Mercurial > emacs
annotate lisp/gnus/utf7.el @ 110898:069deed4cdec
Merge changes made in Gnus trunk.
nnimap.el (nnimap-open-connection): If we have gnutls loaded, then try to use that for the tls stream.
nnimap.el (nnimap-retrieve-group-data-early): Rework the marks code to heed UIDVALIDITY and find out which groups are read-only and not.
nnimap.el (nnimap-get-flags): Use the same marks parsing code as the rest of nnimap.
nnimap.el (nnmail-expiry-target-group): Say that every expiry target group is the "last".
nnir.el (nnir-engines): Fix too many arguments.
nnimap.el: Start implementing QRESYNC support.
gnus.el (gnus-group-set-parameter): Fix typo.
shr.el: Rework the way things are indented by <li> slightly.
spam.el (gnus-summary-mode-map): Bind to "$".
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 10 Oct 2010 00:15:21 +0000 |
parents | 494ea2fb03d7 |
children | 417b1e4d63cd |
rev | line source |
---|---|
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
1 ;;; utf7.el --- UTF-7 encoding/decoding for Emacs -*-coding: iso-8859-1;-*- |
64754
fafd692d1e40
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64085
diff
changeset
|
2 |
104835
88f046f0db6f
(utf7-encode, utf7-decode): Use mm-with-multibyte-buffer, or
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
106815 | 4 ;; 2008, 2009, 2010 Free Software Foundation, Inc. |
31717 | 5 |
6 ;; Author: Jon K Hellan <hellan@acm.org> | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
7 ;; Maintainer: bugs@gnus.org |
31717 | 8 ;; Keywords: mail |
9 | |
10 ;; This file is part of GNU Emacs. | |
11 | |
94662
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
12 ;; GNU Emacs is free software: you can redistribute it and/or modify |
31717 | 13 ;; it under the terms of the GNU General Public License as published by |
94662
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
14 ;; the Free Software Foundation, either version 3 of the License, or |
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
15 ;; (at your option) any later version. |
31717 | 16 |
17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
21 | |
22 ;; You should have received a copy of the GNU General Public License | |
94662
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
31717 | 24 |
25 ;;; Commentary: | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
26 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
27 ;; UTF-7 - A Mail-Safe Transformation Format of Unicode - RFC 2152 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
28 ;; This is a transformation format of Unicode that contains only 7-bit |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
29 ;; ASCII octets and is intended to be readable by humans in the limiting |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
30 ;; case that the document consists of characters from the US-ASCII |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
31 ;; repertoire. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
32 ;; In short, runs of characters outside US-ASCII are encoded as base64 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
33 ;; inside delimiters. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
34 ;; A variation of UTF-7 is specified in IMAP 4rev1 (RFC 2060) as the way |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
35 ;; to represent characters outside US-ASCII in mailbox names in IMAP. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
36 ;; This library supports both variants, but the IMAP variation was the |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
37 ;; reason I wrote it. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
38 ;; The routines convert UTF-7 -> UTF-16 (16 bit encoding of Unicode) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
39 ;; -> current character set, and vice versa. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
40 ;; However, until Emacs supports Unicode, the only Emacs character set |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
41 ;; supported here is ISO-8859.1, which can trivially be converted to/from |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
42 ;; Unicode. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
43 ;; When decoding results in a character outside the Emacs character set, |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
44 ;; an error is thrown. It is up to the application to recover. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
45 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
46 ;; UTF-7 should be done by providing a coding system. Mule-UCS does |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
47 ;; already, but I don't know if it does the IMAP version and it's not |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
48 ;; clear whether that should really be a coding system. The UTF-16 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
49 ;; part of the conversion can be done with coding systems available |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
50 ;; with Mule-UCS or some versions of Emacs. Unfortunately these were |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
51 ;; done wrongly (regarding handling of byte-order marks and how the |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
52 ;; variants were named), so we don't have a consistent name for the |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
53 ;; necessary coding system. The code below doesn't seem to DTRT |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
54 ;; generally. E.g.: |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
55 ;; |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
56 ;; (utf7-encode "a+£") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
57 ;; => "a+ACsAow-" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
58 ;; |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
59 ;; $ echo "a+£"|iconv -f iso-8859-1 -t utf-7 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
60 ;; a+-+AKM |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
61 ;; |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
56927
diff
changeset
|
62 ;; -- fx |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
63 |
31717 | 64 |
65 ;;; Code: | |
66 | |
67 (require 'base64) | |
33119 | 68 (eval-when-compile (require 'cl)) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
69 (require 'mm-util) |
31717 | 70 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
71 (defconst utf7-direct-encoding-chars " -%'-*,-[]-}" |
31717 | 72 "Character ranges which do not need escaping in UTF-7.") |
73 | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
74 (defconst utf7-imap-direct-encoding-chars |
31717 | 75 (concat utf7-direct-encoding-chars "+\\~") |
76 "Character ranges which do not need escaping in the IMAP variant of UTF-7.") | |
77 | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
78 (defconst utf7-utf-16-coding-system |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
79 (cond ((mm-coding-system-p 'utf-16-be-no-signature) ; Mule-UCS |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
80 'utf-16-be-no-signature) |
110637
494ea2fb03d7
Remove Emacs 21 stuff.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110410
diff
changeset
|
81 ((and (mm-coding-system-p 'utf-16-be) ; Emacs |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
82 ;; Avoid versions with BOM. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
83 (= 2 (length (encode-coding-string "a" 'utf-16-be)))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
84 'utf-16-be) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
85 ((mm-coding-system-p 'utf-16-be-nosig) ; ? |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
86 'utf-16-be-nosig)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
87 "Coding system which encodes big endian UTF-16 without a BOM signature.") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
88 |
31717 | 89 (defsubst utf7-imap-get-pad-length (len modulus) |
90 "Return required length of padding for IMAP modified base64 fragment." | |
91 (mod (- len) modulus)) | |
92 | |
93 (defun utf7-encode-internal (&optional for-imap) | |
94 "Encode text in (temporary) buffer as UTF-7. | |
95 Use IMAP modification if FOR-IMAP is non-nil." | |
96 (let ((start (point-min)) | |
97 (end (point-max))) | |
98 (narrow-to-region start end) | |
99 (goto-char start) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
100 (let* ((esc-char (if for-imap ?& ?+)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
101 (direct-encoding-chars |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
102 (if for-imap utf7-imap-direct-encoding-chars |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
103 utf7-direct-encoding-chars)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
104 (not-direct-encoding-chars (concat "^" direct-encoding-chars))) |
31717 | 105 (while (not (eobp)) |
106 (skip-chars-forward direct-encoding-chars) | |
107 (unless (eobp) | |
108 (insert esc-char) | |
109 (let ((p (point)) | |
110 (fc (following-char)) | |
111 (run-length | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
112 (skip-chars-forward not-direct-encoding-chars))) |
31717 | 113 (if (and (= fc esc-char) |
114 (= run-length 1)) ; Lone esc-char? | |
108765
d835100c3e8b
Replace Lisp calls to delete-backward-char by delete-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
115 (delete-char -1) ; Now there's one too many |
31717 | 116 (utf7-fragment-encode p (point) for-imap)) |
117 (insert "-"))))))) | |
118 | |
119 (defun utf7-fragment-encode (start end &optional for-imap) | |
120 "Encode text from START to END in buffer as UTF-7 escape fragment. | |
121 Use IMAP modification if FOR-IMAP is non-nil." | |
122 (save-restriction | |
123 (narrow-to-region start end) | |
124 (funcall (utf7-get-u16char-converter 'to-utf-16)) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
125 (mm-with-unibyte-current-buffer |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
126 (base64-encode-region start (point-max))) |
31717 | 127 (goto-char start) |
128 (let ((pm (point-max))) | |
129 (when for-imap | |
130 (while (search-forward "/" nil t) | |
131 (replace-match ","))) | |
132 (skip-chars-forward "^= \t\n" pm) | |
133 (delete-region (point) pm)))) | |
134 | |
135 (defun utf7-decode-internal (&optional for-imap) | |
136 "Decode UTF-7 text in (temporary) buffer. | |
137 Use IMAP modification if FOR-IMAP is non-nil." | |
138 (let ((start (point-min)) | |
139 (end (point-max))) | |
140 (goto-char start) | |
141 (let* ((esc-pattern (concat "^" (char-to-string (if for-imap ?& ?+)))) | |
142 (base64-chars (concat "A-Za-z0-9+" | |
143 (char-to-string (if for-imap ?, ?/))))) | |
144 (while (not (eobp)) | |
145 (skip-chars-forward esc-pattern) | |
146 (unless (eobp) | |
147 (forward-char) | |
148 (let ((p (point)) | |
149 (run-length (skip-chars-forward base64-chars))) | |
150 (when (and (not (eobp)) (= (following-char) ?-)) | |
151 (delete-char 1)) | |
152 (unless (= run-length 0) ; Encoded lone esc-char? | |
153 (save-excursion | |
154 (utf7-fragment-decode p (point) for-imap) | |
155 (goto-char p) | |
108765
d835100c3e8b
Replace Lisp calls to delete-backward-char by delete-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
156 (delete-char -1))))))))) |
31717 | 157 |
158 (defun utf7-fragment-decode (start end &optional for-imap) | |
159 "Decode base64 encoded fragment from START to END of UTF-7 text in buffer. | |
160 Use IMAP modification if FOR-IMAP is non-nil." | |
161 (save-restriction | |
162 (narrow-to-region start end) | |
163 (when for-imap | |
164 (goto-char start) | |
165 (while (search-forward "," nil 'move-to-end) (replace-match "/"))) | |
166 (let ((pl (utf7-imap-get-pad-length (- end start) 4))) | |
167 (insert (make-string pl ?=)) | |
168 (base64-decode-region start (+ end pl))) | |
169 (funcall (utf7-get-u16char-converter 'from-utf-16)))) | |
170 | |
171 (defun utf7-get-u16char-converter (which-way) | |
172 "Return a function to convert between UTF-16 and current character set." | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
173 (if utf7-utf-16-coding-system |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
174 (if (eq which-way 'to-utf-16) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
175 (lambda () |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
176 (encode-coding-region (point-min) (point-max) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
177 utf7-utf-16-coding-system)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
178 (lambda () |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
179 (decode-coding-region (point-min) (point-max) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
180 utf7-utf-16-coding-system))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
181 ;; Add test to check if we are really Latin-1. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
182 (if (eq which-way 'to-utf-16) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
183 'utf7-latin1-u16-char-converter |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
184 'utf7-u16-latin1-char-converter))) |
31717 | 185 |
186 (defun utf7-latin1-u16-char-converter () | |
187 "Convert latin 1 (ISO-8859.1) characters to 16 bit Unicode. | |
188 Characters are converted to raw byte pairs in narrowed buffer." | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
189 (mm-encode-coding-region (point-min) (point-max) 'iso-8859-1) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
190 (mm-disable-multibyte) |
31717 | 191 (goto-char (point-min)) |
192 (while (not (eobp)) | |
193 (insert 0) | |
194 (forward-char))) | |
195 | |
196 (defun utf7-u16-latin1-char-converter () | |
197 "Convert 16 bit Unicode characters to latin 1 (ISO-8859.1). | |
198 Characters are in raw byte pairs in narrowed buffer." | |
199 (goto-char (point-min)) | |
200 (while (not (eobp)) | |
201 (if (= 0 (following-char)) | |
202 (delete-char 1) | |
203 (error "Unable to convert from Unicode")) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
204 (forward-char)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
205 (mm-decode-coding-region (point-min) (point-max) 'iso-8859-1) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
206 (mm-enable-multibyte)) |
31717 | 207 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110102
diff
changeset
|
208 ;;;###autoload |
31717 | 209 (defun utf7-encode (string &optional for-imap) |
210 "Encode UTF-7 STRING. Use IMAP modification if FOR-IMAP is non-nil." | |
86255
50442c77e242
(utf7-encode, utf7-decode): Use coding system
Reiner Steib <Reiner.Steib@gmx.de>
parents:
78224
diff
changeset
|
211 (if (and (coding-system-p 'utf-7) (coding-system-p 'utf-7-imap)) |
50442c77e242
(utf7-encode, utf7-decode): Use coding system
Reiner Steib <Reiner.Steib@gmx.de>
parents:
78224
diff
changeset
|
212 ;; Emacs 23 with proper support for IMAP |
50442c77e242
(utf7-encode, utf7-decode): Use coding system
Reiner Steib <Reiner.Steib@gmx.de>
parents:
78224
diff
changeset
|
213 (encode-coding-string string (if for-imap 'utf-7-imap 'utf-7)) |
104835
88f046f0db6f
(utf7-encode, utf7-decode): Use mm-with-multibyte-buffer, or
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
214 (mm-with-multibyte-buffer |
88f046f0db6f
(utf7-encode, utf7-decode): Use mm-with-multibyte-buffer, or
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
215 (insert string) |
88f046f0db6f
(utf7-encode, utf7-decode): Use mm-with-multibyte-buffer, or
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
216 (utf7-encode-internal for-imap) |
88f046f0db6f
(utf7-encode, utf7-decode): Use mm-with-multibyte-buffer, or
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
217 (buffer-string)))) |
31717 | 218 |
219 (defun utf7-decode (string &optional for-imap) | |
220 "Decode UTF-7 STRING. Use IMAP modification if FOR-IMAP is non-nil." | |
86255
50442c77e242
(utf7-encode, utf7-decode): Use coding system
Reiner Steib <Reiner.Steib@gmx.de>
parents:
78224
diff
changeset
|
221 (if (and (coding-system-p 'utf-7) (coding-system-p 'utf-7-imap)) |
50442c77e242
(utf7-encode, utf7-decode): Use coding system
Reiner Steib <Reiner.Steib@gmx.de>
parents:
78224
diff
changeset
|
222 ;; Emacs 23 with proper support for IMAP |
50442c77e242
(utf7-encode, utf7-decode): Use coding system
Reiner Steib <Reiner.Steib@gmx.de>
parents:
78224
diff
changeset
|
223 (decode-coding-string string (if for-imap 'utf-7-imap 'utf-7)) |
104835
88f046f0db6f
(utf7-encode, utf7-decode): Use mm-with-multibyte-buffer, or
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
224 (mm-with-unibyte-buffer |
88f046f0db6f
(utf7-encode, utf7-decode): Use mm-with-multibyte-buffer, or
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
225 (insert string) |
88f046f0db6f
(utf7-encode, utf7-decode): Use mm-with-multibyte-buffer, or
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
226 (utf7-decode-internal for-imap) |
88f046f0db6f
(utf7-encode, utf7-decode): Use mm-with-multibyte-buffer, or
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
227 (mm-enable-multibyte) |
88f046f0db6f
(utf7-encode, utf7-decode): Use mm-with-multibyte-buffer, or
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
228 (buffer-string)))) |
31717 | 229 |
230 (provide 'utf7) | |
231 | |
232 ;;; utf7.el ends here |