Permalink
Browse files

Merge branch 'master' of github.com:candera/emacs

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
  • Loading branch information...
candera committed Feb 22, 2013
2 parents 2fab946 + cc9ab7f commit 85b08e0d316cf2e3f6bcfa51a69a80a28d689af4
Showing with 10 additions and 10 deletions.
  1. +1 −1 clojure-mode
  2. +8 −8 colors.el
  3. +1 −1 nrepl.el
View
@@ -29,17 +29,17 @@
'(:foundry "outline"
:family "Courier New"
:weight normal
- :height 160
:width normal))
- ((or (eq system-type 'gnu/linux) (eq system-type 'cygwin))
- `(:foundry "unknown"
+ ((or (eq system-type 'cygwin))
+ '(:foundry "outline"
+ :family "Bitstream Vera Sans Mono"
+ :weight normal
+ :width normal
+ :height 120))
+ ((or (eq system-type 'gnu/linux))
+ '(:foundry "unknown"
:family "Courier 10 Pitch"
:weight normal
- ;; We want to use a different font if we're doing remote
- ;; display back to Windows, so we look to see if DISPLAY
- ;; is something like :0.0. But on Cygwin, we stick with 140
- :height ,(if (eq system-type 'cygwin) 140
- (if (string= (substring (or (get-display) ":") 0 1) ":") 120 140))
:width normal))))))
;; '(mode-line ((((class color) (min-colors 88)) (:background "#8888ff" :foreground "black" :box (:line-width -1 :style released-button)))))
;; '(cursor ((t (:background "red"))))

0 comments on commit 85b08e0

Please sign in to comment.