mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
matz
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@990 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
ef45458e94
commit
1ce6f065b5
16 changed files with 113 additions and 74 deletions
|
@ -442,7 +442,6 @@ The variable ruby-indent-level controls the amount of indentation.
|
|||
(cond
|
||||
((nth 0 state) ; within string
|
||||
(setq indent nil)) ; do nothing
|
||||
|
||||
((car (nth 1 state)) ; in paren
|
||||
(goto-char (cdr (nth 1 state)))
|
||||
(if (eq (car (nth 1 state)) ?\( )
|
||||
|
@ -463,8 +462,7 @@ The variable ruby-indent-level controls the amount of indentation.
|
|||
(goto-char parse-start)
|
||||
(back-to-indentation)
|
||||
(setq indent (ruby-indent-size (current-column) (nth 2 state)))))
|
||||
))
|
||||
|
||||
))
|
||||
((and (nth 2 state)(> (nth 2 state) 0)) ; in nest
|
||||
(if (null (cdr (nth 1 state)))
|
||||
(error "invalid nest"))
|
||||
|
@ -485,7 +483,7 @@ The variable ruby-indent-level controls the amount of indentation.
|
|||
|
||||
((and (nth 2 state) (< (nth 2 state) 0)) ; in negative nest
|
||||
(setq indent (ruby-indent-size (current-column) (nth 2 state)))))
|
||||
|
||||
|
||||
(cond
|
||||
(indent
|
||||
(goto-char indent-point)
|
||||
|
@ -514,7 +512,7 @@ The variable ruby-indent-level controls the amount of indentation.
|
|||
(setq end (point))
|
||||
(beginning-of-line)
|
||||
(if (re-search-forward "^\\s *#" end t)
|
||||
(beginning-of-line)
|
||||
(forward-line 1)
|
||||
(setq done t))))
|
||||
(setq bol (point))
|
||||
(end-of-line)
|
||||
|
@ -538,9 +536,10 @@ The variable ruby-indent-level controls the amount of indentation.
|
|||
(goto-char (match-end 0))
|
||||
(not (looking-at "[a-z_]"))))
|
||||
(and (looking-at ruby-operator-re)
|
||||
(not (eq (char-after (1- (point))) ??))
|
||||
(not (eq (char-after (1- (point))) ?$))
|
||||
(or (not (eq ?/ (char-after (point))))
|
||||
(null (nth 0 (ruby-parse-region parse-start (point)))))
|
||||
(not (eq (char-after (1- (point))) ?$))
|
||||
(or (not (eq ?| (char-after (point))))
|
||||
(save-excursion
|
||||
(or (eolp) (forward-char -1))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue