comparison src/xfns.c @ 109573:228a5fa4eda0

Remove extern declarations from .c files, and them to .h files. * src/xsmfns.c (Vuser_login_name): * src/xrdb.c (Vdouble_click_time): * src/xfaces.c (xic_create_fontsetname): * src/w32select.c (waiting_for_input): * src/print.c (minibuffer_auto_raise): * src/msdos.c (Qhelp_echo): * src/macros.c (real_this_command): * src/keymap.c (Voverriding_local_map): * src/xterm.c (poll_for_input_1, gray_bitmap_width) (gray_bitmap_height, gray_bitmap_bits; * src/xmenu.c ( Voverriding_local_map) (Voverriding_local_map_menu_flag; Qmenu_item; use_dialog_box) (use_file_dialog, Xt_app_con): * src/xdisp.c (minibuffer_auto_raise, Voverriding_local_map) (Voverriding_local_map_menu_flag, Qmenu_item, Qface, Qinvisible) (Qwidth, Qinvisible, Qwindow, Qpriority, Qtool_bar_lines) (Qtool_bar_lines, ignore_mouse_drag_p): * src/minibuf.c (Voverriding_local_map, Qfield, Qfront_sticky) (Qrear_nonsticky, nconc2): * src/keyboard.c (current_global_map, minibuf_level, Qmenu_item) (Vhistory_length, Vtranslation_table_for_input, Qcomposition) (Qdisplay, Qafter_string, Qbefore_string, Qundefined): * src/fileio.c (use_dialog_box, use_file_dialog, Vuser_login_name) (minibuf_level, minibuffer_auto_raise, lisp_time_argument): * src/eval.c (Qinteractive_form, Qrisky_local_variable, Qfunction) (gc_in_progress): * src/doc.c (Voverriding_local_map, Qremap): * src/dired.c (completion_ignore_case, Qcompletion_ignore_case) (Vcompletion_regexp_list): * src/coding.c (Qmac, Qinsert_file_contents, Qwrite_region) (Qcompletion_ignore_case): * src/callint.c (Qcursor_in_echo_area, Qfile_directory_p, Qonly) (Vhistory_length, Vthis_original_command, real_this_command) (Qface, Qminibuffer_prompt, history_delete_duplicates): * src/image.c (Qrisky_local_variable): * src/fontset.c (QCname): * src/fns.c (minibuffer_auto_raise, QCname): * src/dispnew.c (char_ins_del_cost): * src/composite.c (font_fill_lglyph_metrics): * src/cmds.c (Qface, Vtranslation_table_for_input): * src/charset.c (map_char_table_for_charset, Qfile_name_handler_alist): * src/ccl.c (charset_unicode): * src/callproc.c (Vtemporary_file_directory): * src/buffer.c (emacs_strerror): Remove extern declarations. Remove extern declarations from .c files, and them to .h files. * src/keyboard.h (Qhelp_echo, waiting_for_input) (input_available_clear_time, ignore_mouse_drag_p) (Vdouble_click_time, real_this_command, Vthis_original_command): * src/keymap.h (Qremap, Qmenu_item, Voverriding_local_map) (Voverriding_local_map_menu_flag): * src/lisp.h (Qinteractive_form, use_file_dialog) (Qcursor_in_echo_area, QCascent, QCmargin, QCrelief, Qcount) (Qextension_data, QCconversion, QCcolor_symbols, QCheuristic_mask) (QCindex, QCmatrix, QCcolor_adjustment, QCmask) (Qrisky_local_variable, map_char_table_for_charset, Vprint_level) (Qfunction, debug_on_next_call, Qfield) (Vinhibit_field_text_motion, Vuser_login_name, lisp_time_argument) (Qpriority, Qwindow, Qevaporate, Qbefore_string, Qafter_string) (Qfile_directory_p, Qinsert_file_contents) (Qcompletion_ignore_case, Qcompletion_ignore_case) (Vcompletion_regexp_list, Vhistory_length, completion_ignore_case) (history_delete_duplicates, minibuffer_auto_raise, Qonly) (Qfile_name_handler_alist, Qfront_sticky, Qrear_nonsticky) (Qminibuffer_prompt) (Vtemporary_file_directory,char_ins_del_vector, Qface): * src/xterm.h (gray_bitmap_width, gray_bitmap_height) (gray_bitmap_bits, xic_create_fontsetname): * src/coding.h (Vtranslation_table_for_input): Add extern declarations. * src/data.c (Qwindow): Make non-static, used from other files too. * src/frame.c (validate_x_resource_name): Remove shadow definition for i.
author Dan Nicolaescu <dann@ics.uci.edu>
date Wed, 28 Jul 2010 22:48:06 -0700
parents 05e7e7c46ff0
children 06384b3caebf
comparison
equal deleted inserted replaced
109572:8adb5d28e463 109573:228a5fa4eda0
1899 }; 1899 };
1900 1900
1901 1901
1902 /* Create an X fontset on frame F with base font name BASE_FONTNAME. */ 1902 /* Create an X fontset on frame F with base font name BASE_FONTNAME. */
1903 1903
1904 char xic_defaut_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*"; 1904 const char xic_defaut_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*";
1905 1905
1906 /* Create an Xt fontset spec from the name of a base font. 1906 /* Create an Xt fontset spec from the name of a base font.
1907 If `motif' is True use the Motif syntax. */ 1907 If `motif' is True use the Motif syntax. */
1908 char * 1908 char *
1909 xic_create_fontsetname (char *base_fontname, int motif) 1909 xic_create_fontsetname (const char *base_fontname, int motif)
1910 { 1910 {
1911 const char *sep = motif ? ";" : ","; 1911 const char *sep = motif ? ";" : ",";
1912 char *fontsetname; 1912 char *fontsetname;
1913 1913
1914 /* Make a fontset name from the base font name. */ 1914 /* Make a fontset name from the base font name. */
1924 /* Make a fontset name from the base font name. 1924 /* Make a fontset name from the base font name.
1925 The font set will be made of the following elements: 1925 The font set will be made of the following elements:
1926 - the base font. 1926 - the base font.
1927 - the base font where the charset spec is replaced by -*-*. 1927 - the base font where the charset spec is replaced by -*-*.
1928 - the same but with the family also replaced with -*-*-. */ 1928 - the same but with the family also replaced with -*-*-. */
1929 char *p = base_fontname; 1929 const char *p = base_fontname;
1930 int i; 1930 int i;
1931 1931
1932 for (i = 0; *p; p++) 1932 for (i = 0; *p; p++)
1933 if (*p == '-') i++; 1933 if (*p == '-') i++;
1934 if (i != 14) 1934 if (i != 14)
1943 strcat (fontsetname, xic_defaut_fontset); 1943 strcat (fontsetname, xic_defaut_fontset);
1944 } 1944 }
1945 else 1945 else
1946 { 1946 {
1947 int len; 1947 int len;
1948 char *p1 = NULL, *p2 = NULL, *p3 = NULL; 1948 const char *p1 = NULL, *p2 = NULL, *p3 = NULL;
1949 char *font_allcs = NULL; 1949 char *font_allcs = NULL;
1950 char *font_allfamilies = NULL; 1950 char *font_allfamilies = NULL;
1951 char *font_all = NULL; 1951 char *font_all = NULL;
1952 char *allcs = "*-*-*-*-*-*-*"; 1952 const char *allcs = "*-*-*-*-*-*-*";
1953 char *allfamilies = "-*-*-"; 1953 const char *allfamilies = "-*-*-";
1954 char *all = "*-*-*-*-"; 1954 const char *all = "*-*-*-*-";
1955 char *base; 1955 char *base;
1956 1956
1957 for (i = 0, p = base_fontname; i < 8; p++) 1957 for (i = 0, p = base_fontname; i < 8; p++)
1958 { 1958 {
1959 if (*p == '-') 1959 if (*p == '-')
2078 { 2078 {
2079 char buf[256]; 2079 char buf[256];
2080 char **missing_list; 2080 char **missing_list;
2081 int missing_count; 2081 int missing_count;
2082 char *def_string; 2082 char *def_string;
2083 char *xlfd_format = "-*-*-medium-r-normal--%d-*-*-*-*-*"; 2083 const char *xlfd_format = "-*-*-medium-r-normal--%d-*-*-*-*-*";
2084 2084
2085 sprintf (buf, xlfd_format, pixel_size); 2085 sprintf (buf, xlfd_format, pixel_size);
2086 missing_list = NULL; 2086 missing_list = NULL;
2087 xfs = XCreateFontSet (FRAME_X_DISPLAY (f), buf, 2087 xfs = XCreateFontSet (FRAME_X_DISPLAY (f), buf,
2088 &missing_list, &missing_count, &def_string); 2088 &missing_list, &missing_count, &def_string);
5237 0, 0, 0, 5237 0, 0, 0,
5238 doc: /* Return t if the old Gtk+ file selection dialog is used. */) 5238 doc: /* Return t if the old Gtk+ file selection dialog is used. */)
5239 (void) 5239 (void)
5240 { 5240 {
5241 #ifdef USE_GTK 5241 #ifdef USE_GTK
5242 extern int use_dialog_box;
5243 extern int use_file_dialog;
5244
5245 if (use_dialog_box 5242 if (use_dialog_box
5246 && use_file_dialog 5243 && use_file_dialog
5247 && have_menus_p () 5244 && have_menus_p ()
5248 && xg_uses_old_file_dialog ()) 5245 && xg_uses_old_file_dialog ())
5249 return Qt; 5246 return Qt;
5310 Lisp_Object file = Qnil; 5307 Lisp_Object file = Qnil;
5311 Lisp_Object decoded_file; 5308 Lisp_Object decoded_file;
5312 Widget dialog, text, help; 5309 Widget dialog, text, help;
5313 Arg al[10]; 5310 Arg al[10];
5314 int ac = 0; 5311 int ac = 0;
5315 extern XtAppContext Xt_app_con;
5316 XmString dir_xmstring, pattern_xmstring; 5312 XmString dir_xmstring, pattern_xmstring;
5317 int count = SPECPDL_INDEX (); 5313 int count = SPECPDL_INDEX ();
5318 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; 5314 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
5319 5315
5320 check_x (); 5316 check_x ();