# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1118093609 0
# Node ID 7c74e0a311eaec1610528358939e342efc91fa0f
# Parent  ad41fcdb064268d3b4a03ba85392bbf3f947f4a5
*** empty log message ***

diff -r ad41fcdb0642 -r 7c74e0a311ea lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Jun 06 21:32:57 2005 +0000
+++ b/lisp/ChangeLog	Mon Jun 06 21:33:29 2005 +0000
@@ -1,3 +1,7 @@
+2005-06-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* international/iso-cvt.el (iso-sgml2iso-trans-tab): Add NBSP.
+
 2005-06-06  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* font-lock.el (font-lock-add-keywords): Doc fix.
diff -r ad41fcdb0642 -r 7c74e0a311ea src/ChangeLog
--- a/src/ChangeLog	Mon Jun 06 21:32:57 2005 +0000
+++ b/src/ChangeLog	Mon Jun 06 21:33:29 2005 +0000
@@ -1,3 +1,8 @@
+2005-06-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* xterm.c (x_create_toolkit_scroll_bar): Use XtNarrowScrollbars
+	if available.
+
 2005-06-06  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* macmenu.c (menu_quit_handler, install_menu_quit_handler): New