From fd2151d4827016bca2bc23d81998f19aa8760a0c Mon Sep 17 00:00:00 2001 From: ichikawa Date: Mon, 10 Aug 1998 07:13:35 +0000 Subject: [PATCH] Sync up with gnus-5.6.30 --- lisp/ChangeLog | 34 ++++++++++++++++++++++++++++++++++ lisp/gnus-art.el | 2 +- lisp/gnus-group.el | 2 ++ lisp/gnus-salt.el | 3 ++- lisp/gnus-score.el | 2 +- lisp/gnus-soup.el | 4 +++- lisp/gnus-sum.el | 42 ++++++++++++++++++++++++------------------ lisp/gnus-uu.el | 3 ++- lisp/gnus.el | 38 ++++++++++++++++++++++---------------- lisp/message.el | 5 +++++ 10 files changed, 96 insertions(+), 39 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3589498..ed55690 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,37 @@ +Sun Aug 9 15:46:16 1998 Lars Magne Ingebrigtsen + + * gnus.el: Gnus v5.6.30 is released. + +1998-08-09 10:48:31 Lars Magne Ingebrigtsen + + * message.el (message-cite-original-without-signature): Peel off + blank lines. + + * gnus-art.el (gnus-article-maybe-highlight): Doc fix. + + * gnus-sum.el (gnus-data-enter-list): Threw away all new list data + at the beginning of the buffer. + +1998-08-07 01:41:29 Gareth Jones + + * gnus-score.el (gnus-summary-increase-score): Don't downcase + before lookin in char-to-header. + +1998-08-07 01:33:22 Lars Magne Ingebrigtsen + + * gnus.el (gnus-predefined-server-alist): Too many parentheses. + +1998-08-06 11:20:08 Lars Magne Ingebrigtsen + + * gnus.el (gnus-continuum-version): Include quassia. + + * gnus-sum.el (gnus-data-enter-list): Check before entering list. + +1998-08-06 11:13:56 Francois Felix Ingrand + + * gnus-salt.el (gnus-generate-vertical-tree): Don't go too far to + the left. + Thu Aug 6 07:58:17 1998 Lars Magne Ingebrigtsen * gnus.el: Gnus v5.6.29 is released. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 51545f9..f408833 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -2392,7 +2392,7 @@ If given a prefix, show the hidden text instead." (gnus-article-hide-signature arg)) (defun gnus-article-maybe-highlight () - "Do some article highlighting if `article-visual' is non-nil." + "Do some article highlighting if article highlighting is requested." (when (gnus-visual-p 'article-highlight 'highlight) (gnus-article-highlight-some))) diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index 1f3b8d3..f79b976 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -1786,6 +1786,8 @@ ADDRESS." (gnus-read-group "Group name: ") (gnus-read-method "From method: "))) + (when (stringp method) + (setq method (gnus-server-to-method method))) (let* ((meth (when (and method (not (gnus-server-equal method gnus-select-method))) (if address (list (intern method) address) diff --git a/lisp/gnus-salt.el b/lisp/gnus-salt.el index 5dc624e..d3c5ccf 100644 --- a/lisp/gnus-salt.el +++ b/lisp/gnus-salt.el @@ -763,7 +763,8 @@ Two predefined functions are available: (setq beg (point)) (forward-char -1) ;; Draw "-" lines leftwards. - (while (= (char-after (1- (point))) ? ) + (while (and (> (point) 1) + (= (char-after (1- (point))) ? )) (delete-char -1) (insert (car gnus-tree-parent-child-edges)) (forward-char -1)) diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el index 9b673ce..141fbd9 100644 --- a/lisp/gnus-score.el +++ b/lisp/gnus-score.el @@ -550,7 +550,7 @@ used as score." (gnus-score-insert-help "Match on header" char-to-header 1))) (gnus-score-kill-help-buffer) - (unless (setq entry (assq (downcase hchar) char-to-header)) + (unless (setq entry (assq hchar char-to-header)) (if mimic (error "%c %c" prefix hchar) (error "Illegal header type"))) diff --git a/lisp/gnus-soup.el b/lisp/gnus-soup.el index ffc08cb..0d95f4c 100644 --- a/lisp/gnus-soup.el +++ b/lisp/gnus-soup.el @@ -205,7 +205,9 @@ for matching on group names. For instance, if you want to brew on all the nnml groups, as well as groups with \"emacs\" in the name, you could say something like: -$ emacs -batch -f gnus-batch-brew-soup ^nnml \".*emacs.*\"" +$ emacs -batch -f gnus-batch-brew-soup ^nnml \".*emacs.*\" + +Note -- this function hasn't been implemented yet." (interactive) nil) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 6637201..d1f0fb5 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -1985,21 +1985,26 @@ The following commands are available: (when list (let ((data (and after-article (gnus-data-find-list after-article))) (ilist list)) - (or data (not after-article) (error "No such article: %d" after-article)) - ;; Find the last element in the list to be spliced into the main - ;; list. - (while (cdr list) - (setq list (cdr list))) - (if (not data) - (progn - (setcdr list gnus-newsgroup-data) - (setq gnus-newsgroup-data ilist) + (if (not (or data + after-article)) + (let ((odata gnus-newsgroup-data)) + (setq gnus-newsgroup-data (nconc list gnus-newsgroup-data)) (when offset - (gnus-data-update-list (cdr list) offset))) - (setcdr list (cdr data)) - (setcdr data ilist) - (when offset - (gnus-data-update-list (cdr list) offset))) + (gnus-data-update-list odata offset))) + ;; Find the last element in the list to be spliced into the main + ;; list. + (while (cdr list) + (setq list (cdr list))) + (if (not data) + (progn + (setcdr list gnus-newsgroup-data) + (setq gnus-newsgroup-data ilist) + (when offset + (gnus-data-update-list (cdr list) offset))) + (setcdr list (cdr data)) + (setcdr data ilist) + (when offset + (gnus-data-update-list (cdr list) offset)))) (setq gnus-newsgroup-data-reverse nil)))) (defun gnus-data-remove (article &optional offset) @@ -3259,10 +3264,11 @@ If LINE, insert the rebuilt thread starting on line LINE." ;;!!! then we want to insert at the beginning of the buffer. ;;!!! That happens to be true with Gnus now, but that may ;;!!! change in the future. Perhaps. - (gnus-data-enter-list (if line nil current) data (- (point) old-pos)) - (setq gnus-newsgroup-threads (nconc threads gnus-newsgroup-threads)) - (when line - (gnus-data-compute-positions))))) + (gnus-data-enter-list + (if line nil current) data (- (point) old-pos)) + (setq gnus-newsgroup-threads + (nconc threads gnus-newsgroup-threads)) + (gnus-data-compute-positions)))) (defun gnus-number-to-header (number) "Return the header for article NUMBER." diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el index 4512edb..dca97f0 100644 --- a/lisp/gnus-uu.el +++ b/lisp/gnus-uu.el @@ -1291,7 +1291,8 @@ didn't work, and overwrite existing files. Otherwise, ask each time." (file-exists-p result-file) (not gnus-uu-be-dangerous) (or (eq gnus-uu-be-dangerous t) - (gnus-y-or-n-p (format "Delete incomplete file %s? " result-file))) + (gnus-y-or-n-p + (format "Delete incomplete file %s? " result-file))) (delete-file result-file)) ;; If this was a file of the wrong sort, then diff --git a/lisp/gnus.el b/lisp/gnus.el index f099a5b..b61039f 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -250,11 +250,11 @@ is restarted, and sometimes reloaded." :link '(custom-manual "(gnus)Exiting Gnus") :group 'gnus) -(defconst gnus-version-number "6.8.7" +(defconst gnus-version-number "6.8.8" "Version number for this version of gnus.") (defconst gnus-version - (format "Semi-gnus %s (based on Gnus 5.6.29; for SEMI 1.8, FLIM 1.8/1.9)" + (format "Semi-gnus %s (based on Gnus 5.6.30; for SEMI 1.8, FLIM 1.8/1.9)" gnus-version-number) "Version string for this version of gnus.") @@ -1422,11 +1422,11 @@ want." (defvar gnus-predefined-server-alist `(("cache" - (nnspool "cache" - (nnspool-spool-directory gnus-cache-directory) - (nnspool-nov-directory gnus-cache-directory) - (nnspool-active-file - (nnheader-concat gnus-cache-directory "active"))))) + nnspool "cache" + (nnspool-spool-directory gnus-cache-directory) + (nnspool-nov-directory gnus-cache-directory) + (nnspool-active-file + (nnheader-concat gnus-cache-directory "active")))) "List of predefined (convenience) servers.") (defvar gnus-topic-indentation "") ;; Obsolete variable. @@ -1977,13 +1977,15 @@ If ARG, insert string at point." "Return VERSION as a floating point number." (when (or (string-match "^\\([^ ]+\\)? ?Gnus v?\\([0-9.]+\\)$" version) (string-match "^\\(.?\\)gnus-\\([0-9.]+\\)$" version)) - (let* ((alpha (and (match-beginning 1) (match-string 1 version))) - (number (match-string 2 version)) - major minor least) - (string-match "\\([0-9]\\)\\.\\([0-9]+\\)\\.?\\([0-9]+\\)?" number) - (setq major (string-to-number (match-string 1 number))) - (setq minor (string-to-number (match-string 2 number))) - (setq least (if (match-beginning 3) + (let ((alpha (and (match-beginning 1) (match-string 1 version))) + (number (match-string 2 version)) + major minor least) + (unless (string-match + "\\([0-9]\\)\\.\\([0-9]+\\)\\.?\\([0-9]+\\)?" number) + (error "Invalid version string: %s" version)) + (setq major (string-to-number (match-string 1 number)) + minor (string-to-number (match-string 2 number)) + least (if (match-beginning 3) (string-to-number (match-string 3 number)) 0)) (string-to-number @@ -1992,7 +1994,11 @@ If ARG, insert string at point." (cond ((member alpha '("(ding)" "d")) "4.99") ((member alpha '("September" "s")) "5.01") - ((member alpha '("Red" "r")) "5.03")) + ((member alpha '("Red" "r")) "5.03") + ((member alpha '("Quassia" "q")) "5.05") + ((member alpha '("p")) "5.07") + ((member alpha '("o")) "5.09") + ((member alpha '("n")) "5.11")) minor least) (format "%d.%02d%02d" major minor least)))))) @@ -2035,7 +2041,7 @@ g -- Group name." (setq prompt (match-string 1 string))) (setq i (match-end 0)) ;; We basically emulate just about everything that - ;; `interactive' does, but adds the "g" and "G" specs. + ;; `interactive' does, but add the specs listed above. (push (cond ((= c ?a) diff --git a/lisp/message.el b/lisp/message.el index e252079..c9f781b 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -1743,6 +1743,11 @@ prefix, and don't delete any headers." (list message-indent-citation-function))))) (goto-char end) (when (re-search-backward "^-- $" start t) + ;; Also peel off any blank lines before the signature. + (forward-line -1) + (while (looking-at "^[ \t]*$") + (forward-line -1)) + (forward-line 1) (delete-region (point) end)) (goto-char start) (while functions -- 1.7.10.4