From 9a5c9cd79b83f9a74c35a3a9d452fcd47f752a38 Mon Sep 17 00:00:00 2001
From: Magnar Sveen <magnars@gmail.com>
Date: Wed, 25 Jan 2012 06:41:20 +0100
Subject: [PATCH] Refactored setup of unsupported commands.

---
 multiple-cursors.el | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/multiple-cursors.el b/multiple-cursors.el
index a094303..14f23f1 100644
--- a/multiple-cursors.el
+++ b/multiple-cursors.el
@@ -77,6 +77,18 @@
     (overlay-put overlay 'kill-ring kill-ring)
     (overlay-put overlay 'priority 100)))
 
+(setq mc--unsupported-cmds '())
+
+(defmacro unsupported-cmd (cmd)
+  `(progn
+     (push (quote ,cmd) mc--unsupported-cmds)
+     (defadvice ,cmd (around unsupported-advice activate)
+       "command isn't supported with multiple cursors"
+       (unless multiple-cursors-mode
+         ad-do-it))))
+
+(unsupported-cmd yank-pop)
+
 (setq mc--cmds '(self-insert-command
                  previous-line
                  next-line
@@ -92,17 +104,10 @@
                  backward-delete-char-untabify
                  delete-char
                  delete-backward-char
+                 zap-to-char
                  move-end-of-line-or-next-line
                  move-start-of-line-or-prev-line))
 
-(setq mc--unsupported-cmds '(yank-pop))
-
-;; todo: macro-ify and iterate over mc--unsupported-cmds
-(defadvice yank-pop (around yank-pop-unsupported-advice activate)
-  "yank-pop isn't supported with multiple cursors"
-  (unless multiple-cursors-mode
-    ad-do-it))
-
 (defun mc/execute-command-for-all-cursors (cmd)
   (let ((current-kill-ring kill-ring))
     (save-excursion