[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 29ca91f 4/6: Merge from origin/emacs-27
From: |
Glenn Morris |
Subject: |
master 29ca91f 4/6: Merge from origin/emacs-27 |
Date: |
Thu, 18 Mar 2021 11:53:26 -0400 (EDT) |
branch: master
commit 29ca91f3d9ede2026ff2c90c55f78282c33cefc3
Merge: 88ab1d1 a7f95d5
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>
Merge from origin/emacs-27
a7f95d5244 Remove duplicate @table item from ELisp manual
be1b3512f7 Fix reference to 'diff-font-lock-syntax' in diff-mode docu...
---
doc/emacs/files.texi | 5 +++--
doc/lispref/objects.texi | 3 ---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 6b3bc43..912980b 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1670,8 +1670,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
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index 64e7d53..0d0caeb 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}).
- master updated (52270aa -> b72ddbd), Glenn Morris, 2021/03/18
- master 843eb21 1/6: ; Merge from origin/emacs-27, Glenn Morris, 2021/03/18
- master d92b725 2/6: Merge from origin/emacs-27, Glenn Morris, 2021/03/18
- master 29ca91f 4/6: Merge from origin/emacs-27,
Glenn Morris <=
- master 88ab1d1 3/6: ; Merge from origin/emacs-27, Glenn Morris, 2021/03/18
- master 94821a1 5/6: ; Merge from origin/emacs-27, Glenn Morris, 2021/03/18
- master b72ddbd 6/6: Merge from origin/emacs-27, Glenn Morris, 2021/03/18