From unknown Sat Jun 21 10:45:56 2025 X-Loop: don@donarmstrong.com Subject: bug#901: [PATCH] 23.0.60; "l" in "annotation" buffer does nothing Reply-To: Eric Hanchrow , 901@debbugs.gnu.org Resent-From: Eric Hanchrow Resent-To: bug-submit-list@lists.donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Sat, 06 Sep 2008 05:05:06 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 901 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Received: via spool by submit@emacsbugs.donarmstrong.com id=B.12206771466977 (code B ref -1); Sat, 06 Sep 2008 05:05:06 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-6.2 required=4.0 tests=AWL,BAYES_00,FOURLA, IMPRONONCABLE_2,MURPHY_DRUGS_REL8,RCVD_IN_DNSWL_MED autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at submit) by emacsbugs.donarmstrong.com; 6 Sep 2008 04:59:06 +0000 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m864x1JI006971 for ; Fri, 5 Sep 2008 21:59:03 -0700 Received: from mx10.gnu.org ([199.232.76.166]:57733) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1KbprL-0001Af-QN for emacs-pretest-bug@gnu.org; Sat, 06 Sep 2008 00:57:19 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Kbpsu-0000cp-BV for emacs-pretest-bug@gnu.org; Sat, 06 Sep 2008 00:59:00 -0400 Received: from smtp61.avvanta.com ([206.124.128.61]:53877 helo=mail.avvanta.com) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Kbpst-0000b5-SM for emacs-pretest-bug@gnu.org; Sat, 06 Sep 2008 00:58:56 -0400 Received: from mail.avvanta.com (localhost.pops.p.blarg.net [127.0.0.1]) by mail.avvanta.com (Postfix) with ESMTP id CE813276D06 for ; Fri, 5 Sep 2008 21:58:31 -0700 (PDT) Received: from offby1.atm01.sea.blarg.net (q-static-138-125.avvanta.com [206.124.138.125]) by mail.avvanta.com (Postfix) with ESMTP id 9D2E6276CC2 for ; Fri, 5 Sep 2008 21:58:31 -0700 (PDT) Received: from erich by offby1.atm01.sea.blarg.net with local (Exim 4.69) (envelope-from ) id 1KbpsT-000189-Ma for emacs-pretest-bug@gnu.org; Fri, 05 Sep 2008 21:58:29 -0700 From: Eric Hanchrow To: emacs-pretest-bug@gnu.org Date: Fri, 05 Sep 2008 21:58:29 -0700 Message-ID: <87prnh50qy.fsf@offby1.atm01.sea.blarg.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-BlargAV-Status: No viruses detected, BlargAV v1.1 on localhost.pops.p.blarg.net X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6 Please write in English if possible, because the Emacs maintainers usually do not have translators to read other languages for them. Your bug report will be posted to the emacs-pretest-bug@gnu.org mailing list. Please describe exactly what actions triggered the bug and the precise symptoms of the bug: I visited a file that is in a git working tree, then typed C-x v g to display annotations. I put point at the beginning of some line in that buffer, and typed "l". I expected to see point move the the line in *vc-change-log* whose commit matches that displayed in the *Annotate ... buffer, but instead it just stays on the second commit. This patch fixes it for me. lisp/vc-git.el | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 7946624..f54048e 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el @@ -491,12 +491,13 @@ REVISION may have the form BRANCH, BRANCH~N, or BRANCH^ (where \"^\" can be repeated)." (goto-char (point-min)) - (search-forward "\ncommit" nil t - (cond ((string-match "~\\([0-9]\\)$" revision) - (1+ (string-to-number (match-string 1 revision)))) - ((string-match "\\^+$" revision) - (1+ (length (match-string 0 revision)))) - (t nil))) + (let ((count (cond ((string-match "~\\([0-9]\\)$" revision) + (1+ (string-to-number (match-string 1 revision)))) + ((string-match "\\^+$" revision) + (1+ (length (match-string 0 revision)))) + (t nil)))) + (let ((sought (if count "\ncommit" (format "\ncommit %s" revision)))) + (search-forward sought nil t count))) (beginning-of-line)) (defun vc-git-diff (files &optional rev1 rev2 buffer) -- 1.6.0.1.216.g1b23a If Emacs crashed, and you have the Emacs process in the gdb debugger, please include the output from the following gdb commands: `bt full' and `xbacktrace'. If you would like to further debug the crash, please read the file /usr/local/src/emacs-via-git/etc/DEBUG for instructions. In GNU Emacs 23.0.60.16 (i686-pc-linux-gnu, GTK+ Version 2.12.9) of 2008-09-05 on debian configured using `configure '--enable-maintainer-mode' '--with-xpm=yes' '--with-jpeg=no' '--with-gif=no' '--with-tiff=no' '--with-xft' '--with-x-toolkit=gtk'' Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: nil value of $XMODIFIERS: nil locale-coding-system: utf-8-unix default-enable-multibyte-characters: t Major mode: Diff Minor modes in effect: erc-ring-mode: t erc-pcomplete-mode: t erc-netsplit-mode: t erc-button-mode: t erc-fill-mode: t erc-stamp-mode: t erc-autojoin-mode: t erc-track-mode: t erc-track-minor-mode: t erc-match-mode: t erc-log-mode: t erc-services-mode: t erc-networks-mode: t erc-irccontrols-mode: t erc-noncommands-mode: t erc-readonly-mode: t desktop-save-mode: t recentf-mode: t display-time-mode: t global-auto-revert-mode: t diff-auto-refine-mode: t shell-dirtrack-mode: t iswitchb-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t global-auto-composition-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Recent input: C-x o C-n C-n l C-x 0 C-x b s h e RET c SPC / u s r C-a ESC f d C-e / l o c TAB s r TAB e m TAB RET g i t SPC l o g SPC - 3 SPC - - n o - m e r g e s RET C-c C-p C-n ESC C-b ESC C-@ ESC w ESC > g o t SPC DEL DEL DEL g i DEL DEL i t SPC f o r m a t - p a t c h SPC C-y RET C-x d RET g C-u C-n d d d d d d d d d d d d d d x y e s RET q ESC x w o m a n RET g i t - f o r TAB m TAB RET C-v q ESC p . . RET ESC p H E A D RET C-x RET g C-x d RET g C-p C-p C-p C-p d d d d x y e s RET q ESC p ESC DEL ESC b . . C-e DEL DEL RET ESC p ^ RET ESC p DEL ESC C-b DEL DEL C-e C-c C-p C-n C-e C-@ C-g SPC - 1 RET C-p ESC x f f a p RET RET C-x C-q n n p p q ESC > C-x b RET C-x k RET C-x 2 C-x b C-r C-r C-r C-r RET ESC < C-s s i g n C-x o ESC p SPC - s RET C-p ESC x f f a p RET RET y e s RET C-x 1 n n C-x u C-x C-q n p ESC 0 C-l ESC x r e p o r t - e m TAB RET Recent messages: 4 of 4 deletions 4 deletions done History item: 1 [3 times] Mark set Quit diff-hunk-prev: No previous hunk Mark set [2 times] Mark saved where search started History item: 1 Undo! -- The whole point of loud music is to make it possible to date without talking. -- Roger Ebert From unknown Sat Jun 21 10:45:56 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.420 (Entity 5.420) X-Loop: don@donarmstrong.com From: help-debbugs@gnu.org (Emacs bug Tracking System) To: Eric Hanchrow Subject: bug#901 closed by Chong Yidong (Re: [PATCH] 23.0.60; "l" in "annotation" buffer does nothing) Message-ID: References: <878wsfrm80.fsf@cyd.mit.edu> <87prnh50qy.fsf@offby1.atm01.sea.blarg.net> X-Emacs-PR-Message: they-closed 901 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: patch Reply-To: 901@debbugs.gnu.org Content-Type: multipart/mixed; boundary="----------=_1224800710-7444-1" This is a multi-part message in MIME format... ------------=_1224800710-7444-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is an automatic notification regarding your bug report which was filed against the emacs package: #901: [PATCH] 23.0.60; "l" in "annotation" buffer does nothing It has been closed by Chong Yidong . Their explanation is attached below along with your original report. If this explanation is unsatisfactory and you have not received a better one in a separate message then please contact Chong Yidong by replying to this email. --=20 901: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D901 Emacs Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1224800710-7444-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit >From cyd@stupidchicken.com Thu Oct 23 15:16:31 2008 X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-3.9 required=4.0 tests=AWL,BAYES_00, MURPHY_DRUGS_REL8 autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at 901-done) by emacsbugs.donarmstrong.com; 23 Oct 2008 22:16:31 +0000 Received: from cyd.mit.edu (CYD.MIT.EDU [18.115.2.24]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m9NMGSDQ005516 for <901-done@emacsbugs.donarmstrong.com>; Thu, 23 Oct 2008 15:16:30 -0700 Received: by cyd.mit.edu (Postfix, from userid 1000) id A725857E055; Thu, 23 Oct 2008 18:16:31 -0400 (EDT) From: Chong Yidong To: 901-done@debbugs.gnu.org Subject: Re: [PATCH] 23.0.60; "l" in "annotation" buffer does nothing Date: Thu, 23 Oct 2008 18:16:31 -0400 Message-ID: <878wsfrm80.fsf@cyd.mit.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii A different fix seems to have been checked in on 2008-10-14, so I'm closing this bug. ------------=_1224800710-7444-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit >From offby1@blarg.net Fri Sep 5 21:59:05 2008 X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-6.2 required=4.0 tests=AWL,BAYES_00,FOURLA, IMPRONONCABLE_2,MURPHY_DRUGS_REL8,RCVD_IN_DNSWL_MED autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at submit) by emacsbugs.donarmstrong.com; 6 Sep 2008 04:59:06 +0000 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m864x1JI006971 for ; Fri, 5 Sep 2008 21:59:03 -0700 Received: from mx10.gnu.org ([199.232.76.166]:57733) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1KbprL-0001Af-QN for emacs-pretest-bug@gnu.org; Sat, 06 Sep 2008 00:57:19 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Kbpsu-0000cp-BV for emacs-pretest-bug@gnu.org; Sat, 06 Sep 2008 00:59:00 -0400 Received: from smtp61.avvanta.com ([206.124.128.61]:53877 helo=mail.avvanta.com) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Kbpst-0000b5-SM for emacs-pretest-bug@gnu.org; Sat, 06 Sep 2008 00:58:56 -0400 Received: from mail.avvanta.com (localhost.pops.p.blarg.net [127.0.0.1]) by mail.avvanta.com (Postfix) with ESMTP id CE813276D06 for ; Fri, 5 Sep 2008 21:58:31 -0700 (PDT) Received: from offby1.atm01.sea.blarg.net (q-static-138-125.avvanta.com [206.124.138.125]) by mail.avvanta.com (Postfix) with ESMTP id 9D2E6276CC2 for ; Fri, 5 Sep 2008 21:58:31 -0700 (PDT) Received: from erich by offby1.atm01.sea.blarg.net with local (Exim 4.69) (envelope-from ) id 1KbpsT-000189-Ma for emacs-pretest-bug@gnu.org; Fri, 05 Sep 2008 21:58:29 -0700 From: Eric Hanchrow To: emacs-pretest-bug@gnu.org Subject: [PATCH] 23.0.60; "l" in "annotation" buffer does nothing Date: Fri, 05 Sep 2008 21:58:29 -0700 Message-ID: <87prnh50qy.fsf@offby1.atm01.sea.blarg.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-BlargAV-Status: No viruses detected, BlargAV v1.1 on localhost.pops.p.blarg.net X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6 Please write in English if possible, because the Emacs maintainers usually do not have translators to read other languages for them. Your bug report will be posted to the emacs-pretest-bug@gnu.org mailing list. Please describe exactly what actions triggered the bug and the precise symptoms of the bug: I visited a file that is in a git working tree, then typed C-x v g to display annotations. I put point at the beginning of some line in that buffer, and typed "l". I expected to see point move the the line in *vc-change-log* whose commit matches that displayed in the *Annotate ... buffer, but instead it just stays on the second commit. This patch fixes it for me. lisp/vc-git.el | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 7946624..f54048e 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el @@ -491,12 +491,13 @@ REVISION may have the form BRANCH, BRANCH~N, or BRANCH^ (where \"^\" can be repeated)." (goto-char (point-min)) - (search-forward "\ncommit" nil t - (cond ((string-match "~\\([0-9]\\)$" revision) - (1+ (string-to-number (match-string 1 revision)))) - ((string-match "\\^+$" revision) - (1+ (length (match-string 0 revision)))) - (t nil))) + (let ((count (cond ((string-match "~\\([0-9]\\)$" revision) + (1+ (string-to-number (match-string 1 revision)))) + ((string-match "\\^+$" revision) + (1+ (length (match-string 0 revision)))) + (t nil)))) + (let ((sought (if count "\ncommit" (format "\ncommit %s" revision)))) + (search-forward sought nil t count))) (beginning-of-line)) (defun vc-git-diff (files &optional rev1 rev2 buffer) -- 1.6.0.1.216.g1b23a If Emacs crashed, and you have the Emacs process in the gdb debugger, please include the output from the following gdb commands: `bt full' and `xbacktrace'. If you would like to further debug the crash, please read the file /usr/local/src/emacs-via-git/etc/DEBUG for instructions. In GNU Emacs 23.0.60.16 (i686-pc-linux-gnu, GTK+ Version 2.12.9) of 2008-09-05 on debian configured using `configure '--enable-maintainer-mode' '--with-xpm=yes' '--with-jpeg=no' '--with-gif=no' '--with-tiff=no' '--with-xft' '--with-x-toolkit=gtk'' Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: nil value of $XMODIFIERS: nil locale-coding-system: utf-8-unix default-enable-multibyte-characters: t Major mode: Diff Minor modes in effect: erc-ring-mode: t erc-pcomplete-mode: t erc-netsplit-mode: t erc-button-mode: t erc-fill-mode: t erc-stamp-mode: t erc-autojoin-mode: t erc-track-mode: t erc-track-minor-mode: t erc-match-mode: t erc-log-mode: t erc-services-mode: t erc-networks-mode: t erc-irccontrols-mode: t erc-noncommands-mode: t erc-readonly-mode: t desktop-save-mode: t recentf-mode: t display-time-mode: t global-auto-revert-mode: t diff-auto-refine-mode: t shell-dirtrack-mode: t iswitchb-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t global-auto-composition-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Recent input: C-x o C-n C-n l C-x 0 C-x b s h e RET c SPC / u s r C-a ESC f d C-e / l o c TAB s r TAB e m TAB RET g i t SPC l o g SPC - 3 SPC - - n o - m e r g e s RET C-c C-p C-n ESC C-b ESC C-@ ESC w ESC > g o t SPC DEL DEL DEL g i DEL DEL i t SPC f o r m a t - p a t c h SPC C-y RET C-x d RET g C-u C-n d d d d d d d d d d d d d d x y e s RET q ESC x w o m a n RET g i t - f o r TAB m TAB RET C-v q ESC p . . RET ESC p H E A D RET C-x RET g C-x d RET g C-p C-p C-p C-p d d d d x y e s RET q ESC p ESC DEL ESC b . . C-e DEL DEL RET ESC p ^ RET ESC p DEL ESC C-b DEL DEL C-e C-c C-p C-n C-e C-@ C-g SPC - 1 RET C-p ESC x f f a p RET RET C-x C-q n n p p q ESC > C-x b RET C-x k RET C-x 2 C-x b C-r C-r C-r C-r RET ESC < C-s s i g n C-x o ESC p SPC - s RET C-p ESC x f f a p RET RET y e s RET C-x 1 n n C-x u C-x C-q n p ESC 0 C-l ESC x r e p o r t - e m TAB RET Recent messages: 4 of 4 deletions 4 deletions done History item: 1 [3 times] Mark set Quit diff-hunk-prev: No previous hunk Mark set [2 times] Mark saved where search started History item: 1 Undo! -- The whole point of loud music is to make it possible to date without talking. -- Roger Ebert ------------=_1224800710-7444-1--