[Emacs-diffs] /srv/bzr/emacs/trunk r102420: * src/xterm.c (get_current_wm_state): Rename from get_current_vm_state.

[Stefan Monnier]

------------------------------------------------------------
revno: 102420
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2010-11-17 10:12:02 -0500
message:
  * src/xterm.c (get_current_wm_state): Rename from get_current_vm_state.
  (do_ewmh_fullscreen, x_handle_net_wm_state): Update callers.
modified:
  src/ChangeLog
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-17 15:07:48 +0000
+++ b/src/ChangeLog     2010-11-17 15:12:02 +0000
@@ -1,3 +1,8 @@
+2010-11-17  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * coding.c (Fset_terminal_coding_system_internal): Fix previous

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2010-11-17 02:37:45 +0000
+++ b/src/xterm.c       2010-11-17 15:12:02 +0000
@@ -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)
     {