update packages

lisp/multiple-cursors/mc-cycle-cursors.el

@@ -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)
+        (return-from mc/cycle nil))))
     (setf next-cursor fallback-cursor))
   (mc/create-fake-cursor-at-point)
   (mc/pop-state-from-overlay next-cursor)

lisp/multiple-cursors/mc-mark-more.el

@@ -355,7 +355,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)))
@@ -402,7 +402,7 @@ With zero ARG, skip the last one and mark next."
             (mc/pop-state-from-overlay first)))
         (if (> (mc/num-cursors) 1)
             (multiple-cursors-mode 1)
-          (multiple-cursors-mode 0))))))
+          (mc/disable-multiple-cursors-mode))))))
 
 ;;;###autoload
 (defun mc/mark-all-in-region-regexp (beg end)
@@ -427,7 +427,7 @@ With zero ARG, skip the last one and mark next."
             (error "Search failed for %S" search)))
         (goto-char (match-end 0))
         (if (< (mc/num-cursors) 3)
-            (multiple-cursors-mode 0)
+            (mc/disable-multiple-cursors-mode)
           (mc/pop-state-from-overlay (mc/furthest-cursor-before-point))
           (multiple-cursors-mode 1))))))
 

lisp/multiple-cursors/mc-separate-operations.el

@@ -106,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)))

lisp/multiple-cursors/multiple-cursors-core.el

@@ -433,7 +433,7 @@ 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)
+        (mc/disable-multiple-cursors-mode)
       (when this-original-command
         (let ((original-command (or mc--this-command
                                     (command-remapping this-original-command)
@@ -487,7 +487,7 @@ you should disable multiple-cursors-mode."
   "Deactivate mark if there are any active, otherwise exit multiple-cursors-mode."
   (interactive)
   (if (not (use-region-p))
-      (multiple-cursors-mode 0)
+      (mc/disable-multiple-cursors-mode)
     (deactivate-mark)))
 
 (defun mc/repeat-command ()
@@ -588,13 +588,18 @@ They are temporarily disabled when multiple-cursors are active.")
     (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/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)
-    (multiple-cursors-mode 0)))
+    (mc/disable-multiple-cursors-mode)))
 
 (defmacro unsupported-cmd (cmd msg)
   "Adds command to list of unsupported commands and prevents it

lisp/multiple-cursors/multiple-cursors-pkg.el

@@ -1,11 +1,12 @@
-(define-package "multiple-cursors" "20201215.1559" "Multiple cursors for Emacs."
+(define-package "multiple-cursors" "20211112.2223" "Multiple cursors for Emacs."
   '((cl-lib "0.5"))
-  :commit "a9d7764f80b241978f3d4e76bc981ef10bab5d70" :authors
+  :commit "8a60fc7ef0ae6e5ca089a7c95264cd0ae83e7274" :authors
   '(("Magnar Sveen" . "magnars@gmail.com"))
   :maintainer
   '("Magnar Sveen" . "magnars@gmail.com")
   :keywords
-  '("editing" "cursors"))
+  '("editing" "cursors")
+  :url "https://github.com/magnars/multiple-cursors.el")
 ;; Local Variables:
 ;; no-byte-compile: t
 ;; End:

lisp/multiple-cursors/multiple-cursors.el

@@ -5,6 +5,7 @@
 ;; Author: Magnar Sveen <magnars@gmail.com>
 ;; Version: 1.4.0
 ;; 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