summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-util.el
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2021-09-13 04:41:15 +0200
committerStefan Kangas <stefan@marxist.se>2021-09-13 06:04:29 +0200
commitbd601099b9332ef6bae697b23b63ee648d56b667 (patch)
tree77ae1a7a63b9f9fa97b1134b59b7b9952697c312 /lisp/vc/ediff-util.el
parentd31495104399c888911db12517a3fbab2f72401f (diff)
downloademacs-bd601099b9332ef6bae697b23b63ee648d56b667.tar.gz
emacs-bd601099b9332ef6bae697b23b63ee648d56b667.tar.bz2
emacs-bd601099b9332ef6bae697b23b63ee648d56b667.zip
Remove some remaining references to XEmacs
* lisp/allout.el (allout-overlay-preparations): * lisp/cedet/semantic/decorate/include.el (semantic-decoration-unknown-include-menu) (semantic-decoration-fileless-include-menu): * lisp/cedet/semantic/idle.el (semantic-idle-scheduler-setup-timers): * lisp/vc/ediff-init.el: * lisp/vc/ediff-util.el (ediff-mode): Remove some remaining references to XEmacs.
Diffstat (limited to 'lisp/vc/ediff-util.el')
-rw-r--r--lisp/vc/ediff-util.el8
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 0cbea2c28d7..04043809436 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -87,12 +87,10 @@ Commands:
(kill-all-local-variables)
(setq major-mode 'ediff-mode)
(setq mode-name "Ediff")
- ;; We use run-hooks instead of run-mode-hooks for two reasons.
+ ;; We use run-hooks instead of run-mode-hooks for one reason.
;; The ediff control buffer is read-only and it is not supposed to be
;; modified by minor modes and such. So, run-mode-hooks doesn't do anything
;; useful here on top of what run-hooks does.
- ;; Second, changing run-hooks to run-mode-hooks would require an
- ;; if-statement, since XEmacs doesn't have this.
(run-hooks 'ediff-mode-hook))
@@ -3938,8 +3936,8 @@ If Emacs happens to dump core, this is NOT an Ediff problem---it is
an Emacs bug. Report this to Emacs maintainers.
Another popular topic for reports is compilation messages. Because Ediff
-interfaces to several other packages and runs under Emacs and XEmacs,
-byte-compilation may produce output like this:
+interfaces to several other packages, byte-compilation may produce output
+like this:
While compiling toplevel forms in file ediff.el:
** reference to free variable zzz