diff options
| author | Juanma Barranquero | 2008-11-13 16:01:47 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-11-13 16:01:47 +0000 |
| commit | 09949b83d23ea608a5f693706f2997ca7660600f (patch) | |
| tree | 155fe2bc8cfc874f85b74968594ea9029a9598ae | |
| parent | 40d5e695f39562a1bb60036fe4eef5e9f45f3ddb (diff) | |
| download | emacs-09949b83d23ea608a5f693706f2997ca7660600f.tar.gz emacs-09949b83d23ea608a5f693706f2997ca7660600f.zip | |
* files.el (project-settings-file, locate-dominating-file):
Fix typos in docstrings.
(find-file-visit-truename): Remove * from defcustom docstring.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/files.el | 17 |
2 files changed, 15 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 18604a583fa..2a336a15d54 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2008-11-13 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * files.el (project-settings-file, locate-dominating-file): | ||
| 4 | Fix typos in docstrings. | ||
| 5 | (find-file-visit-truename): Remove * from defcustom docstring. | ||
| 6 | |||
| 1 | 2008-11-13 T. V. Raman <raman@users.sourceforge.net> (tiny change) | 7 | 2008-11-13 T. V. Raman <raman@users.sourceforge.net> (tiny change) |
| 2 | 8 | ||
| 3 | * files.el (project-settings-file): New variable. | 9 | * files.el (project-settings-file): New variable. |
diff --git a/lisp/files.el b/lisp/files.el index 1216dff3cef..05442d4665e 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -154,7 +154,7 @@ under another name, you get the existing buffer instead of a new buffer." | |||
| 154 | :group 'find-file) | 154 | :group 'find-file) |
| 155 | 155 | ||
| 156 | (defcustom find-file-visit-truename nil | 156 | (defcustom find-file-visit-truename nil |
| 157 | "*Non-nil means visit a file under its truename. | 157 | "Non-nil means visit a file under its truename. |
| 158 | The truename of a file is found by chasing all links | 158 | The truename of a file is found by chasing all links |
| 159 | both at the file level and at the levels of the containing directories." | 159 | both at the file level and at the levels of the containing directories." |
| 160 | :type 'boolean | 160 | :type 'boolean |
| @@ -757,12 +757,12 @@ special files in directories in which filenames are interpreted as hostnames.") | |||
| 757 | 757 | ||
| 758 | (defun locate-dominating-file (file name) | 758 | (defun locate-dominating-file (file name) |
| 759 | "Look up the directory hierarchy from FILE for a file named NAME. | 759 | "Look up the directory hierarchy from FILE for a file named NAME. |
| 760 | Stop at the first parent directory containing a file NAME return the directory. | 760 | Stop at the first parent directory containing a file NAME, |
| 761 | Return nil if not found." | 761 | and return the directory. Return nil if not found." |
| 762 | ;; We used to use the above locate-dominating-files code, but the | 762 | ;; We used to use the above locate-dominating-files code, but the |
| 763 | ;; directory-files call is very costly, so we're much better off doing | 763 | ;; directory-files call is very costly, so we're much better off doing |
| 764 | ;; multiple calls using the code in here. | 764 | ;; multiple calls using the code in here. |
| 765 | ;; | 765 | ;; |
| 766 | ;; Represent /home/luser/foo as ~/foo so that we don't try to look for | 766 | ;; Represent /home/luser/foo as ~/foo so that we don't try to look for |
| 767 | ;; `name' in /home or in /. | 767 | ;; `name' in /home or in /. |
| 768 | (setq file (abbreviate-file-name file)) | 768 | (setq file (abbreviate-file-name file)) |
| @@ -3203,11 +3203,12 @@ LIST. The list is processed in order. | |||
| 3203 | (push (cons class list) project-class-alist)))) | 3203 | (push (cons class list) project-class-alist)))) |
| 3204 | 3204 | ||
| 3205 | (defcustom project-settings-file ".dir-settings.el" | 3205 | (defcustom project-settings-file ".dir-settings.el" |
| 3206 | "Settings file for per-project settings. Set this to nil if you dont want to load project-specific settings." | 3206 | "Settings file for per-project settings. |
| 3207 | Set this to nil if you don't want to load project-specific settings." | ||
| 3207 | :type '(choice | 3208 | :type '(choice |
| 3208 | (const :tag "Ignore" nil) | 3209 | (const :tag "Ignore" nil) |
| 3209 | (file :tag "File")) | 3210 | (file :tag "File")) |
| 3210 | :group 'files) | 3211 | :group 'files) |
| 3211 | 3212 | ||
| 3212 | (defun project-find-settings-file (file) | 3213 | (defun project-find-settings-file (file) |
| 3213 | "Find the settings file for FILE. | 3214 | "Find the settings file for FILE. |