aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2011-12-08 08:23:43 -0500
committerStefan Monnier2011-12-08 08:23:43 -0500
commit98449af85cfedd241576e35e15d523e38e472c3b (patch)
tree4677e363afc8067591e0c6eda7d05228c756b0d0
parentb09d01daefabb424b0a02b2ae364f29064ddfd9d (diff)
downloademacs-98449af85cfedd241576e35e15d523e38e472c3b.tar.gz
emacs-98449af85cfedd241576e35e15d523e38e472c3b.zip
* lisp/emacs-lisp/lisp-mode.el (defmethod): Add doc-string-elt.
Fixes: debbugs:10244
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/lisp-mode.el1
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 @@
12011-12-08 Stefan Monnier <monnier@iro.umontreal.ca> 12011-12-08 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * emacs-lisp/lisp-mode.el (defmethod): Add doc-string-elt (bug#10244).
4
3 * pcmpl-gnu.el: Don't fail when there is no Makefile nor -f arg. 5 * pcmpl-gnu.el: Don't fail when there is no Makefile nor -f arg.
4 (pcmpl-gnu-makefile-regexps): Accept "makefile" as well as files that 6 (pcmpl-gnu-makefile-regexps): Accept "makefile" as well as files that
5 end in ".mk". 7 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 @@
131(put 'autoload 'doc-string-elt 3) 131(put 'autoload 'doc-string-elt 3)
132(put 'defun 'doc-string-elt 3) 132(put 'defun 'doc-string-elt 3)
133(put 'defun* 'doc-string-elt 3) 133(put 'defun* 'doc-string-elt 3)
134(put 'defmethod 'doc-string-elt 3)
134(put 'defvar 'doc-string-elt 3) 135(put 'defvar 'doc-string-elt 3)
135(put 'defcustom 'doc-string-elt 3) 136(put 'defcustom 'doc-string-elt 3)
136(put 'deftheme 'doc-string-elt 2) 137(put 'deftheme 'doc-string-elt 2)