Skip to content

Commit

Permalink
Avoid recommending Google
Browse files Browse the repository at this point in the history
* doc/misc/org.texi (Link Abbreviations):
* lisp/net/webjump.el (webjump-sample-sites):
* lisp/org/ol.el (org-link-shell-confirm-function)
(org-link-elisp-confirm-function):
* lisp/org/org.el (org-highlight-links):
* lisp/wdired.el: Avoid recommending Google.

squash! Avoid recommending Google
  • Loading branch information
skangas committed Jan 28, 2021
1 parent aca93f6 commit a8caa66
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 13 deletions.
6 changes: 3 additions & 3 deletions doc/misc/org.texi
Expand Up @@ -4071,7 +4071,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
@samp{[[bugzilla:129]]}, search the web for @samp{OrgMode} with @samp{[[google:OrgMode]]},
@samp{[[bugzilla:129]]}, search the web for @samp{OrgMode} with @samp{[[duckduckgo:OrgMode]]},
show the map location of the Free Software Foundation @samp{[[gmap:51
Franklin Street, Boston]]} or of Carsten office @samp{[[omap:Science Park 904,
Amsterdam, The Netherlands]]} and find out what the Org author is doing
Expand All @@ -4082,8 +4082,8 @@ can define them in the file with

@cindex @samp{LINK}, keyword
@example
#+LINK: bugzilla http://10.1.2.9/bugzilla/show_bug.cgi?id=
#+LINK: google http://www.google.com/search?q=%s
#+LINK: bugzilla http://10.1.2.9/bugzilla/show_bug.cgi?id=
#+LINK: duckduckgo https://duckduckgo.com/?q=%s
@end example

In-buffer completion (see @ref{Completion}) can be used after @samp{[} to
Expand Down
3 changes: 0 additions & 3 deletions lisp/net/webjump.el
Expand Up @@ -96,9 +96,6 @@
("DuckDuckGo" .
[simple-query "duckduckgo.com"
"duckduckgo.com/?q=" ""])
("Google" .
[simple-query "www.google.com"
"www.google.com/search?q=" ""])
("Google Groups" .
[simple-query "groups.google.com"
"groups.google.com/groups?q=" ""])
Expand Down
8 changes: 4 additions & 4 deletions lisp/org/ol.el
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lisp/org/org.el
Expand Up @@ -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).
Expand Down
4 changes: 2 additions & 2 deletions lisp/wdired.el
Expand Up @@ -68,8 +68,8 @@

;;; Change Log:

;; Google is your friend (previous versions with complete changelogs
;; were posted to gnu.emacs.sources)
;; Previous versions with complete changelogs were posted to
;; gnu.emacs.sources.

;;; Code:

Expand Down

0 comments on commit a8caa66

Please sign in to comment.