diff options
| -rw-r--r-- | lisp/ediff-init.el | 1 | ||||
| -rw-r--r-- | lisp/ediff-vers.el | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 53660b90bf2..a30eb28306d 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | ;; Start compiler pacifier | 29 | ;; Start compiler pacifier |
| 30 | (defvar ediff-metajob-name) | 30 | (defvar ediff-metajob-name) |
| 31 | (defvar ediff-meta-buffer) | 31 | (defvar ediff-meta-buffer) |
| 32 | (defvar pm-color-alist) | ||
| 33 | (defvar ediff-grab-mouse) | 32 | (defvar ediff-grab-mouse) |
| 34 | (defvar ediff-mouse-pixel-position) | 33 | (defvar ediff-mouse-pixel-position) |
| 35 | (defvar ediff-mouse-pixel-threshold) | 34 | (defvar ediff-mouse-pixel-threshold) |
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index 28f7e12d43a..7a84934ad41 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el | |||
| @@ -28,11 +28,6 @@ | |||
| 28 | 28 | ||
| 29 | ;; Compiler pacifier | 29 | ;; Compiler pacifier |
| 30 | (defvar rcs-default-co-switches) | 30 | (defvar rcs-default-co-switches) |
| 31 | (defvar sc-mode) | ||
| 32 | (defvar cvs-shell) | ||
| 33 | (defvar cvs-program) | ||
| 34 | (defvar cvs-cookie-handle) | ||
| 35 | (defvar ediff-temp-file-prefix) | ||
| 36 | 31 | ||
| 37 | (and noninteractive | 32 | (and noninteractive |
| 38 | (eval-when-compile | 33 | (eval-when-compile |