8000 emacs.samples: Reliably override ".dir-locals.el". · postgres/postgres@81300ea · GitHub
[go: up one dir, main page]
Skip to content

Commit 81300ea

Browse files
nmischnmisch
committed
emacs.samples: Reliably override ".dir-locals.el".
Back-patch to 9.4, where .dir-locals.el was introduced.
1 parent 3f8c23c commit 81300ea

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

‎src/tools/editors/emacs.samples

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@
3030
(add-hook 'c-mode-hook
3131
(defun postgresql-c-mode-hook ()
3232
(when (string-match "/postgres\\(ql\\)?/" buffer-file-name)
33-
(c-set-style "postgresql"))))
33+
(c-set-style "postgresql")
34+
;; Don't override the style we just set with the style in
35+
;; `dir-locals-file'. Emacs 23.4.1 needs this; it is obsolete,
36+
;; albeit harmless, by Emacs 24.3.1.
37+
(set (make-local-variable 'ignored-local-variables)
38+
(append '(c-file-style) ignored-local-variables)))))
3439

3540

3641
;;; Perl files

0 commit comments

Comments
 (0)
0