diff options
| author | Dmitry Antipov | 2012-08-28 09:49:02 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-08-28 09:49:02 +0400 |
| commit | a3d794a153425b09a0185c660926c241d13e0f2c (patch) | |
| tree | b6fed003f6109914b54a9077febeca444852ffa0 /src/buffer.h | |
| parent | 59ea14cde3090fe0bef42d646682b3801859be14 (diff) | |
| download | emacs-a3d794a153425b09a0185c660926c241d13e0f2c.tar.gz emacs-a3d794a153425b09a0185c660926c241d13e0f2c.zip | |
Fix usage of set_buffer_internal.
* buffer.h (set_buffer_internal): Make it BUFFER_INLINE.
* buffer.c (set_buffer_if_live): Use set_buffer_internal.
* coding.c (decode_coding): Omit redundant test.
* fileio.c (decide_coding_unwind): Likewise.
* fns.c (secure_hash): Likewise.
* insdel.c (modify_region): Likewise.
* keyboard.c (command_loop_1): Likewise.
* print.c (PRINTFINISH): Likewise.
* xdisp.c (run_window_scroll_functions): Use set_buffer_internal.
Diffstat (limited to 'src/buffer.h')
| -rw-r--r-- | src/buffer.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/buffer.h b/src/buffer.h index c8b59ffde0b..929da3c4791 100644 --- a/src/buffer.h +++ b/src/buffer.h | |||
| @@ -1014,7 +1014,6 @@ extern ptrdiff_t sort_overlays (Lisp_Object *, ptrdiff_t, struct window *); | |||
| 1014 | extern void recenter_overlay_lists (struct buffer *, ptrdiff_t); | 1014 | extern void recenter_overlay_lists (struct buffer *, ptrdiff_t); |
| 1015 | extern ptrdiff_t overlay_strings (ptrdiff_t, struct window *, unsigned char **); | 1015 | extern ptrdiff_t overlay_strings (ptrdiff_t, struct window *, unsigned char **); |
| 1016 | extern void validate_region (Lisp_Object *, Lisp_Object *); | 1016 | extern void validate_region (Lisp_Object *, Lisp_Object *); |
| 1017 | extern void set_buffer_internal (struct buffer *); | ||
| 1018 | extern void set_buffer_internal_1 (struct buffer *); | 1017 | extern void set_buffer_internal_1 (struct buffer *); |
| 1019 | extern void set_buffer_temp (struct buffer *); | 1018 | extern void set_buffer_temp (struct buffer *); |
| 1020 | extern Lisp_Object buffer_local_value_1 (Lisp_Object, Lisp_Object); | 1019 | extern Lisp_Object buffer_local_value_1 (Lisp_Object, Lisp_Object); |
| @@ -1023,6 +1022,22 @@ extern _Noreturn void buffer_slot_type_mismatch (Lisp_Object, int); | |||
| 1023 | extern void fix_overlays_before (struct buffer *, ptrdiff_t, ptrdiff_t); | 1022 | extern void fix_overlays_before (struct buffer *, ptrdiff_t, ptrdiff_t); |
| 1024 | extern void mmap_set_vars (bool); | 1023 | extern void mmap_set_vars (bool); |
| 1025 | 1024 | ||
| 1025 | /* Set the current buffer to B. | ||
| 1026 | |||
| 1027 | We previously set windows_or_buffers_changed here to invalidate | ||
| 1028 | global unchanged information in beg_unchanged and end_unchanged. | ||
| 1029 | This is no longer necessary because we now compute unchanged | ||
| 1030 | information on a buffer-basis. Every action affecting other | ||
| 1031 | windows than the selected one requires a select_window at some | ||
| 1032 | time, and that increments windows_or_buffers_changed. */ | ||
| 1033 | |||
| 1034 | BUFFER_INLINE void | ||
| 1035 | set_buffer_internal (struct buffer *b) | ||
| 1036 | { | ||
| 1037 | if (current_buffer != b) | ||
| 1038 | set_buffer_internal_1 (b); | ||
| 1039 | } | ||
| 1040 | |||
| 1026 | /* Get overlays at POSN into array OVERLAYS with NOVERLAYS elements. | 1041 | /* Get overlays at POSN into array OVERLAYS with NOVERLAYS elements. |
| 1027 | If NEXTP is non-NULL, return next overlay there. | 1042 | If NEXTP is non-NULL, return next overlay there. |
| 1028 | See overlay_at arg CHANGE_REQ for meaning of CHRQ arg. */ | 1043 | See overlay_at arg CHANGE_REQ for meaning of CHRQ arg. */ |