]> git.eshelyaron.com Git - emacs.git/commit
* lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanup
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 21 Jun 2019 05:16:54 +0000 (01:16 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 21 Jun 2019 05:16:54 +0000 (01:16 -0400)
commit869cf5cbc0721bbe9e4df557f4ed3633fb13c05f
treeacb96e2d8b0319faa745a8dcf789c2551b0df3e0
parentd63bfbcae4a31560468e8800fe8381fda3b9d2ce
* 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.
lisp/vc/ediff-diff.el
lisp/vc/ediff-help.el
lisp/vc/ediff-hook.el
lisp/vc/ediff-init.el
lisp/vc/ediff-merg.el
lisp/vc/ediff-mult.el
lisp/vc/ediff-ptch.el
lisp/vc/ediff-util.el
lisp/vc/ediff-vers.el
lisp/vc/ediff-wind.el
lisp/vc/ediff.el