diff options
| author | Miles Bader | 2006-06-07 18:05:10 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-06-07 18:05:10 +0000 |
| commit | b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb (patch) | |
| tree | de3804210a8cd955e0d3b9abc15679480930bc82 /lisp/image-mode.el | |
| parent | 885b7d0991bd4b4b8f4bd1d3cd21c18a697bbce2 (diff) | |
| parent | 26c9afc3239e18b03537faaea33e3e82e28099e6 (diff) | |
| download | emacs-b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb.tar.gz emacs-b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 285-296)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: admin/FOR-RELEASE: Update refcard section.
* gnus--rel--5.10 (patch 102-104)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
Diffstat (limited to 'lisp/image-mode.el')
| -rw-r--r-- | lisp/image-mode.el | 1 |
1 files changed, 1 insertions, 0 deletions
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." | |||
| 139 | ;; was inserted | 139 | ;; was inserted |
| 140 | (let* ((image | 140 | (let* ((image |
| 141 | (if (and (buffer-file-name) | 141 | (if (and (buffer-file-name) |
| 142 | (not (file-remote-p (buffer-file-name))) | ||
| 142 | (not (buffer-modified-p)) | 143 | (not (buffer-modified-p)) |
| 143 | (not (and (boundp 'archive-superior-buffer) | 144 | (not (and (boundp 'archive-superior-buffer) |
| 144 | archive-superior-buffer)) | 145 | archive-superior-buffer)) |