[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#24409: 25.1.1; dired-jump: Interactive call w/ prefix arg move to wr
From: |
Tino Calancha |
Subject: |
bug#24409: 25.1.1; dired-jump: Interactive call w/ prefix arg move to wrong file line |
Date: |
Tue, 13 Sep 2016 16:04:05 +0900 (JST) |
User-agent: |
Alpine 2.20 (DEB 67 2015-01-07) |
On Mon, 12 Sep 2016, Eli Zaretskii wrote:
From: Tino Calancha <tino.calancha@gmail.com>
Date: Mon, 12 Sep 2016 13:37:14 +0900 (JST)
cc: Tino Calancha <tino.calancha@gmail.com>, 24409@debbugs.gnu.org
I think a better comment would be to say that dired-goto-file requires
its argument to be an absolute file name, and the result of
read-file-name could be an abbreviated file name.
Thank you. I rewrote the comment/log message with your suggestion.
I included the word canonical: an abbreviated file name could be
an absolute file name, for instance ~/foo, but dired-goto-file,
in addition to absolute file name, requires the substitution of '~/'.
We don't have a notion of a "canonical" file name in Emacs, so I'm not
sure this helps. OTOH, "absolute file name" is quite clear, and I
don't think people will be confused by the fact that ~/foo returns
non-nil from file-name-absolute-p.
Ok, i will not use the word canonical.
+When FILE-NAME is non-nil, move to FILE-NAME line in Dired.
"When FILE-NAME is non-nil, jump to its line in Dired."
(Try to avoid saying the same thing twice too close to one another.)
Added. Thank you very much.
Once you give me the LGTM i will apply the following corrected patch:
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
From e1541dd78cb5bf81247bd4025a603cef81f3a3cb Mon Sep 17 00:00:00 2001
From: Tino Calancha <tino.calancha@gmail.com>
Date: Tue, 13 Sep 2016 15:59:45 +0900
Subject: [PATCH] dired-jump: Expand file-name before dired-goto-file call
Command dired-goto-file requires its argument to be an absolute
file name. Interactively FILE-NAME is read with read-file-name,
which could return an abbreviated file name (Bug#24409).
* lisp/dired-x.el (dired-jump): Use expand-file-name on FILE-NAME.
Clarify in doc string the meaning of arg FILE-NAME.
---
lisp/dired-x.el | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index be762e6..41c2256 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -413,14 +413,19 @@ dired-jump
In case the proper Dired file line cannot be found, refresh the dired
buffer and try again.
When OTHER-WINDOW is non-nil, jump to Dired buffer in other window.
-Interactively with prefix argument, read FILE-NAME and
-move to its line in dired."
+When FILE-NAME is non-nil, jump to its line in Dired.
+Interactively with prefix argument, read FILE-NAME."
(interactive
(list nil (and current-prefix-arg
(read-file-name "Jump to Dired file: "))))
(if (bound-and-true-p tar-subfile-mode)
(switch-to-buffer tar-superior-buffer)
- (let* ((file (or file-name buffer-file-name))
+ ;; Expand file-name before `dired-goto-file' call:
+ ;; `dired-goto-file' requires its argument to be an absolute
+ ;; file name; the result of `read-file-name' could be
+ ;; an abbreviated file name (Bug#24409).
+ (let* ((file (or (and file-name (expand-file-name file-name))
+ buffer-file-name))
(dir (if file (file-name-directory file) default-directory)))
(if (and (eq major-mode 'dired-mode) (null file-name))
(progn
--
2.9.3
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
In GNU Emacs 25.1.50.1 (x86_64-pc-linux-gnu, GTK+ Version 3.21.5)
of 2016-09-13
Repository revision: 367f8568bc9e759ebdfb423648891efa0346456b
- bug#24409: 25.1.1; dired-jump: Interactive call w/ prefix arg move to wrong file line, Tino Calancha, 2016/09/11
- bug#24409: 25.1.1; dired-jump: Interactive call w/ prefix arg move to wrong file line, Noam Postavsky, 2016/09/11
- bug#24409: 25.1.1; dired-jump: Interactive call w/ prefix arg move to wrong file line, Eli Zaretskii, 2016/09/11
- bug#24409: 25.1.1; dired-jump: Interactive call w/ prefix arg move to wrong file line, Tino Calancha, 2016/09/11
- bug#24409: 25.1.1; dired-jump: Interactive call w/ prefix arg move to wrong file line, Eli Zaretskii, 2016/09/11
- bug#24409: 25.1.1; dired-jump: Interactive call w/ prefix arg move to wrong file line, Tino Calancha, 2016/09/12
- bug#24409: 25.1.1; dired-jump: Interactive call w/ prefix arg move to wrong file line, Eli Zaretskii, 2016/09/12
- bug#24409: 25.1.1; dired-jump: Interactive call w/ prefix arg move to wrong file line,
Tino Calancha <=
- bug#24409: 25.1.1; dired-jump: Interactive call w/ prefix arg move to wrong file line, Eli Zaretskii, 2016/09/13
- bug#24409: 25.1.1; dired-jump: Interactive call w/ prefix arg move to wrong file line, Tino Calancha, 2016/09/13