/[emacs]/emacs/lisp/gnus/gnus.el
ViewVC logotype

Diff of /emacs/lisp/gnus/gnus.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.26.6.3 by miles, Tue Sep 21 09:34:07 2004 UTC revision 1.26.6.4 by miles, Wed Sep 29 07:22:15 2004 UTC
# Line 282  is restarted, and sometimes reloaded." Line 282  is restarted, and sometimes reloaded."
282    :link '(custom-manual "(gnus)Exiting Gnus")    :link '(custom-manual "(gnus)Exiting Gnus")
283    :group 'gnus)    :group 'gnus)
284    
285  (defconst gnus-version-number "5.10.6"  (defconst gnus-version-number "5.11"
286    "Version number for this version of Gnus.")    "Version number for this version of Gnus.")
287    
288  (defconst gnus-version (format "Gnus v%s" gnus-version-number)  (defconst gnus-version (format "Gnus v%s" gnus-version-number)
# Line 1104  Check the NNTPSERVER environment variabl Line 1104  Check the NNTPSERVER environment variabl
1104        (and (file-readable-p gnus-nntpserver-file)        (and (file-readable-p gnus-nntpserver-file)
1105             (with-temp-buffer             (with-temp-buffer
1106               (insert-file-contents gnus-nntpserver-file)               (insert-file-contents gnus-nntpserver-file)
1107               (let ((name (buffer-string)))               (when (re-search-forward "[^ \t\n\r]+" nil t)
1108                 (unless (string-match "\\`[ \t\n]*$" name)                 (match-string 0))))))
                  name))))))  
1109    
1110  (defcustom gnus-select-method  (defcustom gnus-select-method
1111    (condition-case nil    (condition-case nil
# Line 3309  that that variable is buffer-local to th Line 3308  that that variable is buffer-local to th
3308            (push (cons server result) gnus-server-method-cache))            (push (cons server result) gnus-server-method-cache))
3309          result)))          result)))
3310    
 (defsubst gnus-method-to-server (method)  
   (catch 'server-name  
     (setq method (or method gnus-select-method))  
   
     ;; Perhaps it is already in the cache.  
     (mapc (lambda (name-method)  
             (if (equal (cdr name-method) method)  
                 (throw 'server-name (car name-method))))  
           gnus-server-method-cache)  
   
     (mapc  
      (lambda (server-alist)  
        (mapc (lambda (name-method)  
                (when (gnus-methods-equal-p (cdr name-method) method)  
                  (unless (member name-method gnus-server-method-cache)  
                    (push name-method gnus-server-method-cache))  
                  (throw 'server-name (car name-method))))  
              server-alist))  
      (let ((alists (list gnus-server-alist  
                          gnus-predefined-server-alist)))  
        (if gnus-select-method  
            (push (list (cons "native" gnus-select-method)) alists))  
        alists))  
   
     (let* ((name (if (member (cadr method) '(nil ""))  
                      (format "%s" (car method))  
                    (format "%s:%s" (car method) (cadr method))))  
            (name-method (cons name method)))  
       (unless (member name-method gnus-server-method-cache)  
         (push name-method gnus-server-method-cache))  
       name)))  
   
3311  (defsubst gnus-server-get-method (group method)  (defsubst gnus-server-get-method (group method)
3312    ;; Input either a server name, and extended server name, or a    ;; Input either a server name, and extended server name, or a
3313    ;; select method, and return a select method.    ;; select method, and return a select method.

Legend:
Removed from v.1.26.6.3  
changed lines
  Added in v.1.26.6.4

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26