ld/multiple-cursors.el
1
0
Fork 0
mirror of https://github.com/magnars/multiple-cursors.el.git synced 2025-10-13 21:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #169 from lexa/master

Browse Source 
"Undo" after leaving mc mode will restore cursors as they was
This commit is contained in:
Magnar Sveen 2014-10-26 13:03:57 +01:00
commit 40b1bad8ac
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
features/multiple-cursors-core.feature
View File

@ -65,6 +65,14 @@ Feature: Multiple cursors core
And I type "!" And I type "!"
Then I should see "This text! contains the word text! twice" Then I should see "This text! contains the word text! twice"
Scenario: Undo mode
Given I have cursors at "text" in "This text contains the word text twice"
When I press "C-g"
And I press "M-f"
And I press "C-_"
And I type "!"
Then I should see "This !text contains the word !text twice"
Scenario: Setting and popping mark Scenario: Setting and popping mark
Given I have cursors at "text" in "This text contains the word text twice" Given I have cursors at "text" in "This text contains the word text twice"
And I press "C-SPC" And I press "C-SPC"

40
multiple-cursors-core.el
View File

@ -52,6 +52,14 @@
(setq buffer-undo-list ;; otherwise add a function to activate this cursor (setq buffer-undo-list ;; otherwise add a function to activate this cursor
(cons (cons 'apply (cons 'activate-cursor-for-undo (list id))) buffer-undo-list)))))) (cons (cons 'apply (cons 'activate-cursor-for-undo (list id))) buffer-undo-list))))))
(defun mc/get-all-fake-cursors-state ()
"Return list of all fake cursor states
like this: ((CURSOR-POS MARK-POSITION (list of cursor specific variables)) ...)"
(mapcar (lambda (cursor)
(mc/get-state-from-overlay cursor))
(mc/all-fake-cursors)))
(defun mc/all-fake-cursors (&optional start end) (defun mc/all-fake-cursors (&optional start end)
(remove-if-not 'mc/fake-cursor-p (remove-if-not 'mc/fake-cursor-p
(overlays-in (or start (point-min)) (overlays-in (or start (point-min))
@ -152,6 +160,23 @@ highlights the entire width of the window."
(dolist (var mc/cursor-specific-vars) (dolist (var mc/cursor-specific-vars)
(when (boundp var) (set var (overlay-get o var))))) (when (boundp var) (set var (overlay-get o var)))))
(defun mc/get-state-from-overlay (o)
"Return list describing state of cursor overlay"
(list
(marker-position (overlay-get o 'point))
(marker-position (overlay-get o 'mark))
(mapcar (lambda (var)
(when (boundp var) (cons var (overlay-get o var))))
mc/cursor-specific-vars)))
(defun mc/create-overlay-from-state (point mark cursor-vars)
"Creates cursor overlay according to cursor-info"
(goto-char point)
(push-mark mark t)
(loop for (var . value) in cursor-vars
do (setq var value))
(mc/create-fake-cursor-at-point))
(defun mc/remove-fake-cursor (o) (defun mc/remove-fake-cursor (o)
"Delete overlay with state, including dependent overlays and markers." "Delete overlay with state, including dependent overlays and markers."
(set-marker (overlay-get o 'point) nil) (set-marker (overlay-get o 'point) nil)
@ -459,6 +484,20 @@ They are temporarily disabled when multiple-cursors are active.")
:group 'multiple-cursors) :group 'multiple-cursors)
(put 'mc/mode-line 'risky-local-variable t) (put 'mc/mode-line 'risky-local-variable t)
(defun mc/restore-mode (real-cursor real-mark fake-cursors)
"Restore state of mc mode after undo"
(save-excursion
;; remove all existing fake cursors
(when multiple-cursors-mode
(mc/remove-fake-cursors))
;; and create set a new one
(mapc #'(lambda (cursor)
(apply 'mc/create-overlay-from-state cursor))
fake-cursors))
(goto-char real-cursor)
(push-mark real-mark t)
(multiple-cursors-mode t))
;;;###autoload ;;;###autoload
(define-minor-mode multiple-cursors-mode (define-minor-mode multiple-cursors-mode
"Mode while multiple cursors are active." "Mode while multiple cursors are active."
@ -471,6 +510,7 @@ They are temporarily disabled when multiple-cursors are active.")
(run-hooks 'multiple-cursors-mode-enabled-hook)) (run-hooks 'multiple-cursors-mode-enabled-hook))
(remove-hook 'post-command-hook 'mc/execute-this-command-for-all-cursors t) (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) (remove-hook 'pre-command-hook 'mc/make-a-note-of-the-command-being-run t)
(push `(apply mc/restore-mode . ,(list (point) (mark) (mc/get-all-fake-cursors-state))) buffer-undo-list)
(setq mc--this-command nil) (setq mc--this-command nil)
(mc--maybe-set-killed-rectangle) (mc--maybe-set-killed-rectangle)
(mc/remove-fake-cursors) (mc/remove-fake-cursors)