From: Dmitry Gutov Date: Fri, 12 Jul 2013 23:36:14 +0000 (+0400) Subject: * progmodes/ruby-mode.el (ruby-font-lock-keywords): Simplify the last X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1811 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=481861772a0ba3815d86c814275f0e3b9ff71d4c;p=emacs.git * progmodes/ruby-mode.el (ruby-font-lock-keywords): Simplify the last change. --- diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 041458233c9..06dffd80d88 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -1848,11 +1848,8 @@ See `font-lock-syntax-table'.") '("\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+" 0 font-lock-variable-name-face) ;; constants - '("\\(?:\\_<\\|::\\)\\([A-Z]+\\(\\w\\|_\\)*\\)\\(?:\\_>[^\(]\\|::\\|\\'\\)" - 1 (progn - (when (eq ?: (char-before)) - (forward-char -2)) - font-lock-type-face)) + '("\\(?:\\_<\\|::\\)\\([A-Z]+\\(\\w\\|_\\)*\\)" + 1 (unless (eq ?\( (char-after)) font-lock-type-face)) '("\\(^\\s *\\|[\[\{\(,]\\s *\\|\\sw\\s +\\)\\(\\(\\sw\\|_\\)+\\):[^:]" 2 font-lock-constant-face) ;; expression expansion '(ruby-match-expression-expansion