aboutsummaryrefslogtreecommitdiffstats
path: root/src/lisp.h
diff options
context:
space:
mode:
authorJuanma Barranquero2014-03-26 16:57:13 +0100
committerJuanma Barranquero2014-03-26 16:57:13 +0100
commit16adf2e6eb1ddf0b32ebea2d5ce8fa1e4c226614 (patch)
tree29b782fd6e7c44a834dd09442a551520e30bcbd6 /src/lisp.h
parent5af73b0fe8975eeb47fb270819b4143c18d71caa (diff)
parent196716cf35f81bea108c3b75362e92c86ed1c016 (diff)
downloademacs-16adf2e6eb1ddf0b32ebea2d5ce8fa1e4c226614.tar.gz
emacs-16adf2e6eb1ddf0b32ebea2d5ce8fa1e4c226614.zip
Merge from emacs-24; up to 2014-03-23T23:14:52Z!yamaoka@jpl.org
Diffstat (limited to 'src/lisp.h')
-rw-r--r--src/lisp.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lisp.h b/src/lisp.h
index 98f6c8b4d8d..07bf4646441 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4199,9 +4199,8 @@ extern void syms_of_macros (void);
4199extern Lisp_Object Qapply; 4199extern Lisp_Object Qapply;
4200extern Lisp_Object Qinhibit_read_only; 4200extern Lisp_Object Qinhibit_read_only;
4201extern void truncate_undo_list (struct buffer *); 4201extern void truncate_undo_list (struct buffer *);
4202extern void record_marker_adjustment (Lisp_Object, ptrdiff_t);
4203extern void record_insert (ptrdiff_t, ptrdiff_t); 4202extern void record_insert (ptrdiff_t, ptrdiff_t);
4204extern void record_delete (ptrdiff_t, Lisp_Object); 4203extern void record_delete (ptrdiff_t, Lisp_Object, bool);
4205extern void record_first_change (void); 4204extern void record_first_change (void);
4206extern void record_change (ptrdiff_t, ptrdiff_t); 4205extern void record_change (ptrdiff_t, ptrdiff_t);
4207extern void record_property_change (ptrdiff_t, ptrdiff_t, 4206extern void record_property_change (ptrdiff_t, ptrdiff_t,