[Emacs-diffs] trunk r113333: * lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Remove extra

[Dmitry Gutov]

------------------------------------------------------------
revno: 113333
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-07-09 05:17:48 +0400
message:
  * 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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/ruby-mode.el    
rubymode.el-20091113204419-o5vbwnq5f7feedwu-8804

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-07-08 22:26:37 +0000
+++ b/lisp/ChangeLog    2013-07-09 01:17:48 +0000
@@ -1,3 +1,10 @@
+2013-07-09  Dmitry Gutov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * faces.el (tty-setup-hook): Declare the hook.

=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el       2013-07-03 15:46:45 +0000
+++ b/lisp/progmodes/ruby-mode.el       2013-07-09 01:17:48 +0000
@@ -1721,7 +1721,7 @@
 (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
           "\\(^\\|address@hidden|\\.\\.\\)\\("
@@ -1809,7 +1809,6 @@
              "warn"
              ;; keyword-like private methods on Module
              "alias_method"
-             "autoload"
              "attr"
              "attr_accessor"
              "attr_reader"
@@ -1855,9 +1854,9 @@
    ;; 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.")