aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-06-17 15:16:17 +0000
committerChong Yidong2009-06-17 15:16:17 +0000
commit11473529433b4b17529e6ef29f4299f41a4f6fed (patch)
tree9a7e8075475e8fc7dbfded6669dd2908441764e0
parentb933010836821683b785324ae102a6aa02affdf8 (diff)
downloademacs-11473529433b4b17529e6ef29f4299f41a4f6fed.tar.gz
emacs-11473529433b4b17529e6ef29f4299f41a4f6fed.zip
* progmodes/ruby-mode.el (ruby-parse-partial, ruby-font-lock-keywords): Support overloadable negative operators (Bug#3587).
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/ruby-mode.el4
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c5dd0e621c7..3519690d562 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12009-06-17 Akinori MUSHA <knu@iDaemons.org> (tiny change)
2
3 * progmodes/ruby-mode.el (ruby-parse-partial)
4 (ruby-font-lock-keywords): Support overloadable negative
5 operators (Bug#3587).
6
12009-06-17 Tiago Saboga <tiagosaboga@gmail.com> (tiny change) 72009-06-17 Tiago Saboga <tiagosaboga@gmail.com> (tiny change)
2 8
3 * files.el (save-some-buffers-action-alist): Fix last 9 * files.el (save-some-buffers-action-alist): Fix last
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index d9718e6252f..4807d64f053 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -613,7 +613,7 @@ and `\\' when preceded by `?'."
613 ((looking-at ":\\(['\"]\\)") 613 ((looking-at ":\\(['\"]\\)")
614 (goto-char (match-beginning 1)) 614 (goto-char (match-beginning 1))
615 (ruby-forward-string (buffer-substring (match-beginning 1) (match-end 1)) end)) 615 (ruby-forward-string (buffer-substring (match-beginning 1) (match-end 1)) end))
616 ((looking-at ":\\([-,.+*/%&|^~<>]=?\\|===?\\|<=>\\)") 616 ((looking-at ":\\([-,.+*/%&|^~<>]=?\\|===?\\|<=>\\|![~=]?\\)")
617 (goto-char (match-end 0))) 617 (goto-char (match-end 0)))
618 ((looking-at ":\\([a-zA-Z_][a-zA-Z_0-9]*[!?=]?\\)?") 618 ((looking-at ":\\([a-zA-Z_][a-zA-Z_0-9]*[!?=]?\\)?")
619 (goto-char (match-end 0))) 619 (goto-char (match-end 0)))
@@ -1362,7 +1362,7 @@ See `font-lock-syntax-table'.")
1362 '("\\(^\\|[^_]\\)\\b\\([A-Z]+\\(\\w\\|_\\)*\\)" 1362 '("\\(^\\|[^_]\\)\\b\\([A-Z]+\\(\\w\\|_\\)*\\)"
1363 2 font-lock-type-face) 1363 2 font-lock-type-face)
1364 ;; symbols 1364 ;; symbols
1365 '("\\(^\\|[^:]\\)\\(:\\([-+~]@?\\|[/%&|^`]\\|\\*\\*?\\|<\\(<\\|=>?\\)?\\|>[>=]?\\|===?\\|=~\\|\\[\\]=?\\|\\(\\w\\|_\\)+\\([!?=]\\|\\b_*\\)\\|#{[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\)\\)" 1365 '("\\(^\\|[^:]\\)\\(:\\([-+~]@?\\|[/%&|^`]\\|\\*\\*?\\|<\\(<\\|=>?\\)?\\|>[>=]?\\|===?\\|=~\\|![~=]?\\|\\[\\]=?\\|\\(\\w\\|_\\)+\\([!?=]\\|\\b_*\\)\\|#{[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\)\\)"
1366 2 font-lock-reference-face) 1366 2 font-lock-reference-face)
1367 ;; expression expansion 1367 ;; expression expansion
1368 '("#\\({[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\|\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+\\)" 1368 '("#\\({[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\|\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+\\)"