[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 987956a: * lisp/image-mode.el (image--imagemagick-w
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] master 987956a: * lisp/image-mode.el (image--imagemagick-wanted-p): Check for file extension. |
Date: |
Mon, 15 Oct 2018 18:31:04 -0400 (EDT) |
branch: master
commit 987956ae24b8311cf8ab4735d0147cb6a4bc370a
Author: Juri Linkov <address@hidden>
Commit: Juri Linkov <address@hidden>
* lisp/image-mode.el (image--imagemagick-wanted-p): Check for file
extension.
(Bug#32994)
(image-toggle-display-text): Let-bind create-lockfiles to nil
like in image-toggle-display-image.
---
lisp/image-mode.el | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 19fa28d..97c23e6 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -692,6 +692,7 @@ on these modes."
Remove text properties that display the image."
(let ((inhibit-read-only t)
(buffer-undo-list t)
+ (create-lockfiles nil) ; avoid changing dir mtime by lock_file
(modified (buffer-modified-p)))
(remove-list-of-text-properties (point-min) (point-max)
'(display read-nonsticky ;; intangible
@@ -781,8 +782,9 @@ was inserted."
(defun image--imagemagick-wanted-p (filename)
(and (fboundp 'imagemagick-types)
(not (eq imagemagick-types-inhibit t))
- (not (memq (intern (upcase (file-name-extension filename)) obarray)
- imagemagick-types-inhibit))))
+ (not (and (file-name-extension filename)
+ (memq (intern (upcase (file-name-extension filename)) obarray)
+ imagemagick-types-inhibit)))))
(defun image-toggle-hex-display ()
"Toggle between image and hex display."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 987956a: * lisp/image-mode.el (image--imagemagick-wanted-p): Check for file extension.,
Juri Linkov <=