From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 21 Jul 1999 21:43:03 +0000 (+0000)
Subject: (top-level): Give `display' property `format-list-atomic-p.
X-Git-Tag: emacs-pretest-21.0.90~7458
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f3bbef8728240757ec66bf67bca862aeffa218ef;p=emacs.git

(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.
---

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