diff options
| author | K. Handa | 2015-01-07 22:51:41 +0900 |
|---|---|---|
| committer | K. Handa | 2015-01-07 22:51:41 +0900 |
| commit | 88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch) | |
| tree | 18da116400703b67738bdbbd38cc4abf4c1e929f /src/window.h | |
| parent | 3f79d3131629f73da16ec121d2a0056f11b70e65 (diff) | |
| parent | 95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff) | |
| download | emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip | |
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/window.h')
| -rw-r--r-- | src/window.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/window.h b/src/window.h index 4e4c65b83e6..2ec28ab4e56 100644 --- a/src/window.h +++ b/src/window.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Window definitions for GNU Emacs. | 1 | /* Window definitions for GNU Emacs. |
| 2 | Copyright (C) 1985-1986, 1993, 1995, 1997-2014 Free Software | 2 | Copyright (C) 1985-1986, 1993, 1995, 1997-2015 Free Software |
| 3 | Foundation, Inc. | 3 | Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| @@ -1085,7 +1085,6 @@ struct glyph *get_phys_cursor_glyph (struct window *w); | |||
| 1085 | CHECK_TYPE (WINDOW_LIVE_P (WINDOW), Qwindow_live_p, WINDOW) | 1085 | CHECK_TYPE (WINDOW_LIVE_P (WINDOW), Qwindow_live_p, WINDOW) |
| 1086 | 1086 | ||
| 1087 | /* These used to be in lisp.h. */ | 1087 | /* These used to be in lisp.h. */ |
| 1088 | extern Lisp_Object Qwindow_live_p; | ||
| 1089 | extern Lisp_Object Vwindow_list; | 1088 | extern Lisp_Object Vwindow_list; |
| 1090 | 1089 | ||
| 1091 | extern Lisp_Object window_list (void); | 1090 | extern Lisp_Object window_list (void); |