; Fix a merge snafu.

(cherry picked from commit 988111937b44433490d20593c2a1e543575ae940)

diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index b5d1fb74cf0768497f1d2439f4498fd75346992c..dd783da35a6b4fd6b7f6fbdf9c9526a06fab553f 100644 (file)
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -1301,8 +1301,9 @@ Tibor @v{S}imko and Milan Zamazal wrote @file{slovak.el}, support for
 editing text in Slovak language.
 
 @item
-Jo@~ao T@'avora wrote many improvements for @file{flymake.el}, an
-on-the-fly syntax-checking package.
+João Távora wrote many improvements for @file{flymake.el}, an on-the-fly
+syntax-checking package.  He also wrote @file{eglot.el}, a language
+server protocol (LSP) client that was added in Emacs 29.
 
 @item
 Luc Teirlinck wrote @file{help-at-pt.el}, providing local help through

diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index ecf6088397cf8581146d5d5980f7b07736585489..44bbd4056cc14ac119a777cae57479c371a7bf83 100644 (file)
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -4690,7 +4690,7 @@ the positions of the type and the enclosing class's brace.
  5.         c;
  6. @};
 @end example
- 
+
 @ssindex template-args-cont
 Template definitions introduce yet another syntactic symbol: