diff options
| author | Karoly Lorentey | 2005-03-16 16:06:15 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-03-16 16:06:15 +0000 |
| commit | 14c0ac78c48e6bdf832e370ef15ecbef6573dd06 (patch) | |
| tree | ae0aa5371351ec1a2d0bdf7c55e60b8df4b0063c /src/dispextern.h | |
| parent | 38d2de214077b4e600d9f9d20d7ec81e1f1c8908 (diff) | |
| parent | a7679889e8213289331577d1d9e6d1187a20d035 (diff) | |
| download | emacs-14c0ac78c48e6bdf832e370ef15ecbef6573dd06.tar.gz emacs-14c0ac78c48e6bdf832e370ef15ecbef6573dd06.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 37-38, 162-182)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-162
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-163
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-164
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-165
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-166
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-167
Tweak obsolete function/variable warning message
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-168
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-169
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-170
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-171
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-172
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-173
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-174
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-175
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-176
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-177
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-178
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-179
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-180
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-181
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-182
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-37
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-38
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-309
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 60f24feef5b..8861a9705c4 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -2808,6 +2808,7 @@ EXFUN (Fx_show_tip, 6); | |||
| 2808 | EXFUN (Fx_hide_tip, 0); | 2808 | EXFUN (Fx_hide_tip, 0); |
| 2809 | extern void start_hourglass P_ ((void)); | 2809 | extern void start_hourglass P_ ((void)); |
| 2810 | extern void cancel_hourglass P_ ((void)); | 2810 | extern void cancel_hourglass P_ ((void)); |
| 2811 | extern int hourglass_started P_ ((void)); | ||
| 2811 | extern int display_hourglass_p; | 2812 | extern int display_hourglass_p; |
| 2812 | 2813 | ||
| 2813 | /* Returns the background color of IMG, calculating one heuristically if | 2814 | /* Returns the background color of IMG, calculating one heuristically if |