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

Guard with 'if' rather than defun*/return-from

Browse Source
This commit is contained in:
Maciej Katafiasz 2013-09-06 09:33:37 +02:00
parent 8dfe725c4f
commit a86daa79ce
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mc-mark-more.el
View File

@ -263,13 +263,14 @@ With zero ARG, skip the last one and mark next."
(mc/mark-all-like-this))) (mc/mark-all-like-this)))
;;;###autoload ;;;###autoload
(defun* mc/mark-all-in-region (beg end) (defun mc/mark-all-in-region (beg end)
"Find and mark all the parts in the region matching the given search" "Find and mark all the parts in the region matching the given search"
(interactive "r") (interactive "r")
(let ((search (read-from-minibuffer "Mark all in region: ")) (let ((search (read-from-minibuffer "Mark all in region: "))
(case-fold-search nil)) (case-fold-search nil))
(when (string= search "") (if (string= search "")
(return-from mc/mark-all-in-region nil)) (message "Mark aborted")
(progn
(mc/remove-fake-cursors) (mc/remove-fake-cursors)
(goto-char beg) (goto-char beg)
(while (search-forward search end t) (while (search-forward search end t)
@ -278,10 +279,10 @@ With zero ARG, skip the last one and mark next."
(let ((first (mc/furthest-cursor-before-point))) (let ((first (mc/furthest-cursor-before-point)))
(if (not first) (if (not first)
(error "Search failed for %S" search) (error "Search failed for %S" search)
(mc/pop-state-from-overlay first)))) (mc/pop-state-from-overlay first)))
(if (> (mc/num-cursors) 1) (if (> (mc/num-cursors) 1)
(multiple-cursors-mode 1) (multiple-cursors-mode 1)
(multiple-cursors-mode 0))) (multiple-cursors-mode 0))))))
(when (not (fboundp 'set-temporary-overlay-map)) (when (not (fboundp 'set-temporary-overlay-map))
;; Backport this function from newer emacs versions ;; Backport this function from newer emacs versions