aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2008-04-14 22:04:38 +0000
committerStefan Monnier2008-04-14 22:04:38 +0000
commitbd5c2732aa2d2dacb43fe047caf7fc45dc18d342 (patch)
tree9c5236203bba87f562adb30b88f0d4ca3e6472d6
parent66787d5102721eb738237d9a44e37eb0fe55c50f (diff)
downloademacs-bd5c2732aa2d2dacb43fe047caf7fc45dc18d342.tar.gz
emacs-bd5c2732aa2d2dacb43fe047caf7fc45dc18d342.zip
(minibuffer-message): Make sure we can put-text-property.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/minibuffer.el6
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6102575cf6..cc9ee1d1f7a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12008-04-14 Stefan Monnier <monnier@iro.umontreal.ca> 12008-04-14 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * minibuffer.el (minibuffer-message): Make sure we can put-text-property.
4
3 * emacs-lisp/crm.el: Complete rewrite. 5 * emacs-lisp/crm.el: Complete rewrite.
4 6
5 * tmm.el (tmm-completion-delete-prompt): Don't hardcode point-min==1. 7 * tmm.el (tmm-completion-delete-prompt): Don't hardcode point-min==1.
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 7429af3248d..2fec4238230 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -172,8 +172,10 @@ Enclose MESSAGE in [...] if this is not yet the case.
172If ARGS are provided, then pass MESSAGE through `format'." 172If ARGS are provided, then pass MESSAGE through `format'."
173 ;; Clear out any old echo-area message to make way for our new thing. 173 ;; Clear out any old echo-area message to make way for our new thing.
174 (message nil) 174 (message nil)
175 (unless (and (null args) (string-match "\\[.+\\]" message)) 175 (setq message (if (and (null args) (string-match "\\[.+\\]" message))
176 (setq message (concat " [" message "]"))) 176 ;; Make sure we can put-text-property.
177 (copy-sequence message)
178 (concat " [" message "]")))
177 (when args (setq message (apply 'format message args))) 179 (when args (setq message (apply 'format message args)))
178 (let ((ol (make-overlay (point-max) (point-max) nil t t))) 180 (let ((ol (make-overlay (point-max) (point-max) nil t t)))
179 (unwind-protect 181 (unwind-protect