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

This commit is contained in:
Maciej Katafiasz 2013-09-06 09:33:37 +02:00
parent 8dfe725c4f
commit a86daa79ce

View File

@ -263,13 +263,14 @@ With zero ARG, skip the last one and mark next."
(mc/mark-all-like-this)))
;;;###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"
(interactive "r")
(let ((search (read-from-minibuffer "Mark all in region: "))
(case-fold-search nil))
(when (string= search "")
(return-from mc/mark-all-in-region nil))
(if (string= search "")
(message "Mark aborted")
(progn
(mc/remove-fake-cursors)
(goto-char beg)
(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)))
(if (not first)
(error "Search failed for %S" search)
(mc/pop-state-from-overlay first))))
(mc/pop-state-from-overlay first)))
(if (> (mc/num-cursors) 1)
(multiple-cursors-mode 1)
(multiple-cursors-mode 0)))
(multiple-cursors-mode 0))))))
(when (not (fboundp 'set-temporary-overlay-map))
;; Backport this function from newer emacs versions