Show
Ignore:
Timestamp:
08/10/06 11:19:54 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/files.el

    r4131 r4140  
    541541This function's standard definition is trivial; it just returns 
    542542the argument.  However, on Windows and DOS, replace invalid 
    543 characters.  On DOS, make sure to obey the 8.3 limitations.  On 
    544 Windows, turn Cygwin names into native names, and also turn 
    545 slashes into backslashes if the shell requires it (see 
     543characters.  On DOS, make sure to obey the 8.3 limitations. 
     544In the native Windows build, turn Cygwin names into native names, 
     545and also turn slashes into backslashes if the shell requires it (see 
    546546`w32-shell-dos-semantics'). 
    547547 
    548548See Info node `(elisp)Standard File Names' for more details." 
    549   filename) 
     549  (if (eq system-type 'cygwin) 
     550      (let ((name (copy-sequence filename)) 
     551            (start 0)) 
     552        ;; Replace invalid filename characters with ! 
     553        (while (string-match "[?*:<>|\"\000-\037]" name start) 
     554          (aset name (match-beginning 0) ?!) 
     555          (setq start (match-end 0))) 
     556        name) 
     557    filename)) 
    550558 
    551559(defun read-directory-name (prompt &optional dir default-dirname mustmatch initial) 
    …… 
    43694377            ;; Make sure auto-save file names don't contain characters 
    43704378            ;; invalid for the underlying filesystem. 
    4371             (if (and (memq system-type '(ms-dos windows-nt)) 
     4379            (if (and (memq system-type '(ms-dos windows-nt cygwin)) 
    43724380                     ;; Don't modify remote (ange-ftp) filenames 
    43734381                     (not (string-match "^/\\w+@[-A-Za-z0-9._]+:" result))) 
    …… 
    44044412                      ((file-writable-p "/var/tmp/") "/var/tmp/") 
    44054413                      ("~/"))))) 
    4406                (if (and (memq system-type '(ms-dos windows-nt)) 
     4414               (if (and (memq system-type '(ms-dos windows-nt cygwin)) 
    44074415                        ;; Don't modify remote (ange-ftp) filenames 
    44084416                        (not (string-match "^/\\w+@[-A-Za-z0-9._]+:" fname)))