[Emacs-diffs] Changes to emacs/lisp/files.el

[Juanma Barranquero]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.631 emacs/lisp/files.el:1.632
*** emacs/lisp/files.el:1.631   Thu Jan 23 00:59:47 2003
--- emacs/lisp/files.el Fri Jan 31 10:16:47 2003
***************
*** 215,221 ****
                 "[\000-\031]\\|"                 ; control characters
                 "\\(/\\.\\.?[^/]\\)\\|"          ; leading dots
                 "\\(/[^/.]+\\.[^/.]*\\.\\)"))    ; more than a single dot
!       ((memq system-type '(ms-dos windows-nt))
         (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive
                 "[|<>\"?*\000-\031]"))           ; invalid characters
        (t "[\000]"))
--- 215,221 ----
                 "[\000-\031]\\|"                 ; control characters
                 "\\(/\\.\\.?[^/]\\)\\|"          ; leading dots
                 "\\(/[^/.]+\\.[^/.]*\\.\\)"))    ; more than a single dot
!       ((memq system-type '(ms-dos windows-nt cygwin))
         (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive
                 "[|<>\"?*\000-\031]"))           ; invalid characters
        (t "[\000]"))
***************
*** 1028,1033 ****
--- 1028,1034 ----
             ;; MS-DOS root directories can come with a drive letter;
             ;; Novell Netware allows drive letters beyond `Z:'.
             (not (and (or (eq system-type 'ms-dos)
+                          (eq system-type 'cygwin)
                           (eq system-type 'windows-nt))
                       (save-match-data
                         (string-match "^[a-zA-`]:/$" filename)))))
***************
*** 1774,1780 ****
                  (mode nil))
              ;; Find first matching alist entry.
              (let ((case-fold-search
!                    (memq system-type '(vax-vms windows-nt))))
                (while (and (not mode) alist)
                  (if (string-match (car (car alist)) name)
                      (if (and (consp (cdr (car alist)))
--- 1775,1781 ----
                  (mode nil))
              ;; Find first matching alist entry.
              (let ((case-fold-search
!                    (memq system-type '(vax-vms windows-nt cygwin))))
                (while (and (not mode) alist)
                  (if (string-match (car (car alist)) name)
                      (if (and (consp (cdr (car alist)))
***************
*** 2615,2621 ****
        file
        (if (file-name-absolute-p backup-directory)
          (progn
!           (when (memq system-type '(windows-nt ms-dos))
              ;; Normalize DOSish file names: downcase the drive
              ;; letter, if any, and replace the leading "x:" with
              ;; "/drive_x".
--- 2616,2622 ----
        file
        (if (file-name-absolute-p backup-directory)
          (progn
!           (when (memq system-type '(windows-nt ms-dos cygwin))
              ;; Normalize DOSish file names: downcase the drive
              ;; letter, if any, and replace the leading "x:" with
              ;; "/drive_x".
***************
*** 2737,2742 ****
--- 2738,2744 ----
        ;; On Microsoft OSes, if FILENAME and DIRECTORY have different
        ;; drive names, they can't be relative, so return the absolute name.
        (if (and (or (eq system-type 'ms-dos)
+                  (eq system-type 'cygwin)
                   (eq system-type 'windows-nt))
               (not (string-equal (substring fname  0 2)
                                  (substring directory 0 2))))
***************
*** 3136,3142 ****
  With arg, set read-only iff arg is positive.
  If visiting file read-only and `view-read-only' is non-nil, enter view mode."
    (interactive "P")
!   (if (and arg 
             (if (> (prefix-numeric-value arg) 0) buffer-read-only
               (not buffer-read-only)))  ; If buffer-read-only is set correctly,
        nil                            ; do nothing.
--- 3138,3144 ----
  With arg, set read-only iff arg is positive.
  If visiting file read-only and `view-read-only' is non-nil, enter view mode."
    (interactive "P")
!   (if (and arg
             (if (> (prefix-numeric-value arg) 0) buffer-read-only
               (not buffer-read-only)))  ; If buffer-read-only is set correctly,
        nil                            ; do nothing.
***************
*** 3881,3887 ****
  PATTERN that already quotes some of the special characters."
    (save-match-data
      (cond
!      ((memq system-type '(ms-dos windows-nt))
        ;; DOS/Windows don't allow `"' in file names.  So if the
        ;; argument has quotes, we can safely assume it is already
        ;; quoted by the caller.
--- 3883,3889 ----
  PATTERN that already quotes some of the special characters."
    (save-match-data
      (cond
!      ((memq system-type '(ms-dos windows-nt cygwin))
        ;; DOS/Windows don't allow `"' in file names.  So if the
        ;; argument has quotes, we can safely assume it is already
        ;; quoted by the caller.
***************
*** 4022,4028 ****
                 ;; bunch by one to preserve that property.
                 (coding-system-for-read 'no-conversion)
                 ;; This is to control encoding the arguments in call-process.
!                (coding-system-for-write 
                  (and enable-multibyte-characters
                       (or file-name-coding-system
                           default-file-name-coding-system))))
--- 4024,4030 ----
                 ;; bunch by one to preserve that property.
                 (coding-system-for-read 'no-conversion)
                 ;; This is to control encoding the arguments in call-process.
!                (coding-system-for-write
                  (and enable-multibyte-characters
                       (or file-name-coding-system
                           default-file-name-coding-system))))