Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Antoine Tremblay <antoine.tremblay@ericsson.com>
To: <dje@google.com>, <gdb-patches@sourceware.org>
Cc: Antoine Tremblay <antoine.tremblay@ericsson.com>
Subject: [PATCH v3] Set emacs default mode for the GDB directory to C++
Date: Mon, 19 Dec 2016 12:24:00 -0000	[thread overview]
Message-ID: <20161219122356.26816-1-antoine.tremblay@ericsson.com> (raw)
In-Reply-To: <CADPb22SQ9vdJV4h4yV1fCkqTAW=ej1jzp-Oc6+wcqkNyKZvKXg@mail.gmail.com>

* In this v3:
The namespace indent should be 0 (no indent) rather then [0] (indent to column 0)
fixed that.
OK with that change ?


Since GDB has switched to C++ but the file names are still .c emacs does
not load the proper mode when opening files in the gdb directory.

This patch fixes that by enabling c++ mode.

This patch also fixes indentation tweaks as discussed in this thread:
https://sourceware.org/ml/gdb-patches/2016-12/msg00074.html

Indent with gdb-code-style.el included and the .dir-locals.el is as such:

namespace TestNameSpace {

class test
{
public:
  test test() {}

  int m_a;
};

struct teststruct
{
  int a;
}
}

gdb/ChangeLog:

	* .dir-locals.el: Set c++ mode for the directory and set indent
	properly.
	* gdb-code-style.el: Set c-set-offset 'innamespace as a safe value
	to be used in .dir-locals.el.
---
 gdb/.dir-locals.el    | 7 ++++++-
 gdb/gdb-code-style.el | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/gdb/.dir-locals.el b/gdb/.dir-locals.el
index fbd9309aef..c32846a137 100644
--- a/gdb/.dir-locals.el
+++ b/gdb/.dir-locals.el
@@ -20,5 +20,10 @@
 	      (indent-tabs-mode . t)))
  (nil . ((bug-reference-url-format . "http://sourceware.org/bugzilla/show_bug.cgi?id=%s")))
  (c-mode . ((c-file-style . "GNU")
-	    (indent-tabs-mode . t)))
+	    (mode . c++)
+	    (indent-tabs-mode . t)
+	    (tab-width . 8)
+	    (c-basic-offset . 2)
+	    (eval . (c-set-offset 'innamespace 0))
+	    ))
 )
diff --git a/gdb/gdb-code-style.el b/gdb/gdb-code-style.el
index 6099c1d4b8..9221dd048c 100644
--- a/gdb/gdb-code-style.el
+++ b/gdb/gdb-code-style.el
@@ -74,4 +74,9 @@
   )
 (add-hook 'c-mode-common-hook 'gdb-comment-hook)
 
+;; Set c-set-offset 'innamespace as a safe value to be used in .dir-locals.el.
+(setq safe-local-variable-values
+      (cons safe-local-variable-values
+	    '((eval c-set-offset 'innamespace 0)
+	      (c-offsets-alist (innamespace .0)))))
 ;;; gdb-code-style.el ends here
-- 
2.11.0


  reply	other threads:[~2016-12-19 12:24 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-16 19:29 [PATCH] " Antoine Tremblay
2016-12-16 19:41 ` [PATCH v2] " Antoine Tremblay
2016-12-16 22:25   ` Doug Evans via gdb-patches
2016-12-19 12:24     ` Antoine Tremblay [this message]
2016-12-20 13:04       ` [PATCH v3] " Pedro Alves
2016-12-20 13:46         ` Antoine Tremblay

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161219122356.26816-1-antoine.tremblay@ericsson.com \
    --to=antoine.tremblay@ericsson.com \
    --cc=dje@google.com \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox