Add lexical binding cookies (#389 )

* Add lexical binding cookies * multiple-cursors-core.el: Pacify lexical-binding frenzy in master * multiple-cursors-core.el: when saving mc/list-file, prepend a lexical binding flag to avoid emacs master from screaming. When inserting strings, use `\\n' instead of (newline).
Release 1.5.0
2025-10-13 13:03:03 +00:00 · 2025-10-06 13:38:27 -07:00 · 2025-02-10 19:13:49 +01:00 · 2025-02-10 19:12:54 +01:00 · 2024-12-26 17:55:18 +01:00 · 2024-12-02 17:31:03 +01:00
21 changed files with 919 additions and 509 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -0,0 +1,36 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    paths-ignore:
+    - '**.md'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        emacs_version:
+          - 25.1
+          - 25.2
+          - 25.3
+          - 26.1
+          - 26.2
+          - 26.3
+          - 27.2
+          - 28.1
+          - snapshot
+    steps:
+    - uses: purcell/setup-emacs@master
+      with:
+        version: ${{ matrix.emacs_version }}
+    - name: Install Cask
+      run: git clone https://github.com/cask/cask ~/.cask
+    - name: Add Cask to PATH
+      run: echo "$HOME/.cask/bin" >> $GITHUB_PATH
+    - uses: actions/checkout@v3
+    - name: Install dependencies with Cask
+      run: cask
+    - name: Run tests
+      run: script -e -c /bin/bash -c 'TERM=xterm ./run-tests.sh'
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,3 @@
 elpa
 *.elc
+/.ecukes-failing-scenarios
--- a/.travis.yml
+++ b/.travis.yml
@ -1,21 +0,0 @@
-language: emacs-lisp
-before_install:
-  - if [ "$EMACS" = 'emacs-snapshot' ]; then
-      sudo add-apt-repository -y ppa:cassou/emacs &&
-      sudo apt-get update -qq &&
-      sudo apt-get install -qq
-          emacs-snapshot-el emacs-snapshot-gtk emacs-snapshot;
-    fi
-  - if [ "$EMACS" = 'emacs24' ]; then
-      sudo add-apt-repository -y ppa:cassou/emacs &&
-      sudo apt-get update -qq &&
-      sudo apt-get install -qq
-          emacs24 emacs24-el emacs24-common-non-dfsg;
-    fi
-  - curl -fsSkL https://raw.github.com/cask/cask/master/go | python
-  - export PATH="/home/travis/.cask/bin:$PATH"
-  - cask
-env:
-  - EMACS=emacs24 TAGS=""
-script:
-  ./run-travis-ci.sh
--- a/README.md
+++ b/README.md
@ -1,14 +1,38 @@
-# multiple-cursors.el [![Build Status](https://secure.travis-ci.org/magnars/multiple-cursors.el.png)](http://travis-ci.org/magnars/multiple-cursors.el)
+[![Build Status](https://github.com/magnars/multiple-cursors.el/workflows/CI/badge.svg)](https://github.com/magnars/multiple-cursors.el/actions)
+[![MELPA](https://melpa.org/packages/multiple-cursors-badge.svg)](https://melpa.org/#/multiple-cursors)
+[![MELPA Stable](https://stable.melpa.org/packages/multiple-cursors-badge.svg)](https://stable.melpa.org/#/multiple-cursors)
+[![NonGNU ELPA](https://elpa.nongnu.org/nongnu/multiple-cursors.svg)](https://elpa.nongnu.org/nongnu/multiple-cursors.html)
+
+# multiple-cursors.el

 Multiple cursors for Emacs. This is some pretty crazy functionality, so yes,
-there are kinks. Don't be afraid tho, I've been using it since 2011 with
+there are kinks. Don't be afraid though, I've been using it since 2011 with
 great success and much merriment.

+## Maintenance warning
+
+I use this package every day, and have been doing so for years. It just works.
+At least, it works for all my use cases. And if it breaks somehow, I fix it.
+
+However, it has become painfully clear to me that I don't have time to fix
+problems I don't have. It's been years since I could keep pace with the issues
+and pull requests. Whenever I try, I keep getting feedback that my fix isn't
+good enough by some standard I don't particularly care about.
+
+So, I have closed the issue tracker and the pull requests. I hope you can
+happily use this package, just like I do. If it doesn't work for you, then I'm
+sorry. Thankfully Emacs is infinitely malleable, you can probably fix it
+yourself.
+
+TLDR: *I am still maintaining this package*, but I am no longer crowdsourcing a list of issues.
+
 ## Installation

 I highly recommend installing multiple-cursors through `package.el`.

-It's available on [melpa](http://melpa.milkbox.net/):
+It's available on [MELPA](http://melpa.org/), [MELPA Stable](http://stable.melpa.org) and 
+[NonGNU ELPA](https://elpa.nongnu.org/nongnu/multiple-cursors.html) (enabled by default
+from Emacs 28 onwards):

    M-x package-install multiple-cursors

@ -51,48 +75,59 @@ You can [watch an intro to multiple-cursors at Emacs Rocks](http://emacsrocks.co

 ### Mark one more occurrence

- - `mc/mark-next-like-this`: Adds a cursor and region at the next part of the buffer forwards that matches the current region.
- - `mc/mark-next-like-this-word`: Adds a cursor and region at the next part of the buffer forwards that matches the current region, if  no region is selected it selects the word at the point.
- - `mc/mark-next-like-this-symbol`: Adds a cursor and region at the next part of the buffer forwards that matches the current region, if  no region is selected it selects the symbol at the point.
- - `mc/mark-next-word-like-this`: Like `mc/mark-next-like-this` but only for whole words.
- - `mc/mark-next-symbol-like-this`: Like `mc/mark-next-like-this` but only for whole symbols.
- - `mc/mark-previous-like-this`: Adds a cursor and region at the next part of the buffer backwards that matches the current region.
- - `mc/mark-previous-word-like-this`: Like `mc/mark-previous-like-this` but only for whole words.
- - `mc/mark-previous-symbol-like-this`: Like `mc/mark-previous-like-this` but only for whole symbols.
- - `mc/mark-more-like-this-extended`: Use arrow keys to quickly mark/skip next/previous occurances.
- - `mc/add-cursor-on-click`: Bind to a mouse event to add cursors by clicking. See tips-section.
- - `mc/mark-pop`: Set a cursor at the current point and move to the next (different) position on the mark stack.  This allows for fine grained control over the placement of cursors.
+| Command                             | Description                                                                                                                                                         |
+|-------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `mc/mark-next-like-this`            | Adds a cursor and region at the next part of the buffer forwards that matches the current region.                                                                   |
+| `mc/mark-next-like-this-word`       | Adds a cursor and region at the next part of the buffer forwards that matches the current region, if  no region is selected it selects the word at the point.       |
+| `mc/mark-next-like-this-symbol`     | Adds a cursor and region at the next part of the buffer forwards that matches the current region, if  no region is selected it selects the symbol at the point.     |
+| `mc/mark-next-word-like-this`       | Like `mc/mark-next-like-this` but only for whole words.                                                                                                             |
+| `mc/mark-next-symbol-like-this`     | Like `mc/mark-next-like-this` but only for whole symbols.                                                                                                           |
+| `mc/mark-previous-like-this`        | Adds a cursor and region at the next part of the buffer backwards that matches the current region.                                                                  |
+| `mc/mark-previous-like-this-word`   | Adds a cursor and region at the next part of the buffer backwards that matches the current region, if  no region is selected it selects the word at the point.      |
+| `mc/mark-previous-like-this-symbol` | Adds a cursor and region at the next part of the buffer backwards that matches the current region, if  no region is selected it selects the symbol at the point.    |
+| `mc/mark-previous-word-like-this`   | Like `mc/mark-previous-like-this` but only for whole words.                                                                                                         |
+| `mc/mark-previous-symbol-like-this` | Like `mc/mark-previous-like-this` but only for whole symbols.                                                                                                       |
+| `mc/mark-more-like-this-extended`   | Use arrow keys to quickly mark/skip next/previous occurrences.                                                                                                      |
+| `mc/add-cursor-on-click`            | Bind to a mouse event to add cursors by clicking. See tips-section.                                                                                                 |
+| `mc/mark-pop`                       | Set a cursor at the current point and move to the next (different) position on the mark stack.  This allows for fine grained control over the placement of cursors. |

 ### Juggle around with the current cursors

- - `mc/unmark-next-like-this`: Remove the cursor furthest down in the buffer.
- - `mc/unmark-previous-like-this`: Remove the cursor furthest up in the buffer.
- - `mc/skip-to-next-like-this`: Remove the cursor furthest down, marking the next occurance down.
- - `mc/skip-to-previous-like-this`: Remove the cursor furthest up, marking the next occurance up.
- - `mc/mark-next-like-this-extended`: Temporarily bind the arrow keys to mark/unmark/skip cursors.
+| Command                         | Description                                                        |
+|---------------------------------|--------------------------------------------------------------------|
+| `mc/unmark-next-like-this`      | Remove the cursor furthest down in the buffer.                     |
+| `mc/unmark-previous-like-this`  | Remove the cursor furthest up in the buffer.                       |
+| `mc/skip-to-next-like-this`     | Remove the cursor furthest down, marking the next occurrence down. |
+| `mc/skip-to-previous-like-this` | Remove the cursor furthest up, marking the next occurrence up.     |

 ### Mark many occurrences

- - `mc/edit-lines`: Adds one cursor to each line in the current region.
- - `mc/edit-beginnings-of-lines`: Adds a cursor at the start of each line in the current region.
- - `mc/edit-ends-of-lines`: Adds a cursor at the end of each line in the current region.
- - `mc/mark-all-like-this`: Marks all parts of the buffer that matches the current region.
- - `mc/mark-all-words-like-this`: Like `mc/mark-all-like-this` but only for whole words.
- - `mc/mark-all-symbols-like-this`: Like `mc/mark-all-like-this` but only for whole symbols.
- - `mc/mark-all-in-region`: Prompts for a string to match in the region, adding cursors to all of them.
- - `mc/mark-all-like-this-in-defun`: Marks all parts of the current defun that matches the current region.
- - `mc/mark-all-words-like-this-in-defun`: Like `mc/mark-all-like-this-in-defun` but only for whole words.
- - `mc/mark-all-symbols-like-this-in-defun`: Like `mc/mark-all-like-this-in-defun` but only for whole symbols.
- - `mc/mark-all-dwim`: Tries to be smart about marking everything you want. Can be pressed multiple times.
+| Command                                  | Description                                                                         |
+|------------------------------------------|-------------------------------------------------------------------------------------|
+| `mc/edit-lines`                          | Adds one cursor to each line in the current region.                                 |
+| `mc/edit-beginnings-of-lines`            | Adds a cursor at the start of each line in the current region.                      |
+| `mc/edit-ends-of-lines`                  | Adds a cursor at the end of each line in the current region.                        |
+| `mc/mark-all-like-this`                  | Marks all parts of the buffer that matches the current region.                      |
+| `mc/mark-all-words-like-this`            | Like `mc/mark-all-like-this` but only for whole words.                              |
+| `mc/mark-all-symbols-like-this`          | Like `mc/mark-all-like-this` but only for whole symbols.                            |
+| `mc/mark-all-in-region`                  | Prompts for a string to match in the region, adding cursors to all of them.         |
+| `mc/mark-all-like-this-in-defun`         | Marks all parts of the current defun that matches the current region.               |
+| `mc/mark-all-words-like-this-in-defun`   | Like `mc/mark-all-like-this-in-defun` but only for whole words.                     |
+| `mc/mark-all-symbols-like-this-in-defun` | Like `mc/mark-all-like-this-in-defun` but only for whole symbols.                   |
+| `mc/mark-all-dwim`                       | Tries to be smart about marking everything you want. Can be pressed multiple times. |

 ### Special

- - `set-rectangular-region-anchor`: Think of this one as `set-mark` except you're marking a rectangular region.
- - `mc/mark-sgml-tag-pair`: Mark the current opening and closing tag.
- - `mc/insert-numbers`: Insert increasing numbers for each cursor, top to bottom.
- - `mc/insert-letters`: Insert increasing letters for each cursor, top to bottom.
- - `mc/sort-regions`: Sort the marked regions alphabetically.
- - `mc/reverse-regions`: Reverse the order of the marked regions.
+| Command                         | Description                                                                                                                                                                                  |
+|---------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `set-rectangular-region-anchor` | Think of this one as `set-mark` except you're marking a rectangular region.                                                                                                                  |
+| `mc/mark-sgml-tag-pair`         | Mark the current opening and closing tag.                                                                                                                                                    |
+| `mc/insert-numbers`             | Insert increasing numbers for each cursor, top to bottom.                                                                                                                                    |
+| `mc/insert-letters`             | Insert increasing letters for each cursor, top to bottom.                                                                                                                                    |
+| `mc/sort-regions`               | Sort the marked regions alphabetically.                                                                                                                                                      |
+| `mc/reverse-regions`            | Reverse the order of the marked regions.                                                                                                                                                     |
+| `mc/vertical-align`             | Aligns all cursors vertically with a given CHARACTER to the one with the highest column number (the rightest). (Might not behave as intended if more than one cursors are on the same line.) |
+| `mc/vertical-align-with-space`  | Aligns all cursors with whitespace like `mc/vertical-align` does.                                                                                                                            |

 ## Tips and tricks

@ -100,6 +135,9 @@ You can [watch an intro to multiple-cursors at Emacs Rocks](http://emacsrocks.co
  first disable multiple regions before disabling multiple cursors. If you want to
  insert a newline in multiple-cursors-mode, use `C-j`.

+- `(define-key mc/keymap (kbd "<return>") nil)` will make `<return>` insert a
+  newline; multiple-cursors-mode can still be disabled with `C-g`.
+
 - Sometimes you end up with cursors outside of your view. You can
  scroll the screen to center on each cursor with `C-v` and `M-v` or you can
  press `C-'` to hide all lines without a cursor, press `C-'` again to unhide.
@ -109,7 +147,7 @@ You can [watch an intro to multiple-cursors at Emacs Rocks](http://emacsrocks.co

 - Try pressing `mc/mark-next-like-this-word` or
  `mc/mark-next-like-this-symbol` with no region selected. It will
-  mark the word or symbol and add a cursor at the next occurance
+  mark the word or symbol and add a cursor at the next occurrence

 - Try pressing `mc/mark-all-like-this-dwim` on a tagname in html-mode.

@ -128,6 +166,10 @@ You can [watch an intro to multiple-cursors at Emacs Rocks](http://emacsrocks.co
 - If you would like to keep the global bindings clean, and get custom keybindings
  when the region is active, you can try [region-bindings-mode](https://github.com/fgallina/region-bindings-mode).

+- There is a special hook that is run when the mode is diabled
+  (which is equivalent to the number of cursors going back to 1):
+  `multiple-cursors-mode-disabled-hook`
+
 BTW, I highly recommend adding `mc/mark-next-like-this` to a key binding that's
 right next to the key for `er/expand-region`.

@ -157,11 +199,15 @@ the location with:

 NB! Make sure to do so before requiring multiple-cursors.

+It is possible to set multiple-cursors to "run-for-all" for every
+command except for those that are listed in `mc/cmds-to-run-once`. To
+enable this set `mc/always-run-for-all` to non-nil. Add commands to be
+run once to `mc/cmds-to-run-once` in ".mc-lists.el".
+
 ## Known limitations

 * isearch-forward and isearch-backward aren't supported with multiple cursors.
  If you want this functionality, you can use [phi-search](https://github.com/zk-phi/phi-search).
-* Commands run with `M-x` won't be repeated for all cursors.
 * All key bindings that refer to lambdas are always run for all cursors. If you
  need to limit it, you will have to give it a name.
 * Redo might screw with your cursors. Undo works very well.
@ -198,12 +244,13 @@ Run the tests with:
 * [Aleksey Fedotov](https://github.com/lexa) added `mc-hide-unmatched-lines-mode`
 * [Jules Tamagnan](https://github.com/jtamagnan) added `mc/mark-next-like-this-word` and `mc/mark-next-like-this-symbol`
 * [Ingo Lohmar](https://github.com/ilohmar) extended `mc/add-cursor-on-click` to toggle cursors.
+* [Andrea Orru](https://github.com/AndreaOrru) added `mc/mark-previous-like-this-word`/`-symbol`

 Thanks!

 ## License

-Copyright (C) 2012 Magnar Sveen
+Copyright (C) 2012-2016 Magnar Sveen

 Author: Magnar Sveen <magnars@gmail.com>
 Keywords: editing cursors
--- a/features/insert-numbers.feature
+++ b/features/insert-numbers.feature
@ -17,3 +17,24 @@ Feature: Insert increasing numbers
    When I press "C-u H-0"
    And I press "SPC"
    Then I should see "This 4 text contains the word 5 text thrice (6 text)"
+
+  Scenario: Three cursors, 0-1-2, default
+    Given I have cursors at "text" in "This text contains the word text thrice (text)"
+    When I set mc/insert-numbers-default to 1
+    And I press "H-0"
+    And I press "SPC"
+    Then I should see "This 1 text contains the word 2 text thrice (3 text)"
+
+  Scenario: Three cursors, 9-10-11, default
+    Given I have cursors at "text" in "This text contains the word text thrice (text)"
+    When I set mc/insert-numbers-default to 1
+    And I press "C-9 H-0"
+    And I press "SPC"
+    Then I should see "This 9 text contains the word 10 text thrice (11 text)"
+
+  Scenario: Three cursors, 9-10-11, default
+    Given I have cursors at "text" in "This text contains the word text thrice (text)"
+    When I set mc/insert-numbers-default to 1
+    And I press "C-u H-0"
+    And I press "SPC"
+    Then I should see "This 4 text contains the word 5 text thrice (6 text)"
--- a/features/mark-more.feature
+++ b/features/mark-more.feature
@ -14,6 +14,14 @@ Feature: Marking multiple parts of the buffer
    And I type "sentence"
    Then I should see "This sentence has the word sentence in it"

+  Scenario: Marking next like this, word
+    Given I turn on delete-selection-mode
+    When I insert "This text has the word text in it"
+    And I go to word "text"
+    And I press "C-S-c C->"
+    And I type "sentence"
+    Then I should see "This sentence has the word sentence in it"
+
  Scenario: Skipping a mark
    Given I turn on delete-selection-mode
    When I insert "Here's text, text and text"
@ -54,6 +62,14 @@ Feature: Marking multiple parts of the buffer
    And I type "sentence"
    Then I should see "This sentence has the word sentence in it"

+  Scenario: Marking prev like this, word
+    Given I turn on delete-selection-mode
+    When I insert "This text has the word text in it"
+    And I go to last word "text"
+    And I press "C-S-c C-<"
+    And I type "sentence"
+    Then I should see "This sentence has the word sentence in it"
+
  Scenario: Skipping a prev mark
    Given I turn on delete-selection-mode
    When I insert "Here's text, text and text"
--- a/features/multiple-cursors-core.feature
+++ b/features/multiple-cursors-core.feature
@ -50,6 +50,13 @@ Feature: Multiple cursors core
    And I press "C-!"
    Then I should see "This aatext contains the word aatext twice"

+Scenario: Unknown command with multiple read: yes, do for all
+    Given I have bound C-! to a new command that inserts two read-chars
+    And I have cursors at "text" in "This text contains the word text twice"
+    When I press "C-! b c y"
+    And I press "C-! d e"
+    Then I should see "This bcdetext contains the word bcdetext twice"
+
  Scenario: Unknown command: no, don't do for all
    Given I have bound C-! to another new command that inserts "a"
    And I have cursors at "text" in "This text contains the word text twice"
@ -57,6 +64,28 @@ Feature: Multiple cursors core
    And I press "C-!"
    Then I should see "This aatext contains the word text twice"

+  Scenario: Multiple supported M-x command (forward-word in this case)
+    Given I have cursors at "text" in "This text contains the word text twice"
+    And I type "("
+    And I press "M-x forward-word"
+    And I press "M-x forward-word"
+    And I type ")"
+    Then I should see "This (text contains) the word (text twice)"
+
+  Scenario: Unknown M-x command: yes, do for all
+    Given I have cursors at "text" in "This text contains the word text twice"
+    And I press "C-SPC"
+    And I press "M-f"
+    And I press "M-x upcase-dwim RET y"
+    Then I should see "This TEXT contains the word TEXT twice"
+
+  Scenario: Unknown M-x command: no, don't do for all
+    Given I have cursors at "text" in "This text contains the word text twice"
+    And I press "C-SPC"
+    And I press "M-f"
+    And I press "M-x upcase-dwim RET n"
+    Then I should see "This TEXT contains the word text twice"
+
  Scenario: Undo
    Given I have cursors at "text" in "This text contains the word text twice"
    When I press "M-f"
--- a/features/repeat-command.feature
+++ b/features/repeat-command.feature
@ -0,0 +1,39 @@
+Feature: Repeat last interactive command for fake cursors (mc/repeat-command)
+
+  Scenario: Clone insert-char from M-x
+    Given I have cursors at "text" in "This text contains the word text thrice (text)"
+    When I start an action chain
+    When I press "M-x"
+    And I type "insert-char"
+    And I press "RET"
+    And I type "21"
+    And I press "RET"
+    And I type "n"
+    And I press "C-:"
+    And I press "y"
+    And I execute the action chain
+    Then I should see "This !text contains the word !text thrice (!text)"
+
+  Scenario: Clone insert-char from M-:
+    Given I have cursors at "text" in "This text contains the word text thrice (text)"
+    When I start an action chain
+    When I press "M-:"
+    And I type "(insert-char (+ 40 2))"
+    And I press "RET"
+    And I press "C-:"
+    And I press "y"
+    And I execute the action chain
+    Then I should see "This *text contains the word *text thrice (*text)"
+
+  Scenario: Disable prompt
+    Given I have cursors at "text" in "This text/0000 contains the word text/1111 thrice (text/2222)"
+    When I set mc/always-repeat-command to t
+    When I set mc/always-run-for-all to t
+    When I start an action chain
+    And I press "M-x"
+    And I type "zap-to-char"
+    And I press "RET"
+    And I press "/"
+    And I press "C-:"
+    And I execute the action chain
+    Then I should see "This 0000 contains the word 1111 thrice (2222)"
--- a/features/step-definitions/multiple-cursors-steps.el
+++ b/features/step-definitions/multiple-cursors-steps.el
@ -12,6 +12,12 @@
 (When "^I mark previous like this$"
      (lambda () (call-interactively 'mc/mark-previous-like-this)))

+(When "^I mark previous like this word$"
+      (lambda () (call-interactively 'mc/mark-previous-like-this-word)))
+
+(When "^I mark previous like this symbol$"
+      (lambda () (call-interactively 'mc/mark-previous-like-this-symbol)))
+
 (When "^I mark all like this$"
      (lambda () (call-interactively 'mc/mark-all-like-this)))

@ -124,6 +130,11 @@
           (defun mc-test-temp-command-2 () (interactive) (insert ins))
           (global-set-key (kbd "C-!") 'mc-test-temp-command-2))))

+(Given "^I have bound C-! to a new command that inserts two read-chars$"
+       (lambda ()
+         (defun mc-test-temp-command-3 () (interactive) (insert (read-char "first: ")) (insert (read-char "second: ")))
+         (global-set-key (kbd "C-!") 'mc-test-temp-command-3)))
+
 (Given "^I have bound C-! to a keyboard macro that insert \"_\"$"
       (lambda ()
         (fset 'mc-test-temp-kmacro "\C-q_")
@ -144,6 +155,12 @@
          (cl-assert search nil message word (espuds-buffer-contents))
          (if (string-equal "front" pos) (backward-word)))))

+(When "^I go to last word \"\\(.+\\)\"$"
+      (lambda (text)
+        (goto-char (point-max))
+        (let ((search (re-search-backward text nil t)))
+          (cl-assert search nil "The text '%s' was not found in the current buffer." text))))
+
 (When "^I select the last \"\\(.+\\)\"$"
      (lambda (text)
        (goto-char (point-max))
--- a/features/support/env.el
+++ b/features/support/env.el
@ -24,6 +24,8 @@
 (global-set-key (kbd "C-S-c C->") 'mc/mark-next-like-this-word)
 (global-set-key (kbd "C-S-c M->") 'mc/mark-next-like-this-symbol)
 (global-set-key (kbd "C-<") 'mc/mark-previous-like-this)
+ (global-set-key (kbd "C-S-c C-<") 'mc/mark-previous-like-this-word)
+ (global-set-key (kbd "C-S-c M-<") 'mc/mark-previous-like-this-symbol)
 (global-set-key (kbd "M-!") 'mc/mark-all-like-this)
 (global-set-key (kbd "M-$") 'mc/mark-all-like-this-dwim)
 (global-set-key (kbd "C-$") 'mc/mark-all-dwim)
@ -43,6 +45,8 @@
 (subword-mode 0)
 (wrap-region-mode 0)
 (setq set-mark-default-inactive nil)
- (deactivate-mark))
+ (deactivate-mark)
+ (setq mc/cmds-to-run-for-all nil)
+ (setq mc/cmds-to-run-once nil))

 (After)
--- a/mc-cycle-cursors.el
+++ b/mc-cycle-cursors.el
@ -1,6 +1,6 @@
-;;; mc-cycle-cursors.el
+;;; mc-cycle-cursors.el  -*- lexical-binding: t; -*-

-;; Copyright (C) 2012 Magnar Sveen
+;; Copyright (C) 2012-2016 Magnar Sveen

 ;; Author: Magnar Sveen <magnars@gmail.com>
 ;; Keywords: editing cursors
@ -88,7 +88,11 @@
 (cl-defun mc/cycle (next-cursor fallback-cursor loop-message)
  (when (null next-cursor)
    (when (eql 'stop (mc/handle-loop-condition loop-message))
-      (return-from mc/cycle nil))
+      (cond
+       ((fboundp 'cl-return-from)
+        (cl-return-from mc/cycle nil))
+       ((fboundp 'return-from)
+        (cl-return-from mc/cycle nil))))
    (setf next-cursor fallback-cursor))
  (mc/create-fake-cursor-at-point)
  (mc/pop-state-from-overlay next-cursor)
--- a/mc-edit-lines.el
+++ b/mc-edit-lines.el
@ -1,6 +1,6 @@
-;;; mc-edit-lines.el
+;;; mc-edit-lines.el  -*- lexical-binding: t; -*-

-;; Copyright (C) 2012 Magnar Sveen
+;; Copyright (C) 2012-2016 Magnar Sveen

 ;; Author: Magnar Sveen <magnars@gmail.com>
 ;; Keywords: editing cursors
@ -50,12 +50,12 @@ that symbol is used instead of `mc/edit-lines-empty-lines'.
 Otherwise, if ARG negative, short lines will be ignored.  Any
 other non-nil value will cause short lines to be padded."
  (interactive "P")
-  (when (not (and mark-active (/= (point) (mark))))
+  (unless mark-active
    (error "Mark a set of lines first"))
  (mc/remove-fake-cursors)
  (let* ((col (current-column))
-         (point-line (line-number-at-pos))
-         (mark-line (progn (exchange-point-and-mark) (line-number-at-pos)))
+         (point-line (mc/line-number-at-pos))
+         (mark-line (progn (exchange-point-and-mark) (mc/line-number-at-pos)))
         (direction (if (< point-line mark-line) :up :down))
         (style (cond
                 ;; called from lisp
@ -71,7 +71,7 @@ other non-nil value will cause short lines to be padded."
      (previous-logical-line 1 nil)
      (move-to-column col))
    ;; Add the cursors
-    (while (not (eq (line-number-at-pos) point-line))
+    (while (not (eq (mc/line-number-at-pos) point-line))
      ;; Pad the line
      (when (eq style 'pad)
        (while (< (current-column) col)
--- a/mc-hide-unmatched-lines-mode.el
+++ b/mc-hide-unmatched-lines-mode.el
@ -1,4 +1,4 @@
-;;; mc-hide-unmatched-lines.el
+;;; mc-hide-unmatched-lines-mode.el  -*- lexical-binding: t; -*-

 ;; Copyright (C) 2014 Aleksey Fedotov

@ -54,8 +54,9 @@ also hum/lines-to-expand below and above) To make use of this
 mode press \"C-'\" while multiple-cursor-mode is active. You can
 still edit lines while you are in mc-hide-unmatched-lines
 mode. To leave this mode press <return> or \"C-g\""
-  nil " hu"
-  hum/hide-unmatched-lines-mode-map
+  :init-value nil
+  :lighter " hu"
+  :keymap hum/hide-unmatched-lines-mode-map
  (if mc-hide-unmatched-lines-mode
      ;;just in case if mc mode will be disabled while hide-unmatched-lines is active
      (progn
@ -73,7 +74,7 @@ mode. To leave this mode press <return> or \"C-g\""
  :group 'multiple-cursors)

 (defcustom hum/placeholder "..."
-  "Placeholder which will be placed insted of hiden text"
+  "Placeholder which will be placed instead of hidden text"
  :type '(string)
  :group 'multiple-cursors)

@ -103,5 +104,6 @@ mode. To leave this mode press <return> or \"C-g\""
 (defun hum/unhide-unmatched-lines ()
  (remove-overlays nil nil hum/invisible-overlay-name t))

-(provide 'mc-hide-unmatched-lines-mode)
 (define-key mc/keymap (kbd "C-'") 'mc-hide-unmatched-lines-mode)
+
+(provide 'mc-hide-unmatched-lines-mode)
--- a/mc-mark-more.el
+++ b/mc-mark-more.el
@ -1,6 +1,6 @@
-;;; mc-mark-more.el
+;;; mc-mark-more.el  -*- lexical-binding: t; -*-

-;; Copyright (C) 2012 Magnar Sveen
+;; Copyright (C) 2012-2016 Magnar Sveen

 ;; Author: Magnar Sveen <magnars@gmail.com>
 ;; Keywords: editing cursors
@ -29,6 +29,7 @@

 (require 'multiple-cursors-core)
 (require 'thingatpt)
+(require 'sgml-mode)

 (defun mc/cursor-end (cursor)
  (if (overlay-get cursor 'mark-active)
@ -56,7 +57,7 @@

 (defun mc/furthest-cursor-before-point ()
  (let ((beg (if mark-active (min (mark) (point)) (point)))
-	furthest)
+        furthest)
    (mc/for-each-fake-cursor
     (when (< (mc/cursor-beg cursor) beg)
       (setq beg (mc/cursor-beg cursor))
@ -65,7 +66,7 @@

 (defun mc/furthest-cursor-after-point ()
  (let ((end (if mark-active (max (mark) (point)) (point)))
-	furthest)
+        furthest)
    (mc/for-each-fake-cursor
     (when (> (mc/cursor-end cursor) end)
       (setq end (mc/cursor-end cursor))
@ -96,8 +97,8 @@ to (point)), or nil."
  "How should mc/mark-more-* search for more matches?

 Match everything: nil
-Match only whole words: 'words
-Match only whole symbols: 'symbols
+Match only whole words: \\='words
+Match only whole symbols: \\='symbols

 Use like case-fold-search, don't recommend setting it globally.")

@ -131,7 +132,7 @@ Use like case-fold-search, don't recommend setting it globally.")
             (when point-out-of-order
               (exchange-point-and-mark))
             (mc/create-fake-cursor-at-point))
-         (error "no more matches found."))))))
+         (user-error "no more matches found."))))))

 ;;;###autoload
 (defun mc/mark-next-like-this (arg)
@ -142,9 +143,9 @@ With zero ARG, skip the last one and mark next."
  (interactive "p")
  (if (< arg 0)
      (let ((cursor (mc/furthest-cursor-after-point)))
-	(if cursor
-	    (mc/remove-fake-cursor cursor)
-	  (error "No cursors to be unmarked")))
+        (if cursor
+            (mc/remove-fake-cursor cursor)
+          (error "No cursors to be unmarked")))
    (if (region-active-p)
        (mc/mark-more-like-this (= arg 0) 'forwards)
      (mc/mark-lines arg 'forwards)))
@ -159,9 +160,9 @@ With zero ARG, skip the last one and mark next."
  (interactive "p")
  (if (< arg 0)
      (let ((cursor (mc/furthest-cursor-after-point)))
-	(if cursor
-	    (mc/remove-fake-cursor cursor)
-	  (error "No cursors to be unmarked")))
+        (if cursor
+            (mc/remove-fake-cursor cursor)
+          (error "No cursors to be unmarked")))
    (if (region-active-p)
        (mc/mark-more-like-this (= arg 0) 'forwards)
      (mc--select-thing-at-point 'word)
@ -176,9 +177,9 @@ With zero ARG, skip the last one and mark next."
  (interactive "p")
  (if (< arg 0)
      (let ((cursor (mc/furthest-cursor-after-point)))
-	(if cursor
-	    (mc/remove-fake-cursor cursor)
-	  (error "No cursors to be unmarked")))
+        (if cursor
+            (mc/remove-fake-cursor cursor)
+          (error "No cursors to be unmarked")))
    (if (region-active-p)
        (mc/mark-more-like-this (= arg 0) 'forwards)
      (mc--select-thing-at-point 'symbol)
@ -188,40 +189,121 @@ With zero ARG, skip the last one and mark next."

 ;;;###autoload
 (defun mc/mark-next-word-like-this (arg)
+  "Find and mark the next word of the buffer matching the currently active region
+The matching region must be a whole word to be a match
+If no region is active add a cursor on the next line
+With negative ARG, delete the last one instead.
+With zero ARG, skip the last one and mark next."
  (interactive "p")
  (let ((mc/enclose-search-term 'words))
    (mc/mark-next-like-this arg)))

 ;;;###autoload
 (defun mc/mark-next-symbol-like-this (arg)
+  "Find and mark the next symbol of the buffer matching the currently active region
+The matching region must be a whole symbol to be a match
+If no region is active add a cursor on the next line
+With negative ARG, delete the last one instead.
+With zero ARG, skip the last one and mark next."
  (interactive "p")
  (let ((mc/enclose-search-term 'symbols))
    (mc/mark-next-like-this arg)))

 ;;;###autoload
 (defun mc/mark-previous-like-this (arg)
-  "Find and mark the previous part of the buffer matching the currently active region
+  "Find and mark the previous part of the buffer matching the
+currently active region.
+
+If no region is active ,add a cursor on the previous line.
+
 With negative ARG, delete the last one instead.
+
 With zero ARG, skip the last one and mark next."
  (interactive "p")
  (if (< arg 0)
      (let ((cursor (mc/furthest-cursor-before-point)))
-	(if cursor
-	    (mc/remove-fake-cursor cursor)
-	  (error "No cursors to be unmarked")))
+        (if cursor
+            (mc/remove-fake-cursor cursor)
+          (error "No cursors to be unmarked")))
    (if (region-active-p)
        (mc/mark-more-like-this (= arg 0) 'backwards)
      (mc/mark-lines arg 'backwards)))
  (mc/maybe-multiple-cursors-mode))

+;;;###autoload
+(defun mc/mark-previous-like-this-word (arg)
+  "Find and mark the previous part of the buffer matching the
+currently active region.
+
+If no region is active, mark the word at the point and find the
+previous match.
+
+With negative ARG, delete the last one instead.
+
+With zero ARG, skip the last one and mark previous."
+  (interactive "p")
+  (if (< arg 0)
+      (let ((cursor (mc/furthest-cursor-after-point)))
+        (if cursor
+            (mc/remove-fake-cursor cursor)
+          (error "No cursors to be unmarked")))
+    (if (region-active-p)
+        (mc/mark-more-like-this (= arg 0) 'backwards)
+      (mc--select-thing-at-point 'word)
+      (mc/mark-more-like-this (= arg 0) 'backwards)))
+  (mc/maybe-multiple-cursors-mode))
+
+(defun mc/mark-previous-like-this-symbol (arg)
+  "Find and mark the previous part of the buffer matching the
+currently active region.
+
+If no region is active, mark the symbol at the point and find the
+previous match.
+
+With negative ARG, delete the last one instead.
+
+With zero ARG, skip the last one and mark previous."
+  (interactive "p")
+  (if (< arg 0)
+      (let ((cursor (mc/furthest-cursor-after-point)))
+        (if cursor
+            (mc/remove-fake-cursor cursor)
+          (error "No cursors to be unmarked")))
+    (if (region-active-p)
+        (mc/mark-more-like-this (= arg 0) 'backwards)
+      (mc--select-thing-at-point 'symbol)
+      (mc/mark-more-like-this (= arg 0) 'backwards)))
+  (mc/maybe-multiple-cursors-mode))
+
+
 ;;;###autoload
 (defun mc/mark-previous-word-like-this (arg)
+  "Find and mark the previous part of the buffer matching the
+currently active region.
+
+The matching region must be a whole word to be a match.
+
+If no region is active, add a cursor on the previous line.
+
+With negative ARG, delete the last one instead.
+
+With zero ARG, skip the last one and mark next."
  (interactive "p")
  (let ((mc/enclose-search-term 'words))
    (mc/mark-previous-like-this arg)))

 ;;;###autoload
 (defun mc/mark-previous-symbol-like-this (arg)
+  "Find and mark the previous part of the buffer matching
+the currently active region.
+
+The matching region must be a whole symbol to be a match.
+
+If no region is active add a cursor on the previous line.
+
+With negative ARG, delete the last one instead.
+
+With zero ARG, skip the last one and mark next."
  (interactive "p")
  (let ((mc/enclose-search-term 'symbols))
    (mc/mark-previous-like-this arg)))
@ -230,8 +312,8 @@ With zero ARG, skip the last one and mark next."
  (dotimes (i (if (= num-lines 0) 1 num-lines))
    (mc/save-excursion
     (let ((furthest-cursor (cl-ecase direction
-			      (forwards  (mc/furthest-cursor-after-point))
-			      (backwards (mc/furthest-cursor-before-point)))))
+                              (forwards  (mc/furthest-cursor-after-point))
+                              (backwards (mc/furthest-cursor-before-point)))))
       (when (overlayp furthest-cursor)
         (goto-char (overlay-get furthest-cursor 'point))
         (when (= num-lines 0)
@ -267,13 +349,15 @@ With zero ARG, skip the last one and mark next."

 ;;;###autoload
 (defun mc/skip-to-next-like-this ()
-  "Skip the current one and select the next part of the buffer matching the currently active region."
+  "Skip the current one and select the next part of the buffer
+matching the currently active region."
  (interactive)
  (mc/mark-next-like-this 0))

 ;;;###autoload
 (defun mc/skip-to-previous-like-this ()
-  "Skip the current one and select the prev part of the buffer matching the currently active region."
+  "Skip the current one and select the prev part of the buffer
+matching the currently active region."
  (interactive)
  (mc/mark-previous-like-this 0))

@ -298,7 +382,7 @@ With zero ARG, skip the last one and mark next."
       (when point-first (exchange-point-and-mark)))))
  (if (> (mc/num-cursors) 1)
      (multiple-cursors-mode 1)
-    (multiple-cursors-mode 0)))
+    (mc/disable-multiple-cursors-mode)))

 (defun mc--select-thing-at-point (thing)
  (let ((bound (bounds-of-thing-at-point thing)))
@ -336,16 +420,18 @@ With zero ARG, skip the last one and mark next."
      (progn
        (mc/remove-fake-cursors)
        (goto-char beg)
-        (while (search-forward search end t)
-          (push-mark (match-beginning 0))
-          (mc/create-fake-cursor-at-point))
-        (let ((first (mc/furthest-cursor-before-point)))
-          (if (not first)
-              (error "Search failed for %S" search)
-            (mc/pop-state-from-overlay first)))
-        (if (> (mc/num-cursors) 1)
-            (multiple-cursors-mode 1)
-          (multiple-cursors-mode 0))))))
+	(let ((lastmatch))
+          (while (search-forward search end t)
+            (push-mark (match-beginning 0))
+            (mc/create-fake-cursor-at-point)
+	    (setq lastmatch t))
+          (unless lastmatch
+	    (error "Search failed for %S" search)))
+	(goto-char (match-end 0))
+	(if (< (mc/num-cursors) 3)
+            (mc/disable-multiple-cursors-mode)
+          (mc/pop-state-from-overlay (mc/furthest-cursor-before-point))
+          (multiple-cursors-mode 1))))))

 ;;;###autoload
 (defun mc/mark-all-in-region-regexp (beg end)
@ -366,16 +452,13 @@ With zero ARG, skip the last one and mark next."
            (setq lastmatch (point))
            (when (= (point) (match-beginning 0))
              (forward-char)))
-          (when lastmatch (goto-char lastmatch)))
-        (when (> (mc/num-cursors) 0)
-          (goto-char (match-end 0)))
-        (let ((first (mc/furthest-cursor-before-point)))
-          (if (not first)
-              (error "Search failed for %S" search)
-            (mc/pop-state-from-overlay first)))
-        (if (> (mc/num-cursors) 1)
-            (multiple-cursors-mode 1)
-          (multiple-cursors-mode 0))))))
+          (unless lastmatch
+            (error "Search failed for %S" search)))
+        (goto-char (match-end 0))
+        (if (< (mc/num-cursors) 3)
+            (mc/disable-multiple-cursors-mode)
+          (mc/pop-state-from-overlay (mc/furthest-cursor-before-point))
+          (multiple-cursors-mode 1))))))

 (when (not (fboundp 'set-temporary-overlay-map))
  ;; Backport this function from newer emacs versions
@ -415,31 +498,40 @@ remove the keymap depends on user input and KEEP-PRED:

      (push alist emulation-mode-map-alists))))

+(defvar mc/mark-more-like-this-extended-keymap (make-sparse-keymap))
+
+(define-key mc/mark-more-like-this-extended-keymap (kbd "<up>") 'mc/mmlte--up)
+(define-key mc/mark-more-like-this-extended-keymap (kbd "<down>") 'mc/mmlte--down)
+(define-key mc/mark-more-like-this-extended-keymap (kbd "<left>") 'mc/mmlte--left)
+(define-key mc/mark-more-like-this-extended-keymap (kbd "<right>") 'mc/mmlte--right)
+
 ;;;###autoload
 (defun mc/mark-more-like-this-extended ()
-  "Like mark-more-like-this, but then lets you adjust with arrows key.
+  "Like mark-more-like-this, but then lets you adjust with arrow keys.
 The adjustments work like this:

-   <up>    Mark previous like this and set direction to 'up
-   <down>  Mark next like this and set direction to 'down
+   <up>    Mark previous like this and set direction to \\='up
+   <down>  Mark next like this and set direction to \\='down

-If direction is 'up:
+If direction is \\='up:

   <left>  Skip past the cursor furthest up
   <right> Remove the cursor furthest up

-If direction is 'down:
+If direction is \\='down:

   <left>  Remove the cursor furthest down
   <right> Skip past the cursor furthest down

-The bindings for these commands can be changed. See `mc/mark-more-like-this-extended-keymap'."
+The bindings for these commands can be changed.
+See `mc/mark-more-like-this-extended-keymap'."
  (interactive)
  (mc/mmlte--down)
-  (set-temporary-overlay-map mc/mark-more-like-this-extended-keymap t))
+  (set-transient-map mc/mark-more-like-this-extended-keymap t))

 (defvar mc/mark-more-like-this-extended-direction nil
-  "When using mc/mark-more-like-this-extended are we working on the next or previous cursors?")
+  "When using mc/mark-more-like-this-extended
+are we working on the next or previous cursors?")

 (make-variable-buffer-local 'mc/mark-more-like-this-extended)

@ -474,13 +566,6 @@ The bindings for these commands can be changed. See `mc/mark-more-like-this-exte
    (mc/skip-to-next-like-this))
  (mc/mmlte--message))

-(defvar mc/mark-more-like-this-extended-keymap (make-sparse-keymap))
-
-(define-key mc/mark-more-like-this-extended-keymap (kbd "<up>") 'mc/mmlte--up)
-(define-key mc/mark-more-like-this-extended-keymap (kbd "<down>") 'mc/mmlte--down)
-(define-key mc/mark-more-like-this-extended-keymap (kbd "<left>") 'mc/mmlte--left)
-(define-key mc/mark-more-like-this-extended-keymap (kbd "<right>") 'mc/mmlte--right)
-
 (defvar mc--restrict-mark-all-to-symbols nil)

 ;;;###autoload
@ -525,11 +610,11 @@ If the region is inactive or on a single line, it will behave like
  (interactive "P")
  (if (and (use-region-p)
           (not (> (mc/num-cursors) 1))
-           (not (= (line-number-at-pos (region-beginning))
-                   (line-number-at-pos (region-end)))))
+           (not (= (mc/line-number-at-pos (region-beginning))
+                   (mc/line-number-at-pos (region-end)))))
      (if arg
          (call-interactively 'mc/edit-lines)
-       (call-interactively 'mc/mark-all-in-region))
+        (call-interactively 'mc/mark-all-in-region))
    (progn
      (setq this-command 'mc/mark-all-like-this-dwim)
      (mc/mark-all-like-this-dwim arg))))
@ -585,7 +670,7 @@ If the region is inactive or on a single line, it will behave like
   (last
    (progn
      (when (looking-at "<") (forward-char 1))
-      (when (looking-back ">") (forward-char -1))
+      (when (looking-back ">" 1) (forward-char -1))
      (sgml-get-context)))))

 (defun mc--on-tag-name-p ()
--- a/mc-mark-pop.el
+++ b/mc-mark-pop.el
@ -1,4 +1,4 @@
-;;; mc-mark-pop.el --- Pop cursors off of the mark stack
+;;; mc-mark-pop.el --- Pop cursors off of the mark stack  -*- lexical-binding: t; -*-

 (require 'multiple-cursors-core)

--- a/mc-separate-operations.el
+++ b/mc-separate-operations.el
@ -1,6 +1,6 @@
-;;; mc-separate-operations.el - functions that work differently on each cursor
+;;; mc-separate-operations.el - functions that work differently on each cursor  -*- lexical-binding: t; -*-

-;; Copyright (C) 2012 Magnar Sveen
+;; Copyright (C) 2012-2016 Magnar Sveen

 ;; Author: Magnar Sveen <magnars@gmail.com>
 ;; Keywords: editing cursors
@ -29,17 +29,24 @@

 (require 'multiple-cursors-core)

-;;;###autoload
-(defun mc/insert-numbers (arg)
-  "Insert increasing numbers for each cursor, starting at 0 or ARG."
-  (interactive "P")
-  (setq mc--insert-numbers-number (or (and arg (prefix-numeric-value arg))
-                                      0))
-  (mc/for-each-cursor-ordered
-   (mc/execute-command-for-fake-cursor 'mc--insert-number-and-increase cursor)))
+(defcustom mc/insert-numbers-default 0
+  "The default number at which to start counting for
+`mc/insert-numbers'"
+  :type 'integer
+  :group 'multiple-cursors)

 (defvar mc--insert-numbers-number 0)

+;;;###autoload
+(defun mc/insert-numbers (arg)
+  "Insert increasing numbers for each cursor, starting at
+`mc/insert-numbers-default' or ARG."
+  (interactive "P")
+  (setq mc--insert-numbers-number (or (and arg (prefix-numeric-value arg))
+                                      mc/insert-numbers-default))
+  (mc/for-each-cursor-ordered
+   (mc/execute-command-for-fake-cursor 'mc--insert-number-and-increase cursor)))
+
 (defun mc--insert-number-and-increase ()
  (interactive)
  (insert (number-to-string mc--insert-numbers-number))
@ -54,6 +61,8 @@
                            (mc/cursor-end cursor)) strings))))
    (nreverse strings)))

+(defvar mc--insert-letters-number 0)
+
 ;;;###autoload
 (defun mc/insert-letters (arg)
  "Insert increasing letters for each cursor, starting at 0 or ARG.
@ -66,15 +75,13 @@

 (defun mc--number-to-letters (number)
  (let ((letter
-	 (char-to-string
-	  (+ (mod number 26) ?a)))
-	(number2 (/ number 26)))
+         (char-to-string
+          (+ (mod number 26) ?a)))
+        (number2 (/ number 26)))
    (if (> number2 0)
-	(concat (mc--number-to-letters (- number2 1)) letter)
+        (concat (mc--number-to-letters (- number2 1)) letter)
      letter)))

-(defvar mc--insert-letters-number 0)
-
 (defun mc--insert-letter-and-increase ()
  (interactive)
  (insert (mc--number-to-letters mc--insert-letters-number))
@ -99,7 +106,8 @@
      (progn
        (mc/mark-next-lines 1)
        (mc/reverse-regions)
-        (multiple-cursors-mode 0))
+        (mc/disable-multiple-cursors-mode)
+        )
    (unless (use-region-p)
      (mc/execute-command-for-all-cursors 'mark-sexp))
    (setq mc--strings-to-replace (nreverse (mc--ordered-region-strings)))
@ -117,7 +125,7 @@
 ;;;###autoload
 (defun mc/vertical-align (character)
  "Aligns all cursors vertically with a given CHARACTER to the one with the
-highest colum number (the rightest).
+highest column number (the rightest).
 Might not behave as intended if more than one cursors are on the same line."
  (interactive "c")
  (let ((rightest-column (current-column)))
@ -130,19 +138,14 @@ Might not behave as intended if more than one cursors are on the same line."
     (lambda ()
       (interactive)
       (let ((missing-spaces (- rightest-column (current-column))))
-	 (save-excursion (insert (make-string missing-spaces character)))
-	 (forward-char missing-spaces)
-	 )
-       ))
-      )
-    )
+         (save-excursion (insert (make-string missing-spaces character)))
+         (forward-char missing-spaces))))))

 ;;;###autoload
 (defun mc/vertical-align-with-space ()
  "Aligns all cursors with whitespace like `mc/vertical-align' does"
  (interactive)
-  (mc/vertical-align 32)
-  )
+  (mc/vertical-align 32))

 (provide 'mc-separate-operations)
 ;;; mc-separate-operations.el ends here
--- a/multiple-cursors-core.el
+++ b/multiple-cursors-core.el
@ -1,6 +1,6 @@
-;;; multiple-cursors-core.el --- An experiment in multiple cursors for emacs.
+;;; multiple-cursors-core.el --- An experiment in multiple cursors for emacs.  -*- lexical-binding: t; -*-

-;; Copyright (C) 2012 Magnar Sveen
+;; Copyright (C) 2012-2016 Magnar Sveen

 ;; Author: Magnar Sveen <magnars@gmail.com>
 ;; Keywords: editing cursors
@ -28,13 +28,28 @@
 (require 'cl-lib)
 (require 'rect)

-(defvar mc--read-char)
-
 (defface mc/cursor-face
  '((t (:inverse-video t)))
  "The face used for fake cursors"
  :group 'multiple-cursors)

+(defface mc/cursor-bar-face
+  `((t (:height 1 :background ,(face-attribute 'cursor :background))))
+  "The face used for fake cursors if the cursor-type is bar"
+  :group 'multiple-cursors)
+
+(defcustom mc/match-cursor-style t
+  "If non-nil, attempt to match the cursor style that the user
+has selected.  Namely, use vertical bars the user has configured
+Emacs to use that cursor.
+
+If nil, just use standard rectangle cursors for all fake cursors.
+
+In some modes/themes, the bar fake cursors are either not
+rendered or shift text."
+  :type '(boolean)
+  :group 'multiple-cursors)
+
 (defface mc/region-face
  '((t :inherit region))
  "The face used for fake regions"
@ -98,16 +113,43 @@
       (set-marker ,p nil)
       (set-marker ,s nil))))

+(defun mc/cursor-is-bar ()
+  "Return non-nil if the cursor is a bar."
+  (let ((cursor-type
+         (if (eq cursor-type t)
+             (frame-parameter nil 'cursor-type)
+           cursor-type)))
+    (or (eq cursor-type 'bar)
+        (and (listp cursor-type)
+             (eq (car cursor-type) 'bar)))))
+
+(defun mc/line-number-at-pos (&optional pos absolute)
+  "Faster implementation of `line-number-at-pos'."
+  (if pos
+      (save-excursion
+        (if absolute
+            (save-restriction
+              (widen)
+              (goto-char pos)
+              (string-to-number (format-mode-line "%l")))
+          (goto-char pos)
+          (string-to-number (format-mode-line "%l"))))
+    (string-to-number (format-mode-line "%l"))))
+
 (defun mc/make-cursor-overlay-at-eol (pos)
  "Create overlay to look like cursor at end of line."
  (let ((overlay (make-overlay pos pos nil nil nil)))
-    (overlay-put overlay 'after-string (propertize " " 'face 'mc/cursor-face))
+    (if (and mc/match-cursor-style (mc/cursor-is-bar))
+  (overlay-put overlay 'before-string (propertize "|" 'face 'mc/cursor-bar-face))
+      (overlay-put overlay 'after-string (propertize " " 'face 'mc/cursor-face)))
    overlay))

 (defun mc/make-cursor-overlay-inline (pos)
  "Create overlay to look like cursor inside text."
  (let ((overlay (make-overlay pos (1+ pos) nil nil nil)))
-    (overlay-put overlay 'face 'mc/cursor-face)
+    (if (and mc/match-cursor-style (mc/cursor-is-bar))
+  (overlay-put overlay 'before-string (propertize "|" 'face 'mc/cursor-bar-face))
+      (overlay-put overlay 'face 'mc/cursor-face))
    overlay))

 (defun mc/make-cursor-overlay-at-point ()
@ -133,13 +175,27 @@ highlights the entire width of the window."
                                  yank-undo-function
                                  autopair-action
                                  autopair-wrap-action
-                                  er/history)
+                                  temporary-goal-column
+                                  er/history
+                                  dabbrev--abbrev-char-regexp
+                                  dabbrev--check-other-buffers
+                                  dabbrev--friend-buffer-list
+                                  dabbrev--last-abbrev-location
+                                  dabbrev--last-abbreviation
+                                  dabbrev--last-buffer
+                                  dabbrev--last-buffer-found
+                                  dabbrev--last-direction
+                                  dabbrev--last-expansion
+                                  dabbrev--last-expansion-location
+                                  dabbrev--last-table)
  "A list of vars that need to be tracked on a per-cursor basis.")

 (defun mc/store-current-state-in-overlay (o)
  "Store relevant info about point and mark in the given overlay."
  (overlay-put o 'point (set-marker (make-marker) (point)))
-  (overlay-put o 'mark (set-marker (make-marker) (mark)))
+  (overlay-put o 'mark (set-marker (make-marker)
+           (let ((mark-even-if-inactive t))
+             (mark))))
  (dolist (var mc/cursor-specific-vars)
    (when (boundp var) (overlay-put o var (symbol-value var))))
  o)
@ -196,8 +252,11 @@ If this value is nil, there is no ceiling."
  :group 'multiple-cursors)

 (defun mc/create-fake-cursor-at-point (&optional id)
-  "Add a fake cursor and possibly a fake active region overlay based on point and mark.
-Saves the current state in the overlay to be restored later."
+  "Add a fake cursor and possibly a fake active region overlay
+based on point and mark.
+
+Saves the current state in the overlay
+to be restored later."
  (unless mc--max-cursors-original
    (setq mc--max-cursors-original mc/max-cursors))
  (when mc/max-cursors
@ -217,7 +276,8 @@ Saves the current state in the overlay to be restored later."
    overlay))

 (defun mc/execute-command (cmd)
-  "Run command, simulating the parts of the command loop that makes sense for fake cursors."
+  "Run command, simulating the parts of the command loop that
+makes sense for fake cursors."
  (setq this-command cmd)
  (run-hooks 'pre-command-hook)
  (unless (eq this-command 'ignore)
@ -259,28 +319,35 @@ cursor with updated info."
 ;; Intercept some reading commands so you won't have to
 ;; answer them for every single cursor

-(defvar mc--read-char nil)
-(defvar multiple-cursors-mode nil)
-(defadvice read-char (around mc-support activate)
-  (if (not multiple-cursors-mode)
-      ad-do-it
-    (unless mc--read-char
-      (setq mc--read-char ad-do-it))
-    (setq ad-return-value mc--read-char)))
-
-(defvar mc--read-quoted-char nil)
-(defadvice read-quoted-char (around mc-support activate)
-  (if (not multiple-cursors-mode)
-      ad-do-it
-    (unless mc--read-quoted-char
-      (setq mc--read-quoted-char ad-do-it))
-    (setq ad-return-value mc--read-quoted-char)))
+(defvar mc--input-function-cache nil)

 (defun mc--reset-read-prompts ()
-  (setq mc--read-char nil)
-  (setq mc--read-quoted-char nil))
+  (setq mc--input-function-cache nil))

-(mc--reset-read-prompts)
+(defmacro mc--cache-input-function (fn-name args-cache-key-fn)
+  "Advise FN-NAME to cache its value in a private variable. Cache
+is to be used by mc/execute-command-for-all-fake-cursors and
+caches will be reset by mc--reset-read-prompts. ARGS-CACHE-KEY-FN
+should transform FN-NAME's args to a unique cache-key so that
+different calls to FN-NAME during a command can return multiple
+values."
+  (let ((mc-name (intern (concat "mc--" (symbol-name fn-name)))))
+    `(progn
+       (defun ,mc-name (orig-fun &rest args)
+         (if (not (bound-and-true-p multiple-cursors-mode))
+             (apply orig-fun args)
+           (let* ((cache-key (cons ,(symbol-name fn-name) (,args-cache-key-fn args)))
+                  (cached-value (assoc cache-key mc--input-function-cache))
+                  (return-value (if cached-value (cdr cached-value) (apply orig-fun args))))
+             (unless cached-value
+               (push (cons cache-key return-value) mc--input-function-cache))
+             return-value)))
+       (advice-add ',fn-name :around #',mc-name))))
+
+(mc--cache-input-function read-char car)
+(mc--cache-input-function read-quoted-char car)
+(mc--cache-input-function register-read-with-preview car) ; used by insert-register
+(mc--cache-input-function read-char-from-minibuffer car)  ; used by zap-to-char

 (defun mc/fake-cursor-p (o)
  "Predicate to check if an overlay is a fake cursor"
@ -295,8 +362,10 @@ cursor with updated info."
 (defvar mc--stored-state-for-undo nil
  "Variable to keep the state of the real cursor while undoing a fake one")

+;;;###autoload
 (defun activate-cursor-for-undo (id)
-  "Called when undoing to temporarily activate the fake cursor which action is being undone."
+  "Called when undoing to temporarily activate the fake cursor
+which action is being undone."
  (let ((cursor (mc/cursor-with-id id)))
    (when cursor
      (setq mc--stored-state-for-undo (mc/store-current-state-in-overlay
@ -310,280 +379,15 @@ cursor with updated info."
    (mc/pop-state-from-overlay mc--stored-state-for-undo)
    (setq mc--stored-state-for-undo nil)))

-(defun mc/prompt-for-inclusion-in-whitelist (original-command)
-  "Asks the user, then adds the command either to the once-list or the all-list."
-  (let ((all-p (y-or-n-p (format "Do %S for all cursors?" original-command))))
-    (if all-p
-        (add-to-list 'mc/cmds-to-run-for-all original-command)
-      (add-to-list 'mc/cmds-to-run-once original-command))
-    (mc/save-lists)
-    all-p))
-
-(defun mc/num-cursors ()
-  "The number of cursors (real and fake) in the buffer."
-  (1+ (cl-count-if 'mc/fake-cursor-p
-                   (overlays-in (point-min) (point-max)))))
-
-(defvar mc--this-command nil
-  "Used to store the original command being run.")
-(make-variable-buffer-local 'mc--this-command)
-
-(defun mc/make-a-note-of-the-command-being-run ()
-  "Used with pre-command-hook to store the original command being run.
-Since that cannot be reliably determined in the post-command-hook.
-
-Specifically, this-original-command isn't always right, because it could have
-been remapped. And certain modes (cua comes to mind) will change their
-remapping based on state. So a command that changes the state will afterwards
-not be recognized through the command-remapping lookup."
-  (unless mc--executing-command-for-fake-cursor
-    (let ((cmd (or (command-remapping this-original-command)
-                   this-original-command)))
-      (setq mc--this-command (and (not (eq cmd 'god-mode-self-insert))
-                                  cmd)))))
-
-(defun mc/execute-this-command-for-all-cursors ()
-  "Wrap around `mc/execute-this-command-for-all-cursors-1' to protect hook."
-  (condition-case error
-      (mc/execute-this-command-for-all-cursors-1)
-    (error
-     (message "[mc] problem in `mc/execute-this-command-for-all-cursors': %s"
-              (error-message-string error)))))
-
-;; execute-kbd-macro should never be run for fake cursors. The real cursor will
-;; execute the keyboard macro, resulting in new commands in the command loop,
-;; and the fake cursors can pick up on those instead.
-(defadvice execute-kbd-macro (around skip-fake-cursors activate)
-  (unless mc--executing-command-for-fake-cursor
-    ad-do-it))
-
-(defun mc/execute-this-command-for-all-cursors-1 ()
-  "Used with post-command-hook to execute supported commands for all cursors.
-
-It uses two lists of commands to know what to do: the run-once
-list and the run-for-all list. If a command is in neither of these lists,
-it will prompt for the proper action and then save that preference.
-
-Some commands are so unsupported that they are even prevented for
-the original cursor, to inform about the lack of support."
-  (unless mc--executing-command-for-fake-cursor
-
-    (if (eq 1 (mc/num-cursors)) ;; no fake cursors? disable mc-mode
-        (multiple-cursors-mode 0)
-      (when this-original-command
-        (let ((original-command (or mc--this-command
-                                    (command-remapping this-original-command)
-                                    this-original-command)))
-
-          ;; skip keyboard macros, since they will generate actual commands that are
-          ;; also run in the command loop - we'll handle those later instead.
-          (when (functionp original-command)
-
-            ;; if it's a lambda, we can't know if it's supported or not
-            ;; - so go ahead and assume it's ok, because we're just optimistic like that
-            (if (or (not (symbolp original-command))
-                    ;; lambda registered by smartrep
-                    (string-prefix-p "(" (symbol-name original-command)))
-                (mc/execute-command-for-all-fake-cursors original-command)
-
-              ;; smartrep `intern's commands into own obarray to help
-              ;; `describe-bindings'.  So, let's re-`intern' here to
-              ;; make the command comparable by `eq'.
-              (setq original-command (intern (symbol-name original-command)))
-
-              ;; otherwise it's a symbol, and we can be more thorough
-              (if (get original-command 'mc--unsupported)
-                  (message "%S is not supported with multiple cursors%s"
-                           original-command
-                           (get original-command 'mc--unsupported))
-                (when (and original-command
-                           (not (memq original-command mc--default-cmds-to-run-once))
-                           (not (memq original-command mc/cmds-to-run-once))
-                           (or (memq original-command mc--default-cmds-to-run-for-all)
-                               (memq original-command mc/cmds-to-run-for-all)
-                               (mc/prompt-for-inclusion-in-whitelist original-command)))
-                  (mc/execute-command-for-all-fake-cursors original-command))))))))))
-
-(defun mc/remove-fake-cursors ()
-  "Remove all fake cursors.
-Do not use to conclude editing with multiple cursors. For that
-you should disable multiple-cursors-mode."
-  (mc/for-each-fake-cursor
-   (mc/remove-fake-cursor cursor))
-  (when mc--max-cursors-original
-    (setq mc/max-cursors mc--max-cursors-original))
-  (setq mc--max-cursors-original nil))
-
-(defun mc/keyboard-quit ()
-  "Deactivate mark if there are any active, otherwise exit multiple-cursors-mode."
-  (interactive)
-  (if (not (use-region-p))
-      (multiple-cursors-mode 0)
-    (deactivate-mark)))
-
-(defvar mc/keymap nil
-  "Keymap while multiple cursors are active.
-Main goal of the keymap is to rebind C-g and <return> to conclude
-multiple cursors editing.")
-(unless mc/keymap
-  (setq mc/keymap (make-sparse-keymap))
-  (define-key mc/keymap (kbd "C-g") 'mc/keyboard-quit)
-  (define-key mc/keymap (kbd "<return>") 'multiple-cursors-mode)
-  (when (fboundp 'phi-search)
-    (define-key mc/keymap (kbd "C-s") 'phi-search))
-  (when (fboundp 'phi-search-backward)
-    (define-key mc/keymap (kbd "C-r") 'phi-search-backward)))
-
-(defun mc--all-equal (list)
-  "Are all the items in LIST equal?"
-  (let ((first (car list))
-        (all-equal t))
-    (while (and all-equal list)
-      (setq all-equal (equal first (car list)))
-      (setq list (cdr list)))
-    all-equal))
-
-(defun mc--kill-ring-entries ()
-  "Return the latest kill-ring entry for each cursor.
-The entries are returned in the order they are found in the buffer."
-  (let (entries)
-    (mc/for-each-cursor-ordered
-     (setq entries (cons (car (overlay-get cursor 'kill-ring)) entries)))
-    (reverse entries)))
-
-(defun mc--maybe-set-killed-rectangle ()
-  "Add the latest kill-ring entry for each cursor to killed-rectangle.
-So you can paste it in later with `yank-rectangle'."
-  (let ((entries (let (mc/max-cursors) (mc--kill-ring-entries))))
-    (unless (mc--all-equal entries)
-      (setq killed-rectangle entries))))
-
-(defvar mc/unsupported-minor-modes '(company-mode auto-complete-mode flyspell-mode jedi-mode)
-  "List of minor-modes that does not play well with multiple-cursors.
-They are temporarily disabled when multiple-cursors are active.")
-
-(defvar mc/temporarily-disabled-minor-modes nil
-  "The list of temporarily disabled minor-modes.")
-(make-variable-buffer-local 'mc/temporarily-disabled-minor-modes)
-
-(defun mc/temporarily-disable-minor-mode (mode)
-  "If MODE is available and turned on, remember that and turn it off."
-  (when (and (boundp mode) (eval mode))
-    (add-to-list 'mc/temporarily-disabled-minor-modes mode)
-    (funcall mode -1)))
-
-(defun mc/temporarily-disable-unsupported-minor-modes ()
-  (mapc 'mc/temporarily-disable-minor-mode mc/unsupported-minor-modes))
-
-(defun mc/enable-minor-mode (mode)
-  (funcall mode 1))
-
-(defun mc/enable-temporarily-disabled-minor-modes ()
-  (mapc 'mc/enable-minor-mode mc/temporarily-disabled-minor-modes)
-  (setq mc/temporarily-disabled-minor-modes nil))
-
-(defcustom mc/mode-line
-  `(" mc:" (:eval (format ,(propertize "%d" 'face 'font-lock-warning-face)
-                          (mc/num-cursors))))
-  "What to display in the mode line while multiple-cursors-mode is active."
+(defcustom mc/always-run-for-all nil
+  "Disables whitelisting and always executes commands for every fake cursor."
+  :type '(boolean)
  :group 'multiple-cursors)
-(put 'mc/mode-line 'risky-local-variable t)

-;;;###autoload
-(define-minor-mode multiple-cursors-mode
-  "Mode while multiple cursors are active."
-  nil mc/mode-line mc/keymap
-  (if multiple-cursors-mode
-      (progn
-        (mc/temporarily-disable-unsupported-minor-modes)
-        (add-hook 'pre-command-hook 'mc/make-a-note-of-the-command-being-run nil t)
-        (add-hook 'post-command-hook 'mc/execute-this-command-for-all-cursors t t)
-        (run-hooks 'multiple-cursors-mode-enabled-hook))
-    (remove-hook 'post-command-hook 'mc/execute-this-command-for-all-cursors t)
-    (remove-hook 'pre-command-hook 'mc/make-a-note-of-the-command-being-run t)
-    (setq mc--this-command nil)
-    (mc--maybe-set-killed-rectangle)
-    (mc/remove-fake-cursors)
-    (mc/enable-temporarily-disabled-minor-modes)
-    (run-hooks 'multiple-cursors-mode-disabled-hook)))
-
-(add-hook 'after-revert-hook #'(lambda () (multiple-cursors-mode 0)))
-
-(defun mc/maybe-multiple-cursors-mode ()
-  "Enable multiple-cursors-mode if there is more than one currently active cursor."
-  (if (> (mc/num-cursors) 1)
-      (multiple-cursors-mode 1)
-    (multiple-cursors-mode 0)))
-
-(defmacro unsupported-cmd (cmd msg)
-  "Adds command to list of unsupported commands and prevents it
-from being executed if in multiple-cursors-mode."
-  `(progn
-     (put (quote ,cmd) 'mc--unsupported ,msg)
-     (defadvice ,cmd (around unsupported-advice activate)
-       "command isn't supported with multiple cursors"
-       (unless (and multiple-cursors-mode (called-interactively-p 'any))
-         ad-do-it))))
-
-;; Commands that does not work with multiple-cursors
-(unsupported-cmd isearch-forward ". Feel free to add a compatible version.")
-(unsupported-cmd isearch-backward ". Feel free to add a compatible version.")
-
-;; Make sure pastes from other programs are added to all kill-rings when yanking
-(defadvice current-kill (before interprogram-paste-for-all-cursors activate)
-  (let ((interprogram-paste (and (= n 0)
-                                 interprogram-paste-function
-                                 (funcall interprogram-paste-function))))
-    (when interprogram-paste
-      ;; Add interprogram-paste to normal kill ring, just
-      ;; like current-kill usually does for itself.
-      ;; We have to do the work for it tho, since the funcall only returns
-      ;; something once. It is not a pure function.
-      (let ((interprogram-cut-function nil))
-        (if (listp interprogram-paste)
-            (mapc 'kill-new (nreverse interprogram-paste))
-          (kill-new interprogram-paste))
-        ;; And then add interprogram-paste to the kill-rings
-        ;; of all the other cursors too.
-        (mc/for-each-fake-cursor
-         (let ((kill-ring (overlay-get cursor 'kill-ring))
-               (kill-ring-yank-pointer (overlay-get cursor 'kill-ring-yank-pointer)))
-           (if (listp interprogram-paste)
-               (mapc 'kill-new (nreverse interprogram-paste))
-             (kill-new interprogram-paste))
-           (overlay-put cursor 'kill-ring kill-ring)
-           (overlay-put cursor 'kill-ring-yank-pointer kill-ring-yank-pointer)))))))
-
-(defvar mc/list-file (locate-user-emacs-file ".mc-lists.el")
-  "The position of the file that keeps track of your preferences
-for running commands with multiple cursors.")
-
-(defun mc/dump-list (list-symbol)
-  "Insert (setq 'LIST-SYMBOL LIST-VALUE) to current buffer."
-  (cl-symbol-macrolet ((value (symbol-value list-symbol)))
-    (insert "(setq " (symbol-name list-symbol) "\n"
-            "      '(")
-    (newline-and-indent)
-    (set list-symbol
-         (sort value (lambda (x y) (string-lessp (symbol-name x)
-                                            (symbol-name y)))))
-    (mapc #'(lambda (cmd) (insert (format "%S" cmd)) (newline-and-indent))
-          value)
-    (insert "))")
-    (newline)))
-
-(defun mc/save-lists ()
-  "Saves preferences for running commands with multiple cursors to `mc/list-file'"
-  (with-temp-file mc/list-file
-    (emacs-lisp-mode)
-    (insert ";; This file is automatically generated by the multiple-cursors extension.")
-    (newline)
-    (insert ";; It keeps track of your preferences for running commands with multiple cursors.")
-    (newline)
-    (newline)
-    (mc/dump-list 'mc/cmds-to-run-for-all)
-    (newline)
-    (mc/dump-list 'mc/cmds-to-run-once)))
+(defcustom mc/always-repeat-command nil
+  "Disables confirmation for `mc/repeat-command' command."
+  :type '(boolean)
+  :group 'multiple-cursors)

 (defvar mc/cmds-to-run-once nil
  "Commands to run only once in multiple-cursors-mode.")
@ -595,11 +399,13 @@ for running commands with multiple cursors.")
                                     mc/edit-ends-of-lines
                                     mc/edit-beginnings-of-lines
                                     mc/mark-next-like-this
-				     mc/mark-next-like-this-word
-				     mc/mark-next-like-this-symbol
+                                     mc/mark-next-like-this-word
+                                     mc/mark-next-like-this-symbol
                                     mc/mark-next-word-like-this
                                     mc/mark-next-symbol-like-this
                                     mc/mark-previous-like-this
+                                     mc/mark-previous-like-this-word
+                                     mc/mark-previous-like-this-symbol
                                     mc/mark-previous-word-like-this
                                     mc/mark-previous-symbol-like-this
                                     mc/mark-all-like-this
@ -613,7 +419,7 @@ for running commands with multiple cursors.")
                                     mc/mark-all-dwim
                                     mc/mark-sgml-tag-pair
                                     mc/insert-numbers
-				     mc/insert-letters
+                                     mc/insert-letters
                                     mc/sort-regions
                                     mc/reverse-regions
                                     mc/cycle-forward
@ -631,17 +437,22 @@ for running commands with multiple cursors.")
                                     mc/skip-to-previous-like-this
                                     rrm/switch-to-multiple-cursors
                                     mc-hide-unmatched-lines-mode
+                                     mc/repeat-command
                                     hum/keyboard-quit
                                     hum/unhide-invisible-overlays
                                     save-buffer
                                     ido-exit-minibuffer
+                                     ivy-done
                                     exit-minibuffer
                                     minibuffer-complete-and-exit
                                     execute-extended-command
+                                     eval-expression
                                     undo
                                     redo
                                     undo-tree-undo
                                     undo-tree-redo
+                                     undo-fu-only-undo
+                                     undo-fu-only-redo
                                     universal-argument
                                     universal-argument-more
                                     universal-argument-other-key
@ -671,7 +482,11 @@ for running commands with multiple cursors.")
                                     windmove-left
                                     windmove-right
                                     windmove-up
-                                     windmove-down))
+                                     windmove-down
+                                     repeat-complex-command))
+
+(defvar mc/cmds-to-run-for-all nil
+  "Commands to run for all cursors in multiple-cursors-mode")

 (defvar mc--default-cmds-to-run-for-all nil
  "Default set of commands that should be mirrored by all cursors")
@ -753,12 +568,334 @@ for running commands with multiple cursors.")
                                        smart-up
                                        smart-down))

-(defvar mc/cmds-to-run-for-all nil
-  "Commands to run for all cursors in multiple-cursors-mode")
+(defun mc/prompt-for-inclusion-in-whitelist (original-command)
+  "Asks the user, then adds the command either to the once-list or the all-list."
+  (let ((all-p (y-or-n-p (format "Do %S for all cursors?" original-command))))
+    (if all-p
+        (add-to-list 'mc/cmds-to-run-for-all original-command)
+      (add-to-list 'mc/cmds-to-run-once original-command))
+    (mc/save-lists)
+    all-p))

-(load mc/list-file t) ;; load, but no errors if it does not exist yet please
+(defun mc/num-cursors ()
+  "The number of cursors (real and fake) in the buffer."
+  (1+ (cl-count-if 'mc/fake-cursor-p
+                   (overlays-in (point-min) (point-max)))))
+
+(defvar mc--this-command nil
+  "Used to store the original command being run.")
+(make-variable-buffer-local 'mc--this-command)
+
+(defun mc/make-a-note-of-the-command-being-run ()
+  "Used with pre-command-hook to store the original command being run.
+Since that cannot be reliably determined in the post-command-hook.
+
+Specifically, this-original-command isn't always right, because it could have
+been remapped. And certain modes (cua comes to mind) will change their
+remapping based on state. So a command that changes the state will afterwards
+not be recognized through the command-remapping lookup."
+  (unless mc--executing-command-for-fake-cursor
+    (let ((cmd (or (command-remapping this-original-command)
+                   this-original-command)))
+      (setq mc--this-command (and (not (eq cmd 'god-mode-self-insert))
+                                  cmd)))))
+
+(defun mc/execute-this-command-for-all-cursors ()
+  "Wrap around `mc/execute-this-command-for-all-cursors-1' to protect hook."
+  (condition-case error
+      (mc/execute-this-command-for-all-cursors-1)
+    (error
+     (message "[mc] problem in `mc/execute-this-command-for-all-cursors': %s"
+              (error-message-string error)))))
+
+;; execute-kbd-macro should never be run for fake cursors. The real cursor will
+;; execute the keyboard macro, resulting in new commands in the command loop,
+;; and the fake cursors can pick up on those instead.
+(defadvice execute-kbd-macro (around skip-fake-cursors activate)
+  (unless mc--executing-command-for-fake-cursor
+    ad-do-it))
+
+(defun mc/execute-this-command-for-all-cursors-1 ()
+  "Used with post-command-hook to execute supported commands for all cursors.
+
+It uses two lists of commands to know what to do: the run-once
+list and the run-for-all list. If a command is in neither of these lists,
+it will prompt for the proper action and then save that preference.
+
+Some commands are so unsupported that they are even prevented for
+the original cursor, to inform about the lack of support."
+  (unless mc--executing-command-for-fake-cursor
+
+    (if (eq 1 (mc/num-cursors)) ;; no fake cursors? disable mc-mode
+        (mc/disable-multiple-cursors-mode)
+      (when this-original-command
+        (let ((original-command (or mc--this-command
+                                    (command-remapping this-original-command)
+                                    this-original-command)))
+
+          ;; skip keyboard macros, since they will generate actual commands that are
+          ;; also run in the command loop - we'll handle those later instead.
+          (when (functionp original-command)
+
+            ;; if it's a lambda, we can't know if it's supported or not
+            ;; - so go ahead and assume it's ok, because we're just optimistic like that
+            (if (or (not (symbolp original-command))
+                    ;; lambda registered by smartrep
+                    (string-prefix-p "(" (symbol-name original-command)))
+                (mc/execute-command-for-all-fake-cursors original-command)
+
+              ;; smartrep `intern's commands into own obarray to help
+              ;; `describe-bindings'.  So, let's re-`intern' here to
+              ;; make the command comparable by `eq'.
+              (setq original-command (intern (symbol-name original-command)))
+
+              ;; otherwise it's a symbol, and we can be more thorough
+              (if (get original-command 'mc--unsupported)
+                  (message "%S is not supported with multiple cursors%s"
+                           original-command
+                           (get original-command 'mc--unsupported))
+
+                ;; lazy-load the user's list file
+                (mc/load-lists)
+
+                (when (and original-command
+                           (not (memq original-command mc--default-cmds-to-run-once))
+                           (not (memq original-command mc/cmds-to-run-once))
+                           (or mc/always-run-for-all
+                               (memq original-command mc--default-cmds-to-run-for-all)
+                               (memq original-command mc/cmds-to-run-for-all)
+                               (mc/prompt-for-inclusion-in-whitelist original-command)))
+                  (mc/execute-command-for-all-fake-cursors original-command))))))))))
+
+(defun mc/remove-fake-cursors ()
+  "Remove all fake cursors.
+Do not use to conclude editing with multiple cursors. For that
+you should disable multiple-cursors-mode."
+  (mc/for-each-fake-cursor
+   (mc/remove-fake-cursor cursor))
+  (when mc--max-cursors-original
+    (setq mc/max-cursors mc--max-cursors-original))
+  (setq mc--max-cursors-original nil))
+
+(defun mc/keyboard-quit ()
+  "Deactivate mark if there are any active, otherwise exit multiple-cursors-mode."
+  (interactive)
+  (if (not (use-region-p))
+      (mc/disable-multiple-cursors-mode)
+    (deactivate-mark)))
+
+(defun mc/repeat-command ()
+  "Run last command from `command-history' for every fake cursor."
+  (interactive)
+  (when (or mc/always-repeat-command
+            (y-or-n-p (format "[mc] repeat complex command: %s? " (caar command-history))))
+    (mc/execute-command-for-all-fake-cursors
+     (lambda () (interactive)
+       (cl-letf (((symbol-function 'read-from-minibuffer)
+                  (lambda (p &optional i k r h d m) (read i))))
+         (repeat-complex-command 0))))))
+
+(defvar mc/keymap nil
+  "Keymap while multiple cursors are active.
+Main goal of the keymap is to rebind C-g and <return> to conclude
+multiple cursors editing.")
+(unless mc/keymap
+  (setq mc/keymap (make-sparse-keymap))
+  (define-key mc/keymap (kbd "C-g") 'mc/keyboard-quit)
+  (define-key mc/keymap (kbd "<return>") 'multiple-cursors-mode)
+  (define-key mc/keymap (kbd "C-:") 'mc/repeat-command)
+  (when (fboundp 'phi-search)
+    (define-key mc/keymap (kbd "C-s") 'phi-search))
+  (when (fboundp 'phi-search-backward)
+    (define-key mc/keymap (kbd "C-r") 'phi-search-backward)))
+
+(defun mc--all-equal (list)
+  "Are all the items in LIST equal?"
+  (let ((first (car list))
+        (all-equal t))
+    (while (and all-equal list)
+      (setq all-equal (equal first (car list)))
+      (setq list (cdr list)))
+    all-equal))
+
+(defun mc--kill-ring-entries ()
+  "Return the latest kill-ring entry for each cursor.
+The entries are returned in the order they are found in the buffer."
+  (let (entries)
+    (mc/for-each-cursor-ordered
+     (setq entries (cons (car (overlay-get cursor 'kill-ring)) entries)))
+    (reverse entries)))
+
+(defun mc--maybe-set-killed-rectangle ()
+  "Add the latest kill-ring entry for each cursor to killed-rectangle.
+So you can paste it in later with `yank-rectangle'."
+  (let ((entries (let (mc/max-cursors) (mc--kill-ring-entries))))
+    (unless (mc--all-equal entries)
+      (setq killed-rectangle entries))))
+
+(defvar mc/unsupported-minor-modes '(company-mode auto-complete-mode flyspell-mode jedi-mode)
+  "List of minor-modes that does not play well with multiple-cursors.
+They are temporarily disabled when multiple-cursors are active.")
+
+(defvar mc/temporarily-disabled-minor-modes nil
+  "The list of temporarily disabled minor-modes.")
+(make-variable-buffer-local 'mc/temporarily-disabled-minor-modes)
+
+(defun mc/temporarily-disable-minor-mode (mode)
+  "If MODE is available and turned on, remember that and turn it off."
+  (when (and (boundp mode) (symbol-value mode))
+    (add-to-list 'mc/temporarily-disabled-minor-modes mode)
+    (funcall mode -1)))
+
+(defun mc/temporarily-disable-unsupported-minor-modes ()
+  (mapc 'mc/temporarily-disable-minor-mode mc/unsupported-minor-modes))
+
+(defun mc/enable-minor-mode (mode)
+  (funcall mode 1))
+
+(defun mc/enable-temporarily-disabled-minor-modes ()
+  (mapc 'mc/enable-minor-mode mc/temporarily-disabled-minor-modes)
+  (setq mc/temporarily-disabled-minor-modes nil))
+
+(defcustom mc/mode-line
+  `(" mc:" (:eval (format ,(propertize "%d" 'face 'font-lock-warning-face)
+                          (mc/num-cursors))))
+  "What to display in the mode line while multiple-cursors-mode is active."
+  :type '(sexp)
+  :group 'multiple-cursors)
+(put 'mc/mode-line 'risky-local-variable t)
+
+;;;###autoload
+(define-minor-mode multiple-cursors-mode
+  "Mode while multiple cursors are active."
+  :init-value nil
+  :lighter mc/mode-line
+  :keymap mc/keymap
+  (if multiple-cursors-mode
+      (progn
+        (mc/temporarily-disable-unsupported-minor-modes)
+        (add-hook 'pre-command-hook 'mc/make-a-note-of-the-command-being-run nil t)
+        (add-hook 'post-command-hook 'mc/execute-this-command-for-all-cursors t t)
+        (run-hooks 'multiple-cursors-mode-enabled-hook))
+    (remove-hook 'post-command-hook 'mc/execute-this-command-for-all-cursors t)
+    (remove-hook 'pre-command-hook 'mc/make-a-note-of-the-command-being-run t)
+    (setq mc--this-command nil)
+    (mc--maybe-set-killed-rectangle)
+    (mc/remove-fake-cursors)
+    (mc/enable-temporarily-disabled-minor-modes)
+    (run-hooks 'multiple-cursors-mode-disabled-hook)))
+
+(defun mc/disable-multiple-cursors-mode ()
+  "Disable multiple-cursors-mode and run the corresponding hook."
+  (multiple-cursors-mode 0)
+  (run-hooks 'multiple-cursors-mode-disabled-hook))
+
+(add-hook 'after-revert-hook 'mc/disable-multiple-cursors-mode)
+
+(defun mc/maybe-multiple-cursors-mode ()
+  "Enable multiple-cursors-mode if there is more than one currently active cursor."
+  (if (> (mc/num-cursors) 1)
+      (multiple-cursors-mode 1)
+    (mc/disable-multiple-cursors-mode)))
+
+(defmacro unsupported-cmd (cmd msg)
+  "Adds command to list of unsupported commands and prevents it
+from being executed if in multiple-cursors-mode."
+  `(progn
+     (put (quote ,cmd) 'mc--unsupported ,msg)
+     (defadvice ,cmd (around unsupported-advice activate)
+       "command isn't supported with multiple cursors"
+       (unless (and multiple-cursors-mode (called-interactively-p 'any))
+         ad-do-it))))
+
+;; Commands that does not work with multiple-cursors
+(unsupported-cmd isearch-forward ". Feel free to add a compatible version.")
+(unsupported-cmd isearch-backward ". Feel free to add a compatible version.")
+
+;; Make sure pastes from other programs are added to all kill-rings when yanking
+(defadvice current-kill (before interprogram-paste-for-all-cursors
+        (n &optional do-not-move) activate)
+  (let ((interprogram-paste (and (= n 0)
+                                 interprogram-paste-function
+                                 (funcall interprogram-paste-function))))
+    (when interprogram-paste
+      ;; Add interprogram-paste to normal kill ring, just
+      ;; like current-kill usually does for itself.
+      ;; We have to do the work for it though, since the funcall only returns
+      ;; something once. It is not a pure function.
+      (let ((interprogram-cut-function nil))
+        (if (listp interprogram-paste)
+            (mapc 'kill-new (nreverse interprogram-paste))
+          (kill-new interprogram-paste))
+        ;; And then add interprogram-paste to the kill-rings
+        ;; of all the other cursors too.
+        (mc/for-each-fake-cursor
+         (let ((kill-ring (overlay-get cursor 'kill-ring))
+               (kill-ring-yank-pointer (overlay-get cursor 'kill-ring-yank-pointer)))
+           (if (listp interprogram-paste)
+               (mapc 'kill-new (nreverse interprogram-paste))
+             (kill-new interprogram-paste))
+           (overlay-put cursor 'kill-ring kill-ring)
+           (overlay-put cursor 'kill-ring-yank-pointer kill-ring-yank-pointer)))))))
+
+(defadvice execute-extended-command (after execute-extended-command-for-all-cursors () activate)
+  (when multiple-cursors-mode
+    (unless (or mc/always-run-for-all
+                (not (symbolp this-command))
+                (memq this-command mc/cmds-to-run-for-all)
+                (memq this-command mc/cmds-to-run-once)
+                (memq this-command mc--default-cmds-to-run-for-all)
+                (memq this-command mc--default-cmds-to-run-once))
+      (mc/prompt-for-inclusion-in-whitelist this-command))
+    (when (or mc/always-run-for-all
+              (memq this-command mc/cmds-to-run-for-all)
+              (memq this-command mc--default-cmds-to-run-for-all))
+      (mc/execute-command-for-all-fake-cursors this-command))))
+
+(defcustom mc/list-file (locate-user-emacs-file ".mc-lists.el")
+  "The position of the file that keeps track of your preferences
+for running commands with multiple cursors."
+  :type 'file
+  :group 'multiple-cursors)
+
+(defvar mc--list-file-loaded nil
+  "Whether the list file has already been loaded.")
+
+(defun mc/load-lists ()
+  "Loads preferences for running commands with multiple cursors from `mc/list-file'"
+  (unless mc--list-file-loaded
+    (load mc/list-file 'noerror 'nomessage)
+    (setq mc--list-file-loaded t)))
+
+(defun mc/dump-list (list-symbol)
+  "Insert (setq 'LIST-SYMBOL LIST-VALUE) to current buffer."
+  (cl-symbol-macrolet ((value (symbol-value list-symbol)))
+    (insert "(setq " (symbol-name list-symbol) "\n"
+            "      '(")
+    (newline-and-indent)
+    (set list-symbol
+         (sort value (lambda (x y) (string-lessp (symbol-name x)
+                                            (symbol-name y)))))
+    (mapc #'(lambda (cmd) (insert (format "%S" cmd)) (newline-and-indent))
+          value)
+    (insert "))")
+    (newline)))
+
+(defun mc/save-lists ()
+  "Saves preferences for running commands with multiple cursors to `mc/list-file'"
+  (with-temp-file mc/list-file
+    (emacs-lisp-mode)
+    (when (> emacs-major-version 30)
+      (insert ";;   -*- lexical-binding: t; -*-\n"))
+    (insert ";; This file is automatically generated by the multiple-cursors extension.\n")
+    (insert ";; It keeps track of your preferences for running commands with multiple cursors.\n\n")
+    (mc/dump-list 'mc/cmds-to-run-for-all)
+    (newline)
+    (mc/dump-list 'mc/cmds-to-run-once)))

 (provide 'multiple-cursors-core)
+(require 'mc-cycle-cursors)
+(require 'mc-hide-unmatched-lines-mode)

 ;; Local Variables:
 ;; coding: utf-8
--- a/multiple-cursors-pkg.el
+++ b/multiple-cursors-pkg.el
@ -1,3 +0,0 @@
-(define-package "multiple-cursors" "1.3.0"
-  "Multiple cursors for Emacs."
-  '((cl-lib "0.5")))
--- a/multiple-cursors.el
+++ b/multiple-cursors.el
@ -1,10 +1,12 @@
-;;; multiple-cursors.el --- Multiple cursors for emacs.
+;;; multiple-cursors.el --- Multiple cursors for emacs.  -*- lexical-binding: t; -*-

-;; Copyright (C) 2012-2013 Magnar Sveen
+;; Copyright (C) 2012-2016 Magnar Sveen

 ;; Author: Magnar Sveen <magnars@gmail.com>
-;; Version: 1.4.0
+;; Package-Version: 1.5.0
+;; Package-Requires: ((cl-lib "0.5"))
 ;; Keywords: editing cursors
+;; Homepage: https://github.com/magnars/multiple-cursors.el

 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@ -22,7 +24,7 @@
 ;;; Commentary:

 ;; Multiple cursors for Emacs. This is some pretty crazy functionality, so yes,
-;; there are kinks. Don't be afraid tho, I've been using it since 2011 with
+;; there are kinks. Don't be afraid though, I've been using it since 2011 with
 ;; great success and much merriment.

 ;; ## Basic usage
@ -68,7 +70,7 @@
 ;;  - `mc/mark-previous-like-this`: Adds a cursor and region at the next part of the buffer backwards that matches the current region.
 ;;  - `mc/mark-previous-word-like-this`: Like `mc/mark-previous-like-this` but only for whole words.
 ;;  - `mc/mark-previous-symbol-like-this`: Like `mc/mark-previous-like-this` but only for whole symbols.
-;;  - `mc/mark-more-like-this-extended`: Use arrow keys to quickly mark/skip next/previous occurances.
+;;  - `mc/mark-more-like-this-extended`: Use arrow keys to quickly mark/skip next/previous occurrences.
 ;;  - `mc/add-cursor-on-click`: Bind to a mouse event to add cursors by clicking. See tips-section.

 ;; ### Mark many occurrences
@ -105,7 +107,7 @@
 ;;
 ;; - Try pressing `mc/mark-next-like-this-word` or
 ;;   `mc/mark-next-like-this-symbol` with no region selected. It will
-;;   mark the symbol and add a cursor at the next occurance
+;;   mark the symbol and add a cursor at the next occurrence
 ;;
 ;; - Try pressing `mc/mark-all-like-this-dwim` on a tagname in html-mode.
 ;;
@ -152,7 +154,6 @@

 ;; * isearch-forward and isearch-backward aren't supported with multiple cursors.
 ;;   You should feel free to add a simplified version that can work with it.
-;; * Commands run with `M-x` won't be repeated for all cursors.
 ;; * All key bindings that refer to lambdas are always run for all cursors. If you
 ;;   need to limit it, you will have to give it a name.
 ;; * Redo might screw with your cursors. Undo works very well.
@ -186,13 +187,15 @@

 ;;; Code:

+(defgroup multiple-cursors nil
+  "Multiple cursors for emacs."
+  :group 'editing)
+
 (require 'mc-edit-lines)
-(require 'mc-cycle-cursors)
 (require 'mc-mark-more)
 (require 'mc-mark-pop)
 (require 'rectangular-region-mode)
 (require 'mc-separate-operations)
-(require 'mc-hide-unmatched-lines-mode)

 (provide 'multiple-cursors)

--- a/rectangular-region-mode.el
+++ b/rectangular-region-mode.el
@ -1,6 +1,6 @@
-;;; rectangular-region-mode.el
+;;; rectangular-region-mode.el  -*- lexical-binding: t; -*-

-;; Copyright (C) 2012 Magnar Sveen
+;; Copyright (C) 2012-2016 Magnar Sveen

 ;; Author: Magnar Sveen <magnars@gmail.com>
 ;; Keywords: editing cursors
@ -52,8 +52,9 @@
 (defun set-rectangular-region-anchor ()
  "Anchors the rectangular region at point.

-Think of this one as `set-mark' except you're marking a rectangular region. It is
-an exceedingly quick way of adding multiple cursors to multiple lines."
+Think of this one as `set-mark' except you're marking a
+rectangular region. It is an exceedingly quick way of adding
+multiple cursors to multiple lines."
  (interactive)
  (set-marker rrm/anchor (point))
  (push-mark (point))
@ -75,9 +76,9 @@ an exceedingly quick way of adding multiple cursors to multiple lines."
    (rrm/remove-rectangular-region-overlays)
    (let* ((annoying-arrows-mode nil)
           (point-column (current-column))
-           (point-line (line-number-at-pos))
+           (point-line (mc/line-number-at-pos))
           (anchor-column (save-excursion (goto-char rrm/anchor) (current-column)))
-           (anchor-line (save-excursion (goto-char rrm/anchor) (line-number-at-pos)))
+           (anchor-line (save-excursion (goto-char rrm/anchor) (mc/line-number-at-pos)))
           (left-column (if (< point-column anchor-column) point-column anchor-column))
           (right-column (if (> point-column anchor-column) point-column anchor-column))
           (navigation-step (if (< point-line anchor-line) 1 -1)))
@ -85,7 +86,7 @@ an exceedingly quick way of adding multiple cursors to multiple lines."
      (set-mark (point))
      (move-to-column point-column)
      (mc/save-excursion
-       (while (not (= anchor-line (line-number-at-pos)))
+       (while (not (= anchor-line (mc/line-number-at-pos)))
         (forward-line navigation-step)
         (move-to-column anchor-column)
         (when (= anchor-column (current-column))
@ -111,7 +112,9 @@ an exceedingly quick way of adding multiple cursors to multiple lines."
 ;;;###autoload
 (define-minor-mode rectangular-region-mode
  "A mode for creating a rectangular region to edit"
-  nil " rr" rectangular-region-mode-map
+  :init-value nil
+  :lighter " rr"
+  :keymap rectangular-region-mode-map
  (if rectangular-region-mode
      (progn
        (add-hook 'after-change-functions 'rrm/switch-to-multiple-cursors t t)
--- a/run-travis-ci.sh
+++ b/run-travis-ci.sh
@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-cd "$(dirname "$0")"
-
-ECUKES_EMACS=${EMACS:-$(which emacs)}
-export ECUKES_EMACS
-
-echo "*** Emacs version ***"
-echo "ECUKES_EMACS = $ECUKES_EMACS"
-"$ECUKES_EMACS" --version
-echo
-
-exec ./run-tests.sh $TAGS
Author	SHA1	Message	Date
Pedro A. Aranda Gutiérrez	9017f3be6b	Add lexical binding cookies (#389 ) * Add lexical binding cookies * multiple-cursors-core.el: Pacify lexical-binding frenzy in master * multiple-cursors-core.el: when saving mc/list-file, prepend a lexical binding flag to avoid emacs master from screaming. When inserting strings, use `\\n' instead of (newline).	2025-10-06 13:38:27 -07:00
Magnar Sveen	89f1a8df9b	Release 1.5.0	2025-02-10 19:13:49 +01:00
Magnar Sveen	758223c45b	Merge pull request #388 from emacsmirror/expkg Move metadata from multiple-cursors-pkg.el to multiple-cursors.el	2025-02-10 19:12:54 +01:00
Jonas Bernoulli	bb07ffee68	Move metadata from multiple-cursors-pkg.el to multiple-cursors.el	2024-12-26 17:55:18 +01:00
Magnar Sveen	dd10cf2334	Merge pull request #387 from arialdomartini/tables List of commands in a table	2024-12-02 17:31:03 +01:00
Arialdo Martini	3317246070	List of commands in a table, to improve readability	2024-12-02 15:55:39 +01:00
Magnar Sveen	46635e7f69	Merge pull request #386 from AjaiKN/symbol-value Use symbol-value instead of eval	2024-12-01 19:41:18 +01:00
Ajai Nelson	e315120117	Use symbol-value instead of eval The Emacs Lisp manual says, "to get the value of a variable, while eval works, symbol-value is preferable".	2024-11-27 08:40:16 -05:00
Leo Gaskin	c870c18462	Merge pull request #383 from LaurenceWarne/fix-byte-comp-warnings Fix byte compilation warnings	2024-02-23 12:34:45 +01:00
Laurence Warne	ba7852f192	Move mc/mark-more-like-this-extended-keymap defvar location	2024-02-13 21:03:23 +00:00
Leo Gaskin	d36c62aa71	Merge pull request #384 from cryptorick/fix-version Align version numbers	2024-02-13 18:34:26 +01:00
cryptorick	5ab154b09e	align version numbers	2024-02-12 23:45:40 -05:00
Laurence Warne	25b0dca82e	Fix byte compilation warnings Fix the byte compilation warnings: In mc--read-char: multiple-cursors-core.el:347:2: Warning: reference to free variable ‘multiple-cursors-mode’ In mc--read-quoted-char: multiple-cursors-core.el:348:2: Warning: reference to free variable ‘multiple-cursors-mode’ In mc--register-read-with-preview: multiple-cursors-core.el:349:2: Warning: reference to free variable ‘multiple-cursors-mode’ In mc--read-char-from-minibuffer: multiple-cursors-core.el:350:2: Warning: reference to free variable ‘multiple-cursors-mode’ In toplevel form: mc-mark-more.el:95:2: Warning: defvar `mc/enclose-search-term' docstring has wrong usage of unescaped single quotes (use \= or different quoting) In mc/mark-more-like-this-extended: mc-mark-more.el:501:2: Warning: docstring has wrong usage of unescaped single quotes (use \= or different quoting) mc-mark-more.el:522:22: Warning: reference to free variable ‘mc/mark-more-like-this-extended-keymap’ In end of data: mc-mark-more.el:724:27: Warning: the function ‘sgml-skip-tag-forward’ is not known to be defined. mc-mark-more.el:673:8: Warning: the function ‘sgml-get-context’ is not known to be defined. In end of data: mc-hide-unmatched-lines-mode.el:110:1: Warning: the function ‘sgml-skip-tag-forward’ is not known to be defined. mc-hide-unmatched-lines-mode.el:110:1: Warning: the function ‘sgml-get-context’ is not known to be defined. In end of data: multiple-cursors-core.el:567:43: Warning: the function ‘sgml-skip-tag-forward’ is not known to be defined. multiple-cursors-core.el:535:25: Warning: the function ‘sgml-get-context’ is not known to be defined. In end of data: mc-cycle-cursors.el:124:1: Warning: the function ‘sgml-skip-tag-forward’ is not known to be defined. mc-cycle-cursors.el:124:1: Warning: the function ‘sgml-get-context’ is not known to be defined.	2024-02-11 20:35:00 +00:00
Magnar Sveen	234806c832	Merge pull request #382 from ayyess/master Support commands with multiple read-chars	2023-07-28 07:18:59 +02:00
Andrew Scott	25b98b940c	Support commands with multiple read-chars This change fixes commands that read-chars multiple times. Previously, two stage commands like embrace-change would read the same char twice immediately and avy-goto-char-timer would never stop reading input as a cached value was always provided during the timer. Instead, the read-char prompt is included in the cache key so that multiple different calls are cached separately and accessible by the fake cursors.	2023-07-28 00:05:13 +01:00
Magnar Sveen	6956e8e12e	Add autoload to activate-cursor-for-undo This solves an issue where packages are loaded mid undo-session with undo-fu	2023-03-09 13:04:31 +01:00
Leo Gaskin	16223efc2d	Fix byte compiler warnings by moving variable declarations	2023-01-13 09:35:03 +01:00
Leo Gaskin	7f255ce696	Remove notes saying that "M-x" isn't properly supported	2022-12-24 13:26:12 +01:00
Leo Gaskin	351eb6cbb5	Add multiple-cursors support to execute-extended-command Also add three new tests for this functionality and adapt some existing tests as well as the testing harness.	2022-12-24 13:26:12 +01:00
Leo Gaskin	558198239e	Disable CI support for old versions of Emacs Cask has seemingly stopped properly supporting these versions as indicated by the commit cask/cask@685c4c1.	2022-12-23 16:22:43 +01:00
Leo Gaskin	817a7a8d25	Fix problem aborting mc/edit-lines when not in transient-mark-mode	2022-12-23 16:22:43 +01:00
Leo Gaskin	c9ea562bd5	Fix regression with determining the current sgml context This problem seems to have been introduced in commit aae47ae by adding "100" as an argument to "looking-back" instead of the correct "1".	2022-12-23 16:22:43 +01:00
Leo Gaskin	72de6a4ec4	Use latest major version of actions/checkout for CI	2022-12-23 16:22:43 +01:00
Leo Gaskin	03bc44e093	Use new recommended Cask installation method	2022-12-23 16:22:43 +01:00
Troy Brown	fe0d516745	Detect cursor bar type when specified by the frame. When the 'cursor-type' for the buffer is specified by the frame, this was not detected by the current logic as 'cursor-type' will be set to 't' and thus not explicitly match 'bar'. This update checks to see if 'cursor-type' is specified by the frame and will pull the parameter from the frame if it is, prior to subsequent checks.	2022-11-26 08:43:42 +01:00
Seungheon Oh	1e4842d129	Fix `mc/mark-all-in-region` leaving fake cursor. Previously this function left a remain of fake function if there was only one matching string in selected region.	2022-08-21 11:32:12 +02:00
Ryan Davis	225fc0e889	Extend advising functions for read-char and quoted-read-char w/ macro Add register-read-with-preview and read-char-from-minibuffer to cover insert-register and zap-to-char, respectively. Also add mc--reset-read-variables to for mc--reset-read-prompts to use dynamically so these can be further extended via the macro.	2022-06-13 23:22:50 +02:00
Will B Chang	fd8441bfc8	support undo-fu commands https://github.com/emacsmirror/undo-fu	2022-05-28 14:15:14 +02:00
Steve Purcell	2f003612b7	Use GitHub Actions in place of Travis, and test more Emacs versions (#365 ) * Use GitHub Actions in place of Travis, and test more Emacs versions * Run tests in Actions via `script` to fake a TTY * Add newer emacs versions to CI matrix	2022-05-22 23:54:21 +12:00
Jason May	aae47aebc0	eliminate byte-compilation warnings - long docstrings - "defcustom fails to specify type" - use '(sexp) - keyword arguments in define-minor-mode - deprecations	2022-03-28 19:24:00 +02:00
Johannes Lippmann	8a60fc7ef0	Document multiple-cursors-mode-disabled-hook in Readme	2021-11-12 23:23:42 +01:00
Johannes Lippmann	b139bb6b30	introduce function mc/disable-multiple-cursors-mode	2021-11-12 23:23:42 +01:00
Johannes Lippmann	4975afedb3	Run hook when mc is disabled	2021-11-12 23:23:42 +01:00
Philip K	588daf8c52	Mention NonGNU ELPA Hi, multiple-cursors has recently been added to [NonGNU ELPA](https://elpa.nongnu.org/), allowing Emacs 28+ users to install it without any additional configuration. This patch mentions NonGNU in the README, so that users know that it can be installed by default. Otherwise, the only thing worth noting is that NonGNU ELPA distributes stable versions by default, and these are identified by commits that modify the version tag in the package header. I'm not sure if new versions are to be expected, but in case there is an update, please remember to update the version tag too.	2021-08-08 13:05:02 +02:00
Kaligule	616fbdd369	Document existing functions in Readme mc/vertical-align mc/vertical-align-with-space I have wanted that functions for so long, only to find out now that they have existed for 7 years!	2021-04-21 11:11:19 +02:00
Amory Meltzer	7b13b03c99	Add homepage	2021-03-23 12:28:43 +01:00
Vedang Manerikar	cb93501ec7	Minor backward compatibility fix to remove warning This removes the deprecation warning around `return-from'	2021-03-22 19:44:31 +01:00
Zach Kost-Smith	a9d7764f80	Add option to disable bar-style fake cursors (#367 )	2020-12-15 07:59:00 -08:00
Jen-Chieh Shen	83abb0533a	Add badges to README (#363 ) * Add badges to README * Update README.md Co-authored-by: Steve Purcell <steve@sanityinc.com> Co-authored-by: Steve Purcell <steve@sanityinc.com>	2020-10-25 13:27:10 +13:00
Masahiro Nakamura	7763f4f9d7	Load mc-cycle-cursors and mc-hide-unmatched-lines-mode after loading multiple-cursors-core This is useful with autoloaded commands.	2020-10-18 07:38:52 +02:00
Masahiro Nakamura	6a04a147ce	Fix docstrings Fix wrong docstrings of mc/mark-next-word-like-this and mc/mark-next-symbol-like-this.	2020-10-18 07:37:54 +02:00
Damien Cassou	b880554d04	Fix typos (#359 ) Typos found with codespell.	2019-12-10 09:59:45 -08:00
Magnar Sveen	b9b851a767	Merge pull request #358 from renatofdds/master Faster line-number-at-pos calculation	2019-08-20 09:49:53 +02:00
Renato Ferreira	b39e9631d6	Faster line-number-at-pos calculation	2019-08-18 13:44:55 -03:00
Magnar Sveen	5ffb19af48	Update README.md	2019-03-21 06:57:00 +01:00
Magnar Sveen	a730c414b1	Update README.md	2019-03-20 18:12:37 +01:00
Magnar Sveen	fc6a6a7462	Merge pull request #355 from flatwhatson/lazy-list-file Load mc/list-file as late as possible	2019-03-17 13:11:44 +01:00
Andrew Whatson	d27870dff3	Load mc/list-file as late as possible Previously the list file was loaded immediately upon loading `multiple-cursors-core`. This doesn't work well with modern autoloading emacs configurations, where customisation is mostly done in `eval-after-load` hooks; the default file location is loaded, then the value of `mc/list-file` is changed, and everyone is confused.	2019-03-13 13:40:58 +10:00
Magnar Sveen	5ff2071fac	Merge pull request #351 from jrosdahl/dabbrev-expand Add dabbrev state variables to mc/cursor-specific-vars	2019-02-24 13:46:09 +01:00
Joel Rosdahl	9980faa21f	Add dabbrev state variables to mc/cursor-specific-vars Fixes #142.	2019-02-24 13:28:36 +01:00
Matus Goljer	6a7c3c0853	Fix whitespace	2018-09-13 14:37:07 +02:00
Matus Goljer	8172edd05a	Realign the file according to Elisp conventions	2018-09-13 14:26:58 +02:00
Matus Goljer	3f382d2c8f	Move variables before first use	2018-09-13 14:26:38 +02:00
Magnar Sveen	9c49874fa4	Merge pull request #333 from drrlvn/patch-1 Make "no more matches found." user-error, fix #218	2018-06-15 14:18:37 +02:00
Dror Levin	038815b2b9	Make "no more matches found." user-error, fix #218	2018-06-06 22:33:08 +03:00
Magnar Sveen	75dd6bf83a	Merge pull request #327 from notetiene/master Add customization group definition	2018-04-06 22:50:01 +02:00
Etienne	35ff8b5ef1	Add customization group definition * multiple-cursors.el (multiple-cursors): Add the multiple-cursor group definition.	2018-04-06 15:31:54 -04:00
Magnar Sveen	e419903612	Merge pull request #324 from mkcms/master Always call `mark` with `mark-even-if-inactive` set to t	2018-04-06 14:47:29 +02:00
Magnar Sveen	0e49fecc18	Merge pull request #326 from pstray/issue325 Add temporary-goal-column to mc/cursor-specific-vars	2018-03-20 15:47:49 +01:00
Peder Stray	eba10208fc	Add temporary-goal-column to mc/cursor-specific-vars	2018-03-20 11:25:08 +01:00
Michał K	f628df72a1	Always call `mark` with `mark-even-if-inactive` set to t	2018-03-12 16:18:22 +01:00
bb2020	1075270008	Added mc/interactive-repeating-commands (#303 ) * Added mc/interactive-repeating-commands * simplify mc/interactive-repeating-commands * simplify mc/interactive-repeating-commands * removed mc/interactive-repeating-commands * added mc/repeat-command * rebound mc/repeat-command * blacklisted repeat-complex-command * added mc/always-repeat-command * added mc/repeat-command tests	2017-09-08 14:52:47 -07:00
Jules Tamagnan	e048e04bd8	Fix #271 : The command yank can't work It seems that this may be a windows specific issue given the version strings that @moyotar and @dertuxmalwieder have posted. As a workaround it should be safe to add the arguments that current-kill needs to the defadvice. current-kill has had the same arguments for the past 25 years, since it was first added.	2017-08-31 16:33:49 -07:00
Magnar Sveen	6f183a1e82	Merge pull request #304 from angadgill92/master Fix minor error	2017-08-30 06:48:45 +02:00
Angad Pal	f33cdd4935	Fix minor error - replace "... does not well ..." with "... does not do well ..."	2017-08-30 07:48:31 +05:30
Magnar Sveen	18f992bff5	Merge pull request #290 from raxod502/feat/silent-load Don't display message while loading mc/list-file	2017-08-13 09:38:48 +02:00
Magnar Sveen	f6bac949a0	Add note about M-x	2017-08-11 13:29:04 +02:00
Magnar Sveen	e14fdb77a1	Merge pull request #298 from Quasilyte/update_readme README: added a note about newlines in "tips and tricks"	2017-07-30 16:46:20 +02:00
quasilyte	d2766bc215	tips and tricks: add note about <return> and newlines; if it is not default, let it at least be more discoverable	2017-07-30 17:36:16 +03:00
Josh Hunsaker	c94566597a	Merge pull request #294 from nispio/fix-293 Fix bug in mc/mark-all-in-region-regexp. Fixes #293	2017-07-13 18:47:10 -07:00
Josh Hunsaker	7cb18b8aec	Fix bug in mc/mark-all-in-region-regexp. Fixes #293	2017-06-29 16:30:04 -07:00
Radon Rosborough	fa91dfb9bd	Don't display message while loading mc/list-file	2017-06-15 16:12:28 -07:00
Magnar Sveen	ddbe3ae932	Merge pull request #278 from shlomme/master Add ivy-done to the commands that are only executed once by default	2017-02-15 14:52:02 +01:00
Torsten Marek	616fd84891	Add ivy-done (from ivy) to the list of commands that are only executed once by default. ivy-done is the value of this-original-command when invoking mc/ functions when ivy mode is active.	2017-02-14 17:40:47 +01:00
Jules Tamangan	632768113d	Merge pull request #267 from Fuco1/master Make mc/list-file into defcustom	2016-10-21 14:31:53 -07:00
Matus Goljer	277aef4f0b	Make mc/list-file into defcustom	2016-09-22 17:56:48 +02:00
Jules Tamagnan	dfaf6215fc	Fix #254 ; remove mc/mark-next-like-this-extended	2016-08-01 23:55:09 -04:00
Magnar Sveen	95f2e41fab	Add @AndreaOrru to list of contributors	2016-07-19 11:18:12 +02:00
Magnar Sveen	8e59a8a226	Merge pull request #262 from AndreaOrru/master mark-previous-like-this-word/symbol.	2016-07-19 11:16:38 +02:00
Andrea Orru	6d8c6fcc83	Pass tests.	2016-07-18 14:56:26 +02:00
Andrea Orru	67d6579eab	Updated tests, README.	2016-07-17 16:40:56 +02:00
Andrea Orru	21e48250ec	mc/mark-previous-like-this-word/symbol.	2016-07-17 02:56:48 +02:00
jules tamagnan	ad95d287c7	Update docstring of `mc/cursor-is-bar`	2016-07-05 10:07:06 -04:00
jules tamagnan	60b9ef8347	Updated readme according to `mc/always-run-for-all Related to #256 by @bb2020	2016-07-05 06:26:07 -04:00
jules tamagnan	d9a6047d1a	Fix mc/cursor-is-bar as per @cpitclaudel	2016-07-05 06:07:57 -04:00
Jules Tamangan	8413969a97	Merge pull request #253 from jtamagnan/fake-bar-cursor When cursor-type is bar, mc/cursors appear as bars	2016-06-16 17:04:58 -04:00
Jules Tamangan	2ccfc74bf4	Merge pull request #252 from bb2020/master Add defcustom boolean `mc/always-run-for-all`. When non-nil every command will be run for every cursor	2016-06-09 16:11:55 -04:00
bb2020	d26cecd53a	added always-run-for-all	2016-06-09 23:06:48 +03:00
bb2020	2329611a41	Merge remote-tracking branch 'upstream/master'	2016-06-09 22:45:19 +03:00
bb2020	fd847ae6e7	added mc/always-run-for-all	2016-06-09 22:41:51 +03:00
Jules Tamagnan	be149f9121	Create customizable mc/insert-numbers-default This commit fulfills the feature request from #248 and creates a customizable variable called mc/insert-numbers-default which is the starting value for mc/insert-numbers if no arg is passed	2016-05-23 15:43:08 -04:00
Jules Tamagnan	3112e61824	When cursor-type is bar, mc/cursors appear as bars	2016-05-20 15:36:13 -04:00
Jules Tamagnan	a508978cd9	Add /.ecukes-failing-scenarios to gitignore	2016-05-20 08:58:06 -04:00
Jules Tamagnan	a9daac129a	Add/fix docstring to functions. fix #161 functions documented added: - mc/mark-next-word-like-this, - mc/mark-next-symbol-like-this - mc/mark-previous-word-like-this - mc/mark-previous-symbol-like-this functions documented fixed: - mc/mark-previous-like-this	2016-05-20 08:51:09 -04:00
Bozhidar Batsov	741eec6766	Update some copyright years	2016-05-19 20:29:36 -07:00
Bozhidar Batsov	be4fbc702e	Mention MELPA Stable	2016-05-19 20:28:01 -07:00
bb2020	1686630fd6	try to implement blacklist	2016-05-12 14:41:38 +03:00