ruby-changes:16146
From: nobu <ko1@a...>
Date: Mon, 31 May 2010 18:22:45 +0900 (JST)
Subject: [ruby-changes:16146] Ruby:r28106 (trunk, ruby_1_9_2): * misc/ruby-mode.el (ruby-mode-set-encoding): skip shebang line
nobu 2010-05-31 18:22:25 +0900 (Mon, 31 May 2010) New Revision: 28106 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28106 Log: * misc/ruby-mode.el (ruby-mode-set-encoding): skip shebang line always regardless of ruby. Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/misc/ruby-mode.el trunk/ChangeLog trunk/misc/ruby-mode.el Index: ChangeLog =================================================================== --- ChangeLog (revision 28105) +++ ChangeLog (revision 28106) @@ -1,3 +1,8 @@ +Mon May 31 18:22:23 2010 Nobuyoshi Nakada <nobu@r...> + + * 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@r...> * file.c (file_expand_path): Refix r28102: this breaks Index: misc/ruby-mode.el =================================================================== --- misc/ruby-mode.el (revision 28105) +++ misc/ruby-mode.el (revision 28106) @@ -342,7 +342,7 @@ (cdr (assq coding-system ruby-encoding-map))) coding-system)) "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 *\\(;\\|-\*-\\)") (unless (string= (match-string 2) coding-system) (goto-char (match-beginning 2)) Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 28105) +++ ruby_1_9_2/ChangeLog (revision 28106) @@ -1,3 +1,8 @@ +Mon May 31 18:22:23 2010 Nobuyoshi Nakada <nobu@r...> + + * misc/ruby-mode.el (ruby-mode-set-encoding): skip shebang line + always regardless of ruby. + Mon May 31 04:03:43 2010 Nobuyoshi Nakada <nobu@r...> * file.c (file_expand_path): check if expanded dname encoding is Index: ruby_1_9_2/misc/ruby-mode.el =================================================================== --- ruby_1_9_2/misc/ruby-mode.el (revision 28105) +++ ruby_1_9_2/misc/ruby-mode.el (revision 28106) @@ -342,7 +342,7 @@ (cdr (assq coding-system ruby-encoding-map))) coding-system)) "ascii-8bit")) - (if (looking-at "^#![^\n]*ruby") (beginning-of-line 2)) + (if (looking-at "^#!") (beginning-of-line 2)) (cond ((looking-at "\\s *#.*-\*-\\s *\\(en\\)?coding\\s *:\\s *\\([-a-z0-9_]*\\)\\s *\\(;\\|-\*-\\)") (unless (string= (match-string 2) coding-system) (goto-char (match-beginning 2)) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/