summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemse2014-05-29 12:27:15 +0200
committerGravatar Tom Willemse2014-05-29 12:27:15 +0200
commitf456e614eb789e2e4fede72f121073452482fc65 (patch)
treea302f1f1dd3933236fc0e074fa96241d8c993986
parent63b15ce804073328467a8af67532a1a34bb2910c (diff)
downloadpacmerge-f456e614eb789e2e4fede72f121073452482fc65.tar.gz
pacmerge-f456e614eb789e2e4fede72f121073452482fc65.zip
Start terminal client, not GUIHEADmaster
-rwxr-xr-xpacmerge2
1 files changed, 1 insertions, 1 deletions
diff --git a/pacmerge b/pacmerge
index 55654f1..9e67c44 100755
--- a/pacmerge
+++ b/pacmerge
@@ -5,7 +5,7 @@ emacs --daemon=pacmerge
for itm in $(find /etc/ -type f -name "*.pacnew"); do
local orig="${itm%.pacnew}"
if [[ -f "${orig}" ]]; then
- emacsclient -s pacmerge -c -eval \
+ emacsclient -s pacmerge -t -eval \
"(emerge-files nil \"${orig}\" \"${itm}\" \"${orig}\" nil \
(lambda () (server-save-buffers-kill-terminal nil)))"
fi