Mercurial > hg > xemacs-beta
comparison src/console.c @ 5027:22179cd0fe15
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 10 Feb 2010 07:25:19 -0600 |
parents | ae48681c47fa |
children | d4f666cda5e6 6f2158fa75ed b5df3737028a |
comparison
equal
deleted
inserted
replaced
5026:46cf825f6158 | 5027:22179cd0fe15 |
---|---|
649 find_nonminibuffer_frame_not_on_console_predicate (Lisp_Object frame, | 649 find_nonminibuffer_frame_not_on_console_predicate (Lisp_Object frame, |
650 void *closure) | 650 void *closure) |
651 { | 651 { |
652 Lisp_Object console; | 652 Lisp_Object console; |
653 | 653 |
654 console = VOID_TO_LISP (closure); | 654 console = GET_LISP_FROM_VOID (closure); |
655 if (FRAME_MINIBUF_ONLY_P (XFRAME (frame))) | 655 if (FRAME_MINIBUF_ONLY_P (XFRAME (frame))) |
656 return 0; | 656 return 0; |
657 if (EQ (console, FRAME_CONSOLE (XFRAME (frame)))) | 657 if (EQ (console, FRAME_CONSOLE (XFRAME (frame)))) |
658 return 0; | 658 return 0; |
659 return 1; | 659 return 1; |
661 | 661 |
662 static Lisp_Object | 662 static Lisp_Object |
663 find_nonminibuffer_frame_not_on_console (Lisp_Object console) | 663 find_nonminibuffer_frame_not_on_console (Lisp_Object console) |
664 { | 664 { |
665 return find_some_frame (find_nonminibuffer_frame_not_on_console_predicate, | 665 return find_some_frame (find_nonminibuffer_frame_not_on_console_predicate, |
666 LISP_TO_VOID (console)); | 666 STORE_LISP_IN_VOID (console)); |
667 } | 667 } |
668 | 668 |
669 static void | 669 static void |
670 nuke_all_console_slots (struct console *con, Lisp_Object zap) | 670 nuke_all_console_slots (struct console *con, Lisp_Object zap) |
671 { | 671 { |