[Emacs-diffs] Changes to emacs/src/ChangeLog

[Gerd Moellmann]

Index: emacs/src/ChangeLog
diff -c emacs/src/ChangeLog:1.2340 emacs/src/ChangeLog:1.2341
*** emacs/src/ChangeLog:1.2340  Fri Dec 28 08:34:00 2001
--- emacs/src/ChangeLog Fri Dec 28 09:47:47 2001
***************
*** 1,5 ****
--- 1,8 ----
  2001-12-28  Gerd Moellmann  <address@hidden>
  
+       * xterm.c (x_setup_relief_colors): Don't compute an image's
+       background color if it doesn't have a Pixmap.
+       
        * xterm.c (notice_overwritten_cursor): Don't depend on
        output_cursor and updated_area.  Compare pixel coordinates with
        window's cursor pixel coordinates.
***************
*** 7,13 ****
        notice_overwritten_cursor with new arg list.
        (show_mouse_face): Fix bug setting a row's mouse_face_p flag
        unconditionally.
!       
        * xdisp.c (try_scrolling) <PT below scroll margin>: Add the
        height of the cursor line to the amount to scroll.
  
--- 10,16 ----
        notice_overwritten_cursor with new arg list.
        (show_mouse_face): Fix bug setting a row's mouse_face_p flag
        unconditionally.
! 
        * xdisp.c (try_scrolling) <PT below scroll margin>: Add the
        height of the cursor line to the amount to scroll.