[gettext] po-mode changes

[Dave Love]

[This doesn't seem to have got through before.]


Here are some changes to PO mode (from gettext 0.10.38).  The primary
one is to sanitize setting up the correct coding system.  This should
surely be done as generally as possible, depending on which coding
systems you actually have installed (e.g. I have defined all the
relevant 8-bit ones for use with Emacs 21).  [I hoped that general
machinery like this would be included in `set-auto-coding', but it
doesn't look as though it will be.]

There are various Checkdoc-inspired changes.  Note the fixme about an
undefined variable.

I don't know whether or not using `8-bit' in the header is a typo or
not, but it's not consistent with MIME, at least.

2001-07-24  Dave Love  <address@hidden>

        * po-mode.el: Doc fixes.
        (po-highlight-face): Defvar when compiling.
        (po-content-type-charset-alist): Remove most entries.
        (po-find-file-coding-system): Re-written.
        (po-mode-map): Put all in defvar.  Fix `v' binding.
        (po-buffer-of-edited-entry): Define.
        (po-default-file-header): Use `8bit', not `8-bit'.

*** po-mode.el  2001/07/24 12:46:39     1.1
--- po-mode.el  2001/07/24 19:13:31
***************
*** 1,7 ****
! ;;; po-mode.el -- for helping GNU gettext lovers to edit PO files.
! ;;; Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
! ;;; François Pinard <address@hidden>, 1995.
! ;;; Helped by Greg McGary <address@hidden>.
  
  ;; This file is part of GNU gettext.
  
--- 1,11 ----
! ;;; po-mode.el -- major mode for GNU gettext PO files
! 
! ;; Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
! 
! ;; Author: François Pinard <address@hidden>
! ;;         Greg McGary <address@hidden>
! ;; Keywords: i18n
! ;; Created: 1995
  
  ;; This file is part of GNU gettext.
  
***************
*** 20,45 ****
  ;; Free Software Foundation, 59 Temple Place - Suite 330, Boston,
  ;; MA 02111-1307, USA.
  
! ;;; This package provides the tools meant to help editing PO files,
! ;;; as documented in the GNU gettext user's manual.  See this manual
! ;;; for user documentation, which is not repeated here.
! 
! ;;; To install, merely put this file somewhere GNU Emacs will find it,
! ;;; then add the following lines to your .emacs file:
! ;;;
! ;;;   (autoload 'po-mode "po-mode"
! ;;;             "Major mode for translators to edit PO files" t)
! ;;;   (setq auto-mode-alist (cons '("\\.po[tx]?\\'\\|\\.po\\." . po-mode)
! ;;;                             auto-mode-alist))
! ;;;
! ;;; To automatically use the right coding system under Emacs 20, also add:
! ;;;
! ;;;   (autoload 'po-find-file-coding-system "po-mode")
! ;;;   (modify-coding-system-alist 'file "\\.po[tx]?\\'\\|\\.po\\."
! ;;;                             'po-find-file-coding-system)
! ;;;
! ;;; You may also adjust some variables, below, by defining them in your
! ;;; `.emacs' file, either directly or through command `M-x customize'.

  ;;; Emacs portability matters.
  
--- 24,54 ----
  ;; Free Software Foundation, 59 Temple Place - Suite 330, Boston,
  ;; MA 02111-1307, USA.
  
! ;;; Commentary:
! 
! ;; This package provides tools meant to help editing PO files, as
! ;; documented in the GNU gettext user's manual.  See this manual for
! ;; user documentation, which is not repeated here.
! 
! ;; To install, merely put this file somewhere GNU Emacs will find it,
! ;; then add the following lines to your .emacs file:
! ;;
! ;;   (autoload 'po-mode "po-mode"
! ;;             "Major mode for translators to edit PO files" t)
! ;;   (setq auto-mode-alist (cons '("\\.po[tx]?\\'\\|\\.po\\." . po-mode)
! ;;                              auto-mode-alist))
! ;;
! ;; To use the right coding system automatically under Emacs 20, also add:
! ;;
! ;;   (autoload 'po-find-file-coding-system "po-mode")
! ;;   (modify-coding-system-alist 'file "\\.po[tx]?\\'\\|\\.po\\."
! ;;                              'po-find-file-coding-system)
! ;;
! ;; You may also adjust some variables, below, by defining them in your
! ;; `.emacs' file, either directly or through command `M-x customize'.
! 
! ;;; Code:
! 

  ;;; Emacs portability matters.
  
***************
*** 141,146 ****
--- 150,157 ----
  
  ;; Handle portable highlighting.  Code has been adapted (OK... stolen! :-)
  ;; from `ispell.el'.
+ (eval-when-compile
+   (defvar po-highlight-face))
  (eval-and-compile
    (cond
     (po-EMACS20
***************
*** 309,323 ****
  \"Language-Team: LANGUAGE <address@hidden>\\n\"
  \"MIME-Version: 1.0\\n\"
  \"Content-Type: text/plain; charset=CHARSET\\n\"
! \"Content-Transfer-Encoding: 8-bit\\n\"
  "
    "*Default PO file header."
    :type 'string
    :group 'po)
  
  (defcustom po-highlighting (or po-EMACS20 po-XEMACS)
!   "*Highlight text whenever appropriate, when non-nil.  However, on older
! Emacses, a yet unexplained highlighting bug causes files to get mangled."
    :type 'boolean
    :group 'po)
  
--- 320,335 ----
  \"Language-Team: LANGUAGE <address@hidden>\\n\"
  \"MIME-Version: 1.0\\n\"
  \"Content-Type: text/plain; charset=CHARSET\\n\"
! \"Content-Transfer-Encoding: 8bit\\n\"
  "
    "*Default PO file header."
    :type 'string
    :group 'po)
  
  (defcustom po-highlighting (or po-EMACS20 po-XEMACS)
!   "*Highlight text whenever appropriate, when non-nil.
! However, on older Emacses, a yet unexplained highlighting bug causes
! files to get mangled."
    :type 'boolean
    :group 'po)
  
***************
*** 432,438 ****
  (defun po-mode-version ()
    "Show Emacs PO mode version."
    (interactive)
!   (message (_"Emacs PO mode, version %s") (substring "$Revision: 1.1 $" 11 
-2)))
  
  (defconst po-help-display-string
    (_"\
--- 444,450 ----
  (defun po-mode-version ()
    "Show Emacs PO mode version."
    (interactive)
!   (message (_"Emacs PO mode, version %s") (substring "$Revision: 1.1.1.1 $" 
11 -2)))
  
  (defconst po-help-display-string
    (_"\
***************
*** 557,620 ****
    "Message to post in the minibuffer when an edit buffer is displayed.")
  
  (defconst po-content-type-charset-alist
!   '(; Note: Emacs 20 doesn't support all encodings, thus the missing entries.
!     (ASCII . undecided)
!     (ANSI_X3.4-1968 . undecided)
!     (US-ASCII . undecided)
!     (ISO-8859-1 . iso-8859-1)
!     (ISO_8859-1 . iso-8859-1)
!     (ISO-8859-2 . iso-8859-2)
!     (ISO_8859-2 . iso-8859-2)
!     (ISO-8859-3 . iso-8859-3)
!     (ISO_8859-3 . iso-8859-3)
!     (ISO-8859-4 . iso-8859-4)
!     (ISO_8859-4 . iso-8859-4)
!     (ISO-8859-5 . iso-8859-5)
!     (ISO_8859-5 . iso-8859-5)
!     ;(ISO-8859-6 . ??)
!     ;(ISO_8859-6 . ??)
!     (ISO-8859-7 . iso-8859-7)
!     (ISO_8859-7 . iso-8859-7)
!     (ISO-8859-8 . iso-8859-8)
!     (ISO_8859-8 . iso-8859-8)
!     (ISO-8859-9 . iso-8859-9)
!     (ISO_8859-9 . iso-8859-9)
!     ;(ISO-8859-13 . ??)
!     ;(ISO_8859-13 . ??)
!     ;(ISO-8859-15 . ??)
!     ;(ISO_8859-15 . ??)
!     (KOI8-R . koi8-r)
!     ;(KOI8-U . ??)
!     ;(CP850 . ??)
!     ;(CP866 . ??)
!     ;(CP874 . ??)
!     ;(CP932 . ??)
!     ;(CP949 . ??)
!     ;(CP950 . ??)
!     ;(CP1250 . ??)
!     ;(CP1251 . ??)
!     ;(CP1252 . ??)
!     ;(CP1253 . ??)
!     ;(CP1254 . ??)
!     ;(CP1255 . ??)
!     ;(CP1256 . ??)
!     ;(CP1257 . ??)
!     ;(GB2312 . euc-cn)
!     ;(EUC-JP . euc-jp)
!     ;(EUC-KR . euc-kr)
!     ;(EUC-TW . ??)
!     ;(BIG5 . big5)
!     ;(BIG5HKSCS . ??)
!     ;(GBK . ??)
!     ;(GB18030 . ??)
!     ;(SJIS . shift_jis)
!     ;(JOHAB . ??)
!     ;(TIS-620 . th-tis620)
!     ;(VISCII . viscii)
!     (UTF-8 . utf-8)        ; requires Mule-UCS in Emacs 20, or Emacs 21
!     )
!   "How to convert a GNU libc/libiconv canonical charset name as seen in
! Content-Type into a Mule coding system.")
  
  (defvar po-auxiliary-list nil
    "List of auxiliary PO files, in completing read format.")
--- 569,580 ----
    "Message to post in the minibuffer when an edit buffer is displayed.")
  
  (defconst po-content-type-charset-alist
!   '((ascii . undecided)
!     (ansi_x3.4-1968 . undecided)
!     (us-ascii . undecided))
!   "How to convert some GNU libc/libiconv charset names to coding systems.
! These are charsets which can appear in a `Content-Type', but which do
! not have corresponding coding systems.")
  
  (defvar po-auxiliary-list nil
    "List of auxiliary PO files, in completing read format.")
***************
*** 701,792 ****
  
        (defun po-find-file-coding-system (arg-list)
        "Return a Mule (DECODING . ENCODING) pair, according to PO file charset.
! Called through file-coding-system-alist, before the file is visited for real."
        (and (eq (car arg-list) 'insert-file-contents)
             (with-temp-buffer
!              (let ((coding-system-for-read 'no-conversion))
                 ;; Is 4096 enough?  FIXME: Retry as needed!
                 (insert-file-contents (nth 1 arg-list) nil 0 4096)
!                (if (re-search-forward
!                     "^\"Content-Type: text/plain;[ \t]*charset=\\([^\\]+\\)"
!                     nil t)
!                    (let* ((charset (buffer-substring
!                                      (match-beginning 1) (match-end 1)))
!                           (charset-upper (intern (upcase charset)))
!                           (charset-lower (intern (downcase charset))))
!                      (list (or (cdr (assq charset-upper
!                                           po-content-type-charset-alist))
!                                (if (memq charset-lower (coding-system-list))
!                                    charset-lower
!                                  'no-conversion))))
!                  '(no-conversion))))))
! 
!     ))
  
! (defvar po-mode-map nil
!   "Keymap for PO mode.")
! (if po-mode-map
!     ()
    ;; The following line because (make-sparse-keymap) does not work on Demacs.
!   (setq po-mode-map (make-keymap))
!   (suppress-keymap po-mode-map)
!   (define-key po-mode-map "\C-i" 'po-unfuzzy)
!   (define-key po-mode-map "\C-j" 'po-msgid-to-msgstr)
!   (define-key po-mode-map "\C-m" 'po-edit-msgstr)
!   (define-key po-mode-map " " 'po-auto-select-entry)
!   (define-key po-mode-map "?" 'po-help)
!   (define-key po-mode-map "#" 'po-edit-comment)
!   (define-key po-mode-map "," 'po-tags-search)
!   (define-key po-mode-map "." 'po-current-entry)
!   (define-key po-mode-map "<" 'po-first-entry)
!   (define-key po-mode-map "=" 'po-statistics)
!   (define-key po-mode-map ">" 'po-last-entry)
!   (define-key po-mode-map "a" 'po-cycle-auxiliary)
! ;;;;  (define-key po-mode-map "c" 'po-save-entry)
!   (define-key po-mode-map "f" 'po-next-fuzzy-entry)
!   (define-key po-mode-map "h" 'po-help)
!   (define-key po-mode-map "k" 'po-kill-msgstr)
! ;;;;  (define-key po-mode-map "l" 'po-lookup-lexicons)
!   (define-key po-mode-map "m" 'po-push-location)
!   (define-key po-mode-map "n" 'po-next-entry)
!   (define-key po-mode-map "o" 'po-next-obsolete-entry)
!   (define-key po-mode-map "p" 'po-previous-entry)
!   (define-key po-mode-map "q" 'po-confirm-and-quit)
!   (define-key po-mode-map "r" 'po-pop-location)
!   (define-key po-mode-map "s" 'po-cycle-source-reference)
!   (define-key po-mode-map "t" 'po-next-translated-entry)
!   (define-key po-mode-map "u" 'po-next-untranslated-entry)
!   (define-key po-mode-map "v" 'po-mode-version)
!   (define-key po-mode-map "w" 'po-kill-ring-save-msgstr)
!   (define-key po-mode-map "x" 'po-exchange-location)
!   (define-key po-mode-map "y" 'po-yank-msgstr)
!   (define-key po-mode-map "A" 'po-consider-as-auxiliary)
!   (define-key po-mode-map "E" 'po-edit-out-full)
!   (define-key po-mode-map "K" 'po-kill-comment)
! ;;;;  (define-key po-mode-map "L" 'po-consider-lexicon-file)
!   (define-key po-mode-map "M" 'po-send-mail)
!   (define-key po-mode-map "O" 'po-other-window)
!   (define-key po-mode-map "Q" 'po-quit)
!   (define-key po-mode-map "S" 'po-consider-source-path)
!   (define-key po-mode-map "U" 'po-undo)
!   (define-key po-mode-map "V" 'po-validate)
!   (define-key po-mode-map "W" 'po-kill-ring-save-comment)
!   (define-key po-mode-map "Y" 'po-yank-comment)
!   (define-key po-mode-map "\177" 'po-fade-out-entry)
!   (define-key po-mode-map "\M-," 'po-mark-translatable)
!   (define-key po-mode-map "\M-." 'po-select-mark-and-mark)
!   (define-key po-mode-map "\M-a" 'po-select-auxiliary)
! ;;;;  (define-key po-mode-map "\M-c" 'po-select-and-save-entry)
!   (define-key po-mode-map "\M-f" 'po-previous-fuzzy-entry)
! ;;;;  (define-key po-mode-map "\M-l" 'po-edit-lexicon-entry)
!   (define-key po-mode-map "\M-o" 'po-previous-obsolete-entry)
!   (define-key po-mode-map "\M-t" 'po-previous-translated-entry)
!   (define-key po-mode-map "\M-u" 'po-previous-untranslated-entry)
!   (define-key po-mode-map "\M-s" 'po-select-source-reference)
!   (define-key po-mode-map "\M-A" 'po-ignore-as-auxiliary)
! ;;;;  (define-key po-mode-map "\M-L" 'po-ignore-lexicon-file)
!   (define-key po-mode-map "\M-S" 'po-ignore-source-path)
!   )
  
  (defun po-mode ()
    "Major mode for translators when they edit PO files.
--- 661,749 ----
  
        (defun po-find-file-coding-system (arg-list)
        "Return a Mule (DECODING . ENCODING) pair, according to PO file charset.
! Called through `file-coding-system-alist', before the file is visited
! for real."
        (and (eq (car arg-list) 'insert-file-contents)
             (with-temp-buffer
!              (let ((coding-system-for-read 'raw-text))
                 ;; Is 4096 enough?  FIXME: Retry as needed!
                 (insert-file-contents (nth 1 arg-list) nil 0 4096)
!                (or (and (re-search-forward
!                          "^\"Content-Type: text/plain;[ 
\t]*charset=\\([^\\]+\\)"
!                          nil t)
!                         (let ((charset (downcase (match-string 1))))
!                           (while (string-match "_" charset)
!                             (setq charset (replace-match "-" nil nil 
charset)))
!                           (setq charset (intern charset))
!                           (if (coding-system-p charset)
!                               charset
!                             (cdr (assq charset 
po-content-type-charset-alist)))))
!                    ;; This used to use `no-conversion', but that
!                    ;; doesn't convert EOL conventions.
!                    'raw-text)))))))
  
! (defvar po-mode-map
    ;; The following line because (make-sparse-keymap) does not work on Demacs.
!   (let ((map (setq map (make-keymap))))
!     (suppress-keymap map)
!     (define-key map "\C-i" 'po-unfuzzy)
!     (define-key map "\C-j" 'po-msgid-to-msgstr)
!     (define-key map "\C-m" 'po-edit-msgstr)
!     (define-key map " " 'po-auto-select-entry)
!     (define-key map "?" 'po-help)
!     (define-key map "#" 'po-edit-comment)
!     (define-key map "," 'po-tags-search)
!     (define-key map "." 'po-current-entry)
!     (define-key map "<" 'po-first-entry)
!     (define-key map "=" 'po-statistics)
!     (define-key map ">" 'po-last-entry)
!     (define-key map "a" 'po-cycle-auxiliary)
! ;;;;  (define-key map "c" 'po-save-entry)
!     (define-key map "f" 'po-next-fuzzy-entry)
!     (define-key map "h" 'po-help)
!     (define-key map "k" 'po-kill-msgstr)
! ;;;;  (define-key map "l" 'po-lookup-lexicons)
!     (define-key map "m" 'po-push-location)
!     (define-key map "n" 'po-next-entry)
!     (define-key map "o" 'po-next-obsolete-entry)
!     (define-key map "p" 'po-previous-entry)
!     (define-key map "q" 'po-confirm-and-quit)
!     (define-key map "r" 'po-pop-location)
!     (define-key map "s" 'po-cycle-source-reference)
!     (define-key map "t" 'po-next-translated-entry)
!     (define-key map "u" 'po-next-untranslated-entry)
!     (define-key map "v" 'po-mode-version)
!     (define-key map "w" 'po-kill-ring-save-msgstr)
!     (define-key map "x" 'po-exchange-location)
!     (define-key map "y" 'po-yank-msgstr)
!     (define-key map "A" 'po-consider-as-auxiliary)
!     (define-key map "E" 'po-edit-out-full)
!     (define-key map "K" 'po-kill-comment)
! ;;;;  (define-key map "L" 'po-consider-lexicon-file)
!     (define-key map "M" 'po-send-mail)
!     (define-key map "O" 'po-other-window)
!     (define-key map "Q" 'po-quit)
!     (define-key map "S" 'po-consider-source-path)
!     (define-key map "U" 'po-undo)
!     (define-key map "V" 'po-validate)
!     (define-key map "W" 'po-kill-ring-save-comment)
!     (define-key map "Y" 'po-yank-comment)
!     (define-key map "\177" 'po-fade-out-entry)
!     (define-key map "\M-," 'po-mark-translatable)
!     (define-key map "\M-." 'po-select-mark-and-mark)
!     (define-key map "\M-a" 'po-select-auxiliary)
! ;;;;  (define-key map "\M-c" 'po-select-and-save-entry)
!     (define-key map "\M-f" 'po-previous-fuzzy-entry)
! ;;;;  (define-key map "\M-l" 'po-edit-lexicon-entry)
!     (define-key map "\M-o" 'po-previous-obsolete-entry)
!     (define-key map "\M-t" 'po-previous-translated-entry)
!     (define-key map "\M-u" 'po-previous-untranslated-entry)
!     (define-key map "\M-s" 'po-select-source-reference)
!     (define-key map "\M-A" 'po-ignore-as-auxiliary)
! ;;;;  (define-key map "\M-L" 'po-ignore-lexicon-file)
!     (define-key map "\M-S" 'po-ignore-source-path)
!     map)
!   "Keymap for PO mode.")
  
  (defun po-mode ()
    "Major mode for translators when they edit PO files.
***************
*** 1034,1043 ****
  ;;; Handling span of entry, entry type and entry attributes.
  
  (defun po-find-span-of-entry ()
!   "Find the extent of the PO file entry where the cursor is.  Set variables
! PO-START-OF-ENTRY, PO-START-OF-MSGID, PO-START-OF-MSGSTR, PO-END-OF-ENTRY
! and PO-ENTRY-TYPE to meaningful values.  Decreasing priority of type
! interpretation is: obsolete, fuzzy, untranslated or translated."
    (let ((here (point)))
      (if (re-search-backward po-any-msgstr-regexp nil t)
        (progn
--- 991,1001 ----
  ;;; Handling span of entry, entry type and entry attributes.
  
  (defun po-find-span-of-entry ()
!   "Find the extent of the PO file entry where the cursor is.
! Set variables `po-start-of-entry', `po-start-of-msgid',
! `po-start-of-msgstr', `po-end-of-entry' and `po-entry-type' to
! meaningful values.  Decreasing priority of type interpretation is:
! obsolete, fuzzy, untranslated or translated."
    (let ((here (point)))
      (if (re-search-backward po-any-msgstr-regexp nil t)
        (progn
***************
*** 1327,1334 ****
  ;; Fuzzy entries.
  
  (defvar po-fuzzy-regexp "^#[,!] .*fuzzy"
!   "Regexp matching the string inserted by msgmerge for translations
! which does not match exactly.")
  
  (defun po-next-fuzzy-entry ()
    "Find the next fuzzy entry, wrapping around if necessary."
--- 1285,1292 ----
  ;; Fuzzy entries.
  
  (defvar po-fuzzy-regexp "^#[,!] .*fuzzy"
!   "Regexp matching the string inserted by msgmerge.
! This is for translations which do not match exactly.")
  
  (defun po-next-fuzzy-entry ()
    "Find the next fuzzy entry, wrapping around if necessary."
***************
*** 1541,1547 ****
  FORM is itself a string, then this string is used for insertion.  The string
  is properly requoted before the replacement occurs.
  
! Returns `nil' if the buffer has not been modified, for if the new msgid
  described by FORM is merely identical to the msgid already in place."
    (let ((string (po-eval-requoted form "msgid" (eq po-entry-type 'obsolete))))
      (save-excursion
--- 1499,1505 ----
  FORM is itself a string, then this string is used for insertion.  The string
  is properly requoted before the replacement occurs.
  
! Returns nil if the buffer has not been modified, for if the new msgid
  described by FORM is merely identical to the msgid already in place."
    (let ((string (po-eval-requoted form "msgid" (eq po-entry-type 'obsolete))))
      (save-excursion
***************
*** 1562,1568 ****
  FORM is itself a string, then this string is used for insertion.  The string
  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 "msgstr" (eq po-entry-type 'obsolete)))
          (msgstr-idx nil))
--- 1520,1526 ----
  FORM is itself a string, then this string is used for insertion.  The string
  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 "msgstr" (eq po-entry-type 'obsolete)))
          (msgstr-idx nil))
***************
*** 1998,2005 ****
    "Search a PO file NAME for a `msgid' STRING having a non-empty `msgstr'.
  STRING is the full quoted msgid field, including the `msgid' keyword.  When
  found, display the file over the current window, with the `msgstr' field
! possibly highlighted, the cursor at start of msgid, then return `t'.
! Otherwise, move nothing, and just return `nil'."
    (let ((current (current-buffer))
        (buffer (find-file-noselect name)))
      (set-buffer buffer)
--- 1956,1963 ----
    "Search a PO file NAME for a `msgid' STRING having a non-empty `msgstr'.
  STRING is the full quoted msgid field, including the `msgid' keyword.  When
  found, display the file over the current window, with the `msgstr' field
! possibly highlighted, the cursor at start of msgid, then return t.
! Otherwise, move nothing, and just return nil."
    (let ((current (current-buffer))
        (buffer (find-file-noselect name)))
      (set-buffer buffer)
***************
*** 2061,2066 ****
--- 2019,2027 ----
        (or found (message (_"No other translation found")))
          found)))
  
+ ;; Fixme: This is never defined  -- fx
+ (defvar po-buffer-of-edited-entry nil)
+ 
  (defun po-subedit-cycle-auxiliary ()
    "Cycle auxiliary file, but from the translation edit buffer."
    (interactive)
***************
*** 2072,2079 ****
      (error (_"Not editing a PO file entry"))))
  
  (defun po-select-auxiliary ()
!   "Select one of the available auxiliary files and locate an equivalent
! entry.  If an entry having the same `msgid' cannot be found, merely select
  the file without moving its cursor."
    (interactive)
    (po-find-span-of-entry)
--- 2033,2040 ----
      (error (_"Not editing a PO file entry"))))
  
  (defun po-select-auxiliary ()
!   "Select one of the available auxiliary files and locate an equivalent entry.
! If an entry having the same `msgid' cannot be found, merely select
  the file without moving its cursor."
    (interactive)
    (po-find-span-of-entry)
***************
*** 2637,2643 ****
        (message ""))))
  
  (defun po-quit ()
!   "Save the PO file and kill buffer.  However, offer validation if
  appropriate and ask confirmation if untranslated strings remain."
    (interactive)
    (if (po-check-all-pending-edits)
--- 2598,2605 ----
        (message ""))))
  
  (defun po-quit ()
!   "Save the PO file and kill buffer.
! However, offer validation if
  appropriate and ask confirmation if untranslated strings remain."
    (interactive)
    (if (po-check-all-pending-edits)