From: yamaoka Date: Mon, 17 Sep 2001 22:21:55 +0000 (+0000) Subject: Synch with Oort Gnus. X-Git-Tag: semi-gnus~8 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=91200ff35b432d9e4a9a176162c551bf756e81ed;p=elisp%2Fgnus.git- Synch with Oort Gnus. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 050749e..167c126 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,19 @@ +2001-09-17 Miles Bader + + * gnus-srvr.el (gnus-server-insert-server-line): Don't let an + error querying a backend abort the whole process. + +2001-09-17 08:00:00 ShengHuo ZHU + + * gnus-srvr.el (gnus-server-mode): Fix bogus fontification. + From Gerd M,Av(Bllmann . + +2001-09-17 Didier Verna + + * nndiary.el: version 0.2-b14. + * gnus-diary.el (gnus-diary-check-message): fix `read-string' + compatibility problem with XEmacs 21.1. + 2001-09-15 Simon Josefsson * gnus-group.el (gnus-group-line-format): Document %c. @@ -16,7 +32,7 @@ character before we wanted (never included last character). (gnus-tilde-max-form, gnus-tilde-cut-form) Made readable again, add missing "," (once per function) - + 2001-09-14 Simon Josefsson * gnus-start.el (gnus-group-mode-hook): Moved from gnus-group diff --git a/lisp/gnus-diary.el b/lisp/gnus-diary.el index ecd3845..0e8a1af 100644 --- a/lisp/gnus-diary.el +++ b/lisp/gnus-diary.el @@ -4,18 +4,18 @@ ;; Author: Didier Verna ;; Maintainer: Didier Verna -;; Created: Tue Jul 20 10:42:55 1999 under XEmacs 21.2 (beta 18) +;; Created: Tue Jul 20 10:42:55 1999 ;; Last Revision: Wed Sep 12 12:31:09 2001 ;; Keywords: calendar mail news -;; This file is part of NNDiary. +;; This file is part of Gnus. -;; NNDiary is free software; you can redistribute it and/or modify +;; Gnus is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2 of the License, or ;; (at your option) any later version. -;; NNDiary is distributed in the hope that it will be useful, +;; Gnus is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. @@ -136,6 +136,17 @@ There are currently two built-in format functions: "Current Diary backend version.") +;; Compatibility functions ================================================== + +(eval-and-compile + (if (fboundp 'kill-entire-line) + (defalias 'gnus-diary-kill-entire-line 'kill-entire-line) + (defun gnus-diary-kill-entire-line () + (beginning-of-line) + (let ((kill-whole-line t)) + (kill-line))))) + + ;; Summary line format ====================================================== (defun gnus-diary-delay-format-french (past delay) @@ -268,8 +279,7 @@ Optional prefix (or REVERSE argument) means sort in reverse order." (interactive "P") (gnus-summary-sort 'schedule reverse)) -(defvar gnus-summary-misc-menu) - +(defvar gnus-summary-misc-menu) ;; Avoid byte compiler warning. ;; The function `easy-menu-add-item' is not available under Emacs ;; versions prior to 20.3. Could anyone try to emulate it? (if (eval-when-compile @@ -346,14 +356,6 @@ Optional prefix (or REVERSE argument) means sort in reverse order." ;; Diary Message Checking =================================================== -(eval-and-compile - (if (fboundp 'kill-entire-line) - (defalias 'gnus-diary-kill-entire-line 'kill-entire-line) - (defun gnus-diary-kill-entire-line () - (beginning-of-line) - (let ((kill-whole-line t)) - (kill-line))))) - (defvar gnus-diary-header-value-history nil ;; History variable for header value prompting ) @@ -424,16 +426,14 @@ If ARG (or prefix) is non-nil, force prompting for all fields." (let ((prompt (concat (and invalid (prog1 "(current value invalid) " (beep))) - header - (and (not value) " (defaults to `*')") - ": "))) + header ": "))) (setq value (if (listp (nth 1 head)) (completing-read prompt (cons '("*" nil) (nth 1 head)) nil t value - gnus-diary-header-value-history "*") + gnus-diary-header-value-history) (read-string prompt value - gnus-diary-header-value-history "*")))) + gnus-diary-header-value-history)))) (setq ask nil) (setq invalid nil) (condition-case () diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el index 029d6aa..09eac06 100644 --- a/lisp/gnus-srvr.el +++ b/lisp/gnus-srvr.el @@ -221,7 +221,7 @@ The following specs are understood: All normal editing commands are switched off. \\ For more in-depth information on this mode, read the manual -(`\\[gnus-info-find-node]'). +\(`\\[gnus-info-find-node]'). The following commands are available: @@ -242,20 +242,22 @@ The following commands are available: (if (featurep 'xemacs) (put 'gnus-server-mode 'font-lock-defaults '(gnus-server-font-lock-keywords t)) (set (make-local-variable 'font-lock-defaults) - '(gnus-server-font-lock-keywords t))) + '(gnus-server-font-lock-keywords t))) (gnus-run-hooks 'gnus-server-mode-hook)) (defun gnus-server-insert-server-line (gnus-tmp-name method) (let* ((gnus-tmp-how (car method)) (gnus-tmp-where (nth 1 method)) (elem (assoc method gnus-opened-servers)) - (gnus-tmp-status (cond ((eq (nth 1 elem) 'denied) - "(denied)") - ((or (gnus-server-opened method) - (eq (nth 1 elem) 'ok)) - "(opened)") - (t - "(closed)"))) + (gnus-tmp-status + (if (eq (nth 1 elem) 'denied) + "(denied)" + (condition-case nil + (if (or (gnus-server-opened method) + (eq (nth 1 elem) 'ok)) + "(opened)" + "(closed)") + ((error) "(error)")))) (gnus-tmp-agent (if (and gnus-agent (member method gnus-agent-covered-methods)) diff --git a/lisp/nndiary.el b/lisp/nndiary.el index 72dd7b7..309365e 100644 --- a/lisp/nndiary.el +++ b/lisp/nndiary.el @@ -8,14 +8,14 @@ ;; Last Revision: Wed Aug 8 17:36:21 2001 ;; Keywords: calendar mail news -;; This file is part of NNDiary. +;; This file is part of Gnus. -;; NNDiary is free software; you can redistribute it and/or modify +;; Gnus is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2 of the License, or ;; (at your option) any later version. -;; NNDiary is distributed in the hope that it will be useful, +;; Gnus is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. @@ -363,25 +363,7 @@ all. This may very well take some time.") -;; $Format: "(defconst nndiary-prcs-major-version \"$ProjectMajorVersion$\")"$ -(defconst nndiary-prcs-major-version "branch-0-2") -;; $Format: "(defconst nndiary-prcs-minor-version \"$ProjectMinorVersion$\")"$ -(defconst nndiary-prcs-minor-version "13") -(defconst nndiary-version - (let ((level nndiary-prcs-minor-version) - major minor status) - (string-match "\\(branch\\|version\\)-\\([0-9]+\\)-\\([0-9]+\\)" - nndiary-prcs-major-version) - (setq major (match-string 2 nndiary-prcs-major-version) - minor (match-string 3 nndiary-prcs-major-version) - status (match-string 1 nndiary-prcs-major-version)) - (cond ((string= status "version") - (setq level (int-to-string (1- (string-to-int level)))) - (if (eq level 0) - (concat major "." minor) - (concat major "." minor "." level))) - ((string= status "branch") - (concat major "." minor "-b" level)))) +(defconst nndiary-version "0.2-b14" "Current Diary backend version.") (defun nndiary-version ()