Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Switched over to window mode

  • Loading branch information...
commit 8a8eae670c4e0bb5e7300c8dd24b9ad463d5187d 1 parent a49e709
Tim Ewald authored

Showing 3 changed files with 28 additions and 776 deletions. Show diff stats Hide diff stats

  1. +22 0 custom/init.el
  2. +0 775 custom/init.el~
  3. +6 1 init.el
22 custom/init.el
@@ -18,6 +18,28 @@
18 18 ;;(unless (eq system-type 'windows-nt)
19 19 ;; (server-start))
20 20
  21 +(setq ns-pop-up-frames nil)
  22 +
  23 +(defun set-frame-size-according-to-resolution ()
  24 + (interactive)
  25 + (if window-system
  26 + (progn
  27 + ;; use 120 char wide window for largeish displays
  28 + ;; and smaller 80 column windows for smaller displays
  29 + ;; pick whatever numbers make sense for you
  30 + (if (> (x-display-pixel-width) 1280)
  31 + (add-to-list 'default-frame-alist (cons 'width 120))
  32 + (add-to-list 'default-frame-alist (cons 'width 120)))
  33 + ;; for the height, subtract a couple hundred pixels
  34 + ;; from the screen height (for panels, menubars and
  35 + ;; whatnot), then divide by the height of a char to
  36 + ;; get the height we want
  37 + (add-to-list 'default-frame-alist
  38 + (cons 'height (/ (- (x-display-pixel-height) 200)
  39 + (frame-char-height)))))))
  40 +
  41 +(set-frame-size-according-to-resolution)
  42 +
21 43 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
22 44 ;;
23 45 ;; Do any initialization that's specific to this machine
775 custom/init.el~
... ... @@ -1,775 +0,0 @@
1   -(defun load-file-if-exists (path)
2   - (if (file-exists-p path)
3   - (load-file path)))
4   -
5   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
6   -;;
7   -;; Load nxhtml-mode (with MuMaMo)
8   -;;
9   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10   -;(load "~/.emacs.d/custom/nxhtml/autostart.el")
11   -
12   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
13   -;;
14   -;; Start an emacs server except on Windows,
15   -;; where it would open a TCP socket
16   -;;
17   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
18   -(unless (eq system-type 'windows-nt)
19   - (server-start))
20   -
21   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
22   -;;
23   -;; Do any initialization that's specific to this machine
24   -;;
25   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
26   -(load-file-if-exists "~/local-init.el")
27   -
28   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
29   -;;
30   -;; Set up the load-path
31   -;;
32   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
33   -(add-to-list 'load-path "~/.emacs.d/custom/candera/")
34   -(add-to-list 'load-path "~/.emacs.d/custom/")
35   -
36   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
37   -;;
38   -;; Stuff we want to load right away
39   -;;
40   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
41   -
42   -(require 'font-lock)
43   -
44   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
45   -;;
46   -;; io-mode
47   -;;
48   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
49   -
50   -;; (add-to-list 'load-path "~/.emacs.d/custom/io-mode")
51   -;; (require 'io-mode)
52   -
53   -;; (defun io-repl-line ()
54   -;; (interactive)
55   -;; (let ((source-buffer (current-buffer)))
56   -;; (message (buffer-name source-buffer))
57   -;; (save-excursion
58   -;; (beginning-of-line)
59   -;; (let ((start (point)))
60   -;; (end-of-line)
61   -;; (io-repl-sregion start (point))))
62   -;; (pop-to-buffer source-buffer)))
63   -
64   -;; (define-key io-mode-map (kbd "C-M-X") 'io-repl-line)
65   -
66   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
67   -;;
68   -;; This section sets various miscellaneous settings
69   -;;
70   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
71   -
72   -;; Enable CUA-style undo, cut, copy, paste, and selection
73   -;;(cua-mode t)
74   -
75   -;; For the love of all that is holy, unify the emacs kill ring and the
76   -;; clipboard
77   -(setq x-select-enable-clipboard t)
78   -
79   -;; And don't allow tabs to be inserted
80   -(setq-default insert-tabs-mode nil)
81   -
82   -;; Enable iswitchb-mode
83   -;;(iswitchb-mode 1)
84   -
85   -;; Or enable ido-mode
86   -(ido-mode 1)
87   -
88   -;; Enable line numbering globally
89   -(global-linum-mode 1)
90   -
91   -;; Enable line highlighting
92   -(global-hl-line-mode 1)
93   -
94   -;; Enable rainbow parens
95   -;(highlight-parentheses-mode 1)
96   -
97   -(defun scroll-other-window-up-one ()
98   - "Scrolls other window towards top of buffer by one line"
99   - (interactive)
100   - (scroll-other-window-down 1))
101   -
102   -(defun scroll-other-window-down-one ()
103   - "Scrolls other window towards bottom of buffer by one line"
104   - (interactive)
105   - (scroll-other-window-down -1))
106   -
107   -(defun scroll-window-up-one ()
108   - "Scrolls other window towards top of buffer by one line"
109   - (interactive)
110   - (scroll-down 1))
111   -
112   -(defun scroll-window-down-one ()
113   - "Scrolls other window towards bottom of buffer by one line"
114   - (interactive)
115   - (scroll-down -1))
116   -
117   -;; Cursor-style setting functions
118   -(defun set-cursor-type (cursor)
119   - "Modify the cursor to the specified type"
120   - (interactive "sCursor type (bar, box, etc.): ")
121   - (modify-frame-parameters
122   - (selected-frame)
123   - (list (cons 'cursor-type (intern cursor)))))
124   -
125   -(defun set-bar-cursor ()
126   - "Change the cursor to a bar rather than the (default) box"
127   - (interactive)
128   - (set-cursor-type "bar"))
129   -
130   -(defun set-box-cursor ()
131   - "Change the cursor to a box (the default style)"
132   - (interactive)
133   - (set-cursor-type "box"))
134   -
135   -(set-bar-cursor)
136   -
137   -;; A single space ends a sentence
138   -(setq sentence-end-double-space nil)
139   -
140   -;; Use forward slashes between directory elements
141   -;; TODO: This symbol has been deprecated. Change if there's a problem
142   -(setq directory-sep-char ?\/)
143   -
144   -;; Don't blink the cursor
145   -(setq blink-cursor nil)
146   -
147   -;; Move the mouse pointer out of the way when the cursor is near it
148   -(mouse-avoidance-mode 'cat-and-mouse)
149   -
150   -;; Turn off the menu bar and the tool bar, since I never use them.
151   -(menu-bar-mode -1)
152   -(tool-bar-mode -1)
153   -
154   -;; Set up some keybindings that I like
155   -(global-set-key (quote [C-M-down]) 'scroll-other-window-down-one)
156   -(global-set-key (quote [C-M-up]) 'scroll-other-window-up-one)
157   -(global-set-key (quote [C-up]) 'scroll-window-up-one)
158   -(global-set-key (quote [C-down]) 'scroll-window-down-one)
159   -(global-set-key (kbd "C-;") 'flyspell-auto-correct-previous-word)
160   -
161   -;; And define shift-bindings for modes (like shell) that override the control ones
162   -;; (global-set-key (quote [M-S-down]) 'scroll-other-window-down-one)
163   -;; (global-set-key (quote [M-S-up]) 'scroll-other-window-up-one)
164   -;; (global-set-key (quote [S-up]) 'scroll-window-up-one)
165   -;; (global-set-key (quote [S-down]) 'scroll-window-down-one)
166   -
167   -;; (global-set-key (quote [C-tab]) 'iswitchb-buffer)
168   -
169   -;; (global-unset-key [home])
170   -;; (global-unset-key [end])
171   -
172   -;; (global-set-key [home] 'beginning-of-line)
173   -;; (global-set-key [end] 'end-of-line)
174   -;; (global-set-key (quote [C-home]) (quote beginning-of-buffer))
175   -;; (global-set-key (quote [C-end]) (quote end-of-buffer))
176   -;; (global-set-key "\C-z" 'undo)
177   -
178   -;; (defun switch-to-default-buffer ()
179   -;; "Switches to whatever buffer is the default switch-to"
180   -;; (interactive)
181   -;; (switch-to-buffer nil))
182   -
183   -(global-set-key (quote [C-tab]) 'other-window)
184   -
185   -(global-set-key [f12] 'shell)
186   -(global-set-key [f4] 'call-last-kbd-macro)
187   -(global-set-key [f8] 'next-error)
188   -(column-number-mode ())
189   -
190   -(setq default-major-mode 'text-mode)
191   -(setq display-time-day-and-date 'true)
192   -(display-time)
193   -(add-hook 'text-mode-hook 'turn-on-auto-fill)
194   -;; text-mode-hook runs even in modes derived from text-mode, like
195   -;; javascript-mode, where having flyspell turned on is not exactly
196   -;; handy. Turn it off in modes where we don't want it.
197   -(defun turn-on-flyspell ()
198   - "Turns on flyspell-mode"
199   - (interactive)
200   - (flyspell-mode 1))
201   -
202   -(defun turn-off-flyspell ()
203   - "Turns off flyspell-mode"
204   - (interactive)
205   - (flyspell-mode 0))
206   -
207   -(add-hook 'text-mode-hook 'turn-on-flyspell)
208   -(add-hook 'javascript-mode-hook 'turn-off-flyspell)
209   -(add-hook 'emacs-lisp-mode-hook 'turn-off-flyspell)
210   -(add-hook 'ruby-mode-hook 'turn-off-flyspell)
211   -
212   -;; Work around a bug in Ubuntu 10.10
213   -(setq flyspell-issue-welcome-flag nil)
214   -
215   -;; Turn on font-lock by default in all modes
216   -(global-font-lock-mode t)
217   -
218   -;; Highlight region between point and mark
219   -(transient-mark-mode t)
220   -
221   -(defun insert-new-line-above ()
222   - "Insert a new, blank line above the point"
223   - (interactive)
224   - (progn
225   - (move-to-column 0)
226   - (newline)
227   - (previous-line 1)
228   - (indent-according-to-mode)
229   - )
230   - )
231   -
232   -(global-set-key [\C-return] 'insert-new-line-above)
233   -
234   -(defun set-big-font ()
235   - "sets the font to something readable from more than 3 inches away"
236   - (interactive)
237   - (modify-frame-parameters
238   - nil
239   - '( (font . "-outline-Courier New-bold-r-normal-normal-19-142-96-96-c-110-iso10646-1"))))
240   -
241   -(defun set-small-font ()
242   - "sets the font to something readable from more than 3 inches away"
243   - (interactive)
244   - (modify-frame-parameters
245   - nil
246   - '( (font . "-outline-Courier New-bold-r-normal-normal-12-142-96-96-c-110-iso10646-1"))))
247   -
248   -(defun set-default-frame-properties ()
249   - "Sets the frame properties back to the defaults"
250   - (interactive)
251   - (modify-frame-parameters
252   - nil
253   - default-frame-alist))
254   -
255   -(defun insert-current-time ()
256   - "Inserts the current time at point"
257   - (interactive)
258   - (insert (format-time-string "%Y/%m/%d %H:%M:%S")))
259   -
260   -(global-set-key "\C-c\C-t" 'insert-current-time)
261   -
262   -;; Turn on parathesis highlighting in .el files
263   -;(add-hook 'emacs-lisp-mode-hook
264   -; (lambda () (highlight-parentheses-mode 1)))
265   -
266   -;; Make ido-mode list things vertically
267   -;; (setq ido-decorations
268   -;; (quote
269   -;; ("\n-> " ; Opening bracket around prospect list
270   -;; "" ; Closing bracket around prospect list
271   -;; "\n " ; separator between prospects
272   -;; "\n ..." ; appears at end of truncated list of prospects
273   -;; "[" ; opening bracket around common match string
274   -;; "]" ; closing bracket around common match string
275   -;; " [No match]" ; displayed when there is no match
276   -;; " [Matched]" ; displayed if there is a single match
277   -;; " [Not readable]" ; current diretory is not readable
278   -;; " [Too big]" ; directory too big
279   -;; " [Confirm]"))) ; confirm creation of new file or buffer
280   -
281   -;; Tell emacs to wrap lines in vertically split windows
282   -(setq truncate-partial-width-windows nil)
283   -
284   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
285   -;;
286   -;; Associate javascript mode with .js files
287   -;;
288   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
289   -
290   -(add-to-list 'auto-mode-alist '("\\.js\\'" . javascript-mode))
291   -(autoload 'javascript-mode "javascript" nil t)
292   -
293   -
294   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
295   -;;
296   -;; This section sets up simple refactoring support
297   -;; (only symbol renaming at this point)
298   -;;
299   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
300   -;(require 'refactor)
301   -
302   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
303   -;;
304   -;; Autocomplete
305   -;; http://cx4a.org/software/auto-complete/
306   -;; https://github.com/m2ym/auto-complete.git
307   -;;
308   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
309   -
310   -;(add-to-list 'load-path "~/.emacs.d/custom/auto-complete")
311   -;(require 'auto-complete)
312   -
313   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
314   -;;;
315   -;;; Support paredit for better paren
316   -;;; editing in Lisp mode
317   -;;;
318   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
319   -
320   -(autoload 'paredit-mode "paredit"
321   - "Minor mode for pseudo-structurally editing Lisp code."
322   - t)
323   -(add-hook 'lisp-mode-hook '(lambda () (paredit-mode +1)))
324   -
325   -(show-paren-mode t)
326   -
327   -;; (load "paredit.el")
328   -
329   -;; (define-key paredit-mode-map (kbd "M-)")
330   -;; 'paredit-close-parenthesis-and-newline)
331   -
332   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
333   -;;;
334   -;;; Support for SLIME
335   -;;;
336   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
337   -
338   -(add-to-list 'load-path "~/.emacs.d/custom/slime-2010-05-19/") ; your SLIME directory
339   -(add-to-list 'load-path "~/.emacs.d/custom/slime-2010-05-19/contrib") ; your SLIME contrib directory
340   -
341   -
342   -;;(add-to-list 'load-path "~/emacs/slime-2008-11-03/") ; your SLIME directory
343   -;;(add-to-list 'load-path "~/emacs/slime-2008-11-03/contrib") ; your SLIME contrib directory
344   -;; (setq
345   -;; ; inferior-lisp-program "C:/bin/clisp-2.45/clisp -K full" ; your Lisp system
346   -;; ;inferior-lisp-program "C:/bin/sbcl-1.0.14.22/sbcl --core C:/bin/sbcl-1.0.14.22/sbcl.core" ; your Lisp system
347   -;; slime-complete-symbol-function 'slime-fuzzy-complete-symbol ; fuzzy symbol completion (requires slime-fuzzy from contrib)
348   -;; ;slime-complete-symbol-function 'slime-complete-symbol ; standard symbol completion
349   -;; lisp-indent-function 'common-lisp-indent-function ; How would you like to indent?
350   -;; )
351   -
352   -(require 'slime)
353   -(slime-setup '(slime-repl slime-editing-commands slime-fuzzy slime-presentations slime-scratch))
354   -;(slime-setup '(slime-fancy))
355   -
356   -;(setq slime-complete-symbol-function 'slime-fuzzy-complete-symbol) ; fuzzy symbol completion (requires slime-fuzzy from contrib)
357   -
358   -(if (functionp 'slime-local-setup)
359   - (slime-local-setup))
360   -
361   -;; Turn off the annoying SLIME version mismatch message
362   -
363   -(eval-after-load 'slime '(setq slime-protocol-version 'ignore))
364   -
365   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
366   -;;
367   -;; Autocomplete for SLIME
368   -;;
369   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
370   -
371   -;; (require 'ac-slime)
372   -;; (add-hook 'slime-mode-hook 'set-up-slime-ac)
373   -;; (add-hook 'slime-repl-mode-hook 'set-up-slime-ac)
374   -
375   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376   -;;
377   -;; This section sets up clojure-mode
378   -;;
379   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
380   -
381   -;; Require clojure-mode to load and associate it to all .clj files.
382   -(add-to-list 'load-path "~/.emacs.d/custom/clojure-mode/")
383   -
384   -(autoload 'clojure-mode "clojure-mode" "A major mode for Clojure" t)
385   -(add-to-list 'auto-mode-alist '("\\.clj$" . clojure-mode))
386   -
387   -
388   -;; Turn on paredit for clojure files
389   -;(require 'clojure-paredit)
390   -(setq clojure-enable-paredit t)
391   -
392   -;; These are extra key defines because I kept typing them.
393   -;; Within clojure-mode, have Ctrl-x Ctrl-e evaluate the last
394   -;; expression.
395   -;; Ctrl-c Ctrl-e is also there, because I kept typoing it.
396   -(add-hook 'clojure-mode-hook
397   - '(lambda ()
398   -; (highlight-parentheses-mode 1)
399   - (linum-mode 1)
400   - (paredit-mode 1)
401   - (flyspell-mode 0)
402   - (define-key clojure-mode-map "\C-c\C-e" 'lisp-eval-last-sexp)
403   - (define-key clojure-mode-map "\C-x\C-e" 'lisp-eval-last-sexp)
404   - ;; Fix the keys that paredit screws up
405   - (define-key paredit-mode-map (kbd "<C-left>") nil)
406   - (define-key paredit-mode-map (kbd "<C-right>") nil)
407   - ;; And define some new bindings since the OS eats some of the useful ones
408   - (define-key paredit-mode-map (kbd "<C-S-left>") 'paredit-backward-slurp-sexp)
409   - (define-key paredit-mode-map (kbd "<C-S-right>") 'paredit-forward-slurp-sexp)
410   - (define-key paredit-mode-map (kbd "<M-S-left>") 'paredit-backward-barf-sexp)
411   - (define-key paredit-mode-map (kbd "<M-S-right>") 'paredit-forward-barf-sexp)
412   - ;; Not all terminals can transmit the standard key sequencences for
413   - ;; paredit-forward-slurp-sexp, which is super-useful
414   - (define-key paredit-mode-map (kbd "C-c )") 'paredit-forward-slurp-sexp)))
415   -
416   -(require 'clojure-test-mode)
417   -
418   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
419   -;;
420   -;; elein-mode
421   -;;
422   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
423   -
424   -(add-to-list 'load-path "~/.emacs.d/custom/elein")
425   -(require 'elein)
426   -
427   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
428   -;;;
429   -;;; Set up java doc browser for clojure
430   -;;;
431   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
432   -
433   -(defun slime-java-describe (symbol-name)
434   - "Get details on Java class/instance at point."
435   - (interactive (list (slime-read-symbol-name "Java Class/instance: ")))
436   - (when (not symbol-name)
437   - (error "No symbol given"))
438   - (save-excursion
439   - (set-buffer (slime-output-buffer))
440   - (unless (eq (current-buffer) (window-buffer))
441   - (pop-to-buffer (current-buffer) t))
442   - (goto-char (point-max))
443   - (insert (concat "(show " symbol-name ")"))
444   - (when symbol-name
445   - (slime-repl-return)
446   - (other-window 1))))
447   -
448   -(defun slime-javadoc (symbol-name)
449   - "Get JavaDoc documentation on Java class at point."
450   - (interactive (list (slime-read-symbol-name "JavaDoc info for: ")))
451   - (when (not symbol-name)
452   - (error "No symbol given"))
453   - (set-buffer (slime-output-buffer))
454   - (unless (eq (current-buffer) (window-buffer))
455   - (pop-to-buffer (current-buffer) t))
456   - (goto-char (point-max))
457   - (insert (concat "(javadoc " symbol-name ")"))
458   - (when symbol-name
459   - (slime-repl-return)
460   - (other-window 1)))
461   -
462   -(add-hook 'slime-connected-hook (lambda ()
463   - (interactive)
464   -;; slime-redirect-inferior-output causes problems with slime-connect
465   -;; workaround available here:
466   -;; http://github.com/technomancy/swank-clojure/issues/issue/18
467   -;(slime-redirect-inferior-output)
468   -(define-key slime-mode-map (kbd "C-c d") 'slime-java-describe)
469   -(define-key slime-repl-mode-map (kbd "C-c d") 'slime-java-describe)
470   -(define-key slime-mode-map (kbd "C-c D") 'slime-javadoc)
471   -(define-key slime-repl-mode-map (kbd "C-c D") 'slime-javadoc)))
472   -
473   -
474   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
475   -;;
476   -;; This section sets up Craig's web-lookup utilities
477   -;;
478   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
479   -(require 'web-lookup)
480   -
481   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
482   -;;
483   -;; This section sets up Craig's typing-speed-mode
484   -;;
485   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
486   -(load "~/.emacs.d/custom/candera/typing-speed.el")
487   -(add-hook 'text-mode-hook (lambda ()
488   - (turn-on-typing-speed)))
489   -
490   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
491   -;;
492   -;; This section sets up Craig's view-visited-file-mode
493   -;;
494   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
495   -(require 'view-visited-file)
496   -
497   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
498   -;;
499   -;; This section sets up Craig's outline-presentation-mode
500   -;;
501   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
502   -
503   -;; Turn on Craig's outline-presentation hacks.
504   -(load "~/.emacs.d/custom/candera/outline-presentation.el")
505   -
506   -(global-set-key (quote [f5]) 'outline-presentation-mode-on)
507   -(global-set-key (quote [f6]) 'lisp-mode)
508   -
509   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
510   -;;
511   -;; This section sets up Craig's journal functionality
512   -;;
513   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
514   -
515   -;;(defvar *journal-roots* '("Z:/daily/" "C:/data/daily/"))
516   -(load-file "~/.emacs.d/custom/candera/journal.el")
517   -(global-set-key "\C-x\C-y" 'find-yesterday-log-file)
518   -
519   -
520   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
521   -;
522   -; Enable xml-lite for editing XML
523   -;
524   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
525   -
526   -;; (add-to-list 'load-path (expand-file-name "~/emacs/xml-lite"))
527   -;; (autoload 'xml-lite-mode "xml-lite" "Major mode to edit XML files" t)
528   -;; (setq auto-mode-alist
529   -;; (append '(
530   -;; ("\\.xml$" . sgml-mode)
531   -;; ("\\.build$" . sgml-mode)
532   -;; ("\\.config$" . sgml-mode)
533   -;; ("\\.xslt$" . sgml-mode)
534   -;; ("\\.xsl$" . sgml-mode)
535   -;; ("\\.xsd$" . sgml-mode)
536   -;; ) auto-mode-alist ))
537   -;; (add-hook 'sgml-mode-hook 'xml-lite-mode)
538   -
539   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
540   -;
541   -; Set bash as the preferred shell
542   -;
543   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
544   -
545   -;; For the interactive shell
546   -; (setq explicit-shell-file-name "bash.exe")
547   -
548   -;; For subprocesses invoked via the shell (e.g., "shell -c command")
549   -; (setq shell-file-name explicit-shell-file-name)
550   -
551   -;; (defun my-shell-setup ()
552   -;; "For Cygwin bash under Emacs 20"
553   -;; (setq comint-scroll-show-maximum-output 'this)
554   -;; (setq comint-completion-addsuffix t)
555   -;; ;; (setq comint-process-echoes t) ;; reported that this is no longer needed
556   -;; (setq comint-eol-on-send t)
557   -;; (setq w32-quote-process-args ?\")
558   -;; (make-variable-buffer-local 'comint-completion-addsuffix))
559   -
560   -;; (setq shell-mode-hook 'my-shell-setup)
561   -
562   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
563   -;
564   -; Set up the command shell
565   -;
566   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
567   -
568   -(defun my-shell-setup ()
569   - "For cmdproxy shell under Emacs 20"
570   - (setq w32-quote-process-args ?\")
571   - (make-variable-buffer-local 'comint-completion-addsuffix))
572   -
573   -(setq shell-mode-hook 'my-shell-setup)
574   -
575   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
576   -;
577   -; This sets CVS to use plink, which SourceForge requires
578   -;
579   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
580   -(setenv "CVS_RSH" "plink")
581   -
582   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
583   -;
584   -; This sets up my FlexWiki mode
585   -;
586   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
587   -(add-to-list 'load-path (expand-file-name "~/.emacs.d/custom/flexwiki"))
588   -(add-to-list 'auto-mode-alist '("\\.wiki$" . flexwiki-mode))
589   -(require 'flexwiki)
590   -
591   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
592   -;
593   -; Sets up outline-mode
594   -;
595   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
596   -(add-to-list 'auto-mode-alist '("\\.outline$" . outline-mode))
597   -(add-hook 'outline-mode-hook 'auto-fill-mode)
598   -
599   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
600   -;;
601   -;; Sets up highlight-symbol mode
602   -;;
603   -;; http://nschum.de/src/emacs/highlight-symbol/
604   -;;
605   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
606   -
607   -;(add-to-list 'load-path "/path/to/highlight-symbol")
608   -(require 'highlight-symbol)
609   -
610   -(global-set-key [(control f3)] 'highlight-symbol-at-point)
611   -(global-set-key [f3] 'highlight-symbol-next)
612   -(global-set-key [(shift f3)] 'highlight-symbol-prev)
613   -(global-set-key [(meta f3)] 'highlight-symbol-prev)
614   -
615   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
616   -;;
617   -;; Set up markdown-mode
618   -;;
619   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
620   -
621   -(autoload 'markdown-mode "markdown-mode.el"
622   - "Major mode for editing Markdown files" t)
623   -(setq auto-mode-alist
624   - (cons '("\\.md" . markdown-mode) auto-mode-alist))
625   -
626   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
627   -;;
628   -;; Set up magit
629   -;;
630   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
631   -
632   -(add-to-list 'load-path "~/.emacs.d/custom/magit")
633   -(require 'magit)
634   -
635   -;; C-x m is normally compose-mail, but I never do mail inside of
636   -;; emacs, whereas I run magit-status all the time
637   -(global-set-key (kbd "C-x m") 'magit-status)
638   -
639   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
640   -;;
641   -;; Set up gist.el
642   -;;
643   -;; http://github.com/defunkt/gist.el
644   -;;
645   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
646   -
647   -(add-to-list 'load-path "~/.emacs.d/custom/gist.el")
648   -(require 'gist)
649   -
650   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
651   -;;
652   -;; Start an edit server for the Chrome extension that lets you edit
653   -;; rich text areas using emacs:
654   -;; http://github.com/stsquad/emacs_chrome
655   -;;
656   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
657   -
658   -(require 'edit-server)
659   -(edit-server-start)
660   -
661   -;; Turn on longlines mode whenever we're in an edit server buffer
662   -(add-hook 'edit-server-text-mode-hook
663   - '(lambda ()
664   - (longlines-mode 1)))
665   -
666   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
667   -;;
668   -;; Support mo-git-blame
669   -;;
670   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
671   -
672   -(add-to-list 'load-path "~/.emacs.d/custom/mo-git-blame")
673   -(autoload 'mo-git-blame-file "mo-git-blame" nil t)
674   -(autoload 'mo-git-blame-current "mo-git-blame" nil t)
675   -
676   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
677   -;;
678   -;; Set up later version of org-mode
679   -;;
680   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
681   -
682   -(setq load-path (cons "~/.emacs.d/custom/org-7.4/lisp" load-path))
683   -(setq load-path (cons "~/.emacs.d/custom/org-7.4/contrib/lisp" load-path))
684   -(require 'org-install)
685   -
686   -(setq org-directory "~/Dropbox/")
687   -(setq org-mobile-directory "~/Dropbox/MobileOrg/")
688   -(setq org-agenda-files '("~/Dropbox/notes.txt"))
689   -(setq org-mobile-inbox-for-pull "~/Dropbox/inbox.org")
690   -
691   -(setq org-todo-keywords (quote ((sequence "TODO" "INPROGRESS" "DONE"))))
692   -
693   -;; org-mode refuses to invoke org-indent-mode in emacs 23, claiming
694   -;; that it might crash. So I set this variable, which gets me the same
695   -;; effect.
696   -(setq org-hide-leading-stars t)
697   -
698   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
699   -;;
700   -;; Set up nXhtml mode
701   -;;
702   -;; http://ourcomments.org/Emacs/nXhtml/doc/nxhtml.html
703   -;;
704   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
705   -(load "~/.emacs.d/custom/nxhtml/autostart.el")
706   -
707   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
708   -;;
709   -;; Change zap-to-char not to kill the char
710   -;; it zaps to. Taken from
711   -;; http://www.emacswiki.org/emacs/ZapUpToChar
712   -;;
713   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
714   -
715   -(defadvice zap-to-char (after my-zap-to-char-advice (arg char) activate)
716   - "Kill up to the ARG'th occurence of CHAR, and leave CHAR.
717   - The CHAR is replaced and the point is put before CHAR."
718   - (insert char)
719   - (forward-char -1))
720   -
721   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
722   -;;
723   -;; Miscellaneous customizations
724   -;;
725   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
726   -(setq global-hl-line-mode nil)
727   -
728   -(setq confirm-nonexistent-file-or-buffer nil)
729   -
730   -;; '(default ((t (:stipple
731   -;; nil :background "grey10" :foreground "white" :inverse-video
732   -;; nil :box nil :strike-through nil :overline nil :underline
733   -;; nil :slant normal :weight normal :height 140 :width
734   -;; normal :foundry "outline" :family "Courier New"))))
735   -
736   - ;; '(default ((t (:stipple nil :background "grey10" :foreground "white" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 50 :width normal :foundry "unknown" :family "DejaVu Sans Mono"))))
737   -
738   -(custom-set-faces
739   - ;; custom-set-faces was added by Custom.
740   - ;; If you edit it by hand, you could mess it up, so be careful.
741   - ;; Your init file should contain only one such instance.
742   - ;; If there is more than one, they won't work right.
743   - `(default ((t ,(append '(:background "grey10" :foreground "white")
744   - (if (eq system-type 'windows-nt)
745   - '(:foundry "outline"
746   - :family "Courier New"
747   - :weight bold
748   - :height 160
749   - :width normal)
750   - '(:family "DejaVu Sans Mono" :foundry "unknown" :height 140)
751   -)))))
752   - '(mode-line ((((class color) (min-colors 88)) (:background "#8888ff" :foreground "black" :box (:line-width -1 :style released-button)))))
753   - '(cursor ((t (:background "red"))))
754   - '(highline-face ((t (:background "grey20"))))
755   - '(hl-line ((t (:inherit highlight :background "grey20"))))
756   - '(magit-diff-add ((((class color) (background dark)) (:foreground "lightgreen"))))
757   - '(diff-added ((t (:inherit diff-changed :foreground "green"))))
758   - '(diff-removed ((t (:inherit diff-changed :foreground "red"))))
759   - '(magit-item-highlight ((((class color) (background dark)) (:background "grey20"))))
760   - '(nxml-attribute-colon-face ((t (:inherit nxml-name-face :foreground "blue"))))
761   - '(nxml-attribute-local-name-face ((t (:inherit nxml-name-face :foreground "blue"))))
762   - '(nxml-attribute-prefix-face ((t (:inherit nxml-name-face :foreground "blue"))))
763   - '(nxml-namespace-attribute-colon-face ((t (:inherit nxml-name-face :foreground "red"))))
764   - '(nxml-namespace-attribute-prefix-face ((t (:inherit nxml-name-face :foreground "red"))))
765   - '(nxml-namespace-attribute-xmlns-face ((t (:inherit nxml-name-face :foreground "red")))))
766   -
767   -
768   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
769   -;
770   -; Varibles set by "customize" wind up here
771   -;
772   -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
773   -
774   -(if (functionp 'custom-set-variables-local)
775   - (custom-set-variables-local))
7 init.el
@@ -43,6 +43,11 @@
43 43 ;; If you edit it by hand, you could mess it up, so be careful.
44 44 ;; Your init file should contain only one such instance.
45 45 ;; If there is more than one, they won't work right.
  46 + '(default ((t (:inherit nil :stipple nil :background "grey10" :foreground "White" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 160 :width normal :foundry "apple" :family "Monaco"))))
  47 + '(font-lock-function-name-face ((((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue"))))
  48 + '(font-lock-string-face ((((class color) (min-colors 88) (background dark)) (:foreground "LightSalmon"))))
46 49 '(linum ((t (:inherit (shadow default) :foreground "yellow"))))
47 50 '(mode-line ((t (:background "red" :inverse-video nil))))
48   - '(mode-line-inactive ((default (:inherit mode-line :background "grey")) (nil nil))))
  51 + '(mode-line-inactive ((default (:inherit mode-line :background "grey" :foreground "black")) (nil nil))))
  52 +
  53 +

0 comments on commit 8a8eae6

Please sign in to comment.
Something went wrong with that request. Please try again.