*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0255264eda16aa7e58f7470e01e6aa0d517e5b8a..bd19d2ced475bbde25f99542bfdb1e0be18f6c10 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,13 +1,41 @@
+2003-01-05  Richard M. Stallman  <rms@gnu.org>
+
+       * isearch.el (isearch-repeat): Error if try to repeat search and
+       there was no previou search.
+
+       * dired.el (dired-recursive-deletes): Fix custom type.
+
+       * dabbrev.el (dabbrev--substitute-expansion): 
+       Convert all whitespace to single spaces,
+       except when it's carried over from the existing text.
+
+       * simple.el (split-line): Clean up implementation.
+
+       * mail/rmail.el (rmail-font-lock-keywords): Discard code to match both cases.
+       (rmail-variables): Specify case-insensitive matching for font-lock.
+
+2003-01-05  Alexander Pohoyda  <alexander.pohoyda@gmx.net>  (tiny change)
+
+       * mail/sendmail.el (mail-font-lock-keywords): Match multiline In-Reply-To and X-*.
+       * mail/rmail.el (rmail-font-lock-keywords): Match multiline In-Reply-To and X-*.
+
+2003-01-05  Mark A. Hershberger  <mah@everybody.org>
+
+       * xml.el (xml-substitute-special): Check for &amp last.
+
 2003-01-05  Dave Love  <fx@gnu.org>
 
-       * buff-menu.el (Buffer-menu-execute): Fix for effect of header
-       line.
+       * buff-menu.el (Buffer-menu-execute): Fix previous change.
+
+2003-01-05  Benjamin Riefenstahl  <Benjamin.Riefenstahl@epost.de>  (tiny change)
+
+       * buff-menu.el (Buffer-menu-execute): Allow for Buffer-menu-use-header-line. 
+
+2003-01-05  Dave Love  <fx@gnu.org>
 
-       * international/mule-diag.el (non-iso-charset-alist): Add
-       vietnamese-tcvn.
+       * international/mule-diag.el (non-iso-charset-alist): Add vietnamese-tcvn.
 
-       * international/mule-cmds.el (locale-language-names): Use
-       Croatian, Swedish.
+       * international/mule-cmds.el (locale-language-names): Use Croatian, Swedish.
 
 2003-01-05  Andreas Schwab  <schwab@suse.de>
 
@@ -97,6 +125,7 @@
        * emacs-lisp/eldoc.el (eldoc-get-var-docstring): Only return a
        documentation string when `sym' is non-nil.
 
+>>>>>>> 1.4686
 2003-01-02  Steven Tamm  <steventamm@mac.com>
 
        * scroll-bar.el (toggle-scroll-bar, scroll-bar-mode): Have

diff --git a/src/ChangeLog b/src/ChangeLog
index b4d5cb9397b7136b676e5d230ed1f7fe4241db61..6b0dc07967965130d529ed722a69531909b4d09a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,52 @@
+2003-01-05  Richard M. Stallman  <rms@gnu.org>
+
+       * xdisp.c (try_scrolling): New arg LAST_LINE_MISFIT.
+       Count LAST_LINE_MISFIT in scroll margin for end of window.
+       Move label too_near_end before setting SCROLL_MARGIN_POS.
+       Set LAST_LINE_MISFIT before jumping there.
+       
+       * xdisp.c (try_scrolling): Calculate amount_to_scroll better in
+       scroll_conservatively case.  If scrolling that much doesn't change
+       STARTP, move it down one line.
+
+       * xdisp.c (redisplay_window): Pass last_line_misfit arg to try_scrolling.
+       Make it 1 after make_cursor_line_fully_visible fails.
+       
+       * xdisp.c (setup_echo_area_for_printing): Kill Emacs if no selected frame.
+
+       * keymap.c (apropos_predicate, apropos_accumulate): Make them static.
+       (syms_of_keymap): staticpro them.
+       (Fapropos_internal): Initialize them and clear them out.
+       Don't GCPRO them.
+
+       * buffer.c (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>:
+       Doc fixes.
+
+       * lisp.h: New misc type Lisp_Save_Value.
+       (enum Lisp_Misc_Type): Add Lisp_Misc_Save_Value.
+       (XSAVE_VALUE): New macro.
+       (struct Lisp_Save_Value): New data type.
+       (union Lisp_Misc): Add u_save_value alternative.
+       (make_save_value): Declared.
+
+       * alloc.c (make_save_value): New function.
+
+       * xterm.c (x_catch_errors): Save dpy using make_save_value.
+       (x_catch_errors_unwind): Call XSync.
+
+2003-01-01  Richard M. Stallman  <rms@gnu.org>
+
+       * window.c (window_scroll_pixel_based): Partially undo last change.
+
+       * keyboard.c (command_loop_1): Call adjust_point_for_property
+       in direct action cases for Qforward_char and Qbackward_char.
+       Set already_adjusted so it won't be done twice.
+
+2002-12-30  Richard Dawe  <rich@phekda.freeserve.co.uk>  (tiny change)
+
+       * src/config.in (!HAVE_SIZE_T): Fix order of arguments in
+       type definition of size_t.
+
 2003-01-02  Steven Tamm  <steventamm@mac.com>
 
        * macterm.c (syms_of_macterm): Provide the feature "mac-carbon" to