Merge branch 'master' into merge-job

[deliverable/binutils-gdb.git] / gdb / .dir-locals.el

diff --git a/gdb/.dir-locals.el b/gdb/.dir-locals.el
index 7e2b0cc3134e0ce764013369e67be73c423bc984..17df7e327fe34ef4867ceaefb8c21901687cc09a 100644 (file)
--- a/gdb/.dir-locals.el
+++ b/gdb/.dir-locals.el
@@ -1,5 +1,5 @@
 ;; Emacs settings.
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc.
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -27,5 +27,11 @@
            (eval . (c-set-offset 'innamespace 0))
            ))
  (c++-mode . ((eval . (when (fboundp 'c-toggle-comment-style)
-                       (c-toggle-comment-style 1)))))
+                       (c-toggle-comment-style 1)))
+             (indent-tabs-mode . t)
+             (tab-width . 8)
+             (c-file-style . "GNU")
+             (c-basic-offset . 2)
+             (eval . (c-set-offset 'innamespace 0))
+             ))
 )