Commit graph

29607 commits

Author SHA1 Message Date
Eli Zaretskii
61bfec9843 Really fix int/EMACS_INT use in bidi.c.
bidi.c (struct bidi_paragraph_info): Use EMACS_INT for buffer positions.
 (bidi_cache_search, bidi_cache_find): Use EMACS_INT for buffer positions.
2010-09-24 09:05:24 -04:00
Eli Zaretskii
145582a02c Fix int/EMACS_INT use in buffer.c.
buffer.c (struct sortvec): Use EMACS_INT for buffer positions.
 (struct sortstrlist, overlay_str_len): Use EMACS_INT for string
 length.
 (advance_to_char_boundary, Fset_buffer_multibyte)
 (overlays_at, overlays_in, mouse_face_overlay_overlaps)
 (overlay_touches_p, record_overlay_string, overlay_strings)
 (recenter_overlay_lists, fix_start_end_in_overlays)
 (modify_overlay, Fmove_overlay, report_overlay_modification)
 (evaporate_overlays): Use EMACS_INT for buffer positions.
 lisp.h (fix_start_end_in_overlays, overlay_touches_p): Adjust
 prototypes.
2010-09-24 08:45:09 -04:00
Eli Zaretskii
446470a9f7 Fix int/EMACS_INT in bidi.c.
dispextern.h (struct bidi_saved_info): Use EMACS_INT for buffer positions.
2010-09-24 08:05:24 -04:00
Eli Zaretskii
e6d4aefa01 Fix int/EMACS_INT usage in fns.c.
fns.c (Fcompare_strings, Fstring_lessp, concat)
 (string_make_unibyte, Fstring_as_unibyte, Fsubstring)
 (Fsubstring_no_properties, substring_both, Ffillarray)
 (Fclear_string, mapcar1, Fmapconcat, Fmapcar, Fmapc)
 (Fbase64_encode_region, Fbase64_encode_string, base64_encode_1)
 (Fbase64_decode_region, Fbase64_decode_string, base64_decode_1)
 (Fmd5): Use EMACS_INT for buffer and string positions and length
 variables and arguments.
 <struct textprop_rec>: Use EMACS_INT for positions.
 lisp.h (substring_both): Adjust prototype.
2010-09-24 07:55:44 -04:00
Juanma Barranquero
eb65239679 Remove W32 API function pointer unused since 2005-02-15T23:19:26Z!jasonr@gnu.org.
* w32fns.c (clipboard_sequence_fn): Don't declare.
  (globals_of_w32fns): Don't initialize it.
2010-09-24 05:35:55 +02:00
Chong Yidong
0a9f9d0660 Merge changes from emacs-23 branch. 2010-09-23 22:10:54 -04:00
Lars Magne Ingebrigtsen
faf8b5bc19 Cast SPECPDL_INDEX to int, and do further EMACS_INT/int cleanups. 2010-09-23 22:57:48 +02:00
Lars Magne Ingebrigtsen
4028306292 Clean up EMACS_INT/int in cmds.c, as well as USE_SAFE_ALLOCA. 2010-09-23 22:16:55 +02:00
Lars Magne Ingebrigtsen
84c9ce0579 Clean up EMACS_INT/int usage in doc.c and doprnt.c. 2010-09-23 21:53:46 +02:00
Eli Zaretskii
fe3537c3a9 Fix last changes in editfns.c and intervals.c.
editfns.c (clip_to_bounds): Return an EMACS_INT value.
 lisp.h (clip_to_bounds): Adjust prototype.
 intervals.c (adjust_for_invis_intang): Return EMACS_INT value.
2010-09-23 15:18:30 -04:00
Lars Magne Ingebrigtsen
0350982fc5 Fix EMACS_INT/int conversion errors in marker.c. 2010-09-23 21:12:18 +02:00
Chong Yidong
266a86bd7f Merge changes from emacs-23 branch 2010-09-23 15:00:31 -04:00
Eli Zaretskii
6e48267a3d Use EMACS_INT instead of EMACS_UINT in intervals.c.
The latter causes crashes, since LENGTH macro in intervals.h:114 has to be
 able to return a negative number.
2010-09-23 14:54:49 -04:00
Chong Yidong
c50bd0d278 Avoid intervals crash by changing EMACS_UINTs to EMACS_INT.
* intervals.c (traverse_intervals, rotate_right, rotate_left)
(split_interval_right, find_interval, next_interval)
(delete_node, delete_interval, interval_deletion_adjustment)
(adjust_intervals_for_deletion, merge_interval_right)
(merge_interval_left, graft_intervals_into_buffer)
(copy_intervals): Convert EMACS_UINTs to EMACS_INT.

* intervals.h (traverse_intervals): Update prototype.
2010-09-23 14:50:57 -04:00
Eli Zaretskii
caefdbe7dd Fix src/ChangeLog of the last commit. 2010-09-23 14:37:54 -04:00
Eli Zaretskii
c098fdb898 Fix use of int instead of EMACS_INT in search.c and region-cache.c.
indent.c (compute_motion): Use EMACS_INT for arguments to
 region_cache_forward.
 region-cache.c (struct boundary, struct region_cache): Use
 EMACS_INT for positions.
 (find_cache_boundary, move_cache_gap, insert_cache_boundary)
 (delete_cache_boundaries, set_cache_region)
 (invalidate_region_cache, know_region_cache)
 (region_cache_forward, region_cache_backward, pp_cache): Use
 EMACS_INT for buffer positions.
 region-cache.h (know_region_cache, invalidate_region_cache)
 (region_cache_forward, region_cache_backward): Adjust prototypes.
 search.c (string_match_1, fast_c_string_match_ignore_case)
 (looking_at_1, scan_buffer, scan_newline)
 (find_next_newline_no_quit, find_before_next_newline)
 (search_command, trivial_regexp_p, search_buffer, simple_search)
 (boyer_moore, wordify, Freplace_match): Use EMACS_INT for buffer
 and string positions and length.
 lisp.h (scan_buffer, scan_newline, find_next_newline_no_quit)
 (find_before_next_newline): Adjust prototypes.
2010-09-23 14:35:11 -04:00
Eli Zaretskii
29cdc13ed6 Fix use of int instead of EMACS_INT in editfns.c.
editfns.c (transpose_markers, update_buffer_properties)
 (buildmark, clip_to_bounds, Fgoto_char, overlays_around)
 (get_pos_property, Fconstrain_to_field)
 (Fline_beginning_position, Fline_end_position, Fprevious_char)
 (Fchar_after, Fchar_before, Finsert_char)
 (Finsert_buffer_substring, Fcompare_buffer_substrings)
 (Fsubst_char_in_region, Fformat, Ftranspose_regions): Use
 EMACS_INT for buffer and string position variables.
 lisp.h (clip_to_bounds): Adjust prototype.
2010-09-23 13:10:21 -04:00
Eli Zaretskii
e79123aa34 Fix uses of int instead of EMACS_INT in intervals.c.
intervals.c (traverse_intervals, rotate_right, rotate_left)
 (balance_an_interval, split_interval_right, split_interval_left)
 (find_interval, next_interval, update_interval)
 (adjust_intervals_for_insertion, delete_node, delete_interval)
 (interval_deletion_adjustment, adjust_intervals_for_deletion)
 (offset_intervals, merge_interval_right, merge_interval_left)
 (graft_intervals_into_buffer, adjust_for_invis_intang)
 (move_if_not_intangible, get_local_map, copy_intervals)
 (copy_intervals_to_string, compare_string_intervals)
 (set_intervals_multibyte_1): Use EMACS_INT for buffer positions
 and EMACS_UINT for interval tree size.
 intervals.h (traverse_intervals, split_interval_right)
 (split_interval_left, find_interval, offset_intervals)
 (graft_intervals_into_buffer, copy_intervals)
 (copy_intervals_to_string, move_if_not_intangible, get_local_map)
 (update_interval): Adjust prototypes.
2010-09-23 11:46:54 -04:00
Eli Zaretskii
579c18d04a Fix more uses of int instead of EMACS_INT.
xdisp.c (check_point_in_composition, reconsider_clip_changes):
 Use EMACS_INT for buffer position variables and arguments.
 composite.c (get_composition_id, find_composition)
 (run_composition_function, compose_text)
 (composition_gstring_width, autocmp_chars)
 (composition_update_it, Ffind_composition_internal): Use EMACS_INT
 for buffer positions and string length variables and arguments.
 composite.h (get_composition_id, find_composition, compose_text)
 (composition_gstring_width): Adjust prototypes.
 editfns.c (Fformat): Use EMACS_INT for string size variables.
 xdisp.c (store_mode_line_noprop, display_mode_element): Use
 EMACS_INT for string positions.
 intervals.c (get_property_and_range): Use EMACS_INT for buffer
 position arguments.
 intervals.h (get_property_and_range): Adjust prototype.
 character.c (parse_str_as_multibyte, str_as_multibyte)
 (parse_str_to_multibyte, str_to_multibyte, str_as_unibyte)
 (string_count_byte8, string_escape_byte8, c_string_width)
 (strwidth, lisp_string_width, multibyte_chars_in_text): Use
 EMACS_INT for string length variables and arguments.
 (string_escape_byte8): Protect against too long strings.
 character.h (parse_str_as_multibyte, str_as_multibyte)
 (parse_str_to_multibyte, str_to_multibyte, str_as_unibyte)
 (c_string_width, strwidth, lisp_string_width): Adjust
 prototypes.
 lisp.h (check_point_in_composition): Adjust prototype.
2010-09-23 10:32:38 -04:00
Eli Zaretskii
1416246913 Fix some more uses of int instead of EMACS_INT.
font.c (font_intern_prop): Use EMACS_INT for string length
 variables.
 character.c (parse_str_as_multibyte, str_as_multibyte)
 (parse_str_to_multibyte, str_to_multibyte, str_as_unibyte)
 (string_count_byte8, string_escape_byte8): Use EMACS_INT for
 string length arguments, variables, and return values.
 character.h (parse_str_as_multibyte, str_as_multibyte)
 (parse_str_to_multibyte, str_to_multibyte, str_as_unibyte): Adjust
 prototypes.
 fns.c (Fstring_as_multibyte): Use EMACS_INT for string length
 variables.
 alloc.c <total_string_size>: Declare as EMACS_INT, not int.
 (Fmake_string): Protect against too large strings.
 (live_string_p, live_cons_p, live_symbol_p, live_float_p)
 (live_misc_p): Use ptrdiff_t instead of int for pointer
 differences.
 (string_bytes, check_sblock, check_string_free_list)
 (allocate_string_data, compact_small_strings, Fmake_string)
 (Fmake_bool_vector, make_string, make_unibyte_string)
 (make_multibyte_string, make_string_from_bytes)
 (make_specified_string_string, Fmake_list, Fmake_vector): Use
 EMACS_INT for string length variables and arguments.
 (find_string_data_in_pure, make_pure_string, make_pure_c_string)
 (Fpurecopy): Use EMACS_INT for string size.
 (mark_vectorlike, mark_char_table, mark_object): Use EMACS_UINT
 for vector size.
 lisp.h (make_string, make_unibyte_string, make_multibyte_string)
 (make_string_from_bytes, make_specified_string_string)
 (make_pure_string, string_bytes): Adjust prototypes.
2010-09-23 08:09:12 -04:00
Eli Zaretskii
c8a66ab831 Fix some more uses of int instead of EMACS_INT.
editfns.c (Fsubst_char_in_region, Ftranslate_region_internal)
 (check_translation): Use EMACS_INT for buffer positions and
 length.
 undo.c (record_marker_adjustment, record_delete)
 (record_change, record_point, record_insert)
 (record_property_change, Fprimitive_undo): Use EMACS_INT for
 buffer positions.
 lisp.h (record_marker_adjustment, record_delete)
 (record_change, record_point, record_insert)
 (record_property_change, Fprimitive_undo): Adjust prototypes.
2010-09-22 15:22:06 -04:00
Eli Zaretskii
fc33e1531e w32.c (get_emacs_configuration_options): Fix last change. 2010-09-22 20:39:51 +02:00
Juanma Barranquero
38c54d9dab src/w32.c (get_emacs_configuration_options): Fix buffer overrun. 2010-09-22 19:31:21 +02:00
Eli Zaretskii
413d18e73d Fix some uses of int instead of EMACS_INT.
minibuf.c (Fminibuffer_contents)
 (Fminibuffer_contents_no_properties)
 (Fminibuffer_completion_contents): Use EMACS_INT for minibuffer
 positions.
 keyboard.c (command_loop_1): Use EMACS_INT to compare point with
 mark.
 alloc.c (make_uninit_string, make_uninit_multibyte_string)
 (allocate_string_data): Accept EMACS_INT for string length.
 editfns.c (Ffield_string, Ffield_string_no_properties)
 (make_buffer_string, make_buffer_string_both, Fbuffer_substring)
 (Fbuffer_substring_no_properties, find_field, Fdelete_field)
 (Ffield_string, Ffield_string_no_properties, Ffield_beginning)
 (Ffield_end): Use EMACS_INT for buffer positions.
 insdel.c (prepare_to_modify_buffer): Use EMACS_INT to compare
 point with mark.
 lisp.h (allocate_string_data, make_uninit_string)
 (make_uninit_multibyte_string, make_buffer_string)
 (make_buffer_string_both): Adjust prototypes.
2010-09-22 12:03:34 -04:00
Chong Yidong
4b9832a6f2 Rename libxml2 functions, and make parse tree format consistent with xml.el.
* xml.c: Switch to GNU indentation.
(make_dom): Change parse tree format to match xml.el.
(Fxml_parse_html_string_internal): Rename from html-parse-string.
(Fxml_parse_string_internal): Rename from xml-parse-string.

* configure.in: Announce whether libxml2 is linked to.
2010-09-21 23:10:16 -04:00
Kenichi Handa
1114abdb3d merge trunk 2010-09-22 11:56:28 +09:00
Kenichi Handa
86282aabd0 Fix position calculation on mouse click within bidi-reordered composition. 2010-09-22 11:54:58 +09:00
Ari Roponen
840b985a76 * doc.c (Fsnarf_documentation): Use memmove instead of memcpy as
the regions may overlap.
2010-09-21 21:33:59 +02:00
Stefan Monnier
fbb3da770f * src/syntax.c (back_comment): Detect the case where a 1-char comment
starter is also the 2nd char of a 2-char comment ender.
2010-09-21 17:52:13 +02:00
Juanma Barranquero
5bc88f4b8a src/makefile.w32-in ($(BLD)/sysdep.$(O)): Update dependencies. 2010-09-21 14:49:59 +02:00
Dan Nicolaescu
d19e096ef5 * src/emacs.c: Do not include sys/ioctl.h, not needed. 2010-09-21 14:13:36 +03:00
Dan Nicolaescu
92bc9a3678 * src/doprnt.c: Do not include stdlib.h, config.h does it.
Move #include before macro definition.
2010-09-21 14:03:34 +03:00
Dan Nicolaescu
48e24408d0 Check in missing ChangeLog entry. 2010-09-21 09:42:12 +03:00
Dan Nicolaescu
f5ea3ba7cc Link temacs using $(CC) not $(LD).
* configure.in (LINKER): Rename to LD_FIRSTFLAG, do not include $(CC).

* src/Makefile.in (temacs): Link using $(CC) not $(LD).
(LD_FIRSTFLAG): Define using autoconf.
(LD): Remove.
2010-09-21 01:35:37 +03:00
Dan Nicolaescu
6553950651 Remove HAVE_TERMIOS definitions.
* src/s/usg5-4-common.h (HAVE_TERMIOS):
* src/s/template.h (HAVE_TERMIOS):
* src/s/gnu-linux.h (HAVE_TERMIOS):
* src/s/darwin.h (HAVE_TERMIOS):
* src/s/cygwin.h (HAVE_TERMIOS):
* src/s/bsd-common.h (HAVE_TERMIOS):
* src/s/aix4-2.h (HAVE_TERMIOS):
* src/s/hpux10-20.h (HAVE_TERMIOS): Do not define, it is assumed
defined on all non-MS platforms.
(HAVE_PSTAT_GETDYNAMIC): Do not define, autoconf does it.
2010-09-20 14:38:50 +03:00
Dan Nicolaescu
15f844ac1f * src/xterm.c (xt_action_hook): Use const. 2010-09-20 14:32:26 +03:00
Juanma Barranquero
93acd23dc3 Fix typos in ChangeLogs. 2010-09-20 03:20:32 +02:00
Juanma Barranquero
7d70133410 Don't make W32 code conditional on HAVE_SOCKETS, it's always defined.
* w32.c: Remove top-level uses of #ifdef HAVE_SOCKETS.
  (gethostname) [!HAVE_SOCKETS]: Remove.
  (SOCK_REPLACE_HANDLE): Remove macro.
  (socket_to_fd, sys_close, _sys_read_ahead, sys_read, sys_write)
  (term_ntproc, init_ntproc): Don't conditionalize on HAVE_SOCKETS.
* w32proc.c: Remove top-level uses of #ifdef HAVE_SOCKETS.
  (syms_of_ntproc): Don't conditionalize on HAVE_SOCKETS.
2010-09-20 02:18:18 +02:00
Eli Zaretskii
6d7b951302 src/Changelog: Merge two last entries. 2010-09-18 16:23:29 +02:00
Eli Zaretskii
0d4afaf7ff Fix MSDOS build broken by 2010-09-10T16:44:35Z!larsi@gnus.org, support MSDOS build with libxml2.
config.bat: Detect that libxml2 is installed and if so, build with it.
 src/deps.mk (xml.o): Add dependencies.
 msdos/sed1v2.inp (LIBXML2_LIBS, LIBXML2_CFLAGS): Edit to empty.
2010-09-18 16:13:09 +02:00
Eli Zaretskii
f3ec267ad6 Add xml.o dependencies to deps.mk.
deps.mk (xml.o): Add dependencies.
2010-09-18 16:09:40 +02:00
Eli Zaretskii
bea4f10c83 Fix bug #7038 with cursor motion in paragraphs w/o strong characters.
xdisp.c (Fcurrent_bidi_paragraph_direction): Call
 bidi_paragraph_init with NO_DEFAULT_P non-zero.
 bidi.c (bidi_paragraph_init): Accept an additional argument
 NO_DEFAULT_P; all callers changed.  If NO_DEFAULT_P is non-zero,
 search back until a paragraph with a strong directional character
 is found, and use that to determine paragraph's base direction.
 dispextern.h (bidi_paragraph_init): Update prototype.
2010-09-18 13:59:53 +02:00
Eli Zaretskii
69e847be92 Fix bug #6989.
w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
 of w32api >= 3.15.
2010-09-17 23:34:45 +02:00
Lars Magne Ingebrigtsen
283357a76d * process.c (wait_reading_process_output): Don't message about
accept-process-output unless the time limit really is zero.
2010-09-17 17:47:49 +02:00
Stefan Monnier
4ddb20d610 * src/frame.c (Ftool_bar_pixel_width): YAILOM (Yet another
int/Lisp_Object mixup).
2010-09-17 16:37:14 +02:00
Jan D
2b5b82db49 Make sure detached tool bar menu isn't blank.
* gtkutil.c (xg_tool_bar_menu_proxy): Set gtk-menu-items to TRUE.
2010-09-17 11:58:44 +02:00
Jan D
e24ad6dd2b * keyboard.c (parse_tool_bar_item): For QClabel, set TOOL_BAR_ITEM_LABEL not HELP. 2010-09-17 11:54:28 +02:00
Jan D
fb0cf781a1 Expose tool-bar pixel width to lisp and use it for speedbar (Bug#7048)
* dframe.el (dframe-reposition-frame-emacs): Use tool-bar-pixel-width
in calculating new frame position.  Add more space between new and
parent on the left.

* frame.c (Ftool_bar_pixel_width): New function to expose tool
bar's pixel width to Lisp.
2010-09-17 11:04:35 +02:00
Jan D
318a04c60b Put handle on top for vertical toolbar, Bug#7051.
* gtkutil.c (xg_pack_tool_bar): Call gtk_handle_box_set_handle_position
with argument top/left if tool bar is vertical/horizontal (Bug#7051).
2010-09-17 09:00:12 +02:00
Kenichi Handa
78a217725f ftfont.c (ftfont_check_otf): Fix previous change. 2010-09-17 13:57:58 +09:00