branch: elpa/nginx-mode
commit 8a296e30b01adbc40d1aa9ccde369a972ac5ceab
Merge: 81766b7 bb5d84b
Author: Andrew J. Cosgriff <and...@cosgriff.name>
Commit: Andrew J. Cosgriff <and...@cosgriff.name>
Merge pull request #11 from chillum/master
fixed auto-mode-alist
---
README.md | 15 +++++++++++----
nginx-mode.el | 6 +++---
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index d38f7c9..e14d839 100644
--- a/README.md
+++ b/README.md
@@ -16,15 +16,22 @@ Licensed under the [GPL version
3](http://www.gnu.org/licenses/) or later.
This is a quick mode for editing Nginx config files, as I didn't find
anything else around that did quite this much.
-Many thanks to the authors of puppet-mode.el, from where I found a
+Many thanks to the authors of `puppet-mode.el`, from where I found a
useful indentation function that I've modified to suit this situation.
-Put this file into your load-path and the following into your ~/.emacs:
+Put this file into your `load-path` and the following into your `~/.emacs`:
```lisp
(require 'nginx-mode)
```
-The mode should automatically activate for files called `nginx.conf` and files
under `/etc/nginx` - if not, you can add something like this to your init file:
+The mode automatically activates for:
+
+1. Files, called `nginx.conf`
+2. Files ending in `.conf` under `nginx` directory
+
+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 '("/etc/nginx/sites-available/.*" . 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 8195a00..75d074d 100644
--- a/nginx-mode.el
+++ b/nginx-mode.el
@@ -185,9 +185,9 @@ 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))
(provide 'nginx-mode)
