Permalink
Browse files

Removed duplicate tabs.

  • Loading branch information...
1 parent 5e36569 commit 375199010be62df7f1b9aeca4f02301f4564b69f Chris Balz committed Feb 10, 2014
Showing with 15 additions and 26 deletions.
  1. +15 −26 .emacs
View
41 .emacs
@@ -270,35 +270,24 @@
;; - - - End: Package Management System: Marmalade - - - -
-;; - - 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:
+;; - - - - 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
(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.
@@ -498,7 +487,7 @@
(defun my-js-indent-setup ()
(setq c-default-style "bsd") ;; bsd stroustroup
;; (setq indent-tabs-mode t) ;; turn on tabs for js
- (setq indent-tabs-mode nil) ;; turn off tabs for js
+ ;; (setq indent-tabs-mode nil) ;; turn off tabs for js
(setq c-basic-offset 4)
(lambda () (js-mode))
(js-mode))
@@ -541,8 +530,8 @@
;; The following first-line matches are used to load nxml-mode over html-helper mode, since we use the non-xml html5 package (which does also do xhtml5).
- (defun my-nxml-indent-setup ()
- (setq indent-tabs-mode nil) )
+;; (defun my-nxml-indent-setup ()
+;; (setq indent-tabs-mode nil) )
;; Add the above hook to the nxml-mode.
(add-hook 'nxml-mode-hook 'my-nxml-indent-setup)

0 comments on commit 3751990

Please sign in to comment.