org-reload: bugfix when first element of features is nil
* lisp/org.el (org-reload): Let-bind features and make sure to use the result of delq and not just the side-effects. Otherwise a spurious (nil ...) remains at the beginning of the list and leads to a spurious warning about a possible reload error. Thanks to Rainer M. Krug for reporting this. http://permalink.gmane.org/gmane.emacs.orgmode/61429
This commit is contained in:
parent
975b7f4608
commit
e2e545269a
12
lisp/org.el
12
lisp/org.el
|
@ -20006,15 +20006,17 @@ With prefix arg UNCOMPILED, load the uncompiled versions."
|
|||
(if (featurep 'xemacs) "org-colview" "org-colview-xemacs")
|
||||
"^org$" "^org-infojs$" "^org-loaddefs$" "^org-version$")
|
||||
"\\|"))
|
||||
(feats features)
|
||||
(lfeat (append
|
||||
(sort
|
||||
(setq feats
|
||||
(delq nil (mapcar
|
||||
(lambda (f)
|
||||
(let ((feature (symbol-name f)))
|
||||
(if (and (string-match feature-re feature)
|
||||
(not (string-match remove-re feature)))
|
||||
feature nil)))
|
||||
features))
|
||||
(let ((feat (symbol-name f)))
|
||||
(if (and (string-match feature-re feat)
|
||||
(not (string-match remove-re feat)))
|
||||
feat nil)))
|
||||
feats)))
|
||||
'string-lessp)
|
||||
(list "org-version" "org")))
|
||||
(load-suffixes (if uncompiled (reverse load-suffixes) load-suffixes))
|
||||
|
|
Loading…
Reference in New Issue