summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Crotti <andrea.crotti.0@gmail.com>2016-09-17 13:37:44 +0100
committerGitHub <noreply@github.com>2016-09-17 13:37:44 +0100
commit11dec0b63d5d76f26a690adc6f6ab98e52b63b6a (patch)
tree2e533a559e238999252f109c1575b636f5327921
parentcf589efb27fef753482af82476675fae8d5761d3 (diff)
parent73e8ddcd03ca1ea73fc02baa4943343df845d6ef (diff)
Merge pull request #159 from ennokde/master
Fixing overloaded keys in cc/c++-mode
-rw-r--r--c++-mode/member_function (renamed from c++-mode/function)6
-rw-r--r--cc-mode/inc2
-rw-r--r--cc-mode/inc.12
3 files changed, 5 insertions, 5 deletions
diff --git a/c++-mode/function b/c++-mode/member_function
index c947c34..8b5ee6a 100644
--- a/c++-mode/function
+++ b/c++-mode/member_function
@@ -1,8 +1,8 @@
# -*- mode: snippet -*-
-# name: function
-# key: f
+# name: member_function
+# key: mf
# --
${1:type} ${2:Class}::${3:name}(${4:args})${5: const}
{
$0
-} \ No newline at end of file
+}
diff --git a/cc-mode/inc b/cc-mode/inc
index 96beaa7..7760491 100644
--- a/cc-mode/inc
+++ b/cc-mode/inc
@@ -1,5 +1,5 @@
# -*- mode: snippet -*-
# name : #include <...>
-# key : inc
+# key : incs
# --
#include <$1> \ No newline at end of file
diff --git a/cc-mode/inc.1 b/cc-mode/inc.1
index 64a8653..95567f2 100644
--- a/cc-mode/inc.1
+++ b/cc-mode/inc.1
@@ -1,5 +1,5 @@
# -*- mode: snippet -*-
# name : #include "..."
-# key : inc
+# key : incl
# --
#include "$1" \ No newline at end of file