[Emacs-diffs] emacs-24 r116816: Fix bug#17050

[Dmitry Gutov]

------------------------------------------------------------
revno: 116816
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17050
committer: Dmitry Gutov <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-03-21 06:26:39 +0200
message:
  Fix bug#17050
  
  * lisp/progmodes/ruby-mode.el (ruby-smie-rules):
  Add indentation rule for ` @ '.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/ruby-mode.el    
rubymode.el-20091113204419-o5vbwnq5f7feedwu-8804
  test/indent/ruby.rb            ruby.rb-20120424165921-h044139hbrd7snvw-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-21 01:12:57 +0000
+++ b/lisp/ChangeLog    2014-03-21 04:26:39 +0000
@@ -1,3 +1,8 @@
+2014-03-21  Dmitry Gutov  <address@hidden>
+
+       * progmodes/ruby-mode.el (ruby-smie-rules):
+       Add indentation rule for ` @ '.  (Bug#17050)
+
 2014-03-21  Juanma Barranquero  <address@hidden>
 
        * align.el (align-regexp): Remove superfluous backslash.

=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el       2014-03-13 13:37:27 +0000
+++ b/lisp/progmodes/ruby-mode.el       2014-03-21 04:26:39 +0000
@@ -650,6 +650,10 @@
        ;; because we want to reject hanging tokens at bol, too.
        (unless (or (eolp) (forward-comment 1))
          (cons 'column (current-column)))))
+    (`(:before . " @ ")
+     (save-excursion
+       (skip-chars-forward " \t")
+       (cons 'column (current-column))))
     (`(:before . "do") (ruby-smie--indent-to-stmt))
     (`(:before . ".")
      (if (smie-rule-sibling-p)

=== modified file 'test/indent/ruby.rb'
--- a/test/indent/ruby.rb       2014-03-01 22:04:59 +0000
+++ b/test/indent/ruby.rb       2014-03-21 04:26:39 +0000
@@ -379,3 +379,20 @@
    'd' => %w(e f)
  }
 }
+
+# Bug#17050
+
+return render json: {
+                errors: { base: [message] },
+                copying: copying
+              },
+              status: 400
+
+top test(
+      some,
+      top,
+      test)
+
+foo bar, {
+      tee: qux
+    }