From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Robert Cochran Newsgroups: gmane.emacs.bugs Subject: bug#24427: 25.1.50; end-of-defun jumps too far Date: Tue, 13 Sep 2016 13:26:59 -0700 Message-ID: <87d1k7a6lo.fsf@cochranmail.com> References: <87fup4q7ut.fsf@mbork.pl> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1473798501 28584 195.159.176.226 (13 Sep 2016 20:28:21 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 13 Sep 2016 20:28:21 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) Cc: 24427@debbugs.gnu.org To: Marcin Borkowski Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Sep 13 22:28:17 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bjuJS-0006bP-2x for geb-bug-gnu-emacs@m.gmane.org; Tue, 13 Sep 2016 22:28:16 +0200 Original-Received: from localhost ([::1]:51459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjuJQ-0001Vg-6H for geb-bug-gnu-emacs@m.gmane.org; Tue, 13 Sep 2016 16:28:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59031) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjuJK-0001VL-Nn for bug-gnu-emacs@gnu.org; Tue, 13 Sep 2016 16:28:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bjuJG-0004lK-Hc for bug-gnu-emacs@gnu.org; Tue, 13 Sep 2016 16:28:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:32992) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjuJG-0004lC-Bs for bug-gnu-emacs@gnu.org; Tue, 13 Sep 2016 16:28:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bjuJG-0002it-5W for bug-gnu-emacs@gnu.org; Tue, 13 Sep 2016 16:28:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Robert Cochran Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 13 Sep 2016 20:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 24427 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 24427-submit@debbugs.gnu.org id=B24427.147379843310403 (code B ref 24427); Tue, 13 Sep 2016 20:28:02 +0000 Original-Received: (at 24427) by debbugs.gnu.org; 13 Sep 2016 20:27:13 +0000 Original-Received: from localhost ([127.0.0.1]:58937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bjuIT-0002hj-0x for submit@debbugs.gnu.org; Tue, 13 Sep 2016 16:27:13 -0400 Original-Received: from mail.workgrouplinux.net ([207.195.177.82]:51415) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bjuIR-0002hZ-PE for 24427@debbugs.gnu.org; Tue, 13 Sep 2016 16:27:12 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=simple; d=cochranmail.com; h=from:to :cc:subject:references:date:in-reply-to:message-id:mime-version :content-type; s=dkim1; bh=3PkzmrkbilRCeXx/RsauSAk1ees=; b=oVmCl 9nFLndagoPtVqswSlltHUz7l4QKUX/HpIjd6JTlC5D5xus9wuGlArYSlwTqz30fU jdlhEjjxb5vjZmLIoD9tu1IDS0My45iU7uqklu8IRJAjF6arF14lP9UAj80xyPFJ KSkNsP8GzY/seUc8LbQfoJSl+TrmumpGILUdUTcwN7d14tHRtJ/dOUxHY6STit62 aKa7YUAwDHQP2fpuazydB6AuxY8f9GVpaeGivo1TnzufD5AxVLMK7tESDf3U2MD3 FzR+xAhUyeqbmbhQeXm3q/b35y10rOs58c0Od3lCRICkfgPuaMAj/kqKPXd7IxfU hCxg7MoqxhnpC+zgA== Original-Received: (qmail 24616 invoked by uid 0); 13 Sep 2016 20:27:08 -0000 Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=private; d=cochranmail.com; b=l5m+N9tssYGSmk/AnvQp7FWzSmmKZRZffBWVHzuykejzZpB490EY5ERCtuQYxTN1ClEbSOOaEgJU/gfGLRfGrA==; Original-Received: from 74-93-99-217-washington.hfc.comcastbusiness.net (HELO SoraLaptop) (robert@cochranmail.com@74.93.99.217) by mail.cochrantribe.org with ESMTPA; 13 Sep 2016 20:27:08 -0000 In-Reply-To: <87fup4q7ut.fsf@mbork.pl> (Marcin Borkowski's message of "Tue, 13 Sep 2016 14:53:14 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:123272 Archived-At: --=-=-= Content-Type: text/plain Appears to be an off-by-one error when calling `beginning-of-defun-raw` during the second part of moving forward. This patch `1+`s the `(- arg)` to make both methods equivalent. Please do not hesitate to mention anything I may have missed. ----- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Fix-off-by-one-error-when-going-forward-in-end-of-de.patch Content-Description: Fix off-by-one error in end-of-defun >From 0f4facc6ea2bfe01ba3b8c7e3a0e99210d1bb1e1 Mon Sep 17 00:00:00 2001 From: Robert Cochran Date: Tue, 13 Sep 2016 13:17:32 -0700 Subject: [PATCH] Fix off-by-one error when going forward in end-of-defun end-of-defun (C-M-e) goes forward one too many defuns when given a prefix argument. Fix this so that doing 'C-M-e' foo times and using 'C-u foo C-M-e' do the same thing. * lisp/emacs-lisp/lisp.el (end-of-defun): Fix off-by-one error when going forward. --- lisp/emacs-lisp/lisp.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index ea7cce6..bf03c44 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -452,7 +452,7 @@ end-of-defun ;; We started from after the end of the previous function. (goto-char pos)) (unless (zerop arg) - (beginning-of-defun-raw (- arg)) + (beginning-of-defun-raw (1+ (- arg))) (funcall end-of-defun-function))) ((< arg 0) ;; Moving backward. -- 2.7.4 --=-=-= Content-Type: text/plain ----- HTH, -- ~Robert Cochran GPG Fingerprint - E778 2DD4 FEA6 6A68 6F26 AD2D E5C3 EB36 4886 8871 --=-=-=--