diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-04-23 23:59:19 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-04-23 23:59:19 -0400 |
| commit | 8917710efd63f7a253aec77fa190d6c5ec870bf3 (patch) | |
| tree | 9b1ce196eebdac814370c9bc1f86a62c80b45aa0 /src/buffer.h | |
| parent | 9b233997f468fe8a4f4cb7c0c799aff2e3374ba1 (diff) | |
| download | emacs-8917710efd63f7a253aec77fa190d6c5ec870bf3.tar.gz | |
* src/window.c (Fset_window_configuration): Deactivate the mark before
unsetting the mark.
(set_window_buffer): Ignore window_initialized.
(window_initialized): Remove.
* src/keyboard.c (Qdeactivate_mark): Not static any more.
* src/buffer.c (buffer_local_value): Rename from buffer_local_value_1.
Update all callers.
Diffstat (limited to 'src/buffer.h')
| -rw-r--r-- | src/buffer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buffer.h b/src/buffer.h index de117eb9c61..5c1e1bb278c 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -1079,7 +1079,7 @@ extern ptrdiff_t overlay_strings (ptrdiff_t, struct window *, unsigned char **); extern void validate_region (Lisp_Object *, Lisp_Object *); extern void set_buffer_internal_1 (struct buffer *); extern void set_buffer_temp (struct buffer *); -extern Lisp_Object buffer_local_value_1 (Lisp_Object, Lisp_Object); +extern Lisp_Object buffer_local_value (Lisp_Object, Lisp_Object); extern void record_buffer (Lisp_Object); extern void fix_overlays_before (struct buffer *, ptrdiff_t, ptrdiff_t); extern void mmap_set_vars (bool); |