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...
This commit is contained in:
Glenn Morris 2021-03-18 08:50:32 -07:00
commit 29ca91f3d9
2 changed files with 3 additions and 5 deletions

View file

@ -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

View file

@ -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}).