diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-03-15 02:49:07 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-03-15 02:53:45 +0100 |
| commit | ca7cb9830bde49e76c59a2414a87a3f6eb3b0679 (patch) | |
| tree | 557389d7f0661016ffe5985889a3546b8bb53a8b /lisp | |
| parent | 9c4c76fb023b698270e550a61c14d7272c04552e (diff) | |
| download | emacs-ca7cb9830bde49e76c59a2414a87a3f6eb3b0679.tar.gz emacs-ca7cb9830bde49e76c59a2414a87a3f6eb3b0679.tar.bz2 emacs-ca7cb9830bde49e76c59a2414a87a3f6eb3b0679.zip | |
* lisp/vc/ediff-vers.el: Remove XEmacs compat code.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc/ediff-vers.el | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/lisp/vc/ediff-vers.el b/lisp/vc/ediff-vers.el index 13a653b270b..9e82392725d 100644 --- a/lisp/vc/ediff-vers.el +++ b/lisp/vc/ediff-vers.el @@ -24,23 +24,9 @@ ;;; Code: -;; Compiler pacifier -(defvar rcs-default-co-switches) +(eval-when-compile (require 'ediff-init)) -(and noninteractive - (eval-when-compile - (condition-case nil - ;; for compatibility with current stable version of xemacs - (progn - ;;(require 'pcvs nil 'noerror) - ;;(require 'rcs nil 'noerror) - (require 'pcvs) - (require 'rcs)) - (error nil)) - (require 'vc) - (require 'ediff-init) - )) -;; end pacifier +(defvar rcs-default-co-switches) (defcustom ediff-keep-tmp-versions nil "If t, do not delete temporary previous versions for the files on which |