diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-07-19 05:01:20 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-07-19 05:01:20 +0000 |
| commit | 0b02e7a95a1d87bbe5f83fe427659a570c553ff1 (patch) | |
| tree | 86e763eb62adf255f48806ffe3bbfb92d088576d /lisp/ediff.el | |
| parent | b87c985c2dd0863e4bef57b2a0851d990b6e6250 (diff) | |
| download | emacs-0b02e7a95a1d87bbe5f83fe427659a570c553ff1.tar.gz | |
* viper-cmd.el (viper-escape-to-state): bug fix
(viper-envelop-ESC-key): changed the definition of fast keysequence so
it'll work with keyboard macros
* ediff.el (ediff-patch-buffer): changed the docstring.
Diffstat (limited to 'lisp/ediff.el')
| -rw-r--r-- | lisp/ediff.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el index f842e9dec6c..1bf52b1c59f 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -1357,11 +1357,13 @@ buffer. If odd -- assume it is in a file." ;;;###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 |