diff options
| author | Paul Eggert | 2011-02-14 21:41:07 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-02-14 21:41:07 -0800 |
| commit | fae95934b8edae3f538063e756ac799ed94313b2 (patch) | |
| tree | 3bb814c43cd50db54591bf685e5cb72b863b5833 /src/s | |
| parent | 6d302144c218f12bd380344ae2d3ed87a6ea9327 (diff) | |
| parent | bb55f713d2e4ea089a861a257d7d000432642ce9 (diff) | |
| download | emacs-fae95934b8edae3f538063e756ac799ed94313b2.tar.gz emacs-fae95934b8edae3f538063e756ac799ed94313b2.zip | |
Merge from mainline.
Diffstat (limited to 'src/s')
| -rw-r--r-- | src/s/ms-w32.h | 2 | ||||
| -rw-r--r-- | src/s/msdos.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index 4c3b84dfe4c..34814687597 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h | |||
| @@ -181,7 +181,7 @@ struct sigaction { | |||
| 181 | #define HAVE_MENUS 1 | 181 | #define HAVE_MENUS 1 |
| 182 | #endif | 182 | #endif |
| 183 | 183 | ||
| 184 | #define MODE_LINE_BINARY_TEXT(_b_) (NILP ((_b_)->buffer_file_type) ? "T" : "B") | 184 | #define MODE_LINE_BINARY_TEXT(_b_) (NILP (B_(_b_,buffer_file_type)) ? "T" : "B") |
| 185 | 185 | ||
| 186 | /* Get some redefinitions in place. */ | 186 | /* Get some redefinitions in place. */ |
| 187 | 187 | ||
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 |