.emacs.d/init.el

This commit is contained in:
Tom Willemsen 2012-09-15 13:38:08 +02:00
parent 1391c88fe8
commit 96149a8546

View file

@ -21,18 +21,21 @@
'("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp")) '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp"))
(add-to-list 'load-path "~/.emacs.d/")) (add-to-list 'load-path "~/.emacs.d/"))
(require 'auto-complete-config)
(autoload 'define-slime-contrib "slime")
(autoload 'gtags-mode "gtags" nil t) (autoload 'gtags-mode "gtags" nil t)
(autoload 'identica-mode "identica-mode" nil t) (autoload 'identica-mode "identica-mode" nil t)
(autoload 'jabber-connect "jabber" nil t)
(autoload 'mu4e "mu4e" nil t) (autoload 'mu4e "mu4e" nil t)
(autoload 'naquadah-get-colors "naquadah-theme") (autoload 'naquadah-get-colors "naquadah-theme")
(autoload 'php-mode "php-mode" nil t) (autoload 'php-mode "php-mode" nil t)
(autoload 'po-mode "po-mode" nil t) (autoload 'po-mode "po-mode" nil t)
(autoload 'pony-mode "pony-mode" nil t) (autoload 'pony-mode "pony-mode" nil t)
(autoload 'sawfish-mode "sawfish" nil t) (autoload 'sawfish-mode "sawfish" nil t)
(autoload 'xmodmap-mode "xmodmap-mode" nil t) (autoload 'server-running-p "server")
(autoload 'jabber-connect "jabber" nil t)
(autoload 'define-slime-contrib "slime")
(autoload 'slime-js-minor-mode "slime-js" nil t) (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")) (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 () (defun oni:jabber-chat-mode-func ()
"Function for `jabber-chat-mode-hook'." "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 () (defun oni:java-mode-func ()
"Function for `java-mode-hook'." "Function for `java-mode-hook'."
@ -744,58 +755,59 @@ for easy selection."
(setq-default fci-rule-column 73) (setq-default fci-rule-column 73)
(setq-default gac-automatically-push-p t) (setq-default gac-automatically-push-p t)
(setq-default indent-tabs-mode nil) (setq-default indent-tabs-mode nil)
(setq-default mode-line-format ;; (setq-default mode-line-format
(list ;; (list
'(:eval ;; '(:eval
(if (and (buffer-modified-p) (buffer-file-name)) ;; (if (and (buffer-modified-p) (buffer-file-name))
(propertize "!" ;; (propertize "!"
'face 'oni:mode-line-modified ;; 'face 'oni:mode-line-modified
'help-echo "Buffer has been modified") ;; 'help-echo "Buffer has been modified")
" ")) ;; " "))
'(:eval (propertize "%m" ;; '(:eval (propertize "%m"
'face 'oni:mode-line-mode ;; 'face 'oni:mode-line-mode
'help-echo buffer-file-coding-system)) ;; 'help-echo buffer-file-coding-system))
": " ;; ": "
'(:eval (propertize "%b " ;; '(:eval (propertize "%b "
'face 'mode-line-buffer-id ;; 'face 'mode-line-buffer-id
'help-echo (buffer-file-name))) ;; 'help-echo (buffer-file-name)))
"(" ;; "("
(propertize "%p" 'face 'oni:mode-line-buffer-position) ":" ;; (propertize "%p" 'face 'oni:mode-line-buffer-position) ":"
(propertize "%04l" 'face 'oni:mode-line-buffer-line) "," ;; (propertize "%04l" 'face 'oni:mode-line-buffer-line) ","
(propertize "%02c" 'face 'oni:mode-line-buffer-column) ;; (propertize "%02c" 'face 'oni:mode-line-buffer-column)
") " ;; ") "
"[" ;; "["
'(:eval (propertize ;; '(:eval (propertize
(if buffer-read-only ;; (if buffer-read-only
"R" ;; "R"
(if overwrite-mode "O" "I")) ;; (if overwrite-mode "O" "I"))
'face 'oni:mode-line-buffer-state ;; 'face 'oni:mode-line-buffer-state
'help-echo (concat "Buffer is " ;; 'help-echo (concat "Buffer is "
(if buffer-read-only ;; (if buffer-read-only
"read-only" ;; "read-only"
(if overwrite-mode ;; (if overwrite-mode
"in overwrite mode" ;; "in overwrite mode"
"in insert mode"))))) ;; "in insert mode")))))
"] " ;; "] "
'(:eval ;; '(:eval
(propertize (format-time-string "%H:%M") ;; (propertize (format-time-string "%H:%M")
'help-echo ;; 'help-echo
(concat (format-time-string "%c; ") ;; (concat (format-time-string "%c; ")
(emacs-uptime "Uptime: %hh")))) ;; (emacs-uptime "Uptime: %hh"))))
" --" ;; " --"
'(:eval global-mode-string))) ;; '(:eval global-mode-string)))
(setq-default php-mode-warn-if-mumamo-off nil) (setq-default php-mode-warn-if-mumamo-off nil)
(setq-default require-final-newline t) (setq-default require-final-newline t)
(setq-default tab-width 4) (setq-default tab-width 4)
(setq-default truncate-lines t) (setq-default truncate-lines t)
(setq ac-use-quick-help nil)
(setq appt-display-diary nil) (setq appt-display-diary nil)
(setq auto-mode-case-fold nil) (setq auto-mode-case-fold nil)
(setq auto-save-file-name-transforms (setq auto-save-file-name-transforms
@ -1038,7 +1050,8 @@ for easy selection."
(if (daemonp) (if (daemonp)
(global-set-key "\C-x\C-c" 'oni:close-client-window) (global-set-key "\C-x\C-c" 'oni:close-client-window)
(server-start)) (unless (server-running-p)
(server-start)))
(when (or window-system (daemonp)) (when (or window-system (daemonp))
(global-unset-key "\C-z")) (global-unset-key "\C-z"))
@ -1082,6 +1095,7 @@ for easy selection."
(smex-initialize) (smex-initialize)
(help-at-pt-set-timer) (help-at-pt-set-timer)
(ac-config-default)
(load-theme 'naquadah t) (load-theme 'naquadah t)