gnus-group-completing-read: Add 'substring to completion-styles for group selection; imap.el, mailcap.el, message.el, mm-util.el, nnheader.el, nnmail.el, pop3.el: Remove references to outdated systems; References to win32 w32 mswindows ms-windows emx were probably cargo-culted, and are removed for clarity; By Lars Magne Ingebrigtsen <larsi@gnus.org>.

9 files changed, 20 insertions, 16 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5c148b825e6..79219bc5044 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-group.el (gnus-group-completing-read): Add 'substring to
+        completion-styles for group selection.
+
 2009-02-04  Andreas Schwab  <schwab@suse.de>
 
         * gnus-score.el (gnus-score-string): Fix regex for matching extra
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 7a887735fe2..f9f97071eb5 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2202,7 +2202,9 @@ be permanent."
 The arguments are the same as `completing-read' except that COLLECTION
 and HIST default to `gnus-active-hashtb' and `gnus-group-history'
 respectively if they are omitted."
-  (let (group)
+  (let ((completion-styles completion-styles)
+        group)
+    (push 'substring completion-styles)
     (mapatoms (lambda (symbol)
                 (setq group (symbol-name symbol))
                 (set (intern (if (string-match "[^\000-\177]" group)
diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el
index e725dfcea88..6461a9ae743 100644
--- a/lisp/gnus/mailcap.el
+++ b/lisp/gnus/mailcap.el
@@ -335,7 +335,7 @@ nil means your home directory."
   :group 'mailcap)
 
 (defvar mailcap-poor-system-types
-  '(ms-dos ms-windows windows-nt win32 w32 mswindows)
+  '(ms-dos windows-nt)
   "Systems that don't have a Unix-like directory hierarchy.")
 
 ;;;
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index e034dd701c6..3cb0a1d6528 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5433,7 +5433,7 @@ In posting styles use `(\"Expires\" (make-expires-date 30))'."
            (* 25 25)))
   (let ((tm (current-time)))
     (concat
-     (if (or (memq system-type '(ms-dos emx))
+     (if (or (eq system-type 'ms-dos)
              ;; message-number-base36 doesn't handle bigints.
              (floatp (user-uid)))
          (let ((user (downcase (user-login-name))))
@@ -6451,9 +6451,7 @@ are not included."
       (setq buffer-file-name (expand-file-name
                               (concat
                               (if (memq system-type
-                                        '(ms-dos ms-windows windows-nt
-                                                 cygwin cygwin32 win32 w32
-                                                 mswindows))
+                                        '(ms-dos windows-nt cygwin))
                                   "message"
                                 "*message*")
                                (format-time-string "-%Y%m%d-%H%M%S"))
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index f657000205e..2be5667eea7 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -680,7 +680,7 @@ superset of iso-8859-1."
   "100% binary coding system.")
 
 (defvar mm-text-coding-system
-  (or (if (memq system-type '(windows-nt ms-dos ms-windows))
+  (or (if (memq system-type '(windows-nt ms-dos))
           (and (mm-coding-system-p 'raw-text-dos) 'raw-text-dos)
         (and (mm-coding-system-p 'raw-text) 'raw-text))
       mm-binary-coding-system)
@@ -692,12 +692,12 @@ superset of iso-8859-1."
 (defvar mm-auto-save-coding-system
   (cond
    ((mm-coding-system-p 'utf-8-emacs)   ; Mule 7
-    (if (memq system-type '(windows-nt ms-dos ms-windows))
+    (if (memq system-type '(windows-nt ms-dos))
         (if (mm-coding-system-p 'utf-8-emacs-dos)
             'utf-8-emacs-dos mm-binary-coding-system)
       'utf-8-emacs))
    ((mm-coding-system-p 'emacs-mule)
-    (if (memq system-type '(windows-nt ms-dos ms-windows))
+    (if (memq system-type '(windows-nt ms-dos))
         (if (mm-coding-system-p 'emacs-mule-dos)
             'emacs-mule-dos mm-binary-coding-system)
       'emacs-mule))
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index 6a24f21efc1..449b32fab02 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -77,7 +77,7 @@ Integer values will in effect be rounded up to the nearest multiple of
   "*Length of each read operation when trying to fetch HEAD headers.")
 
 (defvar nnheader-read-timeout
-  (if (string-match "windows-nt\\|os/2\\|emx\\|cygwin"
+  (if (string-match "windows-nt\\|os/2\\|cygwin"
                     (symbol-name system-type))
       ;; http://thread.gmane.org/v9655t3pjo.fsf@marauder.physik.uni-ulm.de
       ;;
@@ -102,7 +102,7 @@ Shorter values mean quicker response, but are more CPU intensive.")
 (defvar nnheader-file-name-translation-alist
   (let ((case-fold-search t))
     (cond
-     ((string-match "windows-nt\\|os/2\\|emx\\|cygwin"
+     ((string-match "windows-nt\\|os/2\\|cygwin"
                     (symbol-name system-type))
       (append (mapcar (lambda (c) (cons c ?_))
                       '(?: ?* ?\" ?< ?> ??))
@@ -786,8 +786,7 @@ If FULL, translate everything."
         ;; We translate -- but only the file name.  We leave the directory
         ;; alone.
         (if (and (featurep 'xemacs)
-                 (memq system-type '(cygwin32 win32 w32 mswindows windows-nt
-                                              cygwin)))
+                 (memq system-type '(windows-nt cygwin)))
             ;; This is needed on NT and stuff, because
             ;; file-name-nondirectory is not enough to split
             ;; file names, containing ':', e.g.
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 8bf0cbf5de1..456f2d9d518 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -265,7 +265,7 @@ It scans low-level sorted spools even when not required."
   :type 'function)
 
 (defcustom nnmail-crosspost-link-function
-  (if (string-match "windows-nt\\|emx" (symbol-name system-type))
+  (if (string-match "windows-nt" (symbol-name system-type))
       'copy-file
     'add-name-to-file)
   "*Function called to create a copy of a file.
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index 20f7ba34b3c..682959af195 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -120,7 +120,7 @@ Used for APOP authentication.")
       (defalias 'pop3-accept-process-output 'nnheader-accept-process-output)
     ;; Borrowed from `nnheader.el':
     (defvar pop3-read-timeout
-      (if (string-match "windows-nt\\|os/2\\|emx\\|cygwin"
+      (if (string-match "windows-nt\\|os/2\\|cygwin"
                         (symbol-name system-type))
           1.0
         0.01)
diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index f9c89cd8162..785b02a2d41 100644
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -267,7 +267,7 @@ See also `imap-log'."
   :type 'string)
 
 (defcustom imap-read-timeout (if (string-match
-                                  "windows-nt\\|os/2\\|emx\\|cygwin"
+                                  "windows-nt\\|os/2\\|cygwin"
                                   (symbol-name system-type))
                                  1.0
                                0.1)