summaryrefslogtreecommitdiff
path: root/lisp/image-file.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2020-08-03 09:14:52 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2020-08-03 09:14:52 +0200
commite1f09607e02eb507b229285ed48b85a3c6a50259 (patch)
tree4ad022c57d9be661ac860aa647df074c62f249b9 /lisp/image-file.el
parent79527cd56e9e3f8b5b1630fe18b92f7ea95e87fd (diff)
downloademacs-e1f09607e02eb507b229285ed48b85a3c6a50259.tar.gz
Make `n'/`p' in image-mode also find externally converted images
* lisp/image-file.el (image-file-name-regexp): Use it to make `n'/`p' in image mode work (bug#39994). * lisp/image/image-converter.el (image-converter-file-name-extensions): New variable to keep track of all suffixes. (image-convert-p): Update. (image-converter--find-converter): Set.
Diffstat (limited to 'lisp/image-file.el')
-rw-r--r--lisp/image-file.el12
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/image-file.el b/lisp/image-file.el
index 89cd75d50dd..22366c89e6a 100644
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -32,6 +32,7 @@
;;; Code:
(require 'image)
+(require 'image-converter)
;;;###autoload
@@ -80,10 +81,13 @@ the variable is set using \\[customize]."
(let ((exts-regexp
(and image-file-name-extensions
(concat "\\."
- (regexp-opt (nconc (mapcar #'upcase
- image-file-name-extensions)
- image-file-name-extensions)
- t)
+ (regexp-opt
+ (append (mapcar #'upcase image-file-name-extensions)
+ image-file-name-extensions
+ (mapcar #'upcase
+ image-converter-file-name-extensions)
+ image-converter-file-name-extensions)
+ t)
"\\'"))))
(mapconcat
'identity