diff options
author | Bastien Guerry <bzg@altern.org> | 2012-10-28 11:10:44 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-10-28 11:10:44 +0100 |
commit | 53a7683fd74ca20a592cb84dd9f0b086ad12ff27 (patch) | |
tree | 98177c933f39234fe63fa0bf5c08268d145a07cb | |
parent | 70e4a89a5d4d1bd353dd5fb586efa6342ec788c3 (diff) | |
parent | f9e89cb8492c36f62225ad07a3ca59eedfa44f61 (diff) | |
download | org-mode-53a7683fd74ca20a592cb84dd9f0b086ad12ff27.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-remember.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/org-remember.el b/lisp/org-remember.el index d555ca6..bfbca73 100644 --- a/lisp/org-remember.el +++ b/lisp/org-remember.el @@ -472,12 +472,12 @@ to be run from that hook to function properly." (erase-buffer) (insert (substitute-command-keys (format - "## %s \"%s\" -> \"* %s\" -## C-u C-c C-c like C-c C-c, and immediately visit note at target location -## C-0 C-c C-c \"%s\" -> \"* %s\" -## %s to select file and header location interactively. -## C-2 C-c C-c as child (C-3: as sibling) of the currently clocked item -## To switch templates, use `\\[org-remember]'. To abort use `C-c C-k'.\n\n" + "# %s \"%s\" -> \"* %s\" +# C-u C-c C-c like C-c C-c, and immediately visit note at target location +# C-0 C-c C-c \"%s\" -> \"* %s\" +# %s to select file and header location interactively. +# C-2 C-c C-c as child (C-3: as sibling) of the currently clocked item +# To switch templates, use `\\[org-remember]'. To abort use `C-c C-k'.\n\n" (if org-remember-store-without-prompt " C-c C-c" " C-1 C-c C-c") (abbreviate-file-name (or file org-default-notes-file)) (or headline "") |