aboutsummaryrefslogtreecommitdiffstats
path: root/src/lisp.h
diff options
context:
space:
mode:
authorStefan Monnier2009-03-28 02:24:22 +0000
committerStefan Monnier2009-03-28 02:24:22 +0000
commitae19ba7cfcf14bad68525ba71a88b14f05ab60a6 (patch)
treefd7ce1264675becab196e2c80b3602820105cbfa /src/lisp.h
parentab226c507517f8ce23daed706f1d6e0b7369cb00 (diff)
downloademacs-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.h83
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 */
2454extern Lisp_Object Qinhibit_modification_hooks; 2454extern Lisp_Object Qinhibit_modification_hooks;
2455extern void move_gap P_ ((int)); 2455extern void move_gap (EMACS_INT);
2456extern void move_gap_both P_ ((int, int)); 2456extern void move_gap_both (EMACS_INT, EMACS_INT);
2457extern void make_gap P_ ((int)); 2457extern void make_gap (EMACS_INT);
2458extern int copy_text P_ ((const unsigned char *, unsigned char *, int, int, int)); 2458extern int copy_text (const unsigned char *, unsigned char *,
2459extern int count_size_as_multibyte P_ ((const unsigned char *, int)); 2459 EMACS_INT, int, int);
2460extern int count_combining_before P_ ((const unsigned char *, int, int, int)); 2460extern int count_size_as_multibyte (const unsigned char *, EMACS_INT);
2461extern int count_combining_after P_ ((const unsigned char *, int, int, int)); 2461extern int count_combining_before (const unsigned char *,
2462extern void insert P_ ((const unsigned char *, int)); 2462 EMACS_INT, EMACS_INT, EMACS_INT);
2463extern void insert_and_inherit P_ ((const unsigned char *, int)); 2463extern int count_combining_after (const unsigned char *,
2464extern void insert_1 P_ ((const unsigned char *, int, int, int, int)); 2464 EMACS_INT, EMACS_INT, EMACS_INT);
2465extern void insert_1_both P_ ((const unsigned char *, int, int, int, int, int)); 2465extern void insert (const unsigned char *, EMACS_INT);
2466extern void insert_from_gap P_ ((EMACS_INT, EMACS_INT)); 2466extern void insert_and_inherit (const unsigned char *, EMACS_INT);
2467extern void insert_from_string P_ ((Lisp_Object, int, int, int, int, int)); 2467extern void insert_1 (const unsigned char *, EMACS_INT, int, int, int);
2468extern void insert_from_buffer P_ ((struct buffer *, int, int, int)); 2468extern void insert_1_both (const unsigned char *, EMACS_INT, EMACS_INT,
2469extern void insert_char P_ ((int)); 2469 int, int, int);
2470extern void insert_string P_ ((const char *)); 2470extern void insert_from_gap (EMACS_INT, EMACS_INT);
2471extern void insert_before_markers P_ ((const unsigned char *, int)); 2471extern void insert_from_string (Lisp_Object, EMACS_INT, EMACS_INT,
2472extern void insert_before_markers_and_inherit P_ ((const unsigned char *, int)); 2472 EMACS_INT, EMACS_INT, int);
2473extern void insert_from_string_before_markers P_ ((Lisp_Object, int, int, int, int, int)); 2473extern void insert_from_buffer (struct buffer *, EMACS_INT, EMACS_INT, int);
2474extern void del_range P_ ((int, int)); 2474extern void insert_char (int);
2475extern Lisp_Object del_range_1 P_ ((int, int, int, int)); 2475extern void insert_string (const char *);
2476extern void del_range_byte P_ ((int, int, int)); 2476extern void insert_before_markers (const unsigned char *, EMACS_INT);
2477extern void del_range_both P_ ((int, int, int, int, int)); 2477extern void insert_before_markers_and_inherit (const unsigned char *,
2478extern Lisp_Object del_range_2 P_ ((int, int, int, int, int)); 2478 EMACS_INT);
2479extern void modify_region P_ ((struct buffer *, int, int, int)); 2479extern void insert_from_string_before_markers (Lisp_Object, EMACS_INT,
2480extern void prepare_to_modify_buffer P_ ((int, int, int *)); 2480 EMACS_INT, EMACS_INT,
2481extern void signal_before_change P_ ((int, int, int *)); 2481 EMACS_INT, int);
2482extern void signal_after_change P_ ((int, int, int)); 2482extern void del_range (EMACS_INT, EMACS_INT);
2483extern void adjust_after_replace P_ ((int, int, Lisp_Object, int, int)); 2483extern Lisp_Object del_range_1 (EMACS_INT, EMACS_INT, int, int);
2484extern void adjust_after_replace_noundo P_ ((int, int, int, int, int, int)); 2484extern void del_range_byte (EMACS_INT, EMACS_INT, int);
2485extern void adjust_after_insert P_ ((int, int, int, int, int)); 2485extern void del_range_both (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, int);
2486extern void replace_range P_ ((int, int, Lisp_Object, int, int, int)); 2486extern Lisp_Object del_range_2 (EMACS_INT, EMACS_INT,
2487extern void replace_range_2 P_ ((int, int, int, int, char *, int, int, int)); 2487 EMACS_INT, EMACS_INT, int);
2488extern void syms_of_insdel P_ ((void)); 2488extern void modify_region (struct buffer *, EMACS_INT, EMACS_INT, int);
2489extern void prepare_to_modify_buffer (EMACS_INT, EMACS_INT, int *);
2490extern void signal_before_change (EMACS_INT, EMACS_INT, int *);
2491extern void signal_after_change (EMACS_INT, EMACS_INT, EMACS_INT);
2492extern void adjust_after_replace (EMACS_INT, EMACS_INT, Lisp_Object,
2493 EMACS_INT, EMACS_INT);
2494extern void adjust_after_replace_noundo (EMACS_INT, EMACS_INT, EMACS_INT,
2495 EMACS_INT, EMACS_INT, EMACS_INT);
2496extern void adjust_after_insert (EMACS_INT, EMACS_INT, EMACS_INT,
2497 EMACS_INT, EMACS_INT);
2498extern void adjust_markers_for_delete (EMACS_INT, EMACS_INT,
2499 EMACS_INT, EMACS_INT);
2500extern void replace_range (EMACS_INT, EMACS_INT, Lisp_Object, int, int, int);
2501extern void replace_range_2 (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT,
2502 char *, EMACS_INT, EMACS_INT, int);
2503extern void syms_of_insdel (void);
2489 2504
2490/* Defined in dispnew.c */ 2505/* Defined in dispnew.c */
2491extern Lisp_Object selected_frame; 2506extern Lisp_Object selected_frame;