aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-10-12 16:07:58 -0400
committerStefan Monnier2012-10-12 16:07:58 -0400
commitbd0ffffd5a90e25d32708dd4fec29578648e1fad (patch)
tree1200f493905572c6463e5efcc39dd1f279328065
parent57e5e467de9748256c96c5f3bda3e5dcb766e896 (diff)
downloademacs-bd0ffffd5a90e25d32708dd4fec29578648e1fad.tar.gz
emacs-bd0ffffd5a90e25d32708dd4fec29578648e1fad.zip
* lisp/emacs-lisp/eieio.el (lisp-imenu-generic-expression): Fix typo.
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/emacs-lisp/eieio.el4
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 @@
12012-10-12 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * emacs-lisp/eieio.el (lisp-imenu-generic-expression): Fix typo.
4
12012-10-12 Glenn Morris <rgm@gnu.org> 52012-10-12 Glenn Morris <rgm@gnu.org>
2 6
3 * mail/rmailsum.el (rmail-header-summary): 7 * mail/rmailsum.el (rmail-header-summary):
@@ -5,8 +9,8 @@
5 9
62012-10-12 Fabián Ezequiel Gallina <fgallina@cuca> 102012-10-12 Fabián Ezequiel Gallina <fgallina@cuca>
7 11
8 * progmodes/python.el (python-mode-map): Replace 12 * progmodes/python.el (python-mode-map):
9 subtitute-key-definition with proper command remapping. 13 Replace subtitute-key-definition with proper command remapping.
10 (python-nav--up-list): Fix behavior for blocks on the same level. 14 (python-nav--up-list): Fix behavior for blocks on the same level.
11 15
122012-10-11 Stefan Monnier <monnier@iro.umontreal.ca> 162012-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
2750method to not throw an error, and its return value becomes the 2750method to not throw an error, and its return value becomes the
2751return value of `call-next-method'." 2751return value of `call-next-method'."
2752 (signal 'no-next-method (list (object-name object) args)) 2752 (signal 'no-next-method (list (object-name object) args))
2753) 2753 )
2754 2754
2755(defgeneric clone (obj &rest params) 2755(defgeneric clone (obj &rest params)
2756 "Make a copy of OBJ, and then supply PARAMS. 2756 "Make a copy of OBJ, and then supply PARAMS.
@@ -3050,7 +3050,7 @@ Optional argument NOESCAPE is passed to `prin1-to-string' when appropriate."
3050;;; Interfacing with imenu in emacs lisp mode 3050;;; Interfacing with imenu in emacs lisp mode
3051;; (Only if the expression is defined) 3051;; (Only if the expression is defined)
3052;; 3052;;
3053(if (eval-when-compile (boundp 'list-imenu-generic-expression)) 3053(if (eval-when-compile (boundp 'lisp-imenu-generic-expression))
3054(progn 3054(progn
3055 3055
3056(defun eieio-update-lisp-imenu-expression () 3056(defun eieio-update-lisp-imenu-expression ()