Mercurial > emacs
diff lisp/ediff.el @ 90203:187d6a1f84f7
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-71
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 485-492)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 92-94)
- Merge from emacs--cvs-trunk--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 22 Jul 2005 08:27:27 +0000 |
parents | fbb2bea03df9 2273b7101b27 |
children | 2d92f5c9d6ae |
line wrap: on
line diff
--- a/lisp/ediff.el Tue Jul 19 02:58:20 2005 +0000 +++ b/lisp/ediff.el Fri Jul 22 08:27:27 2005 +0000 @@ -1357,11 +1357,13 @@ ;;;###autoload (defun ediff-patch-buffer (&optional arg patch-buf) - "Run Ediff by patching BUFFER-NAME. -Without prefix argument: asks if the patch is in some buffer and prompts for -the buffer or a file, depending on the answer. -With prefix arg=1: assumes the patch is in a file and prompts for the file. -With prefix arg=2: assumes the patch is in a buffer and prompts for the buffer." + "Run Ediff by patching the buffer specified at prompt. +Without the optional prefix ARG, asks if the patch is in some buffer and +prompts for the buffer or a file, depending on the answer. +With ARG=1, assumes the patch is in a file and prompts for the file. +With ARG=2, assumes the patch is in a buffer and prompts for the buffer. +PATCH-BUF is an optional argument, which specifies the buffer that contains the +patch. If not given, the user is prompted according to the prefix argument." (interactive "P") (require 'ediff-ptch) (setq patch-buf