From 18fe1d851456217192153b276ae60c0fd252b565 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sat, 8 Mar 1997 07:36:39 +0000 Subject: [PATCH] *** empty log message *** --- lisp/ChangeLog | 21 ++++++++++++++ lisp/gnus-art.el | 70 ++++++++++++++++++++++------------------------ lisp/gnus-group.el | 1 + lisp/gnus-spec.el | 2 ++ lisp/gnus-sum.el | 1 + lisp/gnus.el | 18 +++--------- lisp/message.el | 64 ++++++++++++++++++++++-------------------- texi/ChangeLog | 5 ++++ texi/gnus.texi | 12 ++++++-- 9 files changed, 110 insertions(+), 84 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a09e91443..7a30fbbab 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,24 @@ +Sat Mar 8 08:34:22 1997 Lars Magne Ingebrigtsen + + * gnus.el: Gnus v5.4.23 is released. + +Sat Mar 8 02:09:53 1997 Lars Magne Ingebrigtsen + + * message.el (message-font-lock-keywords): Recognize continuation + headers. + + * gnus-group.el (gnus-group-expire-articles): Touch dribble + buffer. + + * gnus-sum.el (gnus-summary-default-score): Doc fix. + + * gnus.el (gnus-local-organization): Doc fix. + + * gnus-spec.el (gnus-compile): Don't work under XEmacs. + + * gnus-art.el (gnus-article-highlight-headers): Work on bodiless + articles. + Fri Mar 7 23:33:34 1997 Lars Magne Ingebrigtsen * gnus.el: Gnus v5.4.22 is released. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 15cfadb50..84b2dfc01 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -419,10 +419,10 @@ above them." (defface gnus-header-from-face '((((class color) (background dark)) - (:foreground "green1" :bold t :italic t)) + (:foreground "spring green" :bold t :italic t)) (((class color) (background light)) - (:foreground "MidnightBlue" :bold t :italic t)) + (:foreground "indianred" :bold t :italic t)) (t (:bold t :italic t))) "Face used for displaying from headers." @@ -432,7 +432,7 @@ above them." (defface gnus-header-subject-face '((((class color) (background dark)) - (:foreground "green3" :bold t :italic t)) + (:foreground "SeaGreen3" :bold t :italic t)) (((class color) (background light)) (:foreground "firebrick" :bold t :italic t)) @@ -448,7 +448,7 @@ above them." (:foreground "yellow" :bold t :italic t)) (((class color) (background light)) - (:foreground "indianred" :bold t :italic t)) + (:foreground "MidnightBlue" :bold t :italic t)) (t (:bold t :italic t))) "Face used for displaying newsgroups headers." @@ -458,10 +458,10 @@ above them." (defface gnus-header-name-face '((((class color) (background dark)) - (:foreground "green4" :bold t)) + (:foreground "SeaGreen")) (((class color) (background light)) - (:foreground "DarkGreen" :bold t)) + (:foreground "maroon")) (t (:bold t))) "Face used for displaying header names." @@ -474,7 +474,7 @@ above them." (:foreground "forest green" :italic t)) (((class color) (background light)) - (:foreground "DarkGreen" :italic t)) + (:foreground "indianred4" :italic t)) (t (:italic t))) "Face used for displaying header content." :group 'gnus-article-headers @@ -2652,35 +2652,33 @@ do the highlighting. See the documentation for those functions." (case-fold-search t) (inhibit-point-motion-hooks t) entry regexp header-face field-face from hpoints fpoints) - (goto-char (point-min)) - (when (search-forward "\n\n" nil t) - (narrow-to-region (1- (point)) (point-min)) - (while (setq entry (pop alist)) - (goto-char (point-min)) - (setq regexp (concat "^\\(" - (if (string-equal "" (nth 0 entry)) - "[^\t ]" - (nth 0 entry)) - "\\)") - header-face (nth 1 entry) - field-face (nth 2 entry)) - (while (and (re-search-forward regexp nil t) - (not (eobp))) - (beginning-of-line) - (setq from (point)) - (unless (search-forward ":" nil t) - (forward-char 1)) - (when (and header-face - (not (memq (point) hpoints))) - (push (point) hpoints) - (gnus-put-text-property from (point) 'face header-face)) - (when (and field-face - (not (memq (setq from (point)) fpoints))) - (push from fpoints) - (if (re-search-forward "^[^ \t]" nil t) - (forward-char -2) - (goto-char (point-max))) - (gnus-put-text-property from (point) 'face field-face))))))))) + (message-narrow-to-head) + (while (setq entry (pop alist)) + (goto-char (point-min)) + (setq regexp (concat "^\\(" + (if (string-equal "" (nth 0 entry)) + "[^\t ]" + (nth 0 entry)) + "\\)") + header-face (nth 1 entry) + field-face (nth 2 entry)) + (while (and (re-search-forward regexp nil t) + (not (eobp))) + (beginning-of-line) + (setq from (point)) + (unless (search-forward ":" nil t) + (forward-char 1)) + (when (and header-face + (not (memq (point) hpoints))) + (push (point) hpoints) + (gnus-put-text-property from (point) 'face header-face)) + (when (and field-face + (not (memq (setq from (point)) fpoints))) + (push from fpoints) + (if (re-search-forward "^[^ \t]" nil t) + (forward-char -2) + (goto-char (point-max))) + (gnus-put-text-property from (point) 'face field-face)))))))) (defun gnus-article-highlight-signature () "Highlight the signature in an article. diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index ae849e057..2975be983 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -2488,6 +2488,7 @@ or nil if no action could be taken." (gnus-uncompress-sequence (cdr expirable)) group)))) (gnus-close-group group)) (gnus-message 6 "Expiring articles in %s...done" group))) + (gnus-dribble-touch) (gnus-group-position-point)))) (defun gnus-group-expire-all-groups () diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el index e1323408a..44cf937a3 100644 --- a/lisp/gnus-spec.el +++ b/lisp/gnus-spec.el @@ -500,6 +500,8 @@ If PROPS, insert the result." (defun gnus-compile () "Byte-compile the user-defined format specs." (interactive) + (when gnus-xemacs + (error "Can't compile specs under XEmacs")) (let ((entries gnus-format-specs) (byte-compile-warnings '(unresolved callargs redefine)) entry gnus-tmp-func) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 19ab7e661..8114b0b62 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -158,6 +158,7 @@ If nil, only the marking commands will go to the next (un)read article." (defcustom gnus-summary-default-score 0 "*Default article score level. +All scores generated by the score files will be added to this score. If this variable is nil, scoring will be disabled." :group 'gnus-score-default :type '(choice (const :tag "disable") diff --git a/lisp/gnus.el b/lisp/gnus.el index 7a54d83d1..ea160877a 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -226,7 +226,7 @@ is restarted, and sometimes reloaded." :link '(custom-manual "(gnus)Exiting Gnus") :group 'gnus) -(defconst gnus-version-number "5.4.22" +(defconst gnus-version-number "5.4.23" "Version number for this version of Gnus.") (defconst gnus-version (format "Gnus v%s" gnus-version-number) @@ -817,7 +817,7 @@ server buffer." (defcustom gnus-message-archive-group nil "*Name of the group in which to save the messages you've written. -This can either be a string, a list of strings; or an alist +This can either be a string; a list of strings; or an alist of regexps/functions/forms to be evaluated to return a string (or a list of strings). The functions are called with the name of the current group (or nil) as a parameter. @@ -880,19 +880,9 @@ no need to set this variable." :type '(choice (const :tag "default" nil) string)) -(defcustom gnus-local-organization nil +(defvar gnus-local-organization nil "String with a description of what organization (if any) the user belongs to. -The ORGANIZATION environment variable is used instead if it is defined. -If this variable contains a function, this function will be called -with the current newsgroup name as the argument. The function should -return a string. - -In any case, if the string (either in the variable, in the environment -variable, or returned by the function) is a file name, the contents of -this file will be used as the organization." - :group 'gnus-message - :type '(choice (const :tag "default" nil) - string)) +Obsolete variable; use `message-user-organization' instead.") ;; Customization variables diff --git a/lisp/message.el b/lisp/message.el index 3dbdb4856..dd56062b2 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -607,7 +607,7 @@ Defaults to `text-mode-abbrev-table'.") (defface message-header-to-face '((((class color) (background dark)) - (:foreground "green2" :italic t)) + (:foreground "green2" :bold t)) (((class color) (background light)) (:foreground "MidnightBlue" :bold t)) @@ -622,7 +622,7 @@ Defaults to `text-mode-abbrev-table'.") (:foreground "green4" :bold t)) (((class color) (background light)) - (:foreground "blue4")) + (:foreground "MidnightBlue")) (t (:bold t))) "Face used for displaying Cc headers." @@ -634,7 +634,7 @@ Defaults to `text-mode-abbrev-table'.") (:foreground "green3")) (((class color) (background light)) - (:foreground "firebrick" :bold t)) + (:foreground "navy blue" :bold t)) (t (:bold t))) "Face used for displaying subject headers." @@ -646,7 +646,7 @@ Defaults to `text-mode-abbrev-table'.") (:foreground "yellow" :bold t :italic t)) (((class color) (background light)) - (:foreground "indianred" :bold t :italic t)) + (:foreground "blue4" :bold t :italic t)) (t (:bold t :italic t))) "Face used for displaying newsgroups headers." @@ -658,7 +658,7 @@ Defaults to `text-mode-abbrev-table'.") (:foreground "red4")) (((class color) (background light)) - (:foreground "red3")) + (:foreground "steel blue")) (t (:bold t :italic t))) "Face used for displaying newsgroups headers." @@ -670,7 +670,7 @@ Defaults to `text-mode-abbrev-table'.") (:foreground "DarkGreen")) (((class color) (background light)) - (:foreground "red4")) + (:foreground "cornflower blue")) (t (:bold t))) "Face used for displaying header names." @@ -706,7 +706,7 @@ Defaults to `text-mode-abbrev-table'.") (:foreground "red")) (((class color) (background light)) - (:foreground "DarkGreen")) + (:foreground "red")) (t (:bold t))) "Face used for displaying cited text names." @@ -714,30 +714,32 @@ Defaults to `text-mode-abbrev-table'.") (defvar message-font-lock-keywords (let* ((cite-prefix "A-Za-z") - (cite-suffix (concat cite-prefix "0-9_.@-"))) - (list '("^\\(To:\\)[ \t]*\\(.+\\)?" - (1 'message-header-name-face) - (2 'message-header-to-face nil t)) - '("^\\(^[GBF]?[Cc][Cc]:\\|^Reply-To:\\)[ \t]*\\(.+\\)?" - (1 'message-header-name-face) - (2 'message-header-cc-face nil t)) - '("^\\(Subject:\\)[ \t]*\\(.+\\)?" - (1 'message-header-name-face) - (2 'message-header-subject-face nil t)) - '("^\\(Newsgroups:\\|Followup-to:\\)[ \t]*\\(.+\\)?" - (1 'message-header-name-face) - (2 'message-header-newsgroups-face nil t)) - '("^\\([^: \n\t]+:\\)[ \t]*\\(.+\\)?" - (1 'message-header-name-face) - (2 'message-header-other-face nil t)) - (list (concat "^\\(" (regexp-quote mail-header-separator) "\\)$") - 1 '(quote message-separator-face)) - `(,(concat "^[ \t]*" - "\\([" cite-prefix "]+[" cite-suffix "]*\\)?" - "[>|}].*") - (0 'message-cited-text-face)) - '("^\\(X-[A-Za-z0-9-]+\\|In-Reply-To\\):.*" - (0 'message-header-xheader-face)))) + (cite-suffix (concat cite-prefix "0-9_.@-")) + (content "[ \t]*\\(.+\\(\n[ \t].*\\)*\\)")) + `((,(concat "^\\(To:\\)" content) + (1 'message-header-name-face) + (2 'message-header-to-face nil t)) + (,(concat "^\\(^[GBF]?[Cc][Cc]:\\|^Reply-To:\\)" content) + (1 'message-header-name-face) + (2 'message-header-cc-face nil t)) + (,(concat "^\\(Subject:\\)" content) + (1 'message-header-name-face) + (2 'message-header-subject-face nil t)) + (,(concat "^\\(Newsgroups:\\|Followup-to:\\)" content) + (1 'message-header-name-face) + (2 'message-header-newsgroups-face nil t)) + (,(concat "^\\([^: \n\t]+:\\)" content) + (1 'message-header-name-face) + (2 'message-header-other-face nil t)) + (,(concat "^\\(X-[A-Za-z0-9-]+\\|In-Reply-To\\):" content) + (1 'message-header-name-face) + (2 'message-header-name-face)) + (,(concat "^\\(" (regexp-quote mail-header-separator) "\\)$") + 1 'message-separator-face) + (,(concat "^[ \t]*" + "\\([" cite-prefix "]+[" cite-suffix "]*\\)?" + "[>|}].*") + (0 'message-cited-text-face)))) "Additional expressions to highlight in Message mode.") (defvar message-face-alist diff --git a/texi/ChangeLog b/texi/ChangeLog index c561b055f..e2adb1621 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,8 @@ +Sat Mar 8 03:41:47 1997 Lars Magne Ingebrigtsen + + * gnus.texi (Group Parameters): Added example. + (Duplicates): Fix. + Fri Mar 7 10:49:43 1997 Lars Magne Ingebrigtsen * Makefile: New "install" target. diff --git a/texi/gnus.texi b/texi/gnus.texi index a029d6081..aadd88863 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -2005,6 +2005,13 @@ Use the @kbd{G p} command to edit group parameters of a group. Also @pxref{Topic Parameters}. +Here's an example group parameter list: + +@example +((to-address . "ding@ifi.uio.no") + (auto-expiry . t)) +@end example + @node Listing Groups @section Listing Groups @@ -9282,9 +9289,8 @@ variable, which is 1000 by default. (So 1000 @code{Message-ID}s will be stored.) If all this sounds scary to you, you can set @code{nnmail-treat-duplicates} to @code{warn} (which is what it is by default), and @code{nnmail} won't delete duplicate mails. Instead it -will generate a brand new @code{Message-ID} for the mail and insert a -warning into the head of the mail saying that it thinks that this is a -duplicate of a different message. +will insert a warning into the head of the mail saying that it thinks +that this is a duplicate of a different message. This variable can also be a function. If that's the case, the function will be called from a buffer narrowed to the message in question with -- 2.34.1