Merge branch 'pr/198'

jrnl/cli.py

@@ -172,7 +172,11 @@ def run(manual_args=None):
         elif config['editor']:
             raw = util.get_text_from_editor(config)
         else:
+            try:
                 raw = util.py23_read("[Compose Entry; " + _exit_multiline_code + " to finish writing]\n")
+            except KeyboardInterrupt:
+                util.prompt("[Entry NOT saved to journal.]")
+                sys.exit(0)
         if raw:
             args.text = [raw]
         else:

jrnl/util.py

@@ -80,7 +80,6 @@ def py23_input(msg=""):
     return STDIN.readline().strip()
 
 def py23_read(msg=""):
-    STDERR.write(u(msg))
     return STDIN.read()
 
 def yesno(prompt, default=True):