diff options
author | Stefan Kangas <stefan@marxist.se> | 2022-06-05 06:30:25 +0200 |
---|---|---|
committer | Stefan Kangas <stefan@marxist.se> | 2022-06-05 06:30:25 +0200 |
commit | d46e94f23fbbd522f2a017444b29f9f18203b4bc (patch) | |
tree | 606ec60566bda5eebbdea6bc5aee835fcafdef2f /doc/lispref/display.texi | |
parent | ddfb91c0a7e46f0332caf82237cabc736ddfd276 (diff) | |
parent | 1b8719835a200a2be17da226e82030f691caba80 (diff) | |
download | emacs-d46e94f23fbbd522f2a017444b29f9f18203b4bc.tar.gz emacs-d46e94f23fbbd522f2a017444b29f9f18203b4bc.tar.bz2 emacs-d46e94f23fbbd522f2a017444b29f9f18203b4bc.zip |
Merge from origin/emacs-28
1b8719835a Update to Org 9.5.4
92c5faafd7 Clarify documentation of 'string-to-unibyte'
2848512654 ; * lisp/files.el (find-file): Avoid too short lines in do...
672f9f787f Improve keystrokes in doc strings in some find-file functions
ef5651cc77 Fix segfaults when starting on 80x26 TTY frames
bfa647972f ; Fix doc string of 'delete-selection-repeat-replace-region'
a95d46e00f Make it explicit that a couple of _s in lispref are unders...
5c74c25123 Remove from FAQ the MS-Windows info about BDF fonts
edb48646f2 Fix Display Property manual example
Diffstat (limited to 'doc/lispref/display.texi')
-rw-r--r-- | doc/lispref/display.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 653b249a407..b98c2f8fa93 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -5057,7 +5057,7 @@ which are evaluated at display time. This could be unsafe in certain situations, e.g., when the display specification was generated by some external program/agent. Wrapping a display specification in a list that begins with the special symbol @code{disable-eval}, as in -@w{@code{('disable-eval @var{spec})}}, will disable evaluation of any +@w{@code{(disable-eval @var{spec})}}, will disable evaluation of any Lisp in @var{spec}, while still supporting all the other display property features. |