[PATCH 1/2] Fix a bug in org-link-display-format.

[James TD Smith <ahktenzero@mohorovi.cc>]

It would break if there was a '\' in the link description.
---
 lisp/ChangeLog |    4 ++++
 lisp/org.el    |    9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 112e0bc..0ce2d50 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -72,6 +72,10 @@
 	* org-docbook.el (org-export-as-docbook): Protect targets in
 	verbatim emphasis.
 
+2009-11-07  James TD Smith  <ahktenzero@mohorovi.cc>
+
+	* org.el (org-link-display-format): Should be literal replacement.
+
 2009-11-06  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-clock.el (org-show-notification): Handle messages that
diff --git a/lisp/org.el b/lisp/org.el
index c0afd10..ed32b94 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -17575,10 +17575,11 @@ Show the heading too, if it is currently invisible."
 if no description is present"
   (save-match-data
     (if (string-match org-bracket-link-analytic-regexp link)
-	(replace-match (or (match-string 5 link)
-			   (concat (match-string 1 link)
-				   (match-string 3 link)))
-		       nil nil link)
+	    (replace-match (if (match-end 5)
+			       (match-string 5 link)
+			     (concat (match-string 1 link)
+				     (match-string 3 link)))
+			   nil t link)
       link)))
 
 ;; Speedbar support
-- 
1.6.5