Commit 5da37806 authored by Oleh Krehel's avatar Oleh Krehel

Mark previous uses of INTERNAL_FIELD with a trailing underscore

* src/.gdbinit: Revert the previous changes.

* src/buffer.c (compact_buffer): Use BVAR.
parent bed17055
......@@ -378,7 +378,7 @@ define pwinx
printf "Window %d ", $int
xgetptr $w->buffer
set $tem = (struct buffer *) $ptr
xgetptr $tem->name
xgetptr $tem->name_
printf "%s", ((struct Lisp_String *) $ptr)->data
printf "\n"
xgetptr $w->start
......@@ -898,7 +898,7 @@ end
define xbuffer
xgetptr $
print (struct buffer *) $ptr
xgetptr $->name
xgetptr $->name_
output ((struct Lisp_String *) $ptr)->data
echo \n
end
......
......@@ -4496,7 +4496,7 @@ live_buffer_p (struct mem_node *m, void *p)
must not have been killed. */
return (m->type == MEM_TYPE_BUFFER
&& p == m->start
&& !NILP (((struct buffer *) p)->name));
&& !NILP (((struct buffer *) p)->name_));
}
#endif /* GC_MARK_STACK || defined GC_MALLOC_CHECK */
......
......@@ -134,227 +134,227 @@ CHECK_OVERLAY (Lisp_Object x)
static void
bset_abbrev_mode (struct buffer *b, Lisp_Object val)
{
b->abbrev_mode = val;
b->abbrev_mode_ = val;
}
static void
bset_abbrev_table (struct buffer *b, Lisp_Object val)
{
b->abbrev_table = val;
b->abbrev_table_ = val;
}
static void
bset_auto_fill_function (struct buffer *b, Lisp_Object val)
{
b->auto_fill_function = val;
b->auto_fill_function_ = val;
}
static void
bset_auto_save_file_format (struct buffer *b, Lisp_Object val)
{
b->auto_save_file_format = val;
b->auto_save_file_format_ = val;
}
static void
bset_auto_save_file_name (struct buffer *b, Lisp_Object val)
{
b->auto_save_file_name = val;
b->auto_save_file_name_ = val;
}
static void
bset_backed_up (struct buffer *b, Lisp_Object val)
{
b->backed_up = val;
b->backed_up_ = val;
}
static void
bset_begv_marker (struct buffer *b, Lisp_Object val)
{
b->begv_marker = val;
b->begv_marker_ = val;
}
static void
bset_bidi_display_reordering (struct buffer *b, Lisp_Object val)
{
b->bidi_display_reordering = val;
b->bidi_display_reordering_ = val;
}
static void
bset_buffer_file_coding_system (struct buffer *b, Lisp_Object val)
{
b->buffer_file_coding_system = val;
b->buffer_file_coding_system_ = val;
}
static void
bset_case_fold_search (struct buffer *b, Lisp_Object val)
{
b->case_fold_search = val;
b->case_fold_search_ = val;
}
static void
bset_ctl_arrow (struct buffer *b, Lisp_Object val)
{
b->ctl_arrow = val;
b->ctl_arrow_ = val;
}
static void
bset_cursor_in_non_selected_windows (struct buffer *b, Lisp_Object val)
{
b->cursor_in_non_selected_windows = val;
b->cursor_in_non_selected_windows_ = val;
}
static void
bset_cursor_type (struct buffer *b, Lisp_Object val)
{
b->cursor_type = val;
b->cursor_type_ = val;
}
static void
bset_display_table (struct buffer *b, Lisp_Object val)
{
b->display_table = val;
b->display_table_ = val;
}
static void
bset_extra_line_spacing (struct buffer *b, Lisp_Object val)
{
b->extra_line_spacing = val;
b->extra_line_spacing_ = val;
}
static void
bset_file_format (struct buffer *b, Lisp_Object val)
{
b->file_format = val;
b->file_format_ = val;
}
static void
bset_file_truename (struct buffer *b, Lisp_Object val)
{
b->file_truename = val;
b->file_truename_ = val;
}
static void
bset_fringe_cursor_alist (struct buffer *b, Lisp_Object val)
{
b->fringe_cursor_alist = val;
b->fringe_cursor_alist_ = val;
}
static void
bset_fringe_indicator_alist (struct buffer *b, Lisp_Object val)
{
b->fringe_indicator_alist = val;
b->fringe_indicator_alist_ = val;
}
static void
bset_fringes_outside_margins (struct buffer *b, Lisp_Object val)
{
b->fringes_outside_margins = val;
b->fringes_outside_margins_ = val;
}
static void
bset_header_line_format (struct buffer *b, Lisp_Object val)
{
b->header_line_format = val;
b->header_line_format_ = val;
}
static void
bset_indicate_buffer_boundaries (struct buffer *b, Lisp_Object val)
{
b->indicate_buffer_boundaries = val;
b->indicate_buffer_boundaries_ = val;
}
static void
bset_indicate_empty_lines (struct buffer *b, Lisp_Object val)
{
b->indicate_empty_lines = val;
b->indicate_empty_lines_ = val;
}
static void
bset_invisibility_spec (struct buffer *b, Lisp_Object val)
{
b->invisibility_spec = val;
b->invisibility_spec_ = val;
}
static void
bset_left_fringe_width (struct buffer *b, Lisp_Object val)
{
b->left_fringe_width = val;
b->left_fringe_width_ = val;
}
static void
bset_major_mode (struct buffer *b, Lisp_Object val)
{
b->major_mode = val;
b->major_mode_ = val;
}
static void
bset_mark (struct buffer *b, Lisp_Object val)
{
b->mark = val;
b->mark_ = val;
}
static void
bset_minor_modes (struct buffer *b, Lisp_Object val)
{
b->minor_modes = val;
b->minor_modes_ = val;
}
static void
bset_mode_line_format (struct buffer *b, Lisp_Object val)
{
b->mode_line_format = val;
b->mode_line_format_ = val;
}
static void
bset_mode_name (struct buffer *b, Lisp_Object val)
{
b->mode_name = val;
b->mode_name_ = val;
}
static void
bset_name (struct buffer *b, Lisp_Object val)
{
b->name = val;
b->name_ = val;
}
static void
bset_overwrite_mode (struct buffer *b, Lisp_Object val)
{
b->overwrite_mode = val;
b->overwrite_mode_ = val;
}
static void
bset_pt_marker (struct buffer *b, Lisp_Object val)
{
b->pt_marker = val;
b->pt_marker_ = val;
}
static void
bset_right_fringe_width (struct buffer *b, Lisp_Object val)
{
b->right_fringe_width = val;
b->right_fringe_width_ = val;
}
static void
bset_save_length (struct buffer *b, Lisp_Object val)
{
b->save_length = val;
b->save_length_ = val;
}
static void
bset_scroll_bar_width (struct buffer *b, Lisp_Object val)
{
b->scroll_bar_width = val;
b->scroll_bar_width_ = val;
}
static void
bset_scroll_bar_height (struct buffer *b, Lisp_Object val)
{
b->scroll_bar_height = val;
b->scroll_bar_height_ = val;
}
static void
bset_scroll_down_aggressively (struct buffer *b, Lisp_Object val)
{
b->scroll_down_aggressively = val;
b->scroll_down_aggressively_ = val;
}
static void
bset_scroll_up_aggressively (struct buffer *b, Lisp_Object val)
{
b->scroll_up_aggressively = val;
b->scroll_up_aggressively_ = val;
}
static void
bset_selective_display (struct buffer *b, Lisp_Object val)
{
b->selective_display = val;
b->selective_display_ = val;
}
static void
bset_selective_display_ellipses (struct buffer *b, Lisp_Object val)
{
b->selective_display_ellipses = val;
b->selective_display_ellipses_ = val;
}
static void
bset_vertical_scroll_bar_type (struct buffer *b, Lisp_Object val)
{
b->vertical_scroll_bar_type = val;
b->vertical_scroll_bar_type_ = val;
}
static void
bset_horizontal_scroll_bar_type (struct buffer *b, Lisp_Object val)
{
b->horizontal_scroll_bar_type = val;
b->horizontal_scroll_bar_type_ = val;
}
static void
bset_word_wrap (struct buffer *b, Lisp_Object val)
{
b->word_wrap = val;
b->word_wrap_ = val;
}
static void
bset_zv_marker (struct buffer *b, Lisp_Object val)
{
b->zv_marker = val;
b->zv_marker_ = val;
}
void
......@@ -1591,7 +1591,7 @@ compact_buffer (struct buffer *buffer)
turned off in that buffer. Calling truncate_undo_list on
Qt tends to return NULL, which effectively turns undo back on.
So don't call truncate_undo_list if undo_list is Qt. */
if (!EQ (buffer->undo_list, Qt))
if (!EQ (BVAR(buffer, undo_list), Qt))
truncate_undo_list (buffer);
/* Shrink buffer gaps. */
......
This diff is collapsed.
......@@ -41,7 +41,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
static void
bset_category_table (struct buffer *b, Lisp_Object val)
{
b->category_table = val;
b->category_table_ = val;
}
/* The version number of the latest category table. Each category
......
......@@ -391,47 +391,47 @@ static void store_user_signal_events (void);
static void
kset_echo_string (struct kboard *kb, Lisp_Object val)
{
kb->echo_string = val;
kb->echo_string_ = val;
}
static void
kset_kbd_queue (struct kboard *kb, Lisp_Object val)
{
kb->kbd_queue = val;
kb->kbd_queue_ = val;
}
static void
kset_keyboard_translate_table (struct kboard *kb, Lisp_Object val)
{
kb->Vkeyboard_translate_table = val;
kb->Vkeyboard_translate_table_ = val;
}
static void
kset_last_prefix_arg (struct kboard *kb, Lisp_Object val)
{
kb->Vlast_prefix_arg = val;
kb->Vlast_prefix_arg_ = val;
}
static void
kset_last_repeatable_command (struct kboard *kb, Lisp_Object val)
{
kb->Vlast_repeatable_command = val;
kb->Vlast_repeatable_command_ = val;
}
static void
kset_local_function_key_map (struct kboard *kb, Lisp_Object val)
{
kb->Vlocal_function_key_map = val;
kb->Vlocal_function_key_map_ = val;
}
static void
kset_overriding_terminal_local_map (struct kboard *kb, Lisp_Object val)
{
kb->Voverriding_terminal_local_map = val;
kb->Voverriding_terminal_local_map_ = val;
}
static void
kset_real_last_command (struct kboard *kb, Lisp_Object val)
{
kb->Vreal_last_command = val;
kb->Vreal_last_command_ = val;
}
static void
kset_system_key_syms (struct kboard *kb, Lisp_Object val)
{
kb->system_key_syms = val;
kb->system_key_syms_ = val;
}
......
......@@ -25,7 +25,7 @@ INLINE_HEADER_BEGIN
/* Most code should use this macro to access Lisp fields in struct kboard. */
#define KVAR(kboard, field) ((kboard)->field)
#define KVAR(kboard, field) ((kboard)->field ## _)
/* Each KBOARD represents one logical input stream from which Emacs
gets input. If we are using ordinary terminals, it has one KBOARD
......@@ -78,32 +78,32 @@ struct kboard
can effectively wait for input in the any-kboard state, and hence
avoid blocking out the other KBOARDs. See universal-argument in
lisp/simple.el for an example. */
Lisp_Object Voverriding_terminal_local_map;
Lisp_Object Voverriding_terminal_local_map_;
/* Last command executed by the editor command loop, not counting
commands that set the prefix argument. */
Lisp_Object Vlast_command;
Lisp_Object Vlast_command_;
/* Normally same as last-command, but never modified by other commands. */
Lisp_Object Vreal_last_command;
Lisp_Object Vreal_last_command_;
/* User-supplied table to translate input characters through. */
Lisp_Object Vkeyboard_translate_table;
Lisp_Object Vkeyboard_translate_table_;
/* Last command that may be repeated by `repeat'. */
Lisp_Object Vlast_repeatable_command;
Lisp_Object Vlast_repeatable_command_;
/* The prefix argument for the next command, in raw form. */
Lisp_Object Vprefix_arg;
Lisp_Object Vprefix_arg_;
/* Saved prefix argument for the last command, in raw form. */
Lisp_Object Vlast_prefix_arg;
Lisp_Object Vlast_prefix_arg_;
/* Unread events specific to this kboard. */
Lisp_Object kbd_queue;
Lisp_Object kbd_queue_;
/* Non-nil while a kbd macro is being defined. */
Lisp_Object defining_kbd_macro;
Lisp_Object defining_kbd_macro_;
/* The start of storage for the current keyboard macro. */
Lisp_Object *kbd_macro_buffer;
......@@ -125,28 +125,28 @@ struct kboard
ptrdiff_t kbd_macro_bufsize;
/* Last anonymous kbd macro defined. */
Lisp_Object Vlast_kbd_macro;
Lisp_Object Vlast_kbd_macro_;
/* Alist of system-specific X windows key symbols. */
Lisp_Object Vsystem_key_alist;
Lisp_Object Vsystem_key_alist_;
/* Cache for modify_event_symbol. */
Lisp_Object system_key_syms;
Lisp_Object system_key_syms_;
/* The kind of display: x, w32, ... */
Lisp_Object Vwindow_system;
Lisp_Object Vwindow_system_;
/* Keymap mapping keys to alternative preferred forms.
See the DEFVAR for more documentation. */
Lisp_Object Vlocal_function_key_map;
Lisp_Object Vlocal_function_key_map_;
/* Keymap mapping ASCII function key sequences onto their preferred
forms. Initialized by the terminal-specific lisp files. See the
DEFVAR for more documentation. */
Lisp_Object Vinput_decode_map;
Lisp_Object Vinput_decode_map_;
/* Minibufferless frames on this display use this frame's minibuffer. */
Lisp_Object Vdefault_minibuffer_frame;
Lisp_Object Vdefault_minibuffer_frame_;
/* Number of displays using this KBOARD. Normally 1, but can be
larger when you have multiple screens on a single X display. */
......@@ -154,7 +154,7 @@ struct kboard
/* The text we're echoing in the modeline - partial key sequences,
usually. This is nil when not echoing. */
Lisp_Object echo_string;
Lisp_Object echo_string_;
/* This flag indicates that events were put into kbd_queue
while Emacs was running for some other KBOARD.
......@@ -179,42 +179,42 @@ struct kboard
INLINE void
kset_default_minibuffer_frame (struct kboard *kb, Lisp_Object val)
{
kb->Vdefault_minibuffer_frame = val;
kb->Vdefault_minibuffer_frame_ = val;
}
INLINE void
kset_defining_kbd_macro (struct kboard *kb, Lisp_Object val)
{
kb->defining_kbd_macro = val;
kb->defining_kbd_macro_ = val;
}
INLINE void
kset_input_decode_map (struct kboard *kb, Lisp_Object val)
{
kb->Vinput_decode_map = val;
kb->Vinput_decode_map_ = val;
}
INLINE void
kset_last_command (struct kboard *kb, Lisp_Object val)
{
kb->Vlast_command = val;
kb->Vlast_command_ = val;
}
INLINE void
kset_last_kbd_macro (struct kboard *kb, Lisp_Object val)
{
kb->Vlast_kbd_macro = val;
kb->Vlast_kbd_macro_ = val;
}
INLINE void
kset_prefix_arg (struct kboard *kb, Lisp_Object val)
{
kb->Vprefix_arg = val;
kb->Vprefix_arg_ = val;
}
INLINE void
kset_system_key_alist (struct kboard *kb, Lisp_Object val)
{
kb->Vsystem_key_alist = val;
kb->Vsystem_key_alist_ = val;
}
INLINE void
kset_window_system (struct kboard *kb, Lisp_Object val)
{
kb->Vwindow_system = val;
kb->Vwindow_system_ = val;
}
/* Temporarily used before a frame has been opened. */
......
......@@ -2896,7 +2896,7 @@ extern void defvar_kboard (struct Lisp_Kboard_Objfwd *, const char *, int);
#define DEFVAR_KBOARD(lname, vname, doc) \
do { \
static struct Lisp_Kboard_Objfwd ko_fwd; \
defvar_kboard (&ko_fwd, lname, offsetof (KBOARD, vname)); \
defvar_kboard (&ko_fwd, lname, offsetof (KBOARD, vname ## _)); \
} while (false)
/* Save and restore the instruction and environment pointers,
......
......@@ -186,7 +186,7 @@ static bool in_classes (int, Lisp_Object);
static void
bset_syntax_table (struct buffer *b, Lisp_Object val)
{
b->syntax_table = val;
b->syntax_table_ = val;
}
/* Whether the syntax of the character C has the prefix flag set. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment