Переглянути джерело

Merge branch 'maint'

Conflicts:
	lisp/ox-html.el
Nicolas Goaziou 11 роки тому
батько
коміт
ee3cf87d40
5 змінених файлів з 12 додано та 5 видалено
  1. 2 1
      contrib/lisp/ox-groff.el
  2. 4 1
      lisp/ox-html.el
  3. 2 1
      lisp/ox-latex.el
  4. 2 1
      lisp/ox-man.el
  5. 2 1
      lisp/ox-odt.el

+ 2 - 1
contrib/lisp/ox-groff.el

@@ -1251,8 +1251,9 @@ INFO is a plist holding contextual information.  See
          (imagep (org-export-inline-image-p
                   link org-groff-inline-image-rules))
          (path (cond
-                ((member type '("http" "https" "ftp" "mailto"))
+                ((member type '("http" "https" "ftp"))
                  (concat type "://" raw-path))
+		((string= type "mailto") (concat type ":" raw-path))
                 ((string= type "file")
                  (if (file-name-absolute-p raw-path)
                      (concat "file://" (expand-file-name raw-path))

+ 4 - 1
lisp/ox-html.el

@@ -2720,9 +2720,12 @@ INFO is a plist holding contextual information.  See
 	 (desc (org-string-nw-p desc))
 	 (path
 	  (cond
-	   ((member type '("http" "https" "ftp" "mailto"))
+	   ((member type '("http" "https" "ftp"))
 	    (org-link-escape-browser
 	     (org-link-unescape (concat type "://" raw-path))))
+	   ((string= type "mailto")
+	    (org-link-escape-browser
+	     (org-link-unescape (concat type ":" raw-path))))
 	   ((string= type "file")
 	    ;; Treat links to ".org" files as ".html", if needed.
 	    (setq raw-path

+ 2 - 1
lisp/ox-latex.el

@@ -1906,8 +1906,9 @@ INFO is a plist holding contextual information.  See
 	 (imagep (org-export-inline-image-p
 		  link org-latex-inline-image-rules))
 	 (path (cond
-		((member type '("http" "https" "ftp" "mailto"))
+		((member type '("http" "https" "ftp"))
 		 (concat type "://" raw-path))
+		((string= type "mailto") (concat type ":" raw-path))
 		((string= type "file")
 		 (if (not (file-name-absolute-p raw-path)) raw-path
 		   (concat "file://" (expand-file-name raw-path))))

+ 2 - 1
lisp/ox-man.el

@@ -645,8 +645,9 @@ INFO is a plist holding contextual information.  See
          (desc (and (not (string= desc "")) desc))
 
          (path (cond
-                ((member type '("http" "https" "ftp" "mailto"))
+                ((member type '("http" "https" "ftp"))
                  (concat type "://" raw-path))
+		((string= type "mailto") (concat type ":" raw-path))
                 ((string= type "file")
                  (if (file-name-absolute-p raw-path)
                      (concat "file://" (expand-file-name raw-path))

+ 2 - 1
lisp/ox-odt.el

@@ -2711,8 +2711,9 @@ INFO is a plist holding contextual information.  See
 	 (imagep (org-export-inline-image-p
 		  link org-odt-inline-image-rules))
 	 (path (cond
-		((member type '("http" "https" "ftp" "mailto"))
+		((member type '("http" "https" "ftp"))
 		 (concat type "://" raw-path))
+		((string= type "mailto") (concat type ":" raw-path))
 		((string= type "file")
 		 (if (file-name-absolute-p raw-path)
 		     (concat "file://" (expand-file-name raw-path))