From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.bugs Subject: bug#6005: M-k removes the wrong hunk in diff-mode Date: Thu, 22 Apr 2010 13:02:31 -0400 Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1271957485 32375 80.91.229.12 (22 Apr 2010 17:31:25 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 22 Apr 2010 17:31:25 +0000 (UTC) To: 6005@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Apr 22 19:31:22 2010 connect(): No such file or directory Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1O50FA-0006i3-E4 for geb-bug-gnu-emacs@m.gmane.org; Thu, 22 Apr 2010 19:31:16 +0200 Original-Received: from localhost ([127.0.0.1]:50915 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O50F9-0005xt-L3 for geb-bug-gnu-emacs@m.gmane.org; Thu, 22 Apr 2010 13:31:15 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O509f-0002Rx-NG for bug-gnu-emacs@gnu.org; Thu, 22 Apr 2010 13:25:35 -0400 Original-Received: from [140.186.70.92] (port=54803 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O509U-0002Lt-7Z for bug-gnu-emacs@gnu.org; Thu, 22 Apr 2010 13:25:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O509Q-0001fg-Ut for bug-gnu-emacs@gnu.org; Thu, 22 Apr 2010 13:25:24 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:52346) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O509Q-0001fc-Rf for bug-gnu-emacs@gnu.org; Thu, 22 Apr 2010 13:25:20 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1O4znr-0000g6-6F; Thu, 22 Apr 2010 13:03:03 -0400 X-Loop: help-debbugs@gnu.org 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: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.12719557612587 (code B ref -1); Thu, 22 Apr 2010 17:03:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 22 Apr 2010 17:02:41 +0000 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Thu, 22 Apr 2010 13:03:03 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:36424 Archived-At: 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).