diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-08-07 19:21:09 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-08-07 19:21:09 +0200 |
| commit | 7dab52dfbce9c39a77524376a53e8d65b3e470a3 (patch) | |
| tree | 585b5af302ed82d05e09dd037735ea4e8cc36d82 /lisp/vc/ediff-hook.el | |
| parent | 6b4f6dfb4e195c572c6e8502a349afff5f7987b9 (diff) | |
| download | emacs-7dab52dfbce9c39a77524376a53e8d65b3e470a3.tar.gz emacs-7dab52dfbce9c39a77524376a53e8d65b3e470a3.tar.bz2 emacs-7dab52dfbce9c39a77524376a53e8d65b3e470a3.zip | |
Minor cleanups in ediff-*.el
* lisp/vc/ediff-init.el (ediff-window-visible-p):
(ediff-nonempty-string-p): Simplify.
(stipple-pixmap): Don't try XEmacs specific(?) variable.
(ediff-frame-unsplittable-p): Make obsolete. Update callers.
(ediff-has-gutter-support-p): Redefine as obsolete function alias for
'ignore'.
(ediff-mouse-event-p): Redefine as obsolete function alias for
'mouse-event-p'. Update callers.
* lisp/vc/ediff-util.el (ediff-submit-report): Simplify.
(ediff-filename-magic-p): Make obsolete. Update callers.
(ediff-activate-mark): Make obsolete. Update callers.
* lisp/vc/ediff-help.el:
* lisp/vc/ediff-hook.el:
* lisp/vc/ediff-util.el:
* lisp/vc/ediff-wind.el: Remove superfluous defvars.
Diffstat (limited to 'lisp/vc/ediff-hook.el')
| -rw-r--r-- | lisp/vc/ediff-hook.el | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lisp/vc/ediff-hook.el b/lisp/vc/ediff-hook.el index 0160d9f6848..d1eff0151a8 100644 --- a/lisp/vc/ediff-hook.el +++ b/lisp/vc/ediff-hook.el @@ -35,16 +35,8 @@ ;; (define-key menu-bar-tools-menu [ediff] ;; '("Compare" . menu-bar-ediff-menu)) -;; Compiler pacifier -(defvar ediff-menu) -(defvar ediff-merge-menu) -(defvar epatch-menu) -(defvar ediff-misc-menu) -;; end pacifier - ;; allow menus to be set up without ediff-wind.el being loaded -;; Emacs ;; initialize menu bar keymaps (defvar menu-bar-ediff-misc-menu (make-sparse-keymap "Ediff Miscellanea")) |