diff options
author | Bastien Guerry <bzg@altern.org> | 2013-02-27 08:46:36 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-02-27 08:46:36 +0100 |
commit | 72cc2e99d84c1348261bd8100b3e7269259dc184 (patch) | |
tree | eb4ba3ec86a3c3fea226ab8eb3f0ccbac698278a | |
parent | 43297f9ab78d7386e801b171b6f6cd1686e78dbb (diff) | |
parent | 5f47cb2b9f51c8c74f64c0e3f09873a4f10d3302 (diff) | |
download | org-mode-72cc2e99d84c1348261bd8100b3e7269259dc184.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-macs.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org-macs.el b/lisp/org-macs.el index c41e3bf..1c9b8ee 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -221,7 +221,8 @@ in `org-rm-props'." (cond ((eq key t) t) ((eq option t) t) ((assoc key option) (cdr (assoc key option))) - (t (delq nil (cdr (assq 'default option)))))) + (t (let ((r (cdr (assq 'default option)))) + (if (listp r) (delq nil r) r))))) (defsubst org-check-external-command (cmd &optional use no-error) "Check if external program CMD for USE exists, error if not. |