unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
* bug#18847: 24.4; Inconsistent behaviour of M-h with negative arguments
@ 2014-10-26 23:27 H. Dieter Wilhelm
  2014-10-27  7:37 ` H. Dieter Wilhelm
  2014-10-28 17:04 ` Stefan Monnier
  0 siblings, 2 replies; 7+ messages in thread
From: H. Dieter Wilhelm @ 2014-10-26 23:27 UTC (permalink / raw)
  To: 18847


Hello,

please try M-- M-h M-h M-h.

below some paragraphs.  The behaviour is not in line with the other
marking commands like M-@, ...

Here's a suggestion and a matching patch:

(defun mark-paragraph (&optional arg allow-extend)
  "Put mark at beginning of this paragraph,  point at end.
The paragraph marked is the one that contains point or follows
point. 

With argument ARG, puts mark at the end of a following paragraph,
so that the number of paragraphs marked equals ARG.

If ARG is negative, point is put at the beginning of this
paragraph, mark is put at the end of this or a previous
paragraph.

Interactively, if this command is repeated or (in Transient Mark
Mode) if the mark is active, it marks the next ARG paragraphs
after the ones already marked.  This means when activating the
mark before using this command, the current paragraph is only
marked from point."
  (interactive "P\np")
  (let ((numeric-arg (prefix-numeric-value arg)))
    (cond ((eobp)			; smart-aleck?
	   (backward-paragraph (abs numeric-arg))
	   (push-mark nil t t)
	   (forward-paragraph (abs numeric-arg)))
	  ((and allow-extend ;we already called this function or have
			     ;a (possibly empty) region
		(or (eq last-command this-command)
		    (region-active-p)))
	   (if arg
	       (setq arg numeric-arg)
	     (if (< (mark) (point))
		 (setq arg -1)
	       (setq arg 1)))
	   (set-mark
	    (save-excursion
	      (goto-char (mark))
	      (forward-paragraph arg)
	      (point))))
	  ((zerop numeric-arg)		
	   (message "Will not mark zero paragraphs."))
	  (t
	   (forward-paragraph numeric-arg)
	   (push-mark nil t t)
	   (backward-paragraph numeric-arg)))))


Thank you for your troubles!

diff -c /usr/local/src/emacs-24.4/lisp/textmodes/paragraphs.el /usr/local/src/emacs/lisp/textmodes/paragraphs.el
*** /usr/local/src/emacs-24.4/lisp/textmodes/paragraphs.el	2014-03-21 06:34:40.000000000 +0100
--- /usr/local/src/emacs/lisp/textmodes/paragraphs.el	2014-10-27 00:22:41.874845901 +0100
***************
*** 370,403 ****
    (forward-paragraph (- arg)))
  
  (defun mark-paragraph (&optional arg allow-extend)
!   "Put point at beginning of this paragraph, mark at end.
! The paragraph marked is the one that contains point or follows point.
  
! With argument ARG, puts mark at end of a following paragraph, so that
! the number of paragraphs marked equals ARG.
  
! If ARG is negative, point is put at end of this paragraph, mark is put
! at beginning of this or a previous paragraph.
  
! Interactively (or if ALLOW-EXTEND is non-nil), if this command is
! repeated or (in Transient Mark mode) if the mark is active,
! it marks the next ARG paragraphs after the ones already marked."
!   (interactive "p\np")
!   (unless arg (setq arg 1))
!   (when (zerop arg)
!     (error "Cannot mark zero paragraphs"))
!   (cond ((and allow-extend
! 	      (or (and (eq last-command this-command) (mark t))
! 		  (and transient-mark-mode mark-active)))
! 	 (set-mark
! 	  (save-excursion
! 	    (goto-char (mark))
! 	    (forward-paragraph arg)
! 	    (point))))
! 	(t
! 	 (forward-paragraph arg)
! 	 (push-mark nil t t)
! 	 (backward-paragraph arg))))
  
  (defun kill-paragraph (arg)
    "Kill forward to end of paragraph.
--- 370,417 ----
    (forward-paragraph (- arg)))
  
  (defun mark-paragraph (&optional arg allow-extend)
!   "Put mark at beginning of this paragraph,  point at end.
! The paragraph marked is the one that contains point or follows
! point.
  
! With argument ARG, puts mark at the end of a following paragraph,
! so that the number of paragraphs marked equals ARG.
  
! If ARG is negative, point is put at the beginning of this
! paragraph, mark is put at the end of this or a previous
! paragraph.
  
! Interactively, if this command is repeated or (in Transient Mark
! Mode) if the mark is active, it marks the next ARG paragraphs
! after the ones already marked.  This means when activating the
! mark before using this command, the current paragraph is only
! marked from point."
!   (interactive "P\np")
!   (let ((numeric-arg (prefix-numeric-value arg)))
!     (cond ((eobp)			; smart-aleck?
! 	   (backward-paragraph (abs numeric-arg))
! 	   (push-mark nil t t)
! 	   (forward-paragraph (abs numeric-arg)))
! 	  ((and allow-extend ;we already called this function or have
! 			     ;a (possibly empty) region
! 		(or (eq last-command this-command)
! 		    (region-active-p)))
! 	   (if arg
! 	       (setq arg numeric-arg)
! 	     (if (< (mark) (point))
! 		 (setq arg -1)
! 	       (setq arg 1)))
! 	   (set-mark
! 	    (save-excursion
! 	      (goto-char (mark))
! 	      (forward-paragraph arg)
! 	      (point))))
! 	  ((zerop numeric-arg)
! 	   (message "Will not mark zero paragraphs."))
! 	  (t
! 	   (forward-paragraph numeric-arg)
! 	   (push-mark nil t t)
! 	   (backward-paragraph numeric-arg)))))
  
  (defun kill-paragraph (arg)
    "Kill forward to end of paragraph.

Diff finished.  Mon Oct 27 00:22:49 2014


-- 
Best wishes
H. Dieter Wilhelm
Darmstadt, Germany





^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#18847: 24.4; Inconsistent behaviour of M-h with negative arguments
  2014-10-26 23:27 bug#18847: 24.4; Inconsistent behaviour of M-h with negative arguments H. Dieter Wilhelm
@ 2014-10-27  7:37 ` H. Dieter Wilhelm
  2014-10-28 17:04 ` Stefan Monnier
  1 sibling, 0 replies; 7+ messages in thread
From: H. Dieter Wilhelm @ 2014-10-27  7:37 UTC (permalink / raw)
  To: 18847

dieter@duenenhof-wilhelm.de (H. Dieter Wilhelm) writes:

> Hello,
>
> please try M-- M-h M-h M-h.
>
> below some paragraphs.  The behaviour is not in line with the other
> marking commands like M-@, ...
>
> Here's a suggestion and a matching patch:

I'm sorry, I overlooked a special case:

(defun mark-paragraph (&optional arg allow-extend)
  "Put mark at beginning of this paragraph,  point at end.
The paragraph marked is the one that contains point or follows
point.

With argument ARG, puts mark at the end of this or a following
paragraph, so that the number of paragraphs marked equals ARG.
 
If ARG is negative, point is put at the beginning of this
paragraph, mark is put at the end of this or a previous
paragraph.

Interactively, if this command is repeated or (in Transient Mark
Mode) if the mark is active, it marks the next ARG paragraphs
after the region already marked.  This also means when activating
the mark immediately before using this command, the current
paragraph is only marked from point."
  (interactive "P\np")
  (let ((numeric-arg (prefix-numeric-value arg)))
    (cond ((eobp)			; smart-aleck?
	   (backward-paragraph (abs numeric-arg))
	   (push-mark nil t t)
	   (forward-paragraph (abs numeric-arg)))
	  ((and allow-extend
		(or (region-active-p)
		    (and (eq last-command this-command) mark-active)))
	   (if arg
	       (setq arg numeric-arg)
	     (if (< (mark) (point))
		 (setq arg -1)
	       (setq arg 1)))
	   (set-mark
	    (save-excursion
	      (goto-char (mark))
	      (forward-paragraph arg)
	      (point))))
	  ((zerop numeric-arg)
	   (message "Will not mark zero paragraphs."))
	  (t
	   (forward-paragraph numeric-arg)
	   (push-mark nil t t)
	   (backward-paragraph numeric-arg)))))


diff -c /usr/local/src/emacs-24.4/lisp/textmodes/paragraphs.el /usr/local/src/emacs/lisp/textmodes/paragraphs.el
*** /usr/local/src/emacs-24.4/lisp/textmodes/paragraphs.el	2014-03-21 06:34:40.000000000 +0100
--- /usr/local/src/emacs/lisp/textmodes/paragraphs.el	2014-10-27 08:31:27.457755345 +0100
***************
*** 370,403 ****
    (forward-paragraph (- arg)))
  
  (defun mark-paragraph (&optional arg allow-extend)
!   "Put point at beginning of this paragraph, mark at end.
! The paragraph marked is the one that contains point or follows point.
  
! With argument ARG, puts mark at end of a following paragraph, so that
! the number of paragraphs marked equals ARG.
  
! If ARG is negative, point is put at end of this paragraph, mark is put
! at beginning of this or a previous paragraph.
  
! Interactively (or if ALLOW-EXTEND is non-nil), if this command is
! repeated or (in Transient Mark mode) if the mark is active,
! it marks the next ARG paragraphs after the ones already marked."
!   (interactive "p\np")
!   (unless arg (setq arg 1))
!   (when (zerop arg)
!     (error "Cannot mark zero paragraphs"))
!   (cond ((and allow-extend
! 	      (or (and (eq last-command this-command) (mark t))
! 		  (and transient-mark-mode mark-active)))
! 	 (set-mark
! 	  (save-excursion
! 	    (goto-char (mark))
! 	    (forward-paragraph arg)
! 	    (point))))
! 	(t
! 	 (forward-paragraph arg)
! 	 (push-mark nil t t)
! 	 (backward-paragraph arg))))
  
  (defun kill-paragraph (arg)
    "Kill forward to end of paragraph.
--- 370,416 ----
    (forward-paragraph (- arg)))
  
  (defun mark-paragraph (&optional arg allow-extend)
!   "Put mark at beginning of this paragraph,  point at end.
! The paragraph marked is the one that contains point or follows
! point.
  
! With argument ARG, puts mark at the end of this or a following
! paragraph, so that the number of paragraphs marked equals ARG.
  
! If ARG is negative, point is put at the beginning of this
! paragraph, mark is put at the end of this or a previous
! paragraph.
  
! Interactively, if this command is repeated or (in Transient Mark
! Mode) if the mark is active, it marks the next ARG paragraphs
! after the region already marked.  This also means when activating
! the mark immediately before using this command, the current
! paragraph is only marked from point."
!   (interactive "P\np")
!   (let ((numeric-arg (prefix-numeric-value arg)))
!     (cond ((eobp)			; smart-aleck?
! 	   (backward-paragraph (abs numeric-arg))
! 	   (push-mark nil t t)
! 	   (forward-paragraph (abs numeric-arg)))
! 	  ((and allow-extend
! 		(or (region-active-p)
! 		    (and (eq last-command this-command) mark-active)))
! 	   (if arg
! 	       (setq arg numeric-arg)
! 	     (if (< (mark) (point))
! 		 (setq arg -1)
! 	       (setq arg 1)))
! 	   (set-mark
! 	    (save-excursion
! 	      (goto-char (mark))
! 	      (forward-paragraph arg)
! 	      (point))))
! 	  ((zerop numeric-arg)
! 	   (message "Will not mark zero paragraphs."))
! 	  (t
! 	   (forward-paragraph numeric-arg)
! 	   (push-mark nil t t)
! 	   (backward-paragraph numeric-arg)))))
  
  (defun kill-paragraph (arg)
    "Kill forward to end of paragraph.

Diff finished.  Mon Oct 27 08:31:56 2014



> (defun mark-paragraph (&optional arg allow-extend)
>   "Put mark at beginning of this paragraph,  point at end.
> The paragraph marked is the one that contains point or follows
> point. 
>
> With argument ARG, puts mark at the end of a following paragraph,
> so that the number of paragraphs marked equals ARG.
>
> If ARG is negative, point is put at the beginning of this
> paragraph, mark is put at the end of this or a previous
> paragraph.
>
> Interactively, if this command is repeated or (in Transient Mark
> Mode) if the mark is active, it marks the next ARG paragraphs
> after the ones already marked.  This means when activating the
> mark before using this command, the current paragraph is only
> marked from point."
>   (interactive "P\np")
>   (let ((numeric-arg (prefix-numeric-value arg)))
>     (cond ((eobp)			; smart-aleck?
> 	   (backward-paragraph (abs numeric-arg))
> 	   (push-mark nil t t)
> 	   (forward-paragraph (abs numeric-arg)))
> 	  ((and allow-extend ;we already called this function or have
> 			     ;a (possibly empty) region
> 		(or (eq last-command this-command)
> 		    (region-active-p)))
> 	   (if arg
> 	       (setq arg numeric-arg)
> 	     (if (< (mark) (point))
> 		 (setq arg -1)
> 	       (setq arg 1)))
> 	   (set-mark
> 	    (save-excursion
> 	      (goto-char (mark))
> 	      (forward-paragraph arg)
> 	      (point))))
> 	  ((zerop numeric-arg)		
> 	   (message "Will not mark zero paragraphs."))
> 	  (t
> 	   (forward-paragraph numeric-arg)
> 	   (push-mark nil t t)
> 	   (backward-paragraph numeric-arg)))))
>
>
> Thank you for your troubles!
>
> diff -c /usr/local/src/emacs-24.4/lisp/textmodes/paragraphs.el /usr/local/src/emacs/lisp/textmodes/paragraphs.el
> *** /usr/local/src/emacs-24.4/lisp/textmodes/paragraphs.el	2014-03-21 06:34:40.000000000 +0100
> --- /usr/local/src/emacs/lisp/textmodes/paragraphs.el	2014-10-27 00:22:41.874845901 +0100
> ***************
> *** 370,403 ****
>     (forward-paragraph (- arg)))
>   
>   (defun mark-paragraph (&optional arg allow-extend)
> !   "Put point at beginning of this paragraph, mark at end.
> ! The paragraph marked is the one that contains point or follows point.
>   
> ! With argument ARG, puts mark at end of a following paragraph, so that
> ! the number of paragraphs marked equals ARG.
>   
> ! If ARG is negative, point is put at end of this paragraph, mark is put
> ! at beginning of this or a previous paragraph.
>   
> ! Interactively (or if ALLOW-EXTEND is non-nil), if this command is
> ! repeated or (in Transient Mark mode) if the mark is active,
> ! it marks the next ARG paragraphs after the ones already marked."
> !   (interactive "p\np")
> !   (unless arg (setq arg 1))
> !   (when (zerop arg)
> !     (error "Cannot mark zero paragraphs"))
> !   (cond ((and allow-extend
> ! 	      (or (and (eq last-command this-command) (mark t))
> ! 		  (and transient-mark-mode mark-active)))
> ! 	 (set-mark
> ! 	  (save-excursion
> ! 	    (goto-char (mark))
> ! 	    (forward-paragraph arg)
> ! 	    (point))))
> ! 	(t
> ! 	 (forward-paragraph arg)
> ! 	 (push-mark nil t t)
> ! 	 (backward-paragraph arg))))
>   
>   (defun kill-paragraph (arg)
>     "Kill forward to end of paragraph.
> --- 370,417 ----
>     (forward-paragraph (- arg)))
>   
>   (defun mark-paragraph (&optional arg allow-extend)
> !   "Put mark at beginning of this paragraph,  point at end.
> ! The paragraph marked is the one that contains point or follows
> ! point.
>   
> ! With argument ARG, puts mark at the end of a following paragraph,
> ! so that the number of paragraphs marked equals ARG.
>   
> ! If ARG is negative, point is put at the beginning of this
> ! paragraph, mark is put at the end of this or a previous
> ! paragraph.
>   
> ! Interactively, if this command is repeated or (in Transient Mark
> ! Mode) if the mark is active, it marks the next ARG paragraphs
> ! after the ones already marked.  This means when activating the
> ! mark before using this command, the current paragraph is only
> ! marked from point."
> !   (interactive "P\np")
> !   (let ((numeric-arg (prefix-numeric-value arg)))
> !     (cond ((eobp)			; smart-aleck?
> ! 	   (backward-paragraph (abs numeric-arg))
> ! 	   (push-mark nil t t)
> ! 	   (forward-paragraph (abs numeric-arg)))
> ! 	  ((and allow-extend ;we already called this function or have
> ! 			     ;a (possibly empty) region
> ! 		(or (eq last-command this-command)
> ! 		    (region-active-p)))
> ! 	   (if arg
> ! 	       (setq arg numeric-arg)
> ! 	     (if (< (mark) (point))
> ! 		 (setq arg -1)
> ! 	       (setq arg 1)))
> ! 	   (set-mark
> ! 	    (save-excursion
> ! 	      (goto-char (mark))
> ! 	      (forward-paragraph arg)
> ! 	      (point))))
> ! 	  ((zerop numeric-arg)
> ! 	   (message "Will not mark zero paragraphs."))
> ! 	  (t
> ! 	   (forward-paragraph numeric-arg)
> ! 	   (push-mark nil t t)
> ! 	   (backward-paragraph numeric-arg)))))
>   
>   (defun kill-paragraph (arg)
>     "Kill forward to end of paragraph.
>
> Diff finished.  Mon Oct 27 00:22:49 2014

-- 
Best wishes
H. Dieter Wilhelm
Darmstadt, Germany






^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#18847: 24.4; Inconsistent behaviour of M-h with negative arguments
  2014-10-26 23:27 bug#18847: 24.4; Inconsistent behaviour of M-h with negative arguments H. Dieter Wilhelm
  2014-10-27  7:37 ` H. Dieter Wilhelm
@ 2014-10-28 17:04 ` Stefan Monnier
       [not found]   ` <87oasvq1ja.fsf@vsl28t2g.ww011>
  1 sibling, 1 reply; 7+ messages in thread
From: Stefan Monnier @ 2014-10-28 17:04 UTC (permalink / raw)
  To: H. Dieter Wilhelm; +Cc: 18847

> please try M-- M-h M-h M-h.
> below some paragraphs.  The behaviour is not in line with the other
> marking commands like M-@, ...

Could you give more details about which differences you're thinking of?
I have my ideas, but they don't seem to match yours, at least based on
my reading of your patch.


        Stefan





^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#18847: 24.4; Inconsistent behaviour of M-h with negative arguments
       [not found]   ` <87oasvq1ja.fsf@vsl28t2g.ww011>
@ 2014-10-30 16:35     ` Stefan Monnier
  2014-11-03 17:56       ` H. Dieter Wilhelm
  0 siblings, 1 reply; 7+ messages in thread
From: Stefan Monnier @ 2014-10-30 16:35 UTC (permalink / raw)
  To: H. Dieter Wilhelm; +Cc: 18847

[ Be careful to keep 18847@debbugs.gnu.org in the Cc, please.  ]

> 1) The sole real bug - in my opinion - is that M-h doesn't retain the
>    "marking direction" from a negative argument when repeating.

OK, I agree with this, it's a plain bug.

> 2) When applying M-h (or any other marking command) at the end of a
>    buffer (at least interactively, I failed to address this), the right
>    thing to do is marking (a) previous element(s).  I would like to know
>    if you find this a good idea.

I have no opinion on this, I never use M-h myself.

> 3) M-h (C-M-h and C-x C-p ) differ from C-@ and C-M-@ that they are
>    always marking (a) whole element(s).  I wanted to clarify in the
>    documentation string that a marking from point is also achievable
>    with M-h.

So this part is just a docstring change, right?

> 4) M-h does signal an error applying zero as an argument, the other
>    marking commands just ignore zero, so I thought a message might be a
>    good compromise to the current state...

I have no opinion on this one either.  It doesn't seem terribly
important, so reducing discrepancies in this case might be the
dominating factor.


        Stefan





^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#18847: 24.4; Inconsistent behaviour of M-h with negative arguments
  2014-10-30 16:35     ` Stefan Monnier
@ 2014-11-03 17:56       ` H. Dieter Wilhelm
  2014-11-15 19:13         ` H. Dieter Wilhelm
  0 siblings, 1 reply; 7+ messages in thread
From: H. Dieter Wilhelm @ 2014-11-03 17:56 UTC (permalink / raw)
  To: Stefan Monnier; +Cc: 18847

Stefan Monnier <monnier@IRO.UMontreal.CA> writes:

> [ Be careful to keep 18847@debbugs.gnu.org in the Cc, please.  ]

Sorry, I overlooked the Cc field.

....

>> 2) When applying M-h (or any other marking command) at the end of a
>>    buffer (at least interactively, I failed to address this), the right
>>    thing to do is marking (a) previous element(s).  I would like to know
>>    if you find this a good idea.
>
> I have no opinion on this, I never use M-h myself.

Interesting, no M-h!  Anyway, in the meantime I tested M-h more
thoroughly in these borderline cases and I think its behaviour is
actually not correct.  I suggest to separate this issue and possible
enhancements from the current subject.

>> 3) M-h (C-M-h and C-x C-p ) differ from C-@ and C-M-@ that they are
>>    always marking (a) whole element(s).  I wanted to clarify in the
>>    documentation string that a marking from point is also achievable
>>    with M-h.
>
> So this part is just a docstring change, right?

Exactly.

>> 4) M-h does signal an error applying zero as an argument, the other
>>    marking commands just ignore zero, so I thought a message might be a
>>    good compromise to the current state...
>
> I have no opinion on this one either.  It doesn't seem terribly
> important, so reducing discrepancies in this case might be the
> dominating factor.

Right, I dropped the zero argument message. (But still inhibited M-h to
activate the mark in this situation.)

Thank you for your patience

       Dieter


(defun mark-paragraph (&optional arg allow-extend)
  "Put point at beginning of this paragraph, mark at end.
The paragraph marked is the one that contains point or follows
point.

With argument ARG, puts mark at the end of this or a following
paragraph, so that the number of paragraphs marked equals ARG.

If ARG is negative, point is put at the end of this paragraph,
mark is put at the beginning of this or a previous paragraph.

Interactively (or if ALLOW-EXTEND is non-nil), if this command is
repeated or (in Transient Mark mode) if the mark is active, it
marks the next ARG paragraphs after the region already marked.
This also means when activating the mark immediately before using
this command, the current paragraph is only marked from point."
  (interactive "P\np")
  (let ((numeric-arg (prefix-numeric-value arg)))
    (cond ((zerop numeric-arg))
	  ((and allow-extend
		(or (and (eq last-command this-command) mark-active)
		    (region-active-p)))
	   (if arg
	       (setq arg numeric-arg)
	     (if (< (mark) (point))
		 (setq arg -1)
	       (setq arg 1)))
	   (set-mark
	    (save-excursion
	      (goto-char (mark))
	      (forward-paragraph arg)
	      (point))))
	  (t
	   (forward-paragraph numeric-arg)
	   (push-mark nil t t)
	   (backward-paragraph numeric-arg)))))

diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index 3e77d37..e1a735d 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -370,34 +370,47 @@ See `forward-paragraph' for more information."
   (forward-paragraph (- arg)))
 
 (defun mark-paragraph (&optional arg allow-extend)
-  "Put point at beginning of this paragraph, mark at end.
-The paragraph marked is the one that contains point or follows point.
-
-With argument ARG, puts mark at end of a following paragraph, so that
-the number of paragraphs marked equals ARG.
-
-If ARG is negative, point is put at end of this paragraph, mark is put
-at beginning of this or a previous paragraph.
-
-Interactively (or if ALLOW-EXTEND is non-nil), if this command is
-repeated or (in Transient Mark mode) if the mark is active,
-it marks the next ARG paragraphs after the ones already marked."
-  (interactive "p\np")
-  (unless arg (setq arg 1))
-  (when (zerop arg)
-    (error "Cannot mark zero paragraphs"))
-  (cond ((and allow-extend
-	      (or (and (eq last-command this-command) (mark t))
-		  (and transient-mark-mode mark-active)))
-	 (set-mark
-	  (save-excursion
-	    (goto-char (mark))
-	    (forward-paragraph arg)
-	    (point))))
-	(t
-	 (forward-paragraph arg)
-	 (push-mark nil t t)
-	 (backward-paragraph arg))))
+  "Put mark at beginning of this paragraph,  point at end.
+The paragraph marked is the one that contains point or follows
+point.
+
+With argument ARG, puts mark at the end of this or a following
+paragraph, so that the number of paragraphs marked equals ARG.
+
+If ARG is negative, point is put at the beginning of this
+paragraph, mark is put at the end of this or a previous
+paragraph.
+
+Interactively, if this command is repeated or (in Transient Mark
+Mode) if the mark is active, it marks the next ARG paragraphs
+after the region already marked.  This also means when activating
+the mark immediately before using this command, the current
+paragraph is only marked from point."
+  (interactive "P\np")
+  (let ((numeric-arg (prefix-numeric-value arg)))
+    (cond ((eobp)			; smart-aleck?
+	   (backward-paragraph (abs numeric-arg))
+	   (push-mark nil t t)
+	   (forward-paragraph (abs numeric-arg)))
+	  ((and allow-extend
+		(or (region-active-p)
+		    (and (eq last-command this-command) mark-active)))
+	   (if arg
+	       (setq arg numeric-arg)
+	     (if (< (mark) (point))
+		 (setq arg -1)
+	       (setq arg 1)))
+	   (set-mark
+	    (save-excursion
+	      (goto-char (mark))
+	      (forward-paragraph arg)
+	      (point))))
+	  ((zerop numeric-arg)
+	   (message "Will not mark zero paragraphs."))
+	  (t
+	   (forward-paragraph numeric-arg)
+	   (push-mark nil t t)
+	   (backward-paragraph numeric-arg)))))
 
 (defun kill-paragraph (arg)
   "Kill forward to end of paragraph.



-- 
Best wishes
H. Dieter Wilhelm
Darmstadt, Germany





^ permalink raw reply related	[flat|nested] 7+ messages in thread

* bug#18847: 24.4; Inconsistent behaviour of M-h with negative arguments
  2014-11-03 17:56       ` H. Dieter Wilhelm
@ 2014-11-15 19:13         ` H. Dieter Wilhelm
  2020-08-13  9:51           ` Lars Ingebrigtsen
  0 siblings, 1 reply; 7+ messages in thread
From: H. Dieter Wilhelm @ 2014-11-15 19:13 UTC (permalink / raw)
  To: Stefan Monnier; +Cc: 18847


The following patches

1) solve bug#18847 (when applying M-h with negative arguments and
   repeating this command)

2) solve another - not reported - bug.  When, e.g. at the end of the
   buffer, the numbers of paragraphs left in the buffer is less than
   ARG, then paragraphs are also marked *before* the current paragraph
   (contradicting the function's documentation)

3) (hopefully) clarifying a bit the documentation of mark-paragraph

4) aligning the behaviour of a zero argument to other marking commands
   (doing nothing, no error signal)

It still remains one anomaly - in my opinon - but only for a fringe
case, at the moment C-h and forward/backward-paragraph consider empty
lines at the end or the beginning of the buffer as an additional
paragraph...

Anyway, could some good soul apply the patches to emacs-24?

Thank you

      Dieter

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a6ab3b8..463753c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-15  H. Dieter Wilhelm <dieter@duenenhof-wilhelm.de>
+	* textmodes/paragraph.el (mark-paragraph): Handling of
+	negative arguments (bug#18847)
+
 2014-11-14  Ivan Andrus  <darthandrus@gmail.com>
 
 	* progmodes/python.el (python-ffap-module-path): Use


diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index 3e77d37..d17cf09 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -371,33 +371,47 @@ See `forward-paragraph' for more information."
 
 (defun mark-paragraph (&optional arg allow-extend)
   "Put point at beginning of this paragraph, mark at end.
-The paragraph marked is the one that contains point or follows point.
+The paragraph marked is the one that contains point or follows
+point.
 
-With argument ARG, puts mark at end of a following paragraph, so that
-the number of paragraphs marked equals ARG.
+With argument ARG, puts mark at the end of this or a following
+paragraph, so that the number of paragraphs marked equals ARG.
 
-If ARG is negative, point is put at end of this paragraph, mark is put
-at beginning of this or a previous paragraph.
+If ARG is negative, point is put at the end of this paragraph,
+mark is put at the beginning of this or a previous paragraph.
 
 Interactively (or if ALLOW-EXTEND is non-nil), if this command is
-repeated or (in Transient Mark mode) if the mark is active,
-it marks the next ARG paragraphs after the ones already marked."
-  (interactive "p\np")
-  (unless arg (setq arg 1))
-  (when (zerop arg)
-    (error "Cannot mark zero paragraphs"))
-  (cond ((and allow-extend
-	      (or (and (eq last-command this-command) (mark t))
-		  (and transient-mark-mode mark-active)))
-	 (set-mark
-	  (save-excursion
-	    (goto-char (mark))
-	    (forward-paragraph arg)
-	    (point))))
-	(t
-	 (forward-paragraph arg)
-	 (push-mark nil t t)
-	 (backward-paragraph arg))))
+repeated or (in Transient Mark mode) if the mark is active, it
+marks the next ARG paragraphs after the region already marked.
+This also means when activating the mark immediately before using
+this command, the current paragraph is only marked from point."
+  (interactive "P\np")
+  (let ((numeric-arg (prefix-numeric-value arg)))
+    (cond ((zerop numeric-arg))
+	  ((and allow-extend
+		(or (and (eq last-command this-command) mark-active)
+		    (region-active-p)))
+	   (if arg
+	       (setq arg numeric-arg)
+	     (if (< (mark) (point))
+		 (setq arg -1)
+	       (setq arg 1)))
+	   (set-mark
+	    (save-excursion
+	      (goto-char (mark))
+	      (forward-paragraph arg)
+	      (point))))
+	  ;; don't activate the mark when at eob
+	  ((and (eobp) (> numeric-arg 0)))
+	  (t
+	   (unless (save-excursion
+		     (forward-line 0)
+		     (looking-at  paragraph-start))
+	     (backward-paragraph (signum numeric-arg)))
+	   (push-mark
+	    (save-excursion
+	      (forward-paragraph numeric-arg)
+	      (point)) t t)))))
 
 (defun kill-paragraph (arg)
   "Kill forward to end of paragraph.



-- 
Best wishes
H. Dieter Wilhelm
Darmstadt, Germany





^ permalink raw reply related	[flat|nested] 7+ messages in thread

* bug#18847: 24.4; Inconsistent behaviour of M-h with negative arguments
  2014-11-15 19:13         ` H. Dieter Wilhelm
@ 2020-08-13  9:51           ` Lars Ingebrigtsen
  0 siblings, 0 replies; 7+ messages in thread
From: Lars Ingebrigtsen @ 2020-08-13  9:51 UTC (permalink / raw)
  To: H. Dieter Wilhelm; +Cc: Stefan Monnier, 18847

dieter@duenenhof-wilhelm.de (H. Dieter Wilhelm) writes:

> The following patches
>
> 1) solve bug#18847 (when applying M-h with negative arguments and
>    repeating this command)
>
> 2) solve another - not reported - bug.  When, e.g. at the end of the
>    buffer, the numbers of paragraphs left in the buffer is less than
>    ARG, then paragraphs are also marked *before* the current paragraph
>    (contradicting the function's documentation)
>
> 3) (hopefully) clarifying a bit the documentation of mark-paragraph
>
> 4) aligning the behaviour of a zero argument to other marking commands
>    (doing nothing, no error signal)

Thanks; I've now applied this patch to Emacs 28 (with some small
whitespace changes).

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no





^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-08-13  9:51 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-26 23:27 bug#18847: 24.4; Inconsistent behaviour of M-h with negative arguments H. Dieter Wilhelm
2014-10-27  7:37 ` H. Dieter Wilhelm
2014-10-28 17:04 ` Stefan Monnier
     [not found]   ` <87oasvq1ja.fsf@vsl28t2g.ww011>
2014-10-30 16:35     ` Stefan Monnier
2014-11-03 17:56       ` H. Dieter Wilhelm
2014-11-15 19:13         ` H. Dieter Wilhelm
2020-08-13  9:51           ` Lars Ingebrigtsen

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).