better toggle of electric mode and update surgested

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala-tool-support/trunk/src/emacs@15794 5e8d7ff9-d8ef-0310-90f0-a4852d11357a

scala-electric.el

@@ -65,9 +65,10 @@ closing bracket or not."
 (defvar scala-electric-mode-map (make-sparse-keymap)
   "Keymap for scala electric minor mode.")
 
-(define-key scala-electric-mode-map "{" 'scala-electric-curlies)
-(define-key scala-electric-mode-map "(" 'scala-electric-matching-char)
-(define-key scala-electric-mode-map "[" 'scala-electric-matching-char)
+(define-key scala-electric-mode-map "{"  'scala-electric-curlies)
+(define-key scala-electric-mode-map "("  'scala-electric-matching-char)
+(define-key scala-electric-mode-map "["  'scala-electric-matching-char)
+(define-key scala-electric-mode-map "\"" 'scala-electric-matching-char)
 
 ;;;###autoload
 (or (assoc 'scala-electric-mode minor-mode-alist)
@@ -81,6 +82,9 @@ closing bracket or not."
 
 ;; Functions
 
+(defun scala-electric-active-p ()
+  scala-electric-mode)
+
 (defun scala-electric-code-at-point-p()
   (and scala-electric-mode
        (let* ((properties (text-properties-at (point))))

scala-mode.el

@@ -18,7 +18,7 @@
 (require 'regexp-opt)
 (require 'tempo)
 
-(defconst scala-mode-version "0.5_rc2 ($Revision$)")
+(defconst scala-mode-version "0.5_rc3 ($Revision$)")
 (defconst scala-bug-e-mail "scala@listes.epfl.ch")
 (defconst scala-web-url "http://scala-lang.org/")
 
@@ -1060,7 +1060,11 @@ When started, run `scala-mode-hook'.
     ["Evaluate buffer"             scala-eval-buffer (scala-interpreter-running-p)]
     "---"
     ("Options"
-     ["Toggle Scala Electric Mode"   scala-electric-mode] ;; TODO needs toggle button thing
+     ["Toggle Scala Electric Mode"   scala-electric-mode 
+      :style toggle
+      :help "Toggle on/off the electric insert mode for Scala"
+      :selected (scala-electric-active-p)
+      :active t] 
      )
     ["Browse Scala Web site..." scala-browse-web-site t]
     ["Customize..."             scala-customize t]