Mercurial > emacs
changeset 111582:24619421a8dd
* src/xterm.c (get_current_wm_state): Rename from get_current_vm_state.
(do_ewmh_fullscreen, x_handle_net_wm_state): Update callers.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 17 Nov 2010 10:12:02 -0500 |
| parents | facc4bc3e1e4 |
| children | b59fc34f97fb |
| files | src/ChangeLog src/xterm.c |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Nov 17 10:07:48 2010 -0500 +++ b/src/ChangeLog Wed Nov 17 10:12:02 2010 -0500 @@ -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
--- a/src/xterm.c Wed Nov 17 10:07:48 2010 -0500 +++ b/src/xterm.c Wed Nov 17 10:12:02 2010 -0500 @@ -8403,7 +8403,7 @@ 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 @@ 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 @@ 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) {