aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThien-Thi Nguyen2005-11-26 15:52:10 +0000
committerThien-Thi Nguyen2005-11-26 15:52:10 +0000
commit1be0210d3aaa6d058b5da022f9ecaba5b02f4d84 (patch)
tree5210a1a2a22133becf6c6f98d2222df2ac14d8d3
parentd73d22edbd916e48aae93a96335dde906defab7d (diff)
downloademacs-1be0210d3aaa6d058b5da022f9ecaba5b02f4d84.tar.gz
emacs-1be0210d3aaa6d058b5da022f9ecaba5b02f4d84.zip
(file-relative-name): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/files.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15467802b90..60e6f053e0e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12005-11-26 Thien-Thi Nguyen <ttn@gnu.org>
2
3 * files.el (file-relative-name): Doc fix.
4
12005-11-26 Kurt Hornik <Kurt.Hornik@wu-wien.ac.at> 52005-11-26 Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
2 6
3 * progmodes/octave-inf.el (inferior-octave-startup): Force a 7 * progmodes/octave-inf.el (inferior-octave-startup): Force a
diff --git a/lisp/files.el b/lisp/files.el
index 202d24e09fc..20c2ca18971 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3154,7 +3154,7 @@ Uses `backup-directory-alist' in the same way as does
3154This function returns a relative file name which is equivalent to FILENAME 3154This function returns a relative file name which is equivalent to FILENAME
3155when used with that default directory as the default. 3155when used with that default directory as the default.
3156If FILENAME and DIRECTORY lie on different machines or on different drives 3156If FILENAME and DIRECTORY lie on different machines or on different drives
3157on a DOS/Windows machine, it returns FILENAME on expanded form." 3157on a DOS/Windows machine, it returns FILENAME in expanded form."
3158 (save-match-data 3158 (save-match-data
3159 (setq directory 3159 (setq directory
3160 (file-name-as-directory (expand-file-name (or directory 3160 (file-name-as-directory (expand-file-name (or directory