From unknown Sat Aug 16 21:20:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9597: 23.3; [diff-mode] Can't quite cope with git patches Resent-From: Dave Abrahams Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 25 Sep 2011 02:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 9597 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 9597@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.13169160215002 (code B ref -1); Sun, 25 Sep 2011 02:01:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Sep 2011 02:00:21 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1R7e0x-0001Ic-HZ for submit@debbugs.gnu.org; Sat, 24 Sep 2011 22:00:21 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1R7e0t-0001IR-6V for submit@debbugs.gnu.org; Sat, 24 Sep 2011 22:00:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R7e0G-00073x-Dh for submit@debbugs.gnu.org; Sat, 24 Sep 2011 21:59:40 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([140.186.70.17]:46375) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R7e0G-00073t-Bv for submit@debbugs.gnu.org; Sat, 24 Sep 2011 21:59:36 -0400 Received: from eggs.gnu.org ([140.186.70.92]:55018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R7e0C-0008JI-Rl for bug-gnu-emacs@gnu.org; Sat, 24 Sep 2011 21:59:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R7e08-00073H-7J for bug-gnu-emacs@gnu.org; Sat, 24 Sep 2011 21:59:32 -0400 Received: from mail-vw0-f41.google.com ([209.85.212.41]:54477) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R7e08-00073D-1j for bug-gnu-emacs@gnu.org; Sat, 24 Sep 2011 21:59:28 -0400 Received: by vws16 with SMTP id 16so6826200vws.0 for ; Sat, 24 Sep 2011 18:59:26 -0700 (PDT) Received: by 10.52.96.169 with SMTP id dt9mr4702698vdb.481.1316915965654; Sat, 24 Sep 2011 18:59:25 -0700 (PDT) Received: from pluto.luannocracy.com (207-172-223-249.c3-0.smr-ubr3.sbo-smr.ma.static.cable.rcn.com. [207.172.223.249]) by mx.google.com with ESMTPS id ie2sm13598650vdb.1.2011.09.24.18.59.24 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 24 Sep 2011 18:59:25 -0700 (PDT) Received: by pluto.luannocracy.com (Postfix, from userid 501) id 07B39FC28B9; Sat, 24 Sep 2011 21:59:24 -0400 (EDT) From: Dave Abrahams Date: Sat, 24 Sep 2011 15:41:51 -0400 User-Agent: Gnus/5.110018 (No Gnus v0.18) Emacs/23.3 (darwin) Received: from pluto.luannocracy.com (207-172-223-249.c3-0.smr-ubr3.sbo-smr.ma.static.cable.rcn.com. [207.172.223.249]) by mx.google.com with ESMTPS id ha1sm12859252vdb.17.2011.09.24.12.41.52 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 24 Sep 2011 12:41:52 -0700 (PDT) Received: by pluto.luannocracy.com (Postfix, from userid 501) id 755A4FBD731; Sat, 24 Sep 2011 15:41:51 -0400 (EDT) Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.17 X-Spam-Score: -5.1 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -5.1 (-----) --=-=-= Content-Type: text/plain Content-Disposition: inline When I try to apply the last diff in the enclosed file, I get the following backtrace: --8<---------------cut here---------------start------------->8--- Debugger entered--Lisp error: (error "End of hunk ambiguously marked") signal(error ("End of hunk ambiguously marked")) error("End of hunk ambiguously marked") diff-sanity-check-hunk() diff-find-source-location(nil nil) diff-apply-hunk(nil) call-interactively(diff-apply-hunk nil nil) --8<---------------cut here---------------end--------------->8--- Seems to me that diff-mode should be able to handle the output of git-format-patch; after all, the patch command can. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Add-indirect-agenda-follow-mode.patch Content-Description: git format-patch output >From 81ab272ab709c45e898831e5e019e02cfc6617fe Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Sat, 24 Sep 2011 15:21:53 -0400 Subject: [PATCH] Add indirect agenda follow mode By setting `org-agenda-follow-indirect' to a non-nil value, `org-agenda-follow-mode' will use an indirect buffer to display only the current item, rather than the whole agenda file in which it lives --- lisp/org-agenda.el | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index b1fa5f5..1b67153 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -872,6 +872,12 @@ Needs to be set before org.el is loaded." :group 'org-agenda-startup :type 'boolean) +(defcustom org-agenda-follow-indirect nil + "Non-nil means `org-agenda-follow-mode' displays only the +current item's tree, in an indirect buffer." + :group 'org-agenda + :type 'boolean) + (defcustom org-agenda-show-outline-path t "Non-nil means show outline path in echo area after line motion." :group 'org-agenda-startup @@ -6608,8 +6614,7 @@ so that the date SD will be in that range." (interactive) (setq org-agenda-follow-mode (not org-agenda-follow-mode)) (org-agenda-set-mode-name) - (if (and org-agenda-follow-mode (org-get-at-bol 'org-marker)) - (org-agenda-show)) + (org-agenda-do-context-action) (message "Follow mode is %s" (if org-agenda-follow-mode "on" "off"))) @@ -6771,7 +6776,9 @@ When called with a prefix argument, include all archive files as well." "Show outline path and, maybe, follow mode window." (let ((m (org-get-at-bol 'org-marker))) (if (and org-agenda-follow-mode m) - (org-agenda-show)) + (if org-agenda-follow-indirect + (org-agenda-tree-to-indirect-buffer) + (org-agenda-show))) (if (and m org-agenda-show-outline-path) (org-with-point-at m (org-display-outline-path t))))) -- 1.7.3.4 --=-=-= Content-Type: text/plain Content-Disposition: inline In GNU Emacs 23.3.1 (x86_64-apple-darwin10.8.0, Carbon Version 1.6.0 AppKit 1038.36) of 2011-09-12 on pluto.luannocracy.com Windowing system distributor `Apple Inc.', version 10.6.8 configured using `configure '--with-mac' '--enable-mac-app' '--prefix=/usr/local/stow/emacs-23.3' 'CC=gcc -arch x86_64'' 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: iso-latin-1-unix default enable-multibyte-characters: t Major mode: Diff Minor modes in effect: highlight-changes-visible-mode: t diff-auto-refine-mode: t recentf-mode: t frame-bufs-mode: t pretty-control-l-mode: t Info-breadcrumbs-in-mode-line-mode: t shell-dirtrack-mode: t me-minor-mode: t show-paren-mode: t server-mode: t ido-everywhere: t global-auto-revert-mode: t display-time-mode: t delete-selection-mode: t tooltip-mode: t mac-mouse-wheel-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Recent input: C-n C-n C-n C-n C-n C-n C-p C-p C-p C-a C-e C-, C-x C-f M-p M-p M-n M-n C-g C-g C-x C-f M-p M-p M-p M-p M-p M-p M-p M-p M-p C-a C-f C-f C-k s r c / o r R . e m d / e l o r m o M-x f i n d - l i b o r g - a g C-x C-j ^ g C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-n n C-c C-a C-p C-p C-p C-c C-w C-_ C-x C-k y e s R l i C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n n C-c C-a C-p C-p C-n C-. C-. C-. C-a n p SPC C-n C-n C-n C-c C-p C-n C-c C-p C-n C-n C-n C-n C-n C-n C-p C-p C-p C-p C-p C-c g C-g C-g C-x g d y C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n k y e s C-x C-b C-b p n C-c C-a C-c C-a C-c C-a p n C-n C-p C-n C-n C-n C-n C-n C-n C-x C-n C-n C-n C-n C-n C-n C-p C-x C-p p C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-c C-u C-c C-d n n p C-c C-a C-c C-u M-< M-> M-x e m a c s - s u C-g C-g M-x s - e m a c - b u C-a r Recent messages: diff-hunk-prev: No previous hunk Hunk applied Hunk applied at offset 6 lines diff-sanity-check-hunk: End of hunk ambiguously marked [4 times] Auto-saving...done Loading tramp-sh...done diff-sanity-check-context-hunk-half: End of hunk ambiguously marked Mark set [2 times] Quit [2 times] Making completion list... Load-path shadows: /Users/dave/.emacs.d/el-get/nognus/lisp/gravatar hides /Users/dave/.emacs.d/el-get/gravatar/gravatar /Users/dave/.emacs.d/el-get/nognus/lisp/gravatar hides /Users/dave/.emacs.d/el-get/wl-gravatar/gravatar /Users/dave/.emacs.d/el-get/weblogger-el/weblogger hides /Users/dave/.emacs.d/el-get/package/elpa/weblogger-1.4.3/weblogger /Users/dave/.emacs.d/el-get/xml-rpc-el/xml-rpc hides /Users/dave/.emacs.d/el-get/package/elpa/xml-rpc-1.6.7/xml-rpc /Users/dave/.emacs.d/el-get/nognus/lisp/.dir-locals hides /Users/dave/.emacs.d/el-get/org-mode/.dir-locals /Users/dave/.emacs.d/el-get/wanderlust/utils/wl-mailto hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/wl-mailto /Users/dave/.emacs.d/el-get/wanderlust/utils/wl-complete hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/wl-complete /Users/dave/.emacs.d/el-get/wanderlust/utils/wl-addrbook hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/wl-addrbook /Users/dave/.emacs.d/el-get/nognus/lisp/utf7 hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/utf7 /Users/dave/.emacs.d/el-get/wanderlust/utils/ssl hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/ssl /Users/dave/.emacs.d/el-get/wanderlust/utils/rfc2368 hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/rfc2368 /Users/dave/.emacs.d/el-get/wanderlust/utils/im-wl hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/im-wl /Users/dave/.emacs.d/el-get/nognus/lisp/.dir-locals hides /Users/dave/.emacs.d/el-get/magit/.dir-locals /Users/dave/.emacs.d/el-get/nognus/lisp/smime hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/smime /Users/dave/.emacs.d/el-get/nognus/lisp/pgg hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-pgp5 hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg-pgp5 /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-pgp hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg-pgp /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-parse hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg-parse /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-gpg hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg-gpg /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-def hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg-def /Users/dave/.emacs.d/el-get/nognus/lisp/sha1 hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/sha1 /Users/dave/.emacs.d/el-get/nognus/lisp/sasl hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/sasl /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-ntlm hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/sasl-ntlm /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-digest hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/sasl-digest /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-cram hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/sasl-cram /Users/dave/.emacs.d/el-get/nognus/lisp/ntlm hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/ntlm /Users/dave/.emacs.d/el-get/nognus/lisp/md4 hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/md4 /Users/dave/.emacs.d/el-get/nognus/lisp/hmac-md5 hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/hmac-md5 /Users/dave/.emacs.d/el-get/nognus/lisp/hmac-def hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/hmac-def /Users/dave/.emacs.d/el-get/nognus/lisp/hex-util hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/hex-util /Users/dave/.emacs.d/el-get/nognus/lisp/sha1 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/sha1 /Users/dave/.emacs.d/el-get/nognus/lisp/pgg hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/pgg /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-pgp5 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/pgg-pgp5 /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-pgp hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/pgg-pgp /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-parse hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/pgg-parse /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-gpg hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/pgg-gpg /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-def hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/pgg-def /Users/dave/.emacs.d/el-get/nognus/lisp/password-cache hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/password-cache /Users/dave/.emacs.d/el-get/nognus/lisp/md4 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/md4 /Users/dave/.emacs.d/el-get/dwamacs/site-lisp/ido hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/ido /Users/dave/.emacs.d/el-get/nognus/lisp/hex-util hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/hex-util /Users/dave/.emacs.d/el-get/nognus/lisp/format-spec hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/format-spec /Users/dave/.emacs.d/el-get/nognus/lisp/dns-mode hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/textmodes/dns-mode /Users/dave/.emacs.d/el-get/dwamacs/site-lisp/compile hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/progmodes/compile /Users/dave/.emacs.d/el-get/org-mode/lisp/org hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org /Users/dave/.emacs.d/el-get/org-mode/lisp/org-xoxo hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-xoxo /Users/dave/.emacs.d/el-get/org-mode/lisp/org-wl hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-wl /Users/dave/.emacs.d/el-get/org-mode/lisp/org-w3m hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-w3m /Users/dave/.emacs.d/el-get/org-mode/lisp/org-vm hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-vm /Users/dave/.emacs.d/el-get/org-mode/lisp/org-timer hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-timer /Users/dave/.emacs.d/el-get/org-mode/lisp/org-table hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-table /Users/dave/.emacs.d/el-get/org-mode/lisp/org-src hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-src /Users/dave/.emacs.d/el-get/org-mode/lisp/org-rmail hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-rmail /Users/dave/.emacs.d/el-get/org-mode/lisp/org-remember hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-remember /Users/dave/.emacs.d/el-get/org-mode/lisp/org-publish hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-publish /Users/dave/.emacs.d/el-get/org-mode/lisp/org-protocol hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-protocol /Users/dave/.emacs.d/el-get/org-mode/lisp/org-plot hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-plot /Users/dave/.emacs.d/el-get/org-mode/lisp/org-mouse hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-mouse /Users/dave/.emacs.d/el-get/org-mode/lisp/org-mobile hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-mobile /Users/dave/.emacs.d/el-get/org-mode/lisp/org-mhe hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-mhe /Users/dave/.emacs.d/el-get/org-mode/lisp/org-mew hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-mew /Users/dave/.emacs.d/el-get/org-mode/lisp/org-macs hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-macs /Users/dave/.emacs.d/el-get/org-mode/lisp/org-mac-message hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-mac-message /Users/dave/.emacs.d/el-get/org-mode/lisp/org-list hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-list /Users/dave/.emacs.d/el-get/org-mode/lisp/org-latex hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-latex /Users/dave/.emacs.d/el-get/org-mode/lisp/org-jsinfo hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-jsinfo /Users/dave/.emacs.d/el-get/org-mode/lisp/org-irc hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-irc /Users/dave/.emacs.d/el-get/org-mode/lisp/org-install hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-install /Users/dave/.emacs.d/el-get/org-mode/lisp/org-inlinetask hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-inlinetask /Users/dave/.emacs.d/el-get/org-mode/lisp/org-info hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-info /Users/dave/.emacs.d/el-get/org-mode/lisp/org-indent hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-indent /Users/dave/.emacs.d/el-get/org-mode/lisp/org-id hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-id /Users/dave/.emacs.d/el-get/org-mode/lisp/org-icalendar hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-icalendar /Users/dave/.emacs.d/el-get/org-mode/lisp/org-html hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-html /Users/dave/.emacs.d/el-get/org-mode/lisp/org-habit hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-habit /Users/dave/.emacs.d/el-get/org-mode/lisp/org-gnus hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-gnus /Users/dave/.emacs.d/el-get/org-mode/lisp/org-freemind hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-freemind /Users/dave/.emacs.d/el-get/org-mode/lisp/org-footnote hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-footnote /Users/dave/.emacs.d/el-get/org-mode/lisp/org-feed hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-feed /Users/dave/.emacs.d/el-get/org-mode/lisp/org-faces hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-faces /Users/dave/.emacs.d/el-get/org-mode/lisp/org-exp hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-exp /Users/dave/.emacs.d/el-get/org-mode/lisp/org-exp-blocks hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-exp-blocks /Users/dave/.emacs.d/el-get/org-mode/lisp/org-docbook hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-docbook /Users/dave/.emacs.d/el-get/org-mode/lisp/org-datetree hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-datetree /Users/dave/.emacs.d/el-get/org-mode/lisp/org-crypt hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-crypt /Users/dave/.emacs.d/el-get/org-mode/lisp/org-compat hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-compat /Users/dave/.emacs.d/el-get/org-mode/lisp/org-colview hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-colview /Users/dave/.emacs.d/el-get/org-mode/lisp/org-clock hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-clock /Users/dave/.emacs.d/el-get/org-mode/lisp/org-bibtex hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-bibtex /Users/dave/.emacs.d/el-get/org-mode/lisp/org-bbdb hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-bbdb /Users/dave/.emacs.d/el-get/org-mode/lisp/org-attach hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-attach /Users/dave/.emacs.d/el-get/org-mode/lisp/org-ascii hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-ascii /Users/dave/.emacs.d/el-get/org-mode/lisp/org-archive hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-archive /Users/dave/.emacs.d/el-get/org-mode/lisp/org-agenda hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-agenda /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/trampver hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/trampver /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tramp /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-uu hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tramp-uu /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-smb hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tramp-smb /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-gw hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tramp-gw /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-ftp hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tramp-ftp /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-compat hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tramp-compat /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-cmds hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tramp-cmds /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-cache hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tramp-cache /Users/dave/.emacs.d/el-get/nognus/lisp/tls hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tls /Users/dave/.emacs.d/el-get/nognus/lisp/sasl hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/sasl /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-ntlm hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/sasl-ntlm /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-digest hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/sasl-digest /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-cram hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/sasl-cram /Users/dave/.emacs.d/el-get/nognus/lisp/ntlm hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/ntlm /Users/dave/.emacs.d/el-get/nognus/lisp/netrc hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/netrc /Users/dave/.emacs.d/el-get/nognus/lisp/imap hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/imap /Users/dave/.emacs.d/el-get/nognus/lisp/hmac-md5 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/hmac-md5 /Users/dave/.emacs.d/el-get/nognus/lisp/hmac-def hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/hmac-def /Users/dave/.emacs.d/el-get/nognus/lisp/dns hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/dns /Users/dave/.emacs.d/el-get/nognus/lisp/dig hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/dig /Users/dave/.emacs.d/el-get/nognus/lisp/uudecode hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/mail/uudecode /Users/dave/.emacs.d/el-get/wanderlust/utils/rfc2368 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/mail/rfc2368 /Users/dave/.emacs.d/el-get/nognus/lisp/hashcash hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/mail/hashcash /Users/dave/.emacs.d/el-get/nognus/lisp/binhex hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/mail/binhex /Users/dave/.emacs.d/el-get/nognus/lisp/yenc hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/yenc /Users/dave/.emacs.d/el-get/nognus/lisp/utf7 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/utf7 /Users/dave/.emacs.d/el-get/nognus/lisp/starttls hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/starttls /Users/dave/.emacs.d/el-get/nognus/lisp/spam hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/spam /Users/dave/.emacs.d/el-get/nognus/lisp/spam-wash hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/spam-wash /Users/dave/.emacs.d/el-get/nognus/lisp/spam-stat hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/spam-stat /Users/dave/.emacs.d/el-get/nognus/lisp/spam-report hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/spam-report /Users/dave/.emacs.d/el-get/nognus/lisp/smime hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/smime /Users/dave/.emacs.d/el-get/nognus/lisp/smiley hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/smiley /Users/dave/.emacs.d/el-get/nognus/lisp/sieve hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/sieve /Users/dave/.emacs.d/el-get/nognus/lisp/sieve-mode hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/sieve-mode /Users/dave/.emacs.d/el-get/nognus/lisp/sieve-manage hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/sieve-manage /Users/dave/.emacs.d/el-get/nognus/lisp/score-mode hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/score-mode /Users/dave/.emacs.d/el-get/nognus/lisp/rfc2231 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/rfc2231 /Users/dave/.emacs.d/el-get/nognus/lisp/rfc2104 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/rfc2104 /Users/dave/.emacs.d/el-get/nognus/lisp/rfc2047 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/rfc2047 /Users/dave/.emacs.d/el-get/nognus/lisp/rfc2045 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/rfc2045 /Users/dave/.emacs.d/el-get/nognus/lisp/rfc1843 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/rfc1843 /Users/dave/.emacs.d/el-get/nognus/lisp/qp hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/qp /Users/dave/.emacs.d/el-get/nognus/lisp/pop3 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/pop3 /Users/dave/.emacs.d/el-get/nognus/lisp/nnweb hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnweb /Users/dave/.emacs.d/el-get/nognus/lisp/nnvirtual hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnvirtual /Users/dave/.emacs.d/el-get/nognus/lisp/nntp hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nntp /Users/dave/.emacs.d/el-get/nognus/lisp/nnspool hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnspool /Users/dave/.emacs.d/el-get/nognus/lisp/nnrss hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnrss /Users/dave/.emacs.d/el-get/nognus/lisp/nnoo hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnoo /Users/dave/.emacs.d/el-get/nognus/lisp/nnnil hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnnil /Users/dave/.emacs.d/el-get/nognus/lisp/nnml hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnml /Users/dave/.emacs.d/el-get/nognus/lisp/nnmh hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnmh /Users/dave/.emacs.d/el-get/nognus/lisp/nnmbox hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnmbox /Users/dave/.emacs.d/el-get/nognus/lisp/nnmairix hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnmairix /Users/dave/.emacs.d/el-get/nognus/lisp/nnmaildir hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnmaildir /Users/dave/.emacs.d/el-get/nognus/lisp/nnmail hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnmail /Users/dave/.emacs.d/el-get/nognus/lisp/nnir hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnir /Users/dave/.emacs.d/el-get/nognus/lisp/nnimap hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnimap /Users/dave/.emacs.d/el-get/nognus/lisp/nnheader hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnheader /Users/dave/.emacs.d/el-get/nognus/lisp/nngateway hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nngateway /Users/dave/.emacs.d/el-get/nognus/lisp/nnfolder hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnfolder /Users/dave/.emacs.d/el-get/nognus/lisp/nneething hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nneething /Users/dave/.emacs.d/el-get/nognus/lisp/nndraft hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nndraft /Users/dave/.emacs.d/el-get/nognus/lisp/nndoc hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nndoc /Users/dave/.emacs.d/el-get/nognus/lisp/nndir hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nndir /Users/dave/.emacs.d/el-get/nognus/lisp/nndiary hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nndiary /Users/dave/.emacs.d/el-get/nognus/lisp/nnbabyl hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnbabyl /Users/dave/.emacs.d/el-get/nognus/lisp/nnagent hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnagent /Users/dave/.emacs.d/el-get/nognus/lisp/mml2015 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mml2015 /Users/dave/.emacs.d/el-get/nognus/lisp/mml1991 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mml1991 /Users/dave/.emacs.d/el-get/nognus/lisp/mml hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mml /Users/dave/.emacs.d/el-get/nognus/lisp/mml-smime hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mml-smime /Users/dave/.emacs.d/el-get/nognus/lisp/mml-sec hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mml-sec /Users/dave/.emacs.d/el-get/nognus/lisp/mm-view hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-view /Users/dave/.emacs.d/el-get/nognus/lisp/mm-uu hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-uu /Users/dave/.emacs.d/el-get/nognus/lisp/mm-util hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-util /Users/dave/.emacs.d/el-get/nognus/lisp/mm-url hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-url /Users/dave/.emacs.d/el-get/nognus/lisp/mm-partial hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-partial /Users/dave/.emacs.d/el-get/nognus/lisp/mm-extern hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-extern /Users/dave/.emacs.d/el-get/nognus/lisp/mm-encode hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-encode /Users/dave/.emacs.d/el-get/nognus/lisp/mm-decode hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-decode /Users/dave/.emacs.d/el-get/nognus/lisp/mm-bodies hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-bodies /Users/dave/.emacs.d/el-get/nognus/lisp/messcompat hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/messcompat /Users/dave/.emacs.d/el-get/nognus/lisp/message hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/message /Users/dave/.emacs.d/el-get/nognus/lisp/mailcap hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mailcap /Users/dave/.emacs.d/el-get/nognus/lisp/mail-source hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mail-source /Users/dave/.emacs.d/el-get/nognus/lisp/mail-prsvr hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mail-prsvr /Users/dave/.emacs.d/el-get/nognus/lisp/mail-parse hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mail-parse /Users/dave/.emacs.d/el-get/nognus/lisp/legacy-gnus-agent hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/legacy-gnus-agent /Users/dave/.emacs.d/el-get/nognus/lisp/ietf-drums hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/ietf-drums /Users/dave/.emacs.d/el-get/nognus/lisp/html2text hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/html2text /Users/dave/.emacs.d/el-get/nognus/lisp/gnus hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-win hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-win /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-vm hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-vm /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-uu hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-uu /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-util hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-util /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-undo hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-undo /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-topic hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-topic /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-sum hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-sum /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-start hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-start /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-srvr hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-srvr /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-spec hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-spec /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-sieve hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-sieve /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-setup hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-setup /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-score hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-score /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-salt hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-salt /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-registry hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-registry /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-range hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-range /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-picon hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-picon /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-msg hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-msg /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-mlspl hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-mlspl /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-ml hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-ml /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-mh hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-mh /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-logic hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-logic /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-kill hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-kill /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-int hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-int /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-group hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-group /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-fun hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-fun /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-ems hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-ems /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-eform hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-eform /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-dup hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-dup /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-draft hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-draft /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-dired hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-dired /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-diary hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-diary /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-demon hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-demon /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-delay hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-delay /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-cus hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-cus /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-cite hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-cite /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-cache hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-cache /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-bookmark hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-bookmark /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-bcklg hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-bcklg /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-async hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-async /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-art hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-art /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-agent hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-agent /Users/dave/.emacs.d/el-get/nognus/lisp/gmm-utils hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gmm-utils /Users/dave/.emacs.d/el-get/nognus/lisp/flow-fill hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/flow-fill /Users/dave/.emacs.d/el-get/nognus/lisp/ecomplete hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/ecomplete /Users/dave/.emacs.d/el-get/nognus/lisp/deuglify hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/deuglify /Users/dave/.emacs.d/el-get/nognus/lisp/compface hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/compface /Users/dave/.emacs.d/el-get/nognus/lisp/canlock hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/canlock /Users/dave/.emacs.d/el-get/nognus/lisp/auth-source hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/auth-source /Users/dave/.emacs.d/el-get/nognus/lisp/time-date hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/calendar/time-date /Users/dave/.emacs.d/el-get/nognus/lisp/parse-time hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/calendar/parse-time Features: (shadow emacsbug tramp-cache tramp-sh diff jka-compr man smerge-mode dabbrev find-dired grep+ grep-ed hilit-chg grep compile+ compile compile- gnus-dired org-magit magit diff-mode log-edit pcvs-util add-log magit-bisect magit-key-mode org-capture org-mks flow-fill canlock sha1 hex-util url-handlers smiley ansi-color face-remap qp quail cus-edit tabify cal-move mule-util url-http url-auth url-gw gnus-html mm-url gnus-bcklg nndoc gnus-draft gnus-async gnus-salt gnus-ml hl-line gnus-topic nndraft nnmh nnfolder epa-file epa epg rot13 utf-7 proto-stream nnimap parse-time tls utf7 netrc gnus-agent gnus-srvr gnus-score score-mode nnvirtual nntp gnus-cache dot-gnus-el mail-settings gnus-cite w3m-load spam spam-stat gnus-uu yenc gnus-msg gnus-gravatar gnus-art mm-uu mml2015 epg-config mm-view mml-smime smime dig nnir gnus-sum macroexp nnoo gnus-group gnus-undo nnmail mail-source gnus-start gnus-spec gnus-int gnus-range gravatar url-cache url url-proxy url-privacy url-expand url-methods url-history url-cookie url-util url-parse url-vars mailcap gnus-win pgg pgg-parse pgg-def starttls gnus-harvest mailalias gnus gnus-ems recentf tree-widget nnheader mail-extr sort newcomment message rfc822 mml mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 ietf-drums mailabbrev mail-utils gmm-utils mailheader org-xoxo org-timer org-table org-remember org-datetree org-publish org-latex org-export-latex org-beamer org-icalendar org-docbook org-html footnote org-colview org-clock org-attach org-ascii org-exp ob-exp org-exp-blocks vc-git multi-isearch org-archive bookmark pp cal-china lunar solar cal-dst cal-bahai cal-islam cal-hebrew holidays hol-loaddefs diary-lib diary-loaddefs cal-iso dot-org-el ob-sh ob-python ob-R ox-redmine ox-org org-x ox-plugin org-devonthink org-habit org-agenda org-info org-id org ob-emacs-lisp ob-tangle ob-ref ob-lob ob-table org-footnote org-src ob-comint ob-keys ob ob-eval org-pcomplete pcomplete org-list org-faces org-compat org-entities org-macs cal-menu calendar cal-loaddefs frame-bufs zenburn-overrides-theme zenburn session warnings per-window-point page-ext disp-table pp-c-l ws-trim ffap info+ strings misc-fns thingatpt+ system-type-darwin-theme osx-plist xml dot-passwd-el .loaddefs tramp tramp-compat auth-source eieio byte-opt gnus-util time-date mm-util mail-prsvr password-cache format-spec tramp-loaddefs ess-toolbar ess-mouse mouseme browse-url ess-menu ess-swv ess-noweb noweb-font-lock-mode ess-bugs-l essd-els ess-sas-d ess-sas-l ess-sas-a executable shell ess-arc-d ess-vst-d ess-xls-d ess-lsp-l ess-sta-d ess-sta-l cc-vars cc-defs make-regexp ess-sp6-d ess-sp5-d ess-sp3-d ess-r-d ess-r-args ess-s-l ess-inf ess-utils comint ess-mode noweb-mode ess ess-custom ess-compat ess-site xcscope ring cmake-mode mo-git-blame gnus-load yasnippet dropdown-list assoc company-autoloads weblogger-autoloads xml-rpc-autoloads package org-install browse-kill-ring markdown-mode derived thingatpt noutline outline fit-frame color-theme edmacro kmacro wid-edit sendmail reporter info initsplit advice advice-preload find-func el-get help-mode easymenu view autoload help-fns bytecomp byte-compile cl cl-19 dired-x dired-aux dired regexp-opt paren server ido easy-mmode autorevert time delsel cus-start cus-load elhome tooltip ediff-hook vc-hooks lisp-float-type mwheel mac-win tool-bar dnd fontset image fringe lisp-mode register page menu-bar rfn-eshadow timer select scroll-bar mldrag mouse jit-lock font-lock syntax facemenu font-core frame cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev loaddefs button minibuffer faces cus-face files text-properties overlay md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote mac multi-tty make-network-process emacs) -- Dave Abrahams BoostPro Computing http://www.boostpro.com --=-=-=-- From unknown Sat Aug 16 21:20:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9597: 23.3; [diff-mode] Can't quite cope with git patches Resent-From: Juri Linkov Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 25 Sep 2011 13:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9597 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dave Abrahams Cc: 9597@debbugs.gnu.org Received: via spool by 9597-submit@debbugs.gnu.org id=B9597.13169577869393 (code B ref 9597); Sun, 25 Sep 2011 13:37:01 +0000 Received: (at 9597) by debbugs.gnu.org; 25 Sep 2011 13:36:26 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1R7osb-0002RS-HI for submit@debbugs.gnu.org; Sun, 25 Sep 2011 09:36:25 -0400 Received: from smarty.dreamhost.com ([208.113.175.8]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1R7osY-0002RJ-Vs for 9597@debbugs.gnu.org; Sun, 25 Sep 2011 09:36:24 -0400 Received: from ps18281.dreamhostps.com (ps18281.dreamhost.com [69.163.218.105]) by smarty.dreamhost.com (Postfix) with ESMTP id B90E86E805F; Sun, 25 Sep 2011 06:35:43 -0700 (PDT) Received: from localhost (ps18281.dreamhostps.com [69.163.218.105]) by ps18281.dreamhostps.com (Postfix) with ESMTP id 63A74451C330; Sun, 25 Sep 2011 06:35:41 -0700 (PDT) From: Juri Linkov Organization: JURTA References: Date: Sun, 25 Sep 2011 16:29:02 +0300 In-Reply-To: (Dave Abrahams's message of "Sat, 24 Sep 2011 15:41:51 -0400") Message-ID: <87mxdsde9l.fsf@mail.jurta.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.6 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.6 (--) > When I try to apply the last diff in the enclosed file, I get the > following backtrace: > > Debugger entered--Lisp error: (error "End of hunk ambiguously marked") > signal(error ("End of hunk ambiguously marked")) > error("End of hunk ambiguously marked") > diff-sanity-check-hunk() > diff-find-source-location(nil nil) > diff-apply-hunk(nil) > call-interactively(diff-apply-hunk nil nil) > > Seems to me that diff-mode should be able to handle the output of > git-format-patch; after all, the patch command can. bug#5302 reports the same problem with Bzr diffs. In both cases diff separators (a line of dashes) are ignored by `diff-sanity-check-hunk'. Both bugs can be fixed with the patch below. I suppose that modifying the buffer with inserting a newline is a temporary workaround for some earlier bug, so I added a check for the diff separator in another condition branch. The comment says that adding an empty line is for code which doesn't count lines. I don't know where this code is located, but perhaps this code should also check for diff separators? === modified file 'lisp/vc/diff-mode.el' --- lisp/vc/diff-mode.el 2011-05-22 19:22:37 +0000 +++ lisp/vc/diff-mode.el 2011-09-25 13:28:50 +0000 @@ -429,6 +429,9 @@ (defvar diff-valid-unified-empty-line t (defconst diff-hunk-header-re (concat "^\\(?:" diff-hunk-header-re-unified ".*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$")) (defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+ \\|\\*\\*\\* .+\n--- \\|[^-+!<>0-9@* \n]\\).+\n" (substring diff-hunk-header-re 1))) + +(defconst diff-separator-re "^--+ ?$") + (defvar diff-narrowed-to nil) (defun diff-hunk-style (&optional style) @@ -1414,15 +1417,20 @@ (defun diff-sanity-check-hunk () (case (char-after) (?\s (decf before) (decf after) t) (?- - (if (and (looking-at diff-file-header-re) - (zerop before) (zerop after)) - ;; No need to query: this is a case where two patches - ;; are concatenated and only counting the lines will - ;; give the right result. Let's just add an empty - ;; line so that our code which doesn't count lines - ;; will not get confused. - (progn (save-excursion (insert "\n")) nil) - (decf before) t)) + (cond + ((and (looking-at diff-separator-re) + (zerop before) (zerop after)) + nil) + ((and (looking-at diff-file-header-re) + (zerop before) (zerop after)) + ;; No need to query: this is a case where two patches + ;; are concatenated and only counting the lines will + ;; give the right result. Let's just add an empty + ;; line so that our code which doesn't count lines + ;; will not get confused. + (save-excursion (insert "\n")) nil) + (t + (decf before) t))) (?+ (decf after) t) (t (cond From unknown Sat Aug 16 21:20:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9597: 23.3; [diff-mode] Can't quite cope with git patches Resent-From: Stefan Monnier Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 26 Sep 2011 02:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9597 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Juri Linkov Cc: Dave Abrahams , 9597@debbugs.gnu.org Received: via spool by 9597-submit@debbugs.gnu.org id=B9597.13170029592825 (code B ref 9597); Mon, 26 Sep 2011 02:10:01 +0000 Received: (at 9597) by debbugs.gnu.org; 26 Sep 2011 02:09:19 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1R80dC-0000jW-Hz for submit@debbugs.gnu.org; Sun, 25 Sep 2011 22:09:18 -0400 Received: from ironport2-out.teksavvy.com ([206.248.154.181] helo=ironport2-out.pppoe.ca) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1R80dA-0000jP-Dh for 9597@debbugs.gnu.org; Sun, 25 Sep 2011 22:09:17 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av0EAMbdf05FpZLc/2dsb2JhbABBp315gVMBAQQBViMFCws0EhQYDSSIC7hVhwsEoF6EQw X-IronPort-AV: E=Sophos;i="4.68,441,1312171200"; d="scan'208";a="138476425" Received: from 69-165-146-220.dsl.teksavvy.com (HELO ceviche.home) ([69.165.146.220]) by ironport2-out.pppoe.ca with ESMTP/TLS/ADH-AES256-SHA; 25 Sep 2011 22:08:34 -0400 Received: by ceviche.home (Postfix, from userid 20848) id 28DA5660B6; Sun, 25 Sep 2011 22:08:34 -0400 (EDT) From: Stefan Monnier Message-ID: References: <87mxdsde9l.fsf@mail.jurta.org> Date: Sun, 25 Sep 2011 22:08:34 -0400 In-Reply-To: <87mxdsde9l.fsf@mail.jurta.org> (Juri Linkov's message of "Sun, 25 Sep 2011 16:29:02 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.7 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.7 (--) > I suppose that modifying the buffer with inserting a newline > is a temporary workaround for some earlier bug, so I added > a check for the diff separator in another condition branch. No, it's not outdated. The issue is in diff-end-of-hunk where we can sometimes use the numbers but not always. Also, adding a newline makes the thing less ambiguous in cases such as when the user edits the hunks (in which case we need to update the hunk header based on the hunk text). Stefan From unknown Sat Aug 16 21:20:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9597: 23.3; [diff-mode] Can't quite cope with git patches Resent-From: Juri Linkov Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 27 Sep 2011 00:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9597 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Stefan Monnier Cc: Dave Abrahams , 9597@debbugs.gnu.org Received: via spool by 9597-submit@debbugs.gnu.org id=B9597.131708452522918 (code B ref 9597); Tue, 27 Sep 2011 00:49:02 +0000 Received: (at 9597) by debbugs.gnu.org; 27 Sep 2011 00:48:45 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1R8Lqm-0005xa-Qj for submit@debbugs.gnu.org; Mon, 26 Sep 2011 20:48:45 -0400 Received: from smarty.dreamhost.com ([208.113.175.8]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1R8Lqj-0005xS-TF for 9597@debbugs.gnu.org; Mon, 26 Sep 2011 20:48:43 -0400 Received: from ps18281.dreamhostps.com (ps18281.dreamhost.com [69.163.218.105]) by smarty.dreamhost.com (Postfix) with ESMTP id 0821C6E8072; Mon, 26 Sep 2011 17:47:55 -0700 (PDT) Received: from localhost (ps18281.dreamhostps.com [69.163.218.105]) by ps18281.dreamhostps.com (Postfix) with ESMTP id A5DAE451C4F6; Mon, 26 Sep 2011 17:47:53 -0700 (PDT) From: Juri Linkov Organization: JURTA References: <87mxdsde9l.fsf@mail.jurta.org> Date: Tue, 27 Sep 2011 03:03:50 +0300 In-Reply-To: (Stefan Monnier's message of "Sun, 25 Sep 2011 22:08:34 -0400") Message-ID: <87litax5wp.fsf@mail.jurta.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.6 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.6 (--) >> I suppose that modifying the buffer with inserting a newline >> is a temporary workaround for some earlier bug, so I added >> a check for the diff separator in another condition branch. > > No, it's not outdated. > The issue is in diff-end-of-hunk where we can sometimes use the numbers > but not always. > Also, adding a newline makes the thing less ambiguous in cases such as > when the user edits the hunks (in which case we need to update the hunk > header based on the hunk text). Maybe we should add an option that doesn't insert a newline for users who don't want that viewing diff files modifies them. From unknown Sat Aug 16 21:20:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9597: update References: In-Reply-To: Resent-From: Dima Kogan Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 25 Dec 2016 23:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9597 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 9597@debbugs.gnu.org Received: via spool by 9597-submit@debbugs.gnu.org id=B9597.148270925810341 (code B ref 9597); Sun, 25 Dec 2016 23:41:02 +0000 Received: (at 9597) by debbugs.gnu.org; 25 Dec 2016 23:40:58 +0000 Received: from localhost ([127.0.0.1]:55059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cLIPS-0002gj-1J for submit@debbugs.gnu.org; Sun, 25 Dec 2016 18:40:58 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:45068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cLIPQ-0002gb-Dt for 9597@debbugs.gnu.org; Sun, 25 Dec 2016 18:40:56 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id AB9E020850 for <9597@debbugs.gnu.org>; Sun, 25 Dec 2016 18:40:55 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Sun, 25 Dec 2016 18:40:55 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=secretsauce.net; h=content-type:date:from:message-id:mime-version:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=7N4 zLRFc2V1zfyF8XYh88fD62Dk=; b=TD3mNr66VaUyMU5hSCDv69q/woK9ewo33na m38k/EJsBc49STJbfDrfD58OqnhKebTfquVfQx1XRRdxQ2uM59NPgwruLSKissVo QmALNwKv/JG0byz6d3Y/u84sXDcWkGTTGc9PcyVgwnpw4i7MzygB3pKaInFCRZg9 zNl/MUiQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=smtpout; bh=7N4zLRFc2V1zfyF8XYh88fD62Dk=; b=SWq4G P/62/2WSGiMV5hkXkaVlHjruequSV03DnqInJgsajdtWrrBMc3GO03hmOY0nL2Ad PESjYaEGtpGJnTWdk9dATCXZTCSvFK+wspnBuUfqn8gS+hd3BXsk8vNi42ooS+QA w4Lzba/r7r7UD7bR8QLDIOskskhhcVQJfVTh9k= X-ME-Sender: X-Sasl-enc: Y1dAL4MO6r2gnZufNlCDWFoGXg4ysethbZPmD+bG8RIH 1482709255 Received: from shorty.local (50-1-153-216.dsl.dynamic.fusionbroadband.com [50.1.153.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 557CA2452C for <9597@debbugs.gnu.org>; Sun, 25 Dec 2016 18:40:55 -0500 (EST) Received: from dima by shorty.local with local (Exim 4.87) (envelope-from ) id 1cLIPO-0005aj-8h for 9597@debbugs.gnu.org; Sun, 25 Dec 2016 15:40:54 -0800 User-agent: mu4e 0.9.17; emacs 26.0.50.1 From: Dima Kogan Date: Sun, 25 Dec 2016 15:40:54 -0800 Message-ID: <87bmvzefw9.fsf@secretsauce.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Hi. This is still an outstanding bug. Can we please revisit this? I'm attaching a version of Juri Linkov's patch that applies cleanly to the latest master. This patch solves the issue. Do we not like it? --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=fix-git-diffs.patch diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 75fd420..d1a5156 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -437,6 +437,9 @@ diff-valid-unified-empty-line (defconst diff-hunk-header-re (concat "^\\(?:" diff-hunk-header-re-unified ".*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$")) (defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+ \\|\\*\\*\\* .+\n--- \\|[^-+!<>0-9@* \n]\\).+\n" (substring diff-hunk-header-re 1))) + +(defconst diff-separator-re "^--+ ?$") + (defvar diff-narrowed-to nil) (defun diff-hunk-style (&optional style) @@ -1604,15 +1607,20 @@ diff-sanity-check-hunk (pcase (char-after) (?\s (cl-decf before) (cl-decf after) t) (?- - (if (and (looking-at diff-file-header-re) - (zerop before) (zerop after)) - ;; No need to query: this is a case where two patches - ;; are concatenated and only counting the lines will - ;; give the right result. Let's just add an empty - ;; line so that our code which doesn't count lines - ;; will not get confused. - (progn (save-excursion (insert "\n")) nil) - (cl-decf before) t)) + (cond + ((and (looking-at diff-separator-re) + (zerop before) (zerop after)) + nil) + ((and (looking-at diff-file-header-re) + (zerop before) (zerop after)) + ;; No need to query: this is a case where two patches + ;; are concatenated and only counting the lines will + ;; give the right result. Let's just add an empty + ;; line so that our code which doesn't count lines + ;; will not get confused. + (save-excursion (insert "\n")) nil) + (t + (cl-decf before) t))) (?+ (cl-decf after) t) (_ (cond --=-=-=-- From unknown Sat Aug 16 21:20:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9597: update Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 27 Dec 2016 21:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9597 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dima Kogan Cc: 9597@debbugs.gnu.org Received: via spool by 9597-submit@debbugs.gnu.org id=B9597.14828734979301 (code B ref 9597); Tue, 27 Dec 2016 21:19:01 +0000 Received: (at 9597) by debbugs.gnu.org; 27 Dec 2016 21:18:17 +0000 Received: from localhost ([127.0.0.1]:57304 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cLz8T-0002Px-95 for submit@debbugs.gnu.org; Tue, 27 Dec 2016 16:18:17 -0500 Received: from sub3.mail.dreamhost.com ([69.163.253.7]:39622 helo=homiemail-a23.g.dreamhost.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cLz8S-0002Po-E4 for 9597@debbugs.gnu.org; Tue, 27 Dec 2016 16:18:16 -0500 Received: from homiemail-a23.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a23.g.dreamhost.com (Postfix) with ESMTP id 3BCC14B0084; Tue, 27 Dec 2016 13:18:15 -0800 (PST) Received: from localhost.linkov.net (m83-180-21-182.cust.tele2.ee [83.180.21.182]) (Authenticated sender: jurta@jurta.org) by homiemail-a23.g.dreamhost.com (Postfix) with ESMTPA id 4E00E4B006D; Tue, 27 Dec 2016 13:18:14 -0800 (PST) From: Juri Linkov Organization: LINKOV.NET References: <87bmvzefw9.fsf@secretsauce.net> Date: Tue, 27 Dec 2016 23:16:43 +0200 In-Reply-To: <87bmvzefw9.fsf@secretsauce.net> (Dima Kogan's message of "Sun, 25 Dec 2016 15:40:54 -0800") Message-ID: <8737h9ul6s.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) > Hi. This is still an outstanding bug. Can we please revisit this? I'm > attaching a version of Juri Linkov's patch that applies cleanly to the > latest master. This patch solves the issue. Do we not like it? I'm still unsure about possible side effects, but if you don't see any, then maybe it's the right way to go. From unknown Sat Aug 16 21:20:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9597: update Resent-From: Dima Kogan Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 27 Dec 2016 23:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9597 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Juri Linkov Cc: 9597@debbugs.gnu.org Received: via spool by 9597-submit@debbugs.gnu.org id=B9597.14828829714562 (code B ref 9597); Tue, 27 Dec 2016 23:57:01 +0000 Received: (at 9597) by debbugs.gnu.org; 27 Dec 2016 23:56:11 +0000 Received: from localhost ([127.0.0.1]:57391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cM1bH-0001BV-70 for submit@debbugs.gnu.org; Tue, 27 Dec 2016 18:56:11 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:52988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cM1bF-0001BL-2i for 9597@debbugs.gnu.org; Tue, 27 Dec 2016 18:56:09 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 00F1E20D34; Tue, 27 Dec 2016 18:56:03 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute1.internal (MEProxy); Tue, 27 Dec 2016 18:56:04 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=secretsauce.net; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=ZCqTzTuRY685QBdx37hvA3j3DAU=; b=wTMWJv dQzM4UM4MYasPhD9b5PvBUNxEF7Ar2BWz0a3V0mWPxaotqI+p4emd5mzg19shB6z lmwNkZJNzRXJIC0YRVyDakkwDC+PUmHiussLe7kCbfqllgOmkS7FhgUDY3YlrvRv Nf1fsETM8sMFrujfkLD2hVbAi9FHYOlWXuKPA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=smtpout; bh=ZCqTzTuRY685QB dx37hvA3j3DAU=; b=LBx9uZsSCv51O1FHXsWkakLkTSk7yc8uEvniNC89mIdzC+ 7j0bJJydKl8tAcdQG8sML0m4lxHSxo15BiyYxot4TJCkiZ37habPs5idz/Fn0uQJ BTwAvWc0lChjR6gzxA3Ir37kMRGE8GDZozrKeCub4wq/7oiTtf8Fj7Q/tOhYQ= X-ME-Sender: X-Sasl-enc: gXSS+LrO7AkYSvwHcaMJvSbt6MDTLramI3RbM0uKgXd+ 1482882963 Received: from shorty.local (cpe-76-94-185-6.socal.res.rr.com [76.94.185.6]) by mail.messagingengine.com (Postfix) with ESMTPA id 5584F7E2B2; Tue, 27 Dec 2016 18:56:03 -0500 (EST) Received: from dima by shorty.local with local (Exim 4.88) (envelope-from ) id 1cM1b7-0005Zk-PM; Tue, 27 Dec 2016 15:56:01 -0800 References: <87bmvzefw9.fsf@secretsauce.net> <8737h9ul6s.fsf@mail.linkov.net> User-agent: mu4e 0.9.17; emacs 26.0.50.1 From: Dima Kogan In-reply-to: <8737h9ul6s.fsf@mail.linkov.net> Date: Tue, 27 Dec 2016 15:56:01 -0800 Message-ID: <874m1pdizy.fsf@secretsauce.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Juri Linkov writes: >> Hi. This is still an outstanding bug. Can we please revisit this? I'm >> attaching a version of Juri Linkov's patch that applies cleanly to the >> latest master. This patch solves the issue. Do we not like it? > > I'm still unsure about possible side effects, but if you don't see any, > then maybe it's the right way to go. I just looked through this patch, and it looks reasonable to me. The insertion of a newline is indeed odd, but that's an issue separate from this bug. From unknown Sat Aug 16 21:20:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9597: update Resent-From: Dima Kogan Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 25 Jan 2017 22:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9597 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Juri Linkov Cc: 9597@debbugs.gnu.org Received: via spool by 9597-submit@debbugs.gnu.org id=B9597.14853825782888 (code B ref 9597); Wed, 25 Jan 2017 22:17:02 +0000 Received: (at 9597) by debbugs.gnu.org; 25 Jan 2017 22:16:18 +0000 Received: from localhost ([127.0.0.1]:43843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cWVrV-0000kW-RI for submit@debbugs.gnu.org; Wed, 25 Jan 2017 17:16:18 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:47387) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cWVrT-0000kO-IG for 9597@debbugs.gnu.org; Wed, 25 Jan 2017 17:16:15 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 2D88F20886; Wed, 25 Jan 2017 17:16:12 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Wed, 25 Jan 2017 17:16:12 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=secretsauce.net; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=4l0//6Y9Jy7ClxKeq32clep1K3c=; b=FP6ttJ 4vU8MlZb+/RcL+vSWhB7VIMxh2LLfp5DsTXfDKH2vt7OkYjWpdnBEmwohMvo7o8M ACqE16zUsSw2hKCT7LuKhAwsoIk8Lgo1Z64f2CTrBWU/+Nxi5X5S/CVh0YPhbQid BTKANZ9KTPoIGLzx0q8y8uqfnX+7r5fnCesz0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=smtpout; bh=4l0//6Y9Jy7Clx Keq32clep1K3c=; b=PqM66IIz5WBNiM2UJ+ImlyU9PG86ihwA6cNKG4Rtk1JgO6 Rgq203q/zFVKllfHjppyGnnJTt04GYTSI8X0eKBIZKlfuPTETwkaQQkA/IIC3/hp ZeqDcfGrNoapHZyCGSIzPBRFDJ197tm2NFFknWZX1appyg4yse8rERNZgozfE= X-ME-Sender: X-Sasl-enc: id9FgYJz7b75HmKjf6jVxHB8upXKOc7cNEdJNpfZ7Yk/ 1485382571 Received: from shorty.local (unknown [128.149.110.210]) by mail.messagingengine.com (Postfix) with ESMTPA id E029E24519; Wed, 25 Jan 2017 17:16:11 -0500 (EST) Received: from dima by shorty.local with local (Exim 4.88) (envelope-from ) id 1cWVrP-0007MR-HY; Wed, 25 Jan 2017 14:16:11 -0800 References: <87bmvzefw9.fsf@secretsauce.net> <8737h9ul6s.fsf@mail.linkov.net> <874m1pdizy.fsf@secretsauce.net> User-agent: mu4e 0.9.17; emacs 26.0.50.1 From: Dima Kogan In-reply-to: <874m1pdizy.fsf@secretsauce.net> Date: Wed, 25 Jan 2017 14:16:11 -0800 Message-ID: <87vat2n5uc.fsf@secretsauce.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Can we please merge this? It fixes a long-standing and annoying bug that we KNOW exists, and has NO side-effects that we know about. If issues pop up, we can deal with them. I can push this, just need the green light. From unknown Sat Aug 16 21:20:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9597: update Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 27 Jan 2017 09:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9597 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dima Kogan Cc: 9597@debbugs.gnu.org, juri@linkov.net Reply-To: Eli Zaretskii Received: via spool by 9597-submit@debbugs.gnu.org id=B9597.148551083525465 (code B ref 9597); Fri, 27 Jan 2017 09:54:01 +0000 Received: (at 9597) by debbugs.gnu.org; 27 Jan 2017 09:53:55 +0000 Received: from localhost ([127.0.0.1]:47014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cX3E9-0006ce-Ct for submit@debbugs.gnu.org; Fri, 27 Jan 2017 04:53:55 -0500 Received: from eggs.gnu.org ([208.118.235.92]:48933) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cX3E8-0006cR-H7 for 9597@debbugs.gnu.org; Fri, 27 Jan 2017 04:53:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cX3E0-00047d-FO for 9597@debbugs.gnu.org; Fri, 27 Jan 2017 04:53:47 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_20,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60681) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cX3E0-00047W-CC; Fri, 27 Jan 2017 04:53:44 -0500 Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4088 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1cX3Dz-00023J-A9; Fri, 27 Jan 2017 04:53:43 -0500 Date: Fri, 27 Jan 2017 11:53:32 +0200 Message-Id: <83h94k25ib.fsf@gnu.org> From: Eli Zaretskii In-reply-to: <87vat2n5uc.fsf@secretsauce.net> (message from Dima Kogan on Wed, 25 Jan 2017 14:16:11 -0800) References: <87bmvzefw9.fsf@secretsauce.net> <8737h9ul6s.fsf@mail.linkov.net> <874m1pdizy.fsf@secretsauce.net> <87vat2n5uc.fsf@secretsauce.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -8.2 (--------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -8.2 (--------) > From: Dima Kogan > Date: Wed, 25 Jan 2017 14:16:11 -0800 > Cc: 9597@debbugs.gnu.org > > Can we please merge this? It fixes a long-standing and annoying bug that > we KNOW exists, and has NO side-effects that we know about. If issues > pop up, we can deal with them. > > I can push this, just need the green light. You have the green light, but please add some tests for this. Thanks. From unknown Sat Aug 16 21:20:14 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Dave Abrahams Subject: bug#9597: closed (Fixed) Message-ID: References: <87zii7vemm.fsf@secretsauce.net> X-Gnu-PR-Message: they-closed 9597 X-Gnu-PR-Package: emacs Reply-To: 9597@debbugs.gnu.org Date: Tue, 31 Jan 2017 08:06:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1485849963-8942-1" This is a multi-part message in MIME format... ------------=_1485849963-8942-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #9597: 23.3; [diff-mode] Can't quite cope with git patches which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 9597@debbugs.gnu.org. --=20 9597: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D9597 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1485849963-8942-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 9597-done) by debbugs.gnu.org; 31 Jan 2017 08:05:11 +0000 Received: from localhost ([127.0.0.1]:51686 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYTR9-0002Id-DN for submit@debbugs.gnu.org; Tue, 31 Jan 2017 03:05:11 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:39973) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYTR7-0002IQ-CD; Tue, 31 Jan 2017 03:05:09 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id E23CA20AD8; Tue, 31 Jan 2017 03:05:08 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 31 Jan 2017 03:05:08 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=secretsauce.net; h=content-type:date:from:message-id:mime-version:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=fqN uDnknuD4MTNUxbuHd1m7eHBY=; b=l2QfK3jyOpSTnauUsrxUVlITgBv1o8FlshC 4AOV3s+5YM8561xyg+GKlBYruKl1eKIuIoW08vG9F/dIRdYazVH6YOk/J65AIuaT fQxjJGOLJxMFbnz37sSBJruqFLrSrxPDc7o9LaIjU3NSF+p4BZxQR5jcgxiRsfSb pmzFegn8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=smtpout; bh=fqNuDnknuD4MTNUxbuHd1m7eHBY=; b=QIMlP GqoUZ6Gs7F6t6zPtzK1LB4+phfgNwyjUy6EWGmKGy6QIlE/Pb62eRUBpmVIgA5Po HnSeE+Okti8B6qy4qoU6/vKgGq2EPc4Q4HNT1giISTSY/s+e6Zj/UfvRX8FvF7q3 6ya1k4Xv1M8gZkn06CqNPGFBPLjL8pwq4oVMlg= X-ME-Sender: X-Sasl-enc: bvOb55XirsuLLIleXoW3LgoV25BlplZ2SkU7NKeEWBta 1485849908 Received: from scrawny (50-1-153-216.dsl.dynamic.fusionbroadband.com [50.1.153.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 9293B2450F; Tue, 31 Jan 2017 03:05:08 -0500 (EST) Received: from dima by scrawny with local (Exim 4.88) (envelope-from ) id 1cYTR3-0005Ab-MK; Tue, 31 Jan 2017 00:05:05 -0800 User-agent: mu4e 0.9.19; emacs 26.0.50.1 From: Dima Kogan To: 9597-done@debbugs.gnu.org, 5302-done@debbugs.gnu.org Subject: Fixed Date: Tue, 31 Jan 2017 00:05:05 -0800 Message-ID: <87zii7vemm.fsf@secretsauce.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 9597-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) I pushed the fix and a test in 47a1ebb8ab67c97904bf3211eb44ce2d7d40949d ------------=_1485849963-8942-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 25 Sep 2011 02:00:21 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1R7e0x-0001Ic-HZ for submit@debbugs.gnu.org; Sat, 24 Sep 2011 22:00:21 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1R7e0t-0001IR-6V for submit@debbugs.gnu.org; Sat, 24 Sep 2011 22:00:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R7e0G-00073x-Dh for submit@debbugs.gnu.org; Sat, 24 Sep 2011 21:59:40 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([140.186.70.17]:46375) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R7e0G-00073t-Bv for submit@debbugs.gnu.org; Sat, 24 Sep 2011 21:59:36 -0400 Received: from eggs.gnu.org ([140.186.70.92]:55018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R7e0C-0008JI-Rl for bug-gnu-emacs@gnu.org; Sat, 24 Sep 2011 21:59:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R7e08-00073H-7J for bug-gnu-emacs@gnu.org; Sat, 24 Sep 2011 21:59:32 -0400 Received: from mail-vw0-f41.google.com ([209.85.212.41]:54477) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R7e08-00073D-1j for bug-gnu-emacs@gnu.org; Sat, 24 Sep 2011 21:59:28 -0400 Received: by vws16 with SMTP id 16so6826200vws.0 for ; Sat, 24 Sep 2011 18:59:26 -0700 (PDT) Received: by 10.52.96.169 with SMTP id dt9mr4702698vdb.481.1316915965654; Sat, 24 Sep 2011 18:59:25 -0700 (PDT) Received: from pluto.luannocracy.com (207-172-223-249.c3-0.smr-ubr3.sbo-smr.ma.static.cable.rcn.com. [207.172.223.249]) by mx.google.com with ESMTPS id ie2sm13598650vdb.1.2011.09.24.18.59.24 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 24 Sep 2011 18:59:25 -0700 (PDT) Received: by pluto.luannocracy.com (Postfix, from userid 501) id 07B39FC28B9; Sat, 24 Sep 2011 21:59:24 -0400 (EDT) From: Dave Abrahams To: bug-gnu-emacs@gnu.org Subject: 23.3; [diff-mode] Can't quite cope with git patches Date: Sat, 24 Sep 2011 15:41:51 -0400 User-Agent: Gnus/5.110018 (No Gnus v0.18) Emacs/23.3 (darwin) Received: from pluto.luannocracy.com (207-172-223-249.c3-0.smr-ubr3.sbo-smr.ma.static.cable.rcn.com. [207.172.223.249]) by mx.google.com with ESMTPS id ha1sm12859252vdb.17.2011.09.24.12.41.52 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 24 Sep 2011 12:41:52 -0700 (PDT) Received: by pluto.luannocracy.com (Postfix, from userid 501) id 755A4FBD731; Sat, 24 Sep 2011 15:41:51 -0400 (EDT) Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.17 X-Spam-Score: -5.1 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -5.1 (-----) --=-=-= Content-Type: text/plain Content-Disposition: inline When I try to apply the last diff in the enclosed file, I get the following backtrace: --8<---------------cut here---------------start------------->8--- Debugger entered--Lisp error: (error "End of hunk ambiguously marked") signal(error ("End of hunk ambiguously marked")) error("End of hunk ambiguously marked") diff-sanity-check-hunk() diff-find-source-location(nil nil) diff-apply-hunk(nil) call-interactively(diff-apply-hunk nil nil) --8<---------------cut here---------------end--------------->8--- Seems to me that diff-mode should be able to handle the output of git-format-patch; after all, the patch command can. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Add-indirect-agenda-follow-mode.patch Content-Description: git format-patch output >From 81ab272ab709c45e898831e5e019e02cfc6617fe Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Sat, 24 Sep 2011 15:21:53 -0400 Subject: [PATCH] Add indirect agenda follow mode By setting `org-agenda-follow-indirect' to a non-nil value, `org-agenda-follow-mode' will use an indirect buffer to display only the current item, rather than the whole agenda file in which it lives --- lisp/org-agenda.el | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index b1fa5f5..1b67153 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -872,6 +872,12 @@ Needs to be set before org.el is loaded." :group 'org-agenda-startup :type 'boolean) +(defcustom org-agenda-follow-indirect nil + "Non-nil means `org-agenda-follow-mode' displays only the +current item's tree, in an indirect buffer." + :group 'org-agenda + :type 'boolean) + (defcustom org-agenda-show-outline-path t "Non-nil means show outline path in echo area after line motion." :group 'org-agenda-startup @@ -6608,8 +6614,7 @@ so that the date SD will be in that range." (interactive) (setq org-agenda-follow-mode (not org-agenda-follow-mode)) (org-agenda-set-mode-name) - (if (and org-agenda-follow-mode (org-get-at-bol 'org-marker)) - (org-agenda-show)) + (org-agenda-do-context-action) (message "Follow mode is %s" (if org-agenda-follow-mode "on" "off"))) @@ -6771,7 +6776,9 @@ When called with a prefix argument, include all archive files as well." "Show outline path and, maybe, follow mode window." (let ((m (org-get-at-bol 'org-marker))) (if (and org-agenda-follow-mode m) - (org-agenda-show)) + (if org-agenda-follow-indirect + (org-agenda-tree-to-indirect-buffer) + (org-agenda-show))) (if (and m org-agenda-show-outline-path) (org-with-point-at m (org-display-outline-path t))))) -- 1.7.3.4 --=-=-= Content-Type: text/plain Content-Disposition: inline In GNU Emacs 23.3.1 (x86_64-apple-darwin10.8.0, Carbon Version 1.6.0 AppKit 1038.36) of 2011-09-12 on pluto.luannocracy.com Windowing system distributor `Apple Inc.', version 10.6.8 configured using `configure '--with-mac' '--enable-mac-app' '--prefix=/usr/local/stow/emacs-23.3' 'CC=gcc -arch x86_64'' 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: iso-latin-1-unix default enable-multibyte-characters: t Major mode: Diff Minor modes in effect: highlight-changes-visible-mode: t diff-auto-refine-mode: t recentf-mode: t frame-bufs-mode: t pretty-control-l-mode: t Info-breadcrumbs-in-mode-line-mode: t shell-dirtrack-mode: t me-minor-mode: t show-paren-mode: t server-mode: t ido-everywhere: t global-auto-revert-mode: t display-time-mode: t delete-selection-mode: t tooltip-mode: t mac-mouse-wheel-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Recent input: C-n C-n C-n C-n C-n C-n C-p C-p C-p C-a C-e C-, C-x C-f M-p M-p M-n M-n C-g C-g C-x C-f M-p M-p M-p M-p M-p M-p M-p M-p M-p C-a C-f C-f C-k s r c / o r R . e m d / e l o r m o M-x f i n d - l i b o r g - a g C-x C-j ^ g C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-n n C-c C-a C-p C-p C-p C-c C-w C-_ C-x C-k y e s R l i C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n n C-c C-a C-p C-p C-n C-. C-. C-. C-a n p SPC C-n C-n C-n C-c C-p C-n C-c C-p C-n C-n C-n C-n C-n C-n C-p C-p C-p C-p C-p C-c g C-g C-g C-x g d y C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n k y e s C-x C-b C-b p n C-c C-a C-c C-a C-c C-a p n C-n C-p C-n C-n C-n C-n C-n C-n C-x C-n C-n C-n C-n C-n C-n C-p C-x C-p p C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-c C-u C-c C-d n n p C-c C-a C-c C-u M-< M-> M-x e m a c s - s u C-g C-g M-x s - e m a c - b u C-a r Recent messages: diff-hunk-prev: No previous hunk Hunk applied Hunk applied at offset 6 lines diff-sanity-check-hunk: End of hunk ambiguously marked [4 times] Auto-saving...done Loading tramp-sh...done diff-sanity-check-context-hunk-half: End of hunk ambiguously marked Mark set [2 times] Quit [2 times] Making completion list... Load-path shadows: /Users/dave/.emacs.d/el-get/nognus/lisp/gravatar hides /Users/dave/.emacs.d/el-get/gravatar/gravatar /Users/dave/.emacs.d/el-get/nognus/lisp/gravatar hides /Users/dave/.emacs.d/el-get/wl-gravatar/gravatar /Users/dave/.emacs.d/el-get/weblogger-el/weblogger hides /Users/dave/.emacs.d/el-get/package/elpa/weblogger-1.4.3/weblogger /Users/dave/.emacs.d/el-get/xml-rpc-el/xml-rpc hides /Users/dave/.emacs.d/el-get/package/elpa/xml-rpc-1.6.7/xml-rpc /Users/dave/.emacs.d/el-get/nognus/lisp/.dir-locals hides /Users/dave/.emacs.d/el-get/org-mode/.dir-locals /Users/dave/.emacs.d/el-get/wanderlust/utils/wl-mailto hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/wl-mailto /Users/dave/.emacs.d/el-get/wanderlust/utils/wl-complete hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/wl-complete /Users/dave/.emacs.d/el-get/wanderlust/utils/wl-addrbook hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/wl-addrbook /Users/dave/.emacs.d/el-get/nognus/lisp/utf7 hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/utf7 /Users/dave/.emacs.d/el-get/wanderlust/utils/ssl hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/ssl /Users/dave/.emacs.d/el-get/wanderlust/utils/rfc2368 hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/rfc2368 /Users/dave/.emacs.d/el-get/wanderlust/utils/im-wl hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/im-wl /Users/dave/.emacs.d/el-get/nognus/lisp/.dir-locals hides /Users/dave/.emacs.d/el-get/magit/.dir-locals /Users/dave/.emacs.d/el-get/nognus/lisp/smime hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/smime /Users/dave/.emacs.d/el-get/nognus/lisp/pgg hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-pgp5 hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg-pgp5 /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-pgp hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg-pgp /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-parse hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg-parse /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-gpg hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg-gpg /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-def hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg-def /Users/dave/.emacs.d/el-get/nognus/lisp/sha1 hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/sha1 /Users/dave/.emacs.d/el-get/nognus/lisp/sasl hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/sasl /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-ntlm hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/sasl-ntlm /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-digest hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/sasl-digest /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-cram hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/sasl-cram /Users/dave/.emacs.d/el-get/nognus/lisp/ntlm hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/ntlm /Users/dave/.emacs.d/el-get/nognus/lisp/md4 hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/md4 /Users/dave/.emacs.d/el-get/nognus/lisp/hmac-md5 hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/hmac-md5 /Users/dave/.emacs.d/el-get/nognus/lisp/hmac-def hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/hmac-def /Users/dave/.emacs.d/el-get/nognus/lisp/hex-util hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/hex-util /Users/dave/.emacs.d/el-get/nognus/lisp/sha1 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/sha1 /Users/dave/.emacs.d/el-get/nognus/lisp/pgg hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/pgg /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-pgp5 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/pgg-pgp5 /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-pgp hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/pgg-pgp /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-parse hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/pgg-parse /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-gpg hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/pgg-gpg /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-def hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/pgg-def /Users/dave/.emacs.d/el-get/nognus/lisp/password-cache hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/password-cache /Users/dave/.emacs.d/el-get/nognus/lisp/md4 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/md4 /Users/dave/.emacs.d/el-get/dwamacs/site-lisp/ido hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/ido /Users/dave/.emacs.d/el-get/nognus/lisp/hex-util hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/hex-util /Users/dave/.emacs.d/el-get/nognus/lisp/format-spec hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/format-spec /Users/dave/.emacs.d/el-get/nognus/lisp/dns-mode hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/textmodes/dns-mode /Users/dave/.emacs.d/el-get/dwamacs/site-lisp/compile hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/progmodes/compile /Users/dave/.emacs.d/el-get/org-mode/lisp/org hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org /Users/dave/.emacs.d/el-get/org-mode/lisp/org-xoxo hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-xoxo /Users/dave/.emacs.d/el-get/org-mode/lisp/org-wl hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-wl /Users/dave/.emacs.d/el-get/org-mode/lisp/org-w3m hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-w3m /Users/dave/.emacs.d/el-get/org-mode/lisp/org-vm hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-vm /Users/dave/.emacs.d/el-get/org-mode/lisp/org-timer hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-timer /Users/dave/.emacs.d/el-get/org-mode/lisp/org-table hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-table /Users/dave/.emacs.d/el-get/org-mode/lisp/org-src hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-src /Users/dave/.emacs.d/el-get/org-mode/lisp/org-rmail hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-rmail /Users/dave/.emacs.d/el-get/org-mode/lisp/org-remember hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-remember /Users/dave/.emacs.d/el-get/org-mode/lisp/org-publish hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-publish /Users/dave/.emacs.d/el-get/org-mode/lisp/org-protocol hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-protocol /Users/dave/.emacs.d/el-get/org-mode/lisp/org-plot hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-plot /Users/dave/.emacs.d/el-get/org-mode/lisp/org-mouse hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-mouse /Users/dave/.emacs.d/el-get/org-mode/lisp/org-mobile hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-mobile /Users/dave/.emacs.d/el-get/org-mode/lisp/org-mhe hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-mhe /Users/dave/.emacs.d/el-get/org-mode/lisp/org-mew hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-mew /Users/dave/.emacs.d/el-get/org-mode/lisp/org-macs hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-macs /Users/dave/.emacs.d/el-get/org-mode/lisp/org-mac-message hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-mac-message /Users/dave/.emacs.d/el-get/org-mode/lisp/org-list hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-list /Users/dave/.emacs.d/el-get/org-mode/lisp/org-latex hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-latex /Users/dave/.emacs.d/el-get/org-mode/lisp/org-jsinfo hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-jsinfo /Users/dave/.emacs.d/el-get/org-mode/lisp/org-irc hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-irc /Users/dave/.emacs.d/el-get/org-mode/lisp/org-install hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-install /Users/dave/.emacs.d/el-get/org-mode/lisp/org-inlinetask hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-inlinetask /Users/dave/.emacs.d/el-get/org-mode/lisp/org-info hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-info /Users/dave/.emacs.d/el-get/org-mode/lisp/org-indent hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-indent /Users/dave/.emacs.d/el-get/org-mode/lisp/org-id hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-id /Users/dave/.emacs.d/el-get/org-mode/lisp/org-icalendar hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-icalendar /Users/dave/.emacs.d/el-get/org-mode/lisp/org-html hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-html /Users/dave/.emacs.d/el-get/org-mode/lisp/org-habit hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-habit /Users/dave/.emacs.d/el-get/org-mode/lisp/org-gnus hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-gnus /Users/dave/.emacs.d/el-get/org-mode/lisp/org-freemind hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-freemind /Users/dave/.emacs.d/el-get/org-mode/lisp/org-footnote hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-footnote /Users/dave/.emacs.d/el-get/org-mode/lisp/org-feed hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-feed /Users/dave/.emacs.d/el-get/org-mode/lisp/org-faces hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-faces /Users/dave/.emacs.d/el-get/org-mode/lisp/org-exp hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-exp /Users/dave/.emacs.d/el-get/org-mode/lisp/org-exp-blocks hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-exp-blocks /Users/dave/.emacs.d/el-get/org-mode/lisp/org-docbook hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-docbook /Users/dave/.emacs.d/el-get/org-mode/lisp/org-datetree hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-datetree /Users/dave/.emacs.d/el-get/org-mode/lisp/org-crypt hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-crypt /Users/dave/.emacs.d/el-get/org-mode/lisp/org-compat hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-compat /Users/dave/.emacs.d/el-get/org-mode/lisp/org-colview hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-colview /Users/dave/.emacs.d/el-get/org-mode/lisp/org-clock hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-clock /Users/dave/.emacs.d/el-get/org-mode/lisp/org-bibtex hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-bibtex /Users/dave/.emacs.d/el-get/org-mode/lisp/org-bbdb hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-bbdb /Users/dave/.emacs.d/el-get/org-mode/lisp/org-attach hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-attach /Users/dave/.emacs.d/el-get/org-mode/lisp/org-ascii hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-ascii /Users/dave/.emacs.d/el-get/org-mode/lisp/org-archive hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-archive /Users/dave/.emacs.d/el-get/org-mode/lisp/org-agenda hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/org/org-agenda /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/trampver hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/trampver /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tramp /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-uu hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tramp-uu /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-smb hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tramp-smb /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-gw hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tramp-gw /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-ftp hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tramp-ftp /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-compat hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tramp-compat /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-cmds hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tramp-cmds /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-cache hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tramp-cache /Users/dave/.emacs.d/el-get/nognus/lisp/tls hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/tls /Users/dave/.emacs.d/el-get/nognus/lisp/sasl hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/sasl /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-ntlm hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/sasl-ntlm /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-digest hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/sasl-digest /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-cram hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/sasl-cram /Users/dave/.emacs.d/el-get/nognus/lisp/ntlm hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/ntlm /Users/dave/.emacs.d/el-get/nognus/lisp/netrc hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/netrc /Users/dave/.emacs.d/el-get/nognus/lisp/imap hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/imap /Users/dave/.emacs.d/el-get/nognus/lisp/hmac-md5 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/hmac-md5 /Users/dave/.emacs.d/el-get/nognus/lisp/hmac-def hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/hmac-def /Users/dave/.emacs.d/el-get/nognus/lisp/dns hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/dns /Users/dave/.emacs.d/el-get/nognus/lisp/dig hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/net/dig /Users/dave/.emacs.d/el-get/nognus/lisp/uudecode hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/mail/uudecode /Users/dave/.emacs.d/el-get/wanderlust/utils/rfc2368 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/mail/rfc2368 /Users/dave/.emacs.d/el-get/nognus/lisp/hashcash hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/mail/hashcash /Users/dave/.emacs.d/el-get/nognus/lisp/binhex hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/mail/binhex /Users/dave/.emacs.d/el-get/nognus/lisp/yenc hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/yenc /Users/dave/.emacs.d/el-get/nognus/lisp/utf7 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/utf7 /Users/dave/.emacs.d/el-get/nognus/lisp/starttls hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/starttls /Users/dave/.emacs.d/el-get/nognus/lisp/spam hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/spam /Users/dave/.emacs.d/el-get/nognus/lisp/spam-wash hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/spam-wash /Users/dave/.emacs.d/el-get/nognus/lisp/spam-stat hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/spam-stat /Users/dave/.emacs.d/el-get/nognus/lisp/spam-report hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/spam-report /Users/dave/.emacs.d/el-get/nognus/lisp/smime hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/smime /Users/dave/.emacs.d/el-get/nognus/lisp/smiley hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/smiley /Users/dave/.emacs.d/el-get/nognus/lisp/sieve hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/sieve /Users/dave/.emacs.d/el-get/nognus/lisp/sieve-mode hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/sieve-mode /Users/dave/.emacs.d/el-get/nognus/lisp/sieve-manage hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/sieve-manage /Users/dave/.emacs.d/el-get/nognus/lisp/score-mode hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/score-mode /Users/dave/.emacs.d/el-get/nognus/lisp/rfc2231 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/rfc2231 /Users/dave/.emacs.d/el-get/nognus/lisp/rfc2104 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/rfc2104 /Users/dave/.emacs.d/el-get/nognus/lisp/rfc2047 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/rfc2047 /Users/dave/.emacs.d/el-get/nognus/lisp/rfc2045 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/rfc2045 /Users/dave/.emacs.d/el-get/nognus/lisp/rfc1843 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/rfc1843 /Users/dave/.emacs.d/el-get/nognus/lisp/qp hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/qp /Users/dave/.emacs.d/el-get/nognus/lisp/pop3 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/pop3 /Users/dave/.emacs.d/el-get/nognus/lisp/nnweb hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnweb /Users/dave/.emacs.d/el-get/nognus/lisp/nnvirtual hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnvirtual /Users/dave/.emacs.d/el-get/nognus/lisp/nntp hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nntp /Users/dave/.emacs.d/el-get/nognus/lisp/nnspool hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnspool /Users/dave/.emacs.d/el-get/nognus/lisp/nnrss hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnrss /Users/dave/.emacs.d/el-get/nognus/lisp/nnoo hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnoo /Users/dave/.emacs.d/el-get/nognus/lisp/nnnil hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnnil /Users/dave/.emacs.d/el-get/nognus/lisp/nnml hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnml /Users/dave/.emacs.d/el-get/nognus/lisp/nnmh hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnmh /Users/dave/.emacs.d/el-get/nognus/lisp/nnmbox hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnmbox /Users/dave/.emacs.d/el-get/nognus/lisp/nnmairix hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnmairix /Users/dave/.emacs.d/el-get/nognus/lisp/nnmaildir hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnmaildir /Users/dave/.emacs.d/el-get/nognus/lisp/nnmail hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnmail /Users/dave/.emacs.d/el-get/nognus/lisp/nnir hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnir /Users/dave/.emacs.d/el-get/nognus/lisp/nnimap hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnimap /Users/dave/.emacs.d/el-get/nognus/lisp/nnheader hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnheader /Users/dave/.emacs.d/el-get/nognus/lisp/nngateway hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nngateway /Users/dave/.emacs.d/el-get/nognus/lisp/nnfolder hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnfolder /Users/dave/.emacs.d/el-get/nognus/lisp/nneething hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nneething /Users/dave/.emacs.d/el-get/nognus/lisp/nndraft hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nndraft /Users/dave/.emacs.d/el-get/nognus/lisp/nndoc hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nndoc /Users/dave/.emacs.d/el-get/nognus/lisp/nndir hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nndir /Users/dave/.emacs.d/el-get/nognus/lisp/nndiary hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nndiary /Users/dave/.emacs.d/el-get/nognus/lisp/nnbabyl hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnbabyl /Users/dave/.emacs.d/el-get/nognus/lisp/nnagent hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/nnagent /Users/dave/.emacs.d/el-get/nognus/lisp/mml2015 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mml2015 /Users/dave/.emacs.d/el-get/nognus/lisp/mml1991 hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mml1991 /Users/dave/.emacs.d/el-get/nognus/lisp/mml hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mml /Users/dave/.emacs.d/el-get/nognus/lisp/mml-smime hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mml-smime /Users/dave/.emacs.d/el-get/nognus/lisp/mml-sec hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mml-sec /Users/dave/.emacs.d/el-get/nognus/lisp/mm-view hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-view /Users/dave/.emacs.d/el-get/nognus/lisp/mm-uu hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-uu /Users/dave/.emacs.d/el-get/nognus/lisp/mm-util hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-util /Users/dave/.emacs.d/el-get/nognus/lisp/mm-url hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-url /Users/dave/.emacs.d/el-get/nognus/lisp/mm-partial hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-partial /Users/dave/.emacs.d/el-get/nognus/lisp/mm-extern hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-extern /Users/dave/.emacs.d/el-get/nognus/lisp/mm-encode hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-encode /Users/dave/.emacs.d/el-get/nognus/lisp/mm-decode hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-decode /Users/dave/.emacs.d/el-get/nognus/lisp/mm-bodies hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mm-bodies /Users/dave/.emacs.d/el-get/nognus/lisp/messcompat hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/messcompat /Users/dave/.emacs.d/el-get/nognus/lisp/message hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/message /Users/dave/.emacs.d/el-get/nognus/lisp/mailcap hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mailcap /Users/dave/.emacs.d/el-get/nognus/lisp/mail-source hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mail-source /Users/dave/.emacs.d/el-get/nognus/lisp/mail-prsvr hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mail-prsvr /Users/dave/.emacs.d/el-get/nognus/lisp/mail-parse hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/mail-parse /Users/dave/.emacs.d/el-get/nognus/lisp/legacy-gnus-agent hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/legacy-gnus-agent /Users/dave/.emacs.d/el-get/nognus/lisp/ietf-drums hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/ietf-drums /Users/dave/.emacs.d/el-get/nognus/lisp/html2text hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/html2text /Users/dave/.emacs.d/el-get/nognus/lisp/gnus hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-win hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-win /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-vm hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-vm /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-uu hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-uu /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-util hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-util /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-undo hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-undo /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-topic hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-topic /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-sum hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-sum /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-start hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-start /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-srvr hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-srvr /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-spec hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-spec /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-sieve hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-sieve /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-setup hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-setup /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-score hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-score /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-salt hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-salt /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-registry hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-registry /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-range hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-range /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-picon hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-picon /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-msg hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-msg /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-mlspl hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-mlspl /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-ml hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-ml /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-mh hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-mh /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-logic hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-logic /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-kill hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-kill /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-int hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-int /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-group hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-group /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-fun hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-fun /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-ems hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-ems /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-eform hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-eform /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-dup hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-dup /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-draft hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-draft /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-dired hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-dired /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-diary hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-diary /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-demon hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-demon /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-delay hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-delay /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-cus hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-cus /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-cite hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-cite /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-cache hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-cache /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-bookmark hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-bookmark /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-bcklg hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-bcklg /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-async hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-async /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-art hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-art /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-agent hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gnus-agent /Users/dave/.emacs.d/el-get/nognus/lisp/gmm-utils hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/gmm-utils /Users/dave/.emacs.d/el-get/nognus/lisp/flow-fill hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/flow-fill /Users/dave/.emacs.d/el-get/nognus/lisp/ecomplete hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/ecomplete /Users/dave/.emacs.d/el-get/nognus/lisp/deuglify hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/deuglify /Users/dave/.emacs.d/el-get/nognus/lisp/compface hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/compface /Users/dave/.emacs.d/el-get/nognus/lisp/canlock hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/canlock /Users/dave/.emacs.d/el-get/nognus/lisp/auth-source hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/gnus/auth-source /Users/dave/.emacs.d/el-get/nognus/lisp/time-date hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/calendar/time-date /Users/dave/.emacs.d/el-get/nognus/lisp/parse-time hides /usr/local/stow/emacs-23.3/share/emacs/23.3/lisp/calendar/parse-time Features: (shadow emacsbug tramp-cache tramp-sh diff jka-compr man smerge-mode dabbrev find-dired grep+ grep-ed hilit-chg grep compile+ compile compile- gnus-dired org-magit magit diff-mode log-edit pcvs-util add-log magit-bisect magit-key-mode org-capture org-mks flow-fill canlock sha1 hex-util url-handlers smiley ansi-color face-remap qp quail cus-edit tabify cal-move mule-util url-http url-auth url-gw gnus-html mm-url gnus-bcklg nndoc gnus-draft gnus-async gnus-salt gnus-ml hl-line gnus-topic nndraft nnmh nnfolder epa-file epa epg rot13 utf-7 proto-stream nnimap parse-time tls utf7 netrc gnus-agent gnus-srvr gnus-score score-mode nnvirtual nntp gnus-cache dot-gnus-el mail-settings gnus-cite w3m-load spam spam-stat gnus-uu yenc gnus-msg gnus-gravatar gnus-art mm-uu mml2015 epg-config mm-view mml-smime smime dig nnir gnus-sum macroexp nnoo gnus-group gnus-undo nnmail mail-source gnus-start gnus-spec gnus-int gnus-range gravatar url-cache url url-proxy url-privacy url-expand url-methods url-history url-cookie url-util url-parse url-vars mailcap gnus-win pgg pgg-parse pgg-def starttls gnus-harvest mailalias gnus gnus-ems recentf tree-widget nnheader mail-extr sort newcomment message rfc822 mml mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 ietf-drums mailabbrev mail-utils gmm-utils mailheader org-xoxo org-timer org-table org-remember org-datetree org-publish org-latex org-export-latex org-beamer org-icalendar org-docbook org-html footnote org-colview org-clock org-attach org-ascii org-exp ob-exp org-exp-blocks vc-git multi-isearch org-archive bookmark pp cal-china lunar solar cal-dst cal-bahai cal-islam cal-hebrew holidays hol-loaddefs diary-lib diary-loaddefs cal-iso dot-org-el ob-sh ob-python ob-R ox-redmine ox-org org-x ox-plugin org-devonthink org-habit org-agenda org-info org-id org ob-emacs-lisp ob-tangle ob-ref ob-lob ob-table org-footnote org-src ob-comint ob-keys ob ob-eval org-pcomplete pcomplete org-list org-faces org-compat org-entities org-macs cal-menu calendar cal-loaddefs frame-bufs zenburn-overrides-theme zenburn session warnings per-window-point page-ext disp-table pp-c-l ws-trim ffap info+ strings misc-fns thingatpt+ system-type-darwin-theme osx-plist xml dot-passwd-el .loaddefs tramp tramp-compat auth-source eieio byte-opt gnus-util time-date mm-util mail-prsvr password-cache format-spec tramp-loaddefs ess-toolbar ess-mouse mouseme browse-url ess-menu ess-swv ess-noweb noweb-font-lock-mode ess-bugs-l essd-els ess-sas-d ess-sas-l ess-sas-a executable shell ess-arc-d ess-vst-d ess-xls-d ess-lsp-l ess-sta-d ess-sta-l cc-vars cc-defs make-regexp ess-sp6-d ess-sp5-d ess-sp3-d ess-r-d ess-r-args ess-s-l ess-inf ess-utils comint ess-mode noweb-mode ess ess-custom ess-compat ess-site xcscope ring cmake-mode mo-git-blame gnus-load yasnippet dropdown-list assoc company-autoloads weblogger-autoloads xml-rpc-autoloads package org-install browse-kill-ring markdown-mode derived thingatpt noutline outline fit-frame color-theme edmacro kmacro wid-edit sendmail reporter info initsplit advice advice-preload find-func el-get help-mode easymenu view autoload help-fns bytecomp byte-compile cl cl-19 dired-x dired-aux dired regexp-opt paren server ido easy-mmode autorevert time delsel cus-start cus-load elhome tooltip ediff-hook vc-hooks lisp-float-type mwheel mac-win tool-bar dnd fontset image fringe lisp-mode register page menu-bar rfn-eshadow timer select scroll-bar mldrag mouse jit-lock font-lock syntax facemenu font-core frame cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev loaddefs button minibuffer faces cus-face files text-properties overlay md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote mac multi-tty make-network-process emacs) -- Dave Abrahams BoostPro Computing http://www.boostpro.com --=-=-=-- ------------=_1485849963-8942-1-- From unknown Sat Aug 16 21:20:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9597: bug#5302: Diff-mode fails on Bzr diffs References: In-Reply-To: Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 31 Jan 2017 09:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9597 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dima Kogan Cc: 5302@debbugs.gnu.org, 9597@debbugs.gnu.org, tino.calancha@gmail.com Received: via spool by 9597-submit@debbugs.gnu.org id=B9597.148585334314041 (code B ref 9597); Tue, 31 Jan 2017 09:03:02 +0000 Received: (at 9597) by debbugs.gnu.org; 31 Jan 2017 09:02:23 +0000 Received: from localhost ([127.0.0.1]:51711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYUKV-0003eO-9Y for submit@debbugs.gnu.org; Tue, 31 Jan 2017 04:02:23 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:32920) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYUKS-0003e7-Fu; Tue, 31 Jan 2017 04:02:22 -0500 Received: by mail-pf0-f196.google.com with SMTP id e4so26765651pfg.0; Tue, 31 Jan 2017 01:02:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version; bh=P7I6HPTHjlpK5B6nLe6nVnSSRv5GD+22TbB8LqZuUts=; b=S15rQrl+aR9qt11TQE7gKKmcjw1FB5qr/l3JLDZhJvSET8Lt7MU9JnuRYBXYvKoRJo J11EVOUIZ2huWRCE7XqmZAzz8aRV+1zhkj7WXy9FKlW1iRxELzn1zDU4GV1b78zrznnR k4GyR9zDfDGgjBD1r5YkQvx+NuaWSi2klVfoGnurNrOlnj0eW6chDLSk/GD7Zs9cLzRh FXrxiZS464GYWctZfEF7eSUDYIuh6PI3Ongh1qBl6nQ1J49oStM90TWDQ33VSlLeQwk5 o3rfXjCD1JBHW392cumJEoHGBrP7RapRQwarzm48wBobm0v4dutinNHbZKYPKJYv8a3y phcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version; bh=P7I6HPTHjlpK5B6nLe6nVnSSRv5GD+22TbB8LqZuUts=; b=C7adxAo3Zg3U5F6wzSfqZUhcPOxfN7R4+U2RzovjYlopRVJFm1fBvsM8/mfLzbs61Z ckeFfubmdUwBkg6/lk2o6nDYkd7ypYwprc1vXen8RYQc4D+8irEl3Z5syfWtokyzaETZ MzhTtd2Uo7lRlEV6kwdavPxCzU3gPKPLZKl7JlYutrxW9vLsOsww9zbUBGExxIjOfCNm 30S1rWwSOAS6p0pkZ6YCU68g/9ReTcQab/+iEu+j46urDWvj/CYAN8oF49FDEvhmrCI9 HHzswAle6KGZl+ZAk4mNUaCqeKu6uloBQD1uRsrhw6HSnbqCpnLB8FZk4MFmQm4YOEzj mwIQ== X-Gm-Message-State: AIkVDXIoch93vQuQGlKsI6wvAvsQySq7AeTLY7iCMjdl5fDz7R3Q4O14yCcaAHVO3AY7RA== X-Received: by 10.98.223.195 with SMTP id d64mr28061369pfl.80.1485853334579; Tue, 31 Jan 2017 01:02:14 -0800 (PST) Received: from calancha-pc ([103.5.140.175]) by smtp.gmail.com with ESMTPSA id w2sm38800839pfi.65.2017.01.31.01.02.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Jan 2017 01:02:14 -0800 (PST) From: Tino Calancha Date: Tue, 31 Jan 2017 18:02:08 +0900 Message-ID: <877f5bwqjz.fsf@calancha-pc> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) Dima Kogan writes: >I pushed the fix and a test in 47a1ebb8ab67c97904bf3211eb44ce2d7d40949d Hi Dima, i just pulled the master branch but i cannot find such 47a1ebb commit. $ grep diff-separator-re diff-mode.el returns 1 Apparently the fix is not there. From unknown Sat Aug 16 21:20:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9597: bug#5302: Diff-mode fails on Bzr diffs Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 31 Jan 2017 09:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9597 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Tino Calancha Cc: 5302@debbugs.gnu.org, 9597@debbugs.gnu.org, Eli Zaretskii , Dima Kogan Received: via spool by 9597-submit@debbugs.gnu.org id=B9597.148585537617077 (code B ref 9597); Tue, 31 Jan 2017 09:37:02 +0000 Received: (at 9597) by debbugs.gnu.org; 31 Jan 2017 09:36:16 +0000 Received: from localhost ([127.0.0.1]:51725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYUrI-0004RI-Fm for submit@debbugs.gnu.org; Tue, 31 Jan 2017 04:36:16 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36101) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYUrG-0004R0-QP; Tue, 31 Jan 2017 04:36:15 -0500 Received: by mail-pf0-f196.google.com with SMTP id 19so26935072pfo.3; Tue, 31 Jan 2017 01:36:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=K2LfeGDLnWC67LWLHDb7xfCVIrVg142ZQQwH4xnuOaI=; b=mA1BCFscEzWyySUNzbSxWfswl9OMHEugyb1yzfPT1U10MX4ch0PFb+qkBV1thPjnpj odjva3ho71i1/tHRCGp/ijqT5CTbxldQ27qTkKmqXDnM9PRT+sYlSKkz3Gg/sb9L+HeX dktX5w7Jda9O/UlDEPTgsGgRWl0KdczncAnyDAaCTGUFCUgUgGkbnz4py9caJprzobh1 oq+6k1HCOaL37d6DDrjDn8qliCvOa5D3XdbLxx9D8rbEbVnxSbPFAkFTeKvTZEJ4GeOG 51CnqBBxQbTjfZVxsapnKem2QcgKdWqSZYjciYT/T0biHhmHgfEYX0pg3cH6k56XCRHZ JfPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=K2LfeGDLnWC67LWLHDb7xfCVIrVg142ZQQwH4xnuOaI=; b=OzEbJm3i5bPH+nBcvv1d+/Z2ArRNnyNYxp945GSVthrgpIurZPWTcvyP/OMOAFdfjb 3yccvosF8uoj8TG7s1QOq7A8MOGTwbYuBs1uCfw/1+heYzBLigpZ3tgxCpcjuV1PMK76 eDVl6QTF13bvCt06gKNcYhzwn/jhAjltkjYdgjpUu9oMkSfOQmuH4/gVJ3l/ABXHvDZU Duf40wWwGRSc0yugb05lp8et66tyR3zxcjNPWE7Kb+XdGe3ienK4OfhfopuA/AnDvt4Z qUj8swP1w4oI3t9d9o5aGa/5VCh+QFGn5TmtlVce80xPXxMHHPzLuqMLl+Ohr89J790r 6YHQ== X-Gm-Message-State: AIkVDXL5AUqxK7wiwSdnKLDjLTX2Z1Z6OGKknQUAv3Ni9xUgi2aAA/avt93g1FrmzD7lMQ== X-Received: by 10.99.36.3 with SMTP id k3mr29565660pgk.136.1485855369272; Tue, 31 Jan 2017 01:36:09 -0800 (PST) Received: from calancha-pc ([103.5.140.137]) by smtp.gmail.com with ESMTPSA id i21sm39139870pfi.94.2017.01.31.01.36.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jan 2017 01:36:08 -0800 (PST) From: Tino Calancha X-Google-Original-From: Tino Calancha Date: Tue, 31 Jan 2017 18:35:34 +0900 (JST) X-X-Sender: calancha@calancha-pc In-Reply-To: <877f5bwqjz.fsf@calancha-pc> Message-ID: References: <877f5bwqjz.fsf@calancha-pc> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset=US-ASCII X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) On Tue, 31 Jan 2017, Tino Calancha wrote: > > Dima Kogan writes: > >> I pushed the fix and a test in 47a1ebb8ab67c97904bf3211eb44ce2d7d40949d > Hi Dima, > i just pulled the master branch but i cannot find > such 47a1ebb commit. > $ grep diff-separator-re diff-mode.el > returns 1 > > Apparently the fix is not there. Also your latest commit f3c77d11af65f3b319b1784b4c3cf08c51aa7997 looks wrong: it changes 5 files with >100 lines changed, but the commit message is just one word: stash From unknown Sat Aug 16 21:20:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9597: bug#5302: Diff-mode fails on Bzr diffs Resent-From: Dima Kogan Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 31 Jan 2017 16:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9597 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Tino Calancha Cc: 5302@debbugs.gnu.org, 9597@debbugs.gnu.org, Eli Zaretskii Received: via spool by 9597-submit@debbugs.gnu.org id=B9597.14858815675175 (code B ref 9597); Tue, 31 Jan 2017 16:53:02 +0000 Received: (at 9597) by debbugs.gnu.org; 31 Jan 2017 16:52:47 +0000 Received: from localhost ([127.0.0.1]:52467 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYbfj-0001LP-Ar for submit@debbugs.gnu.org; Tue, 31 Jan 2017 11:52:47 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:37001) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYbfg-0001L5-5g; Tue, 31 Jan 2017 11:52:44 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 53CAC237AF; Tue, 31 Jan 2017 11:52:40 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute1.internal (MEProxy); Tue, 31 Jan 2017 11:52:40 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=secretsauce.net; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=AuO aIX5ieN77PEJvHr6HIvCr1G0=; b=hODhWjpPZNZQJd+OGHPTBBK+jAXeHkjTtMB Xx8K2ygqENRCbUHHQTC4/igoCC0b46CWj8Ws+D8+2fhSYS8KTDKDAjrwnFbq25kb gB2iwN5zTXb0pbqu9r2DA/26pRNIu4NP3/I1tWAqwTyQ9uWgP8CPY5xgH1ZEsbEn w6/i5YbM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= smtpout; bh=AuOaIX5ieN77PEJvHr6HIvCr1G0=; b=PlbJ6fzQIMnztvqlgghY ieiXvMOPaGbe9ESu/DQr2wkkCvhd56vbHHOMl96et57HuBOM41GVb4g21P6NPVuJ C2R+N5DWMEgW/CsnQ4t3hv0owDIMES94BH+KSeWNbbcEd6uJEiow9E6tfW/mXgKh t2m4IbB1ijfur+mIrCyvGDM= X-ME-Sender: X-Sasl-enc: cIXXItA/eQdA05hDHr6ftTu2xhrnoP/widV8zKPV26Gd 1485881559 Received: from [22.161.138.38] (unknown [172.56.38.235]) by mail.messagingengine.com (Postfix) with ESMTPA id 172A87E033; Tue, 31 Jan 2017 11:52:38 -0500 (EST) User-Agent: K-9 Mail for Android In-Reply-To: References: <877f5bwqjz.fsf@calancha-pc> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 From: Dima Kogan Date: Tue, 31 Jan 2017 08:52:32 -0800 Message-ID: X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On January 31, 2017 1:35:34 AM PST, Tino Calancha wrote: > > >On Tue, 31 Jan 2017, Tino Calancha wrote: > >> >> Dima Kogan writes: >> >>> I pushed the fix and a test in >47a1ebb8ab67c97904bf3211eb44ce2d7d40949d >> Hi Dima, >> i just pulled the master branch but i cannot find >> such 47a1ebb commit. >> $ grep diff-separator-re diff-mode.el >> returns 1 >> >> Apparently the fix is not there. >Also your latest commit f3c77d11af65f3b319b1784b4c3cf08c51aa7997 >looks wrong: it changes 5 files with >100 lines changed, >but the commit message is just one word: stash I made a mistake and ended up pushing the wrong few commits. The revert and the correct commits are pushed now. The fix lives in 189df8262e54c4. The test lives in 3506ec2b11. From unknown Sat Aug 16 21:20:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9597: bug#5302: Diff-mode fails on Bzr diffs Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 31 Jan 2017 16:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9597 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dima Kogan Cc: 5302@debbugs.gnu.org, 9597@debbugs.gnu.org, Eli Zaretskii Received: via spool by 9597-submit@debbugs.gnu.org id=B9597.14858817275431 (code B ref 9597); Tue, 31 Jan 2017 16:56:02 +0000 Received: (at 9597) by debbugs.gnu.org; 31 Jan 2017 16:55:27 +0000 Received: from localhost ([127.0.0.1]:52472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYbiI-0001PW-Oi for submit@debbugs.gnu.org; Tue, 31 Jan 2017 11:55:26 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYbiH-0001PG-7U; Tue, 31 Jan 2017 11:55:25 -0500 Received: by mail-pf0-f193.google.com with SMTP id f144so28734302pfa.2; Tue, 31 Jan 2017 08:55:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=4akcky3dw/XzttlBexYMBpNGmTEhUcDxL/RuGTufJKw=; b=MUaiUnuvOD4eqxGS6V+hWT1Iiyok5qIYtGG5D1nMAwFtqRB344jGQTo7vozp/UfTpN ieeMd1p4XoN/1i1rdG9spFWNMa7UTBt4S+8LuXZr895IIZiJGXpEYuyUwmISfyCbemLI j0Z+WofvVU1dJRwiwrs8CZx2oY4+1TfNf3InxSYx4BYKepSSXm5pIyZdtdF2lMRKCMk+ K7owBGb3M9zXKM0ycTyWLZJ07I16jnCQHU1rHsPkQ6m+SiMzi89ZUg62Qa3+C/ocQtq6 Ht9M4djrMWELxlFFc58XhUCb8UQV1Phbhl4CI1oSnRouBFvLkTCCPfaoSuqVLP6PtLD4 huHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=4akcky3dw/XzttlBexYMBpNGmTEhUcDxL/RuGTufJKw=; b=g2b2Z3H2INCqyIti2CNDvprcO46JJW6V5br0IxZGPkkv7owT3zSbBXHvi3/DECS/8r SmwWfr/QCXcVUuuC0pC+MmC10brwsJu5ljzrIGUtI3V2YGjT0DcSN1vqYLOHNqPu/glk FlEZDcIgPXC1EX/Y+FZWgZ/L6GlL8WqqSVLoeGetiMx2QFY2/qfDPx9Z83Uc6bYGpHuU 4nuOlAEwMMqsz8Srzb1+5FxNyUEnb52up0LJzD9HxJr2v5GtiUmZe5lp+1nNySMdXSIH MffwKa+HmFIJf3wicrG9y8zITqV17pwCrKN8wS8xukHEo9bF9nxKSNk/ggJHdlmKkhzS Jm7A== X-Gm-Message-State: AIkVDXIpe7pr51SGet1xEqB5/ODgak4LnpVAO9YMxO5gOOGWat7OYwlsDW/XgvgPBfYSSA== X-Received: by 10.98.80.146 with SMTP id g18mr30632058pfj.74.1485881719353; Tue, 31 Jan 2017 08:55:19 -0800 (PST) Received: from [192.168.0.18] (104.81.147.124.dy.bbexcite.jp. [124.147.81.104]) by smtp.gmail.com with ESMTPSA id e25sm42555387pfk.3.2017.01.31.08.55.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jan 2017 08:55:18 -0800 (PST) References: <877f5bwqjz.fsf@calancha-pc> From: Tino Calancha Message-ID: Date: Wed, 1 Feb 2017 01:55:16 +0900 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -1.1 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.1 (-) On 02/01/2017 01:52 AM, Dima Kogan wrote: > On January 31, 2017 1:35:34 AM PST, Tino Calancha wrote: >> >> On Tue, 31 Jan 2017, Tino Calancha wrote: >> >>> Dima Kogan writes: >>> >>>> I pushed the fix and a test in >> 47a1ebb8ab67c97904bf3211eb44ce2d7d40949d >>> Hi Dima, >>> i just pulled the master branch but i cannot find >>> such 47a1ebb commit. >>> $ grep diff-separator-re diff-mode.el >>> returns 1 >>> >>> Apparently the fix is not there. >> Also your latest commit f3c77d11af65f3b319b1784b4c3cf08c51aa7997 >> looks wrong: it changes 5 files with >100 lines changed, >> but the commit message is just one word: stash > I made a mistake and ended up pushing the wrong few commits. The revert and the correct commits are pushed now. The fix lives in 189df8262e54c4. The test lives in 3506ec2b11. > I see your new commits now. Thank you very much for fixing this bugs.