Big merge part 2.

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 773a7623b1da34c4680a16d333fcb678bbc8117d..6ff594d34838812aa462d15258387af7f4ced450 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-13  François Pinard  <pinard@iro.umontreal.ca>
+
+       * po-mode.el (po-mode): Issue message after running hooks rather than
+       before, augmenting the chances that the message does not get erased.
+
 1999-07-25  François Pinard  <pinard@iro.umontreal.ca>
 
        * po-mode.el (po-match-string): New function.

diff --git a/misc/po-mode.el b/misc/po-mode.el
index 68477ce8baf03e106641534b05e174a098ca4f31..91393d4a04374d1f6b0cd4ba0156256db9f34042 100644 (file)
--- a/misc/po-mode.el
+++ b/misc/po-mode.el
@@ -875,8 +875,8 @@ all reachable through `M-x customize', in group `Emacs.Editing.I18n.Po'."
 
   (add-hook 'write-contents-hooks 'po-replace-revision-date)
 
-  (message (_"You may type `h' or `?' for a short PO mode reminder."))
-  (run-hooks 'po-mode-hook))
+  (run-hooks 'po-mode-hook)
+  (message (_"You may type `h' or `?' for a short PO mode reminder.")))
 \f
 ;;; Window management.