*** empty log message ***

5 files changed, 52 insertions, 12 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index e00c40b0871..8cc1ac9cbcf 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -4,8 +4,6 @@ Tasks needed before the next release.
 
 ** Face remapping.
 
-** Let mouse-1 follow links.
-
 ** Make Rmail find the best version of movemail.
 To be done by Sergey Poznyakoff <gray@Mirddin.farlep.net>.
 
@@ -36,6 +34,8 @@ invalid pointer from string_free_list.
 
 * BUGS
 
+** Incomplete overlay mouse-face highlight bug (Ralf Angeli, Oct 18)
+
 ** Ange-ftp should ignore irrelevant IPv6 errors:
 
 Message-Id: <4121-Tue23Mar2004165249+0100-piet@cs.uu.nl>
diff --git a/etc/NEWS b/etc/NEWS
index 3f479e7eb8c..caf2fdc1494 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -98,10 +98,11 @@ types any more.  Add -DUSE_LISP_UNION_TYPE if you want union types.
 
 * Changes in Emacs 21.4
 
-** calculator.el now has radix grouping mode.  In this mode a
-separator character is used between every few digits, making it
-easier to indicate byte boundries etc.  See the documentation of
-the `calculator-radix-grouping-mode' custom variable.
+** calculator.el now has radix grouping mode, which is available when
+`calculator-output-radix' is non-nil.  In this mode a separator
+character is used every few digits, making it easier to see byte
+boundries etc.  For more info, see the documentation of the variable
+`calculator-radix-grouping-mode'.
 
 ** You can now follow links by clicking Mouse-1 on the link.
 
@@ -133,6 +134,24 @@ You can customize the new Mouse-1 behaviour via the new user option
 `mouse-1-click-follows-link'.
 
 +++
+** require-final-newline now has two new possible values:
+
+`visit' means add a newline (as an undoable change) if it's needed
+when visiting the file.
+
+`visit-save' means add a newline (as an undoable change) if it's
+needed when visiting the file, and also add a newline if it's needed
+when saving the file.
+
++++
+** The new option mode-require-final-newline controls how certain
+major modes enable require-final-newline.  Any major mode that's
+designed for a kind of file that should normally end in a newline
+sets require-final-newline based on mode-require-final-newline.
+So you can customize mode-require-final-newline to control what these
+modes do.
+
++++
 ** When the undo information of the current command gets really large
 (beyond the value of `undo-outer-limit'), Emacs asks you whether to
 discard it or keep it.
@@ -1804,12 +1823,15 @@ The functions c-hungry-backspace and c-hungry-delete-forward can be
 bound to keys to get this feature without toggling a mode.
 Contributed by Kevin Ryde.
 
-*** Better control over require-final-newline.
-The variable that controls how to handle a final newline when the
-buffer is saved, require-final-newline, is now customizable on a
-per-mode basis through c-require-final-newline.  The default is to set
-it to t only in languages that mandate a final newline in source files
-(C, C++ and Objective-C).
+*** Better control over require-final-newline.  The variable that
+controls how to handle a final newline when the buffer is saved,
+require-final-newline, is now customizable on a per-mode basis through
+c-require-final-newline.  That is a list of modes, and only those
+modes set require-final-newline.  By default that's C, C++ and
+Objective-C.
+
+The specified modes set require-final-newline based on 
+mode-require-final-newline, as usual.
 
 *** Format change for syntactic context elements.
 The elements in the syntactic context returned by c-guess-basic-syntax
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 46feadfa038..7d0af94aaeb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2004-12-31  Richard M. Stallman  <rms@gnu.org>
 
+        * faces.el (read-face-name):
+        Don't treat an attribute spec as a list of faces.
+
+        * simple.el (undo): Use undo-equiv-table to detect
+        unexpected changes since previous undo.
+        (undo-list-saved): Variable deleted.
+        (buffer-disable-undo): Don't alter undo-list-saved.
+
         * files.el (require-final-newline): Allow `visit' and `visit-save'.
         (mode-require-final-newline): New option.
         (after-find-file): Handle require-final-newline with new values.
diff --git a/man/ChangeLog b/man/ChangeLog
index 1cda3233b45..5e00b01f526 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,5 +1,9 @@
 2004-12-31  Richard M. Stallman  <rms@gnu.org>
 
+        * dired.texi (Shell Commands in Dired): Delete the ? example.
+
+        * display.texi (Scrolling): Correct scroll-preserve-screen-position.
+
         * files.texi (Saving): Describe new require-final-newline features
         and mode-require-final-newline.
 
diff --git a/src/ChangeLog b/src/ChangeLog
index d7de3c33be2..c60504d970c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-31  Richard M. Stallman  <rms@gnu.org>
+
+        * window.c (window_scroll_pixel_based): Only look at
+        Vscroll_preserve_screen_position if the old PT can't be kept.
+        (syms_of_window) <scroll-preserve-screen-position>: Doc fix.
+
 2004-12-30  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (get_line_height_property): New function extracted from