Skip to content

Commit

Permalink
Various fixes...
Browse files Browse the repository at this point in the history
- Fix CIDER. Again.
- Turn on highlight-symbol-mode always in clojure-mode
- Fix default broken mouse scrolling
  • Loading branch information
candera committed May 5, 2016
1 parent 5f0af21 commit 9f3aa07
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion init.el
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
(unless (package-installed-p package)
(package-install package)))

;; This would be great if it didn't just cause cider to completely disappear
;; (add-to-list 'package-pinned-packages '(cider . "melpa-stable") t)

;; Someone broke org-mobile. We have to load from a fixed copy.
(setq load-path (append '("~/.emacs.d/custom/org-mode/lisp"
"~/.emacs.d/custom/org-mode/contrib/lisp")
Expand Down Expand Up @@ -1098,6 +1101,7 @@ always last."
;; (highlight-parentheses-mode 1)
(unless (eq major-mode 'cider-repl-mode)
(linum-mode 1))
(highlight-symbol-mode t)
(paredit-mode 1)
(hs-minor-mode 1)
(setq show-trailing-whitespace t)
Expand Down Expand Up @@ -1621,7 +1625,18 @@ remain indented by four spaces after refilling."

(add-to-list 'auto-mode-alist '("\\.[Cc][Ss][Vv]\\'" . csv-mode))
(autoload 'csv-mode "csv-mode"
"Major mode for editing comma-separated value files." t)
"Major mode for editing comma-separated value files." t)

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Un-pork scrolling
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(setq mouse-wheel-scroll-amount '(1 ((shift) . 1))) ;; one line at a time
(setq mouse-wheel-progressive-speed nil) ;; don't accelerate scrolling
(setq mouse-wheel-follow-mouse 't) ;; scroll window under mouse
(setq scroll-step 1) ;; keyboard scroll one line at a time

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
Expand Down

0 comments on commit 9f3aa07

Please sign in to comment.