(Fdefine_charset_internal): Record a supplementary

[bpt/emacs.git] / src / charset.c

diff --git a/src/charset.c b/src/charset.c
index 9fb7f64..9ed6a73 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -1,10 +1,11 @@
 /* Basic character set support.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
+
    Copyright (C) 2003, 2004
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
@@ -13,7 +14,7 @@ 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 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,
@@ -1053,8 +1054,12 @@ usage: (define-charset-internal ...)  */)
   if (new_definition_p)
     {
       Vcharset_list = Fcons (args[charset_arg_name], Vcharset_list);
-      Vcharset_ordered_list = nconc2 (Vcharset_ordered_list,
-                                     Fcons (make_number (id), Qnil));
+      if (charset.supplementary_p)
+       Vcharset_ordered_list = nconc2 (Vcharset_ordered_list,
+                                       Fcons (make_number (id), Qnil));
+      else
+       Vcharset_ordered_list = Fcons (make_number (id),
+                                      Vcharset_ordered_list);
       charset_ordered_list_tick++;
     }