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-23
[bpt/emacs.git]
/
lisp
/
language
/
ethiopic.el
diff --git
a/lisp/language/ethiopic.el
b/lisp/language/ethiopic.el
index
0cbb30f
..
07d4227
100644
(file)
--- a/
lisp/language/ethiopic.el
+++ b/
lisp/language/ethiopic.el
@@
-1,9
+1,9
@@
;;; ethiopic.el --- support for Ethiopic -*- coding: utf-8-emacs; -*-
;;; ethiopic.el --- support for Ethiopic -*- coding: utf-8-emacs; -*-
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
, 2009, 2010, 2011
;; Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
;; Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008
+;; 2005, 2006, 2007, 2008
, 2009, 2010, 2011
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
@@
-11,10
+11,10
@@
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-22,9
+22,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;; Author: TAKAHASHI Naoto <ntakahas@m17n.org>
;; Author: TAKAHASHI Naoto <ntakahas@m17n.org>
@@
-52,7
+50,7
@@
"CCL program to encode an Ethiopic code to code point of Ethiopic font.")
(setq font-ccl-encoder-alist
"CCL program to encode an Ethiopic code to code point of Ethiopic font.")
(setq font-ccl-encoder-alist
- (cons (cons
"ethiopic"
ccl-encode-ethio-font) font-ccl-encoder-alist))
+ (cons (cons
(purecopy "ethiopic")
ccl-encode-ethio-font) font-ccl-encoder-alist))
(set-language-info-alist
"Ethiopic" '((setup-function . setup-ethiopic-environment-internal)
(set-language-info-alist
"Ethiopic" '((setup-function . setup-ethiopic-environment-internal)
@@
-87,5
+85,5
@@
(provide 'ethiopic)
(provide 'ethiopic)
-;;
;
arch-tag: e81329d9-1286-43ba-92fd-54ce5c7b213c
+;; arch-tag: e81329d9-1286-43ba-92fd-54ce5c7b213c
;;; ethiopic.el ends here
;;; ethiopic.el ends here