rfc2231.el changes (was: Improve handling of message/external-body)

[Reiner Steib <reinersteib+gmane@imap.cc>]

On Wed, Apr 12 2006, Katsumi Yamaoka wrote:

>>>>>> In <b4moe05z6z4.fsf@jpl.org> Katsumi Yamaoka wrote:
>
>> I found there are several problems concerned with externalized
>> MIME parts that I made performing the `C-o' command on ordinary
>> MIME parts.
>
> I've fixed some residual minor bugs concerned with the handling
> of message/external-body parts.
>
> In addition, I've merged the changes to rfc2231.el that Kenichi
> Handa made in the Emacs CVS.
[...]
> * trunk and v5-10 branch *

I've adjusted the corresponding ChangeLog entries (date, ...) which
were a bit messed up.

The versions of `rfc2231.el' in v5-10 and Emacs are in sync now.
However there are two differences to the trunk version.  vc-annotate
shows that you worked on this code (on 16-Feb-06).  Could you sync the
code if appropriate, please?  Hm, maybe it's because older Emacsen
don't support shy groups correctly?

--8<---------------cut here---------------start------------->8---
--- rfc2231.el	12 Apr 2006 02:00:40 -0000	6.11.2.14
+++ rfc2231.el	12 Apr 2006 02:00:49 -0000	7.15
@@ -81,8 +81,8 @@
 		;; Finally, attempt to extract only type.
 		(if (string-match
 		     (concat "\\`[\t\n ]*\\([^" ietf-drums-tspecials "\t\n ]+"
-			     "\\(/[^" ietf-drums-tspecials
-			     "\t\n ]+\\)?\\)\\([\t\n ;]\\|\\'\\)")
+			     "\\(?:/[^" ietf-drums-tspecials
+			     "\t\n ]+\\)?\\)\\(?:[\t\n ;]\\|\\'\\)")
 		     string)
 		    (match-string 1 string)
 		  ""))))))
@@ -223,10 +223,10 @@
  \"'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\",
  \"''This%20is%20%2A%2A%2Afun%2A%2A%2A\", or
  \"This is ***fun***\"."
-  (string-match "\\`\\(\\([^']+\\)?'\\([^']+\\)?'\\)?\\(.+\\)" string)
-  (let ((coding-system (mm-charset-to-coding-system (match-string 2 string)))
-	;;(language (match-string 3 string))
-	(value (match-string 4 string)))
+  (string-match "\\`\\(?:\\([^']+\\)?'\\([^']+\\)?'\\)?\\(.+\\)" string)
+  (let ((coding-system (mm-charset-to-coding-system (match-string 1 string)))
+	;;(language (match-string 2 string))
+	(value (match-string 3 string)))
     (mm-with-unibyte-buffer
       (insert value)
       (goto-char (point-min))
--8<---------------cut here---------------end--------------->8---

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/