From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 10 May 2002 09:43:12 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~15108
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=22a2a46061c1d46123e5877776474f502241a390;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a214bd27c2f..9a7bea16013 100644
--- 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 5bdb3e16bff..1cabb7afae4 100644
--- 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.