summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/NEWS6
-rw-r--r--src/ChangeLog4
-rw-r--r--src/charset.c38
3 files changed, 4 insertions, 44 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 82cad5fc15b..7441085e5ae 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -773,12 +773,6 @@ charsets ordered by priority.
*** The new function `set-charset-priority' sets priorities of charsets.
-*** The new function `unibyte-charset' returns the current unibyte
-charset. The unibyte charset determines how unibyte/multibyte
-conversion is done.
-
-*** The new function `set-unibyte-charset' sets the unibyte charset.
-
*** The new function `unibyte-string' make a unibyte string from bytes.
*** The new function `define-char-code-property' defines a character
diff --git a/src/ChangeLog b/src/ChangeLog
index 568767823f1..2f63a75016f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-01 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * charset.c (Funibyte_charset, Fset_unibyte_charset): Remove.
+
2008-03-31 Juri Linkov <juri@jurta.org>
* window.c (Fdisplay_buffer): Reinitialize `tem' to nil.
diff --git a/src/charset.c b/src/charset.c
index ce15207b3ad..5fe7e43a7a8 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1170,42 +1170,6 @@ DEFUN ("define-charset-alias", Fdefine_charset_alias,
}
-DEFUN ("unibyte-charset", Funibyte_charset, Sunibyte_charset, 0, 0, 0,
- doc: /* Return the unibyte charset (set by `set-unibyte-charset'). */)
- ()
-{
- return CHARSET_NAME (CHARSET_FROM_ID (charset_unibyte));
-}
-
-
-DEFUN ("set-unibyte-charset", Fset_unibyte_charset, Sset_unibyte_charset,
- 1, 1, 0,
- doc: /* Set the unibyte charset to CHARSET.
-This determines how unibyte/multibyte conversion is done. See also
-function `unibyte-charset'. */)
- (charset)
- Lisp_Object charset;
-{
- struct charset *cs;
- int i, c;
-
- CHECK_CHARSET_GET_CHARSET (charset, cs);
- if (! cs->ascii_compatible_p
- || cs->dimension != 1)
- error ("Inappropriate unibyte charset: %s", SDATA (SYMBOL_NAME (charset)));
- charset_unibyte = cs->id;
- memset (unibyte_has_multibyte_table, 1, 128);
- for (i = 128; i < 256; i++)
- {
- c = DECODE_CHAR (cs, i);
- unibyte_to_multibyte_table[i] = (c < 0 ? BYTE8_TO_CHAR (i) : c);
- unibyte_has_multibyte_table[i] = c >= 0;
- }
-
- return Qnil;
-}
-
-
DEFUN ("charset-plist", Fcharset_plist, Scharset_plist, 1, 1, 0,
doc: /* Return the property list of CHARSET. */)
(charset)
@@ -2142,8 +2106,6 @@ syms_of_charset ()
defsubr (&Smap_charset_chars);
defsubr (&Sdefine_charset_internal);
defsubr (&Sdefine_charset_alias);
- defsubr (&Sunibyte_charset);
- defsubr (&Sset_unibyte_charset);
defsubr (&Scharset_plist);
defsubr (&Sset_charset_plist);
defsubr (&Sunify_charset);