mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-25 07:27:57 +00:00
Code

Backport commit a8caa6690 from Emacs

Browse Source 
* doc/org-manual.org (Link Abbreviations):
* lisp/org/ol.el (org-link-shell-confirm-function)
(org-link-elisp-confirm-function):
* lisp/org/org.el (org-highlight-links): Avoid recommending Google.

Avoid recommending Google
a8caa66906b157c9c2b4c4dc1c447b6a9e747c5e
Stefan Kangas
Thu Jan 28 19:36:12 2021 +0100
This commit is contained in:
Stefan Kangas 2021-01-28 19:06:18 +01:00 committed by Kyle Meyer
parent a633d9aea6
commit d8e8a97a14
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/org-manual.org
View File

@ -3537,7 +3537,7 @@ the link. Such a function will be called with the tag as the only
argument.
With the above setting, you could link to a specific bug with
=[[bugzilla:129]]=, search the web for =OrgMode= with =[[google:OrgMode]]=,
=[[bugzilla:129]]=, search the web for =OrgMode= with =[[duckduckgo:OrgMode]]=,
show the map location of the Free Software Foundation =[[gmap:51
Franklin Street, Boston]]= or of Carsten office =[[omap:Science Park 904,
Amsterdam, The Netherlands]]= and find out what the Org author is doing
@ -3549,7 +3549,7 @@ can define them in the file with
#+cindex: @samp{LINK}, keyword
#+begin_example
,#+LINK: bugzilla http://10.1.2.9/bugzilla/show_bug.cgi?id=
,#+LINK: google http://www.google.com/search?q=%s
,#+LINK: duckduckgo https://duckduckgo.com/?q=%s
#+end_example
In-buffer completion (see [[*Completion]]) can be used after =[= to

8
lisp/ol.el
View File

@ -376,9 +376,9 @@ changes to the current buffer."
Shell links can be dangerous: just think about a link
[[shell:rm -rf ~/*][Google Search]]
[[shell:rm -rf ~/*][Web Search]]
This link would show up in your Org document as \"Google Search\",
This link would show up in your Org document as \"Web Search\",
but really it would remove your entire home directory.
Therefore we advise against setting this variable to nil.
Just change it to `y-or-n-p' if you want to confirm with a
@ -401,9 +401,9 @@ single keystroke rather than having to type \"yes\"."
"Non-nil means ask for confirmation before executing Emacs Lisp links.
Elisp links can be dangerous: just think about a link
[[elisp:(shell-command \"rm -rf ~/*\")][Google Search]]
[[elisp:(shell-command \"rm -rf ~/*\")][Web Search]]
This link would show up in your Org document as \"Google Search\",
This link would show up in your Org document as \"Web Search\",
but really it would remove your entire home directory.
Therefore we advise against setting this variable to nil.
Just change it to `y-or-n-p' if you want to confirm with a

2
lisp/org.el
View File

@ -1846,7 +1846,7 @@ link types. The types are:
bracket The recommended [[link][description]] or [[link]] links with hiding.
angle Links in angular brackets that may contain whitespace like
<bbdb:Carsten Dominik>.
plain Plain links in normal text, no whitespace, like http://google.com.
plain Plain links in normal text, no whitespace, like https://gnu.org.
radio Text that is matched by a radio target, see manual for details.
tag Tag settings in a headline (link to tag search).
date Time stamps (link to calendar).