Merge from emacs--devo--0

[bpt/emacs.git] / lisp / language / utf-8-lang.el

diff --git a/lisp/language/utf-8-lang.el b/lisp/language/utf-8-lang.el
index 894c048..d2cec6d 100644 (file)
--- a/lisp/language/utf-8-lang.el
+++ b/lisp/language/utf-8-lang.el
@@ -1,6 +1,6 @@
 ;;; utf-8-lang.el --- generic UTF-8 language environment -*- no-byte-compile: t -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
@@ -10,7 +10,7 @@
 
 ;; 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 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -28,14 +28,15 @@
 ;;; Code:
 
 (set-language-info-alist
- "UTF-8" `((coding-system mule-utf-8)
-          (coding-priority mule-utf-8)
-          (setup-function
-           . (lambda ()
-               ;; Use Unicode font under Windows.  Jason Rumney fecit.
-               (if (and (fboundp 'w32-add-charset-info)
-                        (not (boundp 'w32-unicode-charset-defined)))
-                   (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t))))
+ "UTF-8" `((coding-system utf-8)
+          (coding-priority utf-8)
+;; Presumably not relevant now.
+;;        (setup-function
+;;         . (lambda ()
+;;             ;; Use Unicode font under Windows.  Jason Rumney fecit.
+;;             (if (and (fboundp 'w32-add-charset-info)
+;;                      (not (boundp 'w32-unicode-charset-defined)))
+;;                 (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t))))
 ;; Is this appropriate?
 ;;        (exit-function
 ;;         . (lambda ()
@@ -46,8 +47,8 @@
 ;;                               w32-charset-info-alist)))))
           (input-method . "rfc1345")   ; maybe not the best choice
           (documentation . "\
-This language environment is a generic one for a subset of the Unicode
-character set encoded in UTF-8."))
+This language environment is a generic one for the Unicode character set
+encoded in UTF-8."))
  nil)
 
 (provide 'utf-8-lang)