From 73361d95c4de9482aed573f053a7946ad009803e Mon Sep 17 00:00:00 2001
From: Michael Olson <mwolson@gnu.org>
Date: Sun, 12 Jun 2005 21:33:24 +0000
Subject: [PATCH] Merged from hodique@lifl.fr--2005 (patch 0-1)

Patches applied:

 * hodique@lifl.fr--2005/muse--yh--1.0--base-0
   tag of mwolson@gnu.org--2005/muse--main--1.0--patch-49

 * hodique@lifl.fr--2005/muse--yh--1.0--patch-1
   fix .html (for example) in visible names for links
git-archimport-id: mwolson@gnu.org--2005/muse--main--1.0--patch-50
---
 ChangeLog       | 23 +++++++++++++++++++++++
 muse-publish.el | 19 ++++++++++---------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 163a1da..f2fb09d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,29 @@
 # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--main--1.0
 #
 
+2005-06-12 21:33:24 GMT	Michael Olson <mwolson@gnu.org>	patch-50
+
+    Summary:
+      Merged from hodique@lifl.fr--2005 (patch 0-1)
+    Revision:
+      muse--main--1.0--patch-50
+
+    Patches applied:
+    
+     * hodique@lifl.fr--2005/muse--yh--1.0--base-0
+       tag of mwolson@gnu.org--2005/muse--main--1.0--patch-49
+    
+     * hodique@lifl.fr--2005/muse--yh--1.0--patch-1
+       fix .html (for example) in visible names for links
+
+    modified files:
+     ChangeLog muse-publish.el
+
+    new patches:
+     hodique@lifl.fr--2005/muse--yh--1.0--base-0
+     hodique@lifl.fr--2005/muse--yh--1.0--patch-1
+
+
 2005-06-11 23:35:43 GMT	Michael Olson <mwolson@gnu.org>	patch-49
 
     Summary:
diff --git a/muse-publish.el b/muse-publish.el
index e33cc69..31f0935 100644
--- a/muse-publish.el
+++ b/muse-publish.el
@@ -889,15 +889,16 @@ like read-only from being inadvertently deleted."
 
 (defun muse-publish-url (url &optional desc)
   "Resolve a URL into its final <a href> form."
-  (dolist (transform muse-publish-url-transforms)
-    (setq url (funcall transform url)))
-  (if (string-match muse-image-regexp url)
-      (if desc
-	  (muse-markup-text 'image-with-desc url desc)
-	(muse-markup-text 'image-link url))
-    (if (and desc (string-match muse-image-regexp desc))
-	(muse-markup-text 'url-with-image url desc)
-      (muse-markup-text 'url-link url (or desc url)))))
+  (let ((orig-url url))
+    (dolist (transform muse-publish-url-transforms)
+      (setq url (funcall transform url)))
+    (if (string-match muse-image-regexp url)
+        (if desc
+            (muse-markup-text 'image-with-desc url desc)
+          (muse-markup-text 'image-link url))
+      (if (and desc (string-match muse-image-regexp desc))
+          (muse-markup-text 'url-with-image url desc)
+        (muse-markup-text 'url-link url (or desc orig-url))))))
 
 (defun muse-publish-insert-url (url &optional desc)
   "Resolve a URL into its final <a href> form."
-- 
2.11.4.GIT