[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/03/05 08:53:31

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.12954
retrieving revision 1.12955
diff -u -b -r1.12954 -r1.12955
--- ChangeLog   5 Mar 2008 04:25:10 -0000       1.12954
+++ ChangeLog   5 Mar 2008 08:53:30 -0000       1.12955
@@ -1,9 +1,37 @@
+2008-03-05  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
-       * 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  <address@hidden>