From f599acde509838ec9c2288cef9184ad89cdc1ce5 Mon Sep 17 00:00:00 2001 From: John Doty Date: Mon, 19 Sep 2016 09:50:57 -0700 Subject: [PATCH] Make devserver customization work for mac --- .emacs.d/core.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.emacs.d/core.el b/.emacs.d/core.el index 5a7dc57..8dd142d 100644 --- a/.emacs.d/core.el +++ b/.emacs.d/core.el @@ -54,9 +54,12 @@ (defconst engshare-master (getenv "ADMIN_SCRIPTS")) (if (file-exists-p (expand-file-name "master.emacs" master-dir)) (load-library (expand-file-name "master.emacs" master-dir)) - (load-library (expand-file-name "master.emacs" engshare-master))) + (if (file-exists-p (expand-file-name "master.emacs" engshare-master)) + (load-library (expand-file-name "master.emacs" engshare-master)))) -(if (string-match-p ".+\.prn1\.facebook\.com" (getenv "HOSTNAME")) +(if (and + (getenv "HOSTNAME") + (string-match-p ".+\.prn1\.facebook\.com" (getenv "HOSTNAME"))) (setq url-proxy-services '(("no_proxy" . "^\\(localhost\\|10.*\\)") ("http" . "fwdproxy:8080")