*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index dcf8b55e992d618b0cbee8072dea5c705a8c502d..72d52668d58fa37943c54434f8548a840ae491fe 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -29,6 +29,16 @@ support 64-bit executables.  See etc/MACHINES for instructions.
 \f
 * Changes in Emacs 21.1
 
+** The new variable `auto-mode-interpreter-regexp' contains a regular
+expression matching interpreters, for file mode determination.
+
+This regular expression is matched against the first line of a file to
+determine the file's mode in `set-auto-mode' when Emacs can't deduce a
+mode from the file's name.  If it matches, the file is assumed to be
+interpreted by the interpreter matched by the second group of the
+regular expression.  The mode is then determined as the mode
+associated with that interpreter in `interpreter-mode-alist'.
+
 ** C-down-mouse-3 is bound differently.  Now if the menu bar is not
 displayed it pops up a menu containing the items which would be on the
 menu bar.  If the menu bar is displayed, it pops up the major mode

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 94e38e400ccbaf0505635479b236e705ee14b0d1..505f1998ab788cc73cd55d62ca1748e10eb42ca4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,26 @@
 2000-08-08  Gerd Moellmann  <gerd@gnu.org>
 
+       * info.el (Info-insert-dir): Use Info-additional-directory-list if
+       non-nil.
+       (Info-file-list-for-emacs): Remove "info" from the list because
+       that leads to trying to use the documentation from file `info'
+       in various situations where it isn't appropriate, for instance
+       C-h C-k C-h i.
+
+       * ffap.el (ffap-read-file-or-url-internal): Handle case that
+       DIR and/or STRING are nil.
+
+       * progmodes/compile.el (compilation-setup): Make variable
+       compilation-error-screen-columns buffer-local, as some comment
+       in the code suggests it should be.
+
+       * files.el (auto-mode-interpreter-regexp): New variable.
+       (set-auto-mode): Use it.
+
+       * indent.el (indent-for-tab-command): Doc fix.
+
+       * mouse-sel.el (mouse-sel-mode): Doc fix.
+
        * emacs-lisp/lisp-mode.el (eval-last-sexp-1): Handle `#N='
        labels.
 

diff --git a/man/ChangeLog b/man/ChangeLog
index d12998a3a055b114c6189a31b1c55d92f8e3581a..ac648e1d552c113da78d885df4ccb62b6d5fbc31 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-08  Gerd Moellmann  <gerd@gnu.org>
+
+       * faq.texi (Disabling backups): Replace reference to 
+       non-existent initial-dired-omit-files-p with something that works.
+       
 2000-08-08  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * programs.texi (Documentation): Add an xref to WoMan's own

diff --git a/src/ChangeLog b/src/ChangeLog
index d106e3e30a2f51260298f243b2db9c110e74d248..64fa38a87e36f232a334a22f3bee2a46d62986c6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -17,7 +17,7 @@
        * textprop.c (Fprevious_single_char_property_change): Don't do
        arithmetic directly on lisp objects.
 
-       * editfns.c (find_field): Use EQ, not ==, to compare lisp
+       * editfns.c (find_field): Use EQ, not ==, to compare Lisp
        objects.
 
        * keyboard.h (menu_item_eval_property): Declare.
@@ -26,15 +26,15 @@
        reuse as buffer name, instead of recreating (and discarding) every
        time a message is logged.
        (with_echo_area_buffer): Make callback arg A2 a lisp object.
-       (current_message_1, truncate_message_1, set_message_1,
-       display_echo_area_1, resize_mini_window_1): Signatures changed.
-       (current_message, truncate_echo_area, display_echo_area,
-       resize_echo_area_axactly): Changed calls.
+       (current_message_1, truncate_message_1, set_message_1)
+       (display_echo_area_1, resize_mini_window_1): Signatures changed.
+       (current_message, truncate_echo_area, display_echo_area)
+       (resize_echo_area_axactly): Changed calls.
 
        * coding.c (find_safe_codings): CHAR_TABLE_SET index must be a
-       lisp object.
+       Lisp object.
        (Ffind_coding_systems_region_internal): First argument to Fappend
-       must be an integer, not a lisp object.
+       must be an integer, not a Lisp object.
 
 2000-08-08  Kenichi Handa  <handa@etl.go.jp>