Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-159
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-160
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-119

3 files changed, 24 insertions, 17 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ed93c0fdb7c..5f65301a7cd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2004-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fileio.c (Fread_file_name): Set completion-ignore-case for
+        case-insensitive systems.
+
+2004-03-14  Masatake YAMATO  <jet@gyve.org>
+
+        * xdisp.c (note_mode_line_or_margin_highlight): Accept HEADER_LINE
+        when keymap and cursor are setup.
+
 2004-03-14  Steven Tamm <steventamm@mac.com>
 
         * Makefile.in (XMENU_OBJ): Do not include xmenu.o if
@@ -13,11 +23,9 @@
 
 2004-03-13  Eli Zaretskii  <eliz@elta.co.il>
 
-        * Makefile.in (XMENU_OBJ): Include xmenu.o if HAVE_MENUS is
-        defined.
+        * Makefile.in (XMENU_OBJ): Include xmenu.o if HAVE_MENUS is defined.
 
-        * emacs.c (main): Call syms_of_xmenu only if HAVE_MENUS is
-        defined.
+        * emacs.c (main): Call syms_of_xmenu only if HAVE_MENUS is defined.
 
 2004-03-12  Richard M. Stallman  <rms@gnu.org>
 
@@ -29,12 +37,11 @@
 2004-03-12  Kim F. Storm  <storm@cua.dk>
 
         Fix image support on MAC.  From YAMAMOTO Mitsuharu.
-        
+
         * dispextern.h (XImagePtr, XImagePtr_or_DC): Add typedefs.
         (image_background, image_background_transparent): Fix prototypes.
 
-        * image.c (XImagePtr, XImagePtr_or_DC): Move typedefs to
-        dispextern.h.
+        * image.c (XImagePtr, XImagePtr_or_DC): Move typedefs to dispextern.h.
 
         * macfns.c (x_list_fonts, x_get_font_info, x_load_font)
         (x_query_font, x_find_ccl_program, x_set_window_size)
@@ -57,9 +64,9 @@
         * dispextern.h: Move image related prototypes from xfns.c section
         to image.c.  Condition them by HAVE_WINDOW_SYSTEM rather than
         HAVE_X_WINDOWS.
-        
+
         * Makefile.in (XOBJ): Consolidate into one list.  Add image.o.
-        Move gtkutil.o to new GTK_OBJ list.  
+        Move gtkutil.o to new GTK_OBJ list.
         (XMENU_OBJ) [HAVE_MENUS]: Move declaration to proper place.
         (GTK_OBJ) [USE_GTK]: New declaration.
         (obj): Add $(GTK_OBJ) to list.
@@ -82,7 +89,7 @@
 
         * Makefile.in (XOBJ, MAC_OBJ): Add image.o.
         (image.o): Add dependencies.
-        
+
         * image.c: New file with consolidated image support code.
         (COLOR_TABLE_SUPPORT): New define to control whether
         color table support is available (X only).
@@ -96,8 +103,8 @@
         (PNG_BG_COLOR_SHIFT): Bits to shift PNG background colors.
         (RGB_PIXEL_COLOR): Common type for an integer "pixel color" value.
         (PIX_MASK_RETAIN, PIX_MASK_DRAW): Portability macros (from macfns.c).
-        (FRAME_X_VISUAL, x_defined_color, DefaultDepthOfScreen): Define
-        with suitable equivalents on W32 and MAC for code sharing.
+        (FRAME_X_VISUAL, x_defined_color, DefaultDepthOfScreen):
+        Define with suitable equivalents on W32 and MAC for code sharing.
         (XDrawLine): Define on MAC for code sharing.
         (Destroy_Image, Free_Pixmap): Wrappers for code sharing.
         (IF_LIB_AVAILABLE): Macro to simplify code sharing.
@@ -132,12 +139,12 @@
         code from xfns.c, w32fns.c, and macfns.c.
         (syms_of_image): Consolidate image related symbol setup here.
         (init_image): Consolidate image related initializations here.
-        
+
         * emacs.c (main) [HAVE_WINDOW_SYSTEM]: Add calls to syms_of_image
         and init_image.  Remove call to init_xfns.
 
-        * macterm.h (struct mac_bitmap_record): Add file member.  Not
-        currently used, but simplifies code sharing.
+        * macterm.h (struct mac_bitmap_record): Add file member.
+        Not currently used, but simplifies code sharing.
 
         * macfns.c (Vx_bitmap_file_path, Vimage_cache_eviction_delay)
         (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
diff --git a/src/fileio.c b/src/fileio.c
index 73771591994..3f17da7033d 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -6218,7 +6218,7 @@ provides a file dialog box.  */)
     }
 
   count = SPECPDL_INDEX ();
-#ifdef VMS
+#if defined VMS || defined DOS_NT || defined MAC_OSX
   specbind (intern ("completion-ignore-case"), Qt);
 #endif
 
diff --git a/src/xdisp.c b/src/xdisp.c
index bb7ce740a63..749739a8bca 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20347,7 +20347,7 @@ note_mode_line_or_margin_highlight (w, x, y, area)
         pointer = Fget_text_property (pos, Qpointer, string);
 
      /* Change the mouse pointer according to what is under X/Y.  */
-      if (NILP (pointer) && area == ON_MODE_LINE)
+      if (NILP (pointer) && ((area == ON_MODE_LINE) || (area == ON_HEADER_LINE)))
         {
           Lisp_Object map;
           map = Fget_text_property (pos, Qlocal_map, string);