aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2000-06-13 17:55:59 +0000
committerDave Love2000-06-13 17:55:59 +0000
commitf290ca08fa36d152ee2c3bda959e4f4fdf40d8c1 (patch)
treef3a5a971dcd6a1f2418e42ad5cf0548e223218ea
parent97aa9c1d5adcb82fc0ba7db927574cac112597c5 (diff)
downloademacs-f290ca08fa36d152ee2c3bda959e4f4fdf40d8c1.tar.gz
emacs-f290ca08fa36d152ee2c3bda959e4f4fdf40d8c1.zip
(put-image): Default STRING to a space.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/image.el4
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 72dc27ae943..4536d21038e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12000-06-13 Dave Love <fx@gnu.org> 12000-06-13 Dave Love <fx@gnu.org>
2 2
3 * image.el (put-image): Default STRING to a space.
4
3 * info.el Doc fixes. 5 * info.el Doc fixes.
4 (Info-build-node-completions): Match Ref tags. 6 (Info-build-node-completions): Match Ref tags.
5 7
diff --git a/lisp/image.el b/lisp/image.el
index 339e176c223..fe9dd5bfe55 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -122,7 +122,9 @@ AREA is where to display the image. AREA nil or omitted means
122display it in the text area, a value of `left-margin' means 122display it in the text area, a value of `left-margin' means
123display it in the left marginal area, a value of `right-margin' 123display it in the left marginal area, a value of `right-margin'
124means display it in the right marginal area." 124means display it in the right marginal area."
125 (unless string (setq string "x")) 125 ;; Use a space as least likely to cause trouble when it's a hidden
126 ;; character in the buffer.
127 (unless string (setq string " "))
126 (let ((buffer (current-buffer))) 128 (let ((buffer (current-buffer)))
127 (unless (eq (car-safe image) 'image) 129 (unless (eq (car-safe image) 'image)
128 (error "Not an image: %s" image)) 130 (error "Not an image: %s" image))