Synch to flim-1_14.

diff --git a/ChangeLog b/ChangeLog
index 3761902..fa0da92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-08-11  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * smtp.el (smtp-parse-progress-message-format): Fix regexp usage.
+
+2004-08-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
        * smtp.el (smtp-progress-message-format): New user option.
        (smtp-primitive-data): Show progress message.
        (smtp-parse-progress-message-format): New function.

diff --git a/smtp.el b/smtp.el
index 6e86626..b3d83e0 100644 (file)
--- a/smtp.el
+++ b/smtp.el
@@ -795,10 +795,7 @@ nil, the symbols `b', `k' and `l'."
                                                       (point-max))))))
                          nil nil format))
          (setq index (1+ (match-end 0))
-               format (replace-match (concat "%%"
-                                             (or (match-string 1 format)
-                                                 (match-string 2 format)))
-                                     nil nil format))))
+               format (replace-match "%\\&" nil nil format))))
       (cons format type))))
 
 (defun smtp-show-progress-message (def prev)