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 | |
| 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')
| -rw-r--r-- | doc/lispref/display.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/internals.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/modes.texi | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 40978b408ae..7d1c14c8169 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -8265,7 +8265,7 @@ different. Emacs provides a primitive that applications can use to detect instances of text whose bidirectional properties were overridden so as to make a left-to-right character display as if it were a -right-to-left character, or vise versa. +right-to-left character, or vice versa. @defun bidi-find-overridden-directionality from to &optional object This function looks at the text of the specified @var{object} between diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index cc18b852331..fed9612e329 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi @@ -2059,7 +2059,7 @@ I/O,,,libc}. @cindex nonlocal exits, in modules Emacs Lisp supports nonlocal exits, whereby program control is -transfered from one point in a program to another remote point. +transferred from one point in a program to another remote point. @xref{Nonlocal Exits}. Thus, Lisp functions called by your module might exit nonlocally by calling @code{signal} or @code{throw}, and your module functions must handle such nonlocal exits properly. Such 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 |