diff options
| author |  Tom Willemsen | 2012-10-24 01:36:38 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-10-24 01:36:38 +0200 |
| commit | d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7 (patch) | |
| tree | 71f06d73cb4139e6a8c8aff91e229a9ff4d58b35 /.emacs.d/site-lisp/oni.el | |
| parent | ab3e4c680e329db4c01e6d029874124011328ba1 (diff) | |
| parent | 31d3b87a976a229f444251b871c32dd914330044 (diff) | |
| download | dotfiles-d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7.tar.gz dotfiles-d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/site-lisp/oni.el
.xinitrc
.zprofile
Diffstat (limited to '.emacs.d/site-lisp/oni.el')
| -rw-r--r-- | .emacs.d/site-lisp/oni.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 2f60c63..35e85dc 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -361,7 +361,8 @@ PLIST contains all the pertinent information." (episode (match-string 2 str)) (name (match-string 3 str)) (date (oni:mini-fix-timestamp-string (match-string 4 str)))) - (format "* ACQUIRE %s %s - %s <%s>" title episode name date)))) + (format "* ACQUIRE %s %s - %s \n SCHEDULED: <%s>" + title episode name date)))) (defun oni:newline-and-indent () "`newline-and-indent', but with a twist. @@ -393,7 +394,8 @@ When dealing with braces, add another line and indent that too." "Function for `prog-mode-hook'." (rainbow-delimiters-mode) (fci-mode) - (pretty-symbols-mode)) + (pretty-symbols-mode) + (auto-fill-mode)) (defun oni:python-mode-func () "Function for `python-mode-hook'." |