Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: haxney/dot-emacs
base: c0a8bded97
...
head fork: haxney/dot-emacs
compare: 898a8d5384
  • 4 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
7 custom.el
@@ -160,11 +160,16 @@
'(nxml-slash-auto-complete-flag t)
'(org-agenda-files (quote ("~/org/root.org")))
'(org-archive-location "::* Archived")
- '(org-babel-load-languages (quote ((js . t) (dot . t) (latex . t) (ruby . t) (R . t) (python . t) (emacs-lisp . t))))
+ '(org-babel-load-languages (quote ((js . t) (dot . t) (latex . t) (ruby . t) (R . t) (python . t) (emacs-lisp . t) (sh . t) (sql . t))))
+ '(org-babel-no-eval-on-ctrl-c-ctrl-c t)
'(org-capture-templates (quote (("t" "Todo" entry (file+headline "~/org/root.org" "Task Inbox") "** TODO %?
%i") ("d" "Day Page" entry (function org-open-day-page) "
* Sleep" :immediate-finish t :unnarrowed t))))
+ '(org-clock-in-resume t)
'(org-clock-into-drawer t)
+ '(org-clock-out-remove-zero-time-clocks t)
+ '(org-clock-persist (quote clock))
+ '(org-clock-persist-file "~/.emacs.d/tmp/org-clock-save.el")
'(org-default-notes-file "~/org/root.org")
'(org-export-latex-classes (quote (("article" "\\documentclass[11pt]{article}" ("\\section{%s}" . "\\section*{%s}") ("\\subsection{%s}" . "\\subsection*{%s}") ("\\subsubsection{%s}" . "\\subsubsection*{%s}") ("\\paragraph{%s}" . "\\paragraph*{%s}") ("\\subparagraph{%s}" . "\\subparagraph*{%s}")) ("report" "\\documentclass[11pt]{report}" ("\\part{%s}" . "\\part*{%s}") ("\\chapter{%s}" . "\\chapter*{%s}") ("\\section{%s}" . "\\section*{%s}") ("\\subsection{%s}" . "\\subsection*{%s}") ("\\subsubsection{%s}" . "\\subsubsection*{%s}")) ("book" "\\documentclass[11pt]{book}" ("\\part{%s}" . "\\part*{%s}") ("\\chapter{%s}" . "\\chapter*{%s}") ("\\section{%s}" . "\\section*{%s}") ("\\subsection{%s}" . "\\subsection*{%s}") ("\\subsubsection{%s}" . "\\subsubsection*{%s}")) ("beamer" "\\documentclass{beamer}" org-beamer-sectioning) ("vita" "\\documentclass{vita}" ("\\section{%s \\hrulefill}" . "\\section*{%s \\hrulefill}") ("\\subsection{%s}" . "\\subsection*{%s}")))))
'(org-export-latex-default-packages-alist (quote (("" "xunicode" t) ("" "fontspec" t) ("" "xltxtra" t) ("" "fixltx2e" nil) ("" "graphicx" t) ("" "longtable" nil) ("" "float" nil) ("" "wrapfig" nil) ("" "soul" t) ("" "marvosym" t) ("" "wasysym" t) ("" "latexsym" t) ("dvipdfm, bookmarks, colorlinks, breaklinks, pdfusetitle" "hyperref" nil) "\\tolerance=1000")))
View
83 init.el
@@ -82,51 +82,56 @@ when needed."
;; Explicitly list packages to be loaded and used.
-(setq package-load-list '((yaml-mode t)
- (undo-tree t)
- (smex t)
- (scss-mode t)
- (scala-mode t)
- (sass-mode t)
- (ruby-test-mode t)
- (ruby-mode t)
- (ruby-electric t)
- (ruby-compilation t)
- (ruby-block t)
- (rspec-mode t)
- (rinari t)
- (paredit t)
- (org-table-comment t)
- (org-magit t)
- (org t)
- (mediawiki t)
- (markdown-mode t)
- (magit t)
- (load-dir t)
- (keyfreq t)
- (inflections t)
- (jump t)
- (inf-ruby t)
- (htmlize t)
- (haml-mode t)
- (gnuplot t)
- (geben t)
- (furl t)
- (findr t)
- (feature-mode t)
- (erc-nick-notify t)
- (diminish t)
+(setq package-load-list '(
+ (apache-mode t)
(auctex t)
- (full-ack t)
(coffee-mode t)
- (mode-compile t)
- (less t)
+ (company t)
+ (diminish t)
+ (erc-nick-notify t)
(ess t)
- (highline t)
+ (feature-mode t)
+ (findr t)
+ (full-ack t)
+ (furl t)
+ (geben t)
+ (gnuplot t)
+ (haml-mode t)
(helm t)
(helm-descbinds t)
+ (highline t)
+ (htmlize t)
+ (inf-ruby t)
+ (inflections t)
+ (jump t)
+ (keyfreq t)
+ (less t)
+ (load-dir t)
+ (lua-mode t)
+ (magit t)
+ (markdown-mode t)
+ (mediawiki t)
+ (mode-compile t)
+ (org t)
+ (org-magit t)
+ (org-table-comment t)
+ (paredit t)
+ (php-mode t)
+ (rinari t)
+ (rspec-mode t)
+ (ruby-block t)
+ (ruby-compilation t)
+ (ruby-electric t)
+ (ruby-mode t)
+ (ruby-test-mode t)
+ (rvm t)
+ (sass-mode t)
+ (scala-mode t)
+ (scss-mode t)
+ (smex t)
(tidy t)
- (company t)
+ (undo-tree t)
+ (yaml-mode t)
))
(defvar hl-line-ignore-regexp "\*magit:.*")
View
4 load.d/50filetypes.el
@@ -133,7 +133,7 @@
(add-hook 'woman-mode-hook 'less-minor-mode)
(add-hook 'woman-mode-hook 'scroll-lock-mode)
-(add-hook 'woman-mode-hook 'less-minor-mode)
-(add-hook 'woman-mode-hook 'scroll-lock-mode)
+(add-hook 'Man-mode-hook 'less-minor-mode)
+(add-hook 'Man-mode-hook 'scroll-lock-mode)
;;; 50filetyptes.el ends here
View
2  load.d/50keybindings.el
@@ -2,7 +2,7 @@
(global-set-key (kbd "C-c l") 'org-store-link)
(global-set-key (kbd "C-c a") 'org-agenda)
(global-set-key (kbd "C-c M-d") 'org-open-day-page)
-(global-set-key (kbd "C-c C-x C-o") 'my/org-clock-out)
+(global-set-key (kbd "C-c C-x C-o") 'org-clock-out)
(global-set-key (kbd "C-c r") 'org-capture)
;; Smex, a Super M-x
View
30 load.d/50org-mode.el
@@ -37,36 +37,6 @@
(replace-regexp-in-string "-" "." (org-read-date nil))
".org"))))
-(defun my/org-clock-out ()
- "Clock out of whatever task is currently STARTED."
- (interactive)
- (save-excursion
- (set-buffer (marker-buffer org-clock-marker))
- (goto-char org-clock-marker)
- (org-todo "WAITING")))
-
-(defun my/org-todo-starting ()
- "Mark the current task WAITING."
- (interactive)
- (org-todo "STARTED"))
-
-;; Add Sacha Chua's 'clock-in(out)-if-starting' functions
-(defun wicked/org-clock-in-if-starting ()
- "Clock in when the task is marked STARTED."
- (when (and (string= state "STARTED")
- (not (string= last-state state)))
- (org-clock-in)))
-
-(defun wicked/org-clock-out-if-waiting ()
- "Clock out when the task is marked WAITING."
- (when (and (string= state "WAITING")
- (equal (marker-buffer org-clock-marker) (current-buffer))
- (< (point) org-clock-marker)
- (> (save-excursion (outline-next-heading) (point))
- org-clock-marker)
- (not (string= last-state state)))
- (org-clock-out)))
-
(defun org-preprocess-radio-lists ()
"Preprocess radio lists before exporting."
(save-excursion

No commit comments for this range

Something went wrong with that request. Please try again.