projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(find_charsets_in_charc_string): New prototype; delete
[chise/xemacs-chise.git-]
/
src
/
objects-tty.c
diff --git
a/src/objects-tty.c
b/src/objects-tty.c
index
21e1774
..
ea76e6f
100644
(file)
--- a/
src/objects-tty.c
+++ b/
src/objects-tty.c
@@
-29,7
+29,7
@@
Boston, MA 02111-1307, USA. */
#include "objects-tty.h"
#ifdef MULE
#include "device.h"
#include "objects-tty.h"
#ifdef MULE
#include "device.h"
-#include "mule-charset.h"
+#include "character.h"
#endif
/* An alist mapping from color names to a cons of (FG-STRING, BG-STRING). */
#endif
/* An alist mapping from color names to a cons of (FG-STRING, BG-STRING). */
@@
-220,7
+220,7
@@
tty_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name,
Bufbyte *str = XSTRING_DATA (name);
Lisp_Object charset = Qnil;
Bufbyte *str = XSTRING_DATA (name);
Lisp_Object charset = Qnil;
- if (strncmp ((CONST char *) str, "normal", 6))
+ if (strncmp ((const char *) str, "normal", 6))
return 0;
str += 6;
if (*str)
return 0;
str += 6;
if (*str)
@@
-229,7
+229,7
@@
tty_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name,
if (*str != '/')
return 0;
str++;
if (*str != '/')
return 0;
str++;
- charset = Ffind_charset (intern ((CONST char *) str));
+ charset = Ffind_charset (intern ((const char *) str));
if (NILP (charset))
return 0;
#else
if (NILP (charset))
return 0;
#else
@@
-242,7
+242,7
@@
tty_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name,
FONT_INSTANCE_TTY_CHARSET (f) = charset;
#ifdef MULE
if (CHARSETP (charset))
FONT_INSTANCE_TTY_CHARSET (f) = charset;
#ifdef MULE
if (CHARSETP (charset))
- f->width = XCHARSET_COLUMNS (charset);
+ f->width = CHARSET_COLUMNS (XCHARSET (charset));
else
#endif
f->width = 1;
else
#endif
f->width = 1;
@@
-284,10
+284,10
@@
tty_list_fonts (Lisp_Object pattern, Lisp_Object device)
static int
tty_font_spec_matches_charset (struct device *d, Lisp_Object charset,
static int
tty_font_spec_matches_charset (struct device *d, Lisp_Object charset,
- CONST Bufbyte *nonreloc, Lisp_Object reloc,
+ const Bufbyte *nonreloc, Lisp_Object reloc,
Bytecount offset, Bytecount length)
{
Bytecount offset, Bytecount length)
{
- CONST Bufbyte *the_nonreloc = nonreloc;
+ const Bufbyte *the_nonreloc = nonreloc;
if (!the_nonreloc)
the_nonreloc = XSTRING_DATA (reloc);
if (!the_nonreloc)
the_nonreloc = XSTRING_DATA (reloc);
@@
-296,14
+296,14
@@
tty_font_spec_matches_charset (struct device *d, Lisp_Object charset,
if (UNBOUNDP (charset))
return !memchr (the_nonreloc, '/', length);
if (UNBOUNDP (charset))
return !memchr (the_nonreloc, '/', length);
- the_nonreloc = (CONST Bufbyte *) memchr (the_nonreloc, '/', length);
+ the_nonreloc = (const Bufbyte *) memchr (the_nonreloc, '/', length);
if (!the_nonreloc)
return 0;
the_nonreloc++;
{
Lisp_String *s = symbol_name (XSYMBOL (XCHARSET_NAME (charset)));
if (!the_nonreloc)
return 0;
the_nonreloc++;
{
Lisp_String *s = symbol_name (XSYMBOL (XCHARSET_NAME (charset)));
- return !strcmp ((CONST char *) the_nonreloc,
- (CONST char *) string_data (s));
+ return !strcmp ((const char *) the_nonreloc,
+ (const char *) string_data (s));
}
}
}
}
@@
-315,7
+315,7
@@
tty_find_charset_font (Lisp_Object device, Lisp_Object font,
{
Bufbyte *fontname = XSTRING_DATA (font);
{
Bufbyte *fontname = XSTRING_DATA (font);
- if (strchr ((CONST char *) fontname, '/'))
+ if (strchr ((const char *) fontname, '/'))
{
if (tty_font_spec_matches_charset (XDEVICE (device), charset, 0,
font, 0, -1))
{
if (tty_font_spec_matches_charset (XDEVICE (device), charset, 0,
font, 0, -1))