* w32fns.c (Fx_create_frame): Remove duplicate unwind_protect.before-merge-emacs-app-to-trunk
commit691e329080abb159f73cef723912a41e0169c6d8
authorJason Rumney <jasonr@gnu.org>
Tue, 15 Jul 2008 15:45:05 +0000 (15 15:45 +0000)
committerJason Rumney <jasonr@gnu.org>
Tue, 15 Jul 2008 15:45:05 +0000 (15 15:45 +0000)
treed0eec1b7b1a5d5b6d47be2378a4b56681aed1989
parent008f9d2a01f3e883a62934026e3c61ca9d78ddc8
* w32fns.c (Fx_create_frame): Remove duplicate unwind_protect.
(w32_show_hourglass): Rename from show_hourglass.
(w32_hide_hourglass): Rename from hide_hourglass.
(DEFAULT_HOURGLASS_DELAY): Revert from last change.
(Vhourglass_delay): Declare extern.
(hourglass_started): Remove.

* xdisp.c (Vhourglass_delay): Remove static.
(hourglass_started, start_hourglass, cancel_hourglass):
Don't include these versions on WINDOWSNT.
src/ChangeLog
src/w32fns.c
src/xdisp.c