Skip to content
Browse files

Merge pull request #4 from wentasah/master

A few fixes
  • Loading branch information...
2 parents a580fa8 + ab7c3d5 commit e034cec9029b905b63c91a62b1ee037b3b5335b5 @chrismgray committed Aug 5, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 perl/new_org.pm
View
4 perl/new_org.pm
@@ -20,7 +20,7 @@ sub run_func_in_emacs($$;$) {
if (!defined $args) { $args = ""; }
# WARNING: possible security hole
$args =~ s/'/'\\''/g;
- my $argstring = qq/emacsclient -s org-ikiwiki-compiler --eval '(ikiwiki-org-$func "$tn1" "$tn2" $args)'/;
+ my $argstring = qq/unset ALTERNATE_EDITOR; emacsclient -s org-ikiwiki-compiler --eval '(ikiwiki-org-$func "$tn1" "$tn2" $args)'/;
system($argstring);
# Wait for emacs to finish
my @ret = <$tf2>;
@@ -30,7 +30,7 @@ sub run_func_in_emacs($$;$) {
}
sub import {
- system("emacsclient -s org-ikiwiki-compiler --eval \"(+ 1 1)\"");
+ system("unset ALTERNATE_EDITOR; emacsclient -s org-ikiwiki-compiler --eval nil");
if ($? != 0) {
system("emacs --daemon --eval \"(progn (require 'ikiwiki-org-plugin) (setq server-name \\\"org-ikiwiki-compiler\\\") (server-start))\"");
if ($? != 0) {

0 comments on commit e034cec

Please sign in to comment.
Something went wrong with that request. Please try again.