aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2000-06-13 18:18:02 +0000
committerDave Love2000-06-13 18:18:02 +0000
commit0ad550ba63b104d5983c54255b37eba3906e1321 (patch)
tree16c1162855896d51c6724a15fc277128632914e2
parentf290ca08fa36d152ee2c3bda959e4f4fdf40d8c1 (diff)
downloademacs-0ad550ba63b104d5983c54255b37eba3906e1321.tar.gz
emacs-0ad550ba63b104d5983c54255b37eba3906e1321.zip
Fix last change to be in insert-image as intended.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/image.el8
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4536d21038e..5fa1e5376dc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,6 @@
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. 3 * image.el (insert-image): Default STRING to a space.
4 4
5 * info.el Doc fixes. 5 * info.el Doc fixes.
6 (Info-build-node-completions): Match Ref tags. 6 (Info-build-node-completions): Match Ref tags.
diff --git a/lisp/image.el b/lisp/image.el
index fe9dd5bfe55..0e507d2ed3c 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -122,9 +122,7 @@ 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 ;; Use a space as least likely to cause trouble when it's a hidden 125 (unless string (setq string "x"))
126 ;; character in the buffer.
127 (unless string (setq string " "))
128 (let ((buffer (current-buffer))) 126 (let ((buffer (current-buffer)))
129 (unless (eq (car-safe image) 'image) 127 (unless (eq (car-safe image) 'image)
130 (error "Not an image: %s" image)) 128 (error "Not an image: %s" image))
@@ -148,7 +146,9 @@ AREA is where to display the image. AREA nil or omitted means
148display it in the text area, a value of `left-margin' means 146display it in the text area, a value of `left-margin' means
149display it in the left marginal area, a value of `right-margin' 147display it in the left marginal area, a value of `right-margin'
150means display it in the right marginal area." 148means display it in the right marginal area."
151 (unless string (setq string "x")) 149 ;; Use a space as least likely to cause trouble when it's a hidden
150 ;; character in the buffer.
151 (unless string (setq string " "))
152 (unless (eq (car-safe image) 'image) 152 (unless (eq (car-safe image) 'image)
153 (error "Not an image: %s" image)) 153 (error "Not an image: %s" image))
154 (unless (or (null area) (memq area '(left-margin right-margin))) 154 (unless (or (null area) (memq area '(left-margin right-margin)))