[Emacs-diffs] Changes to emacs/src/w32fns.c [lexbind]

[Miles Bader]

Index: emacs/src/w32fns.c
diff -c emacs/src/w32fns.c:1.173.2.1 emacs/src/w32fns.c:1.173.2.2
*** emacs/src/w32fns.c:1.173.2.1        Fri Apr  4 01:21:04 2003
--- emacs/src/w32fns.c  Tue Oct 14 19:22:47 2003
***************
*** 239,244 ****
--- 239,248 ----
  Lisp_Object Qw32_charset_unicode;
  #endif
  
+ /* Prefix for system colors.  */
+ #define SYSTEM_COLOR_PREFIX "System"
+ #define SYSTEM_COLOR_PREFIX_LEN (sizeof (SYSTEM_COLOR_PREFIX) - 1)
+ 
  /* State variables for emulating a three button mouse. */
  #define LMOUSE 1
  #define MMOUSE 2
***************
*** 253,263 ****
  /* Window that is tracking the mouse.  */
  static HWND track_mouse_window;
  
! typedef BOOL (WINAPI * TrackMouseEvent_Proc) (
!     IN OUT LPTRACKMOUSEEVENT lpEventTrack
!     );
  
! TrackMouseEvent_Proc track_mouse_event_fn=NULL;
  
  /* W95 mousewheel handler */
  unsigned int msh_mousewheel = 0;
--- 257,267 ----
  /* Window that is tracking the mouse.  */
  static HWND track_mouse_window;
  
! typedef BOOL (WINAPI * TrackMouseEvent_Proc)
!   (IN OUT LPTRACKMOUSEEVENT lpEventTrack);
  
! TrackMouseEvent_Proc track_mouse_event_fn = NULL;
! ClipboardSequence_Proc clipboard_sequence_fn = NULL;
  
  /* W95 mousewheel handler */
  unsigned int msh_mousewheel = 0;
***************
*** 655,662 ****
    ClientToScreen (FRAME_W32_WINDOW(f), &pt);
  
    /* Remember x_pixels_diff and y_pixels_diff.  */
!   f->output_data.w32->x_pixels_diff = pt.x - rect.left;
!   f->output_data.w32->y_pixels_diff = pt.y - rect.top;
  
    *xptr = pt.x;
    *yptr = pt.y;
--- 659,666 ----
    ClientToScreen (FRAME_W32_WINDOW(f), &pt);
  
    /* Remember x_pixels_diff and y_pixels_diff.  */
!   f->x_pixels_diff = pt.x - rect.left;
!   f->y_pixels_diff = pt.y - rect.top;
  
    *xptr = pt.x;
    *yptr = pt.y;
***************
*** 1077,1082 ****
--- 1081,1136 ----
    return ret;
  }
  
+ 
+ static void
+ add_system_logical_colors_to_map (system_colors)
+      Lisp_Object *system_colors;
+ {
+   HKEY colors_key;
+ 
+   /* Other registry operations are done with input blocked.  */
+   BLOCK_INPUT;
+ 
+   /* Look for "Control Panel/Colors" under User and Machine registry
+      settings.  */
+   if (RegOpenKeyEx (HKEY_CURRENT_USER, "Control Panel\\Colors", 0,
+                   KEY_READ, &colors_key) == ERROR_SUCCESS
+       || RegOpenKeyEx (HKEY_LOCAL_MACHINE, "Control Panel\\Colors", 0,
+                      KEY_READ, &colors_key) == ERROR_SUCCESS)
+     {
+       /* List all keys.  */
+       char color_buffer[64];
+       char full_name_buffer[MAX_PATH + SYSTEM_COLOR_PREFIX_LEN];
+       int index = 0;
+       DWORD name_size, color_size;
+       char *name_buffer = full_name_buffer + SYSTEM_COLOR_PREFIX_LEN;
+ 
+       name_size = sizeof (full_name_buffer) - SYSTEM_COLOR_PREFIX_LEN;
+       color_size = sizeof (color_buffer);
+ 
+       strcpy (full_name_buffer, SYSTEM_COLOR_PREFIX);
+ 
+       while (RegEnumValueA (colors_key, index, name_buffer, &name_size,
+                           NULL, NULL, color_buffer, &color_size)
+            == ERROR_SUCCESS)
+       {
+         int r, g, b;
+         if (sscanf (color_buffer, " %u %u %u", &r, &g, &b) == 3)
+           *system_colors = Fcons (Fcons (build_string (full_name_buffer),
+                                          make_number (RGB (r, g, b))),
+                                   *system_colors);
+ 
+         name_size = sizeof (full_name_buffer) - SYSTEM_COLOR_PREFIX_LEN;
+         color_size = sizeof (color_buffer);
+         index++;
+       }
+       RegCloseKey (colors_key);
+     }
+ 
+   UNBLOCK_INPUT;
+ }
+ 
+ 
  COLORREF
  x_to_w32_color (colorname)
       char * colorname;
***************
*** 1268,1274 ****
    return ret;
  }
  
- 
  void
  w32_regenerate_palette (FRAME_PTR f)
  {
--- 1322,1327 ----
***************
*** 1769,1775 ****
  
    f->output_data.w32->border_pixel = pix;
  
!   if (FRAME_W32_WINDOW (f) != 0 && f->output_data.w32->border_width > 0)
      {
        if (FRAME_VISIBLE_P (f))
          redraw_frame (f);
--- 1822,1828 ----
  
    f->output_data.w32->border_pixel = pix;
  
!   if (FRAME_W32_WINDOW (f) != 0 && f->border_width > 0)
      {
        if (FRAME_VISIBLE_P (f))
          redraw_frame (f);
***************
*** 1918,1924 ****
        /* Adjust the frame size so that the client (text) dimensions
         remain the same.  This depends on FRAME_EXTERNAL_MENU_BAR being
         set correctly.  */
!       x_set_window_size (f, 0, FRAME_WIDTH (f), FRAME_HEIGHT (f));
        do_pending_window_change (0);
      }
    adjust_glyphs (f);
--- 1971,1977 ----
        /* Adjust the frame size so that the client (text) dimensions
         remain the same.  This depends on FRAME_EXTERNAL_MENU_BAR being
         set correctly.  */
!       x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f));
        do_pending_window_change (0);
      }
    adjust_glyphs (f);
***************
*** 1956,1962 ****
  
    /* Don't resize the tool-bar to more than we have room for.  */
    root_window = FRAME_ROOT_WINDOW (f);
!   root_height = XINT (XWINDOW (root_window)->height);
    if (root_height - delta < 1)
      {
        delta = root_height - 1;
--- 2009,2015 ----
  
    /* Don't resize the tool-bar to more than we have room for.  */
    root_window = FRAME_ROOT_WINDOW (f);
!   root_height = WINDOW_TOTAL_LINES (XWINDOW (root_window));
    if (root_height - delta < 1)
      {
        delta = root_height - 1;
***************
*** 1987,1994 ****
    if (delta < 0)
      {
        int height = FRAME_INTERNAL_BORDER_WIDTH (f);
!       int width = PIXEL_WIDTH (f);
!       int y = nlines * CANON_Y_UNIT (f);
  
        BLOCK_INPUT;
        {
--- 2040,2047 ----
    if (delta < 0)
      {
        int height = FRAME_INTERNAL_BORDER_WIDTH (f);
!       int width = FRAME_PIXEL_WIDTH (f);
!       int y = nlines * FRAME_LINE_HEIGHT (f);
  
        BLOCK_INPUT;
        {
***************
*** 2134,2144 ****
  void x_set_scroll_bar_default_width (f)
       struct frame *f;
  {
!   int wid = FONT_WIDTH (f->output_data.w32->font);
  
!   FRAME_SCROLL_BAR_PIXEL_WIDTH (f) = GetSystemMetrics (SM_CXVSCROLL);
!   FRAME_SCROLL_BAR_COLS (f) = (FRAME_SCROLL_BAR_PIXEL_WIDTH (f) +
!                              wid - 1) / wid;
  }
  
  
--- 2187,2197 ----
  void x_set_scroll_bar_default_width (f)
       struct frame *f;
  {
!   int wid = FRAME_COLUMN_WIDTH (f);
  
!   FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = GetSystemMetrics (SM_CXVSCROLL);
!   FRAME_CONFIG_SCROLL_BAR_COLS (f) = (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) +
!                                     wid - 1) / wid;
  }
  
  
***************
*** 2231,2238 ****
    RECT rect;
  
    rect.left = rect.top = 0;
!   rect.right = PIXEL_WIDTH (f);
!   rect.bottom = PIXEL_HEIGHT (f);
  
    AdjustWindowRect (&rect, f->output_data.w32->dwStyle,
                    FRAME_EXTERNAL_MENU_BAR (f));
--- 2284,2291 ----
    RECT rect;
  
    rect.left = rect.top = 0;
!   rect.right = FRAME_PIXEL_WIDTH (f);
!   rect.bottom = FRAME_PIXEL_HEIGHT (f);
  
    AdjustWindowRect (&rect, f->output_data.w32->dwStyle,
                    FRAME_EXTERNAL_MENU_BAR (f));
***************
*** 2248,2255 ****
      = CreateWindow (EMACS_CLASS,
                    f->namebuf,
                    f->output_data.w32->dwStyle | WS_CLIPCHILDREN,
!                   f->output_data.w32->left_pos,
!                   f->output_data.w32->top_pos,
                    rect.right - rect.left,
                    rect.bottom - rect.top,
                    NULL,
--- 2301,2308 ----
      = CreateWindow (EMACS_CLASS,
                    f->namebuf,
                    f->output_data.w32->dwStyle | WS_CLIPCHILDREN,
!                   f->left_pos,
!                   f->top_pos,
                    rect.right - rect.left,
                    rect.bottom - rect.top,
                    NULL,
***************
*** 2259,2268 ****
  
    if (hwnd)
      {
!       SetWindowLong (hwnd, WND_FONTWIDTH_INDEX, FONT_WIDTH 
(f->output_data.w32->font));
!       SetWindowLong (hwnd, WND_LINEHEIGHT_INDEX, 
f->output_data.w32->line_height);
!       SetWindowLong (hwnd, WND_BORDER_INDEX, 
f->output_data.w32->internal_border_width);
!       SetWindowLong (hwnd, WND_SCROLLBAR_INDEX, 
f->output_data.w32->vertical_scroll_bar_extra);
        SetWindowLong (hwnd, WND_BACKGROUND_INDEX, FRAME_BACKGROUND_PIXEL (f));
  
        /* Enable drag-n-drop.  */
--- 2312,2321 ----
  
    if (hwnd)
      {
!       SetWindowLong (hwnd, WND_FONTWIDTH_INDEX, FRAME_COLUMN_WIDTH (f));
!       SetWindowLong (hwnd, WND_LINEHEIGHT_INDEX, FRAME_LINE_HEIGHT (f));
!       SetWindowLong (hwnd, WND_BORDER_INDEX, FRAME_INTERNAL_BORDER_WIDTH (f));
!       SetWindowLong (hwnd, WND_SCROLLBAR_INDEX, f->scroll_bar_actual_width);
        SetWindowLong (hwnd, WND_BACKGROUND_INDEX, FRAME_BACKGROUND_PIXEL (f));
  
        /* Enable drag-n-drop.  */
***************
*** 4014,4021 ****
    RECT rect;
  
    rect.left = rect.top = 0;
!   rect.right = PIXEL_WIDTH (f);
!   rect.bottom = PIXEL_HEIGHT (f);
  
    AdjustWindowRect (&rect, f->output_data.w32->dwStyle,
                    FRAME_EXTERNAL_MENU_BAR (f));
--- 4067,4074 ----
    RECT rect;
  
    rect.left = rect.top = 0;
!   rect.right = FRAME_PIXEL_WIDTH (f);
!   rect.bottom = FRAME_PIXEL_HEIGHT (f);
  
    AdjustWindowRect (&rect, f->output_data.w32->dwStyle,
                    FRAME_EXTERNAL_MENU_BAR (f));
***************
*** 4024,4031 ****
      = CreateWindow (EMACS_CLASS,
                    f->namebuf,
                    f->output_data.w32->dwStyle,
!                   f->output_data.w32->left_pos,
!                   f->output_data.w32->top_pos,
                    rect.right - rect.left,
                    rect.bottom - rect.top,
                    FRAME_W32_WINDOW (SELECTED_FRAME ()), /* owner */
--- 4077,4084 ----
      = CreateWindow (EMACS_CLASS,
                    f->namebuf,
                    f->output_data.w32->dwStyle,
!                   f->left_pos,
!                   f->top_pos,
                    rect.right - rect.left,
                    rect.bottom - rect.top,
                    FRAME_W32_WINDOW (SELECTED_FRAME ()), /* owner */
***************
*** 4035,4043 ****
  
    if (tip_window)
      {
!       SetWindowLong (tip_window, WND_FONTWIDTH_INDEX, FONT_WIDTH 
(f->output_data.w32->font));
!       SetWindowLong (tip_window, WND_LINEHEIGHT_INDEX, 
f->output_data.w32->line_height);
!       SetWindowLong (tip_window, WND_BORDER_INDEX, 
f->output_data.w32->internal_border_width);
        SetWindowLong (tip_window, WND_BACKGROUND_INDEX, FRAME_BACKGROUND_PIXEL 
(f));
  
        /* Tip frames have no scrollbars.  */
--- 4088,4096 ----
  
    if (tip_window)
      {
!       SetWindowLong (tip_window, WND_FONTWIDTH_INDEX, FRAME_COLUMN_WIDTH (f));
!       SetWindowLong (tip_window, WND_LINEHEIGHT_INDEX, FRAME_LINE_HEIGHT (f));
!       SetWindowLong (tip_window, WND_BORDER_INDEX, 
FRAME_INTERNAL_BORDER_WIDTH (f));
        SetWindowLong (tip_window, WND_BACKGROUND_INDEX, FRAME_BACKGROUND_PIXEL 
(f));
  
        /* Tip frames have no scrollbars.  */
***************
*** 4154,4160 ****
       Note that many default values are used.  */
  
    /* Normal video */
!   gc_values.font = f->output_data.w32->font;
  
    /* Cursor has cursor-color background, background-color foreground.  */
    gc_values.foreground = FRAME_BACKGROUND_PIXEL (f);
--- 4207,4213 ----
       Note that many default values are used.  */
  
    /* Normal video */
!   gc_values.font = FRAME_FONT (f);
  
    /* Cursor has cursor-color background, background-color foreground.  */
    gc_values.foreground = FRAME_BACKGROUND_PIXEL (f);
***************
*** 4286,4292 ****
    FRAME_CAN_HAVE_SCROLL_BARS (f) = 1;
  
    /* By default, make scrollbars the system standard width. */
!   f->scroll_bar_pixel_width = GetSystemMetrics (SM_CXVSCROLL);
  
    f->output_method = output_w32;
    f->output_data.w32 =
--- 4339,4345 ----
    FRAME_CAN_HAVE_SCROLL_BARS (f) = 1;
  
    /* By default, make scrollbars the system standard width. */
!   FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = GetSystemMetrics (SM_CXVSCROLL);
  
    f->output_method = output_w32;
    f->output_data.w32 =
***************
*** 4466,4479 ****
    x_default_parameter (f, parms, Qscroll_bar_width, Qnil,
                       "scrollBarWidth", "ScrollBarWidth", RES_TYPE_NUMBER);
  
!   /* Dimensions, especially f->height, must be done via change_frame_size.
       Change will not be effected unless different from the current
!      f->height.  */
!   width = f->width;
!   height = f->height;
  
!   f->height = 0;
!   SET_FRAME_WIDTH (f, 0);
    change_frame_size (f, height, width, 1, 0, 0);
  
    /* Tell the server what size and position, etc, we want, and how
--- 4519,4532 ----
    x_default_parameter (f, parms, Qscroll_bar_width, Qnil,
                       "scrollBarWidth", "ScrollBarWidth", RES_TYPE_NUMBER);
  
!   /* Dimensions, especially FRAME_LINES (f), must be done via 
change_frame_size.
       Change will not be effected unless different from the current
!      FRAME_LINES (f).  */
!   width = FRAME_COLS (f);
!   height = FRAME_LINES (f);
  
!   FRAME_LINES (f) = 0;
!   SET_FRAME_COLS (f, 0);
    change_frame_size (f, height, width, 1, 0, 0);
  
    /* Tell the server what size and position, etc, we want, and how
***************
*** 4731,4736 ****
--- 4784,4790 ----
  
      /* Now fill in the slots of *FONTP.  */
      BLOCK_INPUT;
+     bzero (fontp, sizeof (*fontp));
      fontp->font = font;
      fontp->font_idx = i;
      fontp->name = (char *) xmalloc (strlen (fontname) + 1);
***************
*** 6658,6685 ****
  x_pixel_width (f)
       register struct frame *f;
  {
!   return PIXEL_WIDTH (f);
  }
  
  int
  x_pixel_height (f)
       register struct frame *f;
  {
!   return PIXEL_HEIGHT (f);
  }
  
  int
  x_char_width (f)
       register struct frame *f;
  {
!   return FONT_WIDTH (f->output_data.w32->font);
  }
  
  int
  x_char_height (f)
       register struct frame *f;
  {
!   return f->output_data.w32->line_height;
  }
  
  int
--- 6712,6739 ----
  x_pixel_width (f)
       register struct frame *f;
  {
!   return FRAME_PIXEL_WIDTH (f);
  }
  
  int
  x_pixel_height (f)
       register struct frame *f;
  {
!   return FRAME_PIXEL_HEIGHT (f);
  }
  
  int
  x_char_width (f)
       register struct frame *f;
  {
!   return FRAME_COLUMN_WIDTH (f);
  }
  
  int
  x_char_height (f)
       register struct frame *f;
  {
!   return FRAME_LINE_HEIGHT (f);
  }
  
  int
***************
*** 6774,6779 ****
--- 6828,6836 ----
    if (NILP (Vw32_color_map))
      Vw32_color_map = Fw32_default_color_map ();
  
+   /* Merge in system logical colors.  */
+   add_system_logical_colors_to_map (&Vw32_color_map);
+ 
    if (! NILP (xrm_string))
      xrm_option = (unsigned char *) SDATA (xrm_string);
    else
***************
*** 7244,7251 ****
        int height = img->height + 2 * img->vmargin;
  
        if (NILP (pixels))
!       size = Fcons (make_float ((double) width / CANON_X_UNIT (f)),
!                     make_float ((double) height / CANON_Y_UNIT (f)));
        else
        size = Fcons (make_number (width), make_number (height));
      }
--- 7301,7308 ----
        int height = img->height + 2 * img->vmargin;
  
        if (NILP (pixels))
!       size = Fcons (make_float ((double) width / FRAME_COLUMN_WIDTH (f)),
!                     make_float ((double) height / FRAME_LINE_HEIGHT (f)));
        else
        size = Fcons (make_number (width), make_number (height));
      }
***************
*** 12731,12737 ****
    XSETFRAME (frame, f);
  
    buffer = Fget_buffer_create (build_string (" *tip*"));
!   Fset_window_buffer (FRAME_ROOT_WINDOW (f), buffer);
    old_buffer = current_buffer;
    set_buffer_internal_1 (XBUFFER (buffer));
    current_buffer->truncate_lines = Qnil;
--- 12788,12794 ----
    XSETFRAME (frame, f);
  
    buffer = Fget_buffer_create (build_string (" *tip*"));
!   Fset_window_buffer (FRAME_ROOT_WINDOW (f), buffer, Qnil);
    old_buffer = current_buffer;
    set_buffer_internal_1 (XBUFFER (buffer));
    current_buffer->truncate_lines = Qnil;
***************
*** 12858,12867 ****
    window_prompting = x_figure_window_size (f, parms, 0);
  
    /* No fringes on tip frame.  */
!   f->output_data.w32->fringes_extra = 0;
!   f->output_data.w32->fringe_cols = 0;
!   f->output_data.w32->left_fringe_width = 0;
!   f->output_data.w32->right_fringe_width = 0;
  
    BLOCK_INPUT;
    my_create_tip_window (f);
--- 12915,12923 ----
    window_prompting = x_figure_window_size (f, parms, 0);
  
    /* No fringes on tip frame.  */
!   f->fringe_cols = 0;
!   f->left_fringe_width = 0;
!   f->right_fringe_width = 0;
  
    BLOCK_INPUT;
    my_create_tip_window (f);
***************
*** 12876,12888 ****
    x_default_parameter (f, parms, Qcursor_type, Qbox,
                       "cursorType", "CursorType", RES_TYPE_SYMBOL);
  
!   /* Dimensions, especially f->height, must be done via change_frame_size.
       Change will not be effected unless different from the current
!      f->height.  */
!   width = f->width;
!   height = f->height;
!   f->height = 0;
!   SET_FRAME_WIDTH (f, 0);
    change_frame_size (f, height, width, 1, 0, 0);
  
    /* Add `tooltip' frame parameter's default value. */
--- 12932,12944 ----
    x_default_parameter (f, parms, Qcursor_type, Qbox,
                       "cursorType", "CursorType", RES_TYPE_SYMBOL);
  
!   /* Dimensions, especially FRAME_LINES (f), must be done via 
change_frame_size.
       Change will not be effected unless different from the current
!      FRAME_LINES (f).  */
!   width = FRAME_COLS (f);
!   height = FRAME_LINES (f);
!   FRAME_LINES (f) = 0;
!   SET_FRAME_COLS (f, 0);
    change_frame_size (f, height, width, 1, 0, 0);
  
    /* Add `tooltip' frame parameter's default value. */
***************
*** 13071,13078 ****
            }
  
          BLOCK_INPUT;
!         compute_tip_xy (f, parms, dx, dy, PIXEL_WIDTH (f),
!                         PIXEL_HEIGHT (f), &root_x, &root_y);
  
          /* Put tooltip in topmost group and in position.  */
          SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOPMOST,
--- 13127,13134 ----
            }
  
          BLOCK_INPUT;
!         compute_tip_xy (f, parms, dx, dy, FRAME_PIXEL_WIDTH (f),
!                         FRAME_PIXEL_HEIGHT (f), &root_x, &root_y);
  
          /* Put tooltip in topmost group and in position.  */
          SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOPMOST,
***************
*** 13120,13126 ****
  
    /* Set up the frame's root window.  */
    w = XWINDOW (FRAME_ROOT_WINDOW (f));
!   w->left = w->top = make_number (0);
  
    if (CONSP (Vx_max_tooltip_size)
        && INTEGERP (XCAR (Vx_max_tooltip_size))
--- 13176,13182 ----
  
    /* Set up the frame's root window.  */
    w = XWINDOW (FRAME_ROOT_WINDOW (f));
!   w->left_col = w->top_line = make_number (0);
  
    if (CONSP (Vx_max_tooltip_size)
        && INTEGERP (XCAR (Vx_max_tooltip_size))
***************
*** 13128,13143 ****
        && INTEGERP (XCDR (Vx_max_tooltip_size))
        && XINT (XCDR (Vx_max_tooltip_size)) > 0)
      {
!       w->width = XCAR (Vx_max_tooltip_size);
!       w->height = XCDR (Vx_max_tooltip_size);
      }
    else
      {
!       w->width = make_number (80);
!       w->height = make_number (40);
      }
  
!   f->window_width = XINT (w->width);
    adjust_glyphs (f);
    w->pseudo_window_p = 1;
  
--- 13184,13199 ----
        && INTEGERP (XCDR (Vx_max_tooltip_size))
        && XINT (XCDR (Vx_max_tooltip_size)) > 0)
      {
!       w->total_cols = XCAR (Vx_max_tooltip_size);
!       w->total_lines = XCDR (Vx_max_tooltip_size);
      }
    else
      {
!       w->total_cols = make_number (80);
!       w->total_lines = make_number (40);
      }
  
!   FRAME_TOTAL_COLS (f) = XINT (w->total_cols);
    adjust_glyphs (f);
    w->pseudo_window_p = 1;
  
***************
*** 14208,14222 ****
  w32-charset-ansi, w32-charset-default, w32-charset-symbol,
  w32-charset-shiftjis, w32-charset-hangeul, w32-charset-gb2312,
  w32-charset-chinesebig5,
- #ifdef JOHAB_CHARSET
  w32-charset-johab, w32-charset-hebrew,
  w32-charset-arabic, w32-charset-greek, w32-charset-turkish,
  w32-charset-vietnamese, w32-charset-thai, w32-charset-easteurope,
  w32-charset-russian, w32-charset-mac, w32-charset-baltic,
- #endif
- #ifdef UNICODE_CHARSET
  w32-charset-unicode,
- #endif
  or w32-charset-oem.
  CODEPAGE should be an integer specifying the codepage that should be used
  to display the character set, t to do no translation and output as Unicode,
--- 14264,14274 ----
***************
*** 14400,14410 ****
    defsubr (&Simage_size);
    defsubr (&Simage_mask_p);
  
- #if GLYPH_DEBUG
-   defsubr (&Simagep);
-   defsubr (&Slookup_image);
- #endif
- 
    hourglass_atimer = NULL;
    hourglass_shown_p = 0;
    defsubr (&Sx_show_tip);
--- 14452,14457 ----
***************
*** 14432,14442 ****
  void globals_of_w32fns ()
  {
    HMODULE user32_lib = GetModuleHandle ("user32.dll");
!       /*
!               TrackMouseEvent not available in all versions of Windows, so 
must load
!               it dynamically.  Do it once, here, instead of every time it is 
used.
    */
!   track_mouse_event_fn = (TrackMouseEvent_Proc) GetProcAddress (user32_lib, 
"TrackMouseEvent");
  }
  
  /* Initialize image types. Based on which libraries are available.  */
--- 14479,14493 ----
  void globals_of_w32fns ()
  {
    HMODULE user32_lib = GetModuleHandle ("user32.dll");
!   /*
!     TrackMouseEvent not available in all versions of Windows, so must load
!     it dynamically.  Do it once, here, instead of every time it is used.
    */
!   track_mouse_event_fn = (TrackMouseEvent_Proc)
!     GetProcAddress (user32_lib, "TrackMouseEvent");
!   /* ditto for GetClipboardSequenceNumber.  */
!   clipboard_sequence_fn = (ClipboardSequence_Proc)
!     GetProcAddress (user32_lib, "GetClipboardSequenceNumber");
  }
  
  /* Initialize image types. Based on which libraries are available.  */
***************
*** 14549,14551 ****
--- 14600,14605 ----
  {
    return GetLastError ();
  }
+ 
+ /* arch-tag: 707589ab-b9be-4638-8cdd-74629cc9b446
+    (do not change this comment) */