diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-12-25 07:57:37 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-12-25 07:57:37 +0000 |
| commit | 7261ece3c08f89db35cd3f486b02fb71249df240 (patch) | |
| tree | 1b2420d60d881b4899a571c53ce413192d913d84 /lisp/ediff-ptch.el | |
| parent | 7dfb59f43023d50d5cdfed096953ec276a91f58c (diff) | |
| download | emacs-7261ece3c08f89db35cd3f486b02fb71249df240.tar.gz | |
2000-12-25 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-init.el (ediff-quit-hook,ediff-suspend-hook): changed
initialization; use add-hook.
(ediff-file-remote-p): use file-local-copy.
* ediff-ptch.el (ediff-prompt-for-patch-buffer): improved defaults.
* ediff.el (ediff-patch-buffer): bug fix.
(ediff-revision): allow selection of the file at the prompt.
Diffstat (limited to 'lisp/ediff-ptch.el')
| -rw-r--r-- | lisp/ediff-ptch.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el index 873e45060e0..18b2f75b4df 100644 --- a/lisp/ediff-ptch.el +++ b/lisp/ediff-ptch.el @@ -427,7 +427,7 @@ are two possible targets for this patch. However, these files do not exist." (defun ediff-prompt-for-patch-buffer () (get-buffer (read-buffer - "Patch is in buffer: " + "Buffer that holds the patch: " (cond ((save-excursion (goto-char (point-min)) (re-search-forward ediff-context-diff-label-regexp nil t)) @@ -444,7 +444,7 @@ are two possible targets for this patch. However, these files do not exist." (goto-char (point-min)) (and (re-search-forward ediff-context-diff-label-regexp nil t) (current-buffer))))) - (t nil)) + (t (other-buffer (current-buffer) 'visible-ok))) 'must-match))) |