Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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: christopherbalz/.emacs-
base: f0fa6d972f
...
head fork: christopherbalz/.emacs-
compare: 261e26f5df
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 1 contributor
Commits on Dec 30, 2013
christopherbalz One exec-path-from-shell-copy-env to rule them all. This set-up will …
…set the desired shell environment variables for all non-Windows systems.
c13ac44
christopherbalz Merge branch 'master' of https://github.com/christopherbalz/.emacs- 261e26f
Showing with 23 additions and 12 deletions.
  1. +23 −12 .emacs
View
35 .emacs
@@ -264,24 +264,35 @@
;; - - - End: Package Management System: Marmalade - - - -
-;; - - - - For non-Aquamacs ports to Mac OS X, must import the shell env, and also, do the @workaround just below:
-;; https://github.com/purcell/exec-path-from-shell
+;; - - Begin: Get the variables needed from the shell:
+;; - For non-Aquamacs ports to Mac OS X, must import the shell env, and also, do the @workaround just below:
(when (memq window-system '(mac ns)) ;; If running on Aquamacs, this may need to be altered or removed.
;; - - - Begin @workaround for issue described at: http://lists.gnu.org/archive/html/bug-gnu-emacs/2012-07/msg00911.html
(setq ls-lisp-use-insert-directory-program t)
(setq insert-directory-program "gls")
;; - - - End workaround.
- (exec-path-from-shell-initialize)
- (exec-path-from-shell-copy-env "CLOJURESCRIPT_HOME")
- (exec-path-from-shell-copy-env "HOME_BIN")
- (exec-path-from-shell-copy-env "JAVA_HOME")
- (exec-path-from-shell-copy-env "ANT_OPTS")
- (exec-path-from-shell-copy-env "GREP_OPTIONS")
- (exec-path-from-shell-copy-env "EDITOR")
- (exec-path-from-shell-copy-env "PS1")
- (exec-path-from-shell-copy-env "CLICOLORS")
- (exec-path-from-shell-copy-env "LSCOLORS")
)
+;; https://github.com/purcell/exec-path-from-shell
+(cond
+ ((not (string= system-type "windows-nt"))
+ (progn
+ (message "Getting shell environment variables.")
+ ;; (exec-path-from-shell-initialize) ;; Gets $PATH , $MANPATH , and exec-path, but only on Mac OS X. So we do them explicitly here:
+ (exec-path-from-shell-copy-env "PATH")
+ (exec-path-from-shell-copy-env "MANPATH")
+ (exec-path-from-shell-copy-env "exec-path")
+ (exec-path-from-shell-copy-env "CLOJURESCRIPT_HOME")
+ (exec-path-from-shell-copy-env "HOME_BIN")
+ (exec-path-from-shell-copy-env "JAVA_HOME")
+ (exec-path-from-shell-copy-env "ANT_OPTS")
+ (exec-path-from-shell-copy-env "GREP_OPTIONS")
+ (exec-path-from-shell-copy-env "EDITOR")
+ (exec-path-from-shell-copy-env "PS1")
+ (exec-path-from-shell-copy-env "CLICOLORS")
+ (exec-path-from-shell-copy-env "LSCOLORS")
+ ))
+ )
+;; - - End: Get the variables needed from the shell:
;; - - - Begin Auto-Complete (as distinguished from `autocomplete`)
;; This is non-CEDET autocompletion and it knows about JavaScript.

No commit comments for this range

Something went wrong with that request. Please try again.