Merge changes from emacs-23 branch

[gnu-emacs] / leim / quail / greek.el

diff --git a/leim/quail/greek.el b/leim/quail/greek.el
index 6b183111fcc8654b42b3c897ac1b48ed8427c137..4deeb86fb4d8e2b4ade7aa9f41310322d42ffcbb 100644 (file)
--- a/leim/quail/greek.el
+++ b/leim/quail/greek.el
@@ -1,9 +1,8 @@
 ;;; greek.el --- Quail package for inputting Greek -*-coding: iso-2022-7bit-*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008, 2009, 2010
+;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
@@ -1280,8 +1279,8 @@ e.g.
  (":;i" ?\e,F@\e(B)
  (";:y" ?\e,F`\e(B)
  (":;y" ?\e,F`\e(B)
- (";<" "\e$(Q)(\e(B")
- (";>" "\e$(Q)2\e(B"))
+ (";<" ?\e$(Q)(\e(B)
+ (";>" ?\e$(Q)2\e(B))
 
 (quail-define-package
  "greek-postfix" "GreekPost" "\e,FX\e(B" nil
@@ -1422,12 +1421,11 @@ e.g.
  ("i;:" ?\e,F@\e(B)
  ("y:;" ?\e,F`\e(B)
  ("y;:" ?\e,F`\e(B)
- ;; There two are asymmetric with ";<" and ";>" in "greek" input
- ;; method.  But, as the other Latin postfix methdos adopt "<<" and
+ ;; These two are asymmetric with ";<" and ";>" in "greek" input
+ ;; method.  But, as the other Latin postfix methods adopt "<<" and
  ;; ">>", it may be better to follow them.
- ("<<" "\e$(Q)(\e(B")
- (">>" "\e$(Q)2\e(B"))
+ ("<<" ?\e$(Q)(\e(B)
+ (">>" ?\e$(Q)2\e(B))
 
 
-;; arch-tag: 2a37e042-db1b-4ecf-b755-117775a3c150
 ;;; greek.el ends here