diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 15467802b90..60e6f053e0e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2005-11-26 Thien-Thi Nguyen + + * files.el (file-relative-name): Doc fix. + 2005-11-26 Kurt Hornik * 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 This function returns a relative file name which is equivalent to FILENAME when used with that default directory as the default. If FILENAME and DIRECTORY lie on different machines or on different drives -on a DOS/Windows machine, it returns FILENAME on expanded form." +on a DOS/Windows machine, it returns FILENAME in expanded form." (save-match-data (setq directory (file-name-as-directory (expand-file-name (or directory