aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/ruby-mode.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e3589f888a9..99626641b08 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-03-13 Dmitry Gutov <dgutov@yandex.ru>
2
3 * progmodes/ruby-mode.el (ruby-font-lock-keywords): Fontify
4 multiple adjacent negation chars. (Bug#17004)
5
12014-03-13 Tom Willemse <tom@ryuslash.org> (tiny change) 62014-03-13 Tom Willemse <tom@ryuslash.org> (tiny change)
2 7
3 * emacs-lisp/package.el (package--prepare-dependencies): 8 * emacs-lisp/package.el (package--prepare-dependencies):
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index a5d8285c98e..fe9346047c6 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -2127,7 +2127,7 @@ See `font-lock-syntax-table'.")
2127 (ruby-match-expression-expansion 2127 (ruby-match-expression-expansion
2128 2 font-lock-variable-name-face t) 2128 2 font-lock-variable-name-face t)
2129 ;; Negation char. 2129 ;; Negation char.
2130 ("[^[:alnum:]_]\\(!\\)[^=]" 2130 ("\\(?:^\\|[^[:alnum:]_]\\)\\(!+\\)[^=]"
2131 1 font-lock-negation-char-face) 2131 1 font-lock-negation-char-face)
2132 ;; Character literals. 2132 ;; Character literals.
2133 ;; FIXME: Support longer escape sequences. 2133 ;; FIXME: Support longer escape sequences.