*** empty log message ***

6 files changed, 48 insertions, 0 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index f230bac38fb..ce878fc173f 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -26,6 +26,9 @@ See msg from rms to emacs-devel on 21 Dec.
 
 ** Update Speedbar.
 
+** Update vhdl-mode.el based on changes in
+   http://opensource.ethz.ch/emacs/vhdl-mode.html.
+
 
 * FATAL ERRORS
 
diff --git a/etc/TODO b/etc/TODO
index c924962244d..34b79f78698 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -30,6 +30,10 @@ to the FSF.
   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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index ab183d39edd..62e3f2b7c36 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 5470a822a51..4da3d22584a 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -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 --git a/man/ChangeLog b/man/ChangeLog
index 376158a115b..6bcbe6dc9e9 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index c1e40d59441..2ffb3c4959c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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):