From: Karl Chen <quarl@hkn.eecs.berkeley.edu>
Cc: Emacs Developement List <emacs-devel@gnu.org>
Subject: [patch] ido.el
Date: Fri, 28 Nov 2003 20:56:12 -0800 [thread overview]
Message-ID: <20031128T2056.j5y8tzdb83.quack@hkn.eecs.berkeley.edu> (raw)
This patch fixes a bug when default-directory or the given
directory doesn't end in a slash
--
Karl Chen 2003-11-28 20:53
Index: ido.el
===================================================================
--- ido.el (revision 5448)
+++ ido.el (working copy)
@@ -1372,6 +1372,9 @@
(fix-it (concat dir "/"))
(t nil)))
+(defsubst ido-directory-or-default (directory)
+ (file-name-as-directory (expand-file-name (or directory default-directory))))
+
(defun ido-set-current-directory (dir &optional subdir no-merge)
;; Set ido's current directory to DIR or DIR/SUBDIR
(setq dir (ido-final-slash dir t))
@@ -1832,7 +1835,7 @@
(defun ido-file-internal (method &optional fallback default prompt item initial)
;; Internal function for ido-find-file and friends
- (let ((ido-current-directory (expand-file-name (or default default-directory)))
+ (let ((ido-current-directory (ido-directory-or-default default))
filename)
(if (or (not ido-mode) (ido-is-slow-ftp-host))
@@ -3725,7 +3728,7 @@
(let (filename
ido-saved-vc-mt
(vc-master-templates (and (boundp 'vc-master-templates) vc-master-templates))
- (ido-current-directory (expand-file-name (or dir default-directory)))
+ (ido-current-directory (ido-directory-or-default dir default-directory))
(ido-work-directory-index -1)
(ido-work-file-index -1)
(ido-find-literal nil))
@@ -3743,7 +3746,7 @@
See `read-file-name' for additional parameters."
(let (filename
ido-saved-vc-mt
- (ido-current-directory (expand-file-name (or dir default-directory)))
+ (ido-current-directory (ido-directory-or-default dir))
(ido-work-directory-index -1)
(ido-work-file-index -1))
(setq filename
next reply other threads:[~2003-11-29 4:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-11-29 4:56 Karl Chen [this message]
2003-12-05 13:17 ` [patch] ido.el Kim F. Storm
2003-12-05 17:57 ` Karl Chen
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20031128T2056.j5y8tzdb83.quack@hkn.eecs.berkeley.edu \
--to=quarl@hkn.eecs.berkeley.edu \
--cc=emacs-devel@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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).