diff options
| author | Noah Misch | 2014-06-13 23:57:18 +0000 |
|---|---|---|
| committer | Noah Misch | 2014-06-13 23:58:58 +0000 |
| commit | c221a0e22768ed7b5aa67184944a50ca735de8dc (patch) | |
| tree | 3e49cd036462d90d6575c6bd22925d1b63cbfc8c | |
| parent | c3c1401ca23a6a990989da777c78f7c8a19ca282 (diff) | |
emacs.samples: Reliably override ".dir-locals.el".
Back-patch to 9.4, where .dir-locals.el was introduced.
| -rw-r--r-- | src/tools/editors/emacs.samples | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/tools/editors/emacs.samples b/src/tools/editors/emacs.samples index e469d5525eb..a510afd051b 100644 --- a/src/tools/editors/emacs.samples +++ b/src/tools/editors/emacs.samples @@ -30,7 +30,12 @@ (add-hook 'c-mode-hook (defun postgresql-c-mode-hook () (when (string-match "/postgres\\(ql\\)?/" buffer-file-name) - (c-set-style "postgresql")))) + (c-set-style "postgresql") + ;; Don't override the style we just set with the style in + ;; `dir-locals-file'. Emacs 23.4.1 needs this; it is obsolete, + ;; albeit harmless, by Emacs 24.3.1. + (set (make-local-variable 'ignored-local-variables) + (append '(c-file-style) ignored-local-variables))))) ;;; Perl files |