summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/image-mode.el1
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a5b3f2b8014..76f065bc747 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-25 Chong Yidong <cyd@stupidchicken.com>
+
+ * image-mode.el (image-toggle-display): Use buffer contents to
+ generate image for a remote file.
+
2006-05-25 Juri Linkov <juri@jurta.org>
* replace.el (query-replace-read-from, query-replace-read-to):
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 1a55676e3c7..66d7fb6c16a 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -139,6 +139,7 @@ and showing the image as an image."
;; was inserted
(let* ((image
(if (and (buffer-file-name)
+ (not (file-remote-p (buffer-file-name)))
(not (buffer-modified-p))
(not (and (boundp 'archive-superior-buffer)
archive-superior-buffer))