[Emacs-diffs] trunk r115039: * lisp/progmodes/ruby-mode.el (ruby-smie--forward-token)

[Dmitry Gutov]

------------------------------------------------------------
revno: 115039
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Fri 2013-11-08 23:23:11 +0200
message:
  * lisp/progmodes/ruby-mode.el (ruby-smie--forward-token)
  (ruby-smie--backward-token): Only consider full-string matches.
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-11-08 17:26:03 +0000
+++ b/lisp/ChangeLog    2013-11-08 21:23:11 +0000
@@ -1,3 +1,8 @@
+2013-11-08  Dmitry Gutov  <address@hidden>
+
+       * progmodes/ruby-mode.el (ruby-smie--forward-token)
+       (ruby-smie--backward-token): Only consider full-string matches.
+
 2013-11-08  Jan Djärv  <address@hidden>
 
        * faces.el (describe-face): Add distant-foreground.

=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el       2013-11-08 16:01:55 +0000
+++ b/lisp/progmodes/ruby-mode.el       2013-11-08 21:23:11 +0000
@@ -438,7 +438,7 @@
            ((member tok '("unless" "if" "while" "until"))
             (if (save-excursion (forward-word -1) (ruby-smie--bosp))
                 tok "iuwu-mod"))
-           ((string-match "|[*&]?" tok)
+           ((string-match-p "\\`|[*&]?\\'" tok)
             (forward-char (- 1 (length tok)))
             (setq tok "|")
             (if (ruby-smie--opening-pipe-p) "opening-|" tok))
@@ -482,7 +482,7 @@
               tok "iuwu-mod"))
          ((equal tok "|")
           (if (ruby-smie--opening-pipe-p) "opening-|" tok))
-         ((string-match-p "|[*&]" tok)
+         ((string-match-p "\\`|[*&]\\'" tok)
           (forward-char 1)
           (substring tok 1))
          ((and (equal tok "") (eq ?\\ (char-before)) (looking-at "\n"))