*** empty log message ***

2 files changed, 47 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c5a5444363..cc2f343cc9a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2001-11-11  Richard M. Stallman  <rms@gnu.org>
+
+        * progmodes/sh-script.el (sh-must-be-shell-mode): 
+        Allow modes derived from sh-mode.
+
+        * emacs-lisp/checkdoc.el (checkdoc-file-comments-engine): 
+        Turn off error in some re-search-forward calls.
+
+        * replace.el (query-replace-skip-read-only): New variable.
+        (perform-replace): If that variable is non-nil, ignore matches
+        that have a read-only property.
+
+        * derived.el (define-derived-mode): Doc fix.
+
+        * server.el (server-buffer-done): Test of server-existing-buffer
+        was backwards.
+        (server-existing-buffer): Doc fix.
+
+        * textmodes/flyspell.el (flyspell-default-dictionary):
+        Allow nil as value, and make nil the default.
+
 2001-11-11  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * subdirs.el: Regenerated.
@@ -39,6 +60,14 @@
 
 2001-11-10  Richard M. Stallman  <rms@gnu.org>
 
+        * abbrev.el (read-abbrev-file): Don't set save-abbrevs.
+        (quietly-read-abbrev-file): Doc fix.
+
+        * startup.el (command-line): Read standard abbrev
+        file (abbrev-file-name), if it exists.
+
+        * files.el (save-abbrevs): Default value is t.
+
         * progmodes/compile.el (compile-goto-error): Fix previous change
         in the case where subsequent errors have not been parsed yet
         because they are in a different source file.
diff --git a/src/ChangeLog b/src/ChangeLog
index d2c0a5917da..55a26c6ee24 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2001-11-11  Richard M. Stallman  <rms@gnu.org>
+
+        * insdel.c (replace_range): Use adjust_markers_for_replace
+        instead of adjust_markers_for_delete and adjust_markers_for_insert.
+
+        * intervals.h: Declare set_text_properties and set_text_properties_1.
+
+        * textprop.c (set_text_properties_1): New subroutine
+        broken out of set_text_properties.
+        (set_text_properties): Use set_text_properties_1.
+
+        * intervals.c (graft_intervals_into_buffer):
+        Use set_text_properties_1 to clear out properties.
+
+        * search.c (Freplace_match): Use replace_range to insert
+        and delete.  Don't request property inheritance from
+        surrounding text.
+
 2001-11-10  Jason Rumney  <jasonr@gnu.org>
 
         * w32fns.c (enum_font_cb2): Use leading @ on face name to detect