summaryrefslogtreecommitdiff
path: root/lisp/format.el
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>1999-07-21 21:43:03 +0000
committerGerd Moellmann <gerd@gnu.org>1999-07-21 21:43:03 +0000
commitf3bbef8728240757ec66bf67bca862aeffa218ef (patch)
tree27307eb9613e552ebb4b8d28b4620744c75272e9 /lisp/format.el
parent81b99826ff1a5090284e7c815b7ffb1f8e286208 (diff)
downloademacs-f3bbef8728240757ec66bf67bca862aeffa218ef.tar.gz
(top-level): Give `display' property `format-list-atomic-p.
(format-annotate-single-property-change): Test that property. If present, treat list property values like atoms.
Diffstat (limited to 'lisp/format.el')
-rw-r--r--lisp/format.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/format.el b/lisp/format.el
index 6fab2a3e725..77b46860c1f 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -502,6 +502,10 @@ ORDER. Unmatched items will go last."
; See format-deannotate-region and
; format-annotate-region.
+;; This text property has list values, but they are treated atomically.
+
+(put 'display 'format-list-atomic-p t)
+
;;;
;;; Decoding
;;;
@@ -921,7 +925,8 @@ Annotations to open and to close are returned as a dotted pair."
(if (not prop-alist)
nil
;; If either old or new is a list, have to treat both that way.
- (if (or (consp old) (consp new))
+ (if (and (or (consp old) (consp new))
+ (not (get prop 'format-list-atomic-p)))
(let* ((old (if (listp old) old (list old)))
(new (if (listp new) new (list new)))
(tail (format-common-tail old new))