[Emacs-diffs] Changes to emacs/lisp/files.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/11/19 13:25:46

Index: files.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/files.el,v
retrieving revision 1.1013
retrieving revision 1.1014
diff -u -b -r1.1013 -r1.1014
--- files.el    18 Nov 2008 18:26:13 -0000      1.1013
+++ files.el    19 Nov 2008 13:25:46 -0000      1.1014
@@ -3208,14 +3208,6 @@
        (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,13 +3215,12 @@
 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))
+  (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 project-settings-file 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))
@@ -3239,7 +3230,7 @@
          (if (> (length (file-name-directory settings))
                 (length (car pda)))
              settings pda)
-       (or 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.