diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-12-08 08:23:43 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-12-08 08:23:43 -0500 |
| commit | 98449af85cfedd241576e35e15d523e38e472c3b (patch) | |
| tree | 4677e363afc8067591e0c6eda7d05228c756b0d0 /lisp | |
| parent | b09d01daefabb424b0a02b2ae364f29064ddfd9d (diff) | |
| download | emacs-98449af85cfedd241576e35e15d523e38e472c3b.tar.gz | |
* lisp/emacs-lisp/lisp-mode.el (defmethod): Add doc-string-elt.
Fixes: debbugs:10244
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f27ed2abb65..828d67fc376 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2011-12-08 Stefan Monnier <monnier@iro.umontreal.ca> + * emacs-lisp/lisp-mode.el (defmethod): Add doc-string-elt (bug#10244). + * pcmpl-gnu.el: Don't fail when there is no Makefile nor -f arg. (pcmpl-gnu-makefile-regexps): Accept "makefile" as well as files that end in ".mk". diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index f9e7fe44824..44e87e171d1 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -131,6 +131,7 @@ (put 'autoload 'doc-string-elt 3) (put 'defun 'doc-string-elt 3) (put 'defun* 'doc-string-elt 3) +(put 'defmethod 'doc-string-elt 3) (put 'defvar 'doc-string-elt 3) (put 'defcustom 'doc-string-elt 3) (put 'deftheme 'doc-string-elt 2) |