HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2014-06-11T19:33:14Z!rgm@gnu.org
[bpt/emacs.git]
/
lisp
/
gnus
/
utf7.el
diff --git
a/lisp/gnus/utf7.el
b/lisp/gnus/utf7.el
index
47c3b0f
..
f48ae87
100644
(file)
--- a/
lisp/gnus/utf7.el
+++ b/
lisp/gnus/utf7.el
@@
-1,7
+1,6
@@
-;;; utf7.el --- UTF-7 encoding/decoding for Emacs -*-coding:
iso-8859-1
;-*-
+;;; utf7.el --- UTF-7 encoding/decoding for Emacs -*-coding:
utf-8
;-*-
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;; 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2014 Free Software Foundation, Inc.
;; Author: Jon K Hellan <hellan@acm.org>
;; Maintainer: bugs@gnus.org
;; Author: Jon K Hellan <hellan@acm.org>
;; Maintainer: bugs@gnus.org
@@
-53,10
+52,10
@@
;; necessary coding system. The code below doesn't seem to DTRT
;; generally. E.g.:
;;
;; necessary coding system. The code below doesn't seem to DTRT
;; generally. E.g.:
;;
-;; (utf7-encode "a+£")
+;; (utf7-encode "a+
Â
£")
;; => "a+ACsAow-"
;;
;; => "a+ACsAow-"
;;
-;; $ echo "a+
£"|iconv -f iso-8859-1
-t utf-7
+;; $ echo "a+
£"|iconv -f utf-8
-t utf-7
;; a+-+AKM
;;
;; -- fx
;; a+-+AKM
;;
;; -- fx