aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-03-05 21:31:32 -0500
committerGlenn Morris2012-03-05 21:31:32 -0500
commiteb18244605c440f79caf2d46edad2734a438dbb7 (patch)
treeefa0159692692d4ad0a7807cb2288d5f08b069b3
parent2467932310c83a430164c4f19e29d1115fa24aea (diff)
downloademacs-eb18244605c440f79caf2d46edad2734a438dbb7.tar.gz
emacs-eb18244605c440f79caf2d46edad2734a438dbb7.zip
* lisp/files.el (locate-dominating-file): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/files.el5
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7bf2ba1bcc2..76166b50c0f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-03-06 Glenn Morris <rgm@gnu.org>
2
3 * files.el (locate-dominating-file): Doc fix.
4
12012-03-06 Adam Spiers <emacs@adamspiers.org> (tiny change) 52012-03-06 Adam Spiers <emacs@adamspiers.org> (tiny change)
2 6
3 * calendar/calendar.el (calendar-set-mode-line): 7 * calendar/calendar.el (calendar-set-mode-line):
diff --git a/lisp/files.el b/lisp/files.el
index 88ebb9eaab4..d9a3e4b0f79 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -880,7 +880,10 @@ or mount points potentially requiring authentication as a different user.")
880(defun locate-dominating-file (file name) 880(defun locate-dominating-file (file name)
881 "Look up the directory hierarchy from FILE for a file named NAME. 881 "Look up the directory hierarchy from FILE for a file named NAME.
882Stop at the first parent directory containing a file NAME, 882Stop at the first parent directory containing a file NAME,
883and return the directory. Return nil if not found." 883and return the directory. Return nil if not found.
884
885This function only tests if FILE exists. If you care about whether
886it is readable, regular, etc., you should test the result."
884 ;; We used to use the above locate-dominating-files code, but the 887 ;; We used to use the above locate-dominating-files code, but the
885 ;; directory-files call is very costly, so we're much better off doing 888 ;; directory-files call is very costly, so we're much better off doing
886 ;; multiple calls using the code in here. 889 ;; multiple calls using the code in here.