Skip to content

Commit

Permalink
Think I got this straightened out
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew Trentacoste committed Feb 24, 2011
1 parent 02da5a0 commit 8b57075
Show file tree
Hide file tree
Showing 7 changed files with 125 additions and 27 deletions.
13 changes: 0 additions & 13 deletions custom.el

This file was deleted.

57 changes: 53 additions & 4 deletions mmt.el
Original file line number Diff line number Diff line change
@@ -1,12 +1,61 @@

;; Default font
; (set-default-font "-misc-fixed-medium-*-normal-*-*-80-*-*-c-*-*-*")

(add-to-list 'load-path (concat dotfiles-dir "/vendor"))
;(add-to-list 'load-path (concat dotfiles-dir "/topfunky"))
(add-to-list 'load-path (concat dotfiles-dir "/mtrent"))

(load (concat dotfiles-dir "topfunky.el"))
;(require 'topfunky)

(add-to-list 'load-path (concat dotfiles-dir "/vendor/textmate.el"))
(require 'textmate)
(require 'peepopen)
(textmate-mode)
(setq ns-pop-up-frames nil)

(require 'maxframe)
(setq mf-display-padding-width 50)
(add-hook 'window-setup-hook 'maximize-frame t)

(require 'revbufs)

(setq mac-allow-anti-aliasing nil)
(load (concat dotfiles-dir "mtrent/twilight.el"))
(color-theme-twilight)

(setq mac-allow-anti-aliasing nil)

(global-set-key (kbd "M- ") 'set-mark-command)

(custom-set-variables
;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(cc-other-file-alist
(quote
(("\\.cc\\'" (".hh" ".h"))
("\\.hh\\'" (".cc" ".C"))
("\\.m\\'" (".h"))
("\\.c\\'" (".h"))
("\\.h\\'" (".c" ".cc" ".C" ".CC" ".cxx" ".cpp" ".m"))
("\\.C\\'" (".H" ".hh" ".h"))
("\\.H\\'" (".C" ".CC"))
("\\.CC\\'" (".HH" ".H" ".hh" ".h"))
("\\.HH\\'" (".CC"))
("\\.c\\+\\+\\'" (".h++" ".hh" ".h"))
("\\.h\\+\\+\\'" (".c++"))
("\\.cpp\\'" (".hpp" ".hh" ".h"))
("\\.hpp\\'" (".cpp"))
("\\.cxx\\'" (".hxx" ".hh" ".h"))
("\\.hxx\\'" (".cxx")))))
'(javascript-indent-level 2))

(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(default ((t (:inherit nil :stipple nil
:inverse-video nil :box nil
:strike-through nil :overline nil :underline nil
:slant normal :weight normal :height 110 :width normal
:foundry "apple" :family "Menlo")))))
66 changes: 66 additions & 0 deletions mtrent/twilight.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
;; Twilight Colour Theme for Emacs.
;;
;; Defines a colour scheme resembling that of the original TextMate Twilight colour theme.
;; To use add the following to your .emacs file (requires the color-theme package):
;;
;; (require 'color-theme)
;; (color-theme-initialize)
;; (load-file "~/.emacs.d/twilight-emacs/color-theme-twilight.el")
;;
;; And then (color-theme-twilight) to activate it.
;;
;; Several areas still require improvement such as recognition of code that ruby-mode doesn't
;; yet pick up (eg. parent classes), Rails/Merb keywords, or non Ruby code related areas
;; (eg. dired, HTML, etc). Please feel free to customize further and send in any improvements,
;; patches most welcome.
;;
;; MIT License Copyright (c) 2008 Marcus Crafter <crafterm@redartisan.com>
;; Credits due to the excellent TextMate Twilight theme

(require 'color-theme)

;;;###autoload
(defun color-theme-twilight ()
"Color theme by Marcus Crafter, based off the TextMate Twilight theme, created 2008-04-18"
(interactive)
(color-theme-install
'(color-theme-twilight
((background-color . "#0C0C0C")
(background-mode . dark)
(border-color . "black")
(cursor-color . "#A7A7A7")
(foreground-color . "#C2C2C2")
(mouse-color . "sienna1"))
(default ((t (:background "#0C0C0C" :foreground "#C2C2C2"))))
(blue ((t (:foreground "blue"))))
(bold ((t (:bold t))))
(bold-italic ((t (:bold t))))
(border-glyph ((t (nil))))
(buffers-tab ((t (:background "#0C0C0C" :foreground "#C2C2C2"))))
(font-lock-builtin-face ((t (:foreground "white"))))
(font-lock-comment-face ((t (:foreground "#5F5A60"))))
(font-lock-constant-face ((t (:foreground "#CF6A4C"))))
(font-lock-doc-string-face ((t (:foreground "DarkOrange"))))
(font-lock-function-name-face ((t (:foreground "#9B703F"))))
(font-lock-keyword-face ((t (:foreground "#CDA869"))))
(font-lock-preprocessor-face ((t (:foreground "Aquamarine"))))
(font-lock-reference-face ((t (:foreground "SlateBlue"))))

(font-lock-regexp-grouping-backslash ((t (:foreground "#E9C062"))))
(font-lock-regexp-grouping-construct ((t (:foreground "red"))))

(font-lock-string-face ((t (:foreground "#8F9D6A"))))
(font-lock-type-face ((t (:foreground "#9B703F"))))
(font-lock-variable-name-face ((t (:foreground "#7587A6"))))
(font-lock-warning-face ((t (:bold t :foreground "Pink"))))
(gui-element ((t (:background "#303030" :foreground "black"))))
(region ((t (:background "#444444"))))
(mode-line ((t (:background "#303030" :foreground "black"))))
(highlight ((t (:background "#222222"))))
(highline-face ((t (:background "SeaGreen"))))
(italic ((t (nil))))
(left-margin ((t (nil))))
(text-cursor ((t (:background "yellow" :foreground "black"))))
(toolbar ((t (nil))))
(underline ((nil (:underline nil))))
(zmacs-region ((t (:background "snow" :foreground "ble")))))))
7 changes: 2 additions & 5 deletions topfunky.el
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,7 @@
(color-theme-initialize)

;; Activate theme
(load (concat dotfiles-dir "topfunky/theme.el"))
(color-theme-topfunky)

;(load (concat dotfiles-dir "topfunky/theme.el"))
;(color-theme-topfunky)

(require 'autotest)


File renamed without changes.
9 changes: 4 additions & 5 deletions vendor/peepopen.el
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,14 @@
(string-join " " *textmate-project-roots* )
")")))
(shell-command-to-string
(format "open 'peepopen://%s?editor=%s'"
(expand-file-name root)
(invocation-name)))))
(format "open -a PeepOpen '%s'"
(expand-file-name root)))))

;;;###autoload
(defun peepopen-bind-keys ()
(cond ((featurep 'aquamacs) (peepopen-bind-aquamacs-keys))
((featurep 'mac-carbon) (peepopen-bind-carbon-keys))
((featurep 'ns) (peepopen-bind-ns-keys))))
((featurep 'mac-carbon) (peepopen-bind-carbon-keys))
((featurep 'ns) (peepopen-bind-ns-keys))))

(defun peepopen-bind-aquamacs-keys ()
;; Need `osx-key-mode-map' to override
Expand Down
File renamed without changes.

0 comments on commit 8b57075

Please sign in to comment.