Fix problem with fetchmail's use of \r in msgid strings.

diff --git a/misc/ChangeLog b/misc/ChangeLog
index f480ff5ae4ef5a341d462cc88725948a3888c3b5..f9a0c7b16a3f6759284d72b84e72d5dbb8c27af7 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-15  Karl Eichwalder  <ke@suse.de>
+
+       * po-mode.el (po-eval-requoted): Add \r to avoid additional quoting
+       during edit.  Reported by Santiago Vila.
+
 2001-12-06  Bruno Haible  <bruno@clisp.org>
 
        * gettextize.in: Install config.rpath in the directory specified

diff --git a/misc/po-mode.el b/misc/po-mode.el
index a8f68d485726eced4f658f59ea3c757436ee7695..dd9ae0a4f95462ad09e875c00cc1b503e90bc9a2 100644 (file)
--- a/misc/po-mode.el
+++ b/misc/po-mode.el
@@ -1724,7 +1724,7 @@ If FORM is itself a string, then this string is used for insertion."
     (goto-char (point-min))
     (let ((multi-line (re-search-forward "[^\n]\n+[^\n]" nil t)))
       (goto-char (point-min))
-      (while (re-search-forward "[\"\a\b\f\n\t\\]" nil t)
+      (while (re-search-forward "[\"\a\b\f\n\r\t\\]" nil t)
        (cond ((eq (preceding-char) ?\") (replace-match "\\\"" t t))
              ((eq (preceding-char) ?\a) (replace-match "\\a" t t))
              ((eq (preceding-char) ?\b) (replace-match "\\b" t t))
@@ -1734,6 +1734,7 @@ If FORM is itself a string, then this string is used for insertion."
                                  "\\n"
                                "\\n\"\n\"")
                              t t))
+             ((eq (preceding-char) ?\r) (replace-match "\\r" t t))
              ((eq (preceding-char) ?\t) (replace-match "\\t" t t))
              ((eq (preceding-char) ?\\) (replace-match "\\\\" t t))))
       (goto-char (point-min))