dot/ercrc.el: Turn off `erc-scrolltobottom-mode'.

[profile] / el / dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index ae50248..a5b7300 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1674,6 +1674,24 @@ doesn't match any of the regular expressions in
           (list (concat "\\<\\(" go-intrinsics "\\)\\>")
                 '(0 font-lock-variable-name-face))
 
+          ;; Strings and characters.
+          (list (concat "'"
+                        "\\(" "[^\\']" "\\|"
+                              "\\\\"
+                              "\\(" "[abfnrtv\\'\"]" "\\|"
+                                    "[0-7]\\{3\\}" "\\|"
+                                    "x" "[0-9A-Fa-f]\\{2\\}" "\\|"
+                                    "u" "[0-9A-Fa-f]\\{4\\}" "\\|"
+                                    "U" "[0-9A-Fa-f]\\{8\\}" "\\)" "\\)"
+                        "'"
+                        "\\|"
+                        "\""
+                        "\\(" "[^\n\\\"]+" "\\|" "\\\\." "\\)*"
+                        "\\(\"\\|$\\)"
+                        "\\|"
+                        "`" "[^`]+" "`")
+                '(0 font-lock-string-face))
+
           ;; Handle numbers too.
           ;;
           ;; The following isn't quite right, but it's close enough.
@@ -2074,11 +2092,11 @@ strip numbers instead."
                          "t" "f")))
     (setq font-lock-keywords
          (list (list (concat "\\<\\(" dylan-keywords
-                             "\\|" (concat "with\\(out\\)?-" word)
-                             "\\|" (concat word ":")
+                             "\\|" "with\\(out\\)?-" word
                              "\\)\\>")
                      '(0 font-lock-keyword-face))
-               (list (concat "#\\(" sharp-keywords "\\)\\>")
+               (list (concat "\\<" word ":" "\\|"
+                             "#\\(" sharp-keywords "\\)\\>")
                      '(0 font-lock-variable-name-face))
                (list (concat "\\("
                              "\\([-+]\\|\\<\\)[0-9]+" "\\("