# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1204707210 0
# Node ID 1157f06ef93b747476c44e643b29419ac3ba452b
# Parent  bf22da1ce4da3148f44d218e21bfc3f81bfb592c
*** empty log message ***

diff -r bf22da1ce4da -r 1157f06ef93b lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Mar 05 08:53:16 2008 +0000
+++ b/lisp/ChangeLog	Wed Mar 05 08:53:30 2008 +0000
@@ -1,9 +1,37 @@
+2008-03-05  Glenn Morris  <rgm@gnu.org>
+
+	* ediff-hook.el (ediff-cond-compile-for-xemacs-or-emacs): Remove.
+	* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): Remove.
+	* ediff-diff.el, ediff-help.el, ediff-hook.el, ediff-init.el:
+	* ediff-mult.el, ediff-util.el, ediff-wind.el: Expand all
+	ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
+
+	* ediff-hook.el (ediff-window-setup-function): Don't autoload
+	declaration for compiler.
+	(ediff-xemacs-init-menus): Use when rather than if.
+
+	* ediff-init.el (top-level, ediff-frame-iconified-p): Simplify
+	if+and to just and.
+	(ediff-read-event, ediff-overlayp, ediff-make-overlay)
+	(ediff-delete-overlay): Move the XEmacs test inside the definition.
+
+	* ediff-mult.el (ediff-get-meta-info): Use or and unless rather than if.
+
+	* ediff-util.el (ediff-kill-bottom-toolbar): Place (ediff-use-toolbar-p)
+	test inside XEmacs test.
+	(ediff-make-bottom-toolbar): Place whole cond inside XEmacs test,
+	since it was doing nothing on Emacs.
+	(ediff-make-bullet-proof-overlay): Use when rather than if.
+
+	* ediff-wind.el (ediff-select-lowest-window): Use when rather than if.
+	(ediff-setup-control-frame): Remove
+	ediff-cond-compile-for-xemacs-or-emacs, since it is already inside
+	a (featurep 'xemacs) test.
+
 2008-03-05  Jay Belanger  <jay.p.belanger@gmail.com>
 
-	* calc/calc-ext.el (calc-extended-command-history):
-	New variable.
-	(calc-exectute-extended-command): Use
-	`calc-extended-command-history'.
+	* calc/calc-ext.el (calc-extended-command-history): New variable.
+	(calc-exectute-extended-command): Use `calc-extended-command-history'.
 
 2008-03-05  Dan Nicolaescu  <dann@ics.uci.edu>