Change B_ to BVAR

	* xfns.c (x_create_tip_frame, Fx_show_tip): Replace B_ with BVAR.
	* xfaces.c (compute_char_face): Replace B_ with BVAR.
	* xdisp.c (pos_visible_p, init_iterator, reseat_1)
	(message_dolog, update_echo_area, ensure_echo_area_buffers)
	(with_echo_area_buffer, setup_echo_area_for_printing)
	(set_message_1, update_menu_bar, update_tool_bar)
	(text_outside_line_unchanged_p, redisplay_internal)
	(try_scrolling, try_cursor_movement, redisplay_window)
	(try_window_reusing_current_matrix, row_containing_pos)
	(try_window_id, get_overlay_arrow_glyph_row, display_line)
	(Fcurrent_bidi_paragraph_direction, display_mode_lines)
	(decode_mode_spec_coding, decode_mode_spec, display_count_lines)
	(get_window_cursor_type, note_mouse_highlight): Replace B_ with
	BVAR.
	* window.c (window_display_table, unshow_buffer, window_loop)
	(window_min_size_2, set_window_buffer, Fset_window_buffer)
	(select_window, Fforce_window_update, temp_output_buffer_show)
	(Fset_window_configuration, save_window_save): Replace B_ with
	BVAR.
	* w32fns.c (x_create_tip_frame, Fx_show_tip, Fw32_shell_execute):
	Replace B_ with BVAR.
	* undo.c (record_point, record_insert, record_delete)
	(record_marker_adjustment, record_first_change)
	(record_property_change, Fundo_boundary, truncate_undo_list)
	(Fprimitive_undo): Replace B_ with BVAR.
	* syntax.h (Vstandard_syntax_table, CURRENT_SYNTAX_TABLE)
	(SETUP_BUFFER_SYNTAX_TABLE): Replace B_ with BVAR.
	* syntax.c (update_syntax_table, dec_bytepos, Fsyntax_table)
	(Fset_syntax_table, Fmodify_syntax_entry, skip_chars)
	(skip_syntaxes, scan_lists): Replace B_ with BVAR.
	* search.c (compile_pattern_1, compile_pattern, looking_at_1)
	(string_match_1, fast_looking_at, newline_cache_on_off)
	(search_command, search_buffer, simple_search, boyer_moore)
	(Freplace_match): Replace B_ with BVAR.
	* process.c (get_process, list_processes_1, Fstart_process)
	(Fmake_serial_process, Fmake_network_process)
	(read_process_output, send_process, exec_sentinel)
	(status_notify, setup_process_coding_systems): Replace B_ with
	BVAR.
	* print.c (PRINTDECLARE, PRINTPREPARE, PRINTFINISH, printchar)
	(strout, print_string, temp_output_buffer_setup, print_object):
	Replace B_ with BVAR.
	* msdos.c (IT_frame_up_to_date): Replace B_ with BVAR.
	* minibuf.c (read_minibuf, get_minibuffer, Fread_buffer): Replace
	B_ with BVAR.
	* marker.c (Fmarker_buffer, Fset_marker, set_marker_restricted)
	(set_marker_both, set_marker_restricted_both, unchain_marker):
	Replace B_ with BVAR.
	* lread.c (readchar, unreadchar, openp, readevalloop)
	(Feval_buffer, Feval_region): Replace B_ with BVAR.
	* lisp.h (DOWNCASE_TABLE, UPCASE_TABLE): Replace B_ with BVAR.
	* keymap.c (Flocal_key_binding, Fuse_local_map)
	(Fcurrent_local_map, push_key_description)
	(Fdescribe_buffer_bindings): Replace B_ with BVAR.
	* keyboard.c (command_loop_1, read_char_minibuf_menu_prompt)
	(read_key_sequence): Replace B_ with BVAR.
	* intervals.h (TEXT_PROP_MEANS_INVISIBLE): Replace B_ with BVAR.
	* intervals.c (set_point_both, get_local_map): Replace B_ with
	BVAR.
	* insdel.c (check_markers, insert_char, insert_1_both)
	(insert_from_string_1, insert_from_gap, insert_from_buffer_1)
	(adjust_after_replace, replace_range, del_range_2)
	(modify_region, prepare_to_modify_buffer)
	(Fcombine_after_change_execute): Replace B_ with BVAR.
	* indent.c (buffer_display_table, recompute_width_table)
	(width_run_cache_on_off, current_column, scan_for_column)
	(Findent_to, position_indentation, compute_motion, vmotion):
	Replace B_ with BVAR.
	* fringe.c (get_logical_cursor_bitmap)
	(get_logical_fringe_bitmap, update_window_fringes): Replace B_
	with BVAR.
	* frame.c (make_frame_visible_1): Replace B_ with BVAR.
	* font.c (font_at): Replace B_ with BVAR.
	* fns.c (Fbase64_encode_region, Fbase64_decode_region, Fmd5):
	Replace B_ with BVAR.
	* filelock.c (unlock_all_files, Flock_buffer, Funlock_buffer)
	(unlock_buffer): Replace B_ with BVAR.
	* fileio.c (Fexpand_file_name, Ffile_directory_p)
	(Ffile_regular_p, Ffile_selinux_context)
	(Fset_file_selinux_context, Ffile_modes, Fset_file_modes)
	(Fset_file_times, Ffile_newer_than_file_p, decide_coding_unwind)
	(Finsert_file_contents, choose_write_coding_system)
	(Fwrite_region, build_annotations, Fverify_visited_file_modtime)
	(Fset_visited_file_modtime, auto_save_error, auto_save_1)
	(Fdo_auto_save, Fset_buffer_auto_saved): Replace B_ with BVAR.
	* editfns.c (region_limit, Fmark_marker, save_excursion_save)
	(save_excursion_restore, Fprevious_char, Fchar_before)
	(general_insert_function, Finsert_char, Finsert_byte)
	(make_buffer_string_both, Finsert_buffer_substring)
	(Fcompare_buffer_substrings, subst_char_in_region_unwind)
	(subst_char_in_region_unwind_1, Fsubst_char_in_region)
	(Ftranslate_region_internal, save_restriction_restore)
	(Fchar_equal): Replace B_ with BVAR.
	* dispnew.c (Fframe_or_buffer_changed_p): Replace B_ with BVAR.
	* dispextern.h (WINDOW_WANTS_MODELINE_P)
	(WINDOW_WANTS_HEADER_LINE_P): Replace B_ with BVAR.
	* dired.c (directory_files_internal): Replace B_ with BVAR.
	* data.c (swap_in_symval_forwarding, set_internal)
	(Fmake_local_variable, Fkill_local_variable, Flocal_variable_p):
	Replace B_ with BVAR.
	* composite.c (fill_gstring_header)
	(composition_compute_stop_pos, composition_adjust_point)
	(Ffind_composition_internal): Replace B_ with BVAR.
	* coding.c (decode_coding, encode_coding)
	(make_conversion_work_buffer, decode_coding_gap)
	(decode_coding_object, encode_coding_object)
	(Fdetect_coding_region, Ffind_coding_systems_region_internal)
	(Funencodable_char_position, Fcheck_coding_systems_region):
	Replace B_ with BVAR.
	* cmds.c (Fself_insert_command, internal_self_insert): Replace B_
	with BVAR.
	* charset.c (Ffind_charset_region): Replace B_ with BVAR.
	* character.h (FETCH_CHAR_ADVANCE, INC_BOTH, DEC_BOTH)
	(ASCII_CHAR_WIDTH): Replace B_ with BVAR.
	* character.c (chars_in_text, Fget_byte): Replace B_ with BVAR.
	* category.h (Vstandard_category_table): Replace B_ with BVAR.
	* category.c (check_category_table, Fcategory_table)
	(Fset_category_table, char_category_set): Replace B_ with BVAR.
	* casetab.c (Fcurrent_case_table, set_case_table): Replace B_ with
	BVAR.
	* casefiddle.c (casify_object, casify_region): Replace B_ with
	BVAR.
	* callproc.c (Fcall_process, Fcall_process_region): Replace B_
	with BVAR.
	* callint.c (check_mark, Fcall_interactively): Replace B_ with
	BVAR.
	* bytecode.c (Fbyte_code): Replace B_ with BVAR.
	* buffer.h (FETCH_CHAR, FETCH_CHAR_AS_MULTIBYTE, BVAR): Replace B_
	with BVAR.
	* buffer.c (Fbuffer_live_p, Fget_file_buffer)
	(get_truename_buffer, Fget_buffer_create)
	(clone_per_buffer_values, Fmake_indirect_buffer, reset_buffer)
	(reset_buffer_local_variables, Fbuffer_name, Fbuffer_file_name)
	(Fbuffer_local_value, buffer_lisp_local_variables)
	(Fset_buffer_modified_p, Frestore_buffer_modified_p)
	(Frename_buffer, Fother_buffer, Fbuffer_enable_undo)
	(Fkill_buffer, Fset_buffer_major_mode, set_buffer_internal_1)
	(set_buffer_temp, Fset_buffer, set_buffer_if_live)
	(Fbarf_if_buffer_read_only, Fbury_buffer, Ferase_buffer)
	(Fbuffer_swap_text, swapfield_, Fbuffer_swap_text)
	(Fset_buffer_multibyte, swap_out_buffer_local_variables)
	(record_overlay_string, overlay_strings, init_buffer_once)
	(init_buffer, syms_of_buffer): Replace B_ with BVAR.

1 files changed, 12 insertions, 12 deletions

diff --git a/src/data.c b/src/data.c
index c0557d5c735..d0afca6a09f 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1009,7 +1009,7 @@ swap_in_symval_forwarding (struct Lisp_Symbol *symbol, struct Lisp_Buffer_Local_
           }
         else
           {
-            tem1 = assq_no_quit (var, B_ (current_buffer, local_var_alist));
+            tem1 = assq_no_quit (var, BVAR (current_buffer, local_var_alist));
             XSETBUFFER (blv->where, current_buffer);
           }
       }
@@ -1178,7 +1178,7 @@ set_internal (register Lisp_Object symbol, register Lisp_Object newval, register
             tem1 = Fassq (symbol,
                           (blv->frame_local
                            ? XFRAME (where)->param_alist
-                           : B_ (XBUFFER (where), local_var_alist)));
+                           : BVAR (XBUFFER (where), local_var_alist)));
             blv->where = where;
             blv->found = 1;
 
@@ -1209,8 +1209,8 @@ set_internal (register Lisp_Object symbol, register Lisp_Object newval, register
                        bindings, not for frame-local bindings.  */
                     eassert (!blv->frame_local);
                     tem1 = Fcons (symbol, XCDR (blv->defcell));
-                    B_ (XBUFFER (where), local_var_alist)
-                      = Fcons (tem1, B_ (XBUFFER (where), local_var_alist));
+                    BVAR (XBUFFER (where), local_var_alist)
+                      = Fcons (tem1, BVAR (XBUFFER (where), local_var_alist));
                   }
               }
 
@@ -1632,13 +1632,13 @@ Instead, use `add-hook' and specify t for the LOCAL argument.  */)
         if (let_shadows_global_binding_p (symbol))
           message ("Making %s local to %s while let-bound!",
                    SDATA (SYMBOL_NAME (variable)),
-                   SDATA (B_ (current_buffer, name)));
+                   SDATA (BVAR (current_buffer, name)));
       }
     }
 
   /* Make sure this buffer has its own value of symbol.  */
   XSETSYMBOL (variable, sym);   /* Update in case of aliasing.  */
-  tem = Fassq (variable, B_ (current_buffer, local_var_alist));
+  tem = Fassq (variable, BVAR (current_buffer, local_var_alist));
   if (NILP (tem))
     {
       if (let_shadows_buffer_binding_p (sym))
@@ -1650,9 +1650,9 @@ Instead, use `add-hook' and specify t for the LOCAL argument.  */)
          default value.  */
       find_symbol_value (variable);
 
-      B_ (current_buffer, local_var_alist)
+      BVAR (current_buffer, local_var_alist)
         = Fcons (Fcons (variable, XCDR (blv->defcell)),
-                 B_ (current_buffer, local_var_alist));
+                 BVAR (current_buffer, local_var_alist));
 
       /* Make sure symbol does not think it is set up for this buffer;
          force it to look once again for this buffer's value.  */
@@ -1718,10 +1718,10 @@ From now on the default value will apply in this buffer.  Return VARIABLE.  */)
 
   /* Get rid of this buffer's alist element, if any.  */
   XSETSYMBOL (variable, sym);   /* Propagate variable indirection.  */
-  tem = Fassq (variable, B_ (current_buffer, local_var_alist));
+  tem = Fassq (variable, BVAR (current_buffer, local_var_alist));
   if (!NILP (tem))
-    B_ (current_buffer, local_var_alist)
-      = Fdelq (tem, B_ (current_buffer, local_var_alist));
+    BVAR (current_buffer, local_var_alist)
+      = Fdelq (tem, BVAR (current_buffer, local_var_alist));
 
   /* If the symbol is set up with the current buffer's binding
      loaded, recompute its value.  We have to do it now, or else
@@ -1848,7 +1848,7 @@ BUFFER defaults to the current buffer.  */)
         XSETBUFFER (tmp, buf);
         XSETSYMBOL (variable, sym); /* Update in case of aliasing.  */
 
-        for (tail = B_ (buf, local_var_alist); CONSP (tail); tail = XCDR (tail))
+        for (tail = BVAR (buf, local_var_alist); CONSP (tail); tail = XCDR (tail))
           {
             elt = XCAR (tail);
             if (EQ (variable, XCAR (elt)))