[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110884: [Gnus] Don't score by headers when scoring by body

[Romain Francoise]

------------------------------------------------------------
revno: 110884
author: Jan Tatarik <address@hidden>
committer: Romain Francoise <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-11-16 10:44:35 +0100
message:
  [Gnus] Don't score by headers when scoring by body
  
  * gnus-score.el (gnus-score-body):
  * gnus-logic.el (gnus-advanced-body): Don't score by headers when
  scoring by body.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-logic.el
  lisp/gnus/gnus-score.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-11-13 03:11:46 +0000
+++ b/lisp/gnus/ChangeLog       2012-11-16 09:44:35 +0000
@@ -1,3 +1,9 @@
+2012-11-16  Jan Tatarik  <address@hidden>
+
+       * gnus-score.el (gnus-score-body):
+       * gnus-logic.el (gnus-advanced-body): Don't score by headers when
+       scoring by body.
+
 2012-11-13  Glenn Morris  <address@hidden>
 
        * gnus-diary.el (nndiary-request-create-group-functions)

=== modified file 'lisp/gnus/gnus-logic.el'
--- a/lisp/gnus/gnus-logic.el   2012-09-05 22:35:32 +0000
+++ b/lisp/gnus/gnus-logic.el   2012-11-16 09:44:35 +0000
@@ -181,17 +181,18 @@
   (with-current-buffer nntp-server-buffer
     (let* ((request-func (cond ((string= "head" header)
                                 'gnus-request-head)
-                               ;; We need to peek at the headers to detect the
-                               ;; content encoding
                                ((string= "body" header)
-                                'gnus-request-article)
+                                'gnus-request-body)
                                (t 'gnus-request-article)))
            ofunc article handles)
       ;; Not all backends support partial fetching.  In that case, we
       ;; just fetch the entire article.
-      (unless (gnus-check-backend-function
-               (intern (concat "request-" header))
-               gnus-newsgroup-name)
+      ;; When scoring by body, we need to peek at the headers to detect the
+      ;; content encoding
+      (unless (or (gnus-check-backend-function
+                   (intern (concat "request-" header))
+                   gnus-newsgroup-name)
+                  (string= "body" header))
         (setq ofunc request-func)
         (setq request-func 'gnus-request-article))
       (setq article (mail-header-number gnus-advanced-headers))

=== modified file 'lisp/gnus/gnus-score.el'
--- a/lisp/gnus/gnus-score.el   2012-09-06 02:20:21 +0000
+++ b/lisp/gnus/gnus-score.el   2012-11-16 09:44:35 +0000
@@ -1762,21 +1762,22 @@
                 (all-scores scores)
                 (request-func (cond ((string= "head" header)
                                      'gnus-request-head)
-                                    ;; We need to peek at the headers to detect
-                                    ;; the content encoding
                                     ((string= "body" header)
-                                     'gnus-request-article)
+                                     'gnus-request-body)
                                     (t 'gnus-request-article)))
                 entries alist ofunc article last)
            (when articles
              (setq last (mail-header-number (caar (last articles))))
              ;; Not all backends support partial fetching.  In that case,
              ;; we just fetch the entire article.
-             (unless (gnus-check-backend-function
-                      (and (string-match "^gnus-" (symbol-name request-func))
-                           (intern (substring (symbol-name request-func)
-                                              (match-end 0))))
-                      gnus-newsgroup-name)
+             ;; When scoring by body, we need to peek at the headers to detect
+             ;; the content encoding
+             (unless (or (gnus-check-backend-function
+                          (and (string-match "^gnus-" (symbol-name 
request-func))
+                               (intern (substring (symbol-name request-func)
+                                                  (match-end 0))))
+                          gnus-newsgroup-name)
+                         (string= "body" header))
                (setq ofunc request-func)
                (setq request-func 'gnus-request-article))
              (while articles