rails.el (auto-mode-alist): added Rakefile to auto-mode-alist

rails-ui.el (rails-minor-mode-test-current-method-key): created
rails-*-test-minor-mode (rails-unit-test-minor-mode rails-functional-test-minor-mode): 
	changed hotkey "C-c ." to "C-c C-c ,", the old conflicted with ECB
rails-ruby.el (flymake-ruby-load): apply flymake-mode only if
	buffer-file-name matched flymake-allowed-file-name-masks


git-svn-id: svn+ssh://rubyforge.org/var/svn/emacs-rails/trunk@166 cc5033d0-740f-0410-afc7-949910e492f2

ChangeLog

@@ -1,3 +1,15 @@
+2007-04-05  Dmitry Galinsky  <dima.exe@gmail.com>
+
+	* rails.el (auto-mode-alist): added Rakefile to auto-mode-alist
+
+	* rails-ui.el (rails-minor-mode-test-current-method-key): created
+
+	* rails-*-test-minor-mode (rails-unit-test-minor-mode rails-functional-test-minor-mode): 
+	changed hotkey "C-c ." to "C-c C-c ,", the old conflicted with ECB
+
+	* rails-ruby.el (flymake-ruby-load): apply flymake-mode only if
+	buffer-file-name matched flymake-allowed-file-name-masks
+
 2007-04-04  Dmitry Galinsky  <dima.exe@gmail.com>
 
 	* rails-ruby.el (flymake-ruby-load): updated

History

@@ -1,4 +1,6 @@
 SVN
+* Fixed #9880: the hotkey "C-c ." conflicted with ECB, changed to "C-c C-c ,"
+
 * New hotkeys, to easy switch without a popup menu between a
   controller or a model related files
   In model layout:

rails-functional-test-minor-mode.el

@@ -30,7 +30,7 @@
   "Minor mode for RubyOnRails functional tests."
   :lighter " FTest"
   :keymap (let ((map (rails-controller-layout:keymap :functional-test)))
-            (define-key map (kbd "\C-c .") 'rails-test:run-current-method)
+            (define-key map rails-minor-mode-test-current-method-key 'rails-test:run-current-method)
             (define-key map [menu-bar rails-controller-layout run] '("Test current method" . rails-test:run-current-method))
             map)
   (setq rails-primary-switch-func 'rails-controller-layout:switch-to-controller)

rails-ruby.el

@@ -82,8 +82,10 @@ See the variable `align-rules-list' for more details.")
                        "\\|"
                        (mapcar 'car flymake-allowed-ruby-file-name-masks)))
               (buffer-file-name)))
-    (setq flymake-allowed-file-name-masks (append flymake-allowed-file-name-masks flymake-allowed-ruby-file-name-masks))
-    (setq flymake-err-line-patterns (cons flymake-ruby-error-line-pattern-regexp flymake-err-line-patterns))
+    (setq flymake-allowed-file-name-masks
+          (append flymake-allowed-file-name-masks flymake-allowed-ruby-file-name-masks))
+    (setq flymake-err-line-patterns
+          (cons flymake-ruby-error-line-pattern-regexp flymake-err-line-patterns))
     (flymake-mode t)
     (local-set-key (kbd "\C-c d") 'flymake-display-err-menu-for-current-line)))
 

rails-ui.el

@@ -194,6 +194,8 @@
   ([rails ws default] '(menu-item "Start/Stop Web Server (With Default Environment)" rails-ws:toggle-start-stop))
   )
 
+(defconst rails-minor-mode-test-current-method-key (kbd "\C-c \C-c ,"))
+
 (defvar rails-minor-mode-map (make-sparse-keymap))
 
 (define-keys rails-minor-mode-map

rails-unit-test-minor-mode.el

@@ -30,7 +30,7 @@
   "Minor mode for RubyOnRails unit tests."
   :lighter " UTest"
   :keymap (let ((map (rails-model-layout:keymap :unit-test)))
-            (define-key map (kbd "\C-c .") 'rails-test:run-current-method)
+            (define-key map rails-minor-mode-test-current-method-key 'rails-test:run-current-method)
             (define-key map [menu-bar rails-model-layout run] '("Test current method" . rails-test:run-current-method))
             map)
   (setq rails-primary-switch-func (lambda()

rails.el

@@ -428,19 +428,20 @@ necessary."
             (if (rails-project:root)
                 (rails-minor-mode t))))
 
-;; helpers
 
 (autoload 'haml-mode "haml-mode" "" t)
 
-(setq auto-mode-alist  (cons '("\\.rb$"    . ruby-mode) auto-mode-alist))
-(setq auto-mode-alist  (cons '("\\.rake$"  . ruby-mode) auto-mode-alist))
-(setq auto-mode-alist  (cons '("\\.haml$"  . haml-mode) auto-mode-alist))
-(setq auto-mode-alist  (cons '("\\.rjs$"   . ruby-mode) auto-mode-alist))
-(setq auto-mode-alist  (cons '("\\.rxml$"  . ruby-mode) auto-mode-alist))
-(setq auto-mode-alist  (cons '("\\.rhtml$" . html-mode) auto-mode-alist))
-
-(modify-coding-system-alist 'file "\\.rb$" 'utf-8)
-(modify-coding-system-alist 'file "\\.rake$" 'utf-8)
+(setq auto-mode-alist  (cons '("\\.rb$"     . ruby-mode) auto-mode-alist))
+(setq auto-mode-alist  (cons '("\\.rake$"   . ruby-mode) auto-mode-alist))
+(setq auto-mode-alist  (cons '("Rakefile$"  . ruby-mode) auto-mode-alist))
+(setq auto-mode-alist  (cons '("\\.haml$"   . haml-mode) auto-mode-alist))
+(setq auto-mode-alist  (cons '("\\.rjs$"    . ruby-mode) auto-mode-alist))
+(setq auto-mode-alist  (cons '("\\.rxml$"   . ruby-mode) auto-mode-alist))
+(setq auto-mode-alist  (cons '("\\.rhtml$"  . html-mode) auto-mode-alist))
+
+(modify-coding-system-alist 'file "\\.rb$"     'utf-8)
+(modify-coding-system-alist 'file "\\.rake$"   'utf-8)
+(modify-coding-system-alist 'file "Rakefile$" 'utf-8)
 (modify-coding-system-alist 'file (rails-core:regex-for-match-view) 'utf-8)
 
 (provide 'rails)