[Emacs-diffs] /srv/bzr/emacs/trunk r101226: 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 <address@hidden>.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101226
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2010-08-30 23:24:56 +0000
message:
  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 <address@hidden>.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-group.el
  lisp/gnus/mailcap.el
  lisp/gnus/message.el
  lisp/gnus/mm-util.el
  lisp/gnus/nnheader.el
  lisp/gnus/nnmail.el
  lisp/gnus/pop3.el
  lisp/net/imap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-08-30 06:32:33 +0000
+++ b/lisp/gnus/ChangeLog       2010-08-30 23:24:56 +0000
@@ -1,3 +1,8 @@
+2010-08-30  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * gnus-group.el (gnus-group-completing-read): Add 'substring to
+       completion-styles for group selection.
+
 2009-02-04  Andreas Schwab  <address@hidden>
 
        * gnus-score.el (gnus-score-string): Fix regex for matching extra

=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el   2010-05-07 06:58:17 +0000
+++ b/lisp/gnus/gnus-group.el   2010-08-30 23:24:56 +0000
@@ -2202,7 +2202,9 @@
 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)

=== modified file 'lisp/gnus/mailcap.el'
--- a/lisp/gnus/mailcap.el      2010-01-13 08:35:10 +0000
+++ b/lisp/gnus/mailcap.el      2010-08-30 23:24:56 +0000
@@ -335,7 +335,7 @@
   :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.")
 
 ;;;

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2010-08-30 06:25:05 +0000
+++ b/lisp/gnus/message.el      2010-08-30 23:24:56 +0000
@@ -5433,7 +5433,7 @@
           (* 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 @@
       (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"))

=== modified file 'lisp/gnus/mm-util.el'
--- a/lisp/gnus/mm-util.el      2010-05-10 12:07:40 +0000
+++ b/lisp/gnus/mm-util.el      2010-08-30 23:24:56 +0000
@@ -680,7 +680,7 @@
   "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 @@
 (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))

=== modified file 'lisp/gnus/nnheader.el'
--- a/lisp/gnus/nnheader.el     2010-03-19 02:55:37 +0000
+++ b/lisp/gnus/nnheader.el     2010-08-30 23:24:56 +0000
@@ -77,7 +77,7 @@
   "*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/address@hidden
       ;;
@@ -102,7 +102,7 @@
 (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 @@
        ;; 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.

=== modified file 'lisp/gnus/nnmail.el'
--- a/lisp/gnus/nnmail.el       2010-08-01 23:49:32 +0000
+++ b/lisp/gnus/nnmail.el       2010-08-30 23:24:56 +0000
@@ -265,7 +265,7 @@
   :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.

=== modified file 'lisp/gnus/pop3.el'
--- a/lisp/gnus/pop3.el 2010-03-23 07:37:09 +0000
+++ b/lisp/gnus/pop3.el 2010-08-30 23:24:56 +0000
@@ -120,7 +120,7 @@
       (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)

=== modified file 'lisp/net/imap.el'
--- a/lisp/net/imap.el  2010-05-25 02:11:08 +0000
+++ b/lisp/net/imap.el  2010-08-30 23:24:56 +0000
@@ -267,7 +267,7 @@
   :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)