From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lee Duhem Newsgroups: gmane.emacs.devel Subject: [PATCH] src/eval.c: Several trivial fixes Date: Tue, 25 Nov 2014 11:15:28 +0800 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1416885350 28120 80.91.229.3 (25 Nov 2014 03:15:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 25 Nov 2014 03:15:50 +0000 (UTC) To: Emacs Devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 25 04:15:43 2014 Return-path: Envelope-to: ged-emacs-devel@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 1Xt6bP-0001dY-1w for ged-emacs-devel@m.gmane.org; Tue, 25 Nov 2014 04:15:43 +0100 Original-Received: from localhost ([::1]:55296 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xt6bO-0004fv-Gl for ged-emacs-devel@m.gmane.org; Mon, 24 Nov 2014 22:15:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33712) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xt6bG-0004fj-HV for emacs-devel@gnu.org; Mon, 24 Nov 2014 22:15:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xt6bB-0007bk-6m for emacs-devel@gnu.org; Mon, 24 Nov 2014 22:15:34 -0500 Original-Received: from mail-qg0-x22f.google.com ([2607:f8b0:400d:c04::22f]:35163) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xt6bB-0007ba-2g for emacs-devel@gnu.org; Mon, 24 Nov 2014 22:15:29 -0500 Original-Received: by mail-qg0-f47.google.com with SMTP id z60so7630726qgd.20 for ; Mon, 24 Nov 2014 19:15:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=M17WsBi7Xh2h6NOCmwLxYUCNNxgCIfOcqaQ9ggHCbys=; b=zw2bussZ5drXBf49Z5WzNIfHPIJxKw8yp3t827IkhgvuOAp4fKMN13KYlrJChQUgwG F+0LBoWyQgLAyrwPQ/RRIsSv4ephR1rujLquxHRm2/veO45j+7UsSf5iIbFrdJ6I44QV qqQ0b5g0pTZjUMAuhmWFfjmlqdEfQIqftvhcpbhMbMxdDQcQgMZrFRXNhXTQhwDDpvRz GvgXbawAWyehJCBPWEyu2M+z71kfzzmza397h4QXD4sTTRTVC0MMowVwaSG83kK+LeKB 9ZSOTxdheuKtyuR6i7ifd/Zt8C9o6zAptWWo36CPLkRPAUCqfE7rW1nEgliE553MblbC /TZA== X-Received: by 10.140.98.54 with SMTP id n51mr33503758qge.79.1416885328514; Mon, 24 Nov 2014 19:15:28 -0800 (PST) Original-Received: by 10.140.37.37 with HTTP; Mon, 24 Nov 2014 19:15:28 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::22f X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:178215 Archived-At: --- src/ChangeLog | 8 ++++++++ src/eval.c | 9 ++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 448de36..f85a0dc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2014-11-25 Lee Duhem + + * eval.c (Fsignal): Remove duplicate condition in whether-to-start- + debugger test. + (autoload-do-load): Remove extra verb in doc string. + (apply_lambda): Remove unnecessary comma expression. + (backtrace_eval_unrewind): Remove empty comment. + 2014-11-24 Lars Magne Ingebrigtsen * gnutls.c: Fix compilation warnings given fix --enable-gcc-warnings. diff --git a/src/eval.c b/src/eval.c index 77b1db9..949f4da 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1532,8 +1532,7 @@ See also the function `condition-case'. */) || NILP (clause) /* A `debug' symbol in the handler list disables the normal suppression of the debugger. */ - || (CONSP (clause) && CONSP (clause) - && !NILP (Fmemq (Qdebug, clause))) + || (CONSP (clause) && !NILP (Fmemq (Qdebug, clause))) /* Special handler that means "print a message and run debugger if requested". */ || EQ (h->tag_or_ch, Qerror))) @@ -1917,7 +1916,7 @@ DEFUN ("autoload-do-load", Fautoload_do_load, Sautoload_do_load, 1, 3, 0, If non-nil, FUNNAME should be the symbol whose function value is FUNDEF, in which case the function returns the new autoloaded function value. If equal to `macro', MACRO-ONLY specifies that FUNDEF should only be loaded if -it is defines a macro. */) +it defines a macro. */) (Lisp_Object fundef, Lisp_Object funname, Lisp_Object macro_only) { ptrdiff_t count = SPECPDL_INDEX (); @@ -2819,7 +2818,8 @@ apply_lambda (Lisp_Object fun, Lisp_Object args, ptrdiff_t count) for (i = 0; i < numargs; ) { - tem = Fcar (args_left), args_left = Fcdr (args_left); + tem = Fcar (args_left); + args_left = Fcdr (args_left); tem = eval_sub (tem); arg_vector[i++] = tem; gcpro1.nvars = i; @@ -3413,7 +3413,6 @@ backtrace_eval_unrewind (int distance) for (; distance > 0; distance--) { tmp += step; - /* */ switch (tmp->kind) { /* FIXME: Ideally we'd like to "temporarily unwind" (some of) those -- 1.9.3