[geany/geany] 60147a: Merge pull request #857 from techee/cpp_h

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Fri, 10 Jun 2016 21:30:02 UTC
Commit:      60147a8c8dafc453a244c5b2329a1dc93aac10f7
             https://github.com/geany/geany/commit/60147a8c8dafc453a244c5b2329a1dc93aac10f7

Log Message:
-----------
Merge pull request #857 from techee/cpp_h

Treat the "h" extension as a C++ file


Modified Paths:
--------------
    data/filetype_extensions.conf
    tests/ctags/bug639639.h.tags
    tests/ctags/extern_variable.h.tags

Modified: data/filetype_extensions.conf
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -10,7 +10,7 @@ Asciidoc=*.asciidoc;*.adoc;
 ASM=*.asm;*.asm51;*.a51;
 Batch=*.bat;*.cmd;*.nt;
 CAML=*.ml;*.mli;
-C=*.c;*.h;*.xpm;
+C=*.c;*.xpm;
 C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C;*.H;
 Clojure=*.clj;*.cljs;*.cljc;
 CUDA=*.cu;*.cuh;*.h;


Modified: tests/ctags/bug639639.h.tags
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -1,3 +1,5 @@
 # format=tagmanager
+Namespace1�256�0
 anon2�4�anon_enum_0�0
 anon_enum_0�2�0
+function2�1024�(char* str)�Namespace1�0�int


Modified: tests/ctags/extern_variable.h.tags
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,5 +1,5 @@
 # format=tagmanager
-C�16384�0�class
+C�32768�0
 S�32768�0
 a�32768�0�int
 b�32768�0�B



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).