summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--emacs11
-rw-r--r--emacs.d/snippets/text-mode/cc-mode/c++-mode/#i.yasnippet4
-rw-r--r--emacs.d/snippets/text-mode/cc-mode/c++-mode/local-#i.yasnippet5
-rw-r--r--emacs.elcbin20352 -> 20553 bytes
4 files changed, 17 insertions, 3 deletions
diff --git a/emacs b/emacs
index ace9e3e..aab5c04 100644
--- a/emacs
+++ b/emacs
@@ -275,7 +275,7 @@
(require 'uniquify)
(setq uniquify-buffer-name-style 'reverse)
-; c-mode stuff
+; c/c++-mode stuff
(setq indent-tabs-mode t)
(setq tab-width 8)
(setq c-default-style "linux")
@@ -288,14 +288,15 @@
(setq comment-column 60)
(modify-syntax-entry ?_ "w") ; now '_' is not considered a word-delimiter
(c-set-style "linux") ; set indentation style
- ))
+ (define-key c-mode-base-map (kbd "M-o") 'eassist-switch-h-cpp)
+ (define-key c-mode-base-map (kbd "M-m") 'eassist-list-methods)))
(global-set-key [C-return] 'dabbrev-expand)
(define-key esc-map [C-return] 'dabbrev-completion)
(global-set-key [f12] 'indent-region)
-;; Enable Doxygen syntax highlighting for C and C++
+; Enable Doxygen syntax highlighting for C and C++
(require 'doxymacs)
(add-hook 'font-lock-mode-hook
'(lambda ()
@@ -474,3 +475,7 @@
;; windmove (only if available)
(when (fboundp 'windmove-default-keybindings) (windmove-default-keybindings))
+
+;; lisp
+; eassist
+(define-key lisp-mode-shared-map (kbd "M-m") 'eassist-list-methods)
diff --git a/emacs.d/snippets/text-mode/cc-mode/c++-mode/#i.yasnippet b/emacs.d/snippets/text-mode/cc-mode/c++-mode/#i.yasnippet
new file mode 100644
index 0000000..b150d38
--- /dev/null
+++ b/emacs.d/snippets/text-mode/cc-mode/c++-mode/#i.yasnippet
@@ -0,0 +1,4 @@
+# -*- mode: snippet -*-
+# name: #include <...>
+# --
+#include <$0> \ No newline at end of file
diff --git a/emacs.d/snippets/text-mode/cc-mode/c++-mode/local-#i.yasnippet b/emacs.d/snippets/text-mode/cc-mode/c++-mode/local-#i.yasnippet
new file mode 100644
index 0000000..ceb4b37
--- /dev/null
+++ b/emacs.d/snippets/text-mode/cc-mode/c++-mode/local-#i.yasnippet
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: #include "..."
+# key: #i
+# --
+#include "$0" \ No newline at end of file
diff --git a/emacs.elc b/emacs.elc
index a559dee..354aa75 100644
--- a/emacs.elc
+++ b/emacs.elc
Binary files differ