diff options
| author | Stefan Monnier | 2009-03-28 02:24:22 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2009-03-28 02:24:22 +0000 |
| commit | ae19ba7cfcf14bad68525ba71a88b14f05ab60a6 (patch) | |
| tree | fd7ce1264675becab196e2c80b3602820105cbfa /src/lisp.h | |
| parent | ab226c507517f8ce23daed706f1d6e0b7369cb00 (diff) | |
| download | emacs-ae19ba7cfcf14bad68525ba71a88b14f05ab60a6.tar.gz emacs-ae19ba7cfcf14bad68525ba71a88b14f05ab60a6.zip | |
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 83 |
1 files changed, 49 insertions, 34 deletions
diff --git a/src/lisp.h b/src/lisp.h index 99da7160b64..a68afeb4388 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -2452,40 +2452,55 @@ extern void init_image P_ ((void)); | |||
| 2452 | 2452 | ||
| 2453 | /* Defined in insdel.c */ | 2453 | /* Defined in insdel.c */ |
| 2454 | extern Lisp_Object Qinhibit_modification_hooks; | 2454 | extern Lisp_Object Qinhibit_modification_hooks; |
| 2455 | extern void move_gap P_ ((int)); | 2455 | extern void move_gap (EMACS_INT); |
| 2456 | extern void move_gap_both P_ ((int, int)); | 2456 | extern void move_gap_both (EMACS_INT, EMACS_INT); |
| 2457 | extern void make_gap P_ ((int)); | 2457 | extern void make_gap (EMACS_INT); |
| 2458 | extern int copy_text P_ ((const unsigned char *, unsigned char *, int, int, int)); | 2458 | extern int copy_text (const unsigned char *, unsigned char *, |
| 2459 | extern int count_size_as_multibyte P_ ((const unsigned char *, int)); | 2459 | EMACS_INT, int, int); |
| 2460 | extern int count_combining_before P_ ((const unsigned char *, int, int, int)); | 2460 | extern int count_size_as_multibyte (const unsigned char *, EMACS_INT); |
| 2461 | extern int count_combining_after P_ ((const unsigned char *, int, int, int)); | 2461 | extern int count_combining_before (const unsigned char *, |
| 2462 | extern void insert P_ ((const unsigned char *, int)); | 2462 | EMACS_INT, EMACS_INT, EMACS_INT); |
| 2463 | extern void insert_and_inherit P_ ((const unsigned char *, int)); | 2463 | extern int count_combining_after (const unsigned char *, |
| 2464 | extern void insert_1 P_ ((const unsigned char *, int, int, int, int)); | 2464 | EMACS_INT, EMACS_INT, EMACS_INT); |
| 2465 | extern void insert_1_both P_ ((const unsigned char *, int, int, int, int, int)); | 2465 | extern void insert (const unsigned char *, EMACS_INT); |
| 2466 | extern void insert_from_gap P_ ((EMACS_INT, EMACS_INT)); | 2466 | extern void insert_and_inherit (const unsigned char *, EMACS_INT); |
| 2467 | extern void insert_from_string P_ ((Lisp_Object, int, int, int, int, int)); | 2467 | extern void insert_1 (const unsigned char *, EMACS_INT, int, int, int); |
| 2468 | extern void insert_from_buffer P_ ((struct buffer *, int, int, int)); | 2468 | extern void insert_1_both (const unsigned char *, EMACS_INT, EMACS_INT, |
| 2469 | extern void insert_char P_ ((int)); | 2469 | int, int, int); |
| 2470 | extern void insert_string P_ ((const char *)); | 2470 | extern void insert_from_gap (EMACS_INT, EMACS_INT); |
| 2471 | extern void insert_before_markers P_ ((const unsigned char *, int)); | 2471 | extern void insert_from_string (Lisp_Object, EMACS_INT, EMACS_INT, |
| 2472 | extern void insert_before_markers_and_inherit P_ ((const unsigned char *, int)); | 2472 | EMACS_INT, EMACS_INT, int); |
| 2473 | extern void insert_from_string_before_markers P_ ((Lisp_Object, int, int, int, int, int)); | 2473 | extern void insert_from_buffer (struct buffer *, EMACS_INT, EMACS_INT, int); |
| 2474 | extern void del_range P_ ((int, int)); | 2474 | extern void insert_char (int); |
| 2475 | extern Lisp_Object del_range_1 P_ ((int, int, int, int)); | 2475 | extern void insert_string (const char *); |
| 2476 | extern void del_range_byte P_ ((int, int, int)); | 2476 | extern void insert_before_markers (const unsigned char *, EMACS_INT); |
| 2477 | extern void del_range_both P_ ((int, int, int, int, int)); | 2477 | extern void insert_before_markers_and_inherit (const unsigned char *, |
| 2478 | extern Lisp_Object del_range_2 P_ ((int, int, int, int, int)); | 2478 | EMACS_INT); |
| 2479 | extern void modify_region P_ ((struct buffer *, int, int, int)); | 2479 | extern void insert_from_string_before_markers (Lisp_Object, EMACS_INT, |
| 2480 | extern void prepare_to_modify_buffer P_ ((int, int, int *)); | 2480 | EMACS_INT, EMACS_INT, |
| 2481 | extern void signal_before_change P_ ((int, int, int *)); | 2481 | EMACS_INT, int); |
| 2482 | extern void signal_after_change P_ ((int, int, int)); | 2482 | extern void del_range (EMACS_INT, EMACS_INT); |
| 2483 | extern void adjust_after_replace P_ ((int, int, Lisp_Object, int, int)); | 2483 | extern Lisp_Object del_range_1 (EMACS_INT, EMACS_INT, int, int); |
| 2484 | extern void adjust_after_replace_noundo P_ ((int, int, int, int, int, int)); | 2484 | extern void del_range_byte (EMACS_INT, EMACS_INT, int); |
| 2485 | extern void adjust_after_insert P_ ((int, int, int, int, int)); | 2485 | extern void del_range_both (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, int); |
| 2486 | extern void replace_range P_ ((int, int, Lisp_Object, int, int, int)); | 2486 | extern Lisp_Object del_range_2 (EMACS_INT, EMACS_INT, |
| 2487 | extern void replace_range_2 P_ ((int, int, int, int, char *, int, int, int)); | 2487 | EMACS_INT, EMACS_INT, int); |
| 2488 | extern void syms_of_insdel P_ ((void)); | 2488 | extern void modify_region (struct buffer *, EMACS_INT, EMACS_INT, int); |
| 2489 | extern void prepare_to_modify_buffer (EMACS_INT, EMACS_INT, int *); | ||
| 2490 | extern void signal_before_change (EMACS_INT, EMACS_INT, int *); | ||
| 2491 | extern void signal_after_change (EMACS_INT, EMACS_INT, EMACS_INT); | ||
| 2492 | extern void adjust_after_replace (EMACS_INT, EMACS_INT, Lisp_Object, | ||
| 2493 | EMACS_INT, EMACS_INT); | ||
| 2494 | extern void adjust_after_replace_noundo (EMACS_INT, EMACS_INT, EMACS_INT, | ||
| 2495 | EMACS_INT, EMACS_INT, EMACS_INT); | ||
| 2496 | extern void adjust_after_insert (EMACS_INT, EMACS_INT, EMACS_INT, | ||
| 2497 | EMACS_INT, EMACS_INT); | ||
| 2498 | extern void adjust_markers_for_delete (EMACS_INT, EMACS_INT, | ||
| 2499 | EMACS_INT, EMACS_INT); | ||
| 2500 | extern void replace_range (EMACS_INT, EMACS_INT, Lisp_Object, int, int, int); | ||
| 2501 | extern void replace_range_2 (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, | ||
| 2502 | char *, EMACS_INT, EMACS_INT, int); | ||
| 2503 | extern void syms_of_insdel (void); | ||
| 2489 | 2504 | ||
| 2490 | /* Defined in dispnew.c */ | 2505 | /* Defined in dispnew.c */ |
| 2491 | extern Lisp_Object selected_frame; | 2506 | extern Lisp_Object selected_frame; |