diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xterm.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b1535b3f659..240155181c4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-11-17 Stefan Monnier <monnier@iro.umontreal.ca> + + * xterm.c (get_current_wm_state): Rename from get_current_vm_state. + (do_ewmh_fullscreen, x_handle_net_wm_state): Update callers. + 2010-11-17 Kenichi Handa <handa@m17n.org> * coding.c (Fset_terminal_coding_system_internal): Fix previous diff --git a/src/xterm.c b/src/xterm.c index eaa19523970..ed3e5dcae45 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8403,7 +8403,7 @@ x_set_sticky (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) STICKY is set to 1 if the sticky state is set, 0 if not. */ static void -get_current_vm_state (struct frame *f, +get_current_wm_state (struct frame *f, Window window, int *size_state, int *sticky) @@ -8474,7 +8474,7 @@ do_ewmh_fullscreen (struct frame *f) Lisp_Object lval = get_frame_param (f, Qfullscreen); int cur, dummy; - get_current_vm_state (f, FRAME_OUTER_WINDOW (f), &cur, &dummy); + get_current_wm_state (f, FRAME_OUTER_WINDOW (f), &cur, &dummy); /* Some window managers don't say they support _NET_WM_STATE, but they do say they support _NET_WM_STATE_FULLSCREEN. Try that also. */ @@ -8556,7 +8556,7 @@ x_handle_net_wm_state (struct frame *f, XPropertyEvent *event) Lisp_Object lval; int sticky = 0; - get_current_vm_state (f, event->window, &value, &sticky); + get_current_wm_state (f, event->window, &value, &sticky); lval = Qnil; switch (value) { |