summaryrefslogtreecommitdiff
blob: e94bf51ec5aff4225c4fe7e33fd86e228ed580c4 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
Fix display of UTF-8 encoded messages on tty
Gentoo patch, reported upstream:
https://bugs.launchpad.net/viewmail/+bug/453351

--- vm-8.0.12-orig/lisp/vm-mime.el
+++ vm-8.0.12/lisp/vm-mime.el
@@ -4399,9 +4399,11 @@
   (cond ((and vm-xemacs-mule-p (memq (device-type) '(x gtk mswindows)))
 	 (or (vm-string-assoc name vm-mime-mule-charset-to-coding-alist)
 	     (vm-mime-default-face-charset-p name)))
-	((and vm-fsfemacs-mule-p (memq window-system '(x mac win32 w32)))
-	 (or (vm-string-assoc name vm-mime-mule-charset-to-coding-alist)
-	     (vm-mime-default-face-charset-p name)))
+
+	;; vm-mime-tty-can-display-mime-charset (called below) fails
+	;; for GNU Emacs. So keep things simple, since there's no harm
+	;; if replacement characters are displayed.
+	(vm-fsfemacs-mule-p)
 	((vm-multiple-fonts-possible-p)
 	 (or (vm-mime-default-face-charset-p name)
 	     (vm-string-assoc name vm-mime-charset-font-alist)))