From 3536c1212dd8cb212a75b5f6753584c62e3b60c6 Mon Sep 17 00:00:00 2001
From: Lute Kamstra <lute@gnu.org>
Date: Mon, 6 Oct 2003 07:14:53 +0000
Subject: [PATCH] (Info-mode): Revert previous change. (Info-escape-percent):
 New function. (Info-fontify-node): Use it.

---
 lisp/ChangeLog |  6 ++++++
 lisp/info.el   | 28 +++++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b737420f12a..7c37cbc7c1b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -24,6 +24,12 @@
 	* makefile.w32-in (DONTCOMPILE, bootstrap-clean-CMD)
 	(bootstrap-clean-SH): Rename loaddefs-boot.el to ldefs-boot.el
 
+2003-10-03  Lute Kamstra  <Lute.Kamstra@cwi.nl>
+
+	* info.el (Info-mode): Revert previous change.
+	(Info-escape-percent): New function.
+	(Info-fontify-node): Use it.
+
 2003-10-02  Andreas Schwab  <schwab@suse.de>
 
 	* loaddefs-boot.el: Regenerated.
diff --git a/lisp/info.el b/lisp/info.el
index e11fdbf16ad..47af5bb8154 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2527,10 +2527,7 @@ Advanced commands:
   (make-local-variable 'Info-index-alternatives)
   (setq header-line-format
 	(if Info-use-header-line
-	    '(:eval
-	      (replace-regexp-in-string
-	       "%" "%%"
-	       (get-text-property (point-min) 'header-line)))
+	    '(:eval (get-text-property (point-min) 'header-line))
 	  nil)) ; so the header line isn't displayed
   (set (make-local-variable 'tool-bar-map) info-tool-bar-map)
   ;; This is for the sake of the invisible text we use handling titles.
@@ -2775,6 +2772,27 @@ the variable `Info-file-list-for-emacs'."
   "Face for headers in Info menus."
   :group 'info)
 
+(defun Info-escape-percent (string)
+  "Double all occurrences of `%' in STRING.
+
+Return a new string with all `%' characters replaced by `%%'.
+Preserve text properties."
+  (let ((start 0)
+	(end (length string))
+	mb me m matches)
+    (save-match-data
+      (while (and (< start end) (string-match "%" string start))
+	(setq mb (match-beginning 0)
+	      me (1+ mb)
+	      m (substring string mb me)
+	      matches (cons m 
+			    (cons m 
+				  (cons (substring string start mb) 
+					matches)))
+	      start me))
+      (push (substring string start end) matches)
+      (apply #'concat (nreverse matches)))))
+
 (defun Info-fontify-menu-headers ()
   "Add the face `info-menu-header' to any header before a menu entry."
   (save-excursion
@@ -2868,7 +2886,7 @@ the variable `Info-file-list-for-emacs'."
 		  (setq header (buffer-substring (point) header-end))))
 
 	      (put-text-property (point-min) (1+ (point-min))
-				 'header-line header)
+				 'header-line (Info-escape-percent header))
 	      ;; Hide the part of the first line
 	      ;; that is in the header, if it is just part.
 	      (unless (bobp)
-- 
2.39.2