diff options
| author | Glenn Morris | 2011-03-03 00:10:52 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-03-03 00:10:52 -0800 |
| commit | 06083aa12dafb69752c0f1a0d355877dbd32a81f (patch) | |
| tree | bc891d8d46b615ae0cbd7f39186f2fd5622b5867 | |
| parent | b612ffc94de61b0fb50818de16fdb26d61294981 (diff) | |
| download | emacs-06083aa12dafb69752c0f1a0d355877dbd32a81f.tar.gz emacs-06083aa12dafb69752c0f1a0d355877dbd32a81f.zip | |
file-truename doc fix for bug#2341.
* lisp/files.el (file-truename): Doc fix.
* doc/lispref/files.texi (Truenames): Minor clarification.
| -rw-r--r-- | doc/lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispref/files.texi | 3 | ||||
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 3 |
4 files changed, 12 insertions, 2 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 1a980f14f3d..25f9225944d 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-03-03 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * files.texi (Truenames): Minor clarification. (Bug#2341) | ||
| 4 | |||
| 1 | 2011-03-01 Glenn Morris <rgm@gnu.org> | 5 | 2011-03-01 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * variables.texi (Directory Local Variables): | 7 | * variables.texi (Directory Local Variables): |
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 3697f18badd..e3bdebd28a1 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi | |||
| @@ -1041,7 +1041,8 @@ because they eliminate symbolic links as a cause of name variation. | |||
| 1041 | 1041 | ||
| 1042 | @defun file-truename filename | 1042 | @defun file-truename filename |
| 1043 | The function @code{file-truename} returns the truename of the file | 1043 | The function @code{file-truename} returns the truename of the file |
| 1044 | @var{filename}. The argument must be an absolute file name. | 1044 | @var{filename}. If the argument is not an absolute file name, |
| 1045 | this function first expands it against @code{default-directory}. | ||
| 1045 | 1046 | ||
| 1046 | This function does not expand environment variables. Only | 1047 | This function does not expand environment variables. Only |
| 1047 | @code{substitute-in-file-name} does that. @xref{Definition of | 1048 | @code{substitute-in-file-name} does that. @xref{Definition of |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d933a2ea696..c785a66fc52 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-03-03 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * files.el (file-truename): Doc fix. (Bug#2341) | ||
| 4 | |||
| 1 | 2011-03-03 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> | 5 | 2011-03-03 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> |
| 2 | 6 | ||
| 3 | * vc/vc-dir.el (vc-dir-mode-map): Bind vc-dir-find-file to e. (Bug#7349) | 7 | * vc/vc-dir.el (vc-dir-mode-map): Bind vc-dir-find-file to e. (Bug#7349) |
diff --git a/lisp/files.el b/lisp/files.el index 8849e264151..a8f937233de 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -983,7 +983,8 @@ accessible." | |||
| 983 | nil))) | 983 | nil))) |
| 984 | 984 | ||
| 985 | (defun file-truename (filename &optional counter prev-dirs) | 985 | (defun file-truename (filename &optional counter prev-dirs) |
| 986 | "Return the truename of FILENAME, which should be absolute. | 986 | "Return the truename of FILENAME. |
| 987 | If FILENAME is not absolute, first expands it against `default-directory'. | ||
| 987 | The truename of a file name is found by chasing symbolic links | 988 | The truename of a file name is found by chasing symbolic links |
| 988 | both at the level of the file and at the level of the directories | 989 | both at the level of the file and at the level of the directories |
| 989 | containing it, until no links are left at any level. | 990 | containing it, until no links are left at any level. |