From: Bruno Haible <bruno@clisp.org>
Date: Sat, 8 May 2010 18:31:57 +0000 (+0200)
Subject: po-mode: Fix po-get-msgid function in plural entries.
X-Git-Tag: v0.18~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc588156d711071eeae5eec4e9d916c3a50cddb5;p=thirdparty%2Fgettext.git

po-mode: Fix po-get-msgid function in plural entries.
---

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index f066aacab..2b200db23 100644
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-08  Noritada Kobayashi  <nori1@dolphin.c.u-tokyo.ac.jp>
+            Bruno Haible  <bruno@clisp.org>
+
+	po-mode: Fix po-get-msgid function in plural entries.
+	* po-mode.el (po-get-msgid): Use po-start-of-msgid_plural as end
+	pointer, if it is set.
+	Reported in
+	<http://lists.gnu.org/archive/html/bug-gnu-utils/2008-05/msg00031.html>.
+
 2010-05-08  Noritada Kobayashi  <nori1@dolphin.c.u-tokyo.ac.jp>
             Bruno Haible  <bruno@clisp.org>
 
diff --git a/gettext-tools/misc/po-mode.el b/gettext-tools/misc/po-mode.el
index b76bdf8d8..246ace590 100644
--- a/gettext-tools/misc/po-mode.el
+++ b/gettext-tools/misc/po-mode.el
@@ -1901,7 +1901,8 @@ If FORM is itself a string, then this string is used for insertion."
   "Extract and return the unquoted msgid string."
   (let ((string (po-extract-unquoted (current-buffer)
                                      po-start-of-msgid
-                                     po-start-of-msgstr-block)))
+                                     (or po-start-of-msgid_plural
+                                         po-start-of-msgstr-block))))
     string))
 
 (defun po-get-msgstr-flavor ()