Mercurial > emacs

comparison src/nsfns.m @ 112375:b7555c0e51fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Paul Eggert <eggert@cs.ucla.edu>
date Wed, 19 Jan 2011 15:02:04 -0800
parents 7935463f385e
children
comparison
equal deleted inserted replaced
112369:47cb827a3b2a 112375:b7555c0e51fe
80 extern Lisp_Object Qface_set_after_frame_default; 80 extern Lisp_Object Qface_set_after_frame_default;
81 extern Lisp_Object Qunderline, Qundefined; 81 extern Lisp_Object Qunderline, Qundefined;
82 extern Lisp_Object Qheight, Qminibuffer, Qname, Qonly, Qwidth; 82 extern Lisp_Object Qheight, Qminibuffer, Qname, Qonly, Qwidth;
83 extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle; 83 extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle;
84 extern Lisp_Object Qnone; 84 extern Lisp_Object Qnone;
85 extern Lisp_Object Vframe_title_format, Vicon_title_format; 85
86
87 /* The below are defined in frame.c. */
88
89 extern Lisp_Object Vmenu_bar_mode, Vtool_bar_mode;
90 86
91 Lisp_Object Qbuffered; 87 Lisp_Object Qbuffered;
92 Lisp_Object Qfontsize; 88 Lisp_Object Qfontsize;
93 89
94 /* hack for OS X file panels */ 90 /* hack for OS X file panels */
95 char panelOK = 0; 91 char panelOK = 0;
96
97 /* Alist of elements (REGEXP . IMAGE) for images of icons associated
98 to frames.*/
99 static Lisp_Object Vns_icon_type_alist;
100
101 /* Toolkit version support. */
102 static Lisp_Object Vns_version_string;
103 92
104 EmacsTooltip *ns_tooltip; 93 EmacsTooltip *ns_tooltip;
105 94
106 /* Need forward declaration here to preserve organizational integrity of file */ 95 /* Need forward declaration here to preserve organizational integrity of file */
107 Lisp_Object Fx_open_connection (Lisp_Object, Lisp_Object, Lisp_Object); 96 Lisp_Object Fx_open_connection (Lisp_Object, Lisp_Object, Lisp_Object);
2591 int i; 2580 int i;
2592 2581
2593 Qfontsize = intern_c_string ("fontsize"); 2582 Qfontsize = intern_c_string ("fontsize");
2594 staticpro (&Qfontsize); 2583 staticpro (&Qfontsize);
2595 2584
2596 DEFVAR_LISP ("ns-icon-type-alist", &Vns_icon_type_alist, 2585 DEFVAR_LISP ("ns-icon-type-alist", Vns_icon_type_alist,
2597 doc: /* Alist of elements (REGEXP . IMAGE) for images of icons associated to frames. 2586 doc: /* Alist of elements (REGEXP . IMAGE) for images of icons associated to frames.
2598 If the title of a frame matches REGEXP, then IMAGE.tiff is 2587 If the title of a frame matches REGEXP, then IMAGE.tiff is
2599 selected as the image of the icon representing the frame when it's 2588 selected as the image of the icon representing the frame when it's
2600 miniaturized. If an element is t, then Emacs tries to select an icon 2589 miniaturized. If an element is t, then Emacs tries to select an icon
2601 based on the filetype of the visited file. 2590 based on the filetype of the visited file.
2612 2601
2613 When you miniaturize a Group, Summary or Article frame, Gnus.tiff will 2602 When you miniaturize a Group, Summary or Article frame, Gnus.tiff will
2614 be used as the image of the icon representing the frame. */); 2603 be used as the image of the icon representing the frame. */);
2615 Vns_icon_type_alist = Fcons (Qt, Qnil); 2604 Vns_icon_type_alist = Fcons (Qt, Qnil);
2616 2605
2617 DEFVAR_LISP ("ns-version-string", &Vns_version_string, 2606 DEFVAR_LISP ("ns-version-string", Vns_version_string,
2618 doc: /* Toolkit version for NS Windowing. */); 2607 doc: /* Toolkit version for NS Windowing. */);
2619 Vns_version_string = ns_appkit_version_str (); 2608 Vns_version_string = ns_appkit_version_str ();
2620 2609
2621 defsubr (&Sns_read_file_name); 2610 defsubr (&Sns_read_file_name);
2622 defsubr (&Sns_get_resource); 2611 defsubr (&Sns_get_resource);