* lisp/emacs-lisp/eieio.el (lisp-imenu-generic-expression): Fix typo.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4424a5fb389bbaadb298400b9cabc67f0cdd0e53..dd43dbb2fb246b147eb2b992d536c2edc63d0620 100644 (file)
--- 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 7e64b42d9e4d7581108c9cf6d197869508495cb7..9bbb149177f3a3897815c42d6e150b0265724717 100644 (file)
--- 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 ()