diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-27 18:12:11 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-27 18:12:11 -0400 |
| commit | b15e584c1a5a32b8a61feca0d954de6af15da8ed (patch) | |
| tree | 179a8f12e182260b68162fbbedcb9ced4637a0c7 | |
| parent | 6001786990501e849f04e018dccb0b5bf7e6d991 (diff) | |
Emacs: don't clobber server files of other hosts
| -rw-r--r-- | .config/bash/rc.d/emacs.sh | 4 | ||||
| -rw-r--r-- | .config/emacs/init.el | 1 | ||||
| -rw-r--r-- | .config/selected_editor | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.config/bash/rc.d/emacs.sh b/.config/bash/rc.d/emacs.sh index 165d71e..b402932 100644 --- a/.config/bash/rc.d/emacs.sh +++ b/.config/bash/rc.d/emacs.sh @@ -1,7 +1,7 @@ #!/bin/bash if [[ $TERM == eterm* ]]; then - SELECTED_EDITOR='emacsclient' + SELECTED_EDITOR="emacsclient -f '$HOME/.emacs.d/server-$HOSTNAME/server'" EDITOR=$SELECTED_EDITOR VISUAL=$SELECTED_EDITOR export SELECTED_EDITOR EDITOR VISUAL @@ -10,7 +10,7 @@ if [[ $TERM == eterm* ]]; then # _emacs_run LISP _emacs_run() { - emacsclient -e "$*" 2>/dev/null + emacsclient -f "$HOME/.emacs.d/server-$HOSTNAME/server" -e "$*" 2>/dev/null } # _emacs_quote UNQUOTED_STRING _emacs_quote() { diff --git a/.config/emacs/init.el b/.config/emacs/init.el index c23b03a..9c3fcad 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -4,6 +4,7 @@ (setq notify-method 'notify-via-libnotify) (add-to-list 'load-path "~/.emacs.d/") (add-to-list 'load-path "~/.emacs.d/el-get/el-get") +(setq server-auth-dir (locate-user-emacs-file (concat "server-" (system-name) "/"))) (setq custom-file "~/.emacs.d/custom.el") ; derived from ELPA installation diff --git a/.config/selected_editor b/.config/selected_editor index eec2325..86d680f 100644 --- a/.config/selected_editor +++ b/.config/selected_editor @@ -1,4 +1,4 @@ -SELECTED_EDITOR="emacsclient -a '' -c" +SELECTED_EDITOR="emacsclient -a '' -f '$HOME/.emacs.d/server-$HOSTNAME/server' -c" if [[ -n $SSH_CONNECTION ]]; then SELECTED_EDITOR+=" -nw" fi |