/[emacs]/emacs/src/w32fns.c
ViewVC logotype

Diff of /emacs/src/w32fns.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.129 by jasonr, Tue Oct 30 22:22:04 2001 UTC revision 1.130 by pj, Fri Nov 2 20:45:57 2001 UTC
# Line 342  check_x_frame (frame) Line 342  check_x_frame (frame)
342    
343    if (NILP (frame))    if (NILP (frame))
344      frame = selected_frame;      frame = selected_frame;
345    CHECK_LIVE_FRAME (frame, 0);    CHECK_LIVE_FRAME (frame);
346    f = XFRAME (frame);    f = XFRAME (frame);
347    if (! FRAME_W32_P (f))    if (! FRAME_W32_P (f))
348      error ("non-w32 frame used");      error ("non-w32 frame used");
# Line 372  check_x_display_info (frame) Line 372  check_x_display_info (frame)
372      {      {
373        FRAME_PTR f;        FRAME_PTR f;
374    
375        CHECK_LIVE_FRAME (frame, 0);        CHECK_LIVE_FRAME (frame);
376        f = XFRAME (frame);        f = XFRAME (frame);
377        if (! FRAME_W32_P (f))        if (! FRAME_W32_P (f))
378          error ("non-w32 frame used");          error ("non-w32 frame used");
# Line 1079  The original entry's RGB ref is returned Line 1079  The original entry's RGB ref is returned
1079    Lisp_Object oldrgb = Qnil;    Lisp_Object oldrgb = Qnil;
1080    Lisp_Object entry;    Lisp_Object entry;
1081    
1082    CHECK_NUMBER (red, 0);    CHECK_NUMBER (red);
1083    CHECK_NUMBER (green, 0);    CHECK_NUMBER (green);
1084    CHECK_NUMBER (blue, 0);    CHECK_NUMBER (blue);
1085    CHECK_STRING (name, 0);    CHECK_STRING (name);
1086    
1087    XSET (rgb, Lisp_Int, RGB(XUINT (red), XUINT (green), XUINT (blue)));    XSET (rgb, Lisp_Int, RGB(XUINT (red), XUINT (green), XUINT (blue)));
1088    
# Line 1120  where R,G,B are numbers between 0 and 25 Line 1120  where R,G,B are numbers between 0 and 25
1120    Lisp_Object cmap = Qnil;    Lisp_Object cmap = Qnil;
1121    Lisp_Object abspath;    Lisp_Object abspath;
1122    
1123    CHECK_STRING (filename, 0);    CHECK_STRING (filename);
1124    abspath = Fexpand_file_name (filename, Qnil);    abspath = Fexpand_file_name (filename, Qnil);
1125    
1126    fp = fopen (XSTRING (filename)->data, "rt");    fp = fopen (XSTRING (filename)->data, "rt");
# Line 1432  w32_to_x_color (rgb) Line 1432  w32_to_x_color (rgb)
1432  {  {
1433    Lisp_Object color;    Lisp_Object color;
1434        
1435    CHECK_NUMBER (rgb, 0);    CHECK_NUMBER (rgb);
1436        
1437    BLOCK_INPUT;    BLOCK_INPUT;
1438        
# Line 1891  x_decode_color (f, arg, def) Line 1891  x_decode_color (f, arg, def)
1891  {  {
1892    XColor cdef;    XColor cdef;
1893    
1894    CHECK_STRING (arg, 0);    CHECK_STRING (arg);
1895    
1896    if (strcmp (XSTRING (arg)->data, "black") == 0)    if (strcmp (XSTRING (arg)->data, "black") == 0)
1897      return BLACK_PIX_DEFAULT (f);      return BLACK_PIX_DEFAULT (f);
# Line 2029  x_set_mouse_color (f, arg, oldval) Line 2029  x_set_mouse_color (f, arg, oldval)
2029    
2030    if (!EQ (Qnil, Vx_pointer_shape))    if (!EQ (Qnil, Vx_pointer_shape))
2031      {      {
2032        CHECK_NUMBER (Vx_pointer_shape, 0);        CHECK_NUMBER (Vx_pointer_shape);
2033        cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XINT (Vx_pointer_shape));        cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XINT (Vx_pointer_shape));
2034      }      }
2035    else    else
# Line 2038  x_set_mouse_color (f, arg, oldval) Line 2038  x_set_mouse_color (f, arg, oldval)
2038    
2039    if (!EQ (Qnil, Vx_nontext_pointer_shape))    if (!EQ (Qnil, Vx_nontext_pointer_shape))
2040      {      {
2041        CHECK_NUMBER (Vx_nontext_pointer_shape, 0);        CHECK_NUMBER (Vx_nontext_pointer_shape);
2042        nontext_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f),        nontext_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f),
2043                                            XINT (Vx_nontext_pointer_shape));                                            XINT (Vx_nontext_pointer_shape));
2044      }      }
# Line 2048  x_set_mouse_color (f, arg, oldval) Line 2048  x_set_mouse_color (f, arg, oldval)
2048    
2049    if (!EQ (Qnil, Vx_hourglass_pointer_shape))    if (!EQ (Qnil, Vx_hourglass_pointer_shape))
2050      {      {
2051        CHECK_NUMBER (Vx_hourglass_pointer_shape, 0);        CHECK_NUMBER (Vx_hourglass_pointer_shape);
2052        hourglass_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f),        hourglass_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f),
2053                                              XINT (Vx_hourglass_pointer_shape));                                              XINT (Vx_hourglass_pointer_shape));
2054      }      }
# Line 2059  x_set_mouse_color (f, arg, oldval) Line 2059  x_set_mouse_color (f, arg, oldval)
2059    x_check_errors (FRAME_W32_DISPLAY (f), "bad nontext pointer cursor: %s");    x_check_errors (FRAME_W32_DISPLAY (f), "bad nontext pointer cursor: %s");
2060    if (!EQ (Qnil, Vx_mode_pointer_shape))    if (!EQ (Qnil, Vx_mode_pointer_shape))
2061      {      {
2062        CHECK_NUMBER (Vx_mode_pointer_shape, 0);        CHECK_NUMBER (Vx_mode_pointer_shape);
2063        mode_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f),        mode_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f),
2064                                         XINT (Vx_mode_pointer_shape));                                         XINT (Vx_mode_pointer_shape));
2065      }      }
# Line 2069  x_set_mouse_color (f, arg, oldval) Line 2069  x_set_mouse_color (f, arg, oldval)
2069    
2070    if (!EQ (Qnil, Vx_sensitive_text_pointer_shape))    if (!EQ (Qnil, Vx_sensitive_text_pointer_shape))
2071      {      {
2072        CHECK_NUMBER (Vx_sensitive_text_pointer_shape, 0);        CHECK_NUMBER (Vx_sensitive_text_pointer_shape);
2073        cross_cursor        cross_cursor
2074          = XCreateFontCursor (FRAME_W32_DISPLAY (f),          = XCreateFontCursor (FRAME_W32_DISPLAY (f),
2075                               XINT (Vx_sensitive_text_pointer_shape));                               XINT (Vx_sensitive_text_pointer_shape));
# Line 2079  x_set_mouse_color (f, arg, oldval) Line 2079  x_set_mouse_color (f, arg, oldval)
2079    
2080    if (!NILP (Vx_window_horizontal_drag_shape))    if (!NILP (Vx_window_horizontal_drag_shape))
2081      {      {
2082        CHECK_NUMBER (Vx_window_horizontal_drag_shape, 0);        CHECK_NUMBER (Vx_window_horizontal_drag_shape);
2083        horizontal_drag_cursor        horizontal_drag_cursor
2084          = XCreateFontCursor (FRAME_X_DISPLAY (f),          = XCreateFontCursor (FRAME_X_DISPLAY (f),
2085                               XINT (Vx_window_horizontal_drag_shape));                               XINT (Vx_window_horizontal_drag_shape));
# Line 2222  x_set_border_color (f, arg, oldval) Line 2222  x_set_border_color (f, arg, oldval)
2222  {  {
2223    int pix;    int pix;
2224    
2225    CHECK_STRING (arg, 0);    CHECK_STRING (arg);
2226    pix = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));    pix = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
2227    x_set_border_pixel (f, pix);    x_set_border_pixel (f, pix);
2228    update_face_from_frame_parameter (f, Qborder_color, arg);    update_face_from_frame_parameter (f, Qborder_color, arg);
# Line 2384  x_set_font (f, arg, oldval) Line 2384  x_set_font (f, arg, oldval)
2384    Lisp_Object frame;    Lisp_Object frame;
2385    int old_fontset = FRAME_FONTSET(f);    int old_fontset = FRAME_FONTSET(f);
2386    
2387    CHECK_STRING (arg, 1);    CHECK_STRING (arg);
2388    
2389    fontset_name = Fquery_fontset (arg, Qnil);    fontset_name = Fquery_fontset (arg, Qnil);
2390    
# Line 2435  x_set_border_width (f, arg, oldval) Line 2435  x_set_border_width (f, arg, oldval)
2435       struct frame *f;       struct frame *f;
2436       Lisp_Object arg, oldval;       Lisp_Object arg, oldval;
2437  {  {
2438    CHECK_NUMBER (arg, 0);    CHECK_NUMBER (arg);
2439    
2440    if (XINT (arg) == f->output_data.w32->border_width)    if (XINT (arg) == f->output_data.w32->border_width)
2441      return;      return;
# Line 2453  x_set_internal_border_width (f, arg, old Line 2453  x_set_internal_border_width (f, arg, old
2453  {  {
2454    int old = f->output_data.w32->internal_border_width;    int old = f->output_data.w32->internal_border_width;
2455    
2456    CHECK_NUMBER (arg, 0);    CHECK_NUMBER (arg);
2457    f->output_data.w32->internal_border_width = XINT (arg);    f->output_data.w32->internal_border_width = XINT (arg);
2458    if (f->output_data.w32->internal_border_width < 0)    if (f->output_data.w32->internal_border_width < 0)
2459      f->output_data.w32->internal_border_width = 0;      f->output_data.w32->internal_border_width = 0;
# Line 2675  x_set_name (f, name, explicit) Line 2675  x_set_name (f, name, explicit)
2675        name = build_string (FRAME_W32_DISPLAY_INFO (f)->w32_id_name);        name = build_string (FRAME_W32_DISPLAY_INFO (f)->w32_id_name);
2676      }      }
2677    else    else
2678      CHECK_STRING (name, 0);      CHECK_STRING (name);
2679    
2680    /* Don't change the name if it's already NAME.  */    /* Don't change the name if it's already NAME.  */
2681    if (! NILP (Fstring_equal (name, f->name)))    if (! NILP (Fstring_equal (name, f->name)))
# Line 2931  and the class is `Emacs.CLASS.SUBCLASS'. Line 2931  and the class is `Emacs.CLASS.SUBCLASS'.
2931    char *name_key;    char *name_key;
2932    char *class_key;    char *class_key;
2933    
2934    CHECK_STRING (attribute, 0);    CHECK_STRING (attribute);
2935    CHECK_STRING (class, 0);    CHECK_STRING (class);
2936    
2937    if (!NILP (component))    if (!NILP (component))
2938      CHECK_STRING (component, 1);      CHECK_STRING (component);
2939    if (!NILP (subclass))    if (!NILP (subclass))
2940      CHECK_STRING (subclass, 2);      CHECK_STRING (subclass);
2941    if (NILP (component) != NILP (subclass))    if (NILP (component) != NILP (subclass))
2942      error ("x-get-resource: must specify both COMPONENT and SUBCLASS or neither");      error ("x-get-resource: must specify both COMPONENT and SUBCLASS or neither");
2943    
# Line 3140  or a list (- N) meaning -N pixels relati Line 3140  or a list (- N) meaning -N pixels relati
3140    unsigned int width, height;    unsigned int width, height;
3141    Lisp_Object result;    Lisp_Object result;
3142    
3143    CHECK_STRING (string, 0);    CHECK_STRING (string);
3144    
3145    geometry = XParseGeometry ((char *) XSTRING (string)->data,    geometry = XParseGeometry ((char *) XSTRING (string)->data,
3146                               &x, &y, &width, &height);                               &x, &y, &width, &height);
# Line 3218  x_figure_window_size (f, parms) Line 3218  x_figure_window_size (f, parms)
3218      {      {
3219        if (!EQ (tem0, Qunbound))        if (!EQ (tem0, Qunbound))
3220          {          {
3221            CHECK_NUMBER (tem0, 0);            CHECK_NUMBER (tem0);
3222            f->height = XINT (tem0);            f->height = XINT (tem0);
3223          }          }
3224        if (!EQ (tem1, Qunbound))        if (!EQ (tem1, Qunbound))
3225          {          {
3226            CHECK_NUMBER (tem1, 0);            CHECK_NUMBER (tem1);
3227            SET_FRAME_WIDTH (f, XINT (tem1));            SET_FRAME_WIDTH (f, XINT (tem1));
3228          }          }
3229        if (!NILP (tem2) && !EQ (tem2, Qunbound))        if (!NILP (tem2) && !EQ (tem2, Qunbound))
# Line 3270  x_figure_window_size (f, parms) Line 3270  x_figure_window_size (f, parms)
3270          f->output_data.w32->top_pos = 0;          f->output_data.w32->top_pos = 0;
3271        else        else
3272          {          {
3273            CHECK_NUMBER (tem0, 0);            CHECK_NUMBER (tem0);
3274            f->output_data.w32->top_pos = XINT (tem0);            f->output_data.w32->top_pos = XINT (tem0);
3275            if (f->output_data.w32->top_pos < 0)            if (f->output_data.w32->top_pos < 0)
3276              window_prompting |= YNegative;              window_prompting |= YNegative;
# Line 3298  x_figure_window_size (f, parms) Line 3298  x_figure_window_size (f, parms)
3298          f->output_data.w32->left_pos = 0;          f->output_data.w32->left_pos = 0;
3299        else        else
3300          {          {
3301            CHECK_NUMBER (tem1, 0);            CHECK_NUMBER (tem1);
3302            f->output_data.w32->left_pos = XINT (tem1);            f->output_data.w32->left_pos = XINT (tem1);
3303            if (f->output_data.w32->left_pos < 0)            if (f->output_data.w32->left_pos < 0)
3304              window_prompting |= XNegative;              window_prompting |= XNegative;
# Line 5095  x_icon (f, parms) Line 5095  x_icon (f, parms)
5095    icon_y = w32_get_arg (parms, Qicon_top, 0, 0, RES_TYPE_NUMBER);    icon_y = w32_get_arg (parms, Qicon_top, 0, 0, RES_TYPE_NUMBER);
5096    if (!EQ (icon_x, Qunbound) && !EQ (icon_y, Qunbound))    if (!EQ (icon_x, Qunbound) && !EQ (icon_y, Qunbound))
5097      {      {
5098        CHECK_NUMBER (icon_x, 0);        CHECK_NUMBER (icon_x);
5099        CHECK_NUMBER (icon_y, 0);        CHECK_NUMBER (icon_y);
5100      }      }
5101    else if (!EQ (icon_x, Qunbound) || !EQ (icon_y, Qunbound))    else if (!EQ (icon_x, Qunbound) || !EQ (icon_y, Qunbound))
5102      error ("Both left and top icon corners of icon must be specified");      error ("Both left and top icon corners of icon must be specified");
# Line 5239  This function is an internal primitive-- Line 5239  This function is an internal primitive--
5239    if (EQ (parent, Qunbound))    if (EQ (parent, Qunbound))
5240      parent = Qnil;      parent = Qnil;
5241    if (! NILP (parent))    if (! NILP (parent))
5242      CHECK_NUMBER (parent, 0);      CHECK_NUMBER (parent);
5243    
5244    /* make_frame_without_minibuffer can run Lisp code and garbage collect.  */    /* make_frame_without_minibuffer can run Lisp code and garbage collect.  */
5245    /* No need to protect DISPLAY because that's not used after passing    /* No need to protect DISPLAY because that's not used after passing
# Line 7208  DEFUN ("xw-color-defined-p", Fxw_color_d Line 7208  DEFUN ("xw-color-defined-p", Fxw_color_d
7208    XColor foo;    XColor foo;
7209    FRAME_PTR f = check_x_frame (frame);    FRAME_PTR f = check_x_frame (frame);
7210    
7211    CHECK_STRING (color, 1);    CHECK_STRING (color);
7212    
7213    if (w32_defined_color (f, XSTRING (color)->data, &foo, 0))    if (w32_defined_color (f, XSTRING (color)->data, &foo, 0))
7214      return Qt;      return Qt;
# Line 7224  DEFUN ("xw-color-values", Fxw_color_valu Line 7224  DEFUN ("xw-color-values", Fxw_color_valu
7224    XColor foo;    XColor foo;
7225    FRAME_PTR f = check_x_frame (frame);    FRAME_PTR f = check_x_frame (frame);
7226    
7227    CHECK_STRING (color, 1);    CHECK_STRING (color);
7228    
7229    if (w32_defined_color (f, XSTRING (color)->data, &foo, 0))    if (w32_defined_color (f, XSTRING (color)->data, &foo, 0))
7230      {      {
# Line 7534  x_display_info_for_name (name) Line 7534  x_display_info_for_name (name)
7534    Lisp_Object names;    Lisp_Object names;
7535    struct w32_display_info *dpyinfo;    struct w32_display_info *dpyinfo;
7536    
7537    CHECK_STRING (name, 0);    CHECK_STRING (name);
7538    
7539    for (dpyinfo = &one_w32_display_info, names = w32_display_name_list;    for (dpyinfo = &one_w32_display_info, names = w32_display_name_list;
7540         dpyinfo;         dpyinfo;
# Line 7575  terminate Emacs if we can't open the con Line 7575  terminate Emacs if we can't open the con
7575    unsigned char *xrm_option;    unsigned char *xrm_option;
7576    struct w32_display_info *dpyinfo;    struct w32_display_info *dpyinfo;
7577    
7578    CHECK_STRING (display, 0);    CHECK_STRING (display);
7579    if (! NILP (xrm_string))    if (! NILP (xrm_string))
7580      CHECK_STRING (xrm_string, 1);      CHECK_STRING (xrm_string);
7581    
7582    if (! EQ (Vwindow_system, intern ("w32")))    if (! EQ (Vwindow_system, intern ("w32")))
7583      error ("Not using Microsoft Windows");      error ("Not using Microsoft Windows");
# Line 12465  selected frame.  Value is VALUE.") Line 12465  selected frame.  Value is VALUE.")
12465    struct frame *f = check_x_frame (frame);    struct frame *f = check_x_frame (frame);
12466    Atom prop_atom;    Atom prop_atom;
12467    
12468    CHECK_STRING (prop, 1);    CHECK_STRING (prop);
12469    CHECK_STRING (value, 2);    CHECK_STRING (value);
12470    
12471    BLOCK_INPUT;    BLOCK_INPUT;
12472    prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), XSTRING (prop)->data, False);    prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), XSTRING (prop)->data, False);
# Line 12496  FRAME nil or omitted means use the selec Line 12496  FRAME nil or omitted means use the selec
12496    struct frame *f = check_x_frame (frame);    struct frame *f = check_x_frame (frame);
12497    Atom prop_atom;    Atom prop_atom;
12498    
12499    CHECK_STRING (prop, 1);    CHECK_STRING (prop);
12500    BLOCK_INPUT;    BLOCK_INPUT;
12501    prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), XSTRING (prop)->data, False);    prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), XSTRING (prop)->data, False);
12502    XDeleteProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f), prop_atom);    XDeleteProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f), prop_atom);
# Line 12530  value.") Line 12530  value.")
12530    int actual_format;    int actual_format;
12531    unsigned long actual_size, bytes_remaining;    unsigned long actual_size, bytes_remaining;
12532    
12533    CHECK_STRING (prop, 1);    CHECK_STRING (prop);
12534    BLOCK_INPUT;    BLOCK_INPUT;
12535    prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), XSTRING (prop)->data, False);    prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), XSTRING (prop)->data, False);
12536    rc = XGetWindowProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f),    rc = XGetWindowProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f),
# Line 13177  Text larger than the specified size is c Line 13177  Text larger than the specified size is c
13177    
13178    GCPRO4 (string, parms, frame, timeout);    GCPRO4 (string, parms, frame, timeout);
13179    
13180    CHECK_STRING (string, 0);    CHECK_STRING (string);
13181    f = check_x_frame (frame);    f = check_x_frame (frame);
13182    if (NILP (timeout))    if (NILP (timeout))
13183      timeout = make_number (5);      timeout = make_number (5);
13184    else    else
13185      CHECK_NATNUM (timeout, 2);      CHECK_NATNUM (timeout);
13186    
13187    if (NILP (dx))    if (NILP (dx))
13188      dx = make_number (5);      dx = make_number (5);
13189    else    else
13190      CHECK_NUMBER (dx, 5);      CHECK_NUMBER (dx);
13191        
13192    if (NILP (dy))    if (NILP (dy))
13193      dy = make_number (-10);      dy = make_number (-10);
13194    else    else
13195      CHECK_NUMBER (dy, 6);      CHECK_NUMBER (dy);
13196    
13197    if (NILP (last_show_tip_args))    if (NILP (last_show_tip_args))
13198      last_show_tip_args = Fmake_vector (make_number (3), Qnil);      last_show_tip_args = Fmake_vector (make_number (3), Qnil);
# Line 13406  specified.  Ensure that file exists if M Line 13406  specified.  Ensure that file exists if M
13406    int use_dialog_p = 1;    int use_dialog_p = 1;
13407    
13408    GCPRO5 (prompt, dir, default_filename, mustmatch, file);    GCPRO5 (prompt, dir, default_filename, mustmatch, file);
13409    CHECK_STRING (prompt, 0);    CHECK_STRING (prompt);
13410    CHECK_STRING (dir, 1);    CHECK_STRING (dir);
13411    
13412    /* Create the dialog with PROMPT as title, using DIR as initial    /* Create the dialog with PROMPT as title, using DIR as initial
13413       directory and using "*" as pattern.  */       directory and using "*" as pattern.  */
# Line 13589  If optional parameter FRAME is not speci Line 13589  If optional parameter FRAME is not speci
13589  {  {
13590    FRAME_PTR f = check_x_frame (frame);    FRAME_PTR f = check_x_frame (frame);
13591    
13592    CHECK_NUMBER (command, 0);    CHECK_NUMBER (command);
13593    
13594    PostMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, XINT (command), 0);    PostMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, XINT (command), 0);
13595    
# Line 13621  otherwise it is an integer representing Line 13621  otherwise it is an integer representing
13621  {  {
13622    Lisp_Object current_dir;    Lisp_Object current_dir;
13623    
13624    CHECK_STRING (document, 0);    CHECK_STRING (document);
13625    
13626    /* Encode filename and current directory.  */    /* Encode filename and current directory.  */
13627    current_dir = ENCODE_FILE (current_buffer->directory);    current_dir = ENCODE_FILE (current_buffer->directory);
# Line 13669  w32_parse_hot_key (key) Line 13669  w32_parse_hot_key (key)
13669    int w32_modifiers;    int w32_modifiers;
13670    struct gcpro gcpro1;    struct gcpro gcpro1;
13671    
13672    CHECK_VECTOR (key, 0);    CHECK_VECTOR (key);
13673    
13674    if (XFASTINT (Flength (key)) != 1)    if (XFASTINT (Flength (key)) != 1)
13675      return Qnil;      return Qnil;
# Line 13807  DEFUN ("w32-reconstruct-hot-key", Fw32_r Line 13807  DEFUN ("w32-reconstruct-hot-key", Fw32_r
13807    int vk_code, w32_modifiers;    int vk_code, w32_modifiers;
13808    Lisp_Object key;    Lisp_Object key;
13809    
13810    CHECK_NUMBER (hotkeyid, 0);    CHECK_NUMBER (hotkeyid);
13811    
13812    vk_code = HOTKEY_VK_CODE (hotkeyid);    vk_code = HOTKEY_VK_CODE (hotkeyid);
13813    w32_modifiers = HOTKEY_MODIFIERS (hotkeyid);    w32_modifiers = HOTKEY_MODIFIERS (hotkeyid);
# Line 13873  If the underlying system call fails, val Line 13873  If the underlying system call fails, val
13873  {  {
13874    Lisp_Object encoded, value;    Lisp_Object encoded, value;
13875    
13876    CHECK_STRING (filename, 0);    CHECK_STRING (filename);
13877    filename = Fexpand_file_name (filename, Qnil);    filename = Fexpand_file_name (filename, Qnil);
13878    encoded = ENCODE_FILE (filename);    encoded = ENCODE_FILE (filename);
13879    

Legend:
Removed from v.1.129  
changed lines
  Added in v.1.130

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26