diff options
| -rw-r--r-- | lisp/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f08169f3ac5..22d4caba884 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,18 @@ 2006-07-17 Stefan Monnier <monnier@iro.umontreal.ca> + * emacs-lisp/autoload.el (make-autoload): Use new arg. + + * custom.el (custom-autoload): Add `noset' argument. + (custom-push-theme): Don't autoload the variable, let callers do it. + (custom-theme-set-variables): Autoload the variable if necessary. + + * cus-edit.el (custom-variable-state-set): If the variable was + originally set outside custom, but to the same value as the default, + consider it to be standard. + + * Makefile.in (mh-loaddefs.el): Finish setting up the default empty + file *before* telling Emacs to add the autoloads, in case it fails. + * progmodes/sh-script.el (sh-quoted-subshell): Don't match escaped `. Use `cond', push', and `dolist'. diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 4000b4da282..da85cbd817a 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -124,7 +124,10 @@ or macro definition or a defcustom)." ) `(progn (defvar ,varname ,init ,doc) - (custom-autoload ',varname ,file)))) + (custom-autoload ',varname ,file + ,(condition-case nil + (null (cadr (memq :set form))) + (error nil)))))) ((eq car 'defgroup) ;; In Emacs this is normally handled separately by cus-dep.el, but for |