From c46626351cb23fdb990174ad86da00bd4e159c81 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 7 May 2011 23:33:28 -0300 Subject: [PATCH] * lisp/emacs-lisp/eieio.el (defmethod): Fix typo in last change. --- lisp/ChangeLog | 12 ++++++++---- lisp/emacs-lisp/eieio.el | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 449c67b0cfb..d50712503f2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,10 +1,14 @@ +2011-05-08 Stefan Monnier + + * emacs-lisp/eieio.el (defmethod): Fix typo in last change. + 2011-05-07 Eli Zaretskii * 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 @@ -65,8 +69,8 @@ 2011-05-05 Michael Albinus - * 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 diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index d71213bfac8..6abf9aa3657 100644 --- 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 -- 2.39.5