Merge git://git.draconx.com/fvwmconf

Conflicts:

	scripts/C/Makefile

diff --combined config
index b652a53012518910ca3838faa182820ef5524621,2dc1e51063e601ce685440208d29251dd86415c7..b256285d5d72a6acfd4dc537d61368a48454604d
--- 1/config
--- 2/config
+++ b/config
@@@ -4,25 -4,25 +4,29 @@@ ImagePath $[FVWM_USERDIR]/icons:$[FVWM_
  DestroyFunc InitFunction
  DestroyFunc StartFunction
  DestroyFunc ExitFunction
 -SetEnv TERMINAL /home/nick/bin/urxvt.sh
 +SetEnv TERMINAL $[HOME]/bin/urxvt.sh
  PipeRead 'echo SetEnv HOST `hostname`'
  
 +SetEnv XMODIFIERS '@im=uim'
 +SetEnv GTK_IM_MODULE 'uim'
 +SetEnv QT_IM_MODULE 'uim'
 +
  # Global Features
  Read global/multiscreen
  Read global/fullscreen
  Read global/windowmenu
+ Read global/appspecific
  
  # Machine-specific features
- Read $[HOST]/config
+ PipeRead "[ -f '$[FVWM_USERDIR]/$[HOST]/config' ] \
+           && echo Read $[HOST]/config \
+         || echo Read default/config"
  
  # Virtual Desktops
  DesktopSize 6x1
  EdgeThickness 1
- EdgeResistance 1 0
+ EdgeResistance 1
+ Style * EdgeMoveDelay 1, EdgeMoveResistance 0
  EdgeScroll 0 0
  
  #####