From: Kaushal Modi <kaushal.modi@gmail.com>
To: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Cc: emacs-org list <emacs-orgmode@gnu.org>,
Michael Albinus <michael.albinus@gmx.de>
Subject: Re: 6 failing tests on master branch
Date: Fri, 09 Jun 2017 19:55:51 +0000 [thread overview]
Message-ID: <CAFyQvY1rDUjWvd4NnT5S0VcQs5=NGKQYV=YrrEPX5yaDT8UNkg@mail.gmail.com> (raw)
In-Reply-To: <87y3t115zb.fsf@nicolasgoaziou.fr>
[-- Attachment #1.1: Type: text/plain, Size: 552 bytes --]
On Fri, Jun 9, 2017 at 12:27 PM Nicolas Goaziou <mail@nicolasgoaziou.fr>
wrote:
> AFAIU, the function doesn't need to change, but the manual needs to be
> updated since, in (info "(org) External links") there is:
>
> /myself@some.where:papers/last.pdf same as above
>
> which is no longer a valid syntax.
>
Here's a patch rebased off maint (as it's just test and manual change with
edits to a backward compatible Tramp syntax).
There were some alignment issues in that External links section. So I have
fixed that too.
--
Kaushal Modi
[-- Attachment #1.2: Type: text/html, Size: 972 bytes --]
[-- Attachment #2: 0001-Update-remote-file-syntax-for-Tramp.patch --]
[-- Type: application/octet-stream, Size: 8255 bytes --]
From d61d6f9543bda7b4078d7a74e2a3c38eada0e44e Mon Sep 17 00:00:00 2001
From: Kaushal Modi <kaushal.modi@gmail.com>
Date: Fri, 9 Jun 2017 15:28:49 -0400
Subject: [PATCH] Update remote file syntax for Tramp
* testing/lisp/test-ox.el (test-org-export/file-uri):
* doc/org.texi (External links): The method part of remote file names
is mandatory now in the emacs master (26+). A valid remote file name
starts with "/method:host:" or "/method:user@host:". ssh is used as
an example method here.
This change in the examples is backward compatible with emacs 25, 24, ..
Suggested by: Michael Albinus <michael.albinus@gmx.de>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00151.html>
Relevant commit in emacs master causing this change:
<http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=ed33337c3e0d0b1a8b140e23168421ea43d79324>
---
doc/org.texi | 80 ++++++++++++++++++++++++-------------------------
testing/lisp/test-ox.el | 4 +--
2 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index c50e44c3ad..93a4b2e484 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -3531,44 +3531,44 @@ string followed by a colon. There can be no space after the colon. The
following list shows examples for each link type.
@example
-http://www.astro.uva.nl/~dominik @r{on the web}
-doi:10.1000/182 @r{DOI for an electronic resource}
-file:/home/dominik/images/jupiter.jpg @r{file, absolute path}
-/home/dominik/images/jupiter.jpg @r{same as above}
-file:papers/last.pdf @r{file, relative path}
-./papers/last.pdf @r{same as above}
-file:/myself@@some.where:papers/last.pdf @r{file, path on remote machine}
-/myself@@some.where:papers/last.pdf @r{same as above}
-file:sometextfile::NNN @r{file, jump to line number}
-file:projects.org @r{another Org file}
-file:projects.org::some words @r{text search in Org file}@footnote{
+http://www.astro.uva.nl/~dominik @r{on the web}
+doi:10.1000/182 @r{DOI for an electronic resource}
+file:/home/dominik/images/jupiter.jpg @r{file, absolute path}
+/home/dominik/images/jupiter.jpg @r{same as above}
+file:papers/last.pdf @r{file, relative path}
+./papers/last.pdf @r{same as above}
+file:/ssh:myself@@some.where:papers/last.pdf @r{file, path on remote machine}
+/ssh:myself@@some.where:papers/last.pdf @r{same as above}
+file:sometextfile::NNN @r{file, jump to line number}
+file:projects.org @r{another Org file}
+file:projects.org::some words @r{text search in Org file}@footnote{
The actual behavior of the search will depend on the value of
the option @code{org-link-search-must-match-exact-headline}. If its value
-is @code{nil}, then a fuzzy text search will be done. If it is t, then only the
-exact headline will be matched, ignoring spaces and cookies. If the value is
-@code{query-to-create}, then an exact headline will be searched; if it is not
-found, then the user will be queried to create it.}
-file:projects.org::*task title @r{heading search in Org
-file}@footnote{Headline searches always match the exact headline, ignoring
+is @code{nil}, then a fuzzy text search will be done. If it is t, then only
+the exact headline will be matched, ignoring spaces and cookies. If the
+value is @code{query-to-create}, then an exact headline will be searched; if
+it is not found, then the user will be queried to create it.}
+file:projects.org::*task title @r{heading search in Org file}@footnote{
+Headline searches always match the exact headline, ignoring
spaces and cookies. If the headline is not found and the value of the option
@code{org-link-search-must-match-exact-headline} is @code{query-to-create},
then the user will be queried to create it.}
-docview:papers/last.pdf::NNN @r{open in doc-view mode at page}
-id:B7423F4D-2E8A-471B-8810-C40F074717E9 @r{Link to heading by ID}
-news:comp.emacs @r{Usenet link}
-mailto:adent@@galaxy.net @r{Mail link}
-mhe:folder @r{MH-E folder link}
-mhe:folder#id @r{MH-E message link}
-rmail:folder @r{RMAIL folder link}
-rmail:folder#id @r{RMAIL message link}
-gnus:group @r{Gnus group link}
-gnus:group#id @r{Gnus article link}
-bbdb:R.*Stallman @r{BBDB link (with regexp)}
-irc:/irc.com/#emacs/bob @r{IRC link}
-info:org#External links @r{Info node or index link}
-shell:ls *.org @r{A shell command}
-elisp:org-agenda @r{Interactive Elisp command}
-elisp:(find-file-other-frame "Elisp.org") @r{Elisp form to evaluate}
+docview:papers/last.pdf::NNN @r{open in doc-view mode at page}
+id:B7423F4D-2E8A-471B-8810-C40F074717E9 @r{Link to heading by ID}
+news:comp.emacs @r{Usenet link}
+mailto:adent@@galaxy.net @r{Mail link}
+mhe:folder @r{MH-E folder link}
+mhe:folder#id @r{MH-E message link}
+rmail:folder @r{RMAIL folder link}
+rmail:folder#id @r{RMAIL message link}
+gnus:group @r{Gnus group link}
+gnus:group#id @r{Gnus article link}
+bbdb:R.*Stallman @r{BBDB link (with regexp)}
+irc:/irc.com/#emacs/bob @r{IRC link}
+info:org#External links @r{Info node or index link}
+shell:ls *.org @r{A shell command}
+elisp:org-agenda @r{Interactive Elisp command}
+elisp:(find-file-other-frame "Elisp.org") @r{Elisp form to evaluate}
@end example
@cindex VM links
@@ -3579,13 +3579,13 @@ to VM or Wanderlust messages are available when you load the corresponding
libraries from the @code{contrib/} directory:
@example
-vm:folder @r{VM folder link}
-vm:folder#id @r{VM message link}
-vm://myself@@some.where.org/folder#id @r{VM on remote machine}
-vm-imap:account:folder @r{VM IMAP folder link}
-vm-imap:account:folder#id @r{VM IMAP message link}
-wl:folder @r{WANDERLUST folder link}
-wl:folder#id @r{WANDERLUST message link}
+vm:folder @r{VM folder link}
+vm:folder#id @r{VM message link}
+vm://myself@@some.where.org/folder#id @r{VM on remote machine}
+vm-imap:account:folder @r{VM IMAP folder link}
+vm-imap:account:folder#id @r{VM IMAP message link}
+wl:folder @r{WANDERLUST folder link}
+wl:folder#id @r{WANDERLUST message link}
@end example
For customizing Org to add new link types @ref{Adding hyperlink types}.
diff --git a/testing/lisp/test-ox.el b/testing/lisp/test-ox.el
index d69660178d..f55cdd4fec 100644
--- a/testing/lisp/test-ox.el
+++ b/testing/lisp/test-ox.el
@@ -3252,8 +3252,8 @@ Another text. (ref:text)
(should (equal (concat (if (memq system-type '(windows-nt cygwin)) "file:///" "file://") (expand-file-name "/local.org"))
(org-export-file-uri "/local.org")))
;; Remote files start with "file://"
- (should (equal "file://myself@some.where:papers/last.pdf"
- (org-export-file-uri "/myself@some.where:papers/last.pdf")))
+ (should (equal "file://ssh:myself@some.where:papers/last.pdf"
+ (org-export-file-uri "/ssh:myself@some.where:papers/last.pdf")))
(should (equal "file://localhost/etc/fstab"
(org-export-file-uri "//localhost/etc/fstab")))
;; Expand filename starting with "~".
--
2.13.0
next prev parent reply other threads:[~2017-06-09 19:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-08 20:33 6 failing tests on master branch Kaushal Modi
2017-06-08 21:10 ` Nicolas Goaziou
2017-06-09 14:26 ` Kaushal Modi
2017-06-09 15:14 ` Kaushal Modi
2017-06-09 16:02 ` Michael Albinus
2017-06-09 16:10 ` Kaushal Modi
2017-06-09 16:27 ` Nicolas Goaziou
2017-06-09 19:55 ` Kaushal Modi [this message]
2017-06-09 20:05 ` Nicolas Goaziou
2017-06-09 20:21 ` Kaushal Modi
2017-06-14 14:56 ` Backward incompatible outline-invisible-p change in emacs master for Org (Was: 6 failing tests on master branch) Kaushal Modi
2017-06-14 16:03 ` Kaushal Modi
2017-06-14 17:02 ` Backward incompatible outline-invisible-p change in emacs master for Org Bastien Guerry
2017-06-14 17:18 ` Kaushal Modi
2017-06-14 20:28 ` Paul Rankin
2017-06-15 6:19 ` Bastien Guerry
2017-06-15 12:16 ` Kaushal Modi
2017-06-15 12:40 ` Bastien Guerry
2017-06-15 13:08 ` Kaushal Modi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAFyQvY1rDUjWvd4NnT5S0VcQs5=NGKQYV=YrrEPX5yaDT8UNkg@mail.gmail.com' \
--to=kaushal.modi@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=mail@nicolasgoaziou.fr \
--cc=michael.albinus@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).