* lisp/emacs-lisp/eieio.el (defmethod): Fix typo in last change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 449c67b0cfb522927d29aaba0ab00cc4cd055120..d50712503f2b8a995a7609caf1de5e5447dede08 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,14 @@
+2011-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/eieio.el (defmethod): Fix typo in last change.
+
 2011-05-07  Eli Zaretskii  <eliz@gnu.org>
 
        * mail/sendmail.el (send-mail-function): On MS-Windows, default to
        mailclient-send-it even if window-system is nil.  (Bug#8595)
 
-       * term/w32console.el (terminal-init-w32console): Call
-       get-screen-color and use its output to set the frame
+       * term/w32console.el (terminal-init-w32console):
+       Call get-screen-color and use its output to set the frame
        background-mode.  (Bug#8597)
 
 2011-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -65,8 +69,8 @@
 
 2011-05-05  Michael Albinus  <michael.albinus@gmx.de>
 
-       * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Fix
-       port computation bug.  (Bug#8618)
+       * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):
+       Fix port computation bug.  (Bug#8618)
 
 2011-05-05  Glenn Morris  <rgm@gnu.org>
 

diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index d71213bfac8297d90713c4ff4100e47b4b916a36..6abf9aa36571960e758072ff9f6836ff6fb4c440 100644 (file)
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -1298,11 +1298,11 @@ Summary:
   (let* ((key (if (keywordp (car args)) (pop args)))
         (params (car args))
         (arg1 (car params))
-         (args (if (consp arg1)
+         (fargs (if (consp arg1)
                    (cons (car arg1) (cdr params))
                  params))
         (class (if (consp arg1) (nth 1 arg1)))
-         (code `(lambda ,args ,@(cdr args))))
+         (code `(lambda ,fargs ,@(cdr args))))
     `(progn
        ;; Make sure there is a generic and the byte-compiler sees it.
        (defgeneric ,method ,args