From: Bruno Haible <bruno@clisp.org>
Date: Mon, 17 Dec 2001 14:14:18 +0000 (+0000)
Subject: Fix problem with fetchmail's use of \r in msgid strings.
X-Git-Tag: v0.11~179
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a32213bee793ec4146c88a3add670e7bc0c04c73;p=thirdparty%2Fgettext.git

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

diff --git a/misc/ChangeLog b/misc/ChangeLog
index f480ff5ae..f9a0c7b16 100644
--- 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 a8f68d485..dd9ae0a4f 100644
--- 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))