From 1859f381e7fdc6e127a2335d7c217c6c6c33f39c Mon Sep 17 00:00:00 2001 From: morioka Date: Tue, 24 Feb 1998 16:39:40 +0000 Subject: [PATCH] Quassia Gnus v0.32. --- lisp/ChangeLog | 22 +++++++++++ lisp/gnus-agent.el | 8 ++-- lisp/gnus-cite.el | 5 ++- lisp/gnus-srvr.el | 14 ++++--- lisp/gnus-topic.el | 105 ++++++++++++++++++++++++++-------------------------- lisp/gnus.el | 2 +- lisp/message.el | 3 +- lisp/nnweb.el | 50 +++++++++++++------------ texi/ChangeLog | 9 +++++ texi/dir | 9 +++++ texi/gnus.texi | 12 ++++-- texi/message.texi | 9 +++-- 12 files changed, 154 insertions(+), 94 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1cb48d1..fe61cf7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,25 @@ +Mon Feb 23 18:06:47 1998 Lars Magne Ingebrigtsen + + * gnus.el: Quassia Gnus v0.32 is released. + +Mon Feb 23 17:48:42 1998 Lars Magne Ingebrigtsen + + * gnus-cite.el (gnus-article-hide-citation-maybe): Wrong + interactive specs. + (gnus-cite-toggle): Maybe parse. + +Mon Feb 23 05:26:11 1998 Rui-Tao Dong ~{6-HpLN~} + + * nnweb.el (nnweb-type-definition): Fixed. + +Sun Feb 22 18:10:53 1998 Lars Magne Ingebrigtsen + + * gnus-agent.el (gnus-agent-group-path): Translate right chars. + (gnus-agent-toggle-plugged): Allow proper closing. + + * gnus-srvr.el (gnus-browse-read-group): Allow entering + non-ephemeral groups. + Sun Feb 22 04:21:15 1998 Lars Magne Ingebrigtsen * gnus.el: Quassia Gnus v0.31 is released. diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index 7bf5518..ed4cc72 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -236,12 +236,13 @@ (defun gnus-agent-toggle-plugged (plugged) "Toggle whether Gnus is unplugged or not." (interactive (list (not gnus-plugged))) - (setq gnus-plugged plugged) (if plugged (progn + (setq gnus-plugged plugged) (gnus-run-hooks 'gnus-agent-plugged-hook) (setcar (cdr gnus-agent-mode-status) " Plugged")) (gnus-agent-close-connections) + (setq gnus-plugged plugged) (gnus-run-hooks 'gnus-agent-unplugged-hook) (setcar (cdr gnus-agent-mode-status) " Unplugged")) (set-buffer-modified-p t)) @@ -481,8 +482,9 @@ the actual number of articles toggled is returned." "Translate GROUP into a path." (if nnmail-use-long-file-names group - (nnheader-translate-file-chars - (nnheader-replace-chars-in-string group ?. ?/)))) + (nnheader-replace-chars-in-string + (nnheader-translate-file-chars group) + ?. ?/))) diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el index c6aefb6..4230388 100644 --- a/lisp/gnus-cite.el +++ b/lisp/gnus-cite.el @@ -507,7 +507,7 @@ always hide." (defun gnus-article-toggle-cited-text (region) "Toggle hiding the text in REGION." (let (buffer-read-only) - (funcall + (funcall (if (text-property-any (car region) (1- (cdr region)) (car gnus-hidden-properties) (cadr gnus-hidden-properties)) @@ -523,7 +523,7 @@ percent and at least `gnus-cite-hide-absolute' lines of the body is cited text with attributions. When called interactively, these two variables are ignored. See also the documentation for `gnus-article-highlight-citation'." - (interactive (list (gnus-article-hidden-arg) 'force)) + (interactive (append (gnus-article-hidden-arg) '(force))) (unless (gnus-article-check-hidden-text 'cite arg) (save-excursion (set-buffer gnus-article-buffer) @@ -882,6 +882,7 @@ See also the documentation for `gnus-article-highlight-citation'." (defun gnus-cite-toggle (prefix) (save-excursion (set-buffer gnus-article-buffer) + (gnus-cite-parse-maybe) (let ((buffer-read-only nil) (numbers (cdr (assoc prefix gnus-cite-prefix-alist))) (inhibit-point-motion-hooks t) diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el index 3018e8f..22089c1 100644 --- a/lisp/gnus-srvr.el +++ b/lisp/gnus-srvr.el @@ -642,11 +642,15 @@ buffer. "Enter the group at the current line." (interactive) (let ((group (gnus-browse-group-name))) - (unless (gnus-group-read-ephemeral-group - group gnus-browse-current-method nil - (cons (current-buffer) 'browse)) - (error "Couldn't enter %s" group)))) - + (if (or (not (gnus-get-info group)) + (gnus-ephemeral-group-p group)) + (unless (gnus-group-read-ephemeral-group + group gnus-browse-current-method nil + (cons (current-buffer) 'browse)) + (error "Couldn't enter %s" group)) + (unless (gnus-group-read-group nil no-article group) + (error "Couldn't enter %s" group))))) + (defun gnus-browse-select-group () "Select the current group." (interactive) diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el index d1c62b2..178bcb9 100644 --- a/lisp/gnus-topic.el +++ b/lisp/gnus-topic.el @@ -734,59 +734,60 @@ articles in the topic and its subtopics." "Run when changing levels to enter/remove groups from topics." (save-excursion (set-buffer gnus-group-buffer) - (unless gnus-topic-inhibit-change-level - (gnus-group-goto-group (or (car (nth 2 previous)) group)) - (when (and gnus-topic-mode - gnus-topic-alist - (not gnus-topic-inhibit-change-level)) - ;; Remove the group from the topics. - (if (and (< oldlevel gnus-level-zombie) - (>= level gnus-level-zombie)) - (let ((alist gnus-topic-alist)) - (while (gnus-group-goto-group group) - (gnus-delete-line)) - (while alist - (when (member group (car alist)) - (setcdr (car alist) (delete group (cdar alist)))) - (pop alist))) - ;; If the group is subscribed we enter it into the topics. - (when (and (< level gnus-level-zombie) - (>= oldlevel gnus-level-zombie)) - (let* ((prev (gnus-group-group-name)) - (gnus-topic-inhibit-change-level t) - (gnus-group-indentation - (make-string - (* gnus-topic-indent-level - (or (save-excursion - (gnus-topic-goto-topic (gnus-current-topic)) - (gnus-group-topic-level)) - 0)) - ? )) - (yanked (list group)) - alist talist end) - ;; Then we enter the yanked groups into the topics they belong - ;; to. - (when (setq alist (assoc (save-excursion - (forward-line -1) - (or - (gnus-current-topic) - (caar gnus-topic-topology))) - gnus-topic-alist)) - (setq talist alist) - (when (stringp yanked) - (setq yanked (list yanked))) - (if (not prev) - (nconc alist yanked) - (if (not (cdr alist)) - (setcdr alist (nconc yanked (cdr alist))) - (while (and (not end) (cdr alist)) - (when (equal (cadr alist) prev) + (let ((buffer-read-only nil)) + (unless gnus-topic-inhibit-change-level + (gnus-group-goto-group (or (car (nth 2 previous)) group)) + (when (and gnus-topic-mode + gnus-topic-alist + (not gnus-topic-inhibit-change-level)) + ;; Remove the group from the topics. + (if (and (< oldlevel gnus-level-zombie) + (>= level gnus-level-zombie)) + (let ((alist gnus-topic-alist)) + (while (gnus-group-goto-group group) + (gnus-delete-line)) + (while alist + (when (member group (car alist)) + (setcdr (car alist) (delete group (cdar alist)))) + (pop alist))) + ;; If the group is subscribed we enter it into the topics. + (when (and (< level gnus-level-zombie) + (>= oldlevel gnus-level-zombie)) + (let* ((prev (gnus-group-group-name)) + (gnus-topic-inhibit-change-level t) + (gnus-group-indentation + (make-string + (* gnus-topic-indent-level + (or (save-excursion + (gnus-topic-goto-topic (gnus-current-topic)) + (gnus-group-topic-level)) + 0)) + ? )) + (yanked (list group)) + alist talist end) + ;; Then we enter the yanked groups into the topics they belong + ;; to. + (when (setq alist (assoc (save-excursion + (forward-line -1) + (or + (gnus-current-topic) + (caar gnus-topic-topology))) + gnus-topic-alist)) + (setq talist alist) + (when (stringp yanked) + (setq yanked (list yanked))) + (if (not prev) + (nconc alist yanked) + (if (not (cdr alist)) (setcdr alist (nconc yanked (cdr alist))) - (setq end t)) - (setq alist (cdr alist))) - (unless end - (nconc talist yanked)))))) - (gnus-topic-update-topic))))))) + (while (and (not end) (cdr alist)) + (when (equal (cadr alist) prev) + (setcdr alist (nconc yanked (cdr alist))) + (setq end t)) + (setq alist (cdr alist))) + (unless end + (nconc talist yanked)))))) + (gnus-topic-update-topic)))))))) (defun gnus-topic-goto-next-group (group props) "Go to group or the next group after group." diff --git a/lisp/gnus.el b/lisp/gnus.el index 52d04ab..91ba202 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -246,7 +246,7 @@ is restarted, and sometimes reloaded." :link '(custom-manual "(gnus)Exiting Gnus") :group 'gnus) -(defconst gnus-version-number "0.31" +(defconst gnus-version-number "0.32" "Version number for this version of Gnus.") (defconst gnus-version (format "Quassia Gnus v%s" gnus-version-number) diff --git a/lisp/message.el b/lisp/message.el index c5365a6..1cc9649 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -440,8 +440,7 @@ the signature is inserted." :type 'hook) (defcustom message-header-setup-hook nil - "Hook called narrowed to the headers when setting up a message -buffer." + "Hook called narrowed to the headers when setting up a message buffer." :group 'message-various :type 'hook) diff --git a/lisp/nnweb.el b/lisp/nnweb.el index 2f2817e..cbb04ed 100644 --- a/lisp/nnweb.el +++ b/lisp/nnweb.el @@ -53,13 +53,13 @@ (article . nnweb-dejanews-wash-article) (map . nnweb-dejanews-create-mapping) (search . nnweb-dejanews-search) - (address . "http://x5.dejanews.com/dnquery.xp") + (address . "http://x8.dejanews.com/dnquery.xp") (identifier . nnweb-dejanews-identity)) (dejanewsold (article . nnweb-dejanews-wash-article) (map . nnweb-dejanews-create-mapping) (search . nnweb-dejanewsold-search) - (address . "http://x5.dejanews.com/dnquery.xp") + (address . "http://x8.dejanews.com/dnquery.xp") (identifier . nnweb-dejanews-identity)) (reference (article . nnweb-reference-wash-article) @@ -79,7 +79,7 @@ (defvoo nnweb-search nil "Search string to feed to DejaNews.") -(defvoo nnweb-max-hits 100 +(defvoo nnweb-max-hits 999 "Maximum number of hits to display.") (defvoo nnweb-ephemeral-p nil @@ -379,49 +379,53 @@ (case-fold-search t) (active (or (cadr (assoc nnweb-group nnweb-group-alist)) (cons 1 0))) - Subject Score Date Newsgroup Author + Subject (Score "0") Date Newsgroup Author map url) (while more ;; Go through all the article hits on this page. (goto-char (point-min)) (nnweb-decode-entities) (goto-char (point-min)) - (while (re-search-forward "^ +[0-9]+\\." nil t) + (while (re-search-forward "^

\n" nil t) (narrow-to-region (point) - (cond ((re-search-forward "^ +[0-9]+\\." nil t) + (cond ((re-search-forward "^

\n" nil t) (match-beginning 0)) ((search-forward "\n\n" nil t) (point)) (t (point-max)))) (goto-char (point-min)) - (when (looking-at ".*HREF=\"\\([^\"]+\\)\"") - (setq url (match-string 1))) - (nnweb-remove-markup) - (goto-char (point-min)) - (while (search-forward "\t" nil t) - (replace-match " ")) - (goto-char (point-min)) - (while (re-search-forward "^ +\\([^:]+\\): +\\(.*\\)$" nil t) - (set (intern (match-string 1)) (match-string 2))) + (looking-at ".*HREF=\"\\([^\"]+\\)\"\\(.*\\)") + (setq url (match-string 1)) + (let ((begin (point))) + (nnweb-remove-markup) + (goto-char begin) + (while (search-forward "\t" nil t) + (replace-match " ")) + (goto-char begin) + (end-of-line) + (setq Subject (buffer-substring begin (point))) + (if (re-search-forward + "^ Newsgroup: \\(.*\\)\n Posted on \\([0-9/]+\\) by \\(.*\\)$" nil t) + (setq Newsgroup (match-string 1) + Date (match-string 2) + Author (match-string 3)))) (widen) - (when (string-match "#[0-9]+/[0-9]+ *$" Subject) - (setq Subject (substring Subject 0 (match-beginning 0)))) (incf i) (unless (nnweb-get-hashtb url) (push (list (incf (cdr active)) (make-full-mail-header - (cdr active) (concat "(" Newsgroup ") " Subject) Author Date + (cdr active) Subject Author Date (concat "<" (nnweb-identifier url) "@dejanews>") nil 0 (string-to-int Score) url)) map) (nnweb-set-hashtb (cadar map) (car map)))) ;; See whether there is a "Get next 20 hits" button here. (if (or (not (re-search-forward - "HREF=\"\\([^\"]+\\)\">Get next" nil t)) + "HREF=\"\\([^\"]+\\)\"[<>b]+Next result" nil t)) (>= i nnweb-max-hits)) (setq more nil) ;; Yup -- fetch it. @@ -460,9 +464,9 @@ ("defaultOp" . "AND") ("svcclass" . "dncurrent") ("maxhits" . "100") - ("format" . "verbose") + ("format" . "verbose2") ("threaded" . "0") - ("showsort" . "score") + ("showsort" . "date") ("agesign" . "1") ("ageweight" . "1"))) t) @@ -474,9 +478,9 @@ ("defaultOp" . "AND") ("svcclass" . "dnold") ("maxhits" . "100") - ("format" . "verbose") + ("format" . "verbose2") ("threaded" . "0") - ("showsort" . "score") + ("showsort" . "date") ("agesign" . "1") ("ageweight" . "1"))) t) diff --git a/texi/ChangeLog b/texi/ChangeLog index 960af18..a3b0c50 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,12 @@ +Mon Feb 23 18:05:09 1998 Lars Magne Ingebrigtsen + + * gnus.texi: Direntry not handled by Emacs 19.34. + +1998-02-21 SL Baur + + * gnus.texi: Add a direntry field. + * message.texi: Ditto. (Data taken from Emacs 20.2 info/dir). + Sun Feb 22 03:24:43 1998 Lars Magne Ingebrigtsen * gnus.texi (Score File Format): Addition. diff --git a/texi/dir b/texi/dir index e69de29..a169da0 100644 --- a/texi/dir +++ b/texi/dir @@ -0,0 +1,9 @@ +-*- Text -*- +The Gnus-related top node. + +File: dir Node: Top This is the Gnus Info tree + +* Menu: + +* Gnus: (gnus). The news reader Gnus. +* Message: (message). The Message sending thingamabob. diff --git a/texi/gnus.texi b/texi/gnus.texi index c2f6e28..ee0fbb7 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -1,10 +1,13 @@ \input texinfo @c -*-texinfo-*- @setfilename gnus -@settitle Quassia Gnus 0.31 Manual +@settitle Quassia Gnus 0.32 Manual @synindex fn cp @synindex vr cp @synindex pg cp +@c @direntry +@c * Gnus: (gnus). The news reader Gnus. +@c @end direntry @iftex @finalout @end iftex @@ -313,7 +316,7 @@ into another language, under the above conditions for modified versions. @tex @titlepage -@title Quassia Gnus 0.31 Manual +@title Quassia Gnus 0.32 Manual @author by Lars Magne Ingebrigtsen @page @@ -349,7 +352,7 @@ can be gotten by any nefarious means you can think of---@sc{nntp}, local spool or your mbox file. All at the same time, if you want to push your luck. -This manual corresponds to Quassia Gnus 0.31. +This manual corresponds to Quassia Gnus 0.32. @end ifinfo @@ -17293,6 +17296,9 @@ in the head or body. Allow breaking lengthy NNTP commands. @item +gnus-article-highlight-limit, to disable highlighting in big articles. + +@item Solve the halting problem. @c TODO diff --git a/texi/message.texi b/texi/message.texi index e595e61..08eb899 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -1,10 +1,13 @@ \input texinfo @c -*-texinfo-*- @setfilename message -@settitle Message 0.31 Manual +@settitle Message 0.32 Manual @synindex fn cp @synindex vr cp @synindex pg cp +@c @direntry +@c * Message: (message). Mail and news composition mode that goes with Gnus. +@c @end direntry @iftex @finalout @end iftex @@ -39,7 +42,7 @@ into another language, under the above conditions for modified versions. @tex @titlepage -@title Message 0.31 Manual +@title Message 0.32 Manual @author by Lars Magne Ingebrigtsen @page @@ -80,7 +83,7 @@ Message mode buffers. * Key Index:: List of Message mode keys. @end menu -This manual corresponds to Message 0.31. Message is distributed with +This manual corresponds to Message 0.32. Message is distributed with the Gnus distribution bearing the same version number as this manual has. -- 1.7.10.4