From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lawrence Mitchell Newsgroups: gmane.emacs.bugs Subject: bug#11686: 24.1.50; defun should return name Date: Wed, 13 Jun 2012 10:13:10 +0100 Message-ID: <87mx47h8wp.fsf@gmx.li> References: <87ipewb637.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: dough.gmane.org 1339578877 20439 80.91.229.3 (13 Jun 2012 09:14:37 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 13 Jun 2012 09:14:37 +0000 (UTC) To: 11686@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jun 13 11:14:35 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Sejen-0006Hq-0t for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 Jun 2012 11:14:29 +0200 Original-Received: from localhost ([::1]:51704 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sejem-0007sS-SJ for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 Jun 2012 05:14:28 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:34478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sejee-0007r6-Tu for bug-gnu-emacs@gnu.org; Wed, 13 Jun 2012 05:14:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SejeZ-0008LC-Tv for bug-gnu-emacs@gnu.org; Wed, 13 Jun 2012 05:14:20 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:59146) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SejeZ-0008L8-RN for bug-gnu-emacs@gnu.org; Wed, 13 Jun 2012 05:14:15 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1SejhF-0001ER-U5 for bug-gnu-emacs@gnu.org; Wed, 13 Jun 2012 05:17:01 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <87ipewb637.fsf@gnu.org> Resent-From: Lawrence Mitchell Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 13 Jun 2012 09:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11686 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.13395789924696 (code B ref -1); Wed, 13 Jun 2012 09:17:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 13 Jun 2012 09:16:32 +0000 Original-Received: from localhost ([127.0.0.1]:40459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Sejgl-0001Dh-Tt for submit@debbugs.gnu.org; Wed, 13 Jun 2012 05:16:32 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:32864) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Sejgi-0001DZ-Pf for submit@debbugs.gnu.org; Wed, 13 Jun 2012 05:16:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sejdx-0008JM-A4 for submit@debbugs.gnu.org; Wed, 13 Jun 2012 05:13:41 -0400 Original-Received: from lists.gnu.org ([208.118.235.17]:60725) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sejdx-0008JI-6j for submit@debbugs.gnu.org; Wed, 13 Jun 2012 05:13:37 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:34399) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sejdr-0007Yf-3e for bug-gnu-emacs@gnu.org; Wed, 13 Jun 2012 05:13:36 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sejdp-0008IZ-BO for bug-gnu-emacs@gnu.org; Wed, 13 Jun 2012 05:13:30 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:55127) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sejdp-0008IU-4Z for bug-gnu-emacs@gnu.org; Wed, 13 Jun 2012 05:13:29 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Sejdj-0002rK-C9 for bug-gnu-emacs@gnu.org; Wed, 13 Jun 2012 11:13:23 +0200 Original-Received: from e4300lm.epcc.ed.ac.uk ([129.215.63.156]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 13 Jun 2012 11:13:23 +0200 Original-Received: from wence by e4300lm.epcc.ed.ac.uk with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 13 Jun 2012 11:13:23 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 55 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: e4300lm.epcc.ed.ac.uk User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.1.50 (gnu/linux) Cancel-Lock: sha1:noBDboJYfeIbD8xkCBvnYpkrmXY= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:60923 Archived-At: Johan Bockgård wrote: > With current trunk, > (defun NAME ()) => (lambda nil nil) > expected => NAME > Ditto for defmacro. Here's a patch, think this is right: Return NAME, not definition from defun and defmacro * lisp/emacs-lisp/byte-run.el (defun, defmacro): Return newly created definition's name, not its definition. diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index 635eef9..fb86b2a 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -135,9 +135,11 @@ interpreted according to `macro-declarations-alist'." (if docstring (setq body (cons docstring body))) ;; Can't use backquote because it's not defined yet! (let* ((fun (list 'function (cons 'lambda (cons arglist body)))) - (def (list 'defalias - (list 'quote name) - (list 'cons ''macro fun))) + (def (cons 'prog1 + (list (list 'quote name) + (list 'defalias + (list 'quote name) + (list 'cons ''macro fun))))) (declarations (mapcar #'(lambda (x) @@ -190,11 +192,13 @@ interpreted according to `defun-declarations-alist'. (t (message "Warning: Unknown defun property %S in %S" (car x) name))))) decls)) - (def (list 'defalias - (list 'quote name) - (list 'function - (cons 'lambda - (cons arglist body)))))) + (def (cons 'prog1 + (list (list 'quote name) + (list 'defalias + (list 'quote name) + (list 'function + (cons 'lambda + (cons arglist body)))))))) (if declarations (cons 'prog1 (cons def declarations)) def))))