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

[Miles Bader]

Index: emacs/src/w32fns.c
diff -c emacs/src/w32fns.c:1.219.2.11 emacs/src/w32fns.c:1.219.2.12
*** emacs/src/w32fns.c:1.219.2.11       Fri Oct 22 10:13:34 2004
--- emacs/src/w32fns.c  Thu Nov  4 08:55:31 2004
***************
*** 5667,5680 ****
      char * fontname;
      char * pattern;
  {
-   char *font_name_copy;
    char *ptr;
!   Lisp_Object encoded_font_name;
    char *regex = alloca (strlen (pattern) * 2 + 3);
  
!   /* Convert fontname to unibyte for match.  */
!   encoded_font_name = string_make_unibyte (build_string (fontname));
!   font_name_copy = SDATA (encoded_font_name);
  
    ptr = regex;
    *ptr++ = '^';
--- 5667,5678 ----
      char * fontname;
      char * pattern;
  {
    char *ptr;
!   char *font_name_copy;
    char *regex = alloca (strlen (pattern) * 2 + 3);
  
!   font_name_copy = alloca (strlen (fontname) + 1);
!   strcpy (font_name_copy, fontname);
  
    ptr = regex;
    *ptr++ = '^';
***************
*** 5712,5719 ****
        return FALSE;
    }
  
!   return (fast_c_string_match_ignore_case (build_string (regex),
!                                            font_name_copy) >= 0);
  }
  
  /* Callback functions, and a structure holding info they need, for
--- 5710,5717 ----
        return FALSE;
    }
  
!   return (fast_string_match_ignore_case (build_string (regex),
!                                          build_string(font_name_copy)) >= 0);
  }
  
  /* Callback functions, and a structure holding info they need, for
***************
*** 6459,6465 ****
  }
  
  DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0,
!        doc: /* Returns the vendor ID string of the W32 system (Microsoft).
  The optional argument DISPLAY specifies which display to ask about.
  DISPLAY should be either a frame or a display name (a string).
  If omitted or nil, that stands for the selected frame's display.  */)
--- 6457,6463 ----
  }
  
  DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0,
!        doc: /* Returns the "vendor ID" string of the W32 system (Microsoft).
  The optional argument DISPLAY specifies which display to ask about.
  DISPLAY should be either a frame or a display name (a string).
  If omitted or nil, that stands for the selected frame's display.  */)
***************
*** 6472,6478 ****
  DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0,
         doc: /* Returns the version numbers of the server of DISPLAY.
  The value is a list of three integers: the major and minor
! version numbers, and the vendor-specific release
  number.  See also the function `x-server-vendor'.
  
  The optional argument DISPLAY specifies which display to ask about.
--- 6470,6476 ----
  DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0,
         doc: /* Returns the version numbers of the server of DISPLAY.
  The value is a list of three integers: the major and minor
! version numbers of the X Protocol in use, and the distributor-specific release
  number.  See also the function `x-server-vendor'.
  
  The optional argument DISPLAY specifies which display to ask about.
***************
*** 7803,7825 ****
    return 0;
  }
  
! DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 4, 0,
         doc: /* Read file name, prompting with PROMPT in directory DIR.
  Use a file selection dialog.
  Select DEFAULT-FILENAME in the dialog's file selection box, if
! specified.  Ensure that file exists if MUSTMATCH is non-nil.  */)
!   (prompt, dir, default_filename, mustmatch)
!      Lisp_Object prompt, dir, default_filename, mustmatch;
  {
    struct frame *f = SELECTED_FRAME ();
    Lisp_Object file = Qnil;
    int count = SPECPDL_INDEX ();
!   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
    char filename[MAX_PATH + 1];
    char init_dir[MAX_PATH + 1];
    int default_filter_index = 1; /* 1: All Files, 2: Directories only  */
  
!   GCPRO5 (prompt, dir, default_filename, mustmatch, file);
    CHECK_STRING (prompt);
    CHECK_STRING (dir);
  
--- 7801,7824 ----
    return 0;
  }
  
! DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 5, 0,
         doc: /* Read file name, prompting with PROMPT in directory DIR.
  Use a file selection dialog.
  Select DEFAULT-FILENAME in the dialog's file selection box, if
! specified.  Ensure that file exists if MUSTMATCH is non-nil.
! If ONLY-DIR-P is non-nil, the user can only select directories.  */)
!   (prompt, dir, default_filename, mustmatch, only_dir_p)
!      Lisp_Object prompt, dir, default_filename, mustmatch, only_dir_p;
  {
    struct frame *f = SELECTED_FRAME ();
    Lisp_Object file = Qnil;
    int count = SPECPDL_INDEX ();
!   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
    char filename[MAX_PATH + 1];
    char init_dir[MAX_PATH + 1];
    int default_filter_index = 1; /* 1: All Files, 2: Directories only  */
  
!   GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file);
    CHECK_STRING (prompt);
    CHECK_STRING (dir);
  
***************
*** 7867,7876 ****
      file_details.lpstrInitialDir = init_dir;
      file_details.lpstrTitle = SDATA (prompt);
  
!     /* If prompt starts with Dired, default to directories only.  */
!     /* A bit hacky, but there doesn't seem to be a better way to
!        DTRT for dired.  */
!     if (strncmp (file_details.lpstrTitle, "Dired", 5) == 0)
        default_filter_index = 2;
  
      file_details.nFilterIndex = default_filter_index;
--- 7866,7872 ----
      file_details.lpstrInitialDir = init_dir;
      file_details.lpstrTitle = SDATA (prompt);
  
!     if (! NILP (only_dir_p))
        default_filter_index = 2;
  
      file_details.nFilterIndex = default_filter_index;