Add 2012 to FSF copyright years for Emacs files

[bpt/emacs.git] / lisp / international / utf-7.el

diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el
index 054e9be..8e10c94 100644 (file)
--- a/lisp/international/utf-7.el
+++ b/lisp/international/utf-7.el
@@ -1,24 +1,24 @@
 ;;; utf-7.el --- utf-7 coding system
 
-;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+;; Copyright (C) 2003-2012  Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n, mail
 
-;; This file is free software; you can redistribute it and/or modify
+;; This file is part of GNU Emacs.
+
+;; 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.
 
-;; This file is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; 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/>.
 
 ;;; Commentary:
 
@@ -30,7 +30,7 @@
 ;; implementation in Gnus, but has been substantially re-done.
 
 ;; This probably needs more attention.  In particular, it's not
-;; completely consistent with iconv's behaviour.  It's arguable
+;; completely consistent with iconv's behavior.  It's arguable
 ;; whether the IMAP version should be a coding system since it's
 ;; apparently only used for IMAP mailbox names, so it's commented out.
 
@@ -61,7 +61,7 @@ IMAP non-nil means use the IMAP version."
                (decode-coding-region p (point) 'utf-16be)
                (save-excursion
                  (goto-char p)
-                 (delete-backward-char 1)))))))
+                 (delete-char -1)))))))
       (- (point-max) (point-min)))))
 
 ;;;###autoload
@@ -91,7 +91,7 @@ ESC and SKIP-CHARS are adjusted for the normal and IMAP versions."
     (goto-char (point-min))
     (while (not (eobp))
       (skip-chars-forward skip-chars)
-      (if (eq ?+ (char-after))
+      (if (eq esc (char-after))
          (progn (forward-char)
                 (insert ?-))
        (unless (eobp)
@@ -126,5 +126,4 @@ ESC and SKIP-CHARS are adjusted for the normal and IMAP versions."
 
 (provide 'utf-7)
 
-;; arch-tag: 975ee403-90a4-4286-97d2-4ed1323f4ef9
 ;;; utf-7.el ends here