GNU bug report logs - #27507
[PATCH] Make `cycle-spacing' allow 'negative-zero in place of an integer

Previous Next

Full log

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Mekeor Melire <mekeor.melire <at> gmail.com>
To: bug-gnu-emacs <at> gnu.org
Subject: [PATCH] Make `cycle-spacing' allow 'negative-zero in place of an
 integer
Date: Tue, 27 Jun 2017 18:18:06 +0200

* lisp/simple.el (cycle-spacing): beside accepting an integer as first
argument N, also allow N to be 'negative-zero. This allows to delete
all spaces including newlines with (cycle-spacing 'negative-zero).
---
 lisp/simple.el | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/lisp/simple.el b/lisp/simple.el
index a5565ab..00df813 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -867,18 +867,20 @@ The first time `cycle-spacing' runs, it saves in this variable:
 its N argument, the original point position, and the original spacing
 around point.")
 
-(defun cycle-spacing (&optional n preserve-nl-back mode)
+(defun cycle-spacing (&optional n-or-negative-zero preserve-nl-back mode)
   "Manipulate whitespace around point in a smart way.
 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.)
+\(or N spaces).  N is the prefix argument.  If N is a negative integer,
+it deletes newlines as well, leaving -N spaces. If N is 'negative-zero, it
+deletes all spaces and newlines. \(If PRESERVE-NL-BACK is non-nil, it does
+not delete newlines before point.)
 
-The second call in a sequence deletes all spaces.
+The second call in a sequence deletes all spaces. It is skipped if N is 0
+or the symbol 'negative-zero.
 
 The third call in a sequence restores the original whitespace (and point).
 
@@ -890,9 +892,14 @@ the function goes straight to the second step.
 Repeatedly calling the function with different values of N starts a
 new sequence each time."
   (interactive "*p")
-  (let ((orig-pos	 (point))
-	(skip-characters (if (and n (< n 0)) " \t\n\r" " \t"))
-	(num		 (abs (or n 1))))
+  (letrec
+    ((orig-pos	 (point))
+     (n-is-negative-zero (eq n-or-negative-zero 'negative-zero))
+     (n (if (or (null n-or-negative-zero) n-is-negative-zero)
+            0 n-or-negative-zero))
+     (skip-characters (if (or n-is-negative-zero (< n 0)) " \t\n\r" " \t"))
+     (num	      (abs (or n 1))))
+
     (skip-chars-backward (if preserve-nl-back " \t" skip-characters))
     (constrain-to-field nil orig-pos)
     (cond
-- 
2.8.4 (Apple Git-73)

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.