--- a/UserPreferences.st	Wed Oct 12 07:05:13 2016 +0200
+++ b/UserPreferences.st	Tue Oct 25 12:31:42 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1998 by eXept Software AG
 	      All Rights Reserved
@@ -872,8 +874,6 @@
     ^ modified ? false
 ! !
 
-
-
 !UserPreferences methodsFor:'accessing-locale'!
 
 dateInputFormat
@@ -1131,7 +1131,9 @@
 !
 
 soapLoggingLevel
-    ^ self at:#soapLoggingLevel ifAbsent:nil
+    ^ self at:#soapLoggingLevel ifAbsent:[0]
+
+    "Modified: / 16-10-2016 / 23:55:34 / cg"
 !
 
 soapLoggingLevel:anIntegerBetween0_and_3
@@ -2768,6 +2770,34 @@
     "
 !
 
+showMarqueeInfo
+    "If set, show multiline infos in the info area as a scrolling marquee text"
+
+    ^ self at:#showMarqueeInfo ifAbsent:[true].
+
+    "
+     UserPreferences current showMarqueeInfo
+     UserPreferences current showMarqueeInfo:true
+     UserPreferences current showMarqueeInfo:false
+    "
+
+    "Created: / 04-04-2012 / 14:02:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+showMarqueeInfo:aBoolean
+    "If set, show multiline infos in the info area as a scrolling marquee text"
+
+    self at:#showMarqueeInfo put:aBoolean.
+
+    "
+     UserPreferences current showMarqueeInfo
+     UserPreferences current showMarqueeInfo:true
+     UserPreferences current showMarqueeInfo:false
+    "
+
+    "Created: / 04-04-2012 / 14:02:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 syntaxColoring
     "return the flag which controls syntax coloring (in the browsers)"
 
@@ -4679,9 +4709,13 @@
 st80EditMode
     "editing as in st80 (do not allow cursor beyond endOfLine/endOftext)."
 
-    ^ self at:#st80EditMode ifAbsent:false
-
-    "
+    ^ self at:#st80EditMode ifAbsent:[false]
+
+    "
+     UserPreferences current st80EditMode
+     UserPreferences current st80EditMode:true
+     UserPreferences current st80EditMode
+     UserPreferences current st80EditMode:false
      UserPreferences current st80EditMode
     "
 !
@@ -4693,6 +4727,7 @@
 
     "
      UserPreferences current st80EditMode:true
+     UserPreferences current st80EditMode:false
     "
 !
 
@@ -4700,7 +4735,7 @@
     "select mode, when double clicking as in st80
      (select to corresponding lparen/double-quote) ?"
 
-    ^ self at:#st80SelectMode ifAbsent:false
+    ^ self at:#st80SelectMode ifAbsent:[false]
 
     "
      UserPreferences current st80SelectMode
@@ -4723,6 +4758,34 @@
     "Created: / 03-07-2006 / 16:25:27 / cg"
 !
 
+trimBlankLines
+    "if true, blank lines are trimmed to zero size in the editor"
+
+    ^ self at:#trimBlankLines ifAbsent:[true]
+
+    "
+     UserPreferences current trimBlankLines
+     UserPreferences current trimBlankLines:true
+     UserPreferences current trimBlankLines
+     UserPreferences current trimBlankLines:false
+     UserPreferences current trimBlankLines
+    "
+!
+
+trimBlankLines:aBoolean
+    "if true, blank lines are trimmed to zero size in the editor"
+
+    self at:#trimBlankLines put:aBoolean
+
+    "
+     UserPreferences current trimBlankLines
+     UserPreferences current trimBlankLines:true
+     UserPreferences current trimBlankLines
+     UserPreferences current trimBlankLines:false
+     UserPreferences current trimBlankLines
+    "
+!
+
 whitespaceWordSelectMode
     "when double clicking, treat ANY non-whitespace as word-characters ?
      (default is off)"
@@ -4818,6 +4881,12 @@
 !
 
 workspaceDirectory
+    "this is the folder where snapshot images, the change file and any stc-compiled
+     object files are stored.
+     The idea is to keep that stuff together, so we can move it as a bunch.
+     These used to be in the bin-folder of st/x, but that would not work with readonly/shared
+     st/x installations."
+     
     ^ self at:#workspaceDirectory ifAbsent:[self class defaultWorkspaceDirectory]
 !