[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/gnus/gnus.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/gnus/gnus.el [lexbind] |
Date: |
Wed, 06 Oct 2004 01:43:18 -0400 |
Index: emacs/lisp/gnus/gnus.el
diff -c emacs/lisp/gnus/gnus.el:1.23.4.4 emacs/lisp/gnus/gnus.el:1.23.4.5
*** emacs/lisp/gnus/gnus.el:1.23.4.4 Wed Oct 6 05:21:53 2004
--- emacs/lisp/gnus/gnus.el Wed Oct 6 05:23:52 2004
***************
*** 282,288 ****
:link '(custom-manual "(gnus)Exiting Gnus")
:group 'gnus)
! (defconst gnus-version-number "5.10.6"
"Version number for this version of Gnus.")
(defconst gnus-version (format "Gnus v%s" gnus-version-number)
--- 282,288 ----
:link '(custom-manual "(gnus)Exiting Gnus")
:group 'gnus)
! (defconst gnus-version-number "5.11"
"Version number for this version of Gnus.")
(defconst gnus-version (format "Gnus v%s" gnus-version-number)
***************
*** 1104,1112 ****
(and (file-readable-p gnus-nntpserver-file)
(with-temp-buffer
(insert-file-contents gnus-nntpserver-file)
! (let ((name (buffer-string)))
! (unless (string-match "\\`[ \t\n]*$" name)
! name))))))
(defcustom gnus-select-method
(condition-case nil
--- 1104,1111 ----
(and (file-readable-p gnus-nntpserver-file)
(with-temp-buffer
(insert-file-contents gnus-nntpserver-file)
! (when (re-search-forward "[^ \t\n\r]+" nil t)
! (match-string 0))))))
(defcustom gnus-select-method
(condition-case nil
***************
*** 3262,3267 ****
--- 3261,3298 ----
(nth 1 method))))
method)))
+ (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)))
+
(defsubst gnus-server-to-method (server)
"Map virtual server names to select methods."
(or (and server (listp server) server)
***************
*** 3309,3346 ****
(push (cons server result) gnus-server-method-cache))
result)))
- (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)))
-
(defsubst gnus-server-get-method (group method)
;; Input either a server name, and extended server name, or a
;; select method, and return a select method.
--- 3340,3345 ----
- [Emacs-diffs] Changes to emacs/lisp/gnus/gnus.el [lexbind],
Miles Bader <=