*** empty log message ***

2 files changed, 11 insertions, 10 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 1e71282f3f..e100cf8caa 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -625,11 +625,6 @@ too.  If you want to use just plain `*' as a wildcard, type `*""'; the
 doublequotes make no difference in the shell, but they prevent
 special treatment in `dired-do-shell-command'.
 
-+++
-*** Dired's v command now runs external viewers to view certain
-types of files.  The variable `dired-view-command-alist' controls
-what external viewers to use and when.
-
 *** In Dired, the w command now copies the current line's file name
 into the kill ring.  With a zero prefix arg, copies absolute file names.
 
@@ -2429,6 +2424,13 @@ timing measurements of code (including the garbage collection component).
 ** `cfengine-mode' is a major mode for editing GNU Cfengine
 configuration files.
 
+* Incompatible Lisp Changes in Emacs 21.4
+
++++
+** Mode line display ignores text properties as well as the
+:propertize and :eval forms in the value of a variable whose
+`risky-local-variable' property is nil.
+
 * Lisp Changes in Emacs 21.4
 
 +++
@@ -3853,11 +3855,6 @@ Reference manual for more detailed documentation.
 used to add text properties to mode-line elements.
 
 +++
-** Mode line display ignores text properties as well as the
-:propertize and :eval forms in the value of a variable whose
-`risky-local-variable' property is nil.
-
-+++
 ** The new `%i' and `%I' constructs for `mode-line-format' can be used
 to display the size of the accessible part of the buffer on the mode
 line.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 610d8aaca2..c72040211c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-04  Richard M. Stallman  <[email protected]>
+
+	* add-log.el (change-log-font-lock-keywords): Don't match just "From".
+
 2005-01-04  Andreas Schwab  <[email protected]>
 
 	* files.el (insert-directory): Only look for error lines in