[sawfish/sawfish-1.7.0] Minor bugfix. `focus-ignore-pointer-events' was customizable, but not now. (cherry-pick from HEAD)

[Christopher Bratusek <chrisb src gnome org>]

commit a2ecd33d26b754fe490da8ad0ec8a40d39083fd7
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Fri Dec 10 11:57:44 2010 +0100

    Minor bugfix. `focus-ignore-pointer-events' was customizable, but not now.
    (cherry-pick from HEAD)
    
    This variable is used internally, and introduced in commit 1c544853.
    Sometime it was turned to a defcustom, but it confuses users. So now a plain defvar.
    
    Conflicts:
    
    	man/news.texi

 OPTIONS                        |    3 ---
 lisp/sawfish/wm/focus.jl       |    8 ++++----
 lisp/sawfish/wm/util/compat.jl |    2 +-
 man/news.texi                  |    2 --
 man/sawfish.texi               |    5 -----
 5 files changed, 5 insertions(+), 15 deletions(-)
---
diff --git a/OPTIONS b/OPTIONS
index 72d5160..4a4995f 100644
--- a/OPTIONS
+++ b/OPTIONS
@@ -72,9 +72,6 @@
 ;;    "When true, focusing a window doesn't change it's position in the
 ;;stack of most-recently focused windows.")
 
-;;  (defvar-setq focus-ignore-pointer-events nil
-;;    "When true, pointer in/out events don't cause focus changes.")
-
 ;;  (defvar-setq focus-windows-when-mapped t
 ;;    "Focus application windows when they first appear.")
 
diff --git a/lisp/sawfish/wm/focus.jl b/lisp/sawfish/wm/focus.jl
index 55449fd..62d7ad2 100644
--- a/lisp/sawfish/wm/focus.jl
+++ b/lisp/sawfish/wm/focus.jl
@@ -61,10 +61,10 @@
     :type boolean
     :group focus)
 
-  (defcustom focus-ignore-pointer-events nil
-    "When true, pointer in/out events don't cause focus changes."
-    :type boolean
-    :group focus)
+
+  ;; Only used by x-cycle.jl
+  (defvar focus-ignore-pointer-events nil
+    "When true, pointer in/out events don't cause focus changes.")
 
   (define focus-within-click-event (make-fluid nil)
           "When true, the current command is being called from within
diff --git a/lisp/sawfish/wm/util/compat.jl b/lisp/sawfish/wm/util/compat.jl
index 282244b..f176b6e 100644
--- a/lisp/sawfish/wm/util/compat.jl
+++ b/lisp/sawfish/wm/util/compat.jl
@@ -100,7 +100,7 @@
           warp-to-window-y-offset uniquify-name-format
           transients-get-focus decorate-transients
           raise-windows-on-uniconify uniconify-to-current-workspace
-          iconify-ignored
+          iconify-ignored focus-ignore-pointer-events
           focus-windows-on-uniconify transients-are-group-members
           raise-selected-windows warp-to-selected-windows
           menus-include-shortcuts configure-auto-gravity
diff --git a/man/news.texi b/man/news.texi
index 0074843..05edf10 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -12,8 +12,6 @@ they occurred between. For more detailed information see the
 @heading 1.7.0.1 "Night Power"
 
 @itemize @bullet
-
- item Bug Fixes
 @itemize @minus
 
 @item Poweroff-menu fix [Teika Kazura, Christopher Bratusek]
diff --git a/man/sawfish.texi b/man/sawfish.texi
index 1cf627d..fb4590e 100644
--- a/man/sawfish.texi
+++ b/man/sawfish.texi
@@ -1243,11 +1243,6 @@ This option may be set on a per-window basis by setting the
 @code{window-put} function).
 @end defvar
 
- defvar focus-ignore-pointer-events
-When true, pointer in/out events don't cause focus changes.  This is
-independent of the current focus mode.
- end defvar
-
 @defvar focus-within-click-event
 When true, the current command is being called from within a
 click-to-focus button press event.