From 7fbe31287fd5e4ee1af0560b757cfb6c3b5a3673 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Sat, 22 Nov 2014 14:53:39 +0000 Subject: [PATCH] Fix issues with emacs built without GUI support --- appearance.el | 4 ++-- runtimes/nodejs.el | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/appearance.el b/appearance.el index 2e579d9..4429a62 100644 --- a/appearance.el +++ b/appearance.el @@ -24,7 +24,7 @@ (tool-bar-mode -1) ;; Disable Scrollbar -(set-scroll-bar-mode 'nil) +(if gui-window-system (set-scroll-bar-mode 'nil)) ;; Show matching parentheses (show-paren-mode t) @@ -133,7 +133,7 @@ ;; Customize git-gutter-fringe glyphs. -(when (require 'fringe-helper nil 'noerror) +(when (and gui-window-system (require 'fringe-helper nil 'noerror)) ;; (setq-default left-fringe-width 20) ;; (setq-default right-fringe-width 20) (fringe-helper-define 'git-gutter-fr:added nil diff --git a/runtimes/nodejs.el b/runtimes/nodejs.el index 000bace..506892c 100644 --- a/runtimes/nodejs.el +++ b/runtimes/nodejs.el @@ -3,5 +3,7 @@ ;; ;; nvm -(when (require 'nvm nil 'noerror) +(when (and + (file-directory-p (expand-file-name "~/.nvm")) + (require 'nvm nil 'noerror)) (nvm-use "v0.10.24"))