Permalink
Browse files

Various updates

  • Loading branch information...
1 parent 60bf04b commit 6fc4a6029c17a22f8e72eb1bdfe0255e557aa463 John Wiegley committed Jan 19, 2013
Showing with 110 additions and 40 deletions.
  1. +91 −29 init.el
  2. +8 −0 lisp/fetchmail-ctl.el
  3. +1 −1 lisp/haskell-config
  4. +0 −4 lisp/helm-commands.el
  5. +2 −2 org-settings.el
  6. +1 −1 override/gnus
  7. +6 −2 settings.el
  8. +1 −1 site-lisp/ghc-mod
View
120 init.el
@@ -1157,6 +1157,16 @@
:defer t
:config
(progn
+ (use-package preview)
+ (use-package ac-math)
+
+ (defun ac-latex-mode-setup ()
+ (nconc ac-sources
+ '(ac-source-math-unicode ac-source-math-latex
+ ac-source-latex-commands)))
+
+ (add-to-list 'ac-modes 'latex-mode)
+ (add-hook 'latex-mode-hook 'ac-latex-mode-setup)
(info-lookup-add-help :mode 'latex-mode
:regexp ".*"
@@ -1529,7 +1539,12 @@ iflipb-next-buffer or iflipb-previous-buffer this round."
(let ((pat name))
(if (string-match "^\\(.+?\\)-[0-9._-]+$" pat)
(setq pat (match-string 1 pat)))
- (or (gethash pat mark-files-cache)
+ (or (gethash pat mark-files-cache)
+ (ignore (puthash pat t mark-files-cache)))))
+
+ (defun dired-mark-similar-version ()
+ (interactive)
+ (setq mark-files-cache (make-hash-table :test #'equal))
(dired-mark-sexp '(mark-similar-versions name))))
:config
@@ -1793,40 +1808,45 @@ The output appears in the buffer `*Async Shell Command*'."
:port 6697
:nick "johnw"
:password (funcall
- (plist-get
- (car (auth-source-search :host "192.168.9.135"
- :user "johnw/freenode"
- :type 'netrc
+ (plist-get
+ (car (auth-source-search
+ :host "192.168.9.135"
+ :user "johnw/freenode"
+ :type 'netrc
:port 6697))
:secret)))
(erc :server "192.168.9.135"
:port 6697
:nick "johnw"
:password (funcall
- (plist-get
- (car (auth-source-search :host "192.168.9.135"
- :user "johnw/welltyped"
- :type 'netrc
+ (plist-get
+ (car (auth-source-search
+ :host "192.168.9.135"
+ :user "johnw/welltyped"
+ :type 'netrc
:port 6697))
- :secret)))
- (erc :server "192.168.9.135"
- :port 6697
- :nick "johnw"
- :password (funcall
- (plist-get
- (car (auth-source-search :host "192.168.9.135"
- :user "johnw/oftc"
- :type 'netrc
- :port 6697))
+ :secret)))
+ (when nil
+ (erc :server "192.168.9.135"
+ :port 6697
+ :nick "johnw"
+ :password (funcall
+ (plist-get
+ (car (auth-source-search
+ :host "192.168.9.135"
+ :user "johnw/oftc"
+ :type 'netrc
+ :port 6697))
:secret)))))
(erc-tls :server "irc.freenode.net"
:port 6697
:nick "johnw"
:password (funcall
- (plist-get
- (car (auth-source-search :host "irc.freenode.net"
- :user "johnw"
- :type 'netrc
+ (plist-get
+ (car (auth-source-search
+ :host "irc.freenode.net"
+ :user "johnw"
+ :type 'netrc
:port 6667))
:secret)))
@@ -1845,10 +1865,11 @@ The output appears in the buffer `*Async Shell Command*'."
:port 6667
:nick "johnw"
:password (funcall
- (plist-get
- (car (auth-source-search :host "bitlbee"
- :user "johnw"
- :type 'netrc
+ (plist-get
+ (car (auth-source-search
+ :host "bitlbee"
+ :user "johnw"
+ :type 'netrc
:port 6667))
:secret))))
@@ -2035,6 +2056,44 @@ FORM => (eval FORM)."
(use-package fetchmail-mode
:commands fetchmail-mode)
+
+;;;_ , flycheck
+
+(use-package flycheck
+ :load-path ("site-lisp/flycheck/deps/dash.el"
+ "site-lisp/flycheck/deps/s.el")
+ :init
+ (progn
+ (flycheck-declare-checker ghc
+ "Haskell checker using ghc"
+ :command '("ghc" "-fno-code" "-v0" source-inplace)
+ :error-patterns
+ '(((concat "^\\(?1:.*?\\):\\(?2:[0-9]+\\):\\(?3:[0-9]+\\):[ \t\n\r]*"
+ "\\(?4:\\(.\\|[ \t\n\r]\\)+?\\)\\(^[^ \t\n\r]\\|\\'\\)") error))
+ :modes 'haskell-mode)
+
+ (flycheck-declare-checker haskell-hdevtools
+ "Haskell checker using hdevtools"
+ :command '("hdevtools" "check" "-g" "-fno-code" source-inplace)
+ :error-patterns
+ '(((concat "^\\(?1:.*?\\):\\(?2:[0-9]+\\):\\(?3:[0-9]+\\):[ \t\n\r]*"
+ "\\(?4:\\(.\\|[ \t\n\r]\\)+?\\)\\(^[^ \t\n\r]\\|\\'\\)") error))
+ :modes 'haskell-mode)
+
+ (flycheck-declare-checker haskell-hlint
+ "Haskell checker using hlint"
+ :command '("hlint" "check" "-g" "-fno-code" source-inplace)
+ :error-patterns
+ '(((concat "^\\(?1:.*?\\):\\(?2:[0-9]+\\):\\(?3:[0-9]+\\):[ \t\n\r]*"
+ "\\(?4:\\(.\\|[ \t\n\r]\\)+?\\)\\(^[^ \t\n\r]\\|\\'\\)") error))
+ :modes 'haskell-mode)
+
+ (flycheck-declare-checker bash
+ "Bash checker"
+ :command '("bash" "--norc" "--noprofile" "-n" source)
+ :error-patterns '(("^\\(?1:.*\\): line \\(?2:[0-9]+\\): \\(?4:.*\\)$" error))
+ :modes 'sh-mode
+ :predicate '(eq sh-shell 'bash))))
;;;_ , flyspell
@@ -2099,7 +2158,7 @@ FORM => (eval FORM)."
(progn
(use-package grep-ed)
- (grep-apply-setting 'grep-command "egrep -nH -e ")
+ (grep-apply-setting 'grep-command "egrep -nH -e ")
(if nil
(grep-apply-setting 'grep-find-command '("gf -e " . 7))
(grep-apply-setting
@@ -2691,6 +2750,8 @@ FORM => (eval FORM)."
:config
(progn
(setenv "GIT_PAGER" "")
+
+ (unbind-key "M-s" magit-mode-map)
(add-hook 'magit-log-edit-mode-hook
#'(lambda ()
@@ -3194,7 +3255,8 @@ FORM => (eval FORM)."
;; You can use commands like
;; (add-hook 'sage-startup-after-prompt-hook 'sage-view-disable-inline-output)
(add-hook 'sage-startup-after-prompt-hook 'sage-view-disable-inline-plots t)
- ;; to enable some combination of features
+ ;; to enable some combination of features
+
(bind-key "C-c Z" 'sage)))
;;;_ , selectkey
View
8 lisp/fetchmail-ctl.el
@@ -93,6 +93,14 @@
(funcall func)))
(get-buffer name)))))
+(defun get-buffer-and-call-func (name func)
+ (let ((buf (get-buffer name)))
+ (if (and buf
+ (or (not (get-buffer-process buf))
+ (not (eq 'run (process-status (get-buffer-process buf))))))
+ (kill-buffer buf))
+ (get-buffer-or-call-func name func)))
+
(defun switch-to-fetchmail ()
(interactive)
(let ((fetchmail-buf
2 lisp/haskell-config
@@ -1 +1 @@
-Subproject commit 650ce1ccc8fbd0287eb632f0716b648bf1d326dc
+Subproject commit af592ed97317ed862b20e6e38dbe097611477797
View
4 lisp/helm-commands.el
@@ -38,10 +38,6 @@
(type . file))
"Search for files in the current Git project.")
-(eval-after-load "helm-files"
- '(add-to-list 'helm-for-files-preferred-list
- 'helm-c-source-git-files))
-
(defvar helm-c-source-zsh-history
'((name . "Zsh History")
(candidates . helm-c-zsh-history-set-candidates)
View
4 org-settings.el
@@ -6,10 +6,10 @@
'(org-M-RET-may-split-line (quote ((headline) (default . t))))
'(org-adapt-indentation nil)
'(org-agenda-auto-exclude-function (quote org-my-auto-exclude-function))
- '(org-agenda-custom-commands (quote (("h" "Current Hotlist" tags "HOT&TODO=\"PROJECT\"" ((org-agenda-overriding-header "Current Hotlist"))) ("H" "Non-Hot Projects" tags "-HOT&TODO=\"PROJECT\"" ((org-agenda-overriding-header "Non-Hot Projects"))) ("A" "Priority #A tasks" agenda "" ((org-agenda-ndays 1) (org-agenda-overriding-header "Today's priority #A tasks: ") (org-agenda-skip-function (quote (org-agenda-skip-entry-if (quote notregexp) "\\=.*\\[#A\\]"))))) ("b" "Priority #A and #B tasks" agenda "" ((org-agenda-ndays 1) (org-agenda-overriding-header "Today's priority #A and #B tasks: ") (org-agenda-skip-function (quote (org-agenda-skip-entry-if (quote regexp) "\\=.*\\[#C\\]"))))) ("E" "Errands (next 7 days)" tags "Errand&TODO<>\"DONE\"&TODO<>\"CANCELED\"&STYLE<>\"habit\"&SCHEDULED<\"<+7d>\"" ((org-agenda-overriding-header "Errands (next 7 days)"))) ("Z" "Agenda (next 7 days)" agenda "" ((org-agenda-ndays 7) (org-agenda-overriding-header "Agenda (next 7 days)"))) ("r" "Uncategorized items" tags "CATEGORY=\"Inbox\"&LEVEL=2" ((org-agenda-overriding-header "Uncategorized items"))) ("W" "Waiting/delegated tasks" tags "TODO=\"WAITING\"|TODO=\"DELEGATED\"" ((org-agenda-overriding-header "Waiting/delegated tasks:") (org-agenda-sorting-strategy (quote (todo-state-up priority-down category-up))))) ("z" "Computer-related tasks" tags "AREA=\"Computer\"&TODO<>\"\"&TODO<>{DONE\\|CANCELED\\|NOTE\\|PROJECT}" ((org-agenda-files (quote ("~/Documents/Tasks/todo.txt"))) (org-agenda-overriding-header "Computer-related tasks: ") (org-agenda-skip-function (quote (org-agenda-skip-entry-if (quote scheduled) (quote deadline) (quote timestamp) (quote regexp) "\\* \\(DEFERRED\\|SOMEDAY\\)"))) (org-agenda-sorting-strategy (quote (priority-down))))) ("u" "Unscheduled tasks" tags "AREA<>{Work\\|Computer\\|Statements}&TODO<>\"\"&TODO<>{DONE\\|CANCELED\\|NOTE\\|PROJECT}" ((org-agenda-files (quote ("~/Documents/Tasks/todo.txt"))) (org-agenda-overriding-header "Unscheduled tasks: ") (org-agenda-skip-function (quote (org-agenda-skip-entry-if (quote scheduled) (quote deadline) (quote timestamp) (quote regexp) "\\* \\(DEFERRED\\|SOMEDAY\\)"))) (org-agenda-sorting-strategy (quote (priority-down))))) ("U" "Deferred tasks" tags "TODO=\"DEFERRED\"" ((org-agenda-files (quote ("~/Documents/Tasks/todo.txt"))) (org-agenda-overriding-header "Deferred tasks:"))) ("Y" "Someday tasks" tags "TODO=\"SOMEDAY\"" ((org-agenda-overriding-header "Someday tasks:"))) ("w" "Unscheduled work-related tasks" tags "AREA=\"Work\"&TODO<>\"\"&TODO<>{DONE\\|CANCELED\\|NOTE\\|PROJECT}" ((org-agenda-overriding-header "Unscheduled work-related tasks") (org-agenda-files (quote ("~/Documents/Tasks/todo.txt"))) (org-agenda-sorting-strategy (quote (todo-state-up priority-down category-up))) (org-agenda-skip-function (quote (org-agenda-skip-entry-if (quote scheduled) (quote deadline) (quote timestamp)))))) ("v" "All work-related tasks" tags "AREA=\"Work\"&TODO<>\"\"&TODO<>{DONE\\|CANCELED\\|NOTE\\|PROJECT}" ((org-agenda-overriding-header "Work-related tasks") (org-agenda-files (quote ("~/Documents/Tasks/todo.txt"))) (org-agenda-sorting-strategy (quote (category-up priority-down todo-state-up alpha-up))) (org-agenda-skip-function (quote (org-agenda-skip-entry-if (quote regexp) "\\* \\(DEFERRED\\|SOMEDAY\\)"))))) ("l" "Ledger tasks" tags-todo "TODO<>{SOMEDAY\\|DEFERRED}" ((org-agenda-files (quote ("~/src/ledger/plan/TODO"))) (org-agenda-overriding-header "Ledger tasks:") (org-agenda-sorting-strategy (quote (todo-state-up priority-down category-up))) (org-agenda-skip-function (quote (org-agenda-skip-entry-if (quote regexp) "\\=.*\\[#C\\]"))))) ("L" "Ledger tasks not in Bugzilla" tags "TODO<>{DONE\\|TESTED\\|CLOSED\\|CANCELED\\|WONTFIX\\|WORKSFORME\\|INVALID\\|DUPLICATE\\|NOTE}&LEVEL=2" ((org-agenda-files (quote ("~/src/ledger/plan/TODO"))) (org-agenda-overriding-header "Ledger tasks:") (org-agenda-sorting-strategy (quote (todo-state-up priority-down category-up))) (org-agenda-skip-function (quote (org-agenda-skip-entry-if (quote regexp) "[^(]#[0-9]+\\]"))))) ("G" "Ledger tasks (all)" alltodo "" ((org-agenda-files (quote ("~/src/ledger/plan/TODO"))) (org-agenda-overriding-header "Ledger tasks:") (org-agenda-sorting-strategy (quote (todo-state-up priority-down category-up))))) ("N" "Ledger tasks (all, alphabetical)" alltodo "" ((org-agenda-files (quote ("~/src/ledger/plan/TODO"))) (org-agenda-overriding-header "Ledger tasks, alphabetical:") (org-agenda-sorting-strategy (quote (alpha-up))))) ("n" "Notes" tags "TODO=\"NOTE\"" ((org-agenda-files (quote ("~/Documents/Tasks/archive-2009.txt" "~/Documents/Tasks/archive-2010.txt" "~/Documents/Tasks/archive-2011.txt" "~/Documents/Tasks/archive.txt" "~/Documents/Tasks/notes.txt"))) (org-agenda-overriding-header "Notes") (org-agenda-sorting-strategy (quote (time-down))))) ("S" "Assembly Action Items" tags-todo "TODO<>\"PROJECT\"" ((org-agenda-files (quote ("~/Documents/Tasks/assembly.txt"))) (org-agenda-overriding-header "Assembly Action Items") (org-agenda-sorting-strategy (quote (alpha-up time-up))))))))
+ '(org-agenda-custom-commands (quote (("h" "Current Hotlist" tags "HOT&TODO=\"PROJECT\"" ((org-agenda-overriding-header "Current Hotlist"))) ("H" "Non-Hot Projects" tags "-HOT&TODO=\"PROJECT\"" ((org-agenda-overriding-header "Non-Hot Projects"))) ("A" "Priority #A tasks" agenda "" ((org-agenda-ndays 1) (org-agenda-overriding-header "Today's priority #A tasks: ") (org-agenda-skip-function (quote (org-agenda-skip-entry-if (quote notregexp) "\\=.*\\[#A\\]"))))) ("b" "Priority #A and #B tasks" agenda "" ((org-agenda-ndays 1) (org-agenda-overriding-header "Today's priority #A and #B tasks: ") (org-agenda-skip-function (quote (org-agenda-skip-entry-if (quote regexp) "\\=.*\\[#C\\]"))))) ("E" "Errands (next 7 days)" tags "Errand&TODO<>\"DONE\"&TODO<>\"CANCELED\"&STYLE<>\"habit\"&SCHEDULED<\"<+7d>\"" ((org-agenda-overriding-header "Errands (next 7 days)"))) ("Z" "Agenda (next 7 days)" agenda "" ((org-agenda-ndays 7) (org-agenda-overriding-header "Agenda (next 7 days)"))) ("r" "Uncategorized items" tags "CATEGORY=\"Inbox\"&LEVEL=2" ((org-agenda-overriding-header "Uncategorized items"))) ("W" "Waiting/delegated tasks" tags "TODO=\"WAITING\"|TODO=\"DELEGATED\"" ((org-agenda-overriding-header "Waiting/delegated tasks:") (org-agenda-sorting-strategy (quote (todo-state-up priority-down category-up))))) ("z" "Computer-related tasks" tags "AREA=\"Computer\"&TODO<>\"\"&TODO<>{DONE\\|CANCELED\\|NOTE\\|PROJECT}" ((org-agenda-files (quote ("~/Documents/Tasks/todo.txt"))) (org-agenda-overriding-header "Computer-related tasks: ") (org-agenda-skip-function (quote (org-agenda-skip-entry-if (quote scheduled) (quote deadline) (quote timestamp) (quote regexp) "\\* \\(DEFERRED\\|SOMEDAY\\)"))) (org-agenda-sorting-strategy (quote (priority-down))))) ("u" "Unscheduled tasks" tags "AREA<>{Work\\|Computer\\|Statements}&TODO<>\"\"&TODO<>{DONE\\|CANCELED\\|NOTE\\|PROJECT}" ((org-agenda-files (quote ("~/Documents/Tasks/todo.txt"))) (org-agenda-overriding-header "Unscheduled tasks: ") (org-agenda-skip-function (quote (org-agenda-skip-entry-if (quote scheduled) (quote deadline) (quote timestamp) (quote regexp) "\\* \\(DEFERRED\\|SOMEDAY\\)"))) (org-agenda-sorting-strategy (quote (priority-down))))) ("U" "Deferred tasks" tags "TODO=\"DEFERRED\"" ((org-agenda-files (quote ("~/Documents/Tasks/todo.txt"))) (org-agenda-overriding-header "Deferred tasks:"))) ("Y" "Someday tasks" tags "TODO=\"SOMEDAY\"" ((org-agenda-overriding-header "Someday tasks:"))) ("w" "Unscheduled work-related tasks" tags "AREA=\"Work\"&TODO<>\"\"&TODO<>{DONE\\|CANCELED\\|NOTE\\|PROJECT}" ((org-agenda-overriding-header "Unscheduled work-related tasks") (org-agenda-files (quote ("~/Documents/Tasks/todo.txt"))) (org-agenda-sorting-strategy (quote (todo-state-up priority-down category-up))) (org-agenda-skip-function (quote (org-agenda-skip-entry-if (quote scheduled) (quote deadline) (quote timestamp)))))) ("v" "All work-related tasks" tags "AREA=\"Work\"&TODO<>\"\"&TODO<>{DONE\\|CANCELED\\|NOTE\\|PROJECT}" ((org-agenda-overriding-header "Work-related tasks") (org-agenda-files (quote ("~/Documents/Tasks/todo.txt"))) (org-agenda-sorting-strategy (quote (todo-state-up category-up priority-down alpha-up))) (org-agenda-skip-function (quote (org-agenda-skip-entry-if (quote regexp) "\\* \\(SOMEDAY\\)"))))) ("l" "Ledger tasks" tags-todo "TODO<>{SOMEDAY\\|DEFERRED}" ((org-agenda-files (quote ("~/src/ledger/plan/TODO"))) (org-agenda-overriding-header "Ledger tasks:") (org-agenda-sorting-strategy (quote (todo-state-up priority-down category-up))) (org-agenda-skip-function (quote (org-agenda-skip-entry-if (quote regexp) "\\=.*\\[#C\\]"))))) ("L" "Ledger tasks not in Bugzilla" tags "TODO<>{DONE\\|TESTED\\|CLOSED\\|CANCELED\\|WONTFIX\\|WORKSFORME\\|INVALID\\|DUPLICATE\\|NOTE}&LEVEL=2" ((org-agenda-files (quote ("~/src/ledger/plan/TODO"))) (org-agenda-overriding-header "Ledger tasks:") (org-agenda-sorting-strategy (quote (todo-state-up priority-down category-up))) (org-agenda-skip-function (quote (org-agenda-skip-entry-if (quote regexp) "[^(]#[0-9]+\\]"))))) ("G" "Ledger tasks (all)" alltodo "" ((org-agenda-files (quote ("~/src/ledger/plan/TODO"))) (org-agenda-overriding-header "Ledger tasks:") (org-agenda-sorting-strategy (quote (todo-state-up priority-down category-up))))) ("N" "Ledger tasks (all, alphabetical)" alltodo "" ((org-agenda-files (quote ("~/src/ledger/plan/TODO"))) (org-agenda-overriding-header "Ledger tasks, alphabetical:") (org-agenda-sorting-strategy (quote (alpha-up))))) ("n" "Notes" tags "TODO=\"NOTE\"" ((org-agenda-files (quote ("~/Documents/Tasks/archive-2009.txt" "~/Documents/Tasks/archive-2010.txt" "~/Documents/Tasks/archive-2011.txt" "~/Documents/Tasks/archive.txt" "~/Documents/Tasks/notes.txt"))) (org-agenda-overriding-header "Notes") (org-agenda-sorting-strategy (quote (time-down))))) ("S" "Assembly Action Items" tags-todo "TODO<>\"PROJECT\"" ((org-agenda-files (quote ("~/Documents/Tasks/assembly.txt"))) (org-agenda-overriding-header "Assembly Action Items") (org-agenda-sorting-strategy (quote (alpha-up time-up))))))))
'(org-agenda-deadline-leaders (quote ("!D!: " "D%02d: ")))
'(org-agenda-default-appointment-duration 60)
- '(org-agenda-files (quote ("~/src/vps/INSTALL.org" "~/Documents/Tasks/todo.txt" "~/Documents/Tasks/assembly.txt" "~/src/ledger/plan/TODO")))
+ '(org-agenda-files (quote ("~/Documents/Tasks/assembly.txt" "~/src/vps/INSTALL.org" "~/Documents/Tasks/todo.txt" "~/src/ledger/plan/TODO")))
'(org-agenda-fontify-priorities t)
'(org-agenda-include-diary t)
'(org-agenda-log-mode-items (quote (closed clock state)))
2 override/gnus
@@ -1 +1 @@
-Subproject commit 9806f12a6fd752f202592a9b630800b8d7906c77
+Subproject commit 3349348c67dc68f0a7a87625a2406a5685602282
View
8 settings.el
@@ -5,6 +5,7 @@
;; If there is more than one, they won't work right.
'(Info-fit-frame-flag nil)
'(TeX-PDF-mode t)
+ '(TeX-electric-escape t)
'(TeX-engine (quote xetex))
'(TeX-expand-list (quote (("%p" TeX-printer-query) ("%q" (lambda nil (TeX-printer-query t))) ("%V" (lambda nil (TeX-source-correlate-start-server-maybe) (TeX-view-command-raw))) ("%vv" (lambda nil (TeX-source-correlate-start-server-maybe) (TeX-output-style-check TeX-output-view-style))) ("%v" (lambda nil (TeX-source-correlate-start-server-maybe) (TeX-style-check TeX-view-style))) ("%r" (lambda nil (TeX-style-check TeX-print-style))) ("%l" (lambda nil (TeX-style-check LaTeX-command-style))) ("%(PDF)" (lambda nil (if (and (eq TeX-engine (quote default)) (or TeX-PDF-mode TeX-DVI-via-PDFTeX)) "pdf" ""))) ("%(PDFout)" (lambda nil (cond ((and (eq TeX-engine (quote xetex)) (not TeX-PDF-mode)) " -no-pdf") ((and (eq TeX-engine (quote luatex)) (not TeX-PDF-mode)) " --output-format=dvi") ((and (eq TeX-engine (quote default)) (not TeX-PDF-mode) TeX-DVI-via-PDFTeX) " \"\\pdfoutput=0 \"") (t "")))) ("%(mode)" (lambda nil (if TeX-interactive-mode "" " -interaction=nonstopmode"))) ("%(o?)" (lambda nil (if (eq TeX-engine (quote omega)) "o" ""))) ("%(tex)" (lambda nil (eval (nth 2 (assq TeX-engine (TeX-engine-alist)))))) ("%(latex)" (lambda nil (eval (nth 3 (assq TeX-engine (TeX-engine-alist)))))) ("%(execopts)" ConTeXt-expand-options) ("%S" TeX-source-correlate-expand-options) ("%dS" TeX-source-specials-view-expand-options) ("%cS" TeX-source-specials-view-expand-client) ("%(outpage)" (lambda nil (if TeX-source-correlate-output-page-function (funcall TeX-source-correlate-output-page-function) "1"))) ("%s" file nil t) ("%t" file t t) ("%`" (lambda nil (setq TeX-command-pos t TeX-command-text ""))) (" \"\\" (lambda nil (if (eq TeX-command-pos t) (setq TeX-command-pos pos pos (+ 3 pos)) (setq pos (1+ pos))))) ("\"" (lambda nil (if (numberp TeX-command-pos) (setq TeX-command-text (concat TeX-command-text (substring command TeX-command-pos (1+ pos))) command (concat (substring command 0 TeX-command-pos) (substring command (1+ pos))) pos TeX-command-pos TeX-command-pos t) (setq pos (1+ pos))))) ("%'" (lambda nil (prog1 (if (stringp TeX-command-text) (progn (setq pos (+ (length TeX-command-text) 9) TeX-command-pos (and (string-match " " (funcall file t t)) "\"")) (concat TeX-command-text " \"\\input\"")) (setq TeX-command-pos nil) "") (setq TeX-command-text nil)))) ("%n" TeX-current-line) ("%d" file "dvi" t) ("%f" file "ps" t) ("%o" (lambda nil (funcall file (TeX-output-extension) t))) ("%b" TeX-current-file-name-master-relative) ("%m" preview-create-subdirectory) ("%O" (lambda nil (expand-file-name (funcall file (TeX-output-extension) t)))))))
'(TeX-view-program-list (quote (("Skim" ("osascript" " ~/bin/skim-gotopage.script" " %O" (mode-io-correlate " %(outpage)"))))))
@@ -103,11 +104,12 @@
'(enable-recursive-minibuffers t)
'(erc-auto-query (quote window-noselect))
'(erc-autoaway-message "I'm away (after %i seconds of idle-time)")
- '(erc-autojoin-channels-alist (quote (("localhost" "&bitlbee") ("freenode.net" "#emacs-ops" "#haskell" "#haskell-in-depth" "#haskell-overflow" "#haskell-blah" "#haskell-ops" "#haskell-lens" "#scannedinavian" "#ledger" "##categorytheory" "#agda" "#coq" "#ghc") ("well-typed.com" "#fpcomplete") ("oftc.net" "#llvm"))))
+ '(erc-autojoin-channels-alist (quote (("localhost" "&bitlbee") ("freenode.net" "#emacs-ops" "#haskell" "#haskell-in-depth" "#haskell-overflow" "#haskell-blah" "#haskell-ops" "#haskell-lens" "#ledger" "##categorytheory" "#agda" "#coq" "#ghc") ("well-typed.com" "#fpcomplete") ("oftc.net" "#llvm"))))
'(erc-autojoin-mode t)
'(erc-fill-function (quote erc-fill-variable))
'(erc-fill-static-center 12)
'(erc-fools (quote ("JordiGH" "nyc")))
+ '(erc-format-nick-function (quote erc-format-@nick))
'(erc-generate-log-file-name-function (quote erc-generate-log-file-name-short))
'(erc-header-line-format nil)
'(erc-hide-list (quote ("JOIN" "NICK" "PART" "QUIT" "MODE")))
@@ -125,7 +127,6 @@
'(erc-services-mode t)
'(erc-text-matched-hook (quote (erc-log-matches erc-hide-fools my-erc-hook)))
'(erc-track-enable-keybindings t)
- '(erc-track-exclude (quote ("#haskell-lens" "#haskell-blah" "#emacs" "#git")))
'(erc-track-exclude-types (quote ("JOIN" "KICK" "NICK" "PART" "QUIT" "MODE" "333" "353")))
'(erc-track-faces-priority-list (quote (erc-error-face (erc-nick-default-face erc-current-nick-face) erc-current-nick-face erc-keyword-face (erc-nick-default-face erc-pal-face) erc-pal-face erc-nick-msg-face erc-direct-msg-face)))
'(erc-track-score-mode t)
@@ -164,6 +165,9 @@
'(haskell-config-use-unicode-symbols t)
'(haskell-doc-use-inf-haskell t)
'(haskell-hoogle-command nil)
+ '(haskell-indentation-ifte-offset 4)
+ '(haskell-indentation-layout-offset 4)
+ '(haskell-indentation-left-offset 4)
'(haskell-mode-hook (quote (turn-on-haskell-indentation turn-on-font-lock turn-on-haskell-decl-scan ghc-init my-haskell-mode-hook)))
'(haskell-program-name "ghci")
'(haskell-saved-check-command "~/.cabal/bin/hlint" t)
2 site-lisp/ghc-mod
@@ -1 +1 @@
-Subproject commit eb4b9b49c6d25d715f298ef57751518e560c618f
+Subproject commit f4a3e8b60d4a7eae1a5c44bd7d4044489ea8a0b3

0 comments on commit 6fc4a60

Please sign in to comment.