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

Diff of /emacs/src/fileio.c

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

revision 1.507 by teirllm, Wed Jul 14 22:47:11 2004 UTC revision 1.507.2.1 by miles, Sat Sep 4 12:01:18 2004 UTC
# Line 886  make_temp_name (prefix, base64_p) Line 886  make_temp_name (prefix, base64_p)
886       int base64_p;       int base64_p;
887  {  {
888    Lisp_Object val;    Lisp_Object val;
889    int len;    int len, clen;
890    int pid;    int pid;
891    unsigned char *p, *data;    unsigned char *p, *data;
892    char pidbuf[20];    char pidbuf[20];
# Line 921  make_temp_name (prefix, base64_p) Line 921  make_temp_name (prefix, base64_p)
921  #endif  #endif
922      }      }
923    
924    len = SCHARS (prefix);    len = SBYTES (prefix); clen = SCHARS (prefix);
925    val = make_uninit_string (len + 3 + pidlen);    val = make_uninit_multibyte_string (clen + 3 + pidlen, len + 3 + pidlen);
926      if (!STRING_MULTIBYTE (prefix))
927        STRING_SET_UNIBYTE (val);
928    data = SDATA (val);    data = SDATA (val);
929    bcopy(SDATA (prefix), data, len);    bcopy(SDATA (prefix), data, len);
930    p = data + len;    p = data + len;
# Line 4866  instead of any buffer contents; END is i Line 4868  instead of any buffer contents; END is i
4868  Optional fourth argument APPEND if non-nil means  Optional fourth argument APPEND if non-nil means
4869    append to existing file contents (if any).  If it is an integer,    append to existing file contents (if any).  If it is an integer,
4870    seek to that offset in the file before writing.    seek to that offset in the file before writing.
4871  Optional fifth argument VISIT if t means  Optional fifth argument VISIT, if t or a string, means
4872    set the last-save-file-modtime of buffer to this file's modtime    set the last-save-file-modtime of buffer to this file's modtime
4873    and mark buffer not modified.    and mark buffer not modified.
4874  If VISIT is a string, it is a second file name;  If VISIT is a string, it is a second file name;
# Line 6191  DIR should be an absolute directory name Line 6193  DIR should be an absolute directory name
6193    
6194  If this command was invoked with the mouse, use a file dialog box if  If this command was invoked with the mouse, use a file dialog box if
6195  `use-dialog-box' is non-nil, and the window system or X toolkit in use  `use-dialog-box' is non-nil, and the window system or X toolkit in use
6196  provides a file dialog box.  */)  provides a file dialog box.
6197    
6198    See also `read-file-name-completion-ignore-case'
6199    and `read-file-name-function'.  */)
6200       (prompt, dir, default_filename, mustmatch, initial, predicate)       (prompt, dir, default_filename, mustmatch, initial, predicate)
6201       Lisp_Object prompt, dir, default_filename, mustmatch, initial, predicate;       Lisp_Object prompt, dir, default_filename, mustmatch, initial, predicate;
6202  {  {
# Line 6299  provides a file dialog box.  */) Line 6304  provides a file dialog box.  */)
6304    
6305    GCPRO2 (insdef, default_filename);    GCPRO2 (insdef, default_filename);
6306    
6307  #if defined (USE_MOTIF) || defined (HAVE_NTGUI) || defined (USE_GTK)  #if defined (USE_MOTIF) || defined (HAVE_NTGUI) || defined (USE_GTK) || defined (TARGET_API_MAC_CARBON)
6308    if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))    if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
6309        && use_dialog_box        && use_dialog_box
6310        && use_file_dialog        && use_file_dialog

Legend:
Removed from v.1.507  
changed lines
  Added in v.1.507.2.1

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