Make `cycle-spacing' behave more like `just-one-space' if colled once.

* simple.el (cycle-spacing): Never delete spaces on first run by
default, but do so in a new 'fast mode and if there are already
N spaces (the previous behaviour).

Compare N with its value in previous invocation so that changing
prefix argument restarts `cycle-spacing' sequence.

The idea is that with this change, binding M-SPC to
`cycle-spacing' should not introduce any changes in behaviour of
the binding so long as users do not type M-SPC twice in a raw with
the same prefix argument or lack thereof.

2 files changed, 47 insertions, 26 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2cd29d8a5c9..ee50bed6209 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2014-03-28  Michal Nazarewicz  <mina86@mina86.com>
+
+        * simple.el (cycle-spacing): Never delete spaces on first run by
+        default, but do so in a new 'fast mode and if there are already
+        N spaces (the previous behaviour).
+
+        Compare N with its value in previous invocation so that changing
+        prefix argument restarts `cycle-spacing' sequence.
+
+        The idea is that with this change, binding M-SPC to
+        `cycle-spacing' should not introduce any changes in behaviour of
+        the binding so long as users do not type M-SPC twice in a raw with
+        the same prefix argument or lack thereof.
+
 2014-03-28  Glenn Morris  <rgm@gnu.org>
 
         * faces.el (term-file-aliases): New variable.
diff --git a/lisp/simple.el b/lisp/simple.el
index ea9ba8fa9a5..6cc9c6bfd6b 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -801,44 +801,51 @@ If BACKWARD-ONLY is non-nil, only delete them before point."
 If N is negative, delete newlines as well, leaving -N spaces.
 See also `cycle-spacing'."
   (interactive "*p")
-  (cycle-spacing n nil t))
+  (cycle-spacing n nil 'single-shot))
 
 (defvar cycle-spacing--context nil
   "Store context used in consecutive calls to `cycle-spacing' command.
-The first time this function is run, it saves the original point
-position and original spacing around the point in this
-variable.")
+The first time this function is run, it saves N argument, the
+original point position and original spacing around the point in
+this variable.")
 
-(defun cycle-spacing (&optional n preserve-nl-back single-shot)
+(defun cycle-spacing (&optional n preserve-nl-back mode)
   "Manipulate whitespace around point in a smart way.
-In interactive use, this function behaves differently in successive
-consecutive calls.
+In interactive use, this function behaves differently in
+successive consecutive calls.
 
-The first call in a sequence acts like `just-one-space'.
-It deletes all spaces and tabs around point, leaving one space
-\(or N spaces).  N is the prefix argument.  If N is negative,
-it deletes newlines as well, leaving -N spaces.
-\(If PRESERVE-NL-BACK is non-nil, it does not delete newlines before point.)
+The first call in a sequence acts like `just-one-space'.  It
+deletes all spaces and tabs around point, leaving one space \(or
+N spaces).  N is the prefix argument.  If N is negative, it
+deletes newlines as well leaving -N spaces.  (If PRESERVE-NL-BACK
+is non-nil, it does not delete newlines before point.)
 
-The second call in a sequence (or the first call if the above does
-not result in any changes) deletes all spaces.
+The second call in a sequence deletes all spaces.
 
-The third call in a sequence restores the original whitespace (and point).
+The third call in a sequence restores the original
+whitespace (and point).
 
-If SINGLE-SHOT is non-nil, it only performs the first step in the sequence."
+If MODE is 'single-shot only the first step is performed.  If
+MODE is 'fast and the first step did not result in any
+change (i.e. there was exactly (abs N) spaces around point)
+function goes to the second step immediately.
+
+Running the function with different N arguments initiates a new
+sequence each time."
   (interactive "*p")
   (let ((orig-pos        (point))
         (skip-characters (if (and n (< n 0)) " \t\n\r" " \t"))
-        (n               (abs (or n 1))))
+        (num             (abs (or n 1))))
     (skip-chars-backward (if preserve-nl-back " \t" skip-characters))
     (constrain-to-field nil orig-pos)
     (cond
-     ;; Command run for the first time or single-shot is non-nil.
-     ((or single-shot
+     ;; Command run for the first time, single-shot mode or different argument
+     ((or (eq 'single-shot mode)
           (not (equal last-command this-command))
-          (not cycle-spacing--context))
+          (not cycle-spacing--context)
+          (not (eq (car cycle-spacing--context) n)))
       (let* ((start (point))
-             (n     (- n (skip-chars-forward " " (+ n (point)))))
+             (num   (- num (skip-chars-forward " " (+ num (point)))))
              (mid   (point))
              (end   (progn
                       (skip-chars-forward skip-characters)
@@ -846,12 +853,12 @@ If SINGLE-SHOT is non-nil, it only performs the first step in the sequence."
         (setq cycle-spacing--context  ;; Save for later.
               ;; Special handling for case where there was no space at all.
               (unless (= start end)
-                (cons orig-pos (buffer-substring start (point)))))
+                (cons n (cons orig-pos (buffer-substring start (point))))))
         ;; If this run causes no change in buffer content, delete all spaces,
         ;; otherwise delete all excess spaces.
-        (delete-region (if (and (not single-shot) (zerop n) (= mid end))
+        (delete-region (if (and (eq mode 'fast) (zerop num) (= mid end))
                            start mid) end)
-        (insert (make-string n ?\s))))
+        (insert (make-string num ?\s))))
 
      ;; Command run for the second time.
      ((not (equal orig-pos (point)))
@@ -859,8 +866,8 @@ If SINGLE-SHOT is non-nil, it only performs the first step in the sequence."
 
      ;; Command run for the third time.
      (t
-      (insert (cdr cycle-spacing--context))
-      (goto-char (car cycle-spacing--context))
+      (insert (cddr cycle-spacing--context))
+      (goto-char (cadr cycle-spacing--context))
       (setq cycle-spacing--context nil)))))
 
 (defun beginning-of-buffer (&optional arg)