# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1119563392 0
# Node ID 1d86d5c00a503acf87809a3a983de7f095e87739
# Parent  01829129c4df228bd020c3eda9749c0e28ecb1d1
*** empty log message ***

diff -r 01829129c4df -r 1d86d5c00a50 admin/FOR-RELEASE
--- a/admin/FOR-RELEASE	Thu Jun 23 21:48:25 2005 +0000
+++ b/admin/FOR-RELEASE	Thu Jun 23 21:49:52 2005 +0000
@@ -26,6 +26,9 @@
 
 ** Update Speedbar.
 
+** Update vhdl-mode.el based on changes in
+   http://opensource.ethz.ch/emacs/vhdl-mode.html.
+
 
 * FATAL ERRORS
 
diff -r 01829129c4df -r 1d86d5c00a50 etc/TODO
--- a/etc/TODO	Thu Jun 23 21:48:25 2005 +0000
+++ b/etc/TODO	Thu Jun 23 21:49:52 2005 +0000
@@ -30,6 +30,10 @@
   See also ESR's proposal for a BROWSER environment variable
   <URL:http://www.catb.org/~esr/BROWSER/browse-url.patch>.
 
+** Enhance scroll-bar to handle tall line (similar to line-move).
+
+** Make occur handle multi-line matches cleanly with context.
+
 * Important features:
 
 ** Provide user-friendly ways to list all available font families,
diff -r 01829129c4df -r 1d86d5c00a50 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Jun 23 21:48:25 2005 +0000
+++ b/lisp/ChangeLog	Thu Jun 23 21:49:52 2005 +0000
@@ -1,3 +1,16 @@
+2005-06-23  Richard M. Stallman  <rms@gnu.org>
+
+	* simple.el (set-variable): Args renamed; doc fix.
+	(line-move-1): When there are overlays around, use vertical-motion.
+
+	* faces.el (escape-glyph): Use brown against light background.
+	(nobreak-space): Renamed from no-break-space.
+	Fix previous change.
+
+	* dired-aux.el (dired-do-copy): Fix arg prompt.
+
+	* mail/sendmail.el (mail-setup-with-from): Fix custom type.
+
 2005-06-23  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
 	* mail/emacsbug.el (report-emacs-bug): Use "X server distributor"
diff -r 01829129c4df -r 1d86d5c00a50 lisp/url/ChangeLog
--- a/lisp/url/ChangeLog	Thu Jun 23 21:48:25 2005 +0000
+++ b/lisp/url/ChangeLog	Thu Jun 23 21:49:52 2005 +0000
@@ -1,3 +1,7 @@
+2005-06-23  Richard M. Stallman  <rms@gnu.org>
+
+	* url-cookie.el (url-cookie-generate-header-lines): Fix autoload cookie.
+
 2005-06-21  Juanma Barranquero  <lekktu@gmail.com>
 
 	* url-gw.el (url-open-stream):
diff -r 01829129c4df -r 1d86d5c00a50 man/ChangeLog
--- a/man/ChangeLog	Thu Jun 23 21:48:25 2005 +0000
+++ b/man/ChangeLog	Thu Jun 23 21:49:52 2005 +0000
@@ -1,5 +1,16 @@
 2005-06-23  Richard M. Stallman  <rms@gnu.org>
 
+	* anti.texi (Antinews): Renamed show-nonbreak-escape to
+	nobreak-char-display.
+
+	* emacs.texi (Top): Update detailed node listing.
+
+	* display.texi (Text Display): Renamed show-nonbreak-escape
+	to nobreak-char-display and no-break-space to nobreak-space.
+	(Standard Faces): Split up the list of standard faces
+	and put it in a separate node.  Add nobreak-space and
+	escape-glyph.
+
 	* speedbar.texi (Creating a display): Texinfo usage fixes.	
 
 	* tramp.texi (Customizing Completion, Auto-save and Backup): 
diff -r 01829129c4df -r 1d86d5c00a50 src/ChangeLog
--- a/src/ChangeLog	Thu Jun 23 21:48:25 2005 +0000
+++ b/src/ChangeLog	Thu Jun 23 21:49:52 2005 +0000
@@ -1,3 +1,16 @@
+2005-06-23  Richard M. Stallman  <rms@gnu.org>
+
+	* xdisp.c (get_next_display_element): Finish reversing the tests of
+	Vnobreak_char_display.
+
+	* xdisp.c (Vnobreak_char_display): Renamed from Vshow_nonbreak_escape.
+	All uses changed.
+	(Qnobreak_space): Renamed from Qno_break_space.  All uses changed.
+	(syms_of_xdisp): Define nobreak-char-display and nobreak-space.
+
+	* fileio.c (Frename_file): Preserve owner and group, if possible,
+	when copying.
+
 2005-06-23  Juanma Barranquero  <lekktu@gmail.com>
 
 	* abbrev.c (Funexpand_abbrev):