comparison src/buffer.c @ 109793:b60dcdd855f0

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 08 Aug 2010 22:52:25 +0000
parents 0781924c2a38
children 64732fa6188a
comparison
equal deleted inserted replaced
109649:1f8f03cfcd2b 109793:b60dcdd855f0
104 /* Number of per-buffer variables used. */ 104 /* Number of per-buffer variables used. */
105 105
106 int last_per_buffer_idx; 106 int last_per_buffer_idx;
107 107
108 EXFUN (Fset_buffer, 1); 108 EXFUN (Fset_buffer, 1);
109 void set_buffer_internal (struct buffer *b);
110 void set_buffer_internal_1 (struct buffer *b);
111 static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay, 109 static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay,
112 int after, Lisp_Object arg1, 110 int after, Lisp_Object arg1,
113 Lisp_Object arg2, Lisp_Object arg3); 111 Lisp_Object arg2, Lisp_Object arg3);
114 static void swap_out_buffer_local_variables (struct buffer *b); 112 static void swap_out_buffer_local_variables (struct buffer *b);
115 static void reset_buffer_local_variables (struct buffer *b, int permanent_too); 113 static void reset_buffer_local_variables (struct buffer *b, int permanent_too);