[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org d8e8a97 07/11: Backport commit a8caa6690 from Emacs
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org d8e8a97 07/11: Backport commit a8caa6690 from Emacs |
Date: |
Sun, 14 Feb 2021 18:57:13 -0500 (EST) |
branch: externals/org
commit d8e8a97a14b332f40a9659993f9aefa221b79954
Author: Stefan Kangas <stefan@marxist.se>
Commit: Kyle Meyer <kyle@kyleam.com>
Backport commit a8caa6690 from Emacs
* 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
---
doc/org-manual.org | 4 ++--
lisp/ol.el | 8 ++++----
lisp/org.el | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/org-manual.org b/doc/org-manual.org
index a9f2542..5d4e3f26 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -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
diff --git a/lisp/ol.el b/lisp/ol.el
index d1db168..994e30f 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -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
diff --git a/lisp/org.el b/lisp/org.el
index 43aa0a1..2d21a44 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -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).
- [elpa] externals/org updated (ff1e8f3 -> e0fb233), ELPA Syncer, 2021/02/14
- [elpa] externals/org ec52bfe 02/11: Backport commit 64d97212f from Emacs, ELPA Syncer, 2021/02/14
- [elpa] externals/org 4c93442 01/11: Backport commit 46394dff7 from Emacs, ELPA Syncer, 2021/02/14
- [elpa] externals/org ce22aa1 03/11: Backport commit 5ab5c3898 from Emacs, ELPA Syncer, 2021/02/14
- [elpa] externals/org 4aa4ae8 08/11: Backport commit bbe88cd82 from Emacs, ELPA Syncer, 2021/02/14
- [elpa] externals/org d904f9e 04/11: Backport commit f88a7897a from Emacs, ELPA Syncer, 2021/02/14
- [elpa] externals/org 263d385 05/11: Backport commit 34a73666d from Emacs, ELPA Syncer, 2021/02/14
- [elpa] externals/org a633d9a 06/11: Backport commit dd662fc97 from Emacs, ELPA Syncer, 2021/02/14
- [elpa] externals/org d8e8a97 07/11: Backport commit a8caa6690 from Emacs,
ELPA Syncer <=
- [elpa] externals/org b7b52aa 09/11: Backport commit ce35760b1 from Emacs, ELPA Syncer, 2021/02/14
- [elpa] externals/org e0fb233 11/11: Merge branch 'km/from-emacs-master', ELPA Syncer, 2021/02/14
- [elpa] externals/org 7dd1cfb 10/11: Backport commit f8dbefbaa from Emacs, ELPA Syncer, 2021/02/14