aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/files.texi3
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/files.el3
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 @@
12011-03-03 Glenn Morris <rgm@gnu.org>
2
3 * files.texi (Truenames): Minor clarification. (Bug#2341)
4
12011-03-01 Glenn Morris <rgm@gnu.org> 52011-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
1043The function @code{file-truename} returns the truename of the file 1043The 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,
1045this function first expands it against @code{default-directory}.
1045 1046
1046This function does not expand environment variables. Only 1047This 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 @@
12011-03-03 Glenn Morris <rgm@gnu.org>
2
3 * files.el (file-truename): Doc fix. (Bug#2341)
4
12011-03-03 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> 52011-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.
987If FILENAME is not absolute, first expands it against `default-directory'.
987The truename of a file name is found by chasing symbolic links 988The truename of a file name is found by chasing symbolic links
988both at the level of the file and at the level of the directories 989both at the level of the file and at the level of the directories
989containing it, until no links are left at any level. 990containing it, until no links are left at any level.