diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 14 |
2 files changed, 4 insertions, 14 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f90445045ae..0f59d6088a5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-09-25 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (mode_line_inverse_video): Delete obsolete variable. | ||
| 4 | |||
| 1 | 2012-09-24 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2012-09-24 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * bytecode.c (exec_byte_code): Signal an error instead of aborting, | 7 | * bytecode.c (exec_byte_code): Signal an error instead of aborting, |
diff --git a/src/xdisp.c b/src/xdisp.c index 423ecab8dc7..0f02997be22 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -20162,10 +20162,6 @@ display_menu_bar (struct window *w) | |||
| 20162 | this. */ | 20162 | this. */ |
| 20163 | it.paragraph_embedding = L2R; | 20163 | it.paragraph_embedding = L2R; |
| 20164 | 20164 | ||
| 20165 | if (! mode_line_inverse_video) | ||
| 20166 | /* Force the menu-bar to be displayed in the default face. */ | ||
| 20167 | it.base_face_id = it.face_id = DEFAULT_FACE_ID; | ||
| 20168 | |||
| 20169 | /* Clear all rows of the menu bar. */ | 20165 | /* Clear all rows of the menu bar. */ |
| 20170 | for (i = 0; i < FRAME_MENU_BAR_LINES (f); ++i) | 20166 | for (i = 0; i < FRAME_MENU_BAR_LINES (f); ++i) |
| 20171 | { | 20167 | { |
| @@ -20335,10 +20331,6 @@ display_mode_line (struct window *w, enum face_id face_id, Lisp_Object format) | |||
| 20335 | 20331 | ||
| 20336 | it.glyph_row->mode_line_p = 1; | 20332 | it.glyph_row->mode_line_p = 1; |
| 20337 | 20333 | ||
| 20338 | if (! mode_line_inverse_video) | ||
| 20339 | /* Force the mode-line to be displayed in the default face. */ | ||
| 20340 | it.base_face_id = it.face_id = DEFAULT_FACE_ID; | ||
| 20341 | |||
| 20342 | /* FIXME: This should be controlled by a user option. But | 20334 | /* FIXME: This should be controlled by a user option. But |
| 20343 | supporting such an option is not trivial, since the mode line is | 20335 | supporting such an option is not trivial, since the mode line is |
| 20344 | made up of many separate strings. */ | 20336 | made up of many separate strings. */ |
| @@ -28930,12 +28922,6 @@ A value of nil means to respect the value of `truncate-lines'. | |||
| 28930 | If `word-wrap' is enabled, you might want to reduce this. */); | 28922 | If `word-wrap' is enabled, you might want to reduce this. */); |
| 28931 | Vtruncate_partial_width_windows = make_number (50); | 28923 | Vtruncate_partial_width_windows = make_number (50); |
| 28932 | 28924 | ||
| 28933 | DEFVAR_BOOL ("mode-line-inverse-video", mode_line_inverse_video, | ||
| 28934 | doc: /* When nil, display the mode-line/header-line/menu-bar in the default face. | ||
| 28935 | Any other value means to use the appropriate face, `mode-line', | ||
| 28936 | `header-line', or `menu' respectively. */); | ||
| 28937 | mode_line_inverse_video = 1; | ||
| 28938 | |||
| 28939 | DEFVAR_LISP ("line-number-display-limit", Vline_number_display_limit, | 28925 | DEFVAR_LISP ("line-number-display-limit", Vline_number_display_limit, |
| 28940 | doc: /* Maximum buffer size for which line number should be displayed. | 28926 | doc: /* Maximum buffer size for which line number should be displayed. |
| 28941 | If the buffer is bigger than this, the line number does not appear | 28927 | If the buffer is bigger than this, the line number does not appear |