aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-01-04 10:49:33 +1300
committerTom Ryder <tom@sanctum.geek.nz>2019-01-04 10:49:33 +1300
commit0b6e3445445c7d0a6fed5529e9f01aee04a74fd5 (patch)
tree9c1a7a3f9793341a6bc506f84f3d213fbf382a09
parentMerge branch 'release/v4.6.0' into develop (diff)
parentBump VERSION (diff)
downloaddotfiles-0b6e3445445c7d0a6fed5529e9f01aee04a74fd5.tar.gz
dotfiles-0b6e3445445c7d0a6fed5529e9f01aee04a74fd5.zip
Merge branch 'hotfix/v4.6.1' into develop
* hotfix/v4.6.1: Add missing arguments to emacsm wrapper
-rw-r--r--VERSION4
-rw-r--r--emacs/bin/emacsm.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/VERSION b/VERSION
index f8ee9b81..51de1854 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v4.6.0
-Thu Jan 3 21:20:13 UTC 2019
+tejr dotfiles v4.6.1
+Thu Jan 3 21:48:25 UTC 2019
diff --git a/emacs/bin/emacsm.sh b/emacs/bin/emacsm.sh
index 58571c5c..6ad17d3b 100644
--- a/emacs/bin/emacsm.sh
+++ b/emacs/bin/emacsm.sh
@@ -1,3 +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=''
+emacsclient --create-frame --alternate-editor='' "$@"