aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorRobin Templeton <[email protected]>2014-08-12 07:42:29 -0400
committerRobin Templeton <[email protected]>2015-04-20 00:29:03 -0400
commitd3d26d60074e54c4d392bbce0e3a8f37b1fa31ff (patch)
tree277134c48558f555708387133581d711a498e59d /lisp
parent59cddd59e27cabe03f39366912c474c99789e7ed (diff)
autoloading eval-when forms
Diffstat (limited to 'lisp')
-rw-r--r--lisp/emacs-lisp/autoload.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 361e8fa7c6..9bd7cc1ed7 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -127,7 +127,9 @@ expression, in which case we want to handle forms differently."
;; (message "autoload of %S" (nth 1 form))
`(autoload ,(nth 1 form) ,file ,doc ,interactive ,type)))
- ((and expansion (memq car '(progn prog1)))
+ ((and expansion
+ (or (memq car '(progn prog1))
+ (and (eq car 'eval-when) (setq form (cdr form)))))
(let ((end (memq :autoload-end form)))
(when end ;Cut-off anything after the :autoload-end marker.
(setq form (copy-sequence form))