# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1021023792 0
# Node ID 39f69eb74306828d5adfb5974e07455c8d443227
# Parent  66644e336dd7ef47e93bca04bad6da4e6a170a0c
*** empty log message ***

diff -r 66644e336dd7 -r 39f69eb74306 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri May 10 09:42:49 2002 +0000
+++ b/lisp/ChangeLog	Fri May 10 09:43:12 2002 +0000
@@ -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 -r 66644e336dd7 -r 39f69eb74306 src/ChangeLog
--- a/src/ChangeLog	Fri May 10 09:42:49 2002 +0000
+++ b/src/ChangeLog	Fri May 10 09:43:12 2002 +0000
@@ -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.