From unknown Fri Jun 20 05:37:01 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6005: M-k removes the wrong hunk in diff-mode Resent-From: Dan Nicolaescu Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 22 Apr 2010 17:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 6005 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 6005@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.12719557612587 (code B ref -1); Thu, 22 Apr 2010 17:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Apr 2010 17:02:41 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4znU-0000fg-Ll for submit@debbugs.gnu.org; Thu, 22 Apr 2010 13:02:40 -0400 Received: from mail.gnu.org ([199.232.76.166] helo=mx10.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4znT-0000fb-Oj for submit@debbugs.gnu.org; Thu, 22 Apr 2010 13:02:40 -0400 Received: from lists.gnu.org ([199.232.76.165]:37358) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1O4znP-0002dX-7Q for submit@debbugs.gnu.org; Thu, 22 Apr 2010 13:02:35 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4znO-0004vk-Aa for bug-gnu-emacs@gnu.org; Thu, 22 Apr 2010 13:02:34 -0400 Received: from [199.232.76.173] (port=57904 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4znN-0004v4-At for bug-gnu-emacs@gnu.org; Thu, 22 Apr 2010 13:02:33 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1O4znL-0002dN-H9 for bug-gnu-emacs@gnu.org; Thu, 22 Apr 2010 13:02:32 -0400 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on monty-python X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.1.0 Received: from fencepost.gnu.org ([140.186.70.10]:49460) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1O4znL-0002dJ-Am for bug-gnu-emacs@gnu.org; Thu, 22 Apr 2010 13:02:31 -0400 Received: from dann by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1O4znL-0008P8-8j for bug-gnu-emacs@gnu.org; Thu, 22 Apr 2010 13:02:31 -0400 From: Dan Nicolaescu Date: Thu, 22 Apr 2010 13:02:31 -0400 Message-ID: User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Spam-Score: -6.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: -6.6 (------) Given this diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-04-22 11:21:39 +0000 +++ lisp/ChangeLog 2010-04-22 12:07:37 +0000 @@ -1,3 +1,15 @@ +2010-04-22 Michael Albinus + + Synchronize with Tramp repository. + + * net/tramp.el (with-connection-property, tramp-completion-mode-p) + (tramp-action-process-alive, tramp-action-out-of-band) + (tramp-check-for-regexp, tramp-file-name-p, tramp-equal-remote) + (tramp-exists-file-name-handler): Fix docstring. + (with-progress-reporter): New defmacro. + (tramp-do-copy-or-rename-file, tramp-handle-dired-compress-file) + (tramp-maybe-open-connection): Use it. + 2010-04-22 Noah Lavine (tiny change) Detect ssh 'ControlMaster' argument automatically in some cases. === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2010-04-22 11:21:39 +0000 +++ lisp/net/tramp.el 2010-04-22 12:07:37 +0000 @@ -2240,7 +2240,7 @@ FILE must be a local file name on a conn (font-lock-add-keywords 'emacs-lisp-mode '("\\")) (defmacro with-connection-property (key property &rest body) - "Checks in Tramp for property PROPERTY, otherwise executes BODY and set." + "Check in Tramp for property PROPERTY, otherwise executes BODY and set." `(let ((value (tramp-get-connection-property ,key ,property 'undef))) (when (eq value 'undef) ;; We cannot pass ,@body as parameter to If the point is on any of the === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2010-04-22 11:21:39 +0000 +++ lisp/net/tramp.el 2010-04-22 12:07:37 +0000 pressing M-k will remove the lisp/ChangeLog hunk above (and not remove the === modified file 'lisp/ChangeLog' line. This is not right, M-k should either remove the first hunk in lisp/net/tramp.el in this example, or just do nothing and advance the point to the start of the next hunk. (So that pressing M-k M-k M-k ... will end up doing the right thing). From unknown Fri Jun 20 05:37:01 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6005: M-k removes the wrong hunk in diff-mode Resent-From: Chong Yidong Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 26 Apr 2012 08:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6005 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dan Nicolaescu Cc: 6005@debbugs.gnu.org Received: via spool by 6005-submit@debbugs.gnu.org id=B6005.133542739913116 (code B ref 6005); Thu, 26 Apr 2012 08:04:02 +0000 Received: (at 6005) by debbugs.gnu.org; 26 Apr 2012 08:03:19 +0000 Received: from localhost ([127.0.0.1]:53451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SNJfY-0003PT-HS for submit@debbugs.gnu.org; Thu, 26 Apr 2012 04:03:18 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:39318 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SNJfV-0003PK-Pe for 6005@debbugs.gnu.org; Thu, 26 Apr 2012 04:03:15 -0400 Received: from [155.69.16.63] (port=45238 helo=ulysses) by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SNJeZ-0000Dr-Bs; Thu, 26 Apr 2012 04:02:15 -0400 From: Chong Yidong References: Date: Thu, 26 Apr 2012 16:02:07 +0800 In-Reply-To: (Dan Nicolaescu's message of "Thu, 22 Apr 2010 13:02:31 -0400") Message-ID: <87ehra6hvk.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.95 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -6.9 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 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: -6.9 (------) Dan Nicolaescu writes: > If the point is on any of the > === modified file 'lisp/net/tramp.el' > --- lisp/net/tramp.el 2010-04-22 11:21:39 +0000 > +++ lisp/net/tramp.el 2010-04-22 12:07:37 +0000 > > pressing M-k will remove the lisp/ChangeLog hunk above (and not remove > the === modified file 'lisp/ChangeLog' line). Fixed in trunk. From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 26 04:03:25 2012 Received: (at control) by debbugs.gnu.org; 26 Apr 2012 08:03:25 +0000 Received: from localhost ([127.0.0.1]:53454 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SNJff-0003Pk-UP for submit@debbugs.gnu.org; Thu, 26 Apr 2012 04:03:24 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:39320 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SNJfd-0003Pd-QS for control@debbugs.gnu.org; Thu, 26 Apr 2012 04:03:22 -0400 Received: from [155.69.16.63] (port=45239 helo=ulysses) by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SNJeh-0000Sb-Lr for control@debbugs.gnu.org; Thu, 26 Apr 2012 04:02:24 -0400 From: Chong Yidong To: control@debbugs.gnu.org Subject: close 6005 Date: Thu, 26 Apr 2012 16:02:18 +0800 Message-ID: <871unakjjp.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -6.9 (------) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 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: -6.9 (------) close 6005 thanks