1 diff --git a/gettext-tools/misc/po-compat.el b/gettext-tools/misc/po-compat.el
2 index 02feafd..64701ba 100644
3 --- a/gettext-tools/misc/po-compat.el
4 +++ b/gettext-tools/misc/po-compat.el
6 ;;; po-compat.el --- basic support of PO translation files -*- coding: latin-1; -*-
8 -;; Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
9 +;; Copyright (C) 1995-1999, 2000-2002, 2010 Free Software Foundation, Inc.
11 ;; Authors: François Pinard <pinard@iro.umontreal.ca>,
12 ;; Greg McGary <gkm@magilla.cichlid.com>,
13 @@ -201,6 +201,7 @@ Called through file-coding-system-alist, before the file is visited for real."
14 (list (cond ((and try-symbol (coding-system-p try-symbol))
17 + (not (string-lessp "23" emacs-version))
18 (string-match "\\`cp[1-9][0-9][0-9]?\\'"
20 (assoc (substring try-string 2)
21 diff --git a/gettext-tools/misc/po-mode.el b/gettext-tools/misc/po-mode.el
22 index a95644b..0e6ef99 100644
23 --- a/gettext-tools/misc/po-mode.el
24 +++ b/gettext-tools/misc/po-mode.el
29 -(defconst po-mode-version-string "2.2" "\
30 +(defconst po-mode-version-string "2.21" "\
31 Version number of this version of po-mode.el.")
33 ;;; Emacs portability matters - part I.
34 @@ -2275,7 +2275,7 @@ For more info cf. `po-subedit-ediff'."
36 (pop-to-buffer oldbuf)
37 (delete-region (point-min) end)
39 + (insert-buffer-substring b2)
40 (mapc 'kill-buffer `(,b1 ,b2))
41 (display-buffer entry-buffer t))
43 @@ -3494,7 +3494,7 @@ Write to your team? ('n' if writing to the Translation Project robot) ")))
45 (concat "^" (regexp-quote mail-header-separator) "\n"))
47 - (insert-buffer buffer)
48 + (insert-buffer-substring buffer)
49 (shell-command-on-region
50 (region-beginning) (region-end)
51 (concat po-gzip-uuencode-command " " name ".gz") t))))))