diff options
| author | Juri Linkov | 2007-09-22 23:56:57 +0000 |
|---|---|---|
| committer | Juri Linkov | 2007-09-22 23:56:57 +0000 |
| commit | f3de57e90690ed39ed98260b518491981ae6f0df (patch) | |
| tree | bbd7599d8435b2915bade43191c788cb5f0dc0e2 | |
| parent | ed16281fa4445ac9e512f0b02b776a986628e6e3 (diff) | |
| download | emacs-f3de57e90690ed39ed98260b518491981ae6f0df.tar.gz emacs-f3de57e90690ed39ed98260b518491981ae6f0df.zip | |
(org-confirm-shell-link-function): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/textmodes/org.el | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d294313da5f..22f542dd5ed 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,13 @@ | |||
| 1 | 2007-09-22 Juri Linkov <juri@jurta.org> | 1 | 2007-09-22 Juri Linkov <juri@jurta.org> |
| 2 | 2 | ||
| 3 | * textmodes/org.el (org-confirm-shell-link-function): Doc fix. | ||
| 4 | |||
| 5 | * tutorial.el (tutorial--default-keys): Update standard bindings: | ||
| 6 | rename `iconify-or-deiconify-frame' to `suspend-frame', | ||
| 7 | and `save-buffers-kill-emacs' to `save-buffers-kill-terminal'. | ||
| 8 | |||
| 9 | 2007-09-22 Juri Linkov <juri@jurta.org> | ||
| 10 | |||
| 3 | * startup.el (fancy-startup-text, fancy-about-text, fancy-startup-tail): | 11 | * startup.el (fancy-startup-text, fancy-about-text, fancy-startup-tail): |
| 4 | Add help-echo to external links and to links without description. | 12 | Add help-echo to external links and to links without description. |
| 5 | (fancy-splash-insert): Use help-echo from the 3rd element of the | 13 | (fancy-splash-insert): Use help-echo from the 3rd element of the |
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el index 97bde491dfb..1d60d452ab0 100644 --- a/lisp/textmodes/org.el +++ b/lisp/textmodes/org.el | |||
| @@ -1231,7 +1231,7 @@ if one was given like in <mailto:arthur@galaxy.org::this subject>." | |||
| 1231 | 1231 | ||
| 1232 | (defcustom org-confirm-shell-link-function 'yes-or-no-p | 1232 | (defcustom org-confirm-shell-link-function 'yes-or-no-p |
| 1233 | "Non-nil means, ask for confirmation before executing shell links. | 1233 | "Non-nil means, ask for confirmation before executing shell links. |
| 1234 | Shell links can be dangerous, just thing about a link | 1234 | Shell links can be dangerous, just think about a link |
| 1235 | 1235 | ||
| 1236 | [[shell:rm -rf ~/*][Google Search]] | 1236 | [[shell:rm -rf ~/*][Google Search]] |
| 1237 | 1237 | ||