diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-04-18 22:18:47 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-04-18 22:18:47 +0200 |
| commit | 6457a9e4e60402e548f95ec33f9ee2181e1c96b3 (patch) | |
| tree | ce5c4073f981da83550a1b0e19a3ee3c97907fc8 | |
| parent | ee5fa1843092c89309d0bbc8fb7d2bf33061a8c8 (diff) | |
| parent | 8814988d1cdfb1612919f42d6498b8aea326b220 (diff) | |
| download | org-mode-6457a9e4e60402e548f95ec33f9ee2181e1c96b3.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el index 0907a30..aee053e 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -22840,7 +22840,9 @@ depending on context." org-ctrl-k-protect-subtree (or (eq org-ctrl-k-protect-subtree 'error) (not (y-or-n-p "Kill hidden subtree along with headline? ")))) - (user-error "C-k aborted as it would kill a hidden subtree")) + (user-error + (substitute-command-keys + "`\\[org-kill-line]' aborted as it would kill a hidden subtree"))) (call-interactively (if (bound-and-true-p visual-line-mode) 'kill-visual-line 'kill-line))) ((looking-at ".*?\\S-\\([ \t]+\\(:[[:alnum:]_@#%:]+:\\)\\)[ \t]*$") |