Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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: alang9/emacs-configuration
base: 2363d97c56
...
head fork: alang9/emacs-configuration
compare: c7b676d735
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
4 emacs
@@ -2,7 +2,9 @@
(setq load-path (cons "~/.emacs.d/plugins" load-path))
(setq load-path (cons "~/.emacs.d/local" load-path))
-
+(let ((default-directory "~/.emacs.d/plugins/"))
+ (normal-top-level-add-to-load-path '("."))
+ (normal-top-level-add-subdirs-to-load-path))
;; Standard packages
View
4 emacs.d/local/appearance.el
@@ -31,7 +31,9 @@
(add-hook 'js2-mode-hook 'highlight-80+-mode)
(add-hook 'java-mode-hook 'highlight-80+-mode)
(add-hook 'html-mode-hook 'highlight-80+-mode)
- (add-hook 'shell-script-mode-hook 'highlight-80+-mode))
+ (add-hook 'shell-script-mode-hook 'highlight-80+-mode)
+ (add-hook 'haskell-mode-hook 'highlight-80+-mode))
+
(defun scrolling-behaviour ()
(setq scroll-conservatively 1))
View
2  emacs.d/local/custom.el
@@ -17,7 +17,7 @@
'(js2-mirror-mode nil)
'(js2-mode-escape-quotes nil)
'(python-honour-comment-indentation t)
- '(safe-local-variable-values (quote ((test-case-name . twisted\.test\.test_protocols) (test-case-name . twisted\.words\.test\.test_irc) (test-case-name . twisted\.test\.test_factories\,twisted\.internet\.test\.test_protocol) (test-case-name . twisted\.web\.test\.test_web) (test-case-name . twisted\.test\.test_application\,twisted\.test\.test_cooperator) (test-case-name . twisted\.web\.test\.test_http) (test-case-name . twisted\.test\.test_defer\,twisted\.test\.test_defgen\,twisted\.internet\.test\.test_inlinecb))))
+ '(safe-local-variable-values (quote ((haskell-program-name . "/home/alang/Projects/trader/release/bin/ghci") (test-case-name . twisted\.test\.test_protocols) (test-case-name . twisted\.words\.test\.test_irc) (test-case-name . twisted\.test\.test_factories\,twisted\.internet\.test\.test_protocol) (test-case-name . twisted\.web\.test\.test_web) (test-case-name . twisted\.test\.test_application\,twisted\.test\.test_cooperator) (test-case-name . twisted\.web\.test\.test_http) (test-case-name . twisted\.test\.test_defer\,twisted\.test\.test_defgen\,twisted\.internet\.test\.test_inlinecb))))
'(show-paren-delay 0)
'(show-paren-mode 1)
'(show-paren-style (quote expression)))
View
22 emacs.d/local/programming.el
@@ -7,7 +7,7 @@
(local-file (file-relative-name
temp-file
(file-name-directory buffer-file-name))))
- (list "/home/jkakar/.emacs.d/plugins/epylint.py" (list local-file))))
+ (list "/home/alang/.emacs.d/plugins/epylint.py" (list local-file))))
(add-to-list 'flymake-allowed-file-name-masks
'("\\.py\\'" flymake-pyflakes-init))
(add-to-list 'flymake-allowed-file-name-masks
@@ -17,13 +17,14 @@
(outline-setup "^class \\|[ ]*def \\|^#"))
(defun my-flymake-find-file-hook ()
- (if (file-writable-p buffer-file-name)
- (flymake-find-file-hook)))
+ (if buffer-file-name
+ (if (file-writable-p buffer-file-name)
+ (flymake-find-file-hook))))
(defun unset-python-newline-and-indent ()
(local-unset-key [?\C-j]))
-(add-hook 'find-file-hook 'my-flymake-find-file-hook)
+;; (add-hook 'find-file-hook 'my-flymake-find-file-hook)
(add-hook 'python-mode-hook 'python-outline-settings)
(add-hook 'python-mode-hook
'(lambda () "Defaults for Python mode." (setq fill-column 78)))
@@ -76,5 +77,18 @@
(define-key global-map "\C-ca" 'org-agenda)
(setq org-log-done t)
+;; Haskell
+
+(add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
+(remove-hook 'haskell-mode-hook 'turn-on-haskell-indent)
+(remove-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
+(add-hook 'haskell-mode-hook 'my-haskell-mode-hook)
+(defun my-haskell-mode-hook ()
+ (haskell-indentation-mode -1) ;; turn off, just to be sure
+ (haskell-indent-mode 1) ;; turn on indent-mode
+ )
+(autoload 'ghc-init "ghc" nil t)
+;; flymake breaks emerge and ediff...
+;;(add-hook 'haskell-mode-hook (lambda () (ghc-init) (flymake-mode)))
(provide 'programming)

No commit comments for this range

Something went wrong with that request. Please try again.