aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Teirlinck2005-11-09 23:04:46 +0000
committerLuc Teirlinck2005-11-09 23:04:46 +0000
commit9c797a34f5551dad3cefe798f3518de47bdd78e8 (patch)
tree544aa712a369d058c339a716c5a3099f7c56fda5
parent6e128e32249e93d907abf3c23787183d07d3f188 (diff)
downloademacs-9c797a34f5551dad3cefe798f3518de47bdd78e8.tar.gz
emacs-9c797a34f5551dad3cefe798f3518de47bdd78e8.zip
Require dired.
(find-lisp-find-dired-internal): Do not call `abbreviate-file-name' on DIR.
-rw-r--r--lisp/find-lisp.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/find-lisp.el b/lisp/find-lisp.el
index 59dac2f62d6..a7c4e3941d9 100644
--- a/lisp/find-lisp.el
+++ b/lisp/find-lisp.el
@@ -3,7 +3,7 @@
3;; Author: Peter Breton 3;; Author: Peter Breton
4;; Created: Fri Mar 26 1999 4;; Created: Fri Mar 26 1999
5;; Keywords: unix 5;; Keywords: unix
6;; Time-stamp: <2001-07-16 12:42:35 pavel> 6;; Time-stamp: <2005-11-09 17:05:07 teirllm>
7 7
8;; Copyright (C) 1999, 2000, 2002, 2003, 2004, 8;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
9;; 2005 Free Software Foundation, Inc. 9;; 2005 Free Software Foundation, Inc.
@@ -46,6 +46,8 @@
46 46
47;;; Code: 47;;; Code:
48 48
49(require 'dired)
50
49(defvar dired-buffers) 51(defvar dired-buffers)
50(defvar dired-subdir-alist) 52(defvar dired-subdir-alist)
51 53
@@ -198,8 +200,7 @@ It is a function which takes two arguments, the directory and its parent."
198 (regexp find-lisp-regexp)) 200 (regexp find-lisp-regexp))
199 ;; Expand DIR ("" means default-directory), and make sure it has a 201 ;; Expand DIR ("" means default-directory), and make sure it has a
200 ;; trailing slash. 202 ;; trailing slash.
201 (setq dir (abbreviate-file-name 203 (setq dir (file-name-as-directory (expand-file-name dir)))
202 (file-name-as-directory (expand-file-name dir))))
203 ;; Check that it's really a directory. 204 ;; Check that it's really a directory.
204 (or (file-directory-p dir) 205 (or (file-directory-p dir)
205 (error "find-dired needs a directory: %s" dir)) 206 (error "find-dired needs a directory: %s" dir))