*** pub/pgnus/lisp/gnus.el	Wed Dec  2 21:26:36 1998
--- pgnus/lisp/gnus.el	Wed Dec  2 21:41:15 1998
***************
*** 254,260 ****
    :link '(custom-manual "(gnus)Exiting Gnus")
    :group 'gnus)
  
! (defconst gnus-version-number "0.60"
    "Version number for this version of Gnus.")
  
  (defconst gnus-version (format "Pterodactyl Gnus v%s" gnus-version-number)
--- 254,260 ----
    :link '(custom-manual "(gnus)Exiting Gnus")
    :group 'gnus)
  
! (defconst gnus-version-number "0.61"
    "Version number for this version of Gnus.")
  
  (defconst gnus-version (format "Pterodactyl Gnus v%s" gnus-version-number)
*** pub/pgnus/lisp/mml.el	Wed Dec  2 21:26:37 1998
--- pgnus/lisp/mml.el	Wed Dec  2 21:41:16 1998
***************
*** 84,92 ****
  			  "Warning: Your message contains %d parts.  Really send? "
  			  (length nstruct)))))
  	      (error "Edit your message to use only one charset"))
! 	    (setq struct (nconc nstruct struct))))))
!       (unless (eobp)
! 	(forward-line 1)))
      (nreverse struct)))
  
  (defun mml-parse-singlepart-with-multiple-charsets (orig-tag beg end)
--- 84,92 ----
  			  "Warning: Your message contains %d parts.  Really send? "
  			  (length nstruct)))))
  	      (error "Edit your message to use only one charset"))
! 	    (setq struct (nconc nstruct struct)))))))
!     (unless (eobp)
!       (forward-line 1))
      (nreverse struct)))
  
  (defun mml-parse-singlepart-with-multiple-charsets (orig-tag beg end)
***************
*** 108,114 ****
  	  (push (append
  		 orig-tag
  		 (list (cons 'contents
! 			     (buffer-substring
  			      beg (or paragraph newline space (point))))))
  		struct)
  	  (setq beg (or paragraph newline space (point))
--- 108,114 ----
  	  (push (append
  		 orig-tag
  		 (list (cons 'contents
! 			     (buffer-substring-no-properties
  			      beg (or paragraph newline space (point))))))
  		struct)
  	  (setq beg (or paragraph newline space (point))
***************
*** 131,137 ****
        (unless (= beg (point))
  	(push (append orig-tag
  		      (list (cons 'contents
! 				  (buffer-substring beg (point)))))
  	      struct))
        struct)))
  
--- 131,138 ----
        (unless (= beg (point))
  	(push (append orig-tag
  		      (list (cons 'contents
! 				  (buffer-substring-no-properties
! 				   beg (point)))))
  	      struct))
        struct)))
  
***************
*** 139,150 ****
    "Read a tag and return the contents."
    (let (contents name elem val)
      (forward-char 2)
!     (setq name (buffer-substring (point) (progn (forward-sexp 1) (point))))
      (skip-chars-forward " \t\n")
      (while (not (looking-at ">"))
!       (setq elem (buffer-substring (point) (progn (forward-sexp 1) (point))))
        (skip-chars-forward "= \t\n")
!       (setq val (buffer-substring (point) (progn (forward-sexp 1) (point))))
        (when (string-match "^\"\\(.*\\)\"$" val)
  	(setq val (match-string 1 val)))
        (push (cons (intern elem) val) contents)
--- 140,154 ----
    "Read a tag and return the contents."
    (let (contents name elem val)
      (forward-char 2)
!     (setq name (buffer-substring-no-properties
! 		(point) (progn (forward-sexp 1) (point))))
      (skip-chars-forward " \t\n")
      (while (not (looking-at ">"))
!       (setq elem (buffer-substring-no-properties
! 		  (point) (progn (forward-sexp 1) (point))))
        (skip-chars-forward "= \t\n")
!       (setq val (buffer-substring-no-properties
! 		 (point) (progn (forward-sexp 1) (point))))
        (when (string-match "^\"\\(.*\\)\"$" val)
  	(setq val (match-string 1 val)))
        (push (cons (intern elem) val) contents)
***************
*** 161,173 ****
      (if (re-search-forward
  	 "<#\\(/\\)?\\(multipart\\|part\\|external\\)." nil t)
  	(prog1
! 	    (buffer-substring beg (match-beginning 0))
  	  (if (or (not (match-beginning 1))
  		  (equal (match-string 2) "multipart"))
  	      (goto-char (match-beginning 0))
  	    (when (looking-at "[ \t]*\n")
  	      (forward-line 1))))
!       (buffer-substring beg (goto-char (point-max))))))
  
  (defvar mml-boundary nil)
  (defvar mml-base-boundary "=-=-=")
--- 165,177 ----
      (if (re-search-forward
  	 "<#\\(/\\)?\\(multipart\\|part\\|external\\)." nil t)
  	(prog1
! 	    (buffer-substring-no-properties beg (match-beginning 0))
  	  (if (or (not (match-beginning 1))
  		  (equal (match-string 2) "multipart"))
  	      (goto-char (match-beginning 0))
  	    (when (looking-at "[ \t]*\n")
  	      (forward-line 1))))
!       (buffer-substring-no-properties beg (goto-char (point-max))))))
  
  (defvar mml-boundary nil)
  (defvar mml-base-boundary "=-=-=")
***************
*** 210,216 ****
  	    (setq coded (buffer-string)))
  	(mm-with-unibyte-buffer
  	  (if (setq filename (cdr (assq 'filename cont)))
! 	      (insert-file-contents-literally filename)
  	    (insert (cdr (assq 'contents cont))))
  	  (setq encoding (mm-encode-buffer type)
  		coded (buffer-string))))
--- 214,220 ----
  	    (setq coded (buffer-string)))
  	(mm-with-unibyte-buffer
  	  (if (setq filename (cdr (assq 'filename cont)))
! 	      (insert-file-contents filename)
  	    (insert (cdr (assq 'contents cont))))
  	  (setq encoding (mm-encode-buffer type)
  		coded (buffer-string))))
***************
*** 308,314 ****
  		    (mml-parameter-string
  		     cont '(name access-type expiration size permission)))
  	      (not (equal type "text/plain")))
!       (when (listp charset)
  	(error
  	 "Can't encode a part with several charsets.  Insert a <#part>."))
        (insert "Content-Type: " type)
--- 312,319 ----
  		    (mml-parameter-string
  		     cont '(name access-type expiration size permission)))
  	      (not (equal type "text/plain")))
!       (when (consp charset)
! 	(debug)
  	(error
  	 "Can't encode a part with several charsets.  Insert a <#part>."))
        (insert "Content-Type: " type)
*** pub/pgnus/lisp/ChangeLog	Wed Dec  2 21:26:34 1998
--- pgnus/lisp/ChangeLog	Wed Dec  2 21:41:15 1998
***************
*** 1,3 ****
--- 1,16 ----
+ Wed Dec  2 20:24:27 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
+ 
+ 	* gnus.el: Pterodactyl Gnus v0.61 is released.
+ 
+ 1998-12-02 21:12:56  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+ 
+ 	* mml.el (mml-parse-1): Skipped parts.
+ 	(mml-insert-mime-headers): Nil is a list.
+ 	(mml-generate-mime-1): Don't insert literally.
+ 	(mml-read-tag): Drop text props.
+ 	(mml-read-part): Ditto.
+ 	(mml-parse-singlepart-with-multiple-charsets): Ditto.
+ 
  Wed Dec  2 20:07:16 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
  
  	* gnus.el: Pterodactyl Gnus v0.60 is released.
*** pub/pgnus/texi/gnus.texi	Wed Dec  2 21:26:38 1998
--- pgnus/texi/gnus.texi	Wed Dec  2 21:41:17 1998
***************
*** 1,7 ****
  \input texinfo                  @c -*-texinfo-*-
  
  @setfilename gnus
! @settitle Pterodactyl Gnus 0.60 Manual
  @synindex fn cp
  @synindex vr cp
  @synindex pg cp
--- 1,7 ----
  \input texinfo                  @c -*-texinfo-*-
  
  @setfilename gnus
! @settitle Pterodactyl Gnus 0.61 Manual
  @synindex fn cp
  @synindex vr cp
  @synindex pg cp
***************
*** 318,324 ****
  @tex
  
  @titlepage
! @title Pterodactyl Gnus 0.60 Manual
  
  @author by Lars Magne Ingebrigtsen
  @page
--- 318,324 ----
  @tex
  
  @titlepage
! @title Pterodactyl Gnus 0.61 Manual
  
  @author by Lars Magne Ingebrigtsen
  @page
***************
*** 354,360 ****
  spool or your mbox file.  All at the same time, if you want to push your
  luck.
  
! This manual corresponds to Pterodactyl Gnus 0.60.
  
  @end ifinfo
  
--- 354,360 ----
  spool or your mbox file.  All at the same time, if you want to push your
  luck.
  
! This manual corresponds to Pterodactyl Gnus 0.61.
  
  @end ifinfo
  
*** pub/pgnus/texi/message.texi	Wed Dec  2 21:26:38 1998
--- pgnus/texi/message.texi	Wed Dec  2 21:41:17 1998
***************
*** 1,7 ****
  \input texinfo                  @c -*-texinfo-*-
  
  @setfilename message
! @settitle Pterodactyl Message 0.60 Manual
  @synindex fn cp
  @synindex vr cp
  @synindex pg cp
--- 1,7 ----
  \input texinfo                  @c -*-texinfo-*-
  
  @setfilename message
! @settitle Pterodactyl Message 0.61 Manual
  @synindex fn cp
  @synindex vr cp
  @synindex pg cp
***************
*** 42,48 ****
  @tex
  
  @titlepage
! @title Pterodactyl Message 0.60 Manual
  
  @author by Lars Magne Ingebrigtsen
  @page
--- 42,48 ----
  @tex
  
  @titlepage
! @title Pterodactyl Message 0.61 Manual
  
  @author by Lars Magne Ingebrigtsen
  @page
***************
*** 83,89 ****
  * Key Index::         List of Message mode keys.
  @end menu
  
! This manual corresponds to Pterodactyl Message 0.60.  Message is
  distributed with the Gnus distribution bearing the same version number
  as this manual.
  
--- 83,89 ----
  * Key Index::         List of Message mode keys.
  @end menu
  
! This manual corresponds to Pterodactyl Message 0.61.  Message is
  distributed with the Gnus distribution bearing the same version number
  as this manual.