emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCHES] 21.3.50 for Cygwin: patch 6


From: Joe Buehler
Subject: [PATCHES] 21.3.50 for Cygwin: patch 6
Date: Fri, 06 Dec 2002 13:38:59 -0500
User-agent: Mozilla/5.0 (Windows; U; WinNT4.0; en-US; rv:1.2) Gecko/20021126

This patch adds cygwin in the appropriate places to the various
system-type comparisons in the LISP code.

Joe Buehler

Index: ./lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.4583
diff -u -r1.4583 ChangeLog
--- ./lisp/ChangeLog    4 Dec 2002 17:20:06 -0000       1.4583
+++ ./lisp/ChangeLog    6 Dec 2002 17:38:48 -0000
@@ -1,3 +1,37 @@
+2002-12-06  Joe Buehler  <address@hidden>
+
+       * woman.el: added cygwin to system-type comparisons
+
+       * shell.el: added cygwin to system-type comparisons
+
+       * recentf.el: added cygwin to system-type comparisons
+
+       * pcomplete.el: added cygwin to system-type comparisons
+
+       * net/browse-url.el: added cygwin to system-type comparisons
+
+       * loaddefs.el: added cygwin to system-type comparisons
+
+       * international/mule.el: added cygwin to system-type comparisons
+
+       * hippie-exp.el: added cygwin to system-type comparisons
+
+       * files.el: added cygwin to system-type comparisons
+
+       * filecache.el: added cygwin to system-type comparisons
+
+       * fast-lock.el: added cygwin to system-type comparisons
+
+       * dos-w32.el: added cygwin to system-type comparisons
+
+       * dirtrack.el: added cygwin to system-type comparisons
+
+       * dired.el: added cygwin to system-type comparisons
+
+       * dired-aux.el: added cygwin to system-type comparisons
+
+       * comint.el: added cygwin to system-type comparisons
+
 2002-12-04  Stefan Monnier  <address@hidden>

        * gdb-ui.el (gdb-inferior-io-mode-map): Remove (unused).
Index: ./lisp/gnus/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/ChangeLog,v
retrieving revision 1.223
diff -u -r1.223 ChangeLog
--- ./lisp/gnus/ChangeLog       29 Nov 2002 15:57:51 -0000      1.223
+++ ./lisp/gnus/ChangeLog       6 Dec 2002 17:38:55 -0000
@@ -1,3 +1,7 @@
+2002-12-06  Joe Buehler  <address@hidden>
+
+       * nnheader.el: added cygwin to system-type comparisons
+
 2002-11-29  ShengHuo ZHU  <address@hidden>

        * smiley-ems.el (gnus-smiley-display): Typo.
Index: lisp/comint.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/comint.el,v
retrieving revision 1.284
diff -u -r1.284 comint.el
--- lisp/comint.el      10 Sep 2002 16:44:58 -0000      1.284
+++ lisp/comint.el      6 Dec 2002 16:34:45 -0000
@@ -2533,7 +2533,7 @@
 directory tracking functions.")

 (defvar comint-file-name-chars
-  (if (memq system-type '(ms-dos windows-nt))
+  (if (memq system-type '(ms-dos windows-nt cygwin))
       "~/A-Za-z0-9_^$!#%&address@hidden'.,:()-"
     "~/A-Za-z0-9+@:_.$#%,={}-")
   "String of characters valid in a file name.
@@ -2658,7 +2658,7 @@
 (defun comint-dynamic-complete-as-filename ()
   "Dynamically complete at point as a filename.
 See `comint-dynamic-complete-filename'.  Returns t if successful."
-  (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt)))
+  (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt 
cygwin)))
         (completion-ignored-extensions comint-completion-fignore)
         ;; If we bind this, it breaks remote directory tracking in rlogin.el.
         ;; I think it was originally bound to solve file completion problems,
@@ -2747,7 +2747,7 @@
 Returns `listed' if a completion listing was shown.

 See also `comint-dynamic-complete-filename'."
-  (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt)))
+  (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt 
cygwin)))
         (suffix (cond ((not comint-completion-addsuffix) "")
                       ((not (consp comint-completion-addsuffix)) " ")
                       (t (cdr comint-completion-addsuffix))))
@@ -2788,7 +2788,7 @@
 (defun comint-dynamic-list-filename-completions ()
   "List in help buffer possible completions of the filename at point."
   (interactive)
-  (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt)))
+  (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt 
cygwin)))
         ;; If we bind this, it breaks remote directory tracking in rlogin.el.
         ;; I think it was originally bound to solve file completion problems,
         ;; but subsequent changes may have made this unnecessary.  sm.
Index: lisp/dired-aux.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/dired-aux.el,v
retrieving revision 1.107
diff -u -r1.107 dired-aux.el
--- lisp/dired-aux.el   11 Nov 2002 11:44:05 -0000      1.107
+++ lisp/dired-aux.el   6 Dec 2002 16:34:46 -0000
@@ -1258,7 +1258,7 @@
                          ;; will return t because the filesystem is
                          ;; case-insensitive, and Emacs will try to move
                          ;; foo -> foo/foo, which fails.
-                         (if (and (memq system-type '(ms-dos windows-nt))
+                         (if (and (memq system-type '(ms-dos windows-nt 
cygwin))
                                   (eq op-symbol 'move)
                                   dired-one-file
                                   (string= (downcase
Index: lisp/dired.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/dired.el,v
retrieving revision 1.246
diff -u -r1.246 dired.el
--- lisp/dired.el       21 Nov 2002 17:31:51 -0000      1.246
+++ lisp/dired.el       6 Dec 2002 16:34:48 -0000
@@ -65,7 +65,7 @@

 ;;;###autoload
 (defvar dired-chown-program
-  (if (memq system-type '(hpux dgux usg-unix-v irix linux gnu/linux))
+  (if (memq system-type '(hpux dgux usg-unix-v irix linux gnu/linux cygwin))
       "chown"
     (if (file-exists-p "/usr/sbin/chown")
        "/usr/sbin/chown"
Index: lisp/dirtrack.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/dirtrack.el,v
retrieving revision 1.11
diff -u -r1.11 dirtrack.el
--- lisp/dirtrack.el    7 Feb 2001 23:38:46 -0000       1.11
+++ lisp/dirtrack.el    6 Dec 2002 16:34:48 -0000
@@ -167,7 +167,7 @@
 (make-variable-buffer-local 'dirtrackp)

 (defcustom dirtrack-directory-function
-  (if (memq system-type (list 'ms-dos 'windows-nt))
+  (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin))
       'dirtrack-windows-directory-function
     'dirtrack-default-directory-function)
   "*Function to apply to the prompt directory for comparison purposes."
@@ -176,7 +176,7 @@
   )

 (defcustom dirtrack-canonicalize-function
-  (if (memq system-type (list 'ms-dos 'windows-nt))
+  (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin))
       'downcase 'identity)
   "*Function to apply to the default directory for comparison purposes."
   :group 'dirtrack
Index: lisp/dos-w32.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/dos-w32.el,v
retrieving revision 1.34
diff -u -r1.34 dos-w32.el
--- lisp/dos-w32.el     11 Jul 2002 17:24:10 -0000      1.34
+++ lisp/dos-w32.el     6 Dec 2002 16:34:49 -0000
@@ -197,7 +197,7 @@
 (defun untranslated-canonical-name (filename)
   "Return FILENAME in a canonicalized form for use with the functions
 dealing with untranslated filesystems."
-  (if (memq system-type '(ms-dos windows-nt))
+  (if (memq system-type '(ms-dos windows-nt cygwin))
       ;; The canonical form for DOS/W32 is with A-Z downcased and all
       ;; directory separators changed to directory-sep-char.
       (let ((name nil))
Index: lisp/fast-lock.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/fast-lock.el,v
retrieving revision 1.25
diff -u -r1.25 fast-lock.el
--- lisp/fast-lock.el   27 Nov 2001 15:52:52 -0000      1.25
+++ lisp/fast-lock.el   6 Dec 2002 16:34:49 -0000
@@ -553,7 +553,7 @@
       (concat buffer-file-name ".flc")
     (let* ((bufile (expand-file-name buffer-file-truename))
           (chars-alist
-           (if (memq system-type '(emx windows-nt))
+           (if (memq system-type '(emx windows-nt cygwin))
                '((?/ . (?#)) (?# . (?# ?#)) (?: . (?\;)) (?\; . (?\; ?\;)))
              '((?/ . (?#)) (?# . (?# ?#)))))
           (mapchars
Index: lisp/filecache.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/filecache.el,v
retrieving revision 1.14
diff -u -r1.14 filecache.el
--- lisp/filecache.el   30 Apr 2002 20:42:40 -0000      1.14
+++ lisp/filecache.el   6 Dec 2002 16:34:49 -0000
@@ -187,7 +187,7 @@
   :group 'file-cache)

 (defcustom file-cache-completion-ignore-case
-   (if (memq system-type (list 'ms-dos 'windows-nt))
+   (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin))
       t
      completion-ignore-case)
   "If non-nil, file-cache completion should ignore case.
@@ -197,7 +197,7 @@
   )

 (defcustom file-cache-case-fold-search
-  (if (memq system-type (list 'ms-dos 'windows-nt))
+  (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin))
       t
     case-fold-search)
   "If non-nil, file-cache completion should ignore case.
@@ -207,7 +207,7 @@
   )

 (defcustom file-cache-assoc-function
-  (if (memq system-type (list 'ms-dos 'windows-nt))
+  (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin))
       'assoc-ignore-case
     'assoc)
   "Function to use to check completions in the file cache.
Index: lisp/files.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/files.el,v
retrieving revision 1.625
diff -u -r1.625 files.el
--- lisp/files.el       27 Nov 2002 23:53:44 -0000      1.625
+++ lisp/files.el       6 Dec 2002 16:34:52 -0000
@@ -215,7 +215,7 @@
                 "[\000-\031]\\|"               ; control characters
                 "\\(/\\.\\.?[^/]\\)\\|"        ; leading dots
                 "\\(/[^/.]+\\.[^/.]*\\.\\)"))          ; more than a single dot
-       ((memq system-type '(ms-dos windows-nt))
+       ((memq system-type '(ms-dos windows-nt cygwin))
         (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive
                 "[|<>\"?*\000-\031]"))              ; invalid characters
        (t "[\000]"))
@@ -1028,6 +1028,7 @@
             ;; 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)))))
@@ -1773,7 +1774,7 @@
                  (mode nil))
              ;; Find first matching alist entry.
              (let ((case-fold-search
-                    (memq system-type '(vax-vms windows-nt))))
+                    (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)))
@@ -2613,7 +2614,7 @@
        file
       (if (file-name-absolute-p backup-directory)
          (progn
-           (when (memq system-type '(windows-nt ms-dos))
+           (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".
@@ -2735,6 +2736,7 @@
       ;; 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))))
@@ -3879,7 +3881,7 @@
 PATTERN that already quotes some of the special characters."
   (save-match-data
     (cond
-     ((memq system-type '(ms-dos windows-nt))
+     ((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.
Index: lisp/hippie-exp.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/hippie-exp.el,v
retrieving revision 1.24
diff -u -r1.24 hippie-exp.el
--- lisp/hippie-exp.el  20 Dec 2001 18:41:15 -0000      1.24
+++ lisp/hippie-exp.el  6 Dec 2002 16:34:53 -0000
@@ -503,7 +503,7 @@
 (defvar he-file-name-chars
   (cond ((memq system-type '(vax-vms axp-vms))
         "-a-zA-Z0-9_/.,~^#$+=:\\[\\]")
-       ((memq system-type '(ms-dos windows-nt))
+       ((memq system-type '(ms-dos windows-nt cygwin))
         "-a-zA-Z0-9_/.,~^#$+=:\\\\")
        (t                          ;; More strange file formats ?
         "-a-zA-Z0-9_/.,~^#$+="))
Index: lisp/loaddefs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/loaddefs.el,v
retrieving revision 2.85
diff -u -r2.85 loaddefs.el
--- lisp/loaddefs.el    20 Nov 2002 07:32:42 -0000      2.85
+++ lisp/loaddefs.el    6 Dec 2002 16:35:13 -0000
@@ -1848,7 +1848,7 @@
 ;;;;;;  "net/browse-url.el" (15783 1896))
 ;;; Generated autoloads from net/browse-url.el

-(defvar browse-url-browser-function (if (memq system-type (quote (windows-nt 
ms-dos))) (quote browse-url-default-windows-browser) (quote 
browse-url-default-browser)) "\
+(defvar browse-url-browser-function (if (memq system-type (quote (windows-nt ms-dos 
cygwin))) (quote browse-url-default-windows-browser) (quote 
browse-url-default-browser)) "\
 *Function to display the current buffer in a WWW browser.
 This is used by the `browse-url-at-point', `browse-url-at-mouse', and
 `browse-url-of-file' commands.
@@ -5640,7 +5640,7 @@
 some of the `ls' switches are not supported; see the doc string of
 `insert-directory' on ls-lisp.el for more details.")

-(defvar dired-chown-program (if (memq system-type (quote (hpux dgux usg-unix-v irix linux gnu/linux))) "chown" 
(if (file-exists-p "/usr/sbin/chown") "/usr/sbin/chown" "/etc/chown")) "\
+(defvar dired-chown-program (if (memq system-type (quote (hpux dgux usg-unix-v irix linux gnu/linux cygwin))) 
"chown" (if (file-exists-p "/usr/sbin/chown") "/usr/sbin/chown" "/etc/chown")) 
"\
 Name of chown command (usually `chown' or `/etc/chown').")

 (defvar dired-ls-F-marks-symlinks nil "\
Index: lisp/pcomplete.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/pcomplete.el,v
retrieving revision 1.11
diff -u -r1.11 pcomplete.el
--- lisp/pcomplete.el   5 Aug 2002 20:07:12 -0000       1.11
+++ lisp/pcomplete.el   6 Dec 2002 16:35:14 -0000
@@ -139,7 +139,7 @@
   :type '(choice regexp (const :tag "None" nil))
   :group 'pcomplete)

-(defcustom pcomplete-ignore-case (memq system-type '(ms-dos windows-nt))
+(defcustom pcomplete-ignore-case (memq system-type '(ms-dos windows-nt cygwin))
   "*If non-nil, ignore case when doing filename completion."
   :type 'boolean
   :group 'pcomplete)
Index: lisp/recentf.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/recentf.el,v
retrieving revision 1.21
diff -u -r1.21 recentf.el
--- lisp/recentf.el     29 Apr 2002 09:27:25 -0000      1.21
+++ lisp/recentf.el     6 Dec 2002 16:35:14 -0000
@@ -201,7 +201,7 @@
 ;;;; Common functions
 ;;;;
 (defconst recentf-case-fold-search
-  (memq system-type '(vax-vms windows-nt))
+  (memq system-type '(vax-vms windows-nt cygwin))
   "Non-nil if recentf searches and matches should ignore case.")

 (defun recentf-include-p (filename)
Index: lisp/shell.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/shell.el,v
retrieving revision 1.117
diff -u -r1.117 shell.el
--- lisp/shell.el       31 Oct 2002 23:37:15 -0000      1.117
+++ lisp/shell.el       6 Dec 2002 16:35:15 -0000
@@ -165,7 +165,7 @@
 This is a fine thing to set in your `.emacs' file.")

 (defvar shell-file-name-chars
-  (if (memq system-type '(ms-dos windows-nt))
+  (if (memq system-type '(ms-dos windows-nt cygwin))
       "~/A-Za-z0-9_^$!#%&address@hidden'.,:()-"
     "~/A-Za-z0-9+@:_.$#%,={}-")
   "String of characters valid in a file name.
Index: lisp/woman.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/woman.el,v
retrieving revision 1.14
diff -u -r1.14 woman.el
--- lisp/woman.el       23 Oct 2002 09:08:04 -0000      1.14
+++ lisp/woman.el       6 Dec 2002 16:35:19 -0000
@@ -1347,7 +1347,7 @@
   ;; including `.' and `..', so remove any trailing / !!!
   (if (string= (substring dir -1) "/")
       (setq dir (substring dir 0 -1)))
-  (if (memq system-type '(windows-nt ms-dos)) ; what else?
+  (if (memq system-type '(windows-nt ms-dos cygwin)) ; what else?
       ;; Match capitalization used by `file-name-directory':
       (setq dir (concat (file-name-directory dir)
                        (file-name-nondirectory dir))))
Index: lisp/gnus/nnheader.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/nnheader.el,v
retrieving revision 1.15
diff -u -r1.15 nnheader.el
--- lisp/gnus/nnheader.el       21 Jun 2002 18:31:10 -0000      1.15
+++ lisp/gnus/nnheader.el       6 Dec 2002 16:35:19 -0000
@@ -653,7 +653,7 @@
        ;; We translate -- but only the file name.  We leave the directory
        ;; alone.
        (if (and (featurep 'xemacs)
-                (memq system-type '(win32 w32 mswindows windows-nt)))
+                (memq system-type '(win32 w32 mswindows windows-nt cygwin)))
            ;; This is needed on NT and stuff, because
            ;; file-name-nondirectory is not enough to split
            ;; file names, containing ':', e.g.
cvs server: Diffing lisp/international
Index: lisp/international/mule.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/international/mule.el,v
retrieving revision 1.170
diff -u -r1.170 mule.el
--- lisp/international/mule.el  15 Nov 2002 23:52:11 -0000      1.170
+++ lisp/international/mule.el  6 Dec 2002 16:35:21 -0000
@@ -1598,7 +1598,7 @@
 (defun auto-coding-alist-lookup (filename)
   "Return the coding system specified by `auto-coding-alist' for FILENAME."
   (let ((alist auto-coding-alist)
-       (case-fold-search (memq system-type '(vax-vms windows-nt ms-dos)))
+       (case-fold-search (memq system-type '(vax-vms windows-nt ms-dos 
cygwin)))
        coding-system)
     (while (and alist (not coding-system))
       (if (string-match (car (car alist)) filename)
cvs server: Diffing lisp/language
cvs server: Diffing lisp/mail
cvs server: Diffing lisp/net
Index: lisp/net/browse-url.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/net/browse-url.el,v
retrieving revision 1.24
diff -u -r1.24 browse-url.el
--- lisp/net/browse-url.el      11 Oct 2002 17:16:24 -0000      1.24
+++ lisp/net/browse-url.el      6 Dec 2002 16:35:23 -0000
@@ -227,7 +227,7 @@

 ;;;###autoload
 (defcustom browse-url-browser-function
-  (if (memq system-type '(windows-nt ms-dos))
+  (if (memq system-type '(windows-nt ms-dos cygwin))
       'browse-url-default-windows-browser
     'browse-url-default-browser)
   "*Function to display the current buffer in a WWW browser.
@@ -381,7 +381,7 @@
     ;; it in anonymous cases.  If it's not anonymous the next regexp
     ;; applies.
     ("^/\\([^:@address@hidden)?\\([^:]+\\):/*" . "ftp://\\1\\2/";)
-    (,@ (if (memq system-type '(windows-nt ms-dos))
+    (,@ (if (memq system-type '(windows-nt ms-dos cygwin))
            '(("^\\([a-zA-Z]:\\)[\\/]" . "file:\\1/")
               ("^[\\/][\\/]+" . "file://"))))
     ("^/+" . "file:/")))







reply via email to

[Prev in Thread] Current Thread [Next in Thread]