summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-10-31 19:33:55 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-10-31 19:33:55 +0100
commit8860fe2938661a18d1ffb7b6bbef5f7ad4fa9d67 (patch)
tree54822011f8192aab78c1feac4781032a595e1a25
parent2567fee3c9039fbfdb93fea459738d2c0fed132b (diff)
downloadorg-mode-8860fe2938661a18d1ffb7b6bbef5f7ad4fa9d67.tar.gz
Fix `org-display-inline-images'
* lisp/org.el (org-display-inline-images): Fix regexp. Reported-by: Leslie Watter <watter@gmail.com> <http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00455.html>
-rw-r--r--lisp/org.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 5da51ce..419945f 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -19335,9 +19335,9 @@ boundaries."
;; "file:" links. Also check link abbreviations since
;; some might expand to "file" links.
(file-types-re (format "[][]\\[\\(?:file\\|[./~]%s\\)"
- (and link-abbrevs
- (format "\\|\\(?:%s:\\)"
- (regexp-opt link-abbrevs))))))
+ (if (not link-abbrevs) ""
+ (format "\\|\\(?:%s:\\)"
+ (regexp-opt link-abbrevs))))))
(while (re-search-forward file-types-re end t)
(let ((link (save-match-data (org-element-context))))
;; Check if we're at an inline image, i.e., an image file