From 96149a8546b20ab2cb6174e6ea68595d9a7923ca Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Sat, 15 Sep 2012 13:38:08 +0200 Subject: .emacs.d/init.el --- .emacs.d/init.el | 118 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 52 deletions(-) (limited to '.emacs.d') diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 983d384..be1626e 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -21,18 +21,21 @@ '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp")) (add-to-list 'load-path "~/.emacs.d/")) +(require 'auto-complete-config) + +(autoload 'define-slime-contrib "slime") (autoload 'gtags-mode "gtags" nil t) (autoload 'identica-mode "identica-mode" nil t) +(autoload 'jabber-connect "jabber" nil t) (autoload 'mu4e "mu4e" nil t) (autoload 'naquadah-get-colors "naquadah-theme") (autoload 'php-mode "php-mode" nil t) (autoload 'po-mode "po-mode" nil t) (autoload 'pony-mode "pony-mode" nil t) (autoload 'sawfish-mode "sawfish" nil t) -(autoload 'xmodmap-mode "xmodmap-mode" nil t) -(autoload 'jabber-connect "jabber" nil t) -(autoload 'define-slime-contrib "slime") +(autoload 'server-running-p "server") (autoload 'slime-js-minor-mode "slime-js" nil t) +(autoload 'xmodmap-mode "xmodmap-mode" nil t) (load (expand-file-name "~/.emacs.d/site-lisp/loaddefs.el")) @@ -335,7 +338,15 @@ If COUNT has been specified indent by that much, otherwise look at (defun oni:jabber-chat-mode-func () "Function for `jabber-chat-mode-hook'." - (visual-line-mode)) + (visual-line-mode) + (setq mode-line-format (append (cddr jabber-chat-header-line-format) + '(global-mode-string)) + header-line-format nil)) + +(defun oni:jabber-roster-mode-func () + "Function for `jabber-roster-mode-hook'." + (setq mode-line-format + (list (propertize " %m" 'face 'mode-line-buffer-id)))) (defun oni:java-mode-func () "Function for `java-mode-hook'." @@ -744,58 +755,59 @@ for easy selection." (setq-default fci-rule-column 73) (setq-default gac-automatically-push-p t) (setq-default indent-tabs-mode nil) -(setq-default mode-line-format - (list - '(:eval - (if (and (buffer-modified-p) (buffer-file-name)) - (propertize "!" - 'face 'oni:mode-line-modified - 'help-echo "Buffer has been modified") - " ")) - - '(:eval (propertize "%m" - 'face 'oni:mode-line-mode - 'help-echo buffer-file-coding-system)) - - ": " - - '(:eval (propertize "%b " - 'face 'mode-line-buffer-id - 'help-echo (buffer-file-name))) - - "(" - (propertize "%p" 'face 'oni:mode-line-buffer-position) ":" - (propertize "%04l" 'face 'oni:mode-line-buffer-line) "," - (propertize "%02c" 'face 'oni:mode-line-buffer-column) - ") " - - "[" - '(:eval (propertize - (if buffer-read-only - "R" - (if overwrite-mode "O" "I")) - 'face 'oni:mode-line-buffer-state - 'help-echo (concat "Buffer is " - (if buffer-read-only - "read-only" - (if overwrite-mode - "in overwrite mode" - "in insert mode"))))) - - "] " - - '(:eval - (propertize (format-time-string "%H:%M") - 'help-echo - (concat (format-time-string "%c; ") - (emacs-uptime "Uptime: %hh")))) - " --" - '(:eval global-mode-string))) +;; (setq-default mode-line-format +;; (list +;; '(:eval +;; (if (and (buffer-modified-p) (buffer-file-name)) +;; (propertize "!" +;; 'face 'oni:mode-line-modified +;; 'help-echo "Buffer has been modified") +;; " ")) + +;; '(:eval (propertize "%m" +;; 'face 'oni:mode-line-mode +;; 'help-echo buffer-file-coding-system)) + +;; ": " + +;; '(:eval (propertize "%b " +;; 'face 'mode-line-buffer-id +;; 'help-echo (buffer-file-name))) + +;; "(" +;; (propertize "%p" 'face 'oni:mode-line-buffer-position) ":" +;; (propertize "%04l" 'face 'oni:mode-line-buffer-line) "," +;; (propertize "%02c" 'face 'oni:mode-line-buffer-column) +;; ") " + +;; "[" +;; '(:eval (propertize +;; (if buffer-read-only +;; "R" +;; (if overwrite-mode "O" "I")) +;; 'face 'oni:mode-line-buffer-state +;; 'help-echo (concat "Buffer is " +;; (if buffer-read-only +;; "read-only" +;; (if overwrite-mode +;; "in overwrite mode" +;; "in insert mode"))))) + +;; "] " + +;; '(:eval +;; (propertize (format-time-string "%H:%M") +;; 'help-echo +;; (concat (format-time-string "%c; ") +;; (emacs-uptime "Uptime: %hh")))) +;; " --" +;; '(:eval global-mode-string))) (setq-default php-mode-warn-if-mumamo-off nil) (setq-default require-final-newline t) (setq-default tab-width 4) (setq-default truncate-lines t) +(setq ac-use-quick-help nil) (setq appt-display-diary nil) (setq auto-mode-case-fold nil) (setq auto-save-file-name-transforms @@ -1038,7 +1050,8 @@ for easy selection." (if (daemonp) (global-set-key "\C-x\C-c" 'oni:close-client-window) - (server-start)) + (unless (server-running-p) + (server-start))) (when (or window-system (daemonp)) (global-unset-key "\C-z")) @@ -1082,6 +1095,7 @@ for easy selection." (smex-initialize) (help-at-pt-set-timer) +(ac-config-default) (load-theme 'naquadah t) -- cgit v1.2.3-54-g00ecf