*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index 6a2eb19f579dcf57b425ca136a264258cc966f24..5832be86b2071985773af7316bf14031b20776c4 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -31,7 +31,11 @@ support 64-bit executables.  See etc/MACHINES for instructions.
 \f
 * Changes in Emacs 21.1
 
-* The Strokes package has been updated.  If your Emacs has XPM
+** The new user-option `find-file-suppress-same-file-warnings' can be
+set to suppress warnings ``X and Y are the same file'' when visiting a
+file that is already visited under a different name.
+
+** The Strokes package has been updated.  If your Emacs has XPM
 support, you can use it for pictographic editing.  In Strokes mode,
 use C-mouse-2 to compose a complex stoke and insert it into the
 buffer.  You can encode or decode a strokes buffer with new commands
@@ -39,10 +43,10 @@ M-x strokes-encode-buffer and M-x strokes-decode-buffer.  There is a
 new command M-x strokes-list-strokes.
 
 +++
-* New command M-x describe-character-set reads a character set name
+** New command M-x describe-character-set reads a character set name
 and displayes information about that.
 
-* When an error is signaled during the loading of the user's init
+** When an error is signaled during the loading of the user's init
 file, Emacs now pops up the *Messages* buffer.
 
 ** Polish and German translations of Emacs' reference card have been
@@ -1594,6 +1598,8 @@ functionality with aliases for the mldrag functions.
 ** In image specifications, `:heuristic-mask' has been replaced
 with the more general `:mask' property.
 
+** Image specifications accept more `:algorithm's.
+
 ** A `?' can be used in a symbol name without escaping it with a
 backslash.
 
@@ -3056,6 +3062,9 @@ Emboss edge-detection uses a matrix of
    -1  0  1
     0  1 -2)
 
+ALGO `disabled' means transform the image so that it looks
+``disabled''.
+
 `:mask MASK'
 
 If MASK is `heuristic' or `(heuristic BG)', build a clipping mask for

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47b4f2a82ed1b82cead6ff448e4ee1a60975ad2f..375a614b8ebc50e662f5f98dc5284cc2f4a8fe6c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -12,6 +12,11 @@
        more exactly for the case that font-lock-constant-face is
        underlined.
 
+2000-09-19  Richard M. Stallman  <rms@gnu.org>
+       
+       * progmodes/sh-script.el (sh-search-word): Rewritten for
+       speed.
+
 2000-09-19  Andre Spiegel  <spiegel@gnu.org>
 
        * vc.el (vc-revert-buffer): Set vc-checkout-time correctly.