diff options
| author | Eli Zaretskii | 2011-02-14 19:58:13 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-02-14 19:58:13 +0200 |
| commit | ef72f149bdb1aeaf2587904f578bb26ec4c1bf99 (patch) | |
| tree | cd844c2a91831a63b43fe6ac60f8ceca8134a51b | |
| parent | fc3ca11315448fa7310f064fd9953b943ae733bf (diff) | |
| download | emacs-ef72f149bdb1aeaf2587904f578bb26ec4c1bf99.tar.gz emacs-ef72f149bdb1aeaf2587904f578bb26ec4c1bf99.zip | |
Fix the MS-DOS build due to introduction of B_.
msdos.c (IT_frame_up_to_date):
s/msdos.h (MODE_LINE_BINARY_TEXT): Use B_ for the MS-DOS build.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/msdos.c | 6 | ||||
| -rw-r--r-- | src/s/msdos.h | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 904a89fb663..2f5749238ff 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-02-14 Eli Zaretskii <eliz@gnu.org> | 1 | 2011-02-14 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * msdos.c (IT_frame_up_to_date): | ||
| 4 | * s/msdos.h (MODE_LINE_BINARY_TEXT): Use B_ for the MS-DOS build. | ||
| 5 | |||
| 3 | * dired.c (directory_files_internal): | 6 | * dired.c (directory_files_internal): |
| 4 | * fileio.c (Finsert_file_contents): | 7 | * fileio.c (Finsert_file_contents): |
| 5 | * insdel.c (prepare_to_modify_buffer): | 8 | * insdel.c (prepare_to_modify_buffer): |
diff --git a/src/msdos.c b/src/msdos.c index eb73f54838d..d37200e700a 100644 --- a/src/msdos.c +++ b/src/msdos.c | |||
| @@ -1317,12 +1317,12 @@ IT_frame_up_to_date (struct frame *f) | |||
| 1317 | { | 1317 | { |
| 1318 | struct buffer *b = XBUFFER (sw->buffer); | 1318 | struct buffer *b = XBUFFER (sw->buffer); |
| 1319 | 1319 | ||
| 1320 | if (EQ (b->cursor_type, Qt)) | 1320 | if (EQ (B_ (b,cursor_type), Qt)) |
| 1321 | new_cursor = frame_desired_cursor; | 1321 | new_cursor = frame_desired_cursor; |
| 1322 | else if (NILP (b->cursor_type)) /* nil means no cursor */ | 1322 | else if (NILP (B_ (b, cursor_type))) /* nil means no cursor */ |
| 1323 | new_cursor = Fcons (Qbar, make_number (0)); | 1323 | new_cursor = Fcons (Qbar, make_number (0)); |
| 1324 | else | 1324 | else |
| 1325 | new_cursor = b->cursor_type; | 1325 | new_cursor = B_ (b, cursor_type); |
| 1326 | } | 1326 | } |
| 1327 | 1327 | ||
| 1328 | IT_set_cursor_type (f, new_cursor); | 1328 | IT_set_cursor_type (f, new_cursor); |
diff --git a/src/s/msdos.h b/src/s/msdos.h index 88afaa83455..a1d23521a0a 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h | |||
| @@ -92,7 +92,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ | |||
| 92 | 92 | ||
| 93 | 93 | ||
| 94 | /* Mode line description of a buffer's type. */ | 94 | /* Mode line description of a buffer's type. */ |
| 95 | #define MODE_LINE_BINARY_TEXT(buf) (NILP(buf->buffer_file_type) ? "T" : "B") | 95 | #define MODE_LINE_BINARY_TEXT(buf) (NILP(B_(buf,buffer_file_type)) ? "T" : "B") |
| 96 | 96 | ||
| 97 | /* We have (the code to control) a mouse. */ | 97 | /* We have (the code to control) a mouse. */ |
| 98 | #define HAVE_MOUSE | 98 | #define HAVE_MOUSE |