[sawfish] Renamed popup-window-menu to popup-window-ops-menu.

[Christopher Bratusek <chrisb src gnome org>]

commit 17edaf1e94271479f9c26d59eda908918e22cdae
Author: Teika kazura <teika lavabit com>
Date:   Sat Nov 6 14:54:13 2010 +0900

    Renamed popup-window-menu to popup-window-ops-menu.

 lisp/sawfish/wm/autoload.jl    |    2 +-
 lisp/sawfish/wm/keymaps.jl     |    8 ++++----
 lisp/sawfish/wm/menus.jl       |    6 +++---
 lisp/sawfish/wm/util/compat.jl |    8 ++++++++
 man/news.texi                  |    8 ++++++++
 5 files changed, 24 insertions(+), 8 deletions(-)
---
diff --git a/lisp/sawfish/wm/autoload.jl b/lisp/sawfish/wm/autoload.jl
index 17122ad..88f5bf3 100644
--- a/lisp/sawfish/wm/autoload.jl
+++ b/lisp/sawfish/wm/autoload.jl
@@ -27,7 +27,7 @@
 
 ;;; ::autoload-start::
 (autoload-command 'customize 'sawfish.wm.customize)
-(autoload-command 'popup-window-menu 'sawfish.wm.menus)
+(autoload-command 'popup-window-ops-menu 'sawfish.wm.menus)
 (autoload-command 'popup-root-menu 'sawfish.wm.menus)
 (autoload-command 'popup-apps-menu 'sawfish.wm.menus)
 (autoload-command 'popup-window-list-menu 'sawfish.wm.menus)
diff --git a/lisp/sawfish/wm/keymaps.jl b/lisp/sawfish/wm/keymaps.jl
index 32552ee..40583ed 100644
--- a/lisp/sawfish/wm/keymaps.jl
+++ b/lisp/sawfish/wm/keymaps.jl
@@ -97,7 +97,7 @@
 			     "W-Up" 'raise-window
 			     "W-Down" 'lower-window
 			     "W-Button3-Click1" 'raise-lower-window
-			     "W-Button2-Click1" 'popup-window-menu
+			     "W-Button2-Click1" 'popup-window-ops-menu
 			     "W-Button1-Move" 'move-window-interactively
 			     "Button1-Click1" 'raise-and-pass-through-click
 			     "W-ISO_Left_Tab" 'tab-raise-left-window
@@ -136,7 +136,7 @@ a window. (Only mouse-bindings are evaluated in this map.)"
     :type keymap)
 
   (defcustom close-button-keymap (bind-keys (make-keymap)
-				   "Button3-Click1" 'popup-window-menu
+				   "Button3-Click1" 'popup-window-ops-menu
 				   "S-Button1-Off" 'delete-group
 				   "Button1-Off" 'delete-window)
     "Keymap containing bindings active when the pointer is in the close button
@@ -145,7 +145,7 @@ of a window. (Only mouse-bindings are evaluated in this map.)"
     :type keymap)
 
   (defcustom iconify-button-keymap (bind-keys (make-keymap)
-				     "Button3-Click1" 'popup-window-menu
+				     "Button3-Click1" 'popup-window-ops-menu
 				     "Button1-Off" 'iconify-window)
     "Keymap containing bindings active when the pointer is in the iconify
 button of a window. (Only mouse-bindings are evaluated in this map.)"
@@ -163,7 +163,7 @@ button of a window. (Only mouse-bindings are evaluated in this map.)"
 
   (defcustom menu-button-keymap (bind-keys (make-keymap)
 				  "Button3-Off" 'delete-window
-				  "Button1-Click1" 'popup-window-menu)
+				  "Button1-Click1" 'popup-window-ops-menu)
     "Keymap containing bindings active when the pointer is in the menu button
 of a window. (Only mouse-bindings are evaluated in this map.)"
     :group bindings
diff --git a/lisp/sawfish/wm/menus.jl b/lisp/sawfish/wm/menus.jl
index 6166e5b..fc4b5b4 100644
--- a/lisp/sawfish/wm/menus.jl
+++ b/lisp/sawfish/wm/menus.jl
@@ -23,7 +23,7 @@
     (export menu-start-process
 	    menu-stop-process
 	    popup-menu
-	    popup-window-menu
+	    popup-window-ops-menu
 	    popup-window-list-menu
 	    popup-root-menu
 	    popup-apps-menu
@@ -364,7 +364,7 @@ before killing it.")
            (setq menu-active nil)
            (apply signal error-data))))))
 
-  (define (popup-window-menu w)
+  (define (popup-window-ops-menu w)
     "Display the menu listing all window operations."
     (let-fluids ((menu-args (list w)))
        (popup-menu window-ops-menu)))
@@ -382,7 +382,7 @@ before killing it.")
     (popup-menu apps-menu))
 
   ;;###autoload
-  (define-command 'popup-window-menu popup-window-menu #:spec "%W")
+  (define-command 'popup-window-ops-menu popup-window-ops-menu #:spec "%W")
   (define-command 'popup-root-menu popup-root-menu)
   (define-command 'popup-apps-menu popup-apps-menu)
   (define-command 'popup-window-list-menu popup-window-list-menu)
diff --git a/lisp/sawfish/wm/util/compat.jl b/lisp/sawfish/wm/util/compat.jl
index 282244b..639a17e 100644
--- a/lisp/sawfish/wm/util/compat.jl
+++ b/lisp/sawfish/wm/util/compat.jl
@@ -32,6 +32,7 @@
 	    maybe-lower-window)
 
     (open rep
+	  sawfish.wm.menus
 	  sawfish.wm.misc
 	  sawfish.wm.custom
 	  sawfish.wm.commands
@@ -61,6 +62,7 @@
   (define maybe-raise-window raise-window*)
   (define maybe-lower-window lower-window*)
 
+  (define popup-window-menu popup-window-ops-menu)
 ;;; obsolete commands
 
   (define (define-commands index)
@@ -83,8 +85,14 @@
     (define-commands i))
 
   (define-command 'insert-workspace (command-ref 'insert-workspace-after)
+    #:doc "Obsolete. Renamed to insert-workspace-after."
     #:class 'deprecated)
 
+  (define-command 'popup-window-menu (command-ref 'popup-window-ops-menu)
+    #:doc "Obsolete. Renamed to popup-window-ops-menu."
+    #:class 'deprecated
+    #:spec "%W")
+
 ;;; obsolete options
 
   ;; 1. If these options are set in ~/.sawfish/custom, then they are
diff --git a/man/news.texi b/man/news.texi
index 5e646f4..0601554 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -41,6 +41,14 @@ access git repository.)
 
 @itemize @bullet
 
+ item Notice
+ itemize @minus
+ item Renamed function @code{popup-window-menu} to @code{popup-window-ops-menu} [Teika kazura]
+
+Both the function and the command are renamed. The old name is still supported,
+but it's recommended to update your configuration.
+ end itemize
+
 @item Bug fixes
 @itemize @minus