aboutsummaryrefslogtreecommitdiff
path: root/emacs
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-01-04 10:20:13 +1300
committerTom Ryder <tom@sanctum.geek.nz>2019-01-04 10:20:13 +1300
commit674c202ffc989ca3930b215bf2751bd0ff2ca43c (patch)
tree68da1ae8ce1fbc88326c09116371a491e69df7cb /emacs
parentMerge branch 'hotfix/v4.5.1' (diff)
parentBump VERSION (diff)
downloaddotfiles-674c202ffc989ca3930b215bf2751bd0ff2ca43c.tar.gz
dotfiles-674c202ffc989ca3930b215bf2751bd0ff2ca43c.zip
Merge branch 'release/v4.6.0'v4.6.0
* release/v4.6.0: Bump VERSION Further attempts at sane Emacs VISUAL setting Use :lhelpgrep for help search shortcut Remove a daft comment Add Lisp to filetypes.vim Remove some possibly-unwanted .emacs config Adjust some comments in .emacs Block stderr from emacs daemon startup Remove an error-prone line from .emacs
Diffstat (limited to 'emacs')
-rw-r--r--emacs/bin/emacsm.sh3
-rw-r--r--emacs/emacs6
-rw-r--r--emacs/profile.d/emacs.sh2
3 files changed, 8 insertions, 3 deletions
diff --git a/emacs/bin/emacsm.sh b/emacs/bin/emacsm.sh
new file mode 100644
index 00000000..58571c5c
--- /dev/null
+++ b/emacs/bin/emacsm.sh
@@ -0,0 +1,3 @@
+# Try to manage GNU emacs daemons on the terminal
+# Emphasis on "try". Man, I have no idea what I'm doing.
+emacsclient --create-frame --alternate-editor=''
diff --git a/emacs/emacs b/emacs/emacs
index 637f8053..ea13faa9 100644
--- a/emacs/emacs
+++ b/emacs/emacs
@@ -26,9 +26,9 @@
backup-directory-alist `(("." . ,(concat user-emacs-directory "backups")))
)
-;; A few more options I've found around the web
+;; Show a scratch buffer rather than the startup hints
(customize-set-variable 'inhibit-startup-screen t)
+
+;; Show line and column number in status bar
(column-number-mode 1)
(line-number-mode 1)
-(menu-bar-mode -1)
-(tool-bar-mode -1)
diff --git a/emacs/profile.d/emacs.sh b/emacs/profile.d/emacs.sh
new file mode 100644
index 00000000..34f6d476
--- /dev/null
+++ b/emacs/profile.d/emacs.sh
@@ -0,0 +1,2 @@
+# Start an Emacs server if we can't detect one already running
+pgrep -fx -u "$USER" 'emacs --daemon' >/dev/null || emacs --daemon