DeCarabas/Init-Files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix for new FB emacs stuff

Browse source 
Summary:

Test Plan:

Reviewers:

Subscribers:

Tasks:

Tags:
This commit is contained in:
doty 2019-05-24 09:50:51 -07:00
parent 56f7d7536f
commit 2b6ffefcc8
1 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
.emacs.d/init.el
View file

@ -67,16 +67,12 @@
(defconst master-dir (getenv "LOCAL_ADMIN_SCRIPTS")) (defconst master-dir (getenv "LOCAL_ADMIN_SCRIPTS"))
(defconst engshare-master (getenv "ADMIN_SCRIPTS")) (defconst engshare-master (getenv "ADMIN_SCRIPTS"))
(defconst is-fb-environment (defconst is-fb-environment
(or (file-exists-p (expand-file-name "master.emacs" master-dir)) (file-exists-p "/usr/share/emacs/site-lisp/fb-master.el")
(file-exists-p (expand-file-name "master.emacs" engshare-master)))
"Are we running on an FB machine or not?") "Are we running on an FB machine or not?")
(when is-fb-environment (when is-fb-environment
;; Load the master.emacs file which apparently has stuff in it I want? ;; Load the master.emacs file which apparently has stuff in it I want?
(if (file-exists-p (expand-file-name "master.emacs" master-dir)) (load-library "/usr/share/emacs/site-lisp/fb-master.el")
(load-library (expand-file-name "master.emacs" master-dir))
(if (file-exists-p (expand-file-name "master.emacs" engshare-master))
(load-library (expand-file-name "master.emacs" engshare-master))))
;; Set up the proxy for working properly from the devserver. ;; Set up the proxy for working properly from the devserver.
(if (and (if (and
@ -787,22 +783,22 @@
;; ================================================================= ;; ;; =================================================================
;; PHP stuff ;; ;; PHP stuff
;; ================================================================= ;; ;; =================================================================
(if is-fb-environment ;; (if is-fb-environment
(progn ;; (progn
;; Hack support for stuff in www ;; ;; Hack support for stuff in www
(setq hack-for-hiphop-root (expand-file-name "www" "~")) ;; (setq hack-for-hiphop-root (expand-file-name "www" "~"))
(load "/home/engshare/tools/hack-for-hiphop") ;; ;;(load "/home/engshare/tools/hack-for-hiphop")
(load-library (expand-file-name "emacs-packages/hh-client.el" master-dir)) ;; (load-library "/usr/share/emacs/site-lisp/emacs-packages/hh-client.el")
(require 'hh-client) ;; (require 'hh-client)
(defun my-fb-php-hook () ;; (defun my-fb-php-hook ()
(global-set-key (kbd "M-.") 'hh-client-find-definition)) ;; (global-set-key (kbd "M-.") 'hh-client-find-definition))
(add-hook 'php-mode-hook 'my-fb-php-hook) ;; (add-hook 'php-mode-hook 'my-fb-php-hook)
)) ;; ))
;; ================================================================= ;; =================================================================