From 179e7c6c2956c5802f089e965606eadd34cece2c Mon Sep 17 00:00:00 2001 From: Luke Hoersten Date: Fri, 9 Jan 2009 10:39:57 -0600 Subject: Minor updates. --- emacs.el | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'emacs.el') diff --git a/emacs.el b/emacs.el index a1c24e6..b4b59ff 100644 --- a/emacs.el +++ b/emacs.el @@ -41,20 +41,19 @@ ;; haskell (setq haskell-font-lock-symbols 'unicode) -;; indentation -(setq-default tab-width 3) -(setq-default c-basic-offset 3) -(setq-default indent-tabs-mode t) - ;; use only spaces for alignment (global-set-key (kbd "C-c a") 'align-with-spaces) ; align -(defun align-with-spaces (beg end) +(defun align-with-spaces (beg end pattern) "Align selected using only spaces for whitespace." - (interactive "r") + (interactive "r\nsAlign by: ") (let ((indent-tabs-mode nil)) - (align beg end))) + (align-string beg end pattern 1) + (align-entire beg end) + (untabify beg end) + (indent-region beg end) + (whitespace-cleanup-region beg end))) -;; shell +;; Shell (global-set-key (kbd "C-c s") 'shell) ; start shell (ansi-color-for-comint-mode-on) ; color in shell buffer (setq-default comint-scroll-to-bottom-on-input t) ; only type on prompt @@ -62,18 +61,18 @@ ;; map file extensions to modes (setq-default auto-mode-alist - (append - '(("\\.ipp$" . c++-mode) - ("\\.inl$" . c++-mode) - ("SCons" . python-mode) - ("\\.jj$" . java-mode)) - auto-mode-alist)) + (append + '(("\\.ipp$" . c++-mode) + ("\\.inl$" . c++-mode) + ("SCons" . python-mode) + ("\\.jj$" . java-mode)) + auto-mode-alist)) ;; x stuff (if (not window-system) - (menu-bar-mode nil) ; remove menu bar in no-x mode - (tool-bar-mode nil) ; remove tool bar - (scroll-bar-mode nil) ; remove scroll bar + (menu-bar-mode nil) ; remove menu bar in no-x mode + (tool-bar-mode nil) ; remove tool bar + (scroll-bar-mode nil) ; remove scroll bar (custom-set-faces '(default ((t (:background "#000000" :foreground "#ffffff" :height 100 :family "DejaVu Sans Mono"))))) (setq default-frame-alist '((width . 100) (height . 50) (menu-bar-lines . 1))) -- cgit v1.2.3