Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-22

Merge from emacs--cvs-trunk--0

Patches applied:

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

13 files changed, 135 insertions, 60 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 60b8d5da63d..254069032ed 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,11 +1,64 @@
+2004-07-06  John Paul Wallington  <jpw@gnu.org>
+
+        * eval.c (Fdefmacro): Signal an error if NAME is not a symbol.
+
+2004-07-05  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * macterm.c (mac_initialize_display_info): Use CGGetActiveDisplayList
+        instead of CGMainDisplayID (only in OSX 10.2 and later).
+
+2004-07-04  John Paul Wallington  <jpw@gnu.org>
+
+        * fileio.c (read_file_name_completion_ignore_case): New variable.
+        (syms_of_fileio): Declare and initialise it.
+        (Fread_file_name): Bind `completion-ignore-case' to respect it.
+
+2004-07-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdos.c (dos_rawgetc): Use make_number to produce Lisp objects
+        for event.x and event.y.
+
+2004-07-01  Kenichi Handa  <handa@m17n.org>
+
+        * w32select.c (Fw32_set_clipboard_data): Update `nbytes' correctly
+        after getting a new string by pre-write-conversion.
+
+2004-06-30  Stefan  <monnier@iro.umontreal.ca>
+
+        * xterm.c (x_detect_focus_change): Remove unused var `nr_events'.
+        (x_calc_absolute_position): Remove unused var `child'.
+
+        * xfaces.c (x_supports_face_attributes_p)
+        (Fdisplay_supports_face_attributes_p): YAILOM.
+        (tty_supports_face_attributes_p): Remove unused var `i'.
+
+        * syntax.c (skip_chars): Remove unused labels fwd_unibyte_ok and
+        back_unibyte_ok.
+
+        * search.c (match_limit, Fmatch_data, Fset_match_data): YAILOM.
+
+        * fontset.c (Fset_fontset_font): Remove unused vars `family' and `registry'.
+
+        * Makefile.in (${etc}DOC): Fix file name of make-docfile.
+
+2004-06-30  Andreas Schwab  <schwab@suse.de>
+
+        * image.c (CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
+        (Finit_image_library): Pass LIBRARIES through to
+        CHECK_LIB_AVAILABLE.  Declare parameters.  Doc fix.
+        (lookup_image_type): Pass Qnil as second argument to
+        Finit_image_library.
+
+        * lisp.h: Declare Finit_image_library.
+
 2004-06-29  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
-        
-        * macterm.c (do_window_activate, do_window_deactivate): Remove.
-        (XTread_socket): Send mouse button events to the toolbox
-        dispatcher even when the mouse is grabbed.  Don't process window
-        activate events for non-Emacs windows.  Replace function calls to
-        do_window_activate and do_window_deactivate with their contents.
-        Reset mouse grabbing status when a window is deactivated.
+
+        * macterm.c (do_window_activate, do_window_deactivate): Remove.
+        (XTread_socket): Send mouse button events to the toolbox
+        dispatcher even when the mouse is grabbed.  Don't process window
+        activate events for non-Emacs windows.  Replace function calls to
+        do_window_activate and do_window_deactivate with their contents.
+        Reset mouse grabbing status when a window is deactivated.
 
 2004-06-29  Steven Tamm  <steventamm@mac.com>
 
@@ -60,8 +113,7 @@
         a buffer, add the buffer as last element to the match data.
         (Fset_match_data): If an additional element of the match-data is a
         buffer, restore it to last_thing_searched.
-        (save_search_regs): Save last_thing_searched as part of the match
-        data.
+        (save_search_regs): Save last_thing_searched as part of the match data.
         (restore_match_data): Restore it again.
 
 2004-06-23  Luc Teirlinck  <teirllm@auburn.edu>
@@ -187,7 +239,7 @@
 2004-06-14  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * gtkutil.c (xg_get_image_for_pixmap): New function.
-        (xg_get_gdk_pixmap_and_mask): Removed.
+        (xg_get_gdk_pixmap_and_mask): Remove.
         (update_frame_tool_bar): Call xg_get_image_for_pixmap instead of
         xg_get_gdk_pixmap_and_mask.
 
@@ -208,8 +260,7 @@
         list of possible filenames.
         (init_xpm_functions, init_png_functions, init_jpeg_functions)
         (init_tiff_functions, init_gif_functions): Use `w32_delayed_load'.
-        (CHECK_LIB_AVAILABLE): Call `define_image_library' with new
-        argument.
+        (CHECK_LIB_AVAILABLE): Call `define_image_library' with new argument.
         (Finit_image_library): New function, extracted from `init_image'.
         Try to initialize an image library on demand and cache whether we
         were successful or not.
@@ -333,7 +384,7 @@
         (merge_face_ref, face_at_buffer_position, face_at_string_position):
         Use `merge_named_face'.
         (merge_face_inheritance): Function removed.
-        (merge_face_ref): Renamed from `merge_face_vector_with_property'.
+        (merge_face_ref): Rename from `merge_face_vector_with_property'.
         Add new `err_msgs' and `named_merge_points' args.  Return error
         status.  Only print error messages if ERR_MSGS is true.  Don't try to
         do :inherit attribute validation.
@@ -393,8 +444,8 @@
 
         * xfaces.c (x_supports_face_attributes_p): Make this function
         conditional on HAVE_WINDOW_SYSTEM.
-        (Fdisplay_supports_face_attributes_p) [HAVE_WINDOW_SYSTEM]: Don't
-        call x_supports_face_attributes_p if it was not compiled in.
+        (Fdisplay_supports_face_attributes_p) [HAVE_WINDOW_SYSTEM]:
+        Don't call x_supports_face_attributes_p if it was not compiled in.
 
 2004-06-04  Miles Bader  <miles@gnu.org>
 
@@ -425,6 +476,8 @@
 
 2004-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * eval.c (Fcondition_case): Fix usage.  Simplify.
+
         * mem-limits.h (EXCEEDS_LISP_PTR) [USE_LSB_TAG]: Never true.
 
 2004-05-29  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
@@ -433,8 +486,7 @@
         [MAC_OSX]: Don't include QuickTime/QuickTime.h.
         [!MAC_OSX]: Don't include alloca.h, Windows.h, Gestalt.h, or
         TextUtils.h.
-        (Fx_create_frame): Sync with xfns.c.  Initialize cursor
-        descriptors.
+        (Fx_create_frame): Sync with xfns.c.  Initialize cursor descriptors.
         (Fx_display_mm_height, Fx_display_mm_width): Calculate length from
         display height/width.
         (compute_tip_xy, Vx_max_tooltip_size): Declare.
@@ -445,8 +497,7 @@
 
         * macgui.h [!MAC_OSX]: Include Gestalt.h.
         (Cursor, No_Cursor): New defines.
-        [!TARGET_API_MAC_CARBON] (SetPortWindowPort): New compatibility
-        macro.
+        [!TARGET_API_MAC_CARBON] (SetPortWindowPort): New compatibility macro.
         [!TARGET_API_MAC_CARBON] (arrow_cursor): Declare.
 
         * macmenu.c (mac_menu_show, mac_dialog): Use SetPortWindowPort.
@@ -474,11 +525,9 @@
         (x_scroll_bar_handle_click): Set `(PORTION . WHOLE)' part in a
         scroll-bar click event.
         (mac_define_frame_cursor): Change the pointer shape.
-        (x_free_frame_resources): Reset tip_window to NULL when it is
-        disposed.
+        (x_free_frame_resources): Reset tip_window to NULL when it is disposed.
         [!TARGET_API_MAC_CARBON] (arrow_cursor): New variable.
-        [!TARGET_API_MAC_CARBON] (do_init_managers): Initialize
-        arrow_cursor.
+        [!TARGET_API_MAC_CARBON] (do_init_managers): Initialize arrow_cursor.
         (do_window_update): Don't do anything if the updated window is the
         tooltip window.
         (do_mouse_moved): Handle mouse movement events here (previously in
@@ -486,8 +535,8 @@
         dpyinfo->mouse_face_hidden is set.
         (do_os_event, do_events): Remove (now in XTread_socket).
         (XTread_socket): Immediately return if interrupt_input_blocked.
-        Loop until all the events in the queue are processed.  Rearrange
-        codes for mouse grabbing.  Add tooltip support.  Include the
+        Loop until all the events in the queue are processed.
+        Rearrange codes for mouse grabbing.  Add tooltip support.  Include the
         contents of do_os_event and do_events.  Remove mouse movement
         handling (now in do_mouse_moved).  Add the case where
         Vmouse_highlight has an integer value.
@@ -496,8 +545,8 @@
         excess initializations.
         (make_mac_terminal_frame): Previous initializations in
         make_mac_frame are moved here.
-        (mac_initialize_display_info): Initialize
-        dpyinfo->mouse_face_overlay and dpyinfo->mouse_face_hidden.
+        (mac_initialize_display_info):
+        Initialize dpyinfo->mouse_face_overlay and dpyinfo->mouse_face_hidden.
 
         * xdisp.c [MAC_OS] (No_Cursor): Remove variable.
         (define_frame_cursor1): Don't treat HAVE_CARBON as a special case.
diff --git a/src/Makefile.in b/src/Makefile.in
index edfe548ec90..2ec1dad4c2e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -910,7 +910,7 @@ emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp}
    for the first time, this prevents any variation between configurations
    in the contents of the DOC file.
    Likewise for ${SOME_MACHINE_LISP}.  */
-${etc}DOC: ${libsrc}make-docfile ${obj} ${shortlisp} ${SOME_MACHINE_LISP}
+${etc}DOC: ${libsrc}make-docfile${EXEEXT} ${obj} ${shortlisp} ${SOME_MACHINE_LISP}
         -rm -f ${etc}DOC
         ${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC
         ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp}
diff --git a/src/eval.c b/src/eval.c
index 096755f9c77..d7cfe959158 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -657,6 +657,7 @@ usage: (defmacro NAME ARGLIST [DOCSTRING] [DECL] BODY...)  */)
   Lisp_Object lambda_list, doc, tail;
 
   fn_name = Fcar (args);
+  CHECK_SYMBOL (fn_name);
   lambda_list = Fcar (Fcdr (args));
   tail = Fcdr (Fcdr (args));
 
diff --git a/src/fileio.c b/src/fileio.c
index 42f3949c917..a032a179ee1 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -206,6 +206,9 @@ Lisp_Object Vread_file_name_function;
 /* Current predicate used by read_file_name_internal.  */
 Lisp_Object Vread_file_name_predicate;
 
+/* Nonzero means completion ignores case when reading file name.  */
+int read_file_name_completion_ignore_case;
+
 /* Nonzero means, when reading a filename in the minibuffer,
  start out by inserting the default directory into the minibuffer. */
 int insert_default_directory;
@@ -6197,10 +6200,8 @@ provides a file dialog box.  */)
     }
 
   count = SPECPDL_INDEX ();
-#if defined VMS || defined DOS_NT || defined MAC_OSX
-  specbind (intern ("completion-ignore-case"), Qt);
-#endif
-
+  specbind (intern ("completion-ignore-case"),
+            read_file_name_completion_ignore_case ? Qt : Qnil);
   specbind (intern ("minibuffer-completing-file-name"), Qt);
   specbind (intern ("read-file-name-predicate"),
             (NILP (predicate) ? Qfile_exists_p : predicate));
@@ -6436,6 +6437,14 @@ same format as a regular save would use.  */);
                doc: /* Current predicate used by `read-file-name-internal'.  */);
   Vread_file_name_predicate = Qnil;
 
+  DEFVAR_BOOL ("read-file-name-completion-ignore-case", &read_file_name_completion_ignore_case,
+               doc: /* *Non-nil means when reading a file name completion ignores case.  */);
+#if defined VMS || defined DOS_NT || defined MAC_OS
+  read_file_name_completion_ignore_case = 1;
+#else
+  read_file_name_completion_ignore_case = 0;
+#endif
+
   DEFVAR_BOOL ("insert-default-directory", &insert_default_directory,
                doc: /* *Non-nil means when reading a filename start with default dir in minibuffer.
 If the initial minibuffer contents are non-empty, you can usually
diff --git a/src/fontset.c b/src/fontset.c
index 016c62f0e50..4901fc71419 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1,4 +1,5 @@
 /* Fontset handler.
+   Copyright (C) 2004  Free Software Foundation, Inc.
    Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN.
      Licensed to the Free Software Foundation.
    Copyright (C) 2003
diff --git a/src/image.c b/src/image.c
index 438e132807f..4ab672ca58e 100644
--- a/src/image.c
+++ b/src/image.c
@@ -675,7 +675,7 @@ define_image_type (type, loaded)
       success = Qt;
     }
 
-  CACHE_IMAGE_TYPE(*type->type, success);
+  CACHE_IMAGE_TYPE (*type->type, success);
   return success;
 }
 
@@ -690,7 +690,7 @@ lookup_image_type (symbol)
   struct image_type *type;
 
   /* We must initialize the image-type if it hasn't been already.  */
-  if (NILP (Finit_image_library (symbol)))
+  if (NILP (Finit_image_library (symbol, Qnil)))
     return 0;                   /* unimplemented */
 
   for (type = image_types; type; type = type->next)
@@ -7927,10 +7927,10 @@ DEFUN ("lookup-image", Flookup_image, Slookup_image, 1, 1, 0, "")
 #ifdef HAVE_NTGUI
 /* Image types that rely on external libraries are loaded dynamically
    if the library is available.  */
-#define CHECK_LIB_AVAILABLE(image_type, init_lib_fn) \
+#define CHECK_LIB_AVAILABLE(image_type, init_lib_fn, libraries) \
   define_image_type (image_type, init_lib_fn (libraries))
 #else
-#define CHECK_LIB_AVAILABLE(image_type, init_lib_fn) \
+#define CHECK_LIB_AVAILABLE(image_type, init_lib_fn, libraries) \
   define_image_type (image_type, TRUE)
 #endif /* HAVE_NTGUI */
 
@@ -7940,8 +7940,9 @@ Return non-nil if TYPE is a supported image type.
 
 Image types pbm and xbm are prebuilt; other types are loaded here.
 Libraries to load are specified in alist LIBRARIES (usually, the value
-of `image-library-alist', which see.  */)
+of `image-library-alist', which see).  */)
   (type, libraries)
+  Lisp_Object type, libraries;
 {
   Lisp_Object tested;
 
@@ -7952,36 +7953,36 @@ of `image-library-alist', which see.  */)
 
 #if defined (HAVE_XPM) || defined (MAC_OS)
   if (EQ (type, Qxpm))
-    return CHECK_LIB_AVAILABLE(&xpm_type, init_xpm_functions);
+    return CHECK_LIB_AVAILABLE (&xpm_type, init_xpm_functions, libraries);
 #endif
 
 #if defined (HAVE_JPEG) || defined (MAC_OS)
   if (EQ (type, Qjpeg))
-    return CHECK_LIB_AVAILABLE(&jpeg_type, init_jpeg_functions);
+    return CHECK_LIB_AVAILABLE (&jpeg_type, init_jpeg_functions, libraries);
 #endif
 
 #if defined (HAVE_TIFF) || defined (MAC_OS)
   if (EQ (type, Qtiff))
-    return CHECK_LIB_AVAILABLE(&tiff_type, init_tiff_functions);
+    return CHECK_LIB_AVAILABLE (&tiff_type, init_tiff_functions, libraries);
 #endif
 
 #if defined (HAVE_GIF) || defined (MAC_OS)
   if (EQ (type, Qgif))
-    return CHECK_LIB_AVAILABLE(&gif_type, init_gif_functions);
+    return CHECK_LIB_AVAILABLE (&gif_type, init_gif_functions, libraries);
 #endif
 
 #if defined (HAVE_PNG) || defined (MAC_OS)
   if (EQ (type, Qpng))
-    return CHECK_LIB_AVAILABLE(&png_type, init_png_functions);
+    return CHECK_LIB_AVAILABLE (&png_type, init_png_functions, libraries);
 #endif
 
 #ifdef HAVE_GHOSTSCRIPT
   if (EQ (type, Qpostscript))
-    return CHECK_LIB_AVAILABLE(&gs_type, init_gs_functions);
+    return CHECK_LIB_AVAILABLE (&gs_type, init_gs_functions, libraries);
 #endif
 
   /* If the type is not recognized, avoid testing it ever again.  */
-  CACHE_IMAGE_TYPE(type, Qnil);
+  CACHE_IMAGE_TYPE (type, Qnil);
   return Qnil;
 }
 
diff --git a/src/lisp.h b/src/lisp.h
index aba3073dc68..780ee76c271 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2348,6 +2348,7 @@ extern void init_fringe P_ ((void));
 extern void init_fringe_once P_ ((void));
 
 /* Defined in image.c */
+EXFUN (Finit_image_library, 2);
 extern void syms_of_image P_ ((void));
 extern void init_image P_ ((void));
 
diff --git a/src/macterm.c b/src/macterm.c
index 04d6ec3be64..149e37741bc 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -8854,8 +8854,21 @@ mac_initialize_display_info ()
   dpyinfo->color_p = TestDeviceAttribute (main_device_handle, gdDevType);
 #ifdef MAC_OSX
   /* HasDepth returns true if it is possible to have a 32 bit display,
-     but this may not be what is actually used.  Mac OSX can do better.  */
-  dpyinfo->n_planes = CGDisplayBitsPerPixel (CGMainDisplayID ());
+     but this may not be what is actually used.  Mac OSX can do better.
+     CGMainDisplayID is only available on OSX 10.2 and higher, but the
+     header for CGGetActiveDisplayList says that the first display returned
+     is the active one, so we use that.  */
+  {
+    CGDirectDisplayID disp_id[1];
+    CGDisplayCount disp_count;
+    CGDisplayErr error_code;
+
+    error_code = CGGetActiveDisplayList (1, disp_id, &disp_count);
+    if (error_code != 0)
+      error ("No display found, CGGetActiveDisplayList error %d", error_code);
+
+    dpyinfo->n_planes = CGDisplayBitsPerPixel (disp_id[0]);
+  }
 #else
   for (dpyinfo->n_planes = 32; dpyinfo->n_planes > 0; dpyinfo->n_planes >>= 1)
     if (HasDepth (main_device_handle, dpyinfo->n_planes,
diff --git a/src/msdos.c b/src/msdos.c
index d0de02aba3f..0aec39e1440 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -3456,8 +3456,8 @@ dos_rawgetc ()
                 event.code = button_num;
                 event.modifiers = dos_get_modifiers (0)
                   | (press ? down_modifier : up_modifier);
-                event.x = x;
-                event.y = y;
+                event.x = make_number (x);
+                event.y = make_number (y);
                 event.frame_or_window = selected_frame;
                 event.arg = Qnil;
                 event.timestamp = event_timestamp ();
diff --git a/src/search.c b/src/search.c
index bb3f222e2c1..11ff90df014 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1,5 +1,6 @@
 /* String search routines for GNU Emacs.
-   Copyright (C) 1985, 86,87,93,94,97,98, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1985, 86,87,93,94,97,98, 1999, 2004
+             Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2582,7 +2583,7 @@ match_limit (num, beginningp)
   CHECK_NUMBER (num);
   n = XINT (num);
   if (n < 0)
-    args_out_of_range (num, 0);
+    args_out_of_range (num, make_number (0));
   if (search_regs.num_regs <= 0)
     error ("No match data, because no search succeeded");
   if (n >= search_regs.num_regs
@@ -2682,10 +2683,9 @@ Return value is undefined if the last search failed.  */)
         data[2 * i] = data [2 * i + 1] = Qnil;
     }
 
-  if (BUFFERP(last_thing_searched)
-      && ! NILP (integers))
+  if (BUFFERP (last_thing_searched) && !NILP (integers))
     {
-      XSETBUFFER(data[len], last_thing_searched);
+      data[len] = last_thing_searched;
       len++;
     }
 
@@ -2765,9 +2765,9 @@ LIST should have been created by calling `match-data' previously.  */)
     for (i = 0;; i++)
       {
         marker = Fcar (list);
-        if (BUFFERP(marker))
+        if (BUFFERP (marker))
           {
-            XSETBUFFER(last_thing_searched, marker);
+            last_thing_searched = marker;
             break;
           }
         if (i >= length)
diff --git a/src/w32select.c b/src/w32select.c
index cc0ca64fab8..af3d477f876 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -130,6 +130,8 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data,
 
   BLOCK_INPUT;
 
+  /* Include the terminating NULL character in the source of
+     conversion.  */
   nbytes = SBYTES (string) + 1;
   src = SDATA (string);
   dst = src;
diff --git a/src/xfaces.c b/src/xfaces.c
index be9c9af685a..6ee06ba5f76 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5986,7 +5986,7 @@ x_supports_face_attributes_p (f, attrs, def_face)
       face = FACE_FROM_ID (f, face_id);
 
       if (! face)
-        signal_error ("cannot make face", 0);
+        error ("cannot make face");
 
       /* If the font is the same, then not supported.  */
       if (face->font == def_face->font)
@@ -6021,7 +6021,7 @@ tty_supports_face_attributes_p (f, attrs, def_face)
      Lisp_Object *attrs;
      struct face *def_face;
 {
-  int weight, i;
+  int weight;
   Lisp_Object val, fg, bg;
   XColor fg_tty_color, fg_std_color;
   XColor bg_tty_color, bg_std_color;
@@ -6243,7 +6243,7 @@ face for italic. */)
   if (def_face == NULL)
     {
       if (! realize_basic_faces (f))
-        signal_error ("Cannot realize default face", 0);
+        error ("Cannot realize default face");
       def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
     }
 
diff --git a/src/xterm.c b/src/xterm.c
index 3e606e2560a..6eb106e5b3f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3265,7 +3265,6 @@ x_detect_focus_change (dpyinfo, event, bufp)
      struct input_event *bufp;
 {
   struct frame *frame;
-  int nr_events = 0;
 
   frame = x_any_window_to_frame (dpyinfo, event->xany.window);
   if (! frame)
@@ -8223,7 +8222,6 @@ void
 x_calc_absolute_position (f)
      struct frame *f;
 {
-  Window child;
   int win_x = 0, win_y = 0;
   int flags = f->size_hint_flags;