3 files changed, 3 insertions, 11 deletions

diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index c0484ed..437ebab 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -970,8 +970,9 @@ session.screen0.imageDither: <boolean>
       False
 
 session.screen0.opaqueMove: <boolean>
-      Sets the visibility level of application windows while being
-      dragged. Default: <boolean>
+      When moving a window, setting this to True will draw the window
+      contents as it moves (this is nasty on slow systems). If False, it
+      will only draw an outline of the window border. Default: False
 
 session.screen0.workspaces: <integer>
       Set this to the number of workspaces the users wants. Default: 4
@@ -1022,11 +1023,6 @@ session.ignoreBorder: <boolean>
 session.numLayers: <integer>
       This controls how many layers fluxbox should have. Default: 13
 
-session.opaqueMove: <boolean>
-      When moving a window, setting this to True will draw the window
-      contents as it moves (this is nasty on slow systems). If False, it
-      will only draw an outline of the window border. Default: False
-
 session.tabPadding: <integer>
       This specifies the spacing between tabs. Default: 0
 
diff --git a/src/Screen.cc b/src/Screen.cc
index 2a4ea9b..b676a8b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1764,9 +1764,6 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
               "Workspace Warping",
               "Workspace Warping - dragging windows to the edge and onto the next workspace",
               *resource.workspace_warping, saverc_cmd);
-    _BOOLITEM(menu, Configmenu, DesktopWheeling,
-              "Desktop MouseWheel Switching", "Workspace switching using mouse wheel",
-              *resource.desktop_wheeling, saverc_cmd);
     _BOOLITEM(menu, Configmenu, DecorateTransient,
               "Decorate Transient Windows", "Decorate Transient Windows",
               *resource.decorate_transient, saverc_cmd);
diff --git a/src/Window.cc b/src/Window.cc
index 0deecd2..36bd271 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -596,7 +596,6 @@ void FluxboxWindow::attachClient(WinClient &client, int x, int y) {
         // figure out which client to raise at the end
         if (FocusControl::focusedFbWindow() == old_win) {
             was_focused = true;
-            focused_win = FocusControl::focusedWindow();
         } else if (FocusControl::focusedFbWindow() != this) {
             FocusControl::FocusedWindows focus_list =
                     screen().focusControl().focusedOrderList();