;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
(defun ediff-prompt-for-patch-file ()
(let ((dir (cond (ediff-patch-default-directory) ; try patch default dir
- (t default-directory))))
+ (t default-directory)))
+ (coding-system-for-read ediff-coding-system-for-read))
(format "Patch is in file:%s "
(and (re-search-forward ediff-context-diff-label-regexp nil t)
- (t (other-buffer (current-buffer)
+ (t (other-buffer (current-buffer))))
;; file for the purpose of patching.
+ ;; this ensures that the patch process gets patch buffer in the
+ ;; encoding that Emacs thinks is right for that type of text
+ (if (boundp 'buffer-file-coding-system) buffer-file-coding-system))
target-buf buf-to-patch file-name-magic-p
patch-return-code ctl-buf backup-style aux-wind)