Merge from emacs-23; up to 2010-06-08T03:06:47Z!dann@ics.uci.edu.

[gnu-emacs] / lisp / language / ethio-util.el

diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index 55dca98e835e03eb911e9a4afddad234e47e566d..bb242a50accf010a16de77bec219f140819bb152 100644 (file)
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -1,9 +1,8 @@
 ;;; ethio-util.el --- utilities for Ethiopic   -*- coding: utf-8; -*-
 
-;; Copyright (C) 1997, 1998, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2002-2011  Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008
+;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 ;; Copyright (C) 2005, 2006
@@ -14,10 +13,10 @@
 
 ;; 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
-;; 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
@@ -25,9 +24,7 @@
 ;; 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>
 
@@ -37,9 +34,6 @@
 
 (require 'robin)
 
-(defvar rmail-current-message)
-(defvar rmail-message-vector)
-
 ;; Information for exiting Ethiopic environment.
 (defvar exit-ethiopic-environment-data nil)
 
@@ -874,7 +868,7 @@ Otherwise, [0-9A-F]."
     (goto-char (point-min))
     (while (re-search-forward "[ሀ-፼]" nil t)
       (setq ucode (preceding-char))
-      (delete-backward-char 1)
+      (delete-char -1)
       (insert
        (format (if ethio-java-save-lowercase "\\u%4x" "\\u%4X")
               ucode)))))
@@ -2078,5 +2072,4 @@ mark."
 
 ;;; ethio-util.el ends here
 
-;; arch-tag: c8feb3d6-39bf-4b0a-b6ef-26f03fbc8140
 ;;; ethio-util.el ends here