Browse Source

Revert "Fix mailto links"

This reverts commit f61cd6b7a17507dbcbd96a105d6c2e59a5b087b4.
Nicolas Goaziou 11 years ago
parent
commit
7b3c11f797
5 changed files with 5 additions and 13 deletions
  1. 1 2
      contrib/lisp/ox-groff.el
  2. 1 5
      lisp/ox-html.el
  3. 1 2
      lisp/ox-latex.el
  4. 1 2
      lisp/ox-man.el
  5. 1 2
      lisp/ox-odt.el

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

@@ -1251,9 +1251,8 @@ 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"))
+                ((member type '("http" "https" "ftp" "mailto"))
                  (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))

+ 1 - 5
lisp/ox-html.el

@@ -2658,11 +2658,7 @@ INFO is a plist holding contextual information.  See
 	 (desc (org-string-nw-p desc))
 	 (path
 	  (cond
-	   ((member type '("http" "https" "ftp"))
-	    (org-link-escape
-	     (org-link-unescape
-	      (concat type "://" raw-path)) org-link-escape-chars-browser))
-	   ((string= type "mailto")
+	   ((member type '("http" "https" "ftp" "mailto"))
 	    (org-link-escape
 	     (org-link-unescape
 	      (concat type "://" raw-path)) org-link-escape-chars-browser))

+ 1 - 2
lisp/ox-latex.el

@@ -1797,9 +1797,8 @@ 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"))
+		((member type '("http" "https" "ftp" "mailto"))
 		 (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))))

+ 1 - 2
lisp/ox-man.el

@@ -645,9 +645,8 @@ INFO is a plist holding contextual information.  See
          (desc (and (not (string= desc "")) desc))
 
          (path (cond
-                ((member type '("http" "https" "ftp"))
+                ((member type '("http" "https" "ftp" "mailto"))
                  (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))

+ 1 - 2
lisp/ox-odt.el

@@ -2711,9 +2711,8 @@ 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"))
+		((member type '("http" "https" "ftp" "mailto"))
 		 (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))