diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-05-12 22:49:47 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-05-12 22:49:47 -0400 |
commit | f67a03ec2a3a266add0060ea74bfbc203f4f7b7f (patch) | |
tree | 1d7ea82855e0428cdbb0c1f6a0041dd8ac9dce4b | |
parent | c9935112c8b66e23d2acd7584fecd8e99a281b14 (diff) |
Play with emacs daemon mode
* .bashrc: include .bash.d/*
* .bash.d/emacs.sh: adjust emacsclient flags in SELECTED_EDITOR, EDITOR, and VISUAL based on $DISPLAY and $TERM
* .emacs: set the font size in a way that plays nice with daemon-mode
-rw-r--r-- | .bash.d/emacs.sh | 16 | ||||
-rw-r--r-- | .bashrc | 7 | ||||
-rw-r--r-- | .emacs | 7 |
3 files changed, 24 insertions, 6 deletions
diff --git a/.bash.d/emacs.sh b/.bash.d/emacs.sh new file mode 100644 index 0000000..b3c5c53 --- /dev/null +++ b/.bash.d/emacs.sh @@ -0,0 +1,16 @@ +case "$SELECTED_EDITOR" in + emacsclient*) + if [ -n "$DISPLAY" ]; then + export VISUAL="$SELECTED_EDITOR -c" + fi + case "$TERM" in + eterm*) + SELECTED_EDITOR="$SELECTED_EDITOR -n" + EDITOR=$SELECTED_EDITOR + VISUAL=$SELECTED_EDITOR + export SELECTED_EDITOR EDITOR VISUAL + :;; + esac + :;; +esac + @@ -73,6 +73,13 @@ xterm*|rxvt*) ;; esac +# Include modular config files +if [ -d ~/.bash.d ]; then + for file in ~/.bash.d/*.sh; do + . $file; + done +fi + # Alias definitions. # You may want to put all your additions into a separate file like # ~/.bash_aliases, instead of adding them here directly. @@ -59,9 +59,4 @@ '(server-mode t) '(show-paren-mode t)) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(default ((t (:inherit default :height 80))))) +(set-face-attribute 'default nil :height 80) |