*** empty log message ***

2 files changed, 50 insertions, 22 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 135f64712ef..fae8a79af88 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -150,6 +150,9 @@ can be saved and will again be loaded with the new `grep-mode'.
 
 ** M-x diff uses diff-mode instead of compilation-mode.
 
+** M-x compare-windows now can automatically skip non-matching text to
+resync points in both windows.
+
 ** New command `strokes-global-set-stroke-string'.
 This is like `strokes-global-set-stroke', but it allows you to bind
 the stroke directly to a string to insert.  This is convenient for
@@ -329,6 +332,31 @@ restores the previous value of `buffer-invisibility-spec'.
 ** New command `kill-whole-line' kills an entire line at once.
 By default, it is bound to C-S-<backspace>.
 
+** Dired mode:
+
+*** New faces dired-header, dired-mark, dired-marked, dired-flagged,
+dired-ignored, dired-directory, dired-symlink, dired-warning
+introduced for Dired mode instead of font-lock faces.
+
+*** New Dired command `dired-compare-directories' to mark files with
+different file attributes in two dired buffers.
+
++++
+*** In Dired's ! command (dired-do-shell-command), `*' and `?' now
+control substitution of the file names only when they are surrounded
+by whitespace.  This means you can now use them as shell wildcards
+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.
+
 ** Info mode:
 +++
 *** Info now hides node names in menus and cross references by default.
@@ -339,6 +367,12 @@ If you prefer the old behavior, you can set the new user option
 Info files on your system for a string, and builds a menu of the
 possible matches.
 
++++
+*** The default value for `Info-scroll-prefer-subnodes' is now nil.
+
+---
+*** Info-index offers completion.
+
 ** Support for the SQLite interpreter has been added to sql.el by calling
 'sql-sqlite'.
 
@@ -755,9 +789,6 @@ mode-line.
 in a directory or in a file.  See the documentation of the user option
 `display-time-mail-directory'.
 
-+++
-** The default value for `Info-scroll-prefer-subnodes' is now nil.
-
 ---
 ** LDAP support now defaults to ldapsearch from OpenLDAP version 2.
 
@@ -815,9 +846,6 @@ whose width, height, or both width and height take up the entire
 screen size.  (For now, this does not work with some window managers.)
 
 ---
-** Info-index offers completion.
-
----
 ** Emacs now tries to set up buffer coding systems for HTML/XML files
 automatically.
 
@@ -953,19 +981,6 @@ to hide its text.  This should be mostly transparent but slightly
 changes the behavior of motion commands like C-e and C-p.
 
 +++
-** In Dired's ! command (dired-do-shell-command), `*' and `?' now
-control substitution of the file names only when they are surrounded
-by whitespace.  This means you can now use them as shell wildcards
-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.
-
-+++
 ** Unquoted `$' in file names do not signal an error any more when
 the corresponding environment variable does not exist.
 Instead, the `$ENVVAR' text is left as is, so that `$$' quoting
@@ -1033,9 +1048,6 @@ With positive arg, M-h marks the current and the following paragraphs;
 if the arg is negative, it marks the current and the preceding
 paragraphs.
 
-** In Dired, the w command now copies the current line's file name
-into the kill ring.
-
 +++
 ** The variables dired-free-space-program and dired-free-space-args
 have been renamed to directory-free-space-program and
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15736b40b37..30eac96b584 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2004-04-11  Juri Linkov  <juri@jurta.org>
+
+        * dired.el (dired-faces): New defgroup.
+        (dired-header, dired-mark, dired-marked, dired-flagged)
+        (dired-warning, dired-directory, dired-symlink, dired-ignored):
+        New faces.
+        (dired-header-face, dired-mark-face, dired-marked-face)
+        (dired-flagged-face, dired-warning-face, dired-directory-face)
+        (dired-symlink-face, dired-ignored-face): New face variables.
+        (dired-font-lock-keywords): Use them instead of font-lock faces.
+        Split the rule for dired marks into 3 separate rules: for marks,
+        marked file names and flagged file names.
+
+        * help-mode.el (help-make-xrefs): Add a final newline to the
+        *Help* buffer.
+
 2004-04-11  John Paul Wallington  <jpw@gnu.org>
 
         * replace.el (occur-engine): Distinguish between one and several