diff options
| author | Paul Eggert | 2011-09-04 16:58:01 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-09-04 16:58:01 -0700 |
| commit | 1c262cae409ec55a234c89b3b74a13a77c7f595a (patch) | |
| tree | 2780610d6227a3b1f64aa9398f21501ce3de774e /src/window.h | |
| parent | 7f59d9c856de33b97bc3f2708dcc8dadf24ee040 (diff) | |
| parent | 052bd38a56ad14a7f311677051e778de6c4bdc1c (diff) | |
| download | emacs-1c262cae409ec55a234c89b3b74a13a77c7f595a.tar.gz emacs-1c262cae409ec55a234c89b3b74a13a77c7f595a.zip | |
Merge from trunk.
Diffstat (limited to 'src/window.h')
| -rw-r--r-- | src/window.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/window.h b/src/window.h index 485734e907e..c6fa5e7a338 100644 --- a/src/window.h +++ b/src/window.h | |||
| @@ -847,11 +847,11 @@ extern Lisp_Object echo_area_window; | |||
| 847 | 847 | ||
| 848 | /* Depth in recursive edits. */ | 848 | /* Depth in recursive edits. */ |
| 849 | 849 | ||
| 850 | extern int command_loop_level; | 850 | extern EMACS_INT command_loop_level; |
| 851 | 851 | ||
| 852 | /* Depth in minibuffer invocations. */ | 852 | /* Depth in minibuffer invocations. */ |
| 853 | 853 | ||
| 854 | extern int minibuf_level; | 854 | extern EMACS_INT minibuf_level; |
| 855 | 855 | ||
| 856 | /* true if we should redraw the mode lines on the next redisplay. */ | 856 | /* true if we should redraw the mode lines on the next redisplay. */ |
| 857 | 857 | ||