diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-09-27 09:37:10 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-09-27 09:37:10 -0700 |
| commit | 2e8c9ede155668167e509ddb80c6a46dab8d70fe (patch) | |
| tree | 200d823eb9522f7531e8a31073ed003333cb34f4 /doc/lispref/modes.texi | |
| parent | a492013d07c59fab8eb9779924b384181e878a1a (diff) | |
| parent | f31c6792ab98c8be343838f59d96e35c05353521 (diff) | |
| download | emacs-2e8c9ede155668167e509ddb80c6a46dab8d70fe.tar.gz emacs-2e8c9ede155668167e509ddb80c6a46dab8d70fe.tar.bz2 emacs-2e8c9ede155668167e509ddb80c6a46dab8d70fe.zip | |
Merge from origin/emacs-27
f31c6792ab Fix support for Zip64 zip files
ba635a19fb * lisp/hi-lock.el (hi-lock-auto-select-face): Doc fix. (B...
cc8fef2bdd Avoid infinite recursion with 'relative' line numbers display
395f10cb98 ; Fix more trivial typos
bf4accb65e ; Fix some trivial typos
# Conflicts:
# etc/NEWS
# lisp/arc-mode.el
Diffstat (limited to 'doc/lispref/modes.texi')
| -rw-r--r-- | doc/lispref/modes.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 1652cb6989d..be2ee5721c2 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -3293,7 +3293,7 @@ is disabled, @code{font-lock-face} has no effect on the display. also use the normal Font Lock machinery. But if the mode does not use the normal Font Lock machinery, it should not set the variable @code{font-lock-defaults}. In this case the @code{face} property will -not be overriden, so using the @code{face} property could work too. +not be overridden, so using the @code{face} property could work too. However, using @code{font-lock-face} is generally preferable as it allows the user to control the fontification by toggling @code{font-lock-mode}, and lets the code work regardless of whether |