ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Achim Gratz 2012-10-09 19:31:37 +02:00
parent 975b7f4608
commit e2e545269a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lisp/org.el
View File

@ -20006,16 +20006,18 @@ With prefix arg UNCOMPILED, load the uncompiled versions."
(if (featurep 'xemacs) "org-colview" "org-colview-xemacs") (if (featurep 'xemacs) "org-colview" "org-colview-xemacs")
"^org$" "^org-infojs$" "^org-loaddefs$" "^org-version$") "^org$" "^org-infojs$" "^org-loaddefs$" "^org-version$")
"\\|")) "\\|"))
(feats features)
(lfeat (append (lfeat (append
(sort (sort
(delq nil (mapcar (setq feats
(lambda (f) (delq nil (mapcar
(let ((feature (symbol-name f))) (lambda (f)
(if (and (string-match feature-re feature) (let ((feat (symbol-name f)))
(not (string-match remove-re feature))) (if (and (string-match feature-re feat)
feature nil))) (not (string-match remove-re feat)))
features)) feat nil)))
'string-lessp) feats)))
'string-lessp)
(list "org-version" "org"))) (list "org-version" "org")))
(load-suffixes (if uncompiled (reverse load-suffixes) load-suffixes)) (load-suffixes (if uncompiled (reverse load-suffixes) load-suffixes))
(load-misses ())) (load-misses ()))