diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2007-08-19 13:47:08 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2007-08-19 13:47:08 +0000 |
| commit | 69441214fa14492b0e3f65ae0c85fb5315f39411 (patch) | |
| tree | cddcd51438b3ad283701726d87af1f13e1febc4f /lisp/ediff-util.el | |
| parent | ae0195c0432748ff17b35850c51884302050e187 (diff) | |
| download | emacs-69441214fa14492b0e3f65ae0c85fb5315f39411.tar.gz | |
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
* viper.el (viper-remove-hooks): remove some additional viper hooks
when the user calls viper-go-away.
(viper-go-away): restore the default of default-major-mode.
Save the value of default-major-mode before vaperization.
* viper-cmd.el: Replace error "" with "Viper bell".
* viper-ex.el: Replace error "" with "Viper bell".
* ediff-util.el (ediff-make-temp-file): use the coding system of the
buffer for which file is created.
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index decff4474d4..e60faa0a0da 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -3164,7 +3164,11 @@ Hit \\[ediff-recenter] to reset the windows afterward." (defun ediff-make-temp-file (buff &optional prefix given-file start end) (let* ((p (ediff-convert-standard-filename (or prefix "ediff"))) (short-p p) - (coding-system-for-write ediff-coding-system-for-write) + (coding-system-for-write + (ediff-with-current-buffer buff + (if (boundp 'buffer-file-coding-system) + buffer-file-coding-system + ediff-coding-system-for-write))) f short-f) (if (and (fboundp 'msdos-long-file-names) (not (msdos-long-file-names)) |