diff options
| author | Paul Eggert | 2011-09-05 13:43:14 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-09-05 13:43:14 -0700 |
| commit | 1dc4aa6d975c9f92cd5c0d0baf5eae89e013fd67 (patch) | |
| tree | 8c3e07779650c446922a93839c3ecdabb85cdaea /src/window.h | |
| parent | f4af5137d41b5ff71771028385f89be889dd1315 (diff) | |
| parent | 697210c4822d4e7be9a81234d2026e5ace724a90 (diff) | |
| download | emacs-1dc4aa6d975c9f92cd5c0d0baf5eae89e013fd67.tar.gz emacs-1dc4aa6d975c9f92cd5c0d0baf5eae89e013fd67.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 | ||