From be1b3512f772133ac9760f93fedabd672ba04598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Sun, 14 Mar 2021 02:25:53 +0100 Subject: [PATCH 1/2] Fix reference to 'diff-font-lock-syntax' in diff-mode documentation * doc/emacs/files.texi (Diff Mode): Add the omitted name of the variable. (Bug#47129) --- doc/emacs/files.texi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 88fcdd0f9f6..b9e45b9919f 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1652,8 +1652,9 @@ modify the original (``old'') source files rather than the patched (``new'') source files. @vindex diff-font-lock-syntax - If non-@code{nil}, fragments of source in hunks are highlighted -according to the appropriate major mode. + If @code{diff-font-lock-syntax} is non-@code{nil}, fragments of +source in hunks are highlighted according to the appropriate major +mode. @node Copying and Naming @section Copying, Naming and Renaming Files From a7f95d5244dcb1fea067858c3ddc2bb2a22ba37a Mon Sep 17 00:00:00 2001 From: Fabrice Bauzac Date: Tue, 16 Mar 2021 21:09:15 +0100 Subject: [PATCH 2/2] Remove duplicate @table item from ELisp manual * doc/lispref/objects.texi (Special Read Syntax): Remove duplicate item "#@N" from the table of Special Read Syntax. (Bug#47200) --- doc/lispref/objects.texi | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi index 9b443865699..99949815edd 100644 --- a/doc/lispref/objects.texi +++ b/doc/lispref/objects.texi @@ -148,9 +148,6 @@ starting list count: object, so when reading back the object, they will be the same object instead of copies (@pxref{Circular Objects}). -@item #@@N -Skip the next @samp{N} characters (@pxref{Comments}). - @item #xN @samp{N} represented as a hexadecimal number (@samp{#x2a}).