diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-09-20 17:47:28 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-09-20 17:47:28 +0000 |
| commit | 15c77b9ecd23bfcb6c831bbc25d35ec8d0723fad (patch) | |
| tree | 65a1226ad4376299b55254a51ccf406c445ac5e7 /lisp/ediff-vers.el | |
| parent | 41ea4df8c30cb9c1c7254188c5aa812d9875f383 (diff) | |
| download | emacs-15c77b9ecd23bfcb6c831bbc25d35ec8d0723fad.tar.gz | |
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-ptch.el (ediff-file-name-sans-prefix): treat nil as an empty
string.
(ediff-fixup-patch-map): better heuristic for intuiting the file names
to patch.
(ediff-prompt-for-patch-file): more intuitive prompt.
* ediff-util.el: use insert-buffer-substring.
* ediff-vers.el (cvs-run-ediff-on-file-descriptor): bug fix.
* viper-cmd.el (viper-change-state): don't move over the field
boundaries in the minibuffer.
(viper-set-minibuffer-style): add viper-minibuffer-post-command-hook.
(viper-minibuffer-post-command-hook): new hook.
(viper-line): don't move cursor at bolp.
* viper-ex.el (ex-pwd, viper-info-on-file): fixed message
* viper-init.el: add alias to make-variable-buffer-local to avoid
compiler warnings.
* viper-macs.el (ex-map): better messages.
* viper-utils.el (viper-beginning-of-field): new function.
* viper.el: replace make-variable-buffer-local with
viper-make-variable-buffer-local everywhere, to avoid warnings.
Diffstat (limited to 'lisp/ediff-vers.el')
| -rw-r--r-- | lisp/ediff-vers.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index 9ae720e9bc3..f1f2305de81 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el @@ -299,7 +299,10 @@ ((eq type 'MODIFIED) (ediff-buffers (find-file-noselect tmp-file) - (find-file-noselect (cvs-fileinfo->full-path fileinfo)) + (if (featurep 'xemacs) + ;; XEmacs doesn't seem to have cvs-fileinfo->full-name + (find-file-noselect (cvs-fileinfo->full-path fileinfo)) + (find-file-noselect (cvs-fileinfo->full-name fileinfo))) nil ; startup-hooks 'ediff-revisions))) (if (stringp tmp-file) (delete-file tmp-file)) |