added doxygen function comment and auto-insert snippets for c-mode

2 files changed, 33 insertions, 5 deletions

diff --git a/settings/setup-auto-insert-mode.el b/settings/setup-auto-insert-mode.el
new file mode 100644
index 0000000..81284db
--- /dev/null
+++ b/settings/setup-auto-insert-mode.el
@@ -0,0 +1,30 @@
+(require 'autoinsert)
+
+(defun custom/expand-yasnippet ()
+  "Replace with real stuff"
+  (yas-expand-snippet (buffer-string) (point-min) (point-max)))
+
+(custom-set-variables
+ '(auto-insert-directory (locate-user-emacs-file "auto-insert")))
+
+;; Activate globally
+(auto-insert-mode)
+(setq auto-insert-query nil)
+
+;; Some global auto-insert variables
+(setq user-full-name "Benj Bellon"
+      user-email "benjaminbellon@gmail.com")
+
+;; C
+(define-auto-insert "\\.c\\'"  ["template.c" custom/expand-yasnippet])
+(define-auto-insert "\\.h\\'"  ["template.h" custom/expand-yasnippet])
+
+;; C++
+(define-auto-insert "\\.cc\\'"  ["template.cc" custom/expand-yasnippet])
+(define-auto-insert "\\.hh\\'"  ["template.cc" custom/expand-yasnippet])
+
+;; Python
+(define-auto-insert "\\.py\\'"  ["template.py" custom/expand-yasnippet])
+
+
+(provide 'setup-auto-insert-mode)
diff --git a/settings/setup-yasnippet.el b/settings/setup-yasnippet.el
index 4145574..5441327 100644
--- a/settings/setup-yasnippet.el
+++ b/settings/setup-yasnippet.el
@@ -1,13 +1,11 @@
 (require 'yasnippet)
 
 (setq yas-snippet-dirs '("~/.emacs.d/snippets"))
-(yas-global-mode 1)
-
-(define-key yas-minor-mode-map [(tab)] nil)
-(define-key yas-minor-mode-map (kbd "TAB") nil)
 
+(yas-global-mode 1)
 ;; Jump to end of snippet definition
-(define-key yas-keymap (kbd "<return>") 'yas-exit-all-snippets)
+(define-key yas-keymap (kbd "<return>") 'yas-next-field)
+(define-key yas-keymap (kbd "C-x RET TAB") 'yas-exit-all-snippets)
 
 (add-hook 'term-mode-hook (lambda()
 			    (setq yas-dont-activate t)))