From 40f406f6e29060ec9932f07386f827a7b885c95b Mon Sep 17 00:00:00 2001 From: Manuel Ebert Date: Fri, 29 Nov 2013 10:25:40 -0800 Subject: [PATCH] Updated docs from master --- jrnl/Journal.py | 2 +- jrnl/cli.pyc | Bin 0 -> 9567 bytes jrnl/install.py | 4 ++-- jrnl/jrnl.py | 9 ++++++++- 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 jrnl/cli.pyc diff --git a/jrnl/Journal.py b/jrnl/Journal.py index f9122892..41d7a225 100644 --- a/jrnl/Journal.py +++ b/jrnl/Journal.py @@ -134,7 +134,7 @@ class Journal(object): line = line.strip() new_date = datetime.strptime(line[:date_length], self.config['timeformat']) - # parsing successfull => save old entry and create new one + # parsing successful => save old entry and create new one if new_date and current_entry: entries.append(current_entry) diff --git a/jrnl/cli.pyc b/jrnl/cli.pyc new file mode 100644 index 0000000000000000000000000000000000000000..f24ccbff50d9889eff1be79666c04df498be7817 GIT binary patch literal 9567 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 QM@A1+hDJw6JEPuz0aiR>p#T5? literal 0 HcmV?d00001 diff --git a/jrnl/install.py b/jrnl/install.py index cd1683d9..7a6fa5c4 100644 --- a/jrnl/install.py +++ b/jrnl/install.py @@ -31,13 +31,13 @@ default_config = { 'timeformat': "%Y-%m-%d %H:%M", 'tagsymbols': '@', 'highlight': True, - 'linewrap': 80, + 'linewrap': 79, } def upgrade_config(config, config_path=os.path.expanduser("~/.jrnl_conf")): """Checks if there are keys missing in a given config dict, and if so, updates the config file accordingly. - This essentially automatically ports jrnl installations if new config parameters are introduced in later + This essentially automatically ports jrnl installations if new config parameters are introduced in later versions.""" missing_keys = set(default_config).difference(config) if missing_keys: diff --git a/jrnl/jrnl.py b/jrnl/jrnl.py index 96ac97b3..451ddbdc 100755 --- a/jrnl/jrnl.py +++ b/jrnl/jrnl.py @@ -156,6 +156,13 @@ def cli(manual_args=None): else: journal = Journal.Journal(journal_name, **config) + if "win32" in sys.platform: + # for Windows systems + _exit_multiline_code = "on a blank line, press Ctrl+Z and then Enter" + else: + # for *nix systems (and others?) + _exit_multiline_code = "press Ctrl+D" + if mode_compose and not args.text: if not sys.stdin.isatty(): # Piping data into jrnl @@ -163,7 +170,7 @@ def cli(manual_args=None): elif config['editor']: raw = get_text_from_editor(config) else: - raw = util.py23_read("[Compose Entry, press Ctrl+D to finish writing]\n") + raw = util.py23_read("[Compose Entry; " + _exit_multiline_code + " to finish writing]\n") if raw: args.text = [raw] else: