From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: no-spam@cua.dk (Kim F. Storm) Newsgroups: gmane.emacs.devel Subject: Re: [patch] ido.el Date: 05 Dec 2003 14:17:38 +0100 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: References: <20031128T2056.j5y8tzdb83.quack@hkn.eecs.berkeley.edu> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1070626992 31864 80.91.224.253 (5 Dec 2003 12:23:12 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 5 Dec 2003 12:23:12 +0000 (UTC) Cc: Emacs Developement List , "Kim F. Storm" Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Fri Dec 05 13:23:09 2003 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1ASEzF-00077N-00 for ; Fri, 05 Dec 2003 13:23:09 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1ASEzE-0002Ra-00 for ; Fri, 05 Dec 2003 13:23:09 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.24) id 1ASFwb-0005Dp-Ju for emacs-devel@quimby.gnus.org; Fri, 05 Dec 2003 08:24:29 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24) id 1ASFuE-0004jJ-VX for emacs-devel@gnu.org; Fri, 05 Dec 2003 08:22:02 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24) id 1ASFti-0004dk-1o for emacs-devel@gnu.org; Fri, 05 Dec 2003 08:22:01 -0500 Original-Received: from [212.88.64.25] (helo=mail-relay.sonofon.dk) by monty-python.gnu.org with smtp (Exim 4.24) id 1ASFs1-0004MW-8j for emacs-devel@gnu.org; Fri, 05 Dec 2003 08:19:45 -0500 Original-Received: (qmail 84889 invoked from network); 5 Dec 2003 12:18:17 -0000 Original-Received: from unknown (HELO kfs-l.imdomain.dk.cua.dk) (213.83.150.2) by 0 with SMTP; 5 Dec 2003 12:18:17 -0000 Original-To: Karl Chen In-Reply-To: <20031128T2056.j5y8tzdb83.quack@hkn.eecs.berkeley.edu> Original-Lines: 58 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.2 Precedence: list List-Id: Emacs development discussions. List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:18412 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:18412 Karl Chen writes: Thanks. I'll install it in a few days... > 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 > > -- Kim F. Storm http://www.cua.dk