diff options
| author | Lars Magne Ingebrigtsen | 2011-07-11 17:03:24 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-07-11 17:03:24 +0200 |
| commit | be958f1d65a2d843b35824dfe30db24b616f6b21 (patch) | |
| tree | d3c30f11295fb332c2af686a7b92e8061565057b | |
| parent | 5bedb26cb8cc705c14a3e6e8d5474bf220345775 (diff) | |
| download | emacs-be958f1d65a2d843b35824dfe30db24b616f6b21.tar.gz emacs-be958f1d65a2d843b35824dfe30db24b616f6b21.zip | |
(ediff-patch-file): Clarify doc string
Fixes: debbugs:3138
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc/ediff.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8ae1978b849..361b2d8087f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-07-11 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2011-07-11 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * vc/ediff.el (ediff-patch-file): Clarify doc string (bug#3138). | ||
| 4 | |||
| 3 | * cus-edit.el (custom-guess-name-alist): -alist variables should | 5 | * cus-edit.el (custom-guess-name-alist): -alist variables should |
| 4 | use the `alist' type (bug#3120). Suggested by Drew Adams. | 6 | use the `alist' type (bug#3120). Suggested by Drew Adams. |
| 5 | 7 | ||
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el index 5e352493dc9..464fdc0a589 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el | |||
| @@ -1348,7 +1348,7 @@ buffer." | |||
| 1348 | 1348 | ||
| 1349 | ;;;###autoload | 1349 | ;;;###autoload |
| 1350 | (defun ediff-patch-file (&optional arg patch-buf) | 1350 | (defun ediff-patch-file (&optional arg patch-buf) |
| 1351 | "Run Ediff by patching SOURCE-FILENAME. | 1351 | "Query for a file name, and then run Ediff by patching that file. |
| 1352 | If optional PATCH-BUF is given, use the patch in that buffer | 1352 | If optional PATCH-BUF is given, use the patch in that buffer |
| 1353 | and don't ask the user. | 1353 | and don't ask the user. |
| 1354 | If prefix argument, then: if even argument, assume that the patch is in a | 1354 | If prefix argument, then: if even argument, assume that the patch is in a |