From 82098c569cfc1362238a2d1e5322886ba765766a Mon Sep 17 00:00:00 2001
From: Vasily Korytov
Date: Tue, 14 Oct 2014 21:56:56 +0300
Subject: auto-mode-alist now works :-)

---
 nginx-mode.el | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'nginx-mode.el')

diff --git a/nginx-mode.el b/nginx-mode.el
index 8195a00..0f7cf8c 100644
--- a/nginx-mode.el
+++ b/nginx-mode.el
@@ -185,9 +185,11 @@ The variable nginx-indent-level controls the amount of indentation.
   (run-hooks 'nginx-mode-hook))
 
 ;;;###autoload
-(add-to-list 'auto-mode-alist
-             '("nginx\.conf$"  . nginx-mode)
-             '("/etc/nginx/.*" . nginx-mode))
+(add-to-list 'auto-mode-alist '("nginx\\.conf\\'"  . nginx-mode))
+;;;###autoload
+(add-to-list 'auto-mode-alist '("/nginx/.*\\.conf\\'" . nginx-mode))
+;;;###autoload
+(add-to-list 'auto-mode-alist '("/nginx/sites-\\(?:available\\|enabled\\)/" . nginx-mode))
 
 (provide 'nginx-mode)
 
-- 
cgit v1.2.3-54-g00ecf


From bb5d84bff0037a5b74f8d731e37426864b347ba4 Mon Sep 17 00:00:00 2001
From: Vasily Korytov
Date: Tue, 14 Oct 2014 22:39:34 +0300
Subject: removed sites-enabled from default (has issues with apache-mode
 autoloads)

---
 README.md     | 10 ++++------
 nginx-mode.el |  4 +---
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'nginx-mode.el')

diff --git a/README.md b/README.md
index ee68dc9..e14d839 100644
--- a/README.md
+++ b/README.md
@@ -24,16 +24,14 @@ Put this file into your `load-path` and the following into your `~/.emacs`:
   (require 'nginx-mode)
 ```
 
-The mode should automatically activate for files:
+The mode automatically activates for:
 
-1. Called `nginx.conf`
+1. Files, called `nginx.conf`
 2. Files ending in `.conf` under `nginx` directory
-3. All files in `nginx/sites-available` and `nginx/sites-enabled`
 
-If this does not work (e.g. shadowed by other packages autoload entries), this also goes to `~/.emacs`:
+If you want `sites-enabled` dir, add this to `~/.emacs` (not done by
+default, because can be shadowed by `apache-mode`):
 
 ```lisp
-(add-to-list 'auto-mode-alist '("nginx\\.conf\\'"  . nginx-mode))
-(add-to-list 'auto-mode-alist '("/nginx/.*\\.conf\\'" . nginx-mode))
 (add-to-list 'auto-mode-alist '("/nginx/sites-\\(?:available\\|enabled\\)/" . nginx-mode))
 ```
diff --git a/nginx-mode.el b/nginx-mode.el
index 0f7cf8c..75d074d 100644
--- a/nginx-mode.el
+++ b/nginx-mode.el
@@ -187,9 +187,7 @@ The variable nginx-indent-level controls the amount of indentation.
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("nginx\\.conf\\'"  . nginx-mode))
 ;;;###autoload
-(add-to-list 'auto-mode-alist '("/nginx/.*\\.conf\\'" . nginx-mode))
-;;;###autoload
-(add-to-list 'auto-mode-alist '("/nginx/sites-\\(?:available\\|enabled\\)/" . nginx-mode))
+(add-to-list 'auto-mode-alist '("/nginx/.+\\.conf\\'" . nginx-mode))
 
 (provide 'nginx-mode)
 
-- 
cgit v1.2.3-54-g00ecf