mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Remove some XEmacs compat code from ediff*.el

Browse source 
* lisp/vc/ediff-diff.el (ediff-goto-word): Ditto.

* lisp/vc/ediff-init.el (ediff-has-face-support-p)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-current-diff-Ancestor)
(ediff-fine-diff-A, ediff-fine-diff-B, ediff-fine-diff-C)
(ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C)
(ediff-even-diff-Ancestor, ediff-odd-diff-A, ediff-odd-diff-B)
(ediff-odd-diff-C, ediff-odd-diff-Ancestor)
(ediff-with-syntax-table): Ditto.

* lisp/vc/ediff-mult.el (ediff-dir-diffs-buffer-map)
(ediff-setup-meta-map, ediff-set-meta-overlay): Ditto.

* lisp/vc/ediff-util.el (ediff-setup-keymap)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-make-bullet-proof-overlay): Ditto.

* lisp/vc/ediff-wind.el (ediff-setup-control-frame)
(ediff-refresh-control-frame): Remove XEmacs compat code.
This commit is contained in:
Lars Ingebrigtsen 2019-10-04 15:20:41 +02:00
parent f1d9e41ab0
commit 8ef09cb30a
5 changed files with 173 additions and 290 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/vc/ediff-diff.el
View file

@ -1326,7 +1326,7 @@ arguments to `skip-chars-forward'."
(syntax-tbl ediff-syntax-table))
(ediff-with-current-buffer buf
(skip-chars-forward ediff-whitespace)
(ediff-with-syntax-table syntax-tbl
(with-syntax-table syntax-tbl
(while (> n 1)
(funcall fwd-word-fun)
(skip-chars-forward ediff-whitespace)