From 9d00f7fc4eb8a95c809c13dc89c05a8b9c5e0a2b Mon Sep 17 00:00:00 2001 From: Noritada Kobayashi Date: Sat, 8 May 2010 19:49:26 +0200 Subject: [PATCH] Fix failure of po-msgid-to-msgstr just after opening a buffer. --- gettext-tools/misc/ChangeLog | 9 +++++++++ gettext-tools/misc/po-mode.el | 7 ++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog index acef43d8d..e0d6cdfcc 100644 --- a/gettext-tools/misc/ChangeLog +++ b/gettext-tools/misc/ChangeLog @@ -1,3 +1,12 @@ +2010-05-08 Noritada Kobayashi + + Fix failure of po-msgid-to-msgstr just after opening a buffer. + * po-mode.el (po-msgstr-form-flavor): Remove variable. + (po-get-msgstr-form): Do not call po-get-msgstr-flavor. + (po-set-msgstr-form): Call po-get-msgstr-flavor function here. + Reported in + . + 2010-05-08 Bruno Haible * po-mode.el (po-edit-string): Assign major mode text-mode to the diff --git a/gettext-tools/misc/po-mode.el b/gettext-tools/misc/po-mode.el index afae18454..9111d681b 100644 --- a/gettext-tools/misc/po-mode.el +++ b/gettext-tools/misc/po-mode.el @@ -692,7 +692,6 @@ No doubt that highlighting, when Emacs does not allow it, is a kludge." (defvar po-end-of-msgstr-form) (defvar po-end-of-entry) (defvar po-entry-type) -(defvar po-msgstr-form-flavor) ;; A few counters are usefully shown in the Emacs mode line. (defvar po-translated-counter) @@ -1900,11 +1899,9 @@ If FORM is itself a string, then this string is used for insertion." (defun po-get-msgstr-form () "Extract and return the unquoted msgstr string." - (let ((flavor (po-get-msgstr-flavor)) - (string (po-extract-unquoted (current-buffer) + (let ((string (po-extract-unquoted (current-buffer) po-start-of-msgstr-form po-end-of-msgstr-form))) - (setq po-msgstr-form-flavor flavor) string)) (defun po-set-msgid (form) @@ -1935,7 +1932,7 @@ is properly requoted before the replacement occurs. Returns 'nil' if the buffer has not been modified, for if the new msgstr described by FORM is merely identical to the msgstr already in place." (let ((string (po-eval-requoted form - po-msgstr-form-flavor + (po-get-msgstr-flavor) (eq po-entry-type 'obsolete)))) (save-excursion (goto-char po-start-of-msgstr-form) -- 2.47.2