From beaa7e14f39734eae845aa23b32b854338308ba1 Mon Sep 17 00:00:00 2001 From: Tom Levy Date: Tue, 9 Nov 2021 12:51:48 +0000 Subject: [PATCH] ; 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") (bug#51718). 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 023d026a6c6..8295a8e6ad4 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 cb14d02d449..afb9dfcb9ec 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -1451,7 +1451,7 @@ is not a function, e.g., a keyboard macro (@pxref{Keyboard Macros}): @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 49fc60431f6..97c84ae5a18 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el @@ -983,9 +983,9 @@ STARTUP-HOOKS is a list of functions that Emacs calls without 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.39.2