(project-settings-file): Remove.

(project-find-settings-file): Undo previous change that added the
use of project-settings-file.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a13050b..949271c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-19  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * files.el (project-settings-file): Remove.
+       (project-find-settings-file): Undo previous change that added the
+       use of project-settings-file.
+
 2008-11-19  Glenn Morris  <rgm@gnu.org>
 
        * proced.el (proced, proced-format-time): Doc fixes.

diff --git a/lisp/files.el b/lisp/files.el
index 5ed3ffa..347f956 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3208,14 +3208,6 @@ LIST.  The list is processed in order.
        (setcdr elt settings)
       (push (cons class settings) project-class-alist))))
 
-(defcustom project-settings-file ".dir-settings.el"
-  "Settings file for per-project settings.
-Set this to nil if you don't want to load project-specific settings."
-  :type '(choice
-         (const :tag "Ignore" nil)
-         (file :tag "File"))
-  :group 'files)
-
 (defun project-find-settings-file (file)
   "Find the settings file for FILE.
 This searches upward in the directory tree.
@@ -3223,23 +3215,22 @@ If a settings file is found, the file name is returned.
 If the file is in a registered project, a cons from
 `project-directory-alist' is returned.
 Otherwise this returns nil."
-  (when project-settings-file
-    (setq file (expand-file-name file))
-    (let ((settings (locate-dominating-file file project-settings-file))
-         (pda nil))
-      ;; `locate-dominating-file' may have abbreviated the name.
-      (when settings
-       (setq settings (expand-file-name project-settings-file settings)))
-      (dolist (x project-directory-alist)
-       (when (and (eq t (compare-strings file nil (length (car x))
-                                         (car x) nil nil))
-                  (> (length (car x)) (length (car pda))))
-         (setq pda x)))
-      (if (and settings pda)
-         (if (> (length (file-name-directory settings))
-                (length (car pda)))
-             settings pda)
-       (or settings pda)))))
+  (setq file (expand-file-name file))
+  (let ((settings (locate-dominating-file file ".dir-settings.el"))
+       (pda nil))
+    ;; `locate-dominating-file' may have abbreviated the name.
+    (when settings
+      (setq settings (expand-file-name ".dir-settings.el" settings)))
+    (dolist (x project-directory-alist)
+      (when (and (eq t (compare-strings file nil (length (car x))
+                                       (car x) nil nil))
+                (> (length (car x)) (length (car pda))))
+       (setq pda x)))
+    (if (and settings pda)
+       (if (> (length (file-name-directory settings))
+              (length (car pda)))
+           settings pda)
+      (or settings pda))))
 
 (defun project-define-from-project-file (settings-file)
   "Load a settings file and register a new project class and instance.