From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Karl Chen Newsgroups: gmane.emacs.devel Subject: Re: [patch] ido.el Date: Fri, 05 Dec 2003 09:57:59 -0800 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <20031205T0957.j53cbzm9js.quack@hkn.eecs.berkeley.edu> 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 1070647187 10075 80.91.224.253 (5 Dec 2003 17:59:47 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 5 Dec 2003 17:59:47 +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 18:59:44 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 1ASKEw-0004Dx-00 for ; Fri, 05 Dec 2003 18:59:42 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1ASKEw-0008O9-00 for ; Fri, 05 Dec 2003 18:59:42 +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 1ASLBU-0004as-AK for emacs-devel@quimby.gnus.org; Fri, 05 Dec 2003 14:00:12 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24) id 1ASLBM-0004aH-O7 for emacs-devel@gnu.org; Fri, 05 Dec 2003 14:00:04 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24) id 1ASLAp-0004O2-KQ for emacs-devel@gnu.org; Fri, 05 Dec 2003 14:00:02 -0500 Original-Received: from [128.32.47.228] (helo=hkn.eecs.berkeley.edu) by monty-python.gnu.org with esmtp (Exim 4.24) id 1ASLAp-0004Nc-9a for emacs-devel@gnu.org; Fri, 05 Dec 2003 13:59:31 -0500 Original-Received: from quarl by hkn.eecs.berkeley.edu with local id 1ASKDH-0007Fw-00; Fri, 05 Dec 2003 09:57:59 -0800 Original-To: no-spam@cua.dk (Kim F. Storm) X-Quack-Archive: 1 In-Reply-To: (Kim F. Storm's message of "05 Dec 2003 14:17:38 +0100") User-Agent: Gnus/5.1002 (Gnus v5.10.2) Emacs/21.3.50 (gnu/linux) 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:18428 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:18428 There was a bug in the patch, here it is fixed: 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)) (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" == Kim F Storm writes: Kim> Kim> Karl Chen writes: Thanks. Kim> I'll install it in a few days... Kim> Kim> >> This patch fixes a bug when default-directory or the given >> directory doesn't end in a slash -- Karl Chen 2003-12-05 09:55