2 files changed, 36 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fe339d528a8..c87c0ae04d9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,10 +3,10 @@
         * gud.el (gdb): Define gud-nexti.
         (gud-menu-map): Add gud-nexti to map.
         (gud-tool-bar-map): Add gud-nexti and gud-stepi to toolbar.
-        
-        * toolbar/gud-stepi.xpm, toolbar/gud-stepi.pbm, 
+
+        * toolbar/gud-stepi.xpm, toolbar/gud-stepi.pbm,
         toolbar/gud-nexti.xpm, toolbar/gud-nexti.pbm: New icons for debugger.
-        
+
 2003-05-17  John Paul Wallington  <jpw@gnu.org>
 
         * international/ja-dic-cnv.el (skkdic-okuri-nasi-entries)
@@ -17,6 +17,36 @@
 
 2003-05-17  Stefan Monnier  <monnier@cs.yale.edu>
 
+        * log-edit.el: Don't require vc.el anymore.
+        (log-edit-mode-map): Fold vc-log-mode-map into it.
+        (vc-log-mode-map): Redefine as an alias.
+        (vc-previous-comment): Don't widen.
+        (vc-comment-to-change-log): Don't redundantly set paragraph-separate.
+        Don't require `add-log' since it's already required at toplevel.
+
+        * vc.el (vc-log-mode-map, vc-maximum-comment-ring-size)
+        (vc-comment-ring, vc-comment-ring-index, vc-last-comment-match):
+        Move vars to log-edit.el.
+        (vc-new-comment-index, vc-previous-comment, vc-next-comment)
+        (vc-comment-search-reverse, vc-comment-search-forward)
+        (vc-comment-to-change-log): Move funs to log-edit.el.
+        (vc-clear-context): Don't empty the comment-ring.
+        (vc-finish-logentry): Don't add the comment onto the comment-ring.
+
+        * log-edit.el (vc-log-mode-map, vc-maximum-comment-ring-size)
+        (vc-comment-ring, vc-comment-ring-index, vc-last-comment-match):
+        Move vars from vc.el.
+        (vc-new-comment-index, vc-previous-comment, vc-next-comment)
+        (vc-comment-search-reverse, vc-comment-search-forward)
+        (vc-comment-to-change-log): Move funs from vc.el.
+        (log-edit-show-files): Remove unused var `editbuf'.
+
+        * progmodes/tcl.el (tcl-indent-exp): Remove dead code.
+        (tcl-tab-always-indent): Default to tab-always-indent.
+
+        * progmodes/perl-mode.el (perl-end-of-function): Remove unused var.
+        (perl-tab-always-indent): Default to tab-always-indent.
+
         * which-func.el (which-func-format): Make it risky-local-variable.
         (which-func-table): New var.
         (which-func-current): Make it into a constant modeline spec.
@@ -32,6 +62,7 @@
         (listify-key-sequence): Don't allocate unnecessarily.
         (read-quoted-char): Allow up to base 36.
         (prepare-change-group): Remove unimplemented argument.
+        (macro-declaration-function): Avoid `dolist' and `cadr'.
 
         * wid-edit.el (pp-to-string, Info-goto-node): Don't autoload.
         (widget-choose, widget-map-buttons): Use with-current-buffer.
diff --git a/src/ChangeLog b/src/ChangeLog
index c6c89a01cc0..a51407e0f44 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2003-05-17  Stefan Monnier  <monnier@cs.yale.edu>
 
+        * lread.c (Fload): Print a message if package is obsolete.
+
         * window.c (Fselect_window): Add optional `norecord' arg.
         (select_window_1): Fold into Fselect_window.
         (select_window_norecord): New function.
@@ -78,7 +80,6 @@
 2003-05-15  Stefan Monnier  <monnier@cs.yale.edu>
 
         * keyboard.c (apply_modifiers): Don't fill the other cache.
-======= end
 
 2003-05-14  Stefan Monnier  <monnier@cs.yale.edu>