From 5396468298b0122469e0b41da8f49860d99a2b51 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 19 Nov 2011 01:18:31 -0800 Subject: Spelling fixes. --- lisp/emacs-lisp/lisp-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/emacs-lisp/lisp-mode.el') diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 9408c0a3c9d..f9e7fe44824 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -769,7 +769,7 @@ this command arranges for all errors to enter the debugger." Reset the `defvar' and `defcustom' variables to the initial value. Reinitialize the face according to the `defface' specification." ;; The code in edebug-defun should be consistent with this, but not - ;; the same, since this gets a macroexpended form. + ;; the same, since this gets a macroexpanded form. (cond ((not (listp form)) form) ((and (eq (car form) 'defvar) -- cgit v1.2.3 From 98449af85cfedd241576e35e15d523e38e472c3b Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 8 Dec 2011 08:23:43 -0500 Subject: * lisp/emacs-lisp/lisp-mode.el (defmethod): Add doc-string-elt. Fixes: debbugs:10244 --- lisp/ChangeLog | 2 ++ lisp/emacs-lisp/lisp-mode.el | 1 + 2 files changed, 3 insertions(+) (limited to 'lisp/emacs-lisp/lisp-mode.el') 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 + * 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) -- cgit v1.2.3