nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-08-03 20:49:01 +02:00
parent 2d155efa07 d0f1d8aa71
commit 4c3a8957ee
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/userguide
View File

@ -437,7 +437,7 @@ for_window [criteria] command
*Examples*: *Examples*:
------------------------------------------------ ------------------------------------------------
# enable floating mode for all XTerm windows # enable floating mode for all XTerm windows
for_window [class="XTerm"] mode floating for_window [class="XTerm"] floating enable
# Make all urxvts use a 1-pixel border: # Make all urxvts use a 1-pixel border:
for_window [class="urxvt"] border 1pixel for_window [class="urxvt"] border 1pixel
@ -445,7 +445,7 @@ for_window [class="urxvt"] border 1pixel
# A less useful, but rather funny example: # A less useful, but rather funny example:
# makes the window floating as soon as I change # makes the window floating as soon as I change
# directory to ~/work # directory to ~/work
for_window [title="x200: ~/work"] mode floating for_window [title="x200: ~/work"] floating enable
------------------------------------------------ ------------------------------------------------
=== Variables === Variables

2
src/cfgparse.y
View File

@ -991,7 +991,7 @@ assign:
/* Compatibility with older versions: If the assignment target starts /* Compatibility with older versions: If the assignment target starts
* with ~, we create the equivalent of: * with ~, we create the equivalent of:
* *
* for_window [class="foo"] mode floating * for_window [class="foo"] floating enable
*/ */
if (*workspace == '~') { if (*workspace == '~') {
workspace++; workspace++;