Sync up with Pterodactyl Gnus v0.65.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 643a2a2..ebfac42 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+Sun Dec  6 19:36:53 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
+
+       * gnus.el: Pterodactyl Gnus v0.65 is released.
+
+1998-12-06 20:11:02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-art.el (gnus-article-prepare-display): Don't init w3.
+
+       * mm-view.el (mm-inline-text): Bind url-standalone-mode here. 
+

 Sat Dec  5 18:35:42 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
        * gnus.el: Pterodactyl Gnus v0.64 is released.
 Sat Dec  5 18:35:42 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
        * gnus.el: Pterodactyl Gnus v0.64 is released.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 2c44f0c..29d7281 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2469,9 +2469,7 @@ If ALL-HEADERS is non-nil, no headers are hidden."
   "Interactively choose a view method for the MIME part under point."
   (interactive)
   (gnus-article-check-buffer)
   "Interactively choose a view method for the MIME part under point."
   (interactive)
   (gnus-article-check-buffer)

-  (mm-setup-w3)
-  (let ((data (get-text-property (point) 'gnus-data))
-       (url-standalone-mode (not gnus-plugged)))
+  (let ((data (get-text-property (point) 'gnus-data)))

     (mm-interactively-view-part data)))
 
 (defun gnus-mime-copy-part (&optional handle)
     (mm-interactively-view-part data)))
 
 (defun gnus-mime-copy-part (&optional handle)

@@ -2501,10 +2499,8 @@ If ALL-HEADERS is non-nil, no headers are hidden."
   "Insert the MIME part under point into the current buffer."
   (interactive "P") ; For compatibility reasons we are not using "z".
   (gnus-article-check-buffer)
   "Insert the MIME part under point into the current buffer."
   (interactive "P") ; For compatibility reasons we are not using "z".
   (gnus-article-check-buffer)

-  (mm-setup-w3)

   (let* ((data (get-text-property (point) 'gnus-data))
         contents
   (let* ((data (get-text-property (point) 'gnus-data))
         contents

-        (url-standalone-mode (not gnus-plugged))

         (b (point))
         buffer-read-only)
     (if (mm-handle-undisplayer data)
         (b (point))
         buffer-read-only)
     (if (mm-handle-undisplayer data)

@@ -2522,9 +2518,7 @@ If ALL-HEADERS is non-nil, no headers are hidden."
   "View the MIME part under point with an external viewer."
   (interactive)
   (gnus-article-check-buffer)
   "View the MIME part under point with an external viewer."
   (interactive)
   (gnus-article-check-buffer)

-  (mm-setup-w3)

   (let* ((handle (or handle (get-text-property (point) 'gnus-data)))
   (let* ((handle (or handle (get-text-property (point) 'gnus-data)))

-        (url-standalone-mode (not gnus-plugged))

         (mm-user-display-methods nil)
         (mm-all-images-fit t)
         (rfc2047-default-charset gnus-newsgroup-default-charset)
         (mm-user-display-methods nil)
         (mm-all-images-fit t)
         (rfc2047-default-charset gnus-newsgroup-default-charset)

@@ -2537,9 +2531,7 @@ If ALL-HEADERS is non-nil, no headers are hidden."
   "View the MIME part under point with an internal viewer."
   (interactive)
   (gnus-article-check-buffer)
   "View the MIME part under point with an internal viewer."
   (interactive)
   (gnus-article-check-buffer)

-  (mm-setup-w3)

   (let* ((handle (or handle (get-text-property (point) 'gnus-data)))
   (let* ((handle (or handle (get-text-property (point) 'gnus-data)))

-        (url-standalone-mode (not gnus-plugged))

         (mm-user-display-methods '((".*" . inline)))
         (mm-all-images-fit t)
         (rfc2047-default-charset gnus-newsgroup-default-charset)
         (mm-user-display-methods '((".*" . inline)))
         (mm-all-images-fit t)
         (rfc2047-default-charset gnus-newsgroup-default-charset)

@@ -2678,9 +2670,7 @@ If ALL-HEADERS is non-nil, no headers are hidden."
 
 (defun gnus-widget-press-button (elems el)
   (goto-char (widget-get elems :from))
 
 (defun gnus-widget-press-button (elems el)
   (goto-char (widget-get elems :from))

-  (mm-setup-w3)
-  (let ((url-standalone-mode (not gnus-plugged)))
-    (gnus-article-press-button)))
+  (gnus-article-press-button))

 
 (defun gnus-display-mime (&optional ihandles)
   "Insert MIME buttons in the buffer."
 
 (defun gnus-display-mime (&optional ihandles)
   "Insert MIME buttons in the buffer."

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index b3859ba..4bd9ca3 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -566,7 +566,7 @@ If SILENT, don't prompt the user."
 (defun gnus-extended-version ()
   "Stringified gnus version."
   (concat gnus-product-name "/" gnus-version-number " (based on "
 (defun gnus-extended-version ()
   "Stringified gnus version."
   (concat gnus-product-name "/" gnus-version-number " (based on "

-         gnus-original-product-name " " gnus-original-version-number ")"))
+         gnus-original-product-name " v" gnus-original-version-number ")"))

 
 (defun gnus-message-make-user-agent (&optional include-mime-info max-column)
   "Return user-agent info.
 
 (defun gnus-message-make-user-agent (&optional include-mime-info max-column)
   "Return user-agent info.

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 224ee1c..115a49d 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -259,17 +259,17 @@ is restarted, and sometimes reloaded."
 (defconst gnus-product-name "T-gnus"
   "Product name of this version of gnus.")
 
 (defconst gnus-product-name "T-gnus"
   "Product name of this version of gnus.")
 

-(defconst gnus-version-number "6.10.049"
+(defconst gnus-version-number "6.10.050"

   "Version number for this version of gnus.")
 
   "Version number for this version of gnus.")
 

-(defconst gnus-original-version-number "v0.64"
+(defconst gnus-original-version-number "0.65"

     "Version number for this version of Gnus.")
 
 (defconst gnus-original-product-name "Pterodactyl Gnus"
   "Product name of the original version of Gnus.")
 
 (defconst gnus-version
     "Version number for this version of Gnus.")
 
 (defconst gnus-original-product-name "Pterodactyl Gnus"
   "Product name of the original version of Gnus.")
 
 (defconst gnus-version

-  (format "%s %s (based on %s %s ; for SEMI 1.12, FLIM 1.12)"
+  (format "%s %s (based on %s v%s ; for SEMI 1.12, FLIM 1.12)"

          gnus-product-name gnus-version-number
          gnus-original-product-name gnus-original-version-number)
   "Version string for this version of gnus.")
          gnus-product-name gnus-version-number
          gnus-original-product-name gnus-original-version-number)
   "Version string for this version of gnus.")

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 75cb51b..0380cf3 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -69,6 +69,7 @@
       (mm-setup-w3)
       (setq text (mm-get-part handle))
       (let ((b (point))
       (mm-setup-w3)
       (setq text (mm-get-part handle))
       (let ((b (point))

+           (url-standalone-mode t)

            (width (window-width)))
        (save-excursion
          (insert text)
            (width (window-width)))
        (save-excursion
          (insert text)

diff --git a/lisp/mml.el b/lisp/mml.el
index a83ceae..7e27f6b 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -1,4 +1,4 @@
-;;; mml.el --- A package for parsing and validating MML documents\r\r
+;;; mml.el --- A package for parsing and validating MML documents

 ;; Copyright (C) 1998 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Copyright (C) 1998 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>