bug#51718: [PATCH] Small miscellaneous fixes (undo-redo, typos)

bug#51718: [PATCH] Small miscellaneous fixes (undo-redo, typos)

[Tom Levy]

[-- Attachment #1.1: Type: text/plain, Size: 59 bytes --]

Hi,

I've attached a couple of small patches.

Cheers,
Tom

[-- Attachment #1.2: Type: text/html, Size: 157 bytes --]

[-- Attachment #2: 0002-Remove-spurious-S-from-define-error-messages.patch --]
[-- Type: text/x-patch, Size: 1800 bytes --]

From b6dfa7353879e6ad78e008f0407b2ed3f882829c Mon Sep 17 00:00:00 2001
From: Tom Levy <tomlevy93@gmail.com>
Date: Tue, 9 Nov 2021 12:25:24 +0000
Subject: [PATCH 2/3] Remove spurious %S from 'define-error' messages

; The MESSAGE arg of 'define-error' does not support format specifiers
; (unlike the 'error' function). The signal data is automatically
; appended to the error message.

* lisp/emacs/lisp/cl-generic.el (cl--generic-cyclic-definition):
Remove spurious %S from error message.
* lisp/emacs-lisp/gv.el (gv-invalid-place): Remove spurious %S from
error message (and rephrase).

Copyright-paperwork-exempt: yes
---
 lisp/emacs-lisp/cl-generic.el | 2 +-
 lisp/emacs-lisp/gv.el         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index 3f75cf9922..9de47e4987 100644
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -687,7 +687,7 @@ cl--generic-combined-method-memoization
 of methods, since this table then allows us to share a single combined-method
 for all those different tags in the method-cache.")
 
-(define-error 'cl--generic-cyclic-definition "Cyclic definition: %S")
+(define-error 'cl--generic-cyclic-definition "Cyclic definition")
 
 (defun cl--generic-build-combined-method (generic methods)
   (if (null methods)
diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el
index d6272a5246..ebcc63cc2a 100644
--- a/lisp/emacs-lisp/gv.el
+++ b/lisp/emacs-lisp/gv.el
@@ -74,7 +74,7 @@
 ;; (defvar gv--macro-environment nil
 ;;   "Macro expanders for generalized variables.")
 
-(define-error 'gv-invalid-place "%S is not a valid place expression")
+(define-error 'gv-invalid-place "Invalid place expression")
 
 ;;;###autoload
 (defun gv-get (place do)
-- 
2.30.2


[-- Attachment #3: 0003-Fix-typos-in-CONTRIBUTE-ELisp-manual-ediff.patch --]
[-- Type: text/x-patch, Size: 2266 bytes --]

From 2d2073cbd3b4fab8e0f3d8c1dc29ff7ade0c8002 Mon Sep 17 00:00:00 2001
From: Tom Levy <tomlevy93@gmail.com>
Date: Tue, 9 Nov 2021 12:51:48 +0000
Subject: [PATCH 3/3] ; Fix typos in CONTRIBUTE, ELisp manual, ediff

* CONTRIBUTE: Remove stray '. after git command.
* doc/lispref/functions.texi (Function Cells): Fix typo.
* lisp/vc/ediff.el (ediff-regions-wordwise): Fix typo in prompts
("Region's A buffer" => "Region A's buffer").

Copyright-paperwork-exempt: yes
---
 CONTRIBUTE                 | 2 +-
 doc/lispref/functions.texi | 2 +-
 lisp/vc/ediff.el           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTE b/CONTRIBUTE
index 023d026a6c..8295a8e6ad 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -58,7 +58,7 @@ format and whitespace are not munged in transit by the various mail
 agents.  To send just one such patch without additional remarks, it is
 also possible to use a command like
 
-  git send-email --to=bug-gnu-emacs@gnu.org 0001-DESCRIPTION.patch'.
+  git send-email --to=bug-gnu-emacs@gnu.org 0001-DESCRIPTION.patch
 
 However, we prefer the 'git format-patch' method with attachment, as
 doing so delivers patches in the correct and easily-recognizable format
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 8f98ac935c..9c1fde06b5 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -1450,7 +1450,7 @@ Function Cells
      @result{} "\^u2\^k"
 @end example
 
-It you wish to use @code{fset} to make an alternate name for a
+If you wish to use @code{fset} to make an alternate name for a
 function, consider using @code{defalias} instead.  @xref{Definition of
 defalias}.
 @end defun
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 49fc60431f..97c84ae5a1 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -983,9 +983,9 @@ ediff-regions-wordwise
 arguments after setting up the Ediff buffers."
   (interactive
    (let (bf)
-     (list (setq bf (read-buffer "Region's A buffer: "
+     (list (setq bf (read-buffer "Region A's buffer: "
 				 (ediff-other-buffer "") t))
-	   (read-buffer "Region's B buffer: "
+	   (read-buffer "Region B's buffer: "
 			(progn
 			  ;; realign buffers so that two visible bufs will be
 			  ;; at the top
-- 
2.30.2


[-- Attachment #4: 0001-Allow-undo-redo-to-be-called-from-Lisp-without-repea.patch --]
[-- Type: text/x-patch, Size: 983 bytes --]

From ba7c81e893f4a196a1971dc3d41345c3fd343a97 Mon Sep 17 00:00:00 2001
From: Tom Levy <tomlevy93@gmail.com>
Date: Tue, 9 Nov 2021 12:05:28 +0000
Subject: [PATCH 1/3] Allow 'undo-redo' to be called from Lisp without repeat
 count

* lisp/simple.el (undo-redo): Default arg to 1 to avoid error when
called from Lisp without args.

Copyright-paperwork-exempt: yes
---
 lisp/simple.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/simple.el b/lisp/simple.el
index 82e373be9e..ad6d28cb14 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3114,7 +3114,7 @@ undo-redo
             (let ((undo-in-progress t))
               (while (and (consp ul) (eq (car ul) nil))
                 (setq ul (cdr ul)))
-              (primitive-undo arg ul)))
+              (primitive-undo (or arg 1) ul)))
            (new-pul (undo--last-change-was-undo-p new-ul)))
       (message "Redo%s" (if undo-in-region " in region" ""))
       (setq this-command 'undo)
-- 
2.30.2

bug#51718: [PATCH] Small miscellaneous fixes (undo-redo, typos)

[Lars Ingebrigtsen]

Tom Levy <tomlevy93@gmail.com> writes:

> I've attached a couple of small patches.

Thanks; I've applied the undo-redo/define-error ones to the trunk and
the typo fix to emacs-28.

These changes were small enough to apply without assigning copyright to
the FSF, but for future patches you want to submit, it might make sense
to get the paperwork started now, so that subsequent patches can be
applied speedily. Would you be willing to sign such paperwork?

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

bug#51718: [PATCH] Small miscellaneous fixes (undo-redo, typos)

[Tom Levy]

Hi Lars,

Thanks for applying the patches.

I'm willing to assign copyright to the FSF. I'll start the process as
described in CONTRIBUTE.

Cheers,
Tom


On Wed, 10 Nov 2021 at 13:17, Lars Ingebrigtsen <larsi@gnus.org> wrote:
>
> Tom Levy <tomlevy93@gmail.com> writes:
>
> > I've attached a couple of small patches.
>
> Thanks; I've applied the undo-redo/define-error ones to the trunk and
> the typo fix to emacs-28.
>
> These changes were small enough to apply without assigning copyright to
> the FSF, but for future patches you want to submit, it might make sense
> to get the paperwork started now, so that subsequent patches can be
> applied speedily. Would you be willing to sign such paperwork?
>
> --
> (domestic pets only, the antidote for overdose, milk.)
>    bloggy blog: http://lars.ingebrigtsen.no

bug#51718: [PATCH] Small miscellaneous fixes (undo-redo, typos)

[Lars Ingebrigtsen]

Tom Levy <tomlevy93@gmail.com> writes:

> I'm willing to assign copyright to the FSF. I'll start the process as
> described in CONTRIBUTE.

Great!

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