From 71d4bce71a3a055b854f48aff18e538f70c6ee47 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 29 Mar 2025 08:54:30 -0400 Subject: [PATCH] ; Fix a merge snafu. (cherry picked from commit 988111937b44433490d20593c2a1e543575ae940) --- doc/emacs/ack.texi | 5 +++-- doc/misc/cc-mode.texi | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index b5d1fb74cf0..dd783da35a6 100644 --- 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 ecf6088397c..44bbd4056cc 100644 --- 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: -- 2.39.5