Index: emacs/lisp/ediff.el
diff -c emacs/lisp/ediff.el:1.70 emacs/lisp/ediff.el:1.71
*** emacs/lisp/ediff.el:1.70 Sun Jul 10 18:46:24 2005
--- emacs/lisp/ediff.el Tue Jul 19 05:01:20 2005
***************
*** 1357,1367 ****
;;;###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."
(interactive "P")
(require 'ediff-ptch)
(setq patch-buf
--- 1357,1369 ----
;;;###autoload
(defun ediff-patch-buffer (&optional arg patch-buf)
! "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
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
