procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the MS-Windows build due to introduction of B_.

Browse source 
dired.c (directory_files_internal):
 fileio.c (Finsert_file_contents):
 insdel.c (prepare_to_modify_buffer):
 xdisp.c (pos_visible_p):
 s/ms-w32.h (MODE_LINE_BINARY_TEXT):
 w32fns.c (Fw32_shell_execute, Fx_show_tip, x_create_tip_frame):
 Use B_ for the MS-Windows build.

 From Tom Tromey:
 buffer.c (init_buffer_once, syms_of_buffer): Use B_ in DOS_NT case.
This commit is contained in:
Eli Zaretskii 2011-02-14 19:35:21 +02:00
parent 3928f2b67e
commit fc3ca11315
8 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/dired.el
View file

@ -4029,7 +4029,7 @@ true then the type of the file linked to by FILE is printed instead.
;;;***
;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
;;;;;; "fbac6ae123aaa2b2e9df8bb2cde61ceb")
;;;;;; "d35468f85920d324895b0c04bb703328")
;;; Generated autoloads from dired-x.el
(autoload 'dired-jump "dired-x" "\

12
src/ChangeLog
View file

@ -1,3 +1,13 @@
2011-02-14 Eli Zaretskii <eliz@gnu.org>
* dired.c (directory_files_internal):
* fileio.c (Finsert_file_contents):
* insdel.c (prepare_to_modify_buffer):
* xdisp.c (pos_visible_p):
* s/ms-w32.h (MODE_LINE_BINARY_TEXT):
* w32fns.c (Fw32_shell_execute, Fx_show_tip, x_create_tip_frame):
Use B_ for the MS-Windows build.
2011-02-14 Jan Djärv <jan.h.d@swipnet.se>
* xrdb.c (x_load_resources): For LUCID and XFT, don't put a
@ -11,6 +21,8 @@
2011-02-14 Tom Tromey <tromey@redhat.com>
* buffer.c (init_buffer_once, syms_of_buffer): Use B_ in DOS_NT case.
* keyboard.h: Remove obsolete comment.
2011-02-14 Tom Tromey <tromey@parfait>

6
src/buffer.c
View file

@ -5041,7 +5041,7 @@ init_buffer_once (void)
B_ (&buffer_defaults, cursor_in_non_selected_windows) = Qt;
#ifdef DOS_NT
buffer_defaults.buffer_file_type = Qnil; /* TEXT */
B_ (&buffer_defaults, buffer_file_type) = Qnil; /* TEXT */
#endif
B_ (&buffer_defaults, enable_multibyte_characters) = Qt;
B_ (&buffer_defaults, buffer_file_coding_system) = Qnil;
@ -5113,7 +5113,7 @@ init_buffer_once (void)
XSETFASTINT (B_ (&buffer_local_flags, abbrev_table), idx); ++idx;
XSETFASTINT (B_ (&buffer_local_flags, display_table), idx); ++idx;
#ifdef DOS_NT
XSETFASTINT (buffer_local_flags.buffer_file_type, idx);
XSETFASTINT (B_ (&buffer_local_flags, buffer_file_type), idx);
/* Make this one a permanent local. */
buffer_permanent_local_flags[idx++] = 1;
#endif
@ -5674,7 +5674,7 @@ word-wrapping, you might want to reduce the value of
in narrower windows. */);
#ifdef DOS_NT
DEFVAR_PER_BUFFER ("buffer-file-type", &current_buffer->buffer_file_type,
DEFVAR_PER_BUFFER ("buffer-file-type", &B_ (current_buffer, buffer_file_type),
Qnil,
doc: /* Non-nil if the visited file is a binary file.
This variable is meaningful on MS-DOG and Windows NT.

2
src/dired.c
View file

@ -158,7 +158,7 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full, Lisp_Object m
# ifdef WINDOWSNT
/* Windows users want case-insensitive wildcards. */
bufp = compile_pattern (match, 0,
buffer_defaults.case_canon_table, 0, 1);
B_ (&buffer_defaults, case_canon_table), 0, 1);
# else /* !WINDOWSNT */
bufp = compile_pattern (match, 0, Qnil, 0, 1);
# endif /* !WINDOWSNT */

4
src/fileio.c
View file

@ -4110,9 +4110,9 @@ variable `last-coding-system-used' to the coding system actually used. */)
if ((VECTORP (CODING_ID_EOL_TYPE (coding.id))
|| EQ (CODING_ID_EOL_TYPE (coding.id), Qunix))
&& ! CODING_REQUIRE_DECODING (&coding))
current_buffer->buffer_file_type = Qt;
B_ (current_buffer, buffer_file_type) = Qt;
else
current_buffer->buffer_file_type = Qnil;
B_ (current_buffer, buffer_file_type) = Qnil;
#endif
handled:

6
src/insdel.c
View file

@ -2029,12 +2029,12 @@ prepare_to_modify_buffer (EMACS_INT start, EMACS_INT end,
lock_file (B_ (base_buffer, file_truename));
#else
/* At least warn if this file has changed on disk since it was visited. */
if (!NILP (base_buffer->filename)
if (!NILP (B_ (base_buffer, filename))
&& SAVE_MODIFF >= MODIFF
&& NILP (Fverify_visited_file_modtime (Fcurrent_buffer ()))
&& !NILP (Ffile_exists_p (base_buffer->filename)))
&& !NILP (Ffile_exists_p (B_ (base_buffer, filename))))
call1 (intern ("ask-user-about-supersession-threat"),
base_buffer->filename);
B_ (base_buffer,filename));
#endif /* not CLASH_DETECTION */
/* If `select-active-regions' is non-nil, save the region text. */

2
src/s/ms-w32.h
View file

@ -181,7 +181,7 @@ struct sigaction {
#define HAVE_MENUS 1
#endif
#define MODE_LINE_BINARY_TEXT(_b_) (NILP ((_b_)->buffer_file_type) ? "T" : "B")
#define MODE_LINE_BINARY_TEXT(_b_) (NILP (B_(_b_,buffer_file_type)) ? "T" : "B")
/* Get some redefinitions in place. */

6
src/w32fns.c
View file

@ -5225,7 +5225,7 @@ x_create_tip_frame (struct w32_display_info *dpyinfo,
Fset_window_buffer (FRAME_ROOT_WINDOW (f), buffer, Qnil);
old_buffer = current_buffer;
set_buffer_internal_1 (XBUFFER (buffer));
current_buffer->truncate_lines = Qnil;
B_ (current_buffer, truncate_lines) = Qnil;
specbind (Qinhibit_read_only, Qt);
specbind (Qinhibit_modification_hooks, Qt);
Ferase_buffer ();
@ -5655,7 +5655,7 @@ Text larger than the specified size is clipped. */)
/* Display the tooltip text in a temporary buffer. */
old_buffer = current_buffer;
set_buffer_internal_1 (XBUFFER (XWINDOW (FRAME_ROOT_WINDOW (f))->buffer));
current_buffer->truncate_lines = Qnil;
B_ (current_buffer, truncate_lines) = Qnil;
clear_glyph_matrix (w->desired_matrix);
clear_glyph_matrix (w->current_matrix);
SET_TEXT_POS (pos, BEGV, BEGV_BYTE);
@ -6162,7 +6162,7 @@ an integer representing a ShowWindow flag:
CHECK_STRING (document);
/* Encode filename, current directory and parameters. */
current_dir = ENCODE_FILE (current_buffer->directory);
current_dir = ENCODE_FILE (B_ (current_buffer, directory));
document = ENCODE_FILE (document);
if (STRINGP (parameters))
parameters = ENCODE_SYSTEM (parameters);