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: [patch] ido.el Date: Fri, 28 Nov 2003 20:56:12 -0800 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <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 1070082036 21892 80.91.224.253 (29 Nov 2003 05:00:36 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 29 Nov 2003 05:00:36 +0000 (UTC) Cc: Emacs Developement List Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Sat Nov 29 06:00:34 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 1APxDe-0007Bl-00 for ; Sat, 29 Nov 2003 06:00:34 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1APxDd-0007UK-00 for ; Sat, 29 Nov 2003 06:00:33 +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 1APy7b-0002c8-39 for emacs-devel@quimby.gnus.org; Sat, 29 Nov 2003 00:58:23 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24) id 1APy7T-0002YV-Vp for emacs-devel@gnu.org; Sat, 29 Nov 2003 00:58:15 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24) id 1APy6x-0002Ej-Tw for emacs-devel@gnu.org; Sat, 29 Nov 2003 00:58:14 -0500 Original-Received: from [128.32.47.228] (helo=hkn.eecs.berkeley.edu) by monty-python.gnu.org with esmtp (Exim 4.24) id 1APy6x-0002EB-KV for emacs-devel@gnu.org; Sat, 29 Nov 2003 00:57:43 -0500 Original-Received: from quarl by hkn.eecs.berkeley.edu with local id 1APx9Q-0004Jt-00; Fri, 28 Nov 2003 20:56:12 -0800 Original-To: "Kim F. Storm" X-Quack-Archive: 1 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:18201 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:18201 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