From a6240c823350245734bd35335a0affb41ec86d8a Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 21 Aug 2021 15:43:06 +0200
Subject: Clarify how to do the `count-words-in-defun' recipe
* doc/lispintro/emacs-lisp-intro.texi (count-words-in-defun):
Clarify the recipe (bug#15069).
---
doc/lispintro/emacs-lisp-intro.texi | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'doc/lispintro/emacs-lisp-intro.texi')
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index fade4096e38..dc182a7a454 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -14650,7 +14650,9 @@ Let's re-use @kbd{C-c =} as a convenient keybinding:
Now we can try out @code{count-words-defun}: install both
@code{count-words-in-defun} and @code{count-words-defun}, and set the
-keybinding, and then place the cursor within the following definition:
+keybinding. Then copy the following to an Emacs Lisp buffer (like,
+for instance, @samp{*scratch*}), place the cursor within the
+definition, and use the @kbd{C-c =} command.
@smallexample
@group
--
cgit v1.2.3
From 28019ccf0ce035f4dd842375594da1380b09e806 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 21 Aug 2021 17:15:43 +0300
Subject: ; Fix Texinfo markup of a recent change
* doc/lispintro/emacs-lisp-intro.texi (count-words-in-defun): Fix
last change.
---
doc/lispintro/emacs-lisp-intro.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'doc/lispintro/emacs-lisp-intro.texi')
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index dc182a7a454..7933ebe58c2 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -14651,7 +14651,7 @@ Let's re-use @kbd{C-c =} as a convenient keybinding:
Now we can try out @code{count-words-defun}: install both
@code{count-words-in-defun} and @code{count-words-defun}, and set the
keybinding. Then copy the following to an Emacs Lisp buffer (like,
-for instance, @samp{*scratch*}), place the cursor within the
+for instance, @file{*scratch*}), place the cursor within the
definition, and use the @kbd{C-c =} command.
@smallexample
--
cgit v1.2.3
From bcf59b99f43be4f40be1ff85d0281d660a8dd731 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Thu, 16 Sep 2021 15:33:35 +0200
Subject: Prefer "website" to "homepage"
These days, a "home page" is understood to be only "the main web page
of a website" or "landing page", whereas a "website" is "a collection
of web pages and related content" (Wikipedia).
* doc/emacs/emacs.texi (Top):
* doc/emacs/package.texi (Package Menu):
* doc/lispintro/emacs-lisp-intro.texi (Top):
* doc/lispref/elisp.texi (Top):
* doc/lispref/tips.texi (Documentation Tips):
* doc/misc/ede.texi (ede-project):
* doc/misc/efaq-w32.texi (More information):
* doc/misc/gnus-faq.texi (FAQ 5-7):
* doc/misc/gnus.texi (About mairix):
* doc/misc/mairix-el.texi (About):
* doc/misc/reftex.texi (AUCTeX, Imprint):
* lisp/cedet/ede/base.el (ede-project):
* lisp/cedet/ede/system.el (ede-web-browse-home):
* lisp/emacs-lisp/package.el (package-menu-mode-menu)
(package-browse-url):
* lisp/erc/erc-button.el (erc-emacswiki-url):
* lisp/filesets.el (filesets-goto-homepage):
* lisp/net/mairix.el:
* lisp/net/webjump.el (webjump-sample-sites):
* lisp/obsolete/vc-arch.el:
* lisp/progmodes/idlw-shell.el (idlwave-shell-mode):
* lisp/progmodes/idlwave.el (idlwave, idlwave-mode):
* lisp/textmodes/reftex-vars.el (reftex):
Prefer "website" to "home page".
* doc/lispref/tips.texi (Documentation Tips):
Sort the "URL" header comment before "Homepage".
* lisp/emacs-lisp/lisp-mnt.el
(lm-website): Rename from 'lm-homepage'.
(lm-homepage): Make into alias for 'lm-website'.
---
doc/emacs/emacs.texi | 2 +-
doc/emacs/package.texi | 2 +-
doc/lispintro/emacs-lisp-intro.texi | 2 +-
doc/lispref/elisp.texi | 2 +-
doc/lispref/tips.texi | 8 ++++----
doc/misc/ede.texi | 2 +-
doc/misc/efaq-w32.texi | 2 +-
doc/misc/gnus-faq.texi | 2 +-
doc/misc/gnus.texi | 2 +-
doc/misc/mairix-el.texi | 2 +-
doc/misc/reftex.texi | 4 ++--
lisp/cedet/ede/base.el | 4 ++--
lisp/cedet/ede/system.el | 2 +-
lisp/emacs-lisp/lisp-mnt.el | 7 ++++---
lisp/emacs-lisp/package.el | 8 ++++----
lisp/erc/erc-button.el | 2 +-
lisp/filesets.el | 2 +-
lisp/net/mairix.el | 2 +-
lisp/net/webjump.el | 4 ++--
lisp/obsolete/vc-arch.el | 2 +-
lisp/progmodes/idlw-shell.el | 4 ++--
lisp/progmodes/idlwave.el | 4 ++--
lisp/textmodes/reftex-vars.el | 2 +-
23 files changed, 37 insertions(+), 36 deletions(-)
(limited to 'doc/lispintro/emacs-lisp-intro.texi')
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index d2011ebf974..2fafb43e9fb 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -116,7 +116,7 @@ ways to customize it; it corresponds to GNU Emacs version @value{EMACSVER}.
@c See 'manual-html-mono' and 'manual-html-node' in admin/admin.el.
@ifset WWW_GNU_ORG
@html
-The homepage for GNU Emacs is at
+The GNU Emacs website is at
<a href="/software/emacs/">https://www.gnu.org/software/emacs/</a>.<br>
To view this manual in other formats, click
<a href="/software/emacs/manual/emacs.html">here</a>.<br>
diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi
index d419a4e24b5..570afd5be2b 100644
--- a/doc/emacs/package.texi
+++ b/doc/emacs/package.texi
@@ -129,7 +129,7 @@ entails.
@item w
@kindex w @r{(Package Menu)}
@findex package-browse-url
-Open the home page of the package on the current line in a browser
+Open the package website on the current line in a browser
(@code{package-browse-url}). @code{browse-url} is used to open the
browser.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 7933ebe58c2..7c7005b3483 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -238,7 +238,7 @@ supports it in developing GNU and promoting software freedom.''
@ifset WWW_GNU_ORG
@html
-<p>The homepage for GNU Emacs is at
+<p>The GNU Emacs website is at
<a href="/software/emacs/">https://www.gnu.org/software/emacs/</a>.<br>
To view this manual in other formats, click
<a href="/software/emacs/manual/eintr.html">here</a>.
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 55bcf399d81..e9e306fa0de 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -161,7 +161,7 @@ Cover art by Etienne Suvasa.
@ifset WWW_GNU_ORG
@html
-<p>The homepage for GNU Emacs is at
+<p>The GNU Emacs website is at
<a href="/software/emacs/">https://www.gnu.org/software/emacs/</a>.<br>
For information on using Emacs, refer to the
<a href="/software/emacs/manual/emacs.html">Emacs Manual</a>.<br>
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index 1611b983ea2..a72ab88cef6 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -767,7 +767,7 @@ Finally, to create a hyperlink to URLs, write the single-quoted URL,
preceded by @samp{URL}. For example,
@smallexample
-The home page for the GNU project has more information (see URL
+The GNU project wesite has more information (see URL
`https://www.gnu.org/').
@end smallexample
@@ -1100,9 +1100,9 @@ The name of this field is unfortunate, since people often assume it is
the place to write arbitrary keywords that describe their package,
rather than just the relevant Finder keywords.
-@item Homepage
-@itemx URL
-These lines state the homepage of the library.
+@item URL
+@itemx Homepage
+These lines state the website of the library.
@item Package-Version
If @samp{Version} is not suitable for use by the package manager, then
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index a0f316f8480..5e9c3d7eef6 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -1556,7 +1556,7 @@ You can also use TRAMP for use with rcp & scp.
@item :web-site-file @*
-A file which contains the home page for this project.
+A file which contains the website for this project.
This file can be relative to slot @code{web-site-directory}.
This can be a local file, use ange-ftp, EFS, or TRAMP.
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index 6eff88b76e3..ba1077d0acd 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -2278,7 +2278,7 @@ In Emacs, you can browse the manual using Info by typing @kbd{C-h r},
and you can view the FAQ by typing @kbd{C-h C-f}. Other resources include:
@itemize
-@item @uref{https://www.gnu.org/software/emacs/, The Emacs homepage}
+@item @uref{https://www.gnu.org/software/emacs/, The Emacs website}
@item @uref{https://www.gnu.org/software/emacs/manual/, Other Emacs manuals}
@item @uref{https://www.emacswiki.org/, Emacs Wiki}
@end itemize
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index eac5f0861ff..36c402ab35a 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -1443,7 +1443,7 @@ details.
However, what you really want is the Insidious Big Brother
Database bbdb. Get it from
-@uref{http://bbdb.sourceforge.net/, bbdb's homepage}.
+@uref{http://bbdb.sourceforge.net/, bbdb's website}.
Now place the following in @file{~/.gnus.el}, to activate bbdb for Gnus:
@example
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 4559ae8e31e..5eeffbdecaa 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -21898,7 +21898,7 @@ bound to mairix searches and are automatically updated.
Mairix is a tool for indexing and searching words in locally stored
mail. It was written by Richard Curnow and is licensed under the
GPL@. Mairix comes with most popular GNU/Linux distributions, but it also
-runs under Windows (with cygwin), macOS and Solaris. The homepage can
+runs under Windows (with cygwin), macOS and Solaris. The website can
be found at
@uref{http://www.rpcurnow.force9.co.uk/mairix/index.html}
diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi
index a571c744870..d0ec552145e 100644
--- a/doc/misc/mairix-el.texi
+++ b/doc/misc/mairix-el.texi
@@ -68,7 +68,7 @@ database.
Mairix is a tool for indexing and searching words in locally stored
mail. It was written by Richard Curnow and is licensed under the
GPL@. Mairix comes with most popular GNU/Linux distributions, but it also
-runs under Windows (with cygwin), macOS and Solaris. The homepage can
+runs under Windows (with cygwin), macOS and Solaris. The website can
be found at
@uref{http://www.rpcurnow.force9.co.uk/mairix/index.html}
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index 88ca4450d59..8ca5fcca5ba 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -3192,7 +3192,7 @@ with the @kbd{g} key. To get this behavior, use instead
@AUCTeX{} is without doubt the best major mode for editing @TeX{} and @LaTeX{}
files with Emacs (@pxref{Top,AUCTeX,,auctex, The AUCTeX User Manual}).
-You can get it from its home page at @value{AUCTEXSITE}, but since
+You can get it from its website at @value{AUCTEXSITE}, but since
it is available from GNU ELPA, you can simply install it from @kbd{M-x
list-packages}.
@@ -3565,7 +3565,7 @@ With @i{Viper} mode prior to Vipers version 3.01, you need to protect
@cindex Acknowledgments
@cindex Thanks
@cindex Bug reports
-@cindex @code{http}, @RefTeX{} home page
+@cindex @code{http}, @RefTeX{} website
@cindex @code{ftp}, @RefTeX{} site
@c dominik@@science.uva.nl
diff --git a/lisp/cedet/ede/base.el b/lisp/cedet/ede/base.el
index 103a37045cc..004da6b95de 100644
--- a/lisp/cedet/ede/base.el
+++ b/lisp/cedet/ede/base.el
@@ -212,7 +212,7 @@ You can also use TRAMP for use with rcp & scp.")
:label "Web Page File"
:group name
:documentation
- "A file which contains the home page for this project.
+ "A file which contains the website for this project.
This file can be relative to slot `web-site-directory'.
This can be a local file, use ange-ftp, EFS, or TRAMP.")
(ftp-site :initarg :ftp-site
@@ -267,7 +267,7 @@ and target specific elements such as build variables.")
'(
[ "Update Version" ede-update-version ede-object ]
[ "Version Control Status" ede-vc-project-directory ede-object ]
- [ "Edit Project Homepage" ede-edit-web-page
+ [ "Edit Project Website" ede-edit-web-page
(and ede-object (oref (ede-toplevel) web-site-file)) ]
[ "Browse Project URL" ede-web-browse-home
(and ede-object
diff --git a/lisp/cedet/ede/system.el b/lisp/cedet/ede/system.el
index 8ef38f0d33e..1300ba9011e 100644
--- a/lisp/cedet/ede/system.el
+++ b/lisp/cedet/ede/system.el
@@ -34,7 +34,7 @@
;;;###autoload
(defun ede-web-browse-home ()
- "Browse the home page of the current project."
+ "Browse the website of the current project."
(interactive)
(if (not (ede-toplevel))
(error "No project"))
diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el
index df14a5cd499..b27c7e78a88 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -498,13 +498,14 @@ absent, return nil."
"" (buffer-substring-no-properties
start (lm-commentary-end))))))))
-(defun lm-homepage (&optional file)
- "Return the homepage in file FILE, or current buffer if FILE is nil."
+(defun lm-website (&optional file)
+ "Return the website in file FILE, or current buffer if FILE is nil."
(let ((page (lm-with-file file
- (lm-header "\\(?:x-\\)?\\(?:homepage\\|url\\)"))))
+ (lm-header "\\(?:x-\\)?\\(?:url\\|homepage\\)"))))
(if (and page (string-match "^<.+>$" page))
(substring page 1 -1)
page)))
+(defalias 'lm-homepage 'lm-website) ; for backwards-compatibility
;;; Verification and synopses
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index c6cb8f058bc..7418b580e80 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2807,8 +2807,8 @@ either a full name or nil, and EMAIL is a valid email address."
"Menu for `package-menu-mode'."
'("Package"
["Describe Package" package-menu-describe-package :help "Display information about this package"]
- ["Open Package Homepage" package-browse-url
- :help "Open the homepage of this package"]
+ ["Open Package Website" package-browse-url
+ :help "Open the website of this package"]
["Help" package-menu-quick-help :help "Show short key binding help for package-menu-mode"]
"--"
["Refresh Package List" revert-buffer
@@ -4230,7 +4230,7 @@ beginning of the line."
(package-desc-summary package-desc))))
(defun package-browse-url (desc &optional secondary)
- "Open the home page of the package under point in a browser.
+ "Open the website of the package under point in a browser.
`browse-url' is used to determine the browser to be used.
If SECONDARY (interactively, the prefix), use the secondary browser."
(interactive (list (tabulated-list-get-id)
@@ -4240,7 +4240,7 @@ If SECONDARY (interactively, the prefix), use the secondary browser."
(user-error "No package here"))
(let ((url (cdr (assoc :url (package-desc-extras desc)))))
(unless url
- (user-error "No home page for %s" (package-desc-name desc)))
+ (user-error "No website for %s" (package-desc-name desc)))
(if secondary
(funcall browse-url-secondary-browser-function url)
(browse-url url))))
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 5953471ae8e..fc72f324eb9 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -195,7 +195,7 @@ PAR is a number of a regexp grouping whose text will be passed to
(integer :tag "Regexp section number")))))
(defcustom erc-emacswiki-url "https://www.emacswiki.org/cgi-bin/wiki.pl?"
- "URL of the EmacsWiki Homepage."
+ "URL of the EmacsWiki website."
:type 'string)
(defcustom erc-emacswiki-lisp-url "https://www.emacswiki.org/elisp/"
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 8e9fae80f69..d138675066c 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -1848,7 +1848,7 @@ User will be queried, if no fileset name is provided."
(filesets-goto-homepage)))
(defun filesets-goto-homepage ()
- "Show filesets's homepage."
+ "Show filesets's website."
(interactive)
(browse-url filesets-homepage))
diff --git a/lisp/net/mairix.el b/lisp/net/mairix.el
index 727aa55de58..3feb089ad05 100644
--- a/lisp/net/mairix.el
+++ b/lisp/net/mairix.el
@@ -24,7 +24,7 @@
;; This is an interface to the mairix mail search engine. Mairix is
;; written by Richard Curnow and is licensed under the GPL. See the
-;; home page for details:
+;; Mairix website for details:
;;
;; http://www.rpcurnow.force9.co.uk/mairix/
;;
diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el
index 4baa657c0a5..d14d382aac3 100644
--- a/lisp/net/webjump.el
+++ b/lisp/net/webjump.el
@@ -79,10 +79,10 @@
;; GNU FTP Mirror List from https://www.gnu.org/order/ftp.html
[mirrors "https://ftp.gnu.org/pub/gnu/"
"https://ftpmirror.gnu.org"])
- ("GNU Project Home Page" . "www.gnu.org")
+ ("GNU Project Website" . "www.gnu.org")
;; Emacs.
- ("Emacs Home Page" .
+ ("Emacs Website" .
"www.gnu.org/software/emacs/emacs.html")
("Savannah Emacs page" .
"savannah.gnu.org/projects/emacs")
diff --git a/lisp/obsolete/vc-arch.el b/lisp/obsolete/vc-arch.el
index cfbf981d3c8..fbbd2d4ecfe 100644
--- a/lisp/obsolete/vc-arch.el
+++ b/lisp/obsolete/vc-arch.el
@@ -24,7 +24,7 @@
;;; Commentary:
-;; The home page of the Arch version control system is at
+;; The Arch version control system website is at
;;
;; https://www.gnu.org/software/gnu-arch/
;;
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index eb88f25dfd6..f2bfbf3e379 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -878,8 +878,8 @@ IDL has currently stepped.")
-------------------------------
Info documentation for this package is available. Use \\[idlwave-info]
to display (complain to your sysadmin if that does not work).
- For PostScript and HTML versions of the documentation, check IDLWAVE's
- homepage at URL `https://github.com/jdtsmith/idlwave'.
+ For PostScript and HTML versions of the documentation, see IDLWAVE's
+ website at URL `https://github.com/jdtsmith/idlwave'.
IDLWAVE has customize support - see the group `idlwave'.
8. Keybindings
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 55e712dd77d..91be4016232 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -163,7 +163,7 @@
(defgroup idlwave nil
"Major mode for editing IDL .pro files."
:tag "IDLWAVE"
- :link '(url-link :tag "Home Page"
+ :link '(url-link :tag "Website"
"https://github.com/jdtsmith/idlwave")
:link '(emacs-commentary-link :tag "Commentary in idlw-shell.el"
"idlw-shell.el")
@@ -1821,7 +1821,7 @@ The main features of this mode are
Info documentation for this package is available. Use
\\[idlwave-info] to display (complain to your sysadmin if that does
not work). For Postscript, PDF, and HTML versions of the
- documentation, check IDLWAVE's homepage at URL
+ documentation, check IDLWAVE's website at URL
`https://github.com/jdtsmith/idlwave'.
IDLWAVE has customize support - see the group `idlwave'.
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index cfdf256f70a..19b40e6ce2f 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -263,7 +263,7 @@ distribution. Mixed-case symbols are convenience aliases.")
(defgroup reftex nil
"LaTeX label and citation support."
:tag "RefTeX"
- :link '(url-link :tag "Home Page"
+ :link '(url-link :tag "Website"
"https://www.gnu.org/software/auctex/reftex.html")
:link '(emacs-commentary-link :tag "Commentary in reftex.el" "reftex.el")
:link '(custom-manual "(reftex)Top")
--
cgit v1.2.3
From c0793cd9dea407e244537f77361cfbe5077181db Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Mon, 4 Oct 2021 01:08:03 +0200
Subject: Don't use some obsolete names in documentation
* admin/notes/bugtracker: Use non-obsolete name
'mail-dont-reply-to-names'.
* admin/notes/multi-tty: Mention new variable name
'x-selection-value'.
* doc/lispintro/emacs-lisp-intro.texi (Point and mark)
(Point and mark, Design @value{COUNT-WORDS}): Avoid using obsolete
name 'count-lines-region'.
* doc/lispref/hooks.texi (Standard Hooks): Remove reference to
obsolete abnormal hook 'completion-annotate-function'.
* doc/misc/efaq.texi (SPC no longer completes file names): Remove
reference to obsolete 'minibuffer-local-filename-must-match-map';
setting it has no effect.
* doc/misc/gnus.texi (NNTP): Remove reference to obsolete variable
'nntp-authinfo-file'.
* doc/misc/reftex.texi (Table of Contents, Creating Citations)
(Options - Table of Contents, Options - Referencing Labels)
(Options - Creating Citations, Options - Index Support)
(Options - Index Support, Changes): Don't use obsolete names.
* doc/misc/speedbar.texi (Minor Display Modes)
(Major Display Modes): Make variable name suggestions more in line
with existing non-obsolete variable.
* lisp/textmodes/reftex-cite.el (reftex-select-bib-mode-map):
* lisp/textmodes/reftex-ref.el (reftex-offer-label-menu): Don't use
obsolete variable names.
* lisp/progmodes/which-func.el (which-func-mode): Doc fix.
---
admin/notes/bugtracker | 2 +-
admin/notes/multi-tty | 2 +-
doc/lispintro/emacs-lisp-intro.texi | 7 +++----
doc/lispref/hooks.texi | 1 -
doc/misc/efaq.texi | 3 ---
doc/misc/gnus.texi | 4 +---
doc/misc/reftex.texi | 26 +++++++++++++-------------
doc/misc/speedbar.texi | 6 +++---
lisp/progmodes/which-func.el | 3 ++-
lisp/textmodes/reftex-cite.el | 4 ++--
lisp/textmodes/reftex-ref.el | 4 ++--
11 files changed, 28 insertions(+), 34 deletions(-)
(limited to 'doc/lispintro/emacs-lisp-intro.texi')
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index 9eb65e1f864..deb06f552cc 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -84,7 +84,7 @@ generate a new report. The only time to send mail to the bug list
address is to create a new report.
Gnus users can add the following to message-dont-reply-to-names;
-similarly with Rmail and rmail-dont-reply-to-names:
+similarly with Rmail and mail-dont-reply-to-names:
"\\(emacs-pretest-bug\\|bug-gnu-emacs\\|bug-\\(e\\|gnu\\)macs\\)@gnu\\.org\\|\
\\(submit\\|control\\|owner\\)@debbugs\\.gnu\\.org"
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty
index 1a337b9d799..fa4df820ae4 100644
--- a/admin/notes/multi-tty
+++ b/admin/notes/multi-tty
@@ -474,7 +474,7 @@ THINGS TO DO
definition.
Exceptions found so far: x-select-text and
- x-cut-buffer-or-selection-value.
+ x-selection-value (old name: x-cut-buffer-or-selection-value).
** Have a look at fatal_error_hook.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 7c7005b3483..9dbf854171c 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -4201,7 +4201,7 @@ times.
The part of the buffer between point and mark is called @dfn{the
region}. Numerous commands work on the region, including
-@code{center-region}, @code{count-lines-region}, @code{kill-region}, and
+@code{center-region}, @code{count-words-region}, @code{kill-region}, and
@code{print-region}.
The @code{save-excursion} special form saves the location of point and
@@ -4214,7 +4214,7 @@ evaluated.
In Emacs, a function frequently moves point as part of its internal
workings even though a user would not expect this. For example,
-@code{count-lines-region} moves point. To prevent the user from being
+@code{count-words-region} moves point. To prevent the user from being
bothered by jumps that are both unexpected and (from the user's point of
view) unnecessary, @code{save-excursion} is often used to keep point in
the location expected by the user. The use of
@@ -13473,8 +13473,7 @@ The template for an interactive function definition is, as always:
What we need to do is fill in the slots.
-The name of the function should be self-explanatory and similar to the
-existing @code{count-lines-region} name. This makes the name easier
+The name of the function should be self-explanatory and easy
to remember. @code{count-words-region} is the obvious choice. Since
that name is now used for the standard Emacs command to count words, we
will name our implementation @code{@value{COUNT-WORDS}}.
diff --git a/doc/lispref/hooks.texi b/doc/lispref/hooks.texi
index 394928454b0..feec8b24f46 100644
--- a/doc/lispref/hooks.texi
+++ b/doc/lispref/hooks.texi
@@ -262,7 +262,6 @@ after-set-visited-file-name-hook
auto-coding-functions
choose-completion-string-functions
completing-read-function
-completion-annotate-function
completion-at-point-functions
completion-list-insert-choice-function
deactivate-current-input-method-function
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index f80ccc080a0..18342e65b0a 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -4136,9 +4136,6 @@ You can get the old behavior by binding @kbd{SPC} to
@lisp
(define-key minibuffer-local-filename-completion-map (kbd "SPC")
'minibuffer-complete-word)
-
-(define-key minibuffer-local-filename-must-match-map (kbd "SPC")
- 'minibuffer-complete-word)
@end lisp
@c ------------------------------------------------------------
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 9e433e11c81..0c065584c45 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -13875,11 +13875,9 @@ present in this hook.
@item nntp-authinfo-function
@vindex nntp-authinfo-function
@findex nntp-send-authinfo
-@vindex nntp-authinfo-file
This function will be used to send @samp{AUTHINFO} to the @acronym{NNTP}
server. The default function is @code{nntp-send-authinfo}, which looks
-through your @file{~/.authinfo} (or whatever you've set the
-@code{nntp-authinfo-file} variable to) for applicable entries. If none
+through your @file{~/.authinfo} for applicable entries. If none
are found, it will prompt you for a login name and a password. The
format of the @file{~/.authinfo} file is (almost) the same as the
@code{ftp} @file{~/.netrc} file, which is defined in the @code{ftp}
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index 8ca5fcca5ba..8bde241e18f 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -658,9 +658,9 @@ variable @code{reftex-auto-recenter-toc}.
@end table
-@vindex reftex-toc-map
+@vindex reftex-toc-mode-map
In order to define additional commands for the @file{*toc*} buffer, the
-keymap @code{reftex-toc-map} may be used.
+keymap @code{reftex-toc-mode-map} may be used.
@findex reftex-toc-recenter
@vindex reftex-auto-recenter-toc
@@ -1021,9 +1021,9 @@ document and let you select a label from there (@pxref{LaTeX xr Package,,xr}).
@end table
-@vindex reftex-select-label-map
+@vindex reftex-select-label-mode-map
In order to define additional commands for the selection process, the
-keymap @code{reftex-select-label-map} may be used.
+keymap @code{reftex-select-label-mode-map} may be used.
@node Builtin Label Environments
@section Builtin Label Environments
@@ -1871,9 +1871,9 @@ entries.
@end table
-@vindex reftex-select-bib-map
+@vindex reftex-select-bib-mode-map
In order to define additional commands for this selection process, the
-keymap @code{reftex-select-bib-map} may be used.
+keymap @code{reftex-select-bib-mode-map} may be used.
Note that if you do not use Emacs to edit the @BibTeX{} database files,
@RefTeX{} will ask if the related buffers should be updated once it
@@ -3960,7 +3960,7 @@ Normal hook which is run when a @file{*toc*} buffer is
created.
@end deffn
-@deffn Keymap reftex-toc-map
+@deffn Keymap reftex-toc-mode-map
The keymap which is active in the @file{*toc*} buffer.
(@pxref{Table of Contents}).
@end deffn
@@ -4425,7 +4425,7 @@ Normal hook which is run when a selection buffer enters
@code{reftex-select-label-mode}.
@end deffn
-@deffn Keymap reftex-select-label-map
+@deffn Keymap reftex-select-label-mode-map
The keymap which is active in the labels selection process
(@pxref{Referencing Labels}).
@end deffn
@@ -4586,7 +4586,7 @@ Normal hook which is run when a selection buffer enters
@code{reftex-select-bib-mode}.
@end deffn
-@deffn Keymap reftex-select-bib-map
+@deffn Keymap reftex-select-bib-mode-map
The keymap which is active in the citation-key selection process
(@pxref{Creating Citations}).
@end deffn
@@ -4792,7 +4792,7 @@ into blocks. Sorting will then preserve blocks, so that lines are
re-arranged only within blocks.
@end defopt
-@defopt reftex-index-phrases-map
+@defopt reftex-index-phrases-mode-map
Keymap for the Index Phrases buffer.
@end defopt
@@ -4824,7 +4824,7 @@ the document. This flag can be toggled from within the @file{*Index*}
buffer with the @kbd{f} key.
@end defopt
-@deffn Keymap reftex-index-map
+@deffn Keymap reftex-index-mode-map
The keymap which is active in the @file{*Index*} buffer
(@pxref{Index Support}).
@end deffn
@@ -5813,8 +5813,8 @@ buffer).
@noindent @b{Version 3.12}
@itemize @bullet
@item
-There are 3 new keymaps for customization: @code{reftex-toc-map},
-@code{reftex-select-label-map}, @code{reftex-select-bib-map}.
+There are 3 new keymaps for customization: @code{reftex-toc-mode-map},
+@code{reftex-select-label-mode-map}, @code{reftex-select-bib-mode-map}.
@item
Refontification uses more standard font-lock stuff.
@item
diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi
index 9991917b3fd..70d4b054166 100644
--- a/doc/misc/speedbar.texi
+++ b/doc/misc/speedbar.texi
@@ -896,7 +896,7 @@ augmented with speedbar.
@enumerate
@item
-Create the keymap variable @code{@var{name}-speedbar-key-map}.
+Create the keymap variable @code{@var{name}-speedbar-mode-map}.
@item
Create a function, named whatever you like, which assigns values into your
@@ -904,7 +904,7 @@ keymap. Use this command to create the keymap before assigning
bindings:
@smallexample
- (setq @var{name}-speedbar-key-map (speedbar-make-specialized-keymap))
+ (setq @var{name}-speedbar-mode-map (speedbar-make-specialized-keymap))
@end smallexample
This function creates a special keymap for use in speedbar.
@@ -977,7 +977,7 @@ Next, register your extension like this;
@example
(speedbar-add-expansion-list '("MyExtension"
MyExtension-speedbar-menu-items
- MyExtension-speedbar-key-map
+ MyExtension-speedbar-mode-map
MyExtension-speedbar-buttons))
@end example
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 8946e2c3f42..176f599649f 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -185,7 +185,8 @@ and you want to simplify them for the mode line
(defvar-local which-func-mode nil
"Non-nil means display current function name in mode line.
-This makes a difference only if `which-function-mode' is non-nil.")
+This makes a difference only if variable `which-function-mode' is
+non-nil.")
(add-hook 'after-change-major-mode-hook #'which-func-ff-hook t)
diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el
index 8a54b1a301f..e1475934ddb 100644
--- a/lisp/textmodes/reftex-cite.el
+++ b/lisp/textmodes/reftex-cite.el
@@ -814,7 +814,7 @@ in order to only add another reference in the same cite command."
(interactive)
(reftex-citation nil ?t))
-(defvar reftex-select-bib-map)
+(defvar reftex-select-bib-mode-map)
(defvar reftex--found-list)
(defun reftex-offer-bib-menu ()
"Offer bib menu and return list of selected items."
@@ -870,7 +870,7 @@ in order to only add another reference in the same cite command."
(reftex-select-item
reftex-citation-prompt
reftex-citation-help
- reftex-select-bib-map
+ reftex-select-bib-mode-map
nil
'reftex-bibtex-selection-callback nil))
(setq key (car rtn)
diff --git a/lisp/textmodes/reftex-ref.el b/lisp/textmodes/reftex-ref.el
index 9d5bc5a8f0f..a5d83c34d67 100644
--- a/lisp/textmodes/reftex-ref.el
+++ b/lisp/textmodes/reftex-ref.el
@@ -533,7 +533,7 @@ When called with 2 \\[universal-argument] prefix args, disable magic word recogn
(cons (cdr cell) (- (match-end 0) (match-end 1)))
nil)))
-(defvar reftex-select-label-map)
+(defvar reftex-select-label-mode-map)
(defun reftex-offer-label-menu (typekey)
;; Offer a menu with the appropriate labels.
(let* ((buf (current-buffer))
@@ -605,7 +605,7 @@ When called with 2 \\[universal-argument] prefix args, disable magic word recogn
(reftex-select-item
reftex-select-label-prompt
reftex-select-label-help
- reftex-select-label-map
+ reftex-select-label-mode-map
offset
'reftex-show-label-location follow))
(setq key (car rtn)
--
cgit v1.2.3
From d2a34cabcf13eb406f06324361c1c647f6e5d31b Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Tue, 5 Oct 2021 21:35:09 +0200
Subject: ; Very minor touch-up to a recent change
* doc/lispintro/emacs-lisp-intro.texi (Design @value{COUNT-WORDS}):
Remove an unnecessary and potentially confusing "now".
---
doc/lispintro/emacs-lisp-intro.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'doc/lispintro/emacs-lisp-intro.texi')
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 9dbf854171c..32c39c7261b 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -13475,7 +13475,7 @@ What we need to do is fill in the slots.
The name of the function should be self-explanatory and easy
to remember. @code{count-words-region} is the obvious choice. Since
-that name is now used for the standard Emacs command to count words, we
+that name is used for the standard Emacs command to count words, we
will name our implementation @code{@value{COUNT-WORDS}}.
The function counts words within a region. This means that the
--
cgit v1.2.3
From 7cb463792334d6f59cdfc89165bac2d7783e3913 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Mon, 11 Oct 2021 14:43:11 +0200
Subject: Minor fix to clarify a sentence in emacs-lisp-intro
* doc/lispintro/emacs-lisp-intro.texi (Simple Extension): Add the word
"that" for clarity. (Bug#43965)
---
doc/lispintro/emacs-lisp-intro.texi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'doc/lispintro/emacs-lisp-intro.texi')
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 32c39c7261b..6ecd552ebb0 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -17456,9 +17456,9 @@ Manual}, for more information.
@findex line-to-top-of-window
@cindex Simple extension in @file{.emacs} file
-Here is a simple extension to Emacs that moves the line point is on to
-the top of the window. I use this all the time, to make text easier
-to read.
+Here is a simple extension to Emacs that moves the line that point is
+on to the top of the window. I use this all the time, to make text
+easier to read.
You can put the following code into a separate file and then load it
from your @file{.emacs} file, or you can include it within your
--
cgit v1.2.3
From 97c4f84cbce4fef3dddebdae29df590bbb7fd516 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Tue, 12 Oct 2021 18:23:46 +0200
Subject: Double the default value of kill-ring-max
* lisp/simple.el (kill-ring-max): Double the default to 120.
* lisp/menu-bar.el (yank-menu-length): Doc fix.
(yank-menu-max-items): New variable.
(menu-bar-update-yank-menu): Don't display more than
'yank-menu-max-items' in the yank menu.
* doc/emacs/custom.texi (Changing a Variable):
* doc/emacs/killing.texi (Kill Ring):
* doc/lispintro/emacs-lisp-intro.texi (kill-new function):
* doc/lispref/text.texi (Internals of Kill Ring): Doc fix to use
the new value.
---
doc/emacs/custom.texi | 2 +-
doc/emacs/killing.texi | 2 +-
doc/lispintro/emacs-lisp-intro.texi | 2 +-
doc/lispref/text.texi | 2 +-
etc/NEWS | 8 ++++++++
lisp/menu-bar.el | 13 ++++++++++---
lisp/simple.el | 5 +++--
7 files changed, 25 insertions(+), 9 deletions(-)
(limited to 'doc/lispintro/emacs-lisp-intro.texi')
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 73dfe03898e..eb30a6acc53 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -195,7 +195,7 @@ the customization buffer:
The first line shows that the variable is named
@code{kill-ring-max}, formatted as @samp{Kill Ring Max} for easier
-viewing. Its value is @samp{60}. The button labeled @samp{[Hide]},
+viewing. Its value is @samp{120}. The button labeled @samp{[Hide]},
if activated, hides the variable's value and state; this is useful to
avoid cluttering up the customization buffer with very long values
(for this reason, variables that have very long values may start out
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 6e4fd77e8b9..76fccdbdfec 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -353,7 +353,7 @@ other ways to move text around.)
@vindex kill-ring-max
The maximum number of entries in the kill ring is controlled by the
-variable @code{kill-ring-max}. The default is 60. If you make a new
+variable @code{kill-ring-max}. The default is 120. If you make a new
kill when this limit has been reached, Emacs makes room by deleting
the oldest entry in the kill ring.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 6ecd552ebb0..81ae2536339 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -8767,7 +8767,7 @@ keeps the kill ring from growing too long. It looks like this:
The code checks whether the length of the kill ring is greater than
the maximum permitted length. This is the value of
-@code{kill-ring-max} (which is 60, by default). If the length of the
+@code{kill-ring-max} (which is 120, by default). If the length of the
kill ring is too long, then this code sets the last element of the
kill ring to @code{nil}. It does this by using two functions,
@code{nthcdr} and @code{setcdr}.
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 1e062be2c64..163ac9038b9 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -1342,7 +1342,7 @@ that @kbd{C-y} should yank.
@defopt kill-ring-max
The value of this variable is the maximum length to which the kill
ring can grow, before elements are thrown away at the end. The default
-value for @code{kill-ring-max} is 60.
+value for @code{kill-ring-max} is 120.
@end defopt
@node Undo
diff --git a/etc/NEWS b/etc/NEWS
index 9daf958b07e..82847cf9b99 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -78,6 +78,14 @@ the point is now moved only when releasing the mouse button. This no
longer results in a bogus selection, unless the mouse has been
effectively dragged.
++++
+** 'kill-ring-max' now defaults to 120.
+
+---
+** New user option 'yank-menu-max-items'.
+Customize this option to limit the amount of entries in the menu
+"Edit->Paste from Kill Menu". The default is 60.
+
* Changes in Specialized Modes and Packages in Emacs 29.1
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 7c9fc1aeba0..1c3b8014e96 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -2169,10 +2169,16 @@ otherwise it could decide to silently do nothing."
(> count 1)))
(defcustom yank-menu-length 20
- "Maximum length to display in the `yank-menu'."
+ "Items in `yank-menu' longer than this will be truncated."
:type 'integer
:group 'menu)
+(defcustom yank-menu-max-items 60
+ "Maximum number of entries to display in the `yank-menu'."
+ :type 'integer
+ :group 'menu
+ :version "29.1")
+
(defun menu-bar-update-yank-menu (string old)
(let ((front (car (cdr yank-menu)))
(menu-string (if (<= (length string) yank-menu-length)
@@ -2196,8 +2202,9 @@ otherwise it could decide to silently do nothing."
(cons
(cons string (cons menu-string 'menu-bar-select-yank))
(cdr yank-menu)))))
- (if (> (length (cdr yank-menu)) kill-ring-max)
- (setcdr (nthcdr kill-ring-max yank-menu) nil)))
+ (let ((max-items (min yank-menu-max-items kill-ring-max)))
+ (if (> (length (cdr yank-menu)) max-items)
+ (setcdr (nthcdr max-items yank-menu) nil))))
(put 'menu-bar-select-yank 'apropos-inhibit t)
(defun menu-bar-select-yank ()
diff --git a/lisp/simple.el b/lisp/simple.el
index 7b6c52a3898..c7bb928cd73 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5076,10 +5076,11 @@ interact nicely with `interprogram-cut-function' and
interaction; you may want to use them instead of manipulating the kill
ring directly.")
-(defcustom kill-ring-max 60
+(defcustom kill-ring-max 120
"Maximum length of kill ring before oldest elements are thrown away."
:type 'integer
- :group 'killing)
+ :group 'killing
+ :version "29.1")
(defvar kill-ring-yank-pointer nil
"The tail of the kill ring whose car is the last thing yanked.")
--
cgit v1.2.3
From 98eb6d783a482cd7ebca7ec656b0775b82c68e57 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Tue, 19 Oct 2021 02:36:06 +0200
Subject: Fix a typo in emacs-lisp-intro.texi
* doc/lispintro/emacs-lisp-intro.texi (Lisp Atoms): Fix typo.
Reported by Mor Zahavi <morzahavi@me.com>. (Bug#51271)
---
doc/lispintro/emacs-lisp-intro.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'doc/lispintro/emacs-lisp-intro.texi')
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 6ecd552ebb0..3897e5a0627 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -1177,7 +1177,7 @@ are different from the meaning the letters make as a word. For
example, the word for the South American sloth, the @samp{ai}, is
completely different from the two words, @samp{a}, and @samp{i}.
-There are many kinds of atom in nature but only a few in Lisp: for
+There are many kinds of atoms in nature but only a few in Lisp: for
example, @dfn{numbers}, such as 37, 511, or 1729, and @dfn{symbols}, such
as @samp{+}, @samp{foo}, or @samp{forward-line}. The words we have
listed in the examples above are all symbols. In everyday Lisp
--
cgit v1.2.3
From 6352e0a55587e15fa3bef878a329c1a148749cfe Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Thu, 21 Oct 2021 21:22:51 +0200
Subject: Add comment on reworking a section in emacs-lisp-intro.texi
* doc/lispintro/emacs-lisp-intro.texi (Body of mark-whole-buffer):
Add comment about how one could rework this section.
---
doc/lispintro/emacs-lisp-intro.texi | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
(limited to 'doc/lispintro/emacs-lisp-intro.texi')
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 2a990ca9ce8..5ce46ea0f79 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -4893,6 +4893,23 @@ region.
@c FIXME: the definition of append-to-buffer has been changed (in
@c 2010-03-30).
+@c In Bug#8275, Stefan Monner <monnier@iro.umontreal.ca> writes:
+@c >> Do you want to fix this, or shall I try? The problem is that
+@c >> append-to-buffer now uses let* and with-current-buffer, so this might
+@c >> break the flow of the text. At this point in the book, let* and
+@c >> with-current-buffer are not yet introduced.
+@c >
+@c > Here are some thoughts:
+@c > - I don't think it's of any importance that the example code be
+@c > identical to the currently used code.
+@c > - append-to-buffer might not be the best example since AFAICT copying
+@c > text from one buffer to another is not a common operation and in most
+@c > cases this is done via buffer-substring + insert (often with some
+@c > processing on the string between the two) rather than with
+@c > insert-buffer-substring which is a rarely used function.
+@c > - yes, I think the text would benefit from some rethink to try and present
+@c > with-current-buffer in preference to set-buffer, but it's not
+@c > a simple fix.
@node append-to-buffer
@section The Definition of @code{append-to-buffer}
@findex append-to-buffer
--
cgit v1.2.3
From fde56eeb764dd20267187b225c2a0d27c795f0dd Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 25 Oct 2021 19:11:06 +0300
Subject: Revert "Fix a typo in emacs-lisp-intro.texi"
This reverts commit 98eb6d783a482cd7ebca7ec656b0775b82c68e57.
I've consulted with Richard Stallman about this, and he says
that the original wording, "kinds of atom", is both correct
and more elegant writing. So I'm restoring the original text.
* doc/lispintro/emacs-lisp-intro.texi (Lisp Atoms): Undo the
fix of a "typo" that wasn't a typo. (Bug#51271)
---
doc/lispintro/emacs-lisp-intro.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'doc/lispintro/emacs-lisp-intro.texi')
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 3897e5a0627..6ecd552ebb0 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -1177,7 +1177,7 @@ are different from the meaning the letters make as a word. For
example, the word for the South American sloth, the @samp{ai}, is
completely different from the two words, @samp{a}, and @samp{i}.
-There are many kinds of atoms in nature but only a few in Lisp: for
+There are many kinds of atom in nature but only a few in Lisp: for
example, @dfn{numbers}, such as 37, 511, or 1729, and @dfn{symbols}, such
as @samp{+}, @samp{foo}, or @samp{forward-line}. The words we have
listed in the examples above are all symbols. In everyday Lisp
--
cgit v1.2.3
From d353fc4a005472f6ac4ac3d530cee18a51c00243 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 27 Oct 2021 14:33:42 +0300
Subject: ; Explain why "kinds of atom" isn't a typo
* doc/lispintro/emacs-lisp-intro.texi (Lisp Atoms): Add a comment
explaining why "kinds of atom" isn't a typo.
---
doc/lispintro/emacs-lisp-intro.texi | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'doc/lispintro/emacs-lisp-intro.texi')
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 6ecd552ebb0..391b6d9c590 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -1162,6 +1162,10 @@ computer. Often, people use the term @dfn{expression}
indiscriminately. (Also, in many texts, the word @dfn{form} is used
as a synonym for expression.)
+@c This and the next paragraph say ``kinds of atom'', but that is not
+@c a typo, just slightly ``old-fashioned wording which adds a fillip
+@c of interest to it'', and ``is more elegant writing'', according to
+@c RMS.
Incidentally, the atoms that make up our universe were named such when
they were thought to be indivisible; but it has been found that physical
atoms are not indivisible. Parts can split off an atom or it can
--
cgit v1.2.3
From d72fefdeabf2da7668aebc7ec0ff8008d63247a9 Mon Sep 17 00:00:00 2001
From: Jan Synacek <jan.synacek@gmail.com>
Date: Thu, 28 Oct 2021 23:32:59 +0200
Subject: Fix typos in the manual and in a comment
* lisp/minibuffer.el (completion-pcm--hilit-commonality):
* doc/lispintro/emacs-lisp-intro.texi (Mode Line): Fix typos
(bug#51434).
Copyright-paperwork-exempt: yes
---
doc/lispintro/emacs-lisp-intro.texi | 2 +-
lisp/minibuffer.el | 13 +++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
(limited to 'doc/lispintro/emacs-lisp-intro.texi')
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 391b6d9c590..308153f9231 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -17843,7 +17843,7 @@ xmodmap -e "keysym Alt_L = Meta_L Alt_L"
Finally, a feature I really like: a modified mode line.
When I work over a network, I forget which machine I am using. Also,
-I tend to I lose track of where I am, and which line point is on.
+I tend to lose track of where I am, and which line point is on.
So I reset my mode line to look like this:
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index bc21f027b6e..ca82b4a9e60 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -3579,12 +3579,13 @@ between 0 and 1, and with faces `completions-common-part',
;; "hole" in the middle of the string is indicated by
;; "-". Note that there are no "holes" near the edges
;; of the string. The completion score is a number
- ;; bound by ]0..1]: the higher the better and only a
- ;; perfect match (pattern equals string) will have
- ;; score 1. The formula takes the form of a quotient.
- ;; For the numerator, we use the number of +, i.e. the
- ;; length of the pattern. For the denominator, it
- ;; first computes
+ ;; bound by (0..1] (i.e., larger than (but not equal
+ ;; to) zero, and smaller or equal to one): the higher
+ ;; the better and only a perfect match (pattern equals
+ ;; string) will have score 1. The formula takes the
+ ;; form of a quotient. For the numerator, we use the
+ ;; number of +, i.e. the length of the pattern. For
+ ;; the denominator, it first computes
;;
;; hole_i_contrib = 1 + (Li-1)^(1/tightness)
;;
--
cgit v1.2.3