diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2015-02-09 19:53:26 -0500 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2015-02-09 19:53:26 -0500 |
| commit | d42129fbfffbe1fee1cafe1f956090a4d0f47731 (patch) | |
| tree | 664c3805fc9b83d07aa5b0365dda117966e8d799 | |
| parent | 4bb669b4ff4391687c36af4ac4874d4263f84403 (diff) | |
fix the emacs client/server
| -rw-r--r-- | .config/bash/rc.d/emacs.sh | 4 | ||||
| -rw-r--r-- | .config/emacs/init.el | 3 | ||||
| -rw-r--r-- | .config/selected_editor | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/.config/bash/rc.d/emacs.sh b/.config/bash/rc.d/emacs.sh index 354c8f3..bb6454b 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 -f '$HOME/.emacs.d/server-$HOSTNAME/server'" + SELECTED_EDITOR='emacsclient' EDITOR=$SELECTED_EDITOR VISUAL=$SELECTED_EDITOR export SELECTED_EDITOR EDITOR VISUAL @@ -11,7 +11,7 @@ if [[ $TERM == eterm* ]]; then # _emacs_run LISP _emacs_run() { - emacsclient -f "$HOME/.emacs.d/server-$HOSTNAME/server" -a false -e "$*" 2>/dev/null + emacsclient -a false -e "$*" 2>/dev/null } # _emacs_quote UNQUOTED_STRING _emacs_quote() { diff --git a/.config/emacs/init.el b/.config/emacs/init.el index ee77250..6ea8e55 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -219,8 +219,7 @@ sh-script.el is broken." ) (set-default 'truncate-lines t) -(setq inhibit-startup-screen t - server-use-tcp t) +(setq inhibit-startup-screen t) ;; Automatically load smerge mode for merge files (defun try-smerge-mode () diff --git a/.config/selected_editor b/.config/selected_editor index 6c700da..57d0288 100644 --- a/.config/selected_editor +++ b/.config/selected_editor @@ -1,4 +1,4 @@ -SELECTED_EDITOR="emacsclient -f '$HOME/.emacs.d/server-$HOSTNAME/server' -c" +SELECTED_EDITOR="emacsclient -a '' -c" if [[ -n $SSH_CONNECTION ]]; then SELECTED_EDITOR+=' -nw' fi |