diff options
| author | Lars Ingebrigtsen | 2014-02-07 20:53:52 -0800 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2014-02-07 20:53:52 -0800 |
| commit | 15cb9968c09e7c265878fcc023a9168c9716dced (patch) | |
| tree | 977ec6233b8b9cec72d70d0fa145a2e1212f8834 | |
| parent | 9788effd3bf8b4b0b9cfe383c4f58d18507c3ebf (diff) | |
| download | emacs-15cb9968c09e7c265878fcc023a9168c9716dced.tar.gz emacs-15cb9968c09e7c265878fcc023a9168c9716dced.zip | |
* files.el (file-relative-name): Doc fix.
Fixes: debbugs:15159
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/files.el | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9f8ff6a064d..3b7ae9cbe66 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-02-08 Lars Ingebrigtsen <larsi@gnus.org> | 1 | 2014-02-08 Lars Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * files.el (file-relative-name): Doc fix (bug#15159). | ||
| 4 | |||
| 3 | * fringe.el (fringe-styles): Doc fix (bug#15239). | 5 | * fringe.el (fringe-styles): Doc fix (bug#15239). |
| 4 | 6 | ||
| 5 | * isearch.el (isearch-filter-predicate): Documentation typo fix | 7 | * isearch.el (isearch-filter-predicate): Documentation typo fix |
diff --git a/lisp/files.el b/lisp/files.el index cb873b4342f..a8b2a204094 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -4469,6 +4469,8 @@ Uses `backup-directory-alist' in the same way as does | |||
| 4469 | "Convert FILENAME to be relative to DIRECTORY (default: `default-directory'). | 4469 | "Convert FILENAME to be relative to DIRECTORY (default: `default-directory'). |
| 4470 | This function returns a relative file name which is equivalent to FILENAME | 4470 | This function returns a relative file name which is equivalent to FILENAME |
| 4471 | when used with that default directory as the default. | 4471 | when used with that default directory as the default. |
| 4472 | If FILENAME is a relative file name, it will be interpreted as existing in | ||
| 4473 | `default-directory'. | ||
| 4472 | If FILENAME and DIRECTORY lie on different machines or on different drives | 4474 | If FILENAME and DIRECTORY lie on different machines or on different drives |
| 4473 | on a DOS/Windows machine, it returns FILENAME in expanded form." | 4475 | on a DOS/Windows machine, it returns FILENAME in expanded form." |
| 4474 | (save-match-data | 4476 | (save-match-data |