Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: nelhage/elisp
base: 51d088b668
...
head fork: nelhage/elisp
compare: 65f086d0e4
  • 3 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
3  .gitmodules
View
@@ -16,3 +16,6 @@
[submodule "site/markdown-mode"]
path = site/markdown-mode
url = git://jblevins.org/git/markdown-mode.git
+[submodule "site/coffee-mode"]
+ path = site/coffee-mode
+ url = https://github.com/defunkt/coffee-mode.git
1  coffee-mode
View
50 dot-emacs
View
@@ -36,8 +36,8 @@
(setq display-time-24hr-format t)
-(global-set-key (kbd "C-x 4 C-f") 'window-number-find-file)
-(global-set-key (kbd "C-x 4 f") 'window-number-find-file)
+; (global-set-key (kbd "C-x 4 C-f") 'window-number-find-file)
+; (global-set-key (kbd "C-x 4 f") 'window-number-find-file)
(setq lpr-switches '("-h"))
(setq ps-left-header '(ps-get-buffer-name user-full-name))
@@ -694,10 +694,13 @@ unable to perform symbol completion.")
(put 'js2-basic-offset 'safe-local-variable 'integerp)
-
(defun my-javascript-mode-hook ()
(require 'moz))
+(require 'coffee-mode)
+(add-to-list 'auto-mode-alist '("\\.coffee$" . coffee-mode))
+(add-to-list 'auto-mode-alist '("Cakefile" . coffee-mode))
+
;;;LaTeX
(add-hook 'latex-mode-hook 'my-latex-mode-hook)
(add-hook 'LaTeX-mode-hook 'my-latex-mode-hook)
@@ -931,6 +934,8 @@ unable to perform symbol completion.")
;; ruby
(autoload 'ruby-mode "ruby-mode" "" t)
(add-to-list 'auto-mode-alist (cons "\\.rb$" 'ruby-mode))
+(add-to-list 'auto-mode-alist (cons "Rakefile$" 'ruby-mode))
+(add-to-list 'auto-mode-alist (cons "Gemfile$" 'ruby-mode))
(add-to-list 'interpreter-mode-alist (cons "ruby" 'ruby-mode))
(autoload 'run-ruby "inf-ruby" "Run an inferior ruby process" t)
@@ -939,6 +944,9 @@ unable to perform symbol completion.")
(add-hook 'ruby-mode-hook 'my-ruby-mode-hook)
(defun my-ruby-mode-hook ()
nil)
+(eval-after-load 'ruby-mode
+ '(progn
+ (define-key ruby-mode-map (kbd "M-TAB") 'dabbrev-expand)))
;; Matlab
@@ -980,8 +988,7 @@ unable to perform symbol completion.")
;; Mediawiki
(require 'mediawiki)
-(setq mediawiki-site-alist
- '(("Ksplice" "https://saccharine.us.oracle.com/w/" "nelhage" nil "Main Page")))
+(setq mediawiki-site-alist '())
;;Evil DOS file endings, eeeeeeeeevil
(add-hook 'find-file-hook 'find-file-check-line-endings)
@@ -1250,22 +1257,15 @@ surrounding xml expression"
(require 'org-mobile)
(setq org-hide-leading-stars t
org-log-done 'time
- org-agenda-files (list (concat org-directory "/todo.org")
- (concat org-directory "/ksplice.org"))
+ org-agenda-files (list (concat org-directory "/todo.org"))
org-agenda-window-setup 'current-window
org-agenda-restore-windows-after-quit t
org-default-notes-file (concat org-directory "/notes.org")
org-remember-templates
'(("Todo" ?t "* TODO %?\n" "todo.org" "Tasks")
- ("Ksplice" ?k "* TODO %?\n" "ksplice.org" "Ksplice")
("Buy" ?b "* TODO %?" "todo.org" "To Buy"))
org-agenda-custom-commands
- '(("u" tags-todo "SCHEDULED<>{.}&DEADLINE<>{.}-ksplice")
- ("k" "Ksplice todo" tags-todo "KSPLICE")
- ("K" "Ksplice agenda" agenda ""
- ((org-agenda-files
- (list (concat org-directory "/ksplice.org")))))
- ("O" "Other agenda" agenda ""
+ '(("O" "Other agenda" agenda ""
((org-agenda-files
(list (concat org-directory "/todo.org"))))))
org-agenda-skip-deadline-if-done t
@@ -1281,10 +1281,6 @@ surrounding xml expression"
org-mobile-directory "~/Dropbox/org/mobile"
line-move-visual nil)
-(defun my-skip-unless-ksplice ()
- (if (not (member "KSPLICE" (org-get-tags-at (point))))
- (point-max)))
-
(eval-after-load 'org-agenda
'(progn
(set-face-attribute 'org-todo nil
@@ -1408,23 +1404,15 @@ surrounding xml expression"
(defvar initial-terminals
'((term "nelhage.com" "~/")
- (term "ksplice-machine" "~/ksplice")
- (term "ksplice-shell2" "~/ksplice")
- (term "ksplice-zephyr" "~/")
- (shell "ksplice-ksplice" "~/ksplice/ksplice")
- (shell "ksplice-client" "~/ksplice/client")
- (shell "ksplice-dev" "~/ksplice/dev")
- (shell "ksplice-server" "~/ksplice/server")
- (shell "ksplice-operations" "~/ksplice/operations")
- (shell "ksplice-events" "~/ksplice/events")
- (shell "ksplice-status" "~/ksplice/status")
- (shell "linux-2.6" "~/ksplice/linux-2.6")
+ (shell "linux-2.6" "~/code/linux")
(shell "barnowl-dev" "~/code/barnowl")
(shell "llvm-dev" "~/code/llvm")
;; (shell "mysql" "~/")
- (term "mutt" "~/")
(term "mutt-nelhage" "~/")
- (term "oracle-irc" "~/"))
+ (term "mutt-stripe" "~/")
+ (term "stripe-dev" "~/stripe")
+ (term "devbox" "~/stripe/pay-server")
+ )
"Terminals to create initially")
(defun setup-terminals ()
1  site/coffee-mode
@@ -0,0 +1 @@
+Subproject commit c45c5f7a529363bc7aa57db0f3df26389fd233d8
2  site/swank-js
@@ -1 +1 @@
-Subproject commit ab7056c28b6537ff8a2aad7691307c4b3cb9866e
+Subproject commit 31d9b5ade1ab1f630f86228a6f870591a564395f

No commit comments for this range

Something went wrong with that request. Please try again.