diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-10-12 16:07:58 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-10-12 16:07:58 -0400 |
| commit | bd0ffffd5a90e25d32708dd4fec29578648e1fad (patch) | |
| tree | 1200f493905572c6463e5efcc39dd1f279328065 | |
| parent | 57e5e467de9748256c96c5f3bda3e5dcb766e896 (diff) | |
| download | emacs-bd0ffffd5a90e25d32708dd4fec29578648e1fad.tar.gz | |
* lisp/emacs-lisp/eieio.el (lisp-imenu-generic-expression): Fix typo.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/emacs-lisp/eieio.el | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4424a5fb389..dd43dbb2fb2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-10-12 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/eieio.el (lisp-imenu-generic-expression): Fix typo. + 2012-10-12 Glenn Morris <rgm@gnu.org> * mail/rmailsum.el (rmail-header-summary): @@ -5,8 +9,8 @@ 2012-10-12 Fabián Ezequiel Gallina <fgallina@cuca> - * progmodes/python.el (python-mode-map): Replace - subtitute-key-definition with proper command remapping. + * progmodes/python.el (python-mode-map): + Replace subtitute-key-definition with proper command remapping. (python-nav--up-list): Fix behavior for blocks on the same level. 2012-10-11 Stefan Monnier <monnier@iro.umontreal.ca> diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 7e64b42d9e4..9bbb149177f 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -2750,7 +2750,7 @@ This method signals `no-next-method' by default. Override this method to not throw an error, and its return value becomes the return value of `call-next-method'." (signal 'no-next-method (list (object-name object) args)) -) + ) (defgeneric clone (obj &rest params) "Make a copy of OBJ, and then supply PARAMS. @@ -3050,7 +3050,7 @@ Optional argument NOESCAPE is passed to `prin1-to-string' when appropriate." ;;; Interfacing with imenu in emacs lisp mode ;; (Only if the expression is defined) ;; -(if (eval-when-compile (boundp 'list-imenu-generic-expression)) +(if (eval-when-compile (boundp 'lisp-imenu-generic-expression)) (progn (defun eieio-update-lisp-imenu-expression () |