Mercurial > emacs
changeset 108054:6daa7142a478
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Mon, 19 Apr 2010 03:43:29 +0000 |
| parents | 0f1b71b92989 (current diff) 6eae3bc10330 (diff) |
| children | 9247fef2ee7f |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Apr 19 00:32:54 2010 +0000 +++ b/lisp/ChangeLog Mon Apr 19 03:43:29 2010 +0000 @@ -1,3 +1,7 @@ +2010-04-19 Stefan Monnier <monnier@iro.umontreal.ca> + + * custom.el (defcustom): Add edebug spec. + 2010-04-18 Juri Linkov <juri@jurta.org> Test for special mode-class in view-buffer instead of view-file (bug#5513).
--- a/lisp/custom.el Mon Apr 19 00:32:54 2010 +0000 +++ b/lisp/custom.el Mon Apr 19 03:43:29 2010 +0000 @@ -304,7 +304,7 @@ See Info node `(elisp) Customization' in the Emacs Lisp manual for more information." - (declare (doc-string 3)) + (declare (doc-string 3) (debug (name body))) ;; It is better not to use backquote in this file, ;; because that makes a bootstrapping problem ;; if you need to recompile all the Lisp files using interpreted code.