Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: jpr5/env
base: 9f1775661d
...
head fork: jpr5/env
compare: b35c2a1b2e
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
View
6 .emacs.d/display.el
@@ -20,9 +20,11 @@
(if window-system
(progn ;; Graphics mode
(setq default-frame-alist '((cursor-type . (bar . 3))))
- (setq initial-frame-alist (x-parse-geometry "150x40+5+5")) ;; cols x rows (character) +x+y (pixel)
(set-face-attribute 'default nil :height 150)
- (modify-frame-parameters (selected-frame) initial-frame-alist) ;; initial window size
+
+ (let ((frame (selected-frame)))
+ (set-frame-position frame 0 0)
+ (set-frame-size frame 150 40))
(blink-cursor-mode 0)
(when (fboundp 'global-hl-line-mode)
View
8 .emacs.d/mode-ruby.el
@@ -1,9 +1,9 @@
;; ruby-block.el current-block-header hiliting
-(require 'ruby-block)
-(ruby-block-mode t)
-(setq ruby-block-highlight-face 'hl-line)
-(setq ruby-block-highlight-toggle 'overlay)
+(when (require 'ruby-block nil 'noerror)
+ (ruby-block-mode t)
+ (setq ruby-block-highlight-face 'hl-line)
+ (setq ruby-block-highlight-toggle 'overlay))
;; Enable Flymake in Ruby
(require 'flymake)
View
6 .emacs.d/settings.el
@@ -33,6 +33,12 @@
(setq grep-template "grep <C> --color=never -nH -wEe <R> <F>")
(setq grep-find-template "find <D> <X> -type f <F> -exec grep --color=never <C> -nH -Ee <R> {} /dev/null \\;")
+; Under 23.x, grep-compute-defaults stores the above defaults on a per-host
+; basis. We get back the per-buffer behaviour by forcing
+; grep-host-defaults-alist to always be buffer-local.
+(if (eq emacs-major-version 23)
+ (make-variable-buffer-local 'grep-host-defaults-alist))
+
;; Use ssh for tramp.
(setq tramp-default-method "ssh")

No commit comments for this range

Something went wrong with that request. Please try again.