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

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index f066aacab707ab87c2b955b37709186085ddb944..2b200db23d55ed4a92ddf8ff110d47a77c84036d 100644 (file)
--- 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 b76bdf8d81c650575ab8434353b4f72ae2274dc8..246ace590d4c7171752c23b195ebbb6a4d7472dd 100644 (file)
--- 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 ()