changeset 49070:17cf54c383f2

*** empty log message ***

--- a/lisp/ChangeLog	Mon Jan 06 01:21:15 2003 +0000
+++ b/lisp/ChangeLog	Mon Jan 06 01:28:25 2003 +0000
@@ -1,13 +1,41 @@
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* 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.
+
[phone]  Alexander Pohoyda  <[e-mail]>  (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-*.
+
[phone]  Mark A. Hershberger  <[e-mail]>
+
+	* xml.el (xml-substitute-special): Check for &amp last.
+
 2003-01-05  Dave Love  <[e-mail]>
 
-	* buff-menu.el (Buffer-menu-execute): Fix for effect of header
-	line.
-
-	* international/mule-diag.el (non-iso-charset-alist): Add
-	vietnamese-tcvn.
-
-	* international/mule-cmds.el (locale-language-names): Use
-	Croatian, Swedish.
+	* buff-menu.el (Buffer-menu-execute): Fix previous change.
+
[phone]  Benjamin Riefenstahl  <[e-mail]>  (tiny change)
+
+	* buff-menu.el (Buffer-menu-execute): Allow for Buffer-menu-use-header-line. 
+
[phone]  Dave Love  <[e-mail]>
+
+	* international/mule-diag.el (non-iso-charset-alist): Add vietnamese-tcvn.
+
+	* international/mule-cmds.el (locale-language-names): Use Croatian, Swedish.
 
 2003-01-05  Andreas Schwab  <[e-mail]>
 
@@ -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  <[e-mail]>
 
 	* scroll-bar.el (toggle-scroll-bar, scroll-bar-mode): Have

--- a/src/ChangeLog	Mon Jan 06 01:21:15 2003 +0000
+++ b/src/ChangeLog	Mon Jan 06 01:28:25 2003 +0000
@@ -1,3 +1,52 @@
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* 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.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* 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.
+
[phone]  Richard Dawe  <[e-mail]>  (tiny change)
+
+	* src/config.in (!HAVE_SIZE_T): Fix order of arguments in
+	type definition of size_t.
+
 2003-01-02  Steven Tamm  <[e-mail]>
 
 	* macterm.c (syms_of_macterm): Provide the feature "mac-carbon" to