po-mode: Properly highlight C format strings with parameter positions

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index a9b3c30d1adc497745890aa304d72ec6abf3f453..5704341c651ae87bb1081b95b18ce5c81535e7f2 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-05  Daiki Ueno  <ueno@gnu.org>
+
+       * po-mode.el (po-font-lock-keywords): Properly highlight C format
+       strings with parameter positions.
+       Reported at
+       <https://savannah.gnu.org/bugs/index.php?33552>.
+
 2013-03-05  Ævar Arnfjörð Bjarmason  <avarab@gmail.com>  (tiny change)
 
        * po-mode.el (po-auto-update-file-header): New user option.

diff --git a/gettext-tools/misc/po-mode.el b/gettext-tools/misc/po-mode.el
index 94ddb07bdc3eddd4bd29aa4d244a497217fcd442..dac3d115c88fda961876c7f26e26ed3f41e743f1 100644 (file)
--- a/gettext-tools/misc/po-mode.el
+++ b/gettext-tools/misc/po-mode.el
@@ -1064,7 +1064,7 @@ Initialize or replace current translation with the original message"))])
     ;;  '("msgctxt " "msgid " "msgid_plural " "msgstr " "msgstr[0] " "msgstr[1] "))
     ("^\\(\\(msg\\(ctxt\\|id\\(_plural\\)?\\|str\\(\\[[0-9]\\]\\)?\\)\\) \\)?\"\\|\"$"
      . font-lock-keyword-face)
-    ("\\\\.\\|%\\*?[-.0-9ul]*[a-zA-Z]" . font-lock-variable-name-face)
+    ("\\\\.\\|%[*$-.0-9ul]*[a-zA-Z]" . font-lock-variable-name-face)
     ("^# .*\\|^#[:,]?" . font-lock-comment-face)
     ("^#:\\(.*\\)" 1 font-lock-reference-face)
     ;; The following line does not work, and I wonder why.