[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-art.el

[Miles Bader]

Index: emacs/lisp/gnus/gnus-art.el
diff -c emacs/lisp/gnus/gnus-art.el:1.45 emacs/lisp/gnus/gnus-art.el:1.46
*** emacs/lisp/gnus/gnus-art.el:1.45    Fri Nov 29 10:57:51 2002
--- emacs/lisp/gnus/gnus-art.el Tue Feb  4 08:06:38 2003
***************
*** 230,236 ****
  
  (defcustom gnus-article-banner-alist nil
    "Banner alist for stripping.
! For example, 
       ((egroups . \"^[ \\t\\n]*-------------------+\\\\( eGroups Sponsor 
-+\\\\)?....\\n\\\\(.+\\n\\\\)+\"))"
    :version "21.1"
    :type '(repeat (cons symbol regexp))
--- 230,236 ----
  
  (defcustom gnus-article-banner-alist nil
    "Banner alist for stripping.
! For example,
       ((egroups . \"^[ \\t\\n]*-------------------+\\\\( eGroups Sponsor 
-+\\\\)?....\\n\\\\(.+\\n\\\\)+\"))"
    :version "21.1"
    :type '(repeat (cons symbol regexp))
***************
*** 658,674 ****
  (defcustom gnus-article-mime-match-handle-function 'undisplayed-alternative
    "Function called with a MIME handle as the argument.
  This is meant for people who want to view first matched part.
! For `undisplayed-alternative' (default), the first undisplayed 
! part or alternative part is used.  For `undisplayed', the first 
! undisplayed part is used.  For a function, the first part which 
  the function return `t' is used.  For `nil', the first part is
  used."
    :version "21.1"
    :group 'gnus-article-mime
!   :type '(choice 
          (item :tag "first" :value nil)
          (item :tag "undisplayed" :value undisplayed)
!         (item :tag "undisplayed or alternative" 
                :value undisplayed-alternative)
          (function)))
  
--- 658,674 ----
  (defcustom gnus-article-mime-match-handle-function 'undisplayed-alternative
    "Function called with a MIME handle as the argument.
  This is meant for people who want to view first matched part.
! For `undisplayed-alternative' (default), the first undisplayed
! part or alternative part is used.  For `undisplayed', the first
! undisplayed part is used.  For a function, the first part which
  the function return `t' is used.  For `nil', the first part is
  used."
    :version "21.1"
    :group 'gnus-article-mime
!   :type '(choice
          (item :tag "first" :value nil)
          (item :tag "undisplayed" :value undisplayed)
!         (item :tag "undisplayed or alternative"
                :value undisplayed-alternative)
          (function)))
  
***************
*** 737,743 ****
    :type gnus-article-treat-head-custom)
  (put 'gnus-treat-buttonize-head 'highlight t)
  
! (defcustom gnus-treat-emphasize 
    (and (or window-system
           (featurep 'xemacs)
           (>= (string-to-number emacs-version) 21))
--- 737,743 ----
    :type gnus-article-treat-head-custom)
  (put 'gnus-treat-buttonize-head 'highlight t)
  
! (defcustom gnus-treat-emphasize
    (and (or window-system
           (featurep 'xemacs)
           (>= (string-to-number emacs-version) 21))
***************
*** 925,931 ****
    :type gnus-article-treat-custom)
  (put 'gnus-treat-overstrike 'highlight t)
  
! (defcustom gnus-treat-display-xface 
    (and (or (and (fboundp 'image-type-available-p)
                (image-type-available-p 'xbm)
                (string-match "^0x" (shell-command-to-string "uncompface")))
--- 925,931 ----
    :type gnus-article-treat-custom)
  (put 'gnus-treat-overstrike 'highlight t)
  
! (defcustom gnus-treat-display-xface
    (and (or (and (fboundp 'image-type-available-p)
                (image-type-available-p 'xbm)
                (string-match "^0x" (shell-command-to-string "uncompface")))
***************
*** 939,945 ****
    :type gnus-article-treat-head-custom)
  (put 'gnus-treat-display-xface 'highlight t)
  
! (defcustom gnus-treat-display-smileys 
    (if (or (and (featurep 'xemacs)
               (featurep 'xpm))
          (and (fboundp 'image-type-available-p)
--- 939,945 ----
    :type gnus-article-treat-head-custom)
  (put 'gnus-treat-display-xface 'highlight t)
  
! (defcustom gnus-treat-display-smileys
    (if (or (and (featurep 'xemacs)
               (featurep 'xpm))
          (and (fboundp 'image-type-available-p)
***************
*** 1512,1518 ****
      (let ((inhibit-point-motion-hooks t)
          buffer-read-only
          (mail-parse-charset gnus-newsgroup-charset)
!         (mail-parse-ignored-charsets 
           (save-excursion (set-buffer gnus-summary-buffer)
                           gnus-newsgroup-ignored-charsets)))
        (mail-decode-encoded-word-region (point-min) (point-max)))))
--- 1512,1518 ----
      (let ((inhibit-point-motion-hooks t)
          buffer-read-only
          (mail-parse-charset gnus-newsgroup-charset)
!         (mail-parse-ignored-charsets
           (save-excursion (set-buffer gnus-summary-buffer)
                           gnus-newsgroup-ignored-charsets)))
        (mail-decode-encoded-word-region (point-min) (point-max)))))
***************
*** 1524,1530 ****
    (let ((inhibit-point-motion-hooks t) (case-fold-search t)
        buffer-read-only
        (mail-parse-charset gnus-newsgroup-charset)
!       (mail-parse-ignored-charsets 
         (save-excursion (condition-case nil
                             (set-buffer gnus-summary-buffer)
                           (error))
--- 1524,1530 ----
    (let ((inhibit-point-motion-hooks t) (case-fold-search t)
        buffer-read-only
        (mail-parse-charset gnus-newsgroup-charset)
!       (mail-parse-ignored-charsets
         (save-excursion (condition-case nil
                             (set-buffer gnus-summary-buffer)
                           (error))
***************
*** 1545,1551 ****
            format (and ctl (mail-content-type-get ctl 'format)))
        (when cte
        (setq cte (mail-header-strip cte)))
!       (if (and ctl (not (string-match "/" (car ctl)))) 
          (setq ctl nil))
        (goto-char (point-max)))
      (forward-line 1)
--- 1545,1551 ----
            format (and ctl (mail-content-type-get ctl 'format)))
        (when cte
        (setq cte (mail-header-strip cte)))
!       (if (and ctl (not (string-match "/" (car ctl))))
          (setq ctl nil))
        (goto-char (point-max)))
      (forward-line 1)
***************
*** 1567,1573 ****
    "Remove encoded-word encoding from headers."
    (let ((inhibit-point-motion-hooks t)
        (mail-parse-charset gnus-newsgroup-charset)
!       (mail-parse-ignored-charsets 
         (save-excursion (condition-case nil
                             (set-buffer gnus-summary-buffer)
                           (error))
--- 1567,1573 ----
    "Remove encoded-word encoding from headers."
    (let ((inhibit-point-motion-hooks t)
        (mail-parse-charset gnus-newsgroup-charset)
!       (mail-parse-ignored-charsets
         (save-excursion (condition-case nil
                             (set-buffer gnus-summary-buffer)
                           (error))
***************
*** 1589,1602 ****
            (setq type
                  (gnus-fetch-field "content-transfer-encoding"))
            (let* ((ct (gnus-fetch-field "content-type"))
!                  (ctl (and ct 
                             (ignore-errors
                               (mail-header-parse-content-type ct)))))
              (setq charset (and ctl
                                 (mail-content-type-get ctl 'charset)))
              (if (stringp charset)
                  (setq charset (intern (downcase charset)))))))
!       (unless charset 
        (setq charset gnus-newsgroup-charset))
        (when (or force
                (and type (let ((case-fold-search t))
--- 1589,1602 ----
            (setq type
                  (gnus-fetch-field "content-transfer-encoding"))
            (let* ((ct (gnus-fetch-field "content-type"))
!                  (ctl (and ct
                             (ignore-errors
                               (mail-header-parse-content-type ct)))))
              (setq charset (and ctl
                                 (mail-content-type-get ctl 'charset)))
              (if (stringp charset)
                  (setq charset (intern (downcase charset)))))))
!       (unless charset
        (setq charset gnus-newsgroup-charset))
        (when (or force
                (and type (let ((case-fold-search t))
***************
*** 1616,1629 ****
            (setq type
                  (gnus-fetch-field "content-transfer-encoding"))
            (let* ((ct (gnus-fetch-field "content-type"))
!                  (ctl (and ct 
                             (ignore-errors
                               (mail-header-parse-content-type ct)))))
              (setq charset (and ctl
                                 (mail-content-type-get ctl 'charset)))
              (if (stringp charset)
                  (setq charset (intern (downcase charset)))))))
!       (unless charset 
        (setq charset gnus-newsgroup-charset))
        (when (or force
                (and type (let ((case-fold-search t))
--- 1616,1629 ----
            (setq type
                  (gnus-fetch-field "content-transfer-encoding"))
            (let* ((ct (gnus-fetch-field "content-type"))
!                  (ctl (and ct
                             (ignore-errors
                               (mail-header-parse-content-type ct)))))
              (setq charset (and ctl
                                 (mail-content-type-get ctl 'charset)))
              (if (stringp charset)
                  (setq charset (intern (downcase charset)))))))
!       (unless charset
        (setq charset gnus-newsgroup-charset))
        (when (or force
                (and type (let ((case-fold-search t))
***************
*** 1655,1668 ****
        (if (gnus-buffer-live-p gnus-original-article-buffer)
          (with-current-buffer gnus-original-article-buffer
            (let* ((ct (gnus-fetch-field "content-type"))
!                  (ctl (and ct 
                             (ignore-errors
                               (mail-header-parse-content-type ct)))))
              (setq charset (and ctl
                                 (mail-content-type-get ctl 'charset)))
              (if (stringp charset)
                  (setq charset (intern (downcase charset)))))))
!       (unless charset 
        (setq charset gnus-newsgroup-charset))
        (article-goto-body)
        (save-window-excursion
--- 1655,1668 ----
        (if (gnus-buffer-live-p gnus-original-article-buffer)
          (with-current-buffer gnus-original-article-buffer
            (let* ((ct (gnus-fetch-field "content-type"))
!                  (ctl (and ct
                             (ignore-errors
                               (mail-header-parse-content-type ct)))))
              (setq charset (and ctl
                                 (mail-content-type-get ctl 'charset)))
              (if (stringp charset)
                  (setq charset (intern (downcase charset)))))))
!       (unless charset
        (setq charset gnus-newsgroup-charset))
        (article-goto-body)
        (save-window-excursion
***************
*** 1690,1696 ****
          (when regexp
            (goto-char (point-min))
            (when (re-search-forward
!                  (concat "^Subject: +\\(\\(\\(Re: +\\)?\\(" regexp 
                           " *\\)\\)+\\(Re: +\\)?\\)")
                   nil t)
              (let ((s (or (match-string 3) (match-string 5))))
--- 1690,1696 ----
          (when regexp
            (goto-char (point-min))
            (when (re-search-forward
!                  (concat "^Subject: +\\(\\(\\(Re: +\\)?\\(" regexp
                           " *\\)\\)+\\(Re: +\\)?\\)")
                   nil t)
              (let ((s (or (match-string 3) (match-string 5))))
***************
*** 2003,2011 ****
  Originally it is hide instead of DUMMY."
    (let ((buffer-read-only nil)
        (inhibit-point-motion-hooks t))
!     (gnus-remove-text-properties-when 
       'article-type type
!      (point-min) (point-max) 
       (cons 'article-type (cons type
                               gnus-hidden-properties)))))
  
--- 2003,2011 ----
  Originally it is hide instead of DUMMY."
    (let ((buffer-read-only nil)
        (inhibit-point-motion-hooks t))
!     (gnus-remove-text-properties-when
       'article-type type
!      (point-min) (point-max)
       (cons 'article-type (cons type
                               gnus-hidden-properties)))))
  
***************
*** 2093,2099 ****
       ((eq type 'local)
        (let ((tz (car (current-time-zone time))))
        (format "Date: %s %s%02d%02d" (current-time-string time)
!               (if (> tz 0) "+" "-") (/ (abs tz) 3600) 
                (/ (% (abs tz) 3600) 60))))
       ;; Convert to Universal Time.
       ((eq type 'ut)
--- 2093,2099 ----
       ((eq type 'local)
        (let ((tz (car (current-time-zone time))))
        (format "Date: %s %s%02d%02d" (current-time-string time)
!               (if (> tz 0) "+" "-") (/ (abs tz) 3600)
                (/ (% (abs tz) 3600) 60))))
       ;; Convert to Universal Time.
       ((eq type 'ut)
***************
*** 2126,2132 ****
         "Date: "
         (format-time-string "%Y%m%dT%H%M%S" time)
         (format "%s%02d%02d"
!                (if (> tz 0) "+" "-") (/ (abs tz) 3600) 
                 (/ (% (abs tz) 3600) 60)))))
       ;; Do an X-Sent lapsed format.
       ((eq type 'lapsed)
--- 2126,2132 ----
         "Date: "
         (format-time-string "%Y%m%dT%H%M%S" time)
         (format "%s%02d%02d"
!                (if (> tz 0) "+" "-") (/ (abs tz) 3600)
                 (/ (% (abs tz) 3600) 60)))))
       ;; Do an X-Sent lapsed format.
       ((eq type 'lapsed)
***************
*** 2246,2255 ****
    (interactive (gnus-article-hidden-arg))
    (unless (gnus-article-check-hidden-text 'emphasis arg)
      (save-excursion
!       (let ((alist (or 
                    (condition-case nil
!                       (with-current-buffer gnus-summary-buffer 
!                         gnus-article-emphasis-alist) 
                      (error))
                    gnus-emphasis-alist))
            (buffer-read-only nil)
--- 2246,2255 ----
    (interactive (gnus-article-hidden-arg))
    (unless (gnus-article-check-hidden-text 'emphasis arg)
      (save-excursion
!       (let ((alist (or
                    (condition-case nil
!                       (with-current-buffer gnus-summary-buffer
!                         gnus-article-emphasis-alist)
                      (error))
                    gnus-emphasis-alist))
            (buffer-read-only nil)
***************
*** 2281,2288 ****
      (let ((name (and gnus-newsgroup-name
                     (gnus-group-real-name gnus-newsgroup-name))))
        (make-local-variable 'gnus-article-emphasis-alist)
!       (setq gnus-article-emphasis-alist 
!           (nconc 
             (let ((alist gnus-group-highlight-words-alist) elem highlight)
               (while (setq elem (pop alist))
                 (when (and name (string-match (car elem) name))
--- 2281,2288 ----
      (let ((name (and gnus-newsgroup-name
                     (gnus-group-real-name gnus-newsgroup-name))))
        (make-local-variable 'gnus-article-emphasis-alist)
!       (setq gnus-article-emphasis-alist
!           (nconc
             (let ((alist gnus-group-highlight-words-alist) elem highlight)
               (while (setq elem (pop alist))
                 (when (and name (string-match (car elem) name))
***************
*** 2291,2297 ****
               highlight)
             (copy-sequence highlight-words)
             (if gnus-newsgroup-name
!                (copy-sequence (gnus-group-find-parameter 
                                 gnus-newsgroup-name 'highlight-words t)))
             gnus-emphasis-alist)))))
  
--- 2291,2297 ----
               highlight)
             (copy-sequence highlight-words)
             (if gnus-newsgroup-name
!                (copy-sequence (gnus-group-find-parameter
                                 gnus-newsgroup-name 'highlight-words t)))
             gnus-emphasis-alist)))))
  
***************
*** 2336,2342 ****
          (funcall function group headers (symbol-value variable)))
        result)
      (setq result
!         (expand-file-name 
           (cond
            ((eq filename 'default)
             default-name)
--- 2336,2342 ----
          (funcall function group headers (symbol-value variable)))
        result)
      (setq result
!         (expand-file-name
           (cond
            ((eq filename 'default)
             default-name)
***************
*** 2701,2707 ****
      ;; Note "Commands" menu is defined in gnus-sum.el for consistency
  
      (when (boundp 'gnus-summary-post-menu)
!       (cond 
         ((not (keymapp gnus-summary-post-menu))
        (setq gnus-article-post-menu gnus-summary-post-menu))
         ((not gnus-article-post-menu)
--- 2701,2707 ----
      ;; Note "Commands" menu is defined in gnus-sum.el for consistency
  
      (when (boundp 'gnus-summary-post-menu)
!       (cond
         ((not (keymapp gnus-summary-post-menu))
        (setq gnus-article-post-menu gnus-summary-post-menu))
         ((not gnus-article-post-menu)
***************
*** 2787,2793 ****
            (mm-destroy-parts gnus-article-mime-handles)
            (setq gnus-article-mime-handles nil))
          ;; Set it to nil in article-buffer!
!         (setq gnus-article-mime-handle-alist nil) 
          (buffer-disable-undo)
          (setq buffer-read-only t)
          (unless (eq major-mode 'gnus-article-mode)
--- 2787,2793 ----
            (mm-destroy-parts gnus-article-mime-handles)
            (setq gnus-article-mime-handles nil))
          ;; Set it to nil in article-buffer!
!         (setq gnus-article-mime-handle-alist nil)
          (buffer-disable-undo)
          (setq buffer-read-only t)
          (unless (eq major-mode 'gnus-article-mode)
***************
*** 3011,3017 ****
      (set-buffer gnus-article-buffer)
      (let ((handles (or handles gnus-article-mime-handles))
          (mail-parse-charset gnus-newsgroup-charset)
!         (mail-parse-ignored-charsets 
           (save-excursion (set-buffer gnus-summary-buffer)
                           gnus-newsgroup-ignored-charsets)))
        (if (stringp (car handles))
--- 3011,3017 ----
      (set-buffer gnus-article-buffer)
      (let ((handles (or handles gnus-article-mime-handles))
          (mail-parse-charset gnus-newsgroup-charset)
!         (mail-parse-ignored-charsets
           (save-excursion (set-buffer gnus-summary-buffer)
                           gnus-newsgroup-ignored-charsets)))
        (if (stringp (car handles))
***************
*** 3109,3121 ****
                          gnus-newsgroup-charset)))
         ((numberp arg)
        (setq charset
!             (or (cdr (assq arg 
                             gnus-summary-show-article-charset-alist))
                  (read-coding-system "Charset: ")))))
        (forward-line 2)
        (mm-insert-inline handle
!                       (if (and charset 
!                                (setq charset (mm-charset-to-coding-system 
                                                charset))
                                 (not (eq charset 'ascii)))
                            (mm-decode-coding-string contents charset)
--- 3109,3121 ----
                          gnus-newsgroup-charset)))
         ((numberp arg)
        (setq charset
!             (or (cdr (assq arg
                             gnus-summary-show-article-charset-alist))
                  (read-coding-system "Charset: ")))))
        (forward-line 2)
        (mm-insert-inline handle
!                       (if (and charset
!                                (setq charset (mm-charset-to-coding-system
                                                charset))
                                 (not (eq charset 'ascii)))
                            (mm-decode-coding-string contents charset)
***************
*** 3130,3136 ****
         (mm-user-display-methods nil)
         (mm-inlined-types nil)
         (mail-parse-charset gnus-newsgroup-charset)
!        (mail-parse-ignored-charsets 
          (save-excursion (set-buffer gnus-summary-buffer)
                          gnus-newsgroup-ignored-charsets)))
      (if (mm-handle-undisplayer handle)
--- 3130,3136 ----
         (mm-user-display-methods nil)
         (mm-inlined-types nil)
         (mail-parse-charset gnus-newsgroup-charset)
!        (mail-parse-ignored-charsets
          (save-excursion (set-buffer gnus-summary-buffer)
                          gnus-newsgroup-ignored-charsets)))
      (if (mm-handle-undisplayer handle)
***************
*** 3146,3152 ****
         (mm-inlined-types '(".*"))
         (mm-inline-large-images t)
         (mail-parse-charset gnus-newsgroup-charset)
!        (mail-parse-ignored-charsets 
          (save-excursion (set-buffer gnus-summary-buffer)
                          gnus-newsgroup-ignored-charsets)))
      (if (mm-handle-undisplayer handle)
--- 3146,3152 ----
         (mm-inlined-types '(".*"))
         (mm-inline-large-images t)
         (mail-parse-charset gnus-newsgroup-charset)
!        (mail-parse-ignored-charsets
          (save-excursion (set-buffer gnus-summary-buffer)
                          gnus-newsgroup-ignored-charsets)))
      (if (mm-handle-undisplayer handle)
***************
*** 3206,3215 ****
    (if condition
        (let ((alist gnus-article-mime-handle-alist) ihandle n)
        (while (setq ihandle (pop alist))
!         (if (and (cond 
                    ((functionp condition)
                     (funcall condition (cdr ihandle)))
!                   ((eq condition 'undisplayed) 
                     (not (or (mm-handle-undisplayer (cdr ihandle))
                              (equal (mm-handle-media-type (cdr ihandle))
                                     "multipart/alternative"))))
--- 3206,3215 ----
    (if condition
        (let ((alist gnus-article-mime-handle-alist) ihandle n)
        (while (setq ihandle (pop alist))
!         (if (and (cond
                    ((functionp condition)
                     (funcall condition (cdr ihandle)))
!                   ((eq condition 'undisplayed)
                     (not (or (mm-handle-undisplayer (cdr ihandle))
                              (equal (mm-handle-media-type (cdr ihandle))
                                     "multipart/alternative"))))
***************
*** 3227,3233 ****
    (interactive "P")
    (save-current-buffer
      (set-buffer gnus-article-buffer)
!     (or (numberp n) (setq n (gnus-article-mime-match-handle-first 
                             gnus-article-mime-match-handle-function)))
      (when (> n (length gnus-article-mime-handle-alist))
        (error "No such part"))
--- 3227,3233 ----
    (interactive "P")
    (save-current-buffer
      (set-buffer gnus-article-buffer)
!     (or (numberp n) (setq n (gnus-article-mime-match-handle-first
                             gnus-article-mime-match-handle-function)))
      (when (> n (length gnus-article-mime-handle-alist))
        (error "No such part"))
***************
*** 3252,3258 ****
      (prog1
        (let ((window (selected-window))
              (mail-parse-charset gnus-newsgroup-charset)
!             (mail-parse-ignored-charsets 
               (save-excursion (set-buffer gnus-summary-buffer)
                               gnus-newsgroup-ignored-charsets)))
          (save-excursion
--- 3252,3258 ----
      (prog1
        (let ((window (selected-window))
              (mail-parse-charset gnus-newsgroup-charset)
!             (mail-parse-ignored-charsets
               (save-excursion (set-buffer gnus-summary-buffer)
                               gnus-newsgroup-ignored-charsets)))
          (save-excursion
***************
*** 3483,3489 ****
              (forward-line -2)
              (setq beg (point)))
            (let ((mail-parse-charset gnus-newsgroup-charset)
!                 (mail-parse-ignored-charsets 
                   (save-excursion (condition-case ()
                                       (set-buffer gnus-summary-buffer)
                                     (error))
--- 3483,3489 ----
              (forward-line -2)
              (setq beg (point)))
            (let ((mail-parse-charset gnus-newsgroup-charset)
!                 (mail-parse-ignored-charsets
                   (save-excursion (condition-case ()
                                       (set-buffer gnus-summary-buffer)
                                     (error))
***************
*** 3502,3508 ****
            (save-restriction
              (narrow-to-region beg (point))
              (gnus-treat-article
!              nil id 
               (gnus-article-mime-total-parts)
               (mm-handle-media-type handle)))))))))
  
--- 3502,3508 ----
            (save-restriction
              (narrow-to-region beg (point))
              (gnus-treat-article
!              nil id
               (gnus-article-mime-total-parts)
               (mm-handle-media-type handle)))))))))
  
***************
*** 3597,3603 ****
          (if (stringp (car preferred))
              (gnus-display-mime preferred)
            (let ((mail-parse-charset gnus-newsgroup-charset)
!                 (mail-parse-ignored-charsets 
                   (save-excursion (set-buffer gnus-summary-buffer)
                                   gnus-newsgroup-ignored-charsets)))
              (mm-display-part preferred)
--- 3597,3603 ----
          (if (stringp (car preferred))
              (gnus-display-mime preferred)
            (let ((mail-parse-charset gnus-newsgroup-charset)
!                 (mail-parse-ignored-charsets
                   (save-excursion (set-buffer gnus-summary-buffer)
                                   gnus-newsgroup-ignored-charsets)))
              (mm-display-part preferred)
***************
*** 3835,3841 ****
          (setq keys (if (featurep 'xemacs)
                       (events-to-keys (read-key-sequence nil))
                     (read-key-sequence nil)))))
!                    
      (message "")
  
      (if (or (member keys nosaves)
--- 3835,3841 ----
          (setq keys (if (featurep 'xemacs)
                       (events-to-keys (read-key-sequence nil))
                     (read-key-sequence nil)))))
! 
      (message "")
  
      (if (or (member keys nosaves)
***************
*** 4041,4047 ****
           ((or (stringp article)
                (numberp article))
            (let ((gnus-override-method gnus-override-method)
!                 (methods (and (stringp article) 
                                gnus-refer-article-method))
                  result
                  (buffer-read-only nil))
--- 4041,4047 ----
           ((or (stringp article)
                (numberp article))
            (let ((gnus-override-method gnus-override-method)
!                 (methods (and (stringp article)
                                gnus-refer-article-method))
                  result
                  (buffer-read-only nil))
***************
*** 4063,4069 ****
                  (gnus-check-group-server))
                (when (gnus-request-article article group (current-buffer))
                  (when (numberp article)
!                   (gnus-async-prefetch-next group article 
                                              gnus-summary-buffer)
                    (when gnus-keep-backlog
                      (gnus-backlog-enter-article
--- 4063,4069 ----
                  (gnus-check-group-server))
                (when (gnus-request-article article group (current-buffer))
                  (when (numberp article)
!                   (gnus-async-prefetch-next group article
                                              gnus-summary-buffer)
                    (when gnus-keep-backlog
                      (gnus-backlog-enter-article
***************
*** 4266,4272 ****
  
  ;;; Internal Variables:
  
! (defcustom gnus-button-url-regexp 
    (if (string-match "[[:digit:]]" "1") ;; support POSIX?
        
"\\b\\(\\(www\\.\\|\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\|info\\):\\)\\(//[-a-zA-Z0-9_.]+:[0-9]*\\)address@hidden&*+|\\/:;.,[:word:address@hidden&*+|\\/[:word:]]\\)"
      
"\\b\\(\\(www\\.\\|\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\|info\\):\\)\\(//[-a-zA-Z0-9_.]+:[0-9]*\\)?\\(address@hidden&*+|\\/:;.,]\\|\\w\\)+\\(address@hidden&*+|\\/]\\|\\w\\)\\)")
--- 4266,4272 ----
  
  ;;; Internal Variables:
  
! (defcustom gnus-button-url-regexp
    (if (string-match "[[:digit:]]" "1") ;; support POSIX?
        
"\\b\\(\\(www\\.\\|\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\|info\\):\\)\\(//[-a-zA-Z0-9_.]+:[0-9]*\\)address@hidden&*+|\\/:;.,[:word:address@hidden&*+|\\/[:word:]]\\)"
      
"\\b\\(\\(www\\.\\|\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\|info\\):\\)\\(//[-a-zA-Z0-9_.]+:[0-9]*\\)?\\(address@hidden&*+|\\/:;.,]\\|\\w\\)+\\(address@hidden&*+|\\/]\\|\\w\\)\\)")