[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116449: * lisp/ido.el (ido-file-internal): Don't ad
From: |
Dmitry Gutov |
Subject: |
[Emacs-diffs] trunk r116449: * lisp/ido.el (ido-file-internal): Don't add the name of an existing |
Date: |
Sun, 16 Feb 2014 04:15:59 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116449
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16747
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Sun 2014-02-16 06:15:47 +0200
message:
* lisp/ido.el (ido-file-internal): Don't add the name of an existing
directory twice.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/ido.el ido.el-20091113204419-o5vbwnq5f7feedwu-2430
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-02-16 03:09:27 +0000
+++ b/lisp/ChangeLog 2014-02-16 04:15:47 +0000
@@ -1,3 +1,8 @@
+2014-02-16 Dmitry Gutov <address@hidden>
+
+ * ido.el (ido-file-internal): Don't add the name of an existing
+ directory twice. (Bug#16747)
+
2014-02-16 Glenn Morris <address@hidden>
* vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):
=== modified file 'lisp/ido.el'
--- a/lisp/ido.el 2014-01-31 06:34:44 +0000
+++ b/lisp/ido.el 2014-02-16 04:15:47 +0000
@@ -2375,14 +2375,14 @@
(if (eq ido-use-filename-at-point 'guess)
(ffap-guesser)
(ffap-string-at-point))))
- (not (string-match "^http:/" fn))
- (let ((absolute-fn (expand-file-name fn)))
- (setq d (if (file-directory-p absolute-fn)
- (file-name-as-directory absolute-fn)
- (file-name-directory absolute-fn))))
- (file-directory-p d))
- (setq ido-current-directory d)
- (setq initial (file-name-nondirectory fn))))))
+ (not (string-match "^http:/" fn)))
+ (let ((absolute-fn (expand-file-name fn)))
+ (cond
+ ((file-directory-p absolute-fn)
+ (setq ido-current-directory (file-name-as-directory
absolute-fn)))
+ ((file-directory-p (file-name-directory absolute-fn))
+ (setq ido-current-directory (file-name-directory absolute-fn))
+ (setq initial (file-name-nondirectory absolute-fn)))))))))
(let (ido-saved-vc-hb
(vc-handled-backends (and (boundp 'vc-handled-backends)
vc-handled-backends))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116449: * lisp/ido.el (ido-file-internal): Don't add the name of an existing,
Dmitry Gutov <=