* lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanup

Re-enable lexical-binding in ediff.  For that, change ediff-find-file
so as not to rely on dynamic scoping in its calling convention.

* lisp/vc/ediff-diff.el: Move `provide` to the end.
Remove redundant :group.
(ediff-exec-process): Disregard current directory.
(ediff-forward-word-function): Use defvar-local.

* lisp/vc/ediff-help.el (ediff-set-help-message): Use functionp.

* lisp/vc/ediff-hook.el (menu-bar-ediff-misc-menu): Make a toggle, as
in the XEmacs menu.

* lisp/vc/ediff-init.el (ediff-defvar-local): Add `doc-string` prop.
(ediff-check-version): Delete function, unused.

* lisp/vc/ediff-mult.el: Move `provide` to the end.
Remove redundant :groups.
(ediff-dir-diffs-buffer-map):
Move initialization into declaration.
(ediff-meta-mode): Use define-derived-mode.
(ediff-intersect-directories): Remove `comparison-func`, unused.
(ediff-prepare-meta-buffer): Fix use of `startup-hooks`.

* lisp/vc/ediff-ptch.el: Move `provide` to the end.

* lisp/vc/ediff-util.el (ediff-add-to-history): Use add-to-history instead.

* lisp/vc/ediff-vers.el (ediff-vc-internal, ediff-vc-merge-internal):
Use push and closures.

* lisp/vc/ediff-wind.el: Remove redundant :groups.

* lisp/vc/ediff.el: Move `provide` to the end.
Remove redundant :groups.
(ediff--magic-file-name, ediff--startup-hook): New vars.
(ediff-find-file): Change calling convention so as not to use
symbols as value cells.
(ediff--buffer-file-name): New function.
(ediff-files-internal): Adjust to new calling convention of ediff-find-file.
(ediff-directories-internal, ediff-directory-revisions-internal)
(ediff-regions-internal): Use push and closures.

1 files changed, 3 insertions, 7 deletions

diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el
index d44263b70b0..05f17acc1e7 100644
--- a/lisp/vc/ediff-help.el
+++ b/lisp/vc/ediff-help.el
@@ -1,4 +1,4 @@
-;;; ediff-help.el --- Code related to the contents of Ediff help buffers  -*- lexical-binding: nil; -*-
+;;; ediff-help.el --- Code related to the contents of Ediff help buffers  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
@@ -270,8 +270,7 @@ the value of this variable and the variables `ediff-help-message-*' in
 (defun ediff-set-help-message ()
   (setq ediff-long-help-message
 	(cond ((and ediff-long-help-message-function
-		    (or (symbolp ediff-long-help-message-function)
-			(consp ediff-long-help-message-function)))
+		    (functionp ediff-long-help-message-function))
 	       (funcall ediff-long-help-message-function))
 	      (ediff-word-mode
 	       (concat ediff-long-help-message-head
@@ -295,8 +294,7 @@ the value of this variable and the variables `ediff-help-message-*' in
 		       ediff-long-help-message-tail))))
   (setq ediff-brief-help-message
 	(cond ((and ediff-brief-help-message-function
-		    (or (symbolp ediff-brief-help-message-function)
-			(consp ediff-brief-help-message-function)))
+                    (functionp ediff-brief-help-message-function))
 	       (funcall ediff-brief-help-message-function))
 	      ((stringp ediff-brief-help-message-function)
 	       ediff-brief-help-message-function)
@@ -316,6 +314,4 @@ the value of this variable and the variables `ediff-help-message-*' in
 
 
 (provide 'ediff-help)
-
-
 ;;; ediff-help.el ends here