nobu	2008-01-29 00:10:02 +0900 (Tue, 29 Jan 2008)

  New Revision: 15297

  Modified files:
    trunk/ChangeLog
    trunk/misc/ruby-mode.el
    trunk/version.h

  Log:
    * misc/ruby-mode.el (ruby-mode-set-encoding): updates magic comment.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/misc/ruby-mode.el?r1=15297&r2=15296&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=15297&r2=15296&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15297&r2=15296&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15296)
+++ ChangeLog	(revision 15297)
@@ -1,3 +1,7 @@
+Tue Jan 29 00:10:00 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* misc/ruby-mode.el (ruby-mode-set-encoding): updates magic comment.
+
 Mon Jan 28 23:47:52 2008  NARUSE, Yui  <naruse@r...>
 
 	* parse.y (rb_id2str, ripper_initialize, Init_ripper):
Index: misc/ruby-mode.el
===================================================================
--- misc/ruby-mode.el	(revision 15296)
+++ misc/ruby-mode.el	(revision 15297)
@@ -234,21 +234,34 @@
   (make-local-variable 'paragraph-ignore-fill-prefix)
   (setq paragraph-ignore-fill-prefix t))
 
+(eval-when-compile
+  (unless (fboundp 'coding-system-to-mime-charset)
+    (defun coding-system-to-mime-charset (coding-system)
+      (coding-system-change-eol-conversion coding-system nil))))
+
 (defun ruby-mode-set-encoding ()
   (save-excursion
     (widen)
     (goto-char (point-min))
     (when (re-search-forward "[^\0-\177]" nil t)
       (goto-char (point-min))
-      (if (looking-at "^#![^\n]*ruby") (beginning-of-line 2))
-      (unless (looking-at "\s*#\.*coding\s*[:=]")
-	(insert "# -*- coding: "
-		(let ((coding-system (coding-system-to-mime-charset (or coding-system-for-write
-									buffer-file-coding-system))))
-		  (if coding-system
-		      (symbol-name coding-system)
-		    "ascii-8bit"))
-		" -*-\n")))))
+      (let ((coding-system
+	     (coding-system-to-mime-charset
+	      (or coding-system-for-write
+		  buffer-file-coding-system))))
+	(setq coding-system
+	      (if coding-system
+		  (symbol-name coding-system)
+		"ascii-8bit"))
+	(if (looking-at "^#![^\n]*ruby") (beginning-of-line 2))
+	(cond ((looking-at "\\s *#.*-\*-\\s *\\(en\\)?coding\\s *:\\s *\\([-a-z0-9_]+\\)")
+	       (unless (string= (match-string 2) coding-system)
+		 (goto-char (match-beginning 2))
+		 (delete-region (point) (match-end 2))
+		 (insert coding-system)))
+	      ((looking-at "\\s *#.*coding\\s *[:=]"))
+	      (t (insert "# -*- coding: " coding-system " -*-\n"))
+	      )))))
 
 ;;;###autoload
 (defun ruby-mode ()
Index: version.h
===================================================================
--- version.h	(revision 15296)
+++ version.h	(revision 15297)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-01-28"
+#define RUBY_RELEASE_DATE "2008-01-29"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080128
+#define RUBY_RELEASE_CODE 20080129
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_DAY 29
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/