Mercurial > hg > xemacs-beta

comparison src/objects-tty.c @ 5027:22179cd0fe15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Wed, 10 Feb 2010 07:25:19 -0600
parents d95c102a96d3
children d4f666cda5e6 b5df3737028a
comparison
equal deleted inserted replaced
5026:46cf825f6158 5027:22179cd0fe15
1 /* TTY-specific Lisp objects. 1 /* TTY-specific Lisp objects.
2 Copyright (C) 1995 Board of Trustees, University of Illinois. 2 Copyright (C) 1995 Board of Trustees, University of Illinois.
3 Copyright (C) 1995, 1996, 2001, 2002 Ben Wing. 3 Copyright (C) 1995, 1996, 2001, 2002, 2010 Ben Wing.
4 4
5 This file is part of XEmacs. 5 This file is part of XEmacs.
6 6
7 XEmacs is free software; you can redistribute it and/or modify it 7 XEmacs is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
343 Bytecount offset, Bytecount length, 343 Bytecount offset, Bytecount length,
344 enum font_specifier_matchspec_stages stage) 344 enum font_specifier_matchspec_stages stage)
345 { 345 {
346 const Ibyte *the_nonreloc = nonreloc; 346 const Ibyte *the_nonreloc = nonreloc;
347 347
348 if (stage) 348 if (stage == STAGE_FINAL)
349 return 0; 349 return 0;
350 350
351 if (!the_nonreloc) 351 if (!the_nonreloc)
352 the_nonreloc = XSTRING_DATA (reloc); 352 the_nonreloc = XSTRING_DATA (reloc);
353 fixup_internal_substring (nonreloc, reloc, offset, &length); 353 fixup_internal_substring (nonreloc, reloc, offset, &length);
372 Lisp_Object charset, 372 Lisp_Object charset,
373 enum font_specifier_matchspec_stages stage) 373 enum font_specifier_matchspec_stages stage)
374 { 374 {
375 Ibyte *fontname = XSTRING_DATA (font); 375 Ibyte *fontname = XSTRING_DATA (font);
376 376
377 if (stage) 377 if (stage == STAGE_FINAL)
378 return Qnil; 378 return Qnil;
379 379
380 if (strchr ((const char *) fontname, '/')) 380 if (strchr ((const char *) fontname, '/'))
381 { 381 {
382 if (tty_font_spec_matches_charset (XDEVICE (device), charset, 0, 382 if (tty_font_spec_matches_charset (XDEVICE (device), charset, 0,
383 font, 0, -1, initial)) 383 font, 0, -1, STAGE_INITIAL))
384 return font; 384 return font;
385 return Qnil; 385 return Qnil;
386 } 386 }
387 387
388 if (NILP (charset)) 388 if (NILP (charset))