master 8f784a2766: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 8f784a27667fbebdf320388ef2ec46ae67f69230
Merge: ed9adafc0b a4078fa628
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Merge from origin/emacs-28
    
    a4078fa628 ; * lisp/vc/ediff.el: Improve wording in last change.
    dd077ebded Revert "; * doc/lispintro/emacs-lisp-intro.texi: Fix typo."
    362c9ab879 * doc/misc/gnus.texi (Article Washing): Fix Links URL.
---
 doc/lispintro/emacs-lisp-intro.texi |  2 +-
 doc/misc/gnus.texi                  |  2 +-
 lisp/vc/ediff.el                    | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/lispintro/emacs-lisp-intro.texi 
b/doc/lispintro/emacs-lisp-intro.texi
index e00edeb392..47a5a870fd 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -14808,7 +14808,7 @@ symbols in one function definition."
         (setq lengths-list
               (cons (count-words-in-defun) lengths-list)))
       (kill-buffer buffer)
-      lengths-list))))
+      lengths-list)))
 @end group
 @end smallexample
 
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index acc70a260f..738ff94b9f 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -9346,7 +9346,7 @@ Use @uref{http://emacs-w3m.namazu.org/, emacs-w3m}.
 Use @uref{http://w3m.sourceforge.net/, w3m}.
 
 @item links
-Use @uref{https://almende.github.io/chap-links-library/, CHAP Links}.
+Use @uref{http://links.twibright.com/, Links}.
 
 @item lynx
 Use @uref{https://lynx.browser.org/, Lynx}.
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 94e3fc6d7f..40473a2c03 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -89,11 +89,11 @@
 ;;  underlining.  However, if the region is already underlined by some other
 ;;  overlays, there is no simple way to temporarily remove that residual
 ;;  underlining.  This problem occurs when a buffer is highlighted with
-;;  font-lock.el packages.  If this residual highlighting gets in the way, you
-;;  can do the following.  font-lock.el provides commands for unhighlighting
-;;  buffers.  You can either place these commands in 
`ediff-prepare-buffer-hook'
-;;  (which will unhighlight every buffer used by Ediff) or you can execute
-;;  them interactively, at any time and in any buffer.
+;;  font-lock.el.  If this residual highlighting gets in the way, you
+;;  can use the font-lock.el commands for unhighlighting buffers.
+;;  Either place these commands in `ediff-prepare-buffer-hook' (which will
+;;  unhighlight every buffer used by Ediff) or execute them
+;;  interactively, which you can do at any time and in any buffer.
 
 
 ;;; Acknowledgments: