Protect expression "$Id: ... $" against being replaced by SubVersion (bug #689093).

git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@7934 a1074d23-0009-0410-80fe-cf8c14f379e6

1 files changed, 6 insertions, 3 deletions

diff --git a/gs/doc/gsdoc.el b/gs/doc/gsdoc.el
index 76be2c15f..4f52ae060 100644
--- a/gs/doc/gsdoc.el
+++ b/gs/doc/gsdoc.el
@@ -427,6 +427,9 @@ those characters."
 (while (search-forward ">" nil t) (replace-match ">" t t))
 
 (goto-char BEGIN)
+(while (search-forward "$" nil t) (replace-match "$" t t))
+
+(goto-char BEGIN)
 )
 
 ;;============================================================
@@ -462,7 +465,7 @@ be most useful in preparing new sections for the news document."
 (goto-char (point-min))
 (insert "<pre>\n") (setq g~pre-point (point))
 (setq g~ID " [No pre-existing ID] ")
-(if (re-search-forward "^\\$Id:\\( [^ ]+ \\)\\$" nil t) (progn
+(if (re-search-forward (concat "^\\$" "Id:\\( [^ ]+ \\)\\$") nil t) (progn
     (setq g~ID (buffer-substring (match-beginning 1) (match-end 1)))
     (next-line 1) (beginning-of-line) (delete-region g~pre-point (point))
     ))
@@ -522,14 +525,14 @@ properly placed markers, but that's history."
 ;; Replace the RCS $Id if one can be found in exactly the right format, and
 ;; otherwise insert one just after the title, along with a warning message.
 
-(if (re-search-forward "<!-- $Id: *\\([^ ]*\\) $ -->" nil t)
+(if (re-search-forward (concat "<!-- $" "Id: *\\([^ ]*\\) $ -->") nil t)
     (progn
       (setq Original (buffer-substring (match-beginning 1) (match-end 1)))
       (replace-match g~thisfile t t nil 1)
       )
     (progn
       (search-forward "</title>" nil t) (end-of-line)
-      (insert (concat "\n<!-- $Id: " g~thisfile " $ -->"))
+      (insert (concat "\n<!-- $" "Id: " g~thisfile " $ -->"))
       (setq Original "(UNSET by gs-structure)")
       )
     )