bug#18753: [PATCH] .rbw and .pyw support, more Ruby files recognized

[Vasily Korytov <vasily.korytov@yahoo.com>]

[-- Attachment #1: Type: text/plain, Size: 234 bytes --]

Hello,

I would like to propose two patches for Emacs (I have the papers signed):

1. w.patch: this makes Emacs recognize .rbw and .pyw files.

2. ruby.patch: this adds Procfile and Berksfile to the list of ruby-mode
files.

Thanks.


[-- Attachment #2: w.patch --]
[-- Type: application/octet-stream, Size: 1116 bytes --]

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index b230992..acd22eb 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -256,7 +256,7 @@
 (autoload 'comint-mode "comint")
 
 ;;;###autoload
-(add-to-list 'auto-mode-alist (cons (purecopy "\\.py\\'")  'python-mode))
+(add-to-list 'auto-mode-alist (cons (purecopy "\\.pyw?\\'")  'python-mode))
 ;;;###autoload
 (add-to-list 'interpreter-mode-alist (cons (purecopy "python[0-9.]*") 'python-mode))
 
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 2f23e33..1553bbc 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -2205,7 +2205,7 @@ See `font-lock-syntax-table'.")
 ;;;###autoload
 (add-to-list 'auto-mode-alist
              (cons (purecopy (concat "\\(?:\\."
-                                     "rb\\|ru\\|rake\\|thor"
+                                     "rbw?\\|ru\\|rake\\|thor"
                                      "\\|jbuilder\\|gemspec\\|podspec"
                                      "\\|/"
                                      "\\(?:Gem\\|Rake\\|Cap\\|Thor"

[-- Attachment #3: ruby.patch --]
[-- Type: application/octet-stream, Size: 779 bytes --]

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 2f23e33..6c9ab92 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -2208,8 +2208,8 @@ See `font-lock-syntax-table'.")
                                      "rb\\|ru\\|rake\\|thor"
                                      "\\|jbuilder\\|gemspec\\|podspec"
                                      "\\|/"
-                                     "\\(?:Gem\\|Rake\\|Cap\\|Thor"
-                                     "\\|Vagrant\\|Guard\\|Pod\\)file"
+                                     "\\(?:Gem\\|Rake\\|Cap\\|Thor\\|Proc"
+                                     "\\|Vagrant\\|Guard\\|Pod\\|Berks\\)file"
                                      "\\)\\'")) 'ruby-mode))
 
 ;;;###autoload