3 files changed, 46 insertions, 2 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 1d3f1e90434..996f4e75e7b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -145,7 +145,6 @@ src/fontset.c
 src/getloadavg.c
 src/gmalloc.c
 src/hftctl.c
-src/igc.c
 src/indent.c
 src/insdel.c
 src/lastfile.c
@@ -176,7 +175,6 @@ src/termcap.c
 src/terminfo.c
 src/textprop.c
 src/tparam.c
-src/ttymenu.c
 src/undo.c
 src/unexaix.c
 src/unexalpha.c
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a1e7037c6cd..f2370b78626 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,41 @@
+2001-11-25  Stefan Monnier  <monnier@cs.yale.edu>
+
+        * diff-mode.el (diff-end-of-hunk): Watch out for ambiguities.
+        (diff-hunk-kill): Simplify.
+        (diff-post-command-hook): Only apply to a single hunk.
+        (diff-hunk-text): Make `char-offset' non-optional.
+        (diff-find-text): Return a cons cell.
+        (diff-find-approx-text): New fun.
+        (diff-find-source-location): Use it.
+        (diff-apply-hunk, diff-test-hunk, diff-goto-source):
+        Adapt to new retval of diff-find-source-location.
+
+        * vc-cvs.el (vc-cvs-parse-entry): Rewrite, comparing the string-
+        rather than integer- representation of dates.
+
+        * textmodes/fill.el (fill-indent-according-to-mode): Default to nil.
+
+        * emacs-lisp/syntax.el: Don't profile syntax-ppss any more.
+        (syntax-after): New fun.
+
+        * help-funs.el (describe-syntax): New fun.
+
+        * font-lock.el (font-lock-cache-state, font-lock-cache-position)
+        (font-lock-ppss-stats, font-lock-ppss): Remove.
+        (font-lock-fontify-syntactically-region): Remove tuning code.
+        (font-lock-compile-keywords): Fix off-by-one bug.
+        (font-lock-set-defaults): Don't set removed vars.
+        (c-keywords): Add `inline'.
+        (c-type-names): Add `_Complex', `_Imaginary' and `_Bool'.
+
+        * emacs-lisp/lisp-mode.el (lisp-mode-variables):
+        Set syntax-begin-function.
+        (lisp-interaction-mode-abbrev-table): Defvar to its correct value.
+        (lisp-interaction-mode): Don't set local-abbrev-table any more.
+        (lisp-mode-auto-fill): Use syntax-ppss and obey
+        comment-auto-fill-only-comments.
+        (lisp-fill-paragraph): Use syntax-ppss.
+
 2001-11-25  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * mail/rmail.el (rmail-enable-mime-composing): New. A lightweight
diff --git a/src/ChangeLog b/src/ChangeLog
index b06eac4304b..91c413947ec 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-25  Stefan Monnier  <monnier@cs.yale.edu>
+
+        * textprop.c (set_text_properties_1): Clearly mark that the
+        interval should not be empty.
+
+        * intervals.c (graft_intervals_into_buffer):
+        Don't call set_text_properties_1 on an empty interval.
+
 2001-11-25  Richard M. Stallman  <rms@gnu.org>
 
         * unexelf.c (unexec): Index by n, not nn, when checking for ".sbss".