1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* misc/ruby-mode.el (ruby-mode-set-encoding): skip shebang line

always regardless of ruby.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-05-31 09:22:25 +00:00
parent 455554b64c
commit 97a1d656f8
2 changed files with 6 additions and 1 deletions

View file

@ -1,3 +1,8 @@
Mon May 31 18:22:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-mode.el (ruby-mode-set-encoding): skip shebang line
always regardless of ruby.
Mon May 31 15:07:18 2010 NARUSE, Yui <naruse@ruby-lang.org> Mon May 31 15:07:18 2010 NARUSE, Yui <naruse@ruby-lang.org>
* file.c (file_expand_path): Refix r28102: this breaks * file.c (file_expand_path): Refix r28102: this breaks

View file

@ -342,7 +342,7 @@ Also ignores spaces after parenthesis when 'space."
(cdr (assq coding-system ruby-encoding-map))) (cdr (assq coding-system ruby-encoding-map)))
coding-system)) coding-system))
"ascii-8bit")) "ascii-8bit"))
(if (looking-at "^#![^\n]*ruby") (beginning-of-line 2)) (unless (looking-at "^#![^\n]*ruby") (beginning-of-line 2))
(cond ((looking-at "\\s *#.*-\*-\\s *\\(en\\)?coding\\s *:\\s *\\([-a-z0-9_]*\\)\\s *\\(;\\|-\*-\\)") (cond ((looking-at "\\s *#.*-\*-\\s *\\(en\\)?coding\\s *:\\s *\\([-a-z0-9_]*\\)\\s *\\(;\\|-\*-\\)")
(unless (string= (match-string 2) coding-system) (unless (string= (match-string 2) coding-system)
(goto-char (match-beginning 2)) (goto-char (match-beginning 2))