summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
2000-06-13 Dave Love <fx@gnu.org>
- * image.el (put-image): Default STRING to a space.
+ * image.el (insert-image): Default STRING to a space.
* info.el Doc fixes.
(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
display it in the text area, a value of `left-margin' means
display it in the left marginal area, a value of `right-margin'
means display it in the right marginal area."
- ;; Use a space as least likely to cause trouble when it's a hidden
- ;; character in the buffer.
- (unless string (setq string " "))
+ (unless string (setq string "x"))
(let ((buffer (current-buffer)))
(unless (eq (car-safe image) 'image)
(error "Not an image: %s" image))
@@ -148,7 +146,9 @@ AREA is where to display the image. AREA nil or omitted means
display it in the text area, a value of `left-margin' means
display it in the left marginal area, a value of `right-margin'
means display it in the right marginal area."
- (unless string (setq string "x"))
+ ;; Use a space as least likely to cause trouble when it's a hidden
+ ;; character in the buffer.
+ (unless string (setq string " "))
(unless (eq (car-safe image) 'image)
(error "Not an image: %s" image))
(unless (or (null area) (memq area '(left-margin right-margin)))