Mercurial > emacs
comparison src/xselect.c @ 109555:05e7e7c46ff0
Use const, move declarations to header files.
* src/buffer.c (Fset_buffer_multibyte): Remove local extern declaration.
* src/character.c (strwidth, parse_str_to_multibyte): Add const.
* src/character.h (strwidth, parse_str_to_multibyte): Likewise.
* src/charset.c (add_to_log): Remove declaration.
* src/composite.c (syms_of_composite): Remove local extern declarations.
* src/data.c (Finteractive_form): Use const.
* src/dired.c (scmp): Add const.
(directory_files_internal): Remove local extern declaration.
* src/dispextern.h (add_to_log): Remove declaration.
(x_get_arg, x_frame_get_arg, x_frame_get_and_record_arg)
(x_frame_get_and_record_arg, x_default_parameter): Add const.
* src/dispnew.c: Remove duplicate #include <unistd.h>.
(update_window, update_frame_1, init_display): Remove local extern
declarations.
* src/editfns.c (region_limit, syms_of_editfns): Remove local extern
declarations.
* src/emacs.c (main): Remove local extern declaration.
* src/font.c (Qnormal, QCtype, QCfamily, QCweight, QCslant, QCwidth)
(QCheight, QCsize, QCname): Remove declarations.
* src/frame.c (x_get_resource_string, x_get_string_resource)
(x_get_arg, x_frame_get_arg, x_frame_get_and_record_arg)
(x_default_parameter): Use const.
* src/image.c (QCwidth, QCheight, QCforeground, QCbackground, QCfile)
(QCdata, QCtype, Qcenter): Remove declarations.
* src/keyboard.h (do_mouse_tracking): Add declaration.
* src/minibuf.c (Qmouse_face): Remove declaration.
* src/msdos.c (IT_note_mouse_highlight): Remove local extern declaration.
* src/xdisp.c (do_mouse_tracking): Remove declaration.
(add_to_log): Use const.
* src/xfaces.c (Qmouse_face): Remove declaration.
(face_color_gray_p, tty_defined_color, defined_color)
(face_color_gray_p, face_color_supported_p). Add const.
* src/xfns.c: Include xlwmenu.h when USE_LUCID.
(x_defined_color, xic_set_xfontset): Use const.
(Fx_hide_tip): Remove local extern declaration.
* src/xselect.c (selection_data_to_lisp_data)
(x_property_data_to_lisp):
* src/xrdb.c (x_get_string_resource, file_p)
(x_get_customization_string, magic_file_p, search_magic_path)
(get_system_app, get_user_app, x_load_resources, x_get_resource)
(x_get_string_resource): Use const.
* src/xterm.c (xlwmenu_window_p, xlwmenu_redisplay): Remove declarations.
(x_text_icon, x_check_errors, x_connection_closed): Use const.
* src/xterm.h (x_get_customization_string, x_load_resources)
(x_get_resource, x_text_icon, x_text_icon, x_check_errors)
(x_check_errors, x_property_data_to_lisp, defined_color)
(xic_set_xfontset, x_defined_color): Use const.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Mon, 26 Jul 2010 20:52:35 -0700 |
parents | 89a16701cde1 |
children | 52a2d97e28e4 |
comparison
equal
deleted
inserted
replaced
109554:b22b609d1fa7 | 109555:05e7e7c46ff0 |
---|---|
74 unsigned char **, int *, | 74 unsigned char **, int *, |
75 Atom *, int *, unsigned long *); | 75 Atom *, int *, unsigned long *); |
76 static Lisp_Object x_get_window_property_as_lisp_data (Display *, | 76 static Lisp_Object x_get_window_property_as_lisp_data (Display *, |
77 Window, Atom, | 77 Window, Atom, |
78 Lisp_Object, Atom); | 78 Lisp_Object, Atom); |
79 static Lisp_Object selection_data_to_lisp_data (Display *, unsigned char *, | 79 static Lisp_Object selection_data_to_lisp_data (Display *, |
80 const unsigned char *, | |
80 int, Atom, int); | 81 int, Atom, int); |
81 static void lisp_data_to_selection_data (Display *, Lisp_Object, | 82 static void lisp_data_to_selection_data (Display *, Lisp_Object, |
82 unsigned char **, Atom *, | 83 unsigned char **, Atom *, |
83 unsigned *, int *, int *); | 84 unsigned *, int *, int *); |
84 static Lisp_Object clean_local_selection_data (Lisp_Object); | 85 static Lisp_Object clean_local_selection_data (Lisp_Object); |
1756 when sizeof(long) != sizeof(int). */ | 1757 when sizeof(long) != sizeof(int). */ |
1757 | 1758 |
1758 | 1759 |
1759 | 1760 |
1760 static Lisp_Object | 1761 static Lisp_Object |
1761 selection_data_to_lisp_data (Display *display, unsigned char *data, int size, Atom type, int format) | 1762 selection_data_to_lisp_data (Display *display, const unsigned char *data, |
1763 int size, Atom type, int format) | |
1762 { | 1764 { |
1763 struct x_display_info *dpyinfo = x_display_info_for_display (display); | 1765 struct x_display_info *dpyinfo = x_display_info_for_display (display); |
1764 | 1766 |
1765 if (type == dpyinfo->Xatom_NULL) | 1767 if (type == dpyinfo->Xatom_NULL) |
1766 return QNULL; | 1768 return QNULL; |
2538 when sizeof(long) != sizeof(int). | 2540 when sizeof(long) != sizeof(int). |
2539 | 2541 |
2540 Also see comment for selection_data_to_lisp_data above. */ | 2542 Also see comment for selection_data_to_lisp_data above. */ |
2541 | 2543 |
2542 Lisp_Object | 2544 Lisp_Object |
2543 x_property_data_to_lisp (struct frame *f, unsigned char *data, Atom type, int format, long unsigned int size) | 2545 x_property_data_to_lisp (struct frame *f, const unsigned char *data, |
2546 Atom type, int format, long unsigned int size) | |
2544 { | 2547 { |
2545 return selection_data_to_lisp_data (FRAME_X_DISPLAY (f), | 2548 return selection_data_to_lisp_data (FRAME_X_DISPLAY (f), |
2546 data, size*format/8, type, format); | 2549 data, size*format/8, type, format); |
2547 } | 2550 } |
2548 | 2551 |