[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/charset.c,v
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/src/charset.c,v |
Date: |
Tue, 03 Jun 2008 04:22:56 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 08/06/03 04:22:56
Index: charset.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/charset.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -b -r1.162 -r1.163
--- charset.c 30 May 2008 21:07:50 -0000 1.162
+++ charset.c 3 Jun 2008 04:22:55 -0000 1.163
@@ -1813,8 +1813,12 @@
Lisp_Object charset_list;
unsigned *code_return;
{
+ int maybe_null = 0;
+
if (NILP (charset_list))
charset_list = Vcharset_ordered_list;
+ else
+ maybe_null = 1;
while (CONSP (charset_list))
{
@@ -1832,7 +1836,8 @@
&& EQ (charset_list, Vcharset_non_preferred_head))
return CHARSET_FROM_ID (charset_unicode);
}
- return (c <= MAX_5_BYTE_CHAR ? CHARSET_FROM_ID (charset_emacs)
+ return (maybe_null ? NULL
+ : c <= MAX_5_BYTE_CHAR ? CHARSET_FROM_ID (charset_emacs)
: CHARSET_FROM_ID (charset_eight_bit));
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/charset.c,v,
Kenichi Handa <=