From 81300ea4443766aad2631fad8d02d09dd66954a2 Mon Sep 17 00:00:00 2001
From: Noah Misch <noah@leadboat.com>
Date: Fri, 13 Jun 2014 19:57:18 -0400
Subject: [PATCH] emacs.samples: Reliably override ".dir-locals.el".
Back-patch to 9.4, where .dir-locals.el was introduced.
---
src/tools/editors/emacs.samples | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
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
--
GitLab