Add 2010 to copyright years.

[bpt/emacs.git] / lisp / nxml / nxml-glyph.el

diff --git a/lisp/nxml/nxml-glyph.el b/lisp/nxml/nxml-glyph.el
index 47d7086..ec7ee49 100644 (file)
--- a/lisp/nxml/nxml-glyph.el
+++ b/lisp/nxml/nxml-glyph.el
@@ -1,16 +1,16 @@
 ;;; nxml-glyph.el --- glyph-handling for nxml-mode
 
-;; Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: XML
 
 ;; 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
@@ -18,9 +18,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/>.
 
 ;;; Commentary:
 
@@ -273,7 +271,7 @@ This repertoire is supported for the following fonts:
   "Glyph set for TARGET3 glyph repertoire of the misc-fixed-* fonts.
 This repertoire is supported for the following fonts:
 6x13.bdf 8x13.bdf 9x15.bdf 9x18.bdf 10x20.bdf")
-  
+
 (defconst nxml-wgl4-glyph-set
   [(#x0020 . #x007E)
    (#x00A0 . #x017F)
@@ -336,14 +334,14 @@ This repertoire is supported for the following fonts:
 
 (defvar nxml-glyph-set-hook nil
   "*Hook for determining the set of glyphs in a face.
-The hook will receive a single argument FACE.  If it can determine the
-set of glyphs representable by FACE, it must set the variable
-`nxml-glyph-set' and return non-nil.  Otherwise, it must return
-nil. The hook will be run until success.  The constants
+The hook will receive a single argument FACE.  If it can determine
+the set of glyphs representable by FACE, it must set the variable
+`nxml-glyph-set' and return non-nil.  Otherwise, it must return nil.
+The hook will be run until success.  The constants
 `nxml-ascii-glyph-set', `nxml-latin1-glyph-set',
 `nxml-misc-fixed-1-glyph-set', `nxml-misc-fixed-2-glyph-set',
-`nxml-misc-fixed-3-glyph-set' and `nxml-wgl4-glyph-set' are predefined
-for use by `nxml-glyph-set-hook'.")
+`nxml-misc-fixed-3-glyph-set' and `nxml-wgl4-glyph-set' are
+predefined for use by `nxml-glyph-set-hook'.")
 
 (defvar nxml-glyph-set nil
   "Used by `nxml-glyph-set-hook' to return set of glyphs in a FACE.
@@ -388,7 +386,7 @@ Return nil if the face cannot display a glyph for N."
         (nxml-glyph-set-contains-p n nxml-glyph-set)
         (let ((ch (decode-char 'ucs n)))
           (and ch (string ch))))))
-      
+
 (defun nxml-glyph-set-contains-p (n v)
   (let ((start 0)
        (end (length v))