Merge from emacs--rel--22

[gnu-emacs] / lisp / international / code-pages.el

diff --git a/lisp/international/code-pages.el b/lisp/international/code-pages.el
index 3f4e0ca5072dce841b74dd8ebd69eea1ea8976ed..5007a00b16d2bba0927380a704f8308733557b19 100644 (file)
--- a/lisp/international/code-pages.el
+++ b/lisp/international/code-pages.el
@@ -1,7 +1,8 @@
 ;;; code-pages.el --- coding systems for assorted codepages  -*-coding: utf-8;-*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
-;; Copyright (C) 2004, 2005
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
@@ -3574,11 +3575,11 @@ Return an updated `non-iso-charset-alist'."
   ?\ƒ
   ?\§
   ?\¤
-  nil
+  ?\’
   ?\“
   ?\«
-  nil
-  nil
+  ?\‹
+  ?\›
   ?\fi
   ?\fl
   ?\®
@@ -3589,8 +3590,8 @@ Return an updated `non-iso-charset-alist'."
   ?\¦
   ?\¶
   ?\•
-  nil
-  nil
+  ?\‚
+  ?\„
   ?\”
   ?\»
   ?\…