Fix wrong charset for outgoing mail with Emacs 23.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

4 files changed, 109 insertions, 7 deletions

diff --git a/app-emacs/vm/ChangeLog b/app-emacs/vm/ChangeLog
index e195e677bb21..4b037b38b1a4 100644
--- a/app-emacs/vm/ChangeLog
+++ b/app-emacs/vm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/vm
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.67 2009/09/12 10:58:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.68 2009/09/16 00:14:53 ulm Exp $
+
+  16 Sep 2009; Ulrich Mueller <ulm@gentoo.org> vm-8.0.12-r4.ebuild,
+  +files/vm-8.0.12-emacs-23.patch:
+  Fix wrong charset for outgoing mail with Emacs 23.
 
 *vm-8.0.12-r4 (12 Sep 2009)
 
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index 3e440a1f4cf4..370eb3ef8ada 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -10,6 +10,7 @@ AUX vm-7.19-gcc4.patch 1194 RMD160 74c8421cfc845fb0ce7807f9ea74b980ae11877b SHA1
 AUX vm-7.19-install-info.patch 412 RMD160 1fc5a5c5e20c1bb18acd013904812c5fed1f550f SHA1 299c51bbcd5e3e0ac2ba7a6c0b50a33edb54f2b2 SHA256 c8b998e29bed776fa75405fc432cd493fd8d9e01fb35935ceb5b96a58945730c
 AUX vm-8.0-no-pcrisis.patch 620 RMD160 9615e5574f955718ae8fe375afb6bc91dded4d54 SHA1 ea87f99aec9d6b03318e58b6197412745fafee4f SHA256 2c343d31649a152791f31bf14e8ee3d7a849e5645ba028661ab84309f73a5886
 AUX vm-8.0.12-autoload-vm-pine.patch 448 RMD160 d9e80c1817d3e64ae7b5ee62c79a3d67eddf0134 SHA1 1913d786c728af81bd9bf52d2087e5a28650f665 SHA256 2693ac867ae356e0ee0aec6bc900e27517910b66c10e17edefa36ab2a1e50c8b
+AUX vm-8.0.12-emacs-23.patch 3704 RMD160 ad0a36c08968566d7abac86801c7ea072e8e122f SHA1 b1037b2364517cde8e10fd8edc10581329da766f SHA256 7ef9861270b019303968f5db993cbfef1ab13c69ec094d117da1ce91d9c93f45
 AUX vm-8.0.12-folder-corruption.patch 635 RMD160 1dc3454b6df2bfd9944c63e0e90b23ea18f45b03 SHA1 b11b9fb8de22f879313c5cd203cbf2cf76bd8f64 SHA256 f78007ef176ea9e8dd98ed01e2edec4055b9ef9356b0d85f8e3ca6341198febc
 AUX vm-8.0.12-supercite-yank.patch 642 RMD160 9a590b66a7ec907809fff3dedf8f7098c86b02cb SHA1 92ea521824b1f06dacb8cc463dca962c438eed8d SHA256 0b8f8242c31761b5dd0bb6510984e2099eff958acfe376dc16de7d6876bd910c
 AUX vm-info-dir-fix-gentoo.patch 325 RMD160 51f59c36d9c0ae13eca4db61dc76ef1dabdd6d31 SHA1 3a1bce1bd3e91ef3b2403bab54bb47569933e88d SHA256 8320c7ae7c51a5985bb344ec04a153e263af87de3ff2d95a0a55814e2377d276
@@ -19,14 +20,14 @@ DIST vm-8.0.9-544.tgz 538966 RMD160 76a1a11efe519d7f044bea2ae7b2e50161e7b566 SHA
 EBUILD vm-7.19-r3.ebuild 1195 RMD160 7a1929a2e8998a83c0ef1e984f87b6cb8ec7de60 SHA1 1449b34c9eb73d97af9344bdc4556e7ff8eb600a SHA256 b1a99245cdd552e2e9f6a263e42d4e41430894e5044ac00e7801ff2b49ef32dc
 EBUILD vm-7.19-r4.ebuild 1251 RMD160 fd1508212700dd0a0472599ee11301b0b8b06039 SHA1 0e664d361c0aff5853f4f73b719d65edb2358da1 SHA256 5cb3188bade8c2bbda76ec2e1280bdd843d1ac3c4d9c57ec451814f4ad9b073c
 EBUILD vm-8.0.12-r2.ebuild 1440 RMD160 821595b3fe4b2e9f69ce96b3c2e19178431b0681 SHA1 eeae4b47b20442767878c86f6a2b5dd51fc1a2a9 SHA256 a652c48a4e0dd234fa9b9de0e3c46e7fd12b2cae3a479dae9f37b264e8f0a152
-EBUILD vm-8.0.12-r4.ebuild 1349 RMD160 88e7ecfc83ec5a7d09a750f207beffea4395da7f SHA1 5a3609b45865d78fc3a89e30ca4c18ebb755c646 SHA256 63c80a1cce7dc2f22e4584d65ef15812fe744746c1a83437850d938d46fe7f33
+EBUILD vm-8.0.12-r4.ebuild 1391 RMD160 2f1c5a543e243637820f47ceb226c89f87edf002 SHA1 4119aa7054e4fc073b77d148a6c2a12225d27030 SHA256 654d0715bdb4316f4973c31b5105af0717127e20569f63bd697bbff867605708
 EBUILD vm-8.0.9.544.ebuild 1398 RMD160 a35b0a2721224439bb69827250abe73447a9b858 SHA1 4973420077123c5f3a2debfedaf5d7814df12338 SHA256 489c89c39e5814f93acfdc47d2fa6ab80f2320797dad10f5bec855fad6b08e76
-MISC ChangeLog 9765 RMD160 481c681aae1bff62c6511f1a4ff5c5be0c0b77fa SHA1 110278490525606f75d92bf06367cf884f2927a4 SHA256 11d8f943ecf073cda8578117e639986c287dcff015553802ec1cdf5ae7bd5d34
+MISC ChangeLog 9922 RMD160 ab0528a1ff38c2b542508dccc238adbf9879a47c SHA1 49f0b87c4aa99da012bacaf8954a45db55ce4a07 SHA256 2feba48fcef9708196c16bc182af25142ce51cfec487177058296b33d3aecfa0
 MISC metadata.xml 616 RMD160 0671bc015f427662d3614403112ee15d0c457125 SHA1 27754651e0a70d9c85c159cb1e6175bc44c85de6 SHA256 9f491a8f5a4adb6bebc5ce9d5177a87d3daff04c7fa9cb3aad9a6a8e4909dec7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAkqrf00ACgkQOeoy/oIi7uyBbgCfcZZcdfWnvSYo2o8snlA+p0TF
-SlAAoNyQFqjO78h04IPW8xlKIxmT6Hz2
-=e8ow
+iEYEARECAAYFAkqwLn0ACgkQOeoy/oIi7uwHqACfcbQZPVHmA0yNf7K6zVe90zFe
+enwAn1xfw35tmiuD63j6hRUv/Sa5F3LS
+=ngDq
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/vm/files/vm-8.0.12-emacs-23.patch b/app-emacs/vm/files/vm-8.0.12-emacs-23.patch
new file mode 100644
index 000000000000..aee214333249
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.0.12-emacs-23.patch
@@ -0,0 +1,96 @@
+Fix wrong charset for outgoing mail with Emacs 23
+Gentoo patch, reported upstream:
+http://groups.google.de/group/gnu.emacs.vm.bug/msg/33d027060b6fffe6
+
+--- vm-8.0.12-orig/lisp/vm-mime.el
++++ vm-8.0.12/lisp/vm-mime.el
+@@ -1409,7 +1409,6 @@
+ 
+ (defvar buffer-file-coding-system)
+ 
+-;; TODO: integrate with the FSF's unify-8859-on-encoding-mode stuff.
+ (defun vm-determine-proper-charset (beg end)
+   "Work out what MIME character set to use for sending a message.
+ 
+@@ -1430,6 +1429,28 @@
+ 	(if (or vm-xemacs-mule-p
+ 		(and vm-fsfemacs-mule-p enable-multibyte-characters))
+ 	    ;; Okay, we're on a MULE build.
++	  (if (fboundp 'check-coding-systems-region)
++	      ;; check-coding-systems-region appeared in GNU Emacs 23.
++	      (let* ((preapproved (vm-get-coding-system-priorities))
++		     (ucs-list (vm-get-mime-ucs-list))
++		     (cant-encode (check-coding-systems-region
++				   (point-min) (point-max)
++				   (cons 'us-ascii preapproved))))
++		(if (not (assq 'us-ascii cant-encode))
++		    ;; If there are only ASCII chars, we're done.
++		    "us-ascii"
++		  (while (and preapproved
++			      (assq (car preapproved) cant-encode)
++			      (not (memq (car preapproved) ucs-list)))
++		    (setq preapproved (cdr preapproved)))
++		  (if preapproved
++		      (cadr (assq (car preapproved)
++				  vm-mime-mule-coding-to-charset-alist))
++		    ;; None of the entries in vm-coding-system-priorities
++		    ;; can be used. This can only happen if no universal
++		    ;; coding system is included. Fall back to utf-8.
++		    "utf-8")))
++
+ 	    (let ((charsets (delq 'ascii
+ 				  (vm-charsets-in-region (point-min)
+ 							 (point-max)))))
+@@ -1472,9 +1493,7 @@
+ 				(while preapproved
+ 				  (if (memq (car preapproved) ucs-list)
+ 				      (throw 'done 
+-					     (car (cdr (assq 
+-							(vm-coding-system-name 
+-							 (car preapproved))
++					     (car (cdr (assq (car preapproved)
+ 				      vm-mime-mule-coding-to-charset-alist)))))
+ 				  (setq preapproved (cdr preapproved)))
+ 				;; Nothing universal in the preapproved list.
+@@ -1488,8 +1507,8 @@
+ 			    (when (latin-unity-maybe-remap (point-min) 
+ 							   (point-max) sys 
+ 							   csets psets t)
+-			      (throw 'done (second (assq 
+-						    (vm-coding-system-name sys)
++			      (throw 'done
++				     (second (assq sys
+ 				    vm-mime-mule-coding-to-charset-alist)))))
+ 			  (setq systems (cdr systems)))
+ 			(throw 'done nil))
+@@ -1511,9 +1530,8 @@
+ 			    ;; If we encounter a universal character set on
+ 			    ;; the preapproved list, pass it back.
+ 			    (if (memq (car preapproved) ucs-list)
+-				(throw 'done (second (assq 
+-						      (vm-coding-system-name
+-						       (car preapproved))
++				(throw 'done
++				       (second (assq (car preapproved)
+ 				     vm-mime-mule-coding-to-charset-alist))))
+ 
+ 			    ;; The preapproved entry isn't universal. Check if
+@@ -1549,15 +1567,14 @@
+ 			    ;; If we encounter a universal character set on
+ 			    ;; the preapproved list, pass it back.
+ 			    (when (memq (car preapproved) ucs-list)
+-				(throw 'done (second (assq 
+-						      (vm-coding-system-name
+-						       (car preapproved))
++			      (throw 'done
++				     (second (assq (car preapproved)
+ 				     vm-mime-mule-coding-to-charset-alist))))
+ 			    (setq preapproved (cdr preapproved)))))
+ 		    (throw 'done nil))))
+ 	       ;; Couldn't do any magic with vm-coding-system-priorities. Pass
+ 	       ;; back a Japanese iso-2022 MIME character set.
+-	       (t (or vm-mime-8bit-composition-charset "iso-2022-jp"))))
++	       (t (or vm-mime-8bit-composition-charset "iso-2022-jp")))))
+ 	  ;; If we're non-MULE and there are eight bit characters, use a
+ 	  ;; sensible default.
+ 	  (goto-char (point-min))
diff --git a/app-emacs/vm/vm-8.0.12-r4.ebuild b/app-emacs/vm/vm-8.0.12-r4.ebuild
index 6c1a18bdb3e9..b9b92f7b2ceb 100644
--- a/app-emacs/vm/vm-8.0.12-r4.ebuild
+++ b/app-emacs/vm/vm-8.0.12-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.12-r4.ebuild,v 1.1 2009/09/12 10:58:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.12-r4.ebuild,v 1.2 2009/09/16 00:14:53 ulm Exp $
 
 inherit elisp eutils
 
@@ -26,6 +26,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-autoload-vm-pine.patch" #246185
 	epatch "${FILESDIR}/${P}-supercite-yank.patch" #256886
 	epatch "${FILESDIR}/${P}-folder-corruption.patch" #284668
+	epatch "${FILESDIR}/${P}-emacs-23.patch"
 
 	if ! use bbdb; then
 		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."