[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/nginx-mode bb5d84b 21/34: removed sites-enabled from defau
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/nginx-mode bb5d84b 21/34: removed sites-enabled from default (has issues with apache-mode autoloads) |
Date: |
Sun, 29 Aug 2021 11:24:15 -0400 (EDT) |
branch: elpa/nginx-mode
commit bb5d84bff0037a5b74f8d731e37426864b347ba4
Author: Vasily Korytov <vasily.korytov@rochsystems.com>
Commit: Vasily Korytov <vasily.korytov@rochsystems.com>
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(-)
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)
- [nongnu] elpa/nginx-mode 87ee3d1 07/34: add a version number to make marmalade-repo.org happy, (continued)
- [nongnu] elpa/nginx-mode 87ee3d1 07/34: add a version number to make marmalade-repo.org happy, ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode 72e1ea5 09/34: Remove font-lock-pseudo-keyword-face. I can't think of anything else to highlight semicolons with, and really, it doesn't matter that much anyway. Fixes #5., ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode ad2f140 08/34: fix commenting/uncommenting as per suggestion from @mbunkus - fixes #3., ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode 2cbac8a 15/34: Merge pull request #8 from yasuyk/auto-mode-alist, ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode dd61d1d 23/34: font-lock-operator-face is gone.\n\nFixes #14., ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode a04cef3 25/34: Update README.md, ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode f33abe7 26/34: Use syntax table instead of font-lock regexp, ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode c13fa62 27/34: Merge pull request #15 from zonuexe/feature/comment-syntax-table, ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode 95cb916 32/34: Add top-level Nginx configuration blocks to magic-fallback-mode-alist., ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode 304c9e2 24/34: one more ref to font-lock-operator-face., ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode bb5d84b 21/34: removed sites-enabled from default (has issues with apache-mode autoloads),
ELPA Syncer <=
- [nongnu] elpa/nginx-mode 99d5eea 02/34: mention where you can find it, ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode 0600403 03/34: syntax highlighting improvements, of a sort., ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode 06fe730 10/34: add some auto-mode-alist magic. Fixes #6., ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode 82098c5 19/34: auto-mode-alist now works :-), ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode 8a296e3 22/34: Merge pull request #11 from chillum/master, ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode 47aaf2c 29/34: Remove `run-hook`, it is run automatically., ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode c37ae5f 30/34: Merge pull request #16 from Fuco1/patch-1, ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode 9fc6ef2 01/34: initial checkin of working code, ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode 79e1c5b 04/34: hrm. maybe highlighting parens and curly braces wasn't such a good idea (my eyes!), ELPA Syncer, 2021/08/29
- [nongnu] elpa/nginx-mode 88da7a7 12/34: Set auto-mode-alist at top-level and Add autoload cookie, ELPA Syncer, 2021/08/29