diff options
| author | Juri Linkov <juri@linkov.net> | 2018-10-16 01:30:56 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2018-10-16 01:30:56 +0300 |
| commit | 987956ae24b8311cf8ab4735d0147cb6a4bc370a (patch) | |
| tree | 5ce6db3bd155ab2aca3c7d8782481573c0879061 /lisp | |
| parent | 96df6043bdd67507a7e3289ef2611e077933deb4 (diff) | |
| download | emacs-987956ae24b8311cf8ab4735d0147cb6a4bc370a.tar.gz emacs-987956ae24b8311cf8ab4735d0147cb6a4bc370a.tar.bz2 emacs-987956ae24b8311cf8ab4735d0147cb6a4bc370a.zip | |
* 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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/image-mode.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 19fa28d4401..97c23e67480 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." |