--- a/EditTextView.st	Wed Jan 17 14:09:45 2018 +0100
+++ b/EditTextView.st	Thu Jan 18 17:02:07 2018 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
               All Rights Reserved
@@ -1650,7 +1648,7 @@
      If there is an acceptAction, it is called."
 
     acceptEnabled == false ifTrue:[
-        self beep.
+        self beepInEditor.
         ^ self
     ].
     (disableIfInvisible == true and:[self reallyRealized not]) ifTrue:[
@@ -1774,7 +1772,7 @@
     |e commentPair opening closing|
 
     (self checkModificationsAllowed) ifFalse:[ ^ self].
-    commentStrings isNil ifTrue:[ self beep. ^ self].
+    commentStrings isNil ifTrue:[ self beepInEditor. ^ self].
 
     self
         undoableDo:[ 
@@ -1869,7 +1867,7 @@
     |e commentPair opening closing sz1 sz2 l1 l2 c1 c2|
 
     (self checkModificationsAllowed) ifFalse:[ ^ self].
-    commentStrings isNil ifTrue:[ self beep. ^ self].
+    commentStrings isNil ifTrue:[ self beepInEditor. ^ self].
 
     self
         undoableDo:[
@@ -1972,7 +1970,7 @@
         wasOn := self hideCursor.
         self setValidatedCursorLine:(list size + 1) col:cursorCol.
         self makeCursorVisibleAndShowCursor:wasOn.
-        self beep.
+        self beepInEditor.
     ].
 
     "Modified: / 10.6.1998 / 17:00:23 / cg"
@@ -2007,7 +2005,7 @@
             wasOn := self hideCursor.
             self setValidatedCursorLine:nL col:(self listAt:nL) size + 1.
             self makeCursorVisibleAndShowCursor:wasOn.
-            self beep.
+            self beepInEditor.
             ^ self.
         ]
     ].
@@ -2789,7 +2787,7 @@
         self insertString:Character quote asString atLine:line1 col:col1.
         self selectFromLine:line1 col:col1 toLine:line2 col:col2+2.
     ] ifFalse:[
-        self beep.
+        self beepInEditor.
     ]
 
     "Created: / 06-06-2016 / 11:03:36 / cg"
@@ -5971,7 +5969,7 @@
                          ]
                     ]
             ifNotFound:[self showNotFound]
-            onError:[self beep]
+            onError:[self beepInEditor]
         ].
       ]
     ].
@@ -7866,9 +7864,7 @@
 beep
     "output an audible beep or bell on my screen device"
 
-    UserPreferences current beepInEditor ifTrue:[
-        super beep
-    ]
+    super beepInEditor
 !
 
 checkModificationsAllowed
@@ -8315,7 +8311,7 @@
         searchForMatchingParenthesisFromLine:cursorLine col:cursorCol
         ifFound:[:line :col | self cursorLine:line col:col]
         ifNotFound:[self showNotFound]
-        onError:[self beep]
+        onError:[self beepInEditor]
 
     "Modified: / 09-10-1997 / 12:56:30 / cg"
     "Modified (comment): / 13-02-2017 / 20:10:54 / cg"
@@ -8858,7 +8854,7 @@
     "undo the last undo"
 
     undoSupport hasRedoAction ifFalse:[
-        self beep
+        self beepInEditor
     ] ifTrue:[
         undoSupport redo.
     ]
@@ -8868,7 +8864,7 @@
     "undo the last edit operation"
 
     undoSupport hasUndoAction ifFalse:[
-        self beep
+        self beepInEditor
     ] ifTrue:[
         undoSupport undo.
         self makeSelectionVisible.