summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bash.d/emacs.sh16
-rw-r--r--.bashrc7
-rw-r--r--.emacs7
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
+
diff --git a/.bashrc b/.bashrc
index 133ff9f..9609bc2 100644
--- a/.bashrc
+++ b/.bashrc
@@ -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.
diff --git a/.emacs b/.emacs
index 9b8ef7a..6f884eb 100644
--- a/.emacs
+++ b/.emacs
@@ -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)