diff options
| author | Jan Djärv | 2009-11-29 09:48:50 +0000 |
|---|---|---|
| committer | Jan Djärv | 2009-11-29 09:48:50 +0000 |
| commit | abeafb2a06c9eac90ac5edfad3d1c56e532114d2 (patch) | |
| tree | ce48b79676ddff73cb4171521570fc6609db69c9 /src | |
| parent | 21f49db9e9d118fafe45a36516fa6f64ccbe4658 (diff) | |
| download | emacs-abeafb2a06c9eac90ac5edfad3d1c56e532114d2.tar.gz emacs-abeafb2a06c9eac90ac5edfad3d1c56e532114d2.zip | |
frame.c (frame_make_pointer_invisible)
(frame_make_pointer_visible): Declare f before statements.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/frame.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 346a3442ed4..7d5525c781e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-11-29 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * frame.c (frame_make_pointer_invisible) | ||
| 4 | (frame_make_pointer_visible): Declare f before statements. | ||
| 5 | |||
| 1 | 2009-11-28 Eli Zaretskii <eliz@gnu.org> | 6 | 2009-11-28 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * Makefile.in [!AUTO_DEPEND]: Remove outdated comment about | 8 | * Makefile.in [!AUTO_DEPEND]: Remove outdated comment about |
diff --git a/src/frame.c b/src/frame.c index 1475eb68fb6..0c2d2225ca2 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -4377,10 +4377,11 @@ frame_make_pointer_invisible () | |||
| 4377 | { | 4377 | { |
| 4378 | if (! NILP (Vmake_pointer_invisible)) | 4378 | if (! NILP (Vmake_pointer_invisible)) |
| 4379 | { | 4379 | { |
| 4380 | struct frame *f; | ||
| 4380 | if (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame))) | 4381 | if (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame))) |
| 4381 | return; | 4382 | return; |
| 4382 | 4383 | ||
| 4383 | struct frame *f = SELECTED_FRAME (); | 4384 | f = SELECTED_FRAME (); |
| 4384 | if (f && !f->pointer_invisible | 4385 | if (f && !f->pointer_invisible |
| 4385 | && FRAME_TERMINAL (f)->toggle_invisible_pointer_hook) | 4386 | && FRAME_TERMINAL (f)->toggle_invisible_pointer_hook) |
| 4386 | { | 4387 | { |
| @@ -4396,11 +4397,12 @@ frame_make_pointer_visible () | |||
| 4396 | { | 4397 | { |
| 4397 | /* We don't check Vmake_pointer_invisible here in case the | 4398 | /* We don't check Vmake_pointer_invisible here in case the |
| 4398 | pointer was invisible when Vmake_pointer_invisible was set to nil. */ | 4399 | pointer was invisible when Vmake_pointer_invisible was set to nil. */ |
| 4400 | struct frame *f; | ||
| 4399 | 4401 | ||
| 4400 | if (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame))) | 4402 | if (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame))) |
| 4401 | return; | 4403 | return; |
| 4402 | 4404 | ||
| 4403 | struct frame *f = SELECTED_FRAME (); | 4405 | f = SELECTED_FRAME (); |
| 4404 | if (f && f->pointer_invisible && f->mouse_moved | 4406 | if (f && f->pointer_invisible && f->mouse_moved |
| 4405 | && FRAME_TERMINAL (f)->toggle_invisible_pointer_hook) | 4407 | && FRAME_TERMINAL (f)->toggle_invisible_pointer_hook) |
| 4406 | { | 4408 | { |