comparison src/specifier.c @ 2:ac2d302a0011 r19-15b2

Import from CVS: tag r19-15b2
author cvs
date Mon, 13 Aug 2007 08:46:35 +0200
parents 376386a54a3c
children 0293115a14e9
comparison
equal deleted inserted replaced
1:c0c6a60d29db 2:ac2d302a0011
502 (locale) 502 (locale)
503 Lisp_Object locale; 503 Lisp_Object locale;
504 { 504 {
505 /* This cannot GC. */ 505 /* This cannot GC. */
506 if ((DEVICEP (locale) && DEVICE_LIVE_P (XDEVICE (locale))) || 506 if ((DEVICEP (locale) && DEVICE_LIVE_P (XDEVICE (locale))) ||
507 (FRAMEP (locale) && FRAME_LIVE_P (XFRAME (locale))) || 507 (FRAMEP (locale) && FRAME_LIVE_P (XFRAME (locale))) ||
508 (BUFFERP (locale) && BUFFER_LIVE_P (XBUFFER (locale))) || 508 (BUFFERP (locale) && BUFFER_LIVE_P (XBUFFER (locale))) ||
509 /* dead windows are allowed because they may become live 509 /* dead windows are allowed because they may become live
510 windows again when a window configuration is restored */ 510 windows again when a window configuration is restored */
511 WINDOWP (locale) || 511 WINDOWP (locale) ||
512 EQ (locale, Qglobal)) 512 EQ (locale, Qglobal))
526 (domain) 526 (domain)
527 Lisp_Object domain; 527 Lisp_Object domain;
528 { 528 {
529 /* This cannot GC. */ 529 /* This cannot GC. */
530 if ((DEVICEP (domain) && DEVICE_LIVE_P (XDEVICE (domain))) || 530 if ((DEVICEP (domain) && DEVICE_LIVE_P (XDEVICE (domain))) ||
531 (FRAMEP (domain) && FRAME_LIVE_P (XFRAME (domain))) || 531 (FRAMEP (domain) && FRAME_LIVE_P (XFRAME (domain))) ||
532 (WINDOWP (domain) && WINDOW_LIVE_P (XWINDOW (domain)))) 532 (WINDOWP (domain) && WINDOW_LIVE_P (XWINDOW (domain))))
533 return Qt; 533 return Qt;
534 else 534 else
535 return Qnil; 535 return Qnil;
536 } 536 }
547 Lisp_Object locale_type; 547 Lisp_Object locale_type;
548 { 548 {
549 /* This cannot GC. */ 549 /* This cannot GC. */
550 if (EQ (locale_type, Qglobal) || 550 if (EQ (locale_type, Qglobal) ||
551 EQ (locale_type, Qdevice) || 551 EQ (locale_type, Qdevice) ||
552 EQ (locale_type, Qframe) || 552 EQ (locale_type, Qframe) ||
553 EQ (locale_type, Qwindow) || 553 EQ (locale_type, Qwindow) ||
554 EQ (locale_type, Qbuffer)) 554 EQ (locale_type, Qbuffer))
555 return Qt; 555 return Qt;
556 else 556 else
557 return Qnil; 557 return Qnil;
607 607
608 static enum spec_locale_type 608 static enum spec_locale_type
609 decode_locale_type (Lisp_Object locale_type) 609 decode_locale_type (Lisp_Object locale_type)
610 { 610 {
611 /* This cannot GC. */ 611 /* This cannot GC. */
612 if (EQ (locale_type, Qglobal)) 612 if (EQ (locale_type, Qglobal)) return LOCALE_GLOBAL;
613 return LOCALE_GLOBAL; 613 if (EQ (locale_type, Qdevice)) return LOCALE_DEVICE;
614 if (EQ (locale_type, Qdevice)) 614 if (EQ (locale_type, Qframe)) return LOCALE_FRAME;
615 return LOCALE_DEVICE; 615 if (EQ (locale_type, Qwindow)) return LOCALE_WINDOW;
616 if (EQ (locale_type, Qframe)) 616 if (EQ (locale_type, Qbuffer)) return LOCALE_BUFFER;
617 return LOCALE_FRAME; 617
618 if (EQ (locale_type, Qwindow))
619 return LOCALE_WINDOW;
620 if (EQ (locale_type, Qbuffer))
621 return LOCALE_BUFFER;
622 signal_simple_error ("Invalid specifier locale type", locale_type); 618 signal_simple_error ("Invalid specifier locale type", locale_type);
623 return 0; 619 return LOCALE_GLOBAL; /* not reached */
624 } 620 }
625 621
626 Lisp_Object 622 Lisp_Object
627 decode_locale_list (Lisp_Object locale) 623 decode_locale_list (Lisp_Object locale)
628 { 624 {