From: Michal Nazarewicz <mina86@mina86.com>
To: bug-gnu-emacs@gnu.org
Cc: Alan Mackenzie <acm@muc.de>,
emacs-devel@gnu.org, Stefan Monnier <monnier@iro.umontreal.ca>,
Richard Stallman <rms@gnu.org>
Subject: [PATCH] Make `cycle-spacing' behave more like `just-one-space' if called once.
Date: Mon, 10 Feb 2014 13:19:19 +0100 [thread overview]
Message-ID: <xa1tr45ozg9v.fsf@mina86.com> (raw)
In-Reply-To: <xa1tbnyfhyjk.fsf@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.
---
lisp/ChangeLog | 14 ++++++++++++++
lisp/simple.el | 59 ++++++++++++++++++++++++++++++++--------------------------
2 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b61da99..e53eacd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2014-03-26 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-26 Daniel Colascione <dancol@dancol.org>
* simple.el (process-menu-mode-map): New variable.
diff --git a/lisp/simple.el b/lisp/simple.el
index 2ee6231..2bfab4a 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)))))
\f
(defun beginning-of-buffer (&optional arg)
--
1.9.1.423.g4596e3a
next prev parent reply other threads:[~2014-02-10 12:19 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-29 17:15 key-binding for cycle-spacing Glenn Morris
2014-01-29 17:21 ` Bastien
2014-01-29 17:44 ` Eli Zaretskii
2014-01-29 18:35 ` Glenn Morris
2014-01-29 18:46 ` Glenn Morris
2014-01-29 18:49 ` Eli Zaretskii
2014-01-30 2:33 ` Glenn Morris
2014-01-31 22:36 ` Tassilo Horn
2014-01-29 19:18 ` Teemu Likonen
2014-01-29 19:53 ` David Kastrup
2014-01-29 20:28 ` Alan Mackenzie
2014-01-30 2:37 ` Glenn Morris
2014-01-30 6:11 ` Alan Mackenzie
2014-01-31 22:40 ` Tassilo Horn
2014-01-31 22:55 ` Alan Mackenzie
2014-01-31 23:35 ` Tassilo Horn
2014-02-10 13:45 ` Michal Nazarewicz
2014-02-10 12:19 ` Michal Nazarewicz [this message]
2014-03-27 14:27 ` [PATCH] Make `cycle-spacing' behave more like `just-one-space' if called once Stefan Monnier
2014-03-28 16:29 ` Michal Nazarewicz
2014-01-29 20:30 ` key-binding for cycle-spacing Johan Bockgård
2014-01-30 2:32 ` Glenn Morris
2014-01-30 14:09 ` Richard Stallman
2014-01-30 15:21 ` Stefan Monnier
2014-01-30 23:23 ` Richard Stallman
2014-02-10 13:09 ` Michal Nazarewicz
2014-02-10 13:06 ` [PATCH] Make `cycle-spacing' behave more like `just-one-space' if colled once Michal Nazarewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xa1tr45ozg9v.fsf@mina86.com \
--to=mina86@mina86.com \
--cc=acm@muc.de \
--cc=bug-gnu-emacs@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
--cc=rms@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.