*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a214bd27c2fea5187d5293720ad69d63137b5e04..9a7bea160132b0415096a64d1cc50c492f438f2d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2002-05-10  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * menu-bar.el (menu-bar-showhide-scroll-bar-menu) 
+       (menu-bar-showhide-menu): Use display-graphic-p, not
+       widnow-system.
+       (menu-bar-showhide-menu) <showhide-menu-bar, showhide-tool-bar>:
+       Run a named function.
+       (showhide-menu-bar, showhide-toolbar): Invoke customize-mark-as-set.
+       (menu-bar-showhide-menu) <column-number-mode, line-number-mode>:
+       Fix help text.
+
 2002-05-10  Kim F. Storm  <storm@cua.dk>
 
        * emulation/cua-base.el (cua-mode): Misc. changes to use

diff --git a/src/ChangeLog b/src/ChangeLog
index 5bdb3e16bffbca38d475b74d7107c3982ff5e591..1cabb7afae43a56b972dd1d0f8f8f9a7ec15de2f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-10  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * coding.c (encode_coding_sjis_big5): Enclose bitwise AND in
+       parens, to ensure correct evaluation order.
+
 2002-05-10  Kim F. Storm  <storm@cua.dk>
 
        * keymap.c (Vemulation_mode_map_alists): New variable.