summaryrefslogtreecommitdiff
path: root/lisp/org/org-jsinfo.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/org/org-jsinfo.el')
-rw-r--r--lisp/org/org-jsinfo.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org/org-jsinfo.el b/lisp/org/org-jsinfo.el
index 15011c71ff7..c13629976dc 100644
--- a/lisp/org/org-jsinfo.el
+++ b/lisp/org/org-jsinfo.el
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.16
+;; Version: 6.19a
;;
;; This file is part of GNU Emacs.
;;
@@ -140,7 +140,7 @@ Option settings will replace the %MANAGER-OPTIONS cookie."
default (cdr (assoc opt org-infojs-options)))
(and (symbolp default) (not (memq default '(t nil)))
(setq default (plist-get exp-plist default)))
- (if (string-match (format " %s:\\(\\S-+\\)" opt) v)
+ (if (and v (string-match (format " %s:\\(\\S-+\\)" opt) v))
(setq val (match-string 1 v))
(setq val default))
(cond