* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Remove extra

"autoload".  Remove "warn lower camel case" section, previously
commented out.  Highlight negation char.  Do not highlight the
target in singleton method definitions.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c113aeac11b647e76d8e583c81c7d7695d30c3dc..03b4e4e6519bdad90a0bde741b7a8334d8aa652c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-09  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/ruby-mode.el (ruby-font-lock-keywords): Remove extra
+       "autoload".  Remove "warn lower camel case" section, previously
+       commented out.  Highlight negation char.  Do not highlight the
+       target in singleton method definitions.
+
 2013-07-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * faces.el (tty-setup-hook): Declare the hook.

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 5f92d197a666e332030f6e0e8105acc52ffe2d11..b873606286a25b3649b71e4c1bd136ef93c3b4c8 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1721,7 +1721,7 @@ See `font-lock-syntax-table'.")
 (defconst ruby-font-lock-keywords
   (list
    ;; functions
-   '("^\\s *def\\s +\\([^( \t\n]+\\)"
+   '("^\\s *def\\s +\\(?:[^( \t\n.]*\\.\\)?\\([^( \t\n]+\\)"
      1 font-lock-function-name-face)
    (list (concat
           "\\(^\\|[^.@$]\\|\\.\\.\\)\\("
@@ -1809,7 +1809,6 @@ See `font-lock-syntax-table'.")
              "warn"
              ;; keyword-like private methods on Module
              "alias_method"
-             "autoload"
              "attr"
              "attr_accessor"
              "attr_reader"
@@ -1855,9 +1854,9 @@ See `font-lock-syntax-table'.")
    ;; expression expansion
    '(ruby-match-expression-expansion
      2 font-lock-variable-name-face t)
-   ;; warn lower camel case
-                                        ;'("\\<[a-z]+[a-z0-9]*[A-Z][A-Za-z0-9]*\\([!?]?\\|\\>\\)"
-                                        ;  0 font-lock-warning-face)
+   ;; negation char
+   '("[^[:alnum:]_]\\(!\\)[^=]"
+     1 font-lock-negation-char-face)
    )
   "Additional expressions to highlight in Ruby mode.")