From e2e545269a20e01f4f06960c8b430f459b3d96e3 Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Tue, 9 Oct 2012 19:31:37 +0200 Subject: [PATCH] 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 --- lisp/org.el | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 4a60e90e4..410df69bd 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -20006,16 +20006,18 @@ 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 - (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)) - 'string-lessp) + (setq feats + (delq nil (mapcar + (lambda (f) + (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)) (load-misses ()))