summaryrefslogtreecommitdiffstats
path: root/.emacs.d
diff options
context:
space:
mode:
Diffstat (limited to '.emacs.d')
-rw-r--r--.emacs.d/init.el8
-rw-r--r--.emacs.d/site-lisp/oni.el4
-rw-r--r--.emacs.d/snippets/org-mode/heading10
3 files changed, 10 insertions, 12 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index cd9c9b5..d2d68bc 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -354,6 +354,9 @@
(add-to-list 'auto-mode-alist '("^PKGBUILD$" . shell-script-mode))
(add-to-list 'auto-mode-alist '("^\\.Xmodmap$" . xmodmap-mode))
+(add-to-list 'compilation-finish-functions
+ 'oni:compilation-finish-function)
+
(add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
(add-to-list
@@ -391,6 +394,7 @@
(savehist-mode)
(show-paren-mode)
(winner-mode)
+(display-battery-mode)
(smex-initialize)
(help-at-pt-set-timer)
@@ -399,10 +403,6 @@
(load custom-file)
;; (load "rudel-loaddefs.el")
-(load (expand-file-name "~/quicklisp/slime-helper.el"))
-
-(load "quick-edit-mode")
-(global-set-key (kbd "C-z") 'quick-edit-mode)
(unless (server-running-p)
(server-start))
diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el
index 79b5f6e..979e804 100644
--- a/.emacs.d/site-lisp/oni.el
+++ b/.emacs.d/site-lisp/oni.el
@@ -191,7 +191,6 @@ DOT are intentionally being skipped."
(defun oni:html-mode-func ()
"Function for `html-mode-hook'."
- (yas-minor-mode)
(fci-mode))
(defun oni:indent-shift-left (start end &optional count)
@@ -400,7 +399,7 @@ When dealing with braces, add another line and indent that too."
"Function for `org-mode-hook'."
(auto-fill-mode)
(yas-minor-mode)
- (setq-local comment-auto-fill-only-comments nil))
+ (set (make-local-variable 'comment-auto-fill-only-comments) nil))
(defun oni:php-mode-func ()
"Function for `php-mode-hook'."
@@ -422,7 +421,6 @@ length -1. Use the `-' character. WIN is ignored."
(rainbow-delimiters-mode)
(fci-mode)
(pretty-symbols-mode)
- (yas-minor-mode)
(auto-fill-mode))
(defun oni:python-mode-func ()
diff --git a/.emacs.d/snippets/org-mode/heading b/.emacs.d/snippets/org-mode/heading
index 9d5451e..48dca7f 100644
--- a/.emacs.d/snippets/org-mode/heading
+++ b/.emacs.d/snippets/org-mode/heading
@@ -2,8 +2,8 @@
# name: Heading
# key: *
# --
-${1:*} ${2:TODO} $3
-${1:$(make-string (length text) ?\ )} :PROPERTIES:
-${1:$(make-string (length text) ?\ )} :CATEGORY: $4
-${1:$(make-string (length text) ?\ )} :END:
-${1:$(make-string (length text) ?\ )} $0 \ No newline at end of file
+*$1 ${2:TODO} $3
+ ${1:$(make-string (length text) ?\ )} :PROPERTIES:
+ ${1:$(make-string (length text) ?\ )} :CATEGORY: $4
+ ${1:$(make-string (length text) ?\ )} :END:
+ ${1:$(make-string (length text) ?\ )} $0 \ No newline at end of file