From 08c5c139bd0e6bbca01870bce66dd4eaddca747e Mon Sep 17 00:00:00 2001 From: Luke Hoersten Date: Wed, 19 Nov 2014 18:45:01 -0600 Subject: Moved lisp files to their own dir. --- .hgignore | 3 +++ c-init.el | 49 ------------------------------------------------ hoersten-c-style.el | 36 ----------------------------------- init.el | 2 +- lisp/c-init.el | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ lisp/hoersten-c-style.el | 36 +++++++++++++++++++++++++++++++++++ lisp/move-line.el | 27 ++++++++++++++++++++++++++ move-line.el | 27 -------------------------- 8 files changed, 116 insertions(+), 113 deletions(-) delete mode 100644 c-init.el delete mode 100644 hoersten-c-style.el create mode 100644 lisp/c-init.el create mode 100644 lisp/hoersten-c-style.el create mode 100644 lisp/move-line.el delete mode 100644 move-line.el diff --git a/.hgignore b/.hgignore index 708625c..0c970e5 100644 --- a/.hgignore +++ b/.hgignore @@ -1,8 +1,11 @@ syntax: regexp ^url\/ ^elpa\/ +^eshell\/ \.elc$ \.mc-lists\.el$ +\.DS_Store$ +session\..*$ ac-comphist\.dat$ ~$ \#.*\#$ diff --git a/c-init.el b/c-init.el deleted file mode 100644 index 8bcb172..0000000 --- a/c-init.el +++ /dev/null @@ -1,49 +0,0 @@ -;; ~/.emacs.d/c-hook.el -;; Luke Hoersten - -(require 'hoersten-c-style) - -(add-hook - 'c-mode-common-hook - (lambda () - ;; indentation - (setq - tab-width 3 - c-basic-offset 3 - indent-tabs-mode t - standard-indent 3 - whitespace-line-column 120) - - (setq - compile-command "scons " - c-hungry-delete-key t) - - (c-toggle-auto-newline t) ; auto newline - (c-subword-mode t) - - ;; custom keys - (local-set-key (kbd "C-c f") 'ff-find-other-file) ; toggle header/source file - - ;; ;; code folding - ;; (local-set-key (kbd "C-c v") 'hs-toggle-hiding) - ;; (local-set-key (kbd "") 'hs-hide-all) - ;; (local-set-key (kbd "") 'hs-show-all) - ;; (hs-minor-mode t) ; enable hide-show mode - - ;; gdb settings - (setq - gdb-many-windows t ; gdb many windows - gdb-use-separate-io-buffer t ; gdb stdio output - gud-tooltip-mode t) ; mouse hover variables - (local-set-key (kbd "C-c g") 'gdb) ; gdb - - ;; auto-close bracing - (setq parens-require-spaces nil) - (dolist (key '("(" "[")) (define-key (current-local-map) key 'insert-pair)) - )) - -(add-to-list 'auto-mode-alist '("\\.ipp$" . c++-mode)) -(add-to-list 'auto-mode-alist '("\\.inl$" . c++-mode)) - -(message "Loading c-init...done") -(provide 'c-init) diff --git a/hoersten-c-style.el b/hoersten-c-style.el deleted file mode 100644 index 043a499..0000000 --- a/hoersten-c-style.el +++ /dev/null @@ -1,36 +0,0 @@ -;; ~/.emacs.d/hoersten-c-style.el -;; Luke Hoersten - -;; hoersten c++-style -(c-add-style - "hoersten" - '(;; indentation - (indent-tabs-mode . t) - (tab-width . 3) - (c-basic-offset . 3) - - ;; brace cleanups - (c-cleanup-list - brace-else-brace - brace-elseif-brace - brace-catch-brace - empty-defun-braces - defun-close-semi - list-close-comma - scope-operator) - - ;; syntactic symbols - (c-offsets-alist - (substatement-open . 0) - (inline-open . 0) - (case-label . +) - (innamespace . 0) - (arglist-cont-nonempty . +) - (cpp-macro . -)))) - -;; c-like language settings (c, c++, java, etc.) -;;(require 'doxymacs) -(setq-default c-default-style "hoersten") ; load c-style - -(message "Loading hoersten-c-style...done") -(provide 'hoersten-c-style) diff --git a/init.el b/init.el index e799223..aa76f08 100644 --- a/init.el +++ b/init.el @@ -2,7 +2,7 @@ ;; Luke Hoersten ;;;; General ;;;; -(add-to-list 'load-path "~/.emacs.d") ; set default emacs load path +(add-to-list 'load-path "~/.emacs.d/lisp") ; set default emacs load path (setq-default ediff-split-window-function diff --git a/lisp/c-init.el b/lisp/c-init.el new file mode 100644 index 0000000..8bcb172 --- /dev/null +++ b/lisp/c-init.el @@ -0,0 +1,49 @@ +;; ~/.emacs.d/c-hook.el +;; Luke Hoersten + +(require 'hoersten-c-style) + +(add-hook + 'c-mode-common-hook + (lambda () + ;; indentation + (setq + tab-width 3 + c-basic-offset 3 + indent-tabs-mode t + standard-indent 3 + whitespace-line-column 120) + + (setq + compile-command "scons " + c-hungry-delete-key t) + + (c-toggle-auto-newline t) ; auto newline + (c-subword-mode t) + + ;; custom keys + (local-set-key (kbd "C-c f") 'ff-find-other-file) ; toggle header/source file + + ;; ;; code folding + ;; (local-set-key (kbd "C-c v") 'hs-toggle-hiding) + ;; (local-set-key (kbd "") 'hs-hide-all) + ;; (local-set-key (kbd "") 'hs-show-all) + ;; (hs-minor-mode t) ; enable hide-show mode + + ;; gdb settings + (setq + gdb-many-windows t ; gdb many windows + gdb-use-separate-io-buffer t ; gdb stdio output + gud-tooltip-mode t) ; mouse hover variables + (local-set-key (kbd "C-c g") 'gdb) ; gdb + + ;; auto-close bracing + (setq parens-require-spaces nil) + (dolist (key '("(" "[")) (define-key (current-local-map) key 'insert-pair)) + )) + +(add-to-list 'auto-mode-alist '("\\.ipp$" . c++-mode)) +(add-to-list 'auto-mode-alist '("\\.inl$" . c++-mode)) + +(message "Loading c-init...done") +(provide 'c-init) diff --git a/lisp/hoersten-c-style.el b/lisp/hoersten-c-style.el new file mode 100644 index 0000000..043a499 --- /dev/null +++ b/lisp/hoersten-c-style.el @@ -0,0 +1,36 @@ +;; ~/.emacs.d/hoersten-c-style.el +;; Luke Hoersten + +;; hoersten c++-style +(c-add-style + "hoersten" + '(;; indentation + (indent-tabs-mode . t) + (tab-width . 3) + (c-basic-offset . 3) + + ;; brace cleanups + (c-cleanup-list + brace-else-brace + brace-elseif-brace + brace-catch-brace + empty-defun-braces + defun-close-semi + list-close-comma + scope-operator) + + ;; syntactic symbols + (c-offsets-alist + (substatement-open . 0) + (inline-open . 0) + (case-label . +) + (innamespace . 0) + (arglist-cont-nonempty . +) + (cpp-macro . -)))) + +;; c-like language settings (c, c++, java, etc.) +;;(require 'doxymacs) +(setq-default c-default-style "hoersten") ; load c-style + +(message "Loading hoersten-c-style...done") +(provide 'hoersten-c-style) diff --git a/lisp/move-line.el b/lisp/move-line.el new file mode 100644 index 0000000..7986715 --- /dev/null +++ b/lisp/move-line.el @@ -0,0 +1,27 @@ +;; http://www.emacswiki.org/emacs/MoveLine + +(defun move-line (n) + "Move the current line up or down by N lines." + (interactive "p") + (setq col (current-column)) + (beginning-of-line) (setq start (point)) + (end-of-line) (forward-char) (setq end (point)) + (let ((line-text (delete-and-extract-region start end))) + (forward-line n) + (insert line-text) + ;; restore point to original column in moved line + (forward-line -1) + (forward-char col))) + +(defun move-line-up (n) + "Move the current line up by N lines." + (interactive "p") + (move-line (if (null n) -1 (- n)))) + +(defun move-line-down (n) + "Move the current line down by N lines." + (interactive "p") + (move-line (if (null n) 1 n))) + +(message "Loading move-line...done") +(provide 'move-line) diff --git a/move-line.el b/move-line.el deleted file mode 100644 index 7986715..0000000 --- a/move-line.el +++ /dev/null @@ -1,27 +0,0 @@ -;; http://www.emacswiki.org/emacs/MoveLine - -(defun move-line (n) - "Move the current line up or down by N lines." - (interactive "p") - (setq col (current-column)) - (beginning-of-line) (setq start (point)) - (end-of-line) (forward-char) (setq end (point)) - (let ((line-text (delete-and-extract-region start end))) - (forward-line n) - (insert line-text) - ;; restore point to original column in moved line - (forward-line -1) - (forward-char col))) - -(defun move-line-up (n) - "Move the current line up by N lines." - (interactive "p") - (move-line (if (null n) -1 (- n)))) - -(defun move-line-down (n) - "Move the current line down by N lines." - (interactive "p") - (move-line (if (null n) 1 n))) - -(message "Loading move-line...done") -(provide 'move-line) -- cgit v1.2.3