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

Unrevert "Support unmarking with no region. Change mc/mark-lines to preserve point."

Browse Source 
This reverts commit 2588ccef6939b77896105f23642483c30c4a4e06.
This commit is contained in:
Justin Dove 2015-06-08 09:20:46 -04:00
parent 49c9f7f6bf
commit 5d677f765c
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
mc-mark-more.el
View File

@ -127,14 +127,14 @@ Use like case-fold-search, don't recommend setting it globally.")
With negative ARG, delete the last one instead. With negative ARG, delete the last one instead.
With zero ARG, skip the last one and mark next." With zero ARG, skip the last one and mark next."
(interactive "p") (interactive "p")
(if (region-active-p) (if (< arg 0)
(if (< arg 0) (let ((cursor (mc/furthest-cursor-after-point)))
(let ((cursor (mc/furthest-cursor-after-point))) (if cursor
(if cursor (mc/remove-fake-cursor cursor)
(mc/remove-fake-cursor cursor) (error "No cursors to be unmarked")))
(error "No cursors to be unmarked"))) (if (region-active-p)
(mc/mark-more-like-this (= arg 0) 'forwards)) (mc/mark-more-like-this (= arg 0) 'forwards)
(mc/mark-lines arg 'forwards)) (mc/mark-lines arg 'forwards)))
(mc/maybe-multiple-cursors-mode)) (mc/maybe-multiple-cursors-mode))
;;;###autoload ;;;###autoload
@ -155,14 +155,14 @@ With zero ARG, skip the last one and mark next."
With negative ARG, delete the last one instead. With negative ARG, delete the last one instead.
With zero ARG, skip the last one and mark next." With zero ARG, skip the last one and mark next."
(interactive "p") (interactive "p")
(if (region-active-p) (if (< arg 0)
(if (< arg 0) (let ((cursor (mc/furthest-cursor-before-point)))
(let ((cursor (mc/furthest-cursor-before-point))) (if cursor
(if cursor (mc/remove-fake-cursor cursor)
(mc/remove-fake-cursor cursor) (error "No cursors to be unmarked")))
(error "No cursors to be unmarked"))) (if (region-active-p)
(mc/mark-more-like-this (= arg 0) 'backwards)) (mc/mark-more-like-this (= arg 0) 'backwards)
(mc/mark-lines arg 'backwards)) (mc/mark-lines arg 'backwards)))
(mc/maybe-multiple-cursors-mode)) (mc/maybe-multiple-cursors-mode))
;;;###autoload ;;;###autoload
@ -179,12 +179,16 @@ With zero ARG, skip the last one and mark next."
(defun mc/mark-lines (num-lines direction) (defun mc/mark-lines (num-lines direction)
(dotimes (i num-lines) (dotimes (i num-lines)
(mc/create-fake-cursor-at-point) (mc/save-excursion
(ecase direction (let ((furthest-cursor (ecase direction
(forwards (loop do (next-logical-line 1 nil) (forwards (mc/furthest-cursor-after-point))
while (mc/all-fake-cursors (point) (1+ (point))))) (backwards (mc/furthest-cursor-before-point)))))
(backwards (loop do (previous-logical-line 1 nil) (if (overlayp furthest-cursor)
while (mc/all-fake-cursors (point) (1+ (point)))))))) (goto-char (overlay-get furthest-cursor 'point))))
(ecase direction
(forwards (next-logical-line 1 nil))
(backwards (previous-logical-line 1 nil)))
(mc/create-fake-cursor-at-point))))
;;;###autoload ;;;###autoload
(defun mc/mark-next-lines (arg) (defun mc/mark-next-lines (arg)