From: Dan Nicolaescu <dann@gnu.org>
To: 6005@debbugs.gnu.org
Subject: bug#6005: M-k removes the wrong hunk in diff-mode
Date: Thu, 22 Apr 2010 13:02:31 -0400 [thread overview]
Message-ID: <yxqhbn3s9nc.fsf@fencepost.gnu.org> (raw)
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 <michael.albinus@gmx.de>
+
+ 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 <noah549@gmail.com> (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 '("\\<with-file-property\\>"))
(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).
next reply other threads:[~2010-04-22 17:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-22 17:02 Dan Nicolaescu [this message]
2012-04-26 8:02 ` bug#6005: M-k removes the wrong hunk in diff-mode Chong Yidong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=yxqhbn3s9nc.fsf@fencepost.gnu.org \
--to=dann@gnu.org \
--cc=6005@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.