From d1089bce9fcbebfb70746eed5a78112572549e3d Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Tue, 4 Mar 1997 19:49:19 +0000 Subject: [PATCH] *** empty log message *** --- lisp/ChangeLog | 20 ++++++++++++++++++++ lisp/custom.el | 7 ++++--- lisp/gnus-xmas.el | 4 +++- lisp/gnus.el | 30 +++++++++++------------------- 4 files changed, 38 insertions(+), 23 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3e340abba..7d5888e86 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,23 @@ +Sat Jun 22 11:16:57 1996 Lars Magne Ingebrigtsen + + * gnus.el (gnus-adjust-marked-articles): Would bug out on some + bookmarks. + +Sat Jun 22 11:13:51 1996 Raja R. Harinath + + * gnus.el (gnus-summary-save-body-in-file): Saved wrong buffer. + +Sat Jun 22 10:57:35 1996 Lars Magne Ingebrigtsen + + * gnus.el (gnus-thread-total-score-1): Replaced with old, + non-buggy version. + + * gnus-xmas.el ((find-face 'gnus-x-face)): Set proper colors. + +Fri Jun 21 18:04:03 1996 Lars Magne Ingebrigtsen + + * gnus.el: Gnus v5.2.24 is released. + Fri Jun 21 16:36:03 1996 Christoph Wedler * gnus-picon.el (gnus-picons-insert-face-if-exists): Total change. diff --git a/lisp/custom.el b/lisp/custom.el index 981c34e17..910ef02b1 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -260,9 +260,10 @@ into the buffer visible in the event's window." ;; Put it in the Help menu, if possible. (if (string-match "XEmacs" emacs-version) - ;; XEmacs (disabled because it doesn't work) - (and current-menubar - (add-menu-item '("Help") "Customize..." 'customize t)) + (if (featurep 'menubar) + ;; XEmacs (disabled because it doesn't work) + (and current-menubar + (add-menu-item '("Help") "Customize..." 'customize t))) ;; Emacs 19.28 and earlier (global-set-key [ menu-bar help customize ] '("Customize..." . customize)) diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el index 93256e995..a1ad02730 100644 --- a/lisp/gnus-xmas.el +++ b/lisp/gnus-xmas.el @@ -703,7 +703,9 @@ XEmacs compatibility workaround." args)) (unless (find-face 'gnus-x-face) - (copy-face 'default 'gnus-x-face)) + (copy-face 'default 'gnus-x-face) + (set-face-foreground 'gnus-x-face "black") + (set-face-background 'gnus-x-face "white")) (defun gnus-xmas-article-display-xface (beg end) "Display any XFace headers in the current article." diff --git a/lisp/gnus.el b/lisp/gnus.el index 31c5e1c8a..2d0e98ebc 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -1730,7 +1730,7 @@ variable (string, integer, character, etc).") "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)" "The mail address of the Gnus maintainers.") -(defconst gnus-version-number "5.2.24" +(defconst gnus-version-number "5.2.25" "Version number for this version of Gnus.") (defconst gnus-version (format "Gnus v%s" gnus-version-number) @@ -8423,23 +8423,14 @@ Unscored articles will be counted as having a score of zero." (gnus-thread-total-score-1 (list thread))))) (defun gnus-thread-total-score-1 (root) - ;; This function finds the total score of the thread below ROOT. + ;; This function find the total score of the thread below ROOT. (setq root (car root)) - (let ((number (mail-header-number root))) - (if (and (not (memq number gnus-newsgroup-limit)) - (not (memq number gnus-newsgroup-sparse))) - ;; This article shouldn't be counted. - (apply gnus-thread-score-function - (mapcar 'gnus-thread-total-score - (cdr (gnus-gethash (mail-header-id root) - gnus-newsgroup-dependencies)))) - ;; This article should be counted. - (apply gnus-thread-score-function - (or (cdr (assq number gnus-newsgroup-scored)) - gnus-summary-default-score 0) - (mapcar 'gnus-thread-total-score - (cdr (gnus-gethash (mail-header-id root) - gnus-newsgroup-dependencies))))))) + (apply gnus-thread-score-function + (or (cdr (assq (mail-header-number root) gnus-newsgroup-scored)) + gnus-summary-default-score 0) + (mapcar 'gnus-thread-total-score + (cdr (gnus-gethash (mail-header-id root) + gnus-newsgroup-dependencies))))) ;; Added by Per Abrahamsen . (defvar gnus-tmp-prev-subject nil) @@ -8968,7 +8959,8 @@ If READ-ALL is non-nil, all articles in the group are selected." ;; Adjust assocs. ((memq mark '(score bookmark)) (while articles - (when (or (< (car (setq article (pop articles))) min) + (when (or (not (consp (setq article (pop articles)))) + (< (car article) min) (> (car article) max)) (set var (delq article (symbol-value var)))))))))) @@ -13311,7 +13303,7 @@ The directory to save in defaults to `gnus-article-save-directory'." (t (gnus-read-save-file-name "Save body in file:" default-name)))) (gnus-make-directory (file-name-directory filename)) - (gnus-eval-in-buffer-window gnus-article-buffer + (gnus-eval-in-buffer-window gnus-original-article-buffer (save-excursion (save-restriction (widen) -- 2.25.1