Change po-mode keymap.

diff --git a/NEWS b/NEWS
index 2d02233fc5537f544501b2159a744fb81244b4f7..bcf93032985881aa397d35c28b909ff66ebe302d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,12 @@ Version 0.11 - XXX 2001
   -d/--default-domain and -p/--output-dir have been removed.
 
 * Manual pages for all the programs have been added.
+
+* PO mode changes:
+  New key bindings for 'po-previous-fuzzy-entry',
+  'po-previous-obsolete-entry', 'po-previous-translated-entry',
+  'po-previous-untranslated', 'po-undo', 'po-other-window', and
+  'po-select-auxiliary'.
 \f
 Version 0.10.40 - September 2001
 

diff --git a/doc/ChangeLog b/doc/ChangeLog
index be04a36ec1576556c94221b4cbf4df5b871cd2b9..ddd5338fce0761e8d60eeebed37f716522e6292d 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,13 @@
+2001-08-23  Karl Eichwalder  <ke@suse.de>
+
+       * gettext.texi (Main PO Commands): Reflect po-mode.el key binding
+       changes.
+       (Translated Entries): Likewise.
+       (Fuzzy Entries): Likewise.
+       (Untranslated Entries): Likewise.
+       (Obsolete Entries): Likewise.
+       (Auxiliary): Likewise.
+
 2001-11-07  Bruno Haible  <haible@clisp.cons.org>
 
        * gettext.texi (Smalltalk): Update from

diff --git a/doc/gettext.texi b/doc/gettext.texi
index d3b444073651738a36f43c5371d8b72b735ecf3b..2663e18eb84245f6e97a9f6d40e8ecd5274590df 100644 (file)
--- a/doc/gettext.texi
+++ b/doc/gettext.texi
@@ -1087,7 +1087,7 @@ subsequent sections.  These allow for quitting PO mode or for managing windows
 in special ways.
 
 @table @kbd
-@item U
+@item _
 Undo last modification to the PO file.
 
 @item Q
@@ -1096,7 +1096,7 @@ Quit processing and save the PO file.
 @item q
 Quit processing, possibly after confirmation.
 
-@item O
+@item 0
 Temporary leave the PO file window.
 
 @item ?
@@ -1131,7 +1131,7 @@ off working with this PO file.  This is the preferred way of getting rid
 of an Emacs PO file buffer.  Merely killing it through the usual command
 @w{@kbd{C-x k}} (@code{kill-buffer}) is not the tidiest way to proceed.
 
-The command @kbd{O} (@code{po-other-window}) is another, softer way,
+The command @kbd{0} (@code{po-other-window}) is another, softer way,
 to leave PO mode, temporarily.  It just moves the cursor to some other
 Emacs window, and pops one if necessary.  For example, if the translator
 just got PO mode to show some source context in some other, she might
@@ -2122,7 +2122,7 @@ Some commands are more specifically related to translated entry processing.
 @item t
 Find the next translated entry.
 
-@item M-t
+@item T
 Find the previous translated entry.
 
 @end table
@@ -2169,7 +2169,7 @@ related to fuzzy entry processing.
 @item f
 Find the next fuzzy entry.
 
-@item M-f
+@item F
 Find the previous fuzzy entry.
 
 @item @key{TAB}
@@ -2233,7 +2233,7 @@ processing.
 @item u
 Find the next untranslated entry.
 
-@item M-u
+@item U
 Find the previous untranslated entry.
 
 @item k
@@ -2280,7 +2280,7 @@ entry processing.
 @item o
 Find the next obsolete entry.
 
-@item M-o
+@item O
 Find the previous obsolete entry.
 
 @item @key{DEL}
@@ -2753,7 +2753,7 @@ Here are the auxiliary file commands available in PO mode.
 @item a
 Seek auxiliary files for another translation for the same entry.
 
-@item M-a
+@item C-c C-a
 Switch to a particular auxiliary file.
 
 @item A
@@ -2777,7 +2777,7 @@ file is also made into an auxiliary file, if not already.  So, @kbd{a}
 in this newly displayed PO file will seek another PO file, and so on,
 so repeating @kbd{a} will eventually yield back the original PO file.
 
-The command @kbd{M-a} (@code{po-select-auxiliary}) asks the translator
+The command @kbd{C-c C-a} (@code{po-select-auxiliary}) asks the translator
 for her choice of a particular auxiliary file, with completion, and
 then switches to that selected PO file.  The command also checks if
 the selected file has an @code{msgid} field identical as the one for

diff --git a/misc/ChangeLog b/misc/ChangeLog
index b8299b5a623ec8480585e229f8c70d28638458f6..6158e69cd8e59af64beb21d3ac9ca9a11d7b9b78 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,16 @@
+2001-08-23  Karl Eichwalder  <ke@suse.de>
+
+       * po-mode.el (po-mode-map): Assign new Key bindings to avoid
+       clashes with moving actions:
+       'po-previous-fuzzy-entry' = 'F',
+       'po-previous-obsolete-entry' = 'O',
+       'po-previous-translated-entry' = 'T',
+       'po-previous-untranslated' = 'U',
+       'po-undo' = '_',
+       'po-other-window' = '0',
+       'po-select-auxiliary' = '\C-c\C-a'.
+       (po-help-display-string): Likewise.
+
 2001-08-23  Karl Eichwalder  <ke@suse.de>
 
        * po-mode.el (po-next-translated-entry): Actually search for

diff --git a/misc/po-mode.el b/misc/po-mode.el
index 80dfcb23515fa9cf2f869bdfa64cd1f2066cc6e2..78087c82f450b3db7fa59d878492e0b84e6050d6 100644 (file)
--- a/misc/po-mode.el
+++ b/misc/po-mode.el
@@ -608,13 +608,13 @@ No doubt that highlighting, when Emacs does not allow it, is a kludge."
   (_"\
 PO Mode Summary           Next Previous            Miscellaneous
 *: Later, /: Docum        n    p    Any type       .     Redisplay
-                          /t   /M-t Translated     /v    Version info
-Moving around             f    M-f  Fuzzy          ?, h  This help
-<    First if any         o    M-o  Obsolete       =     Current index
->    Last if any          u    M-u  Untranslated   O     Other window
+                          /t   /T Translated       /v    Version info
+Moving around             f    F    Fuzzy          ?, h  This help
+<    First if any         o    O    Obsolete       =     Current index
+>    Last if any          u    U    Untranslated   0     Other window
 /SPC Auto select                                   V     Validate
                         Msgstr Comments            M     Mail officially
-Modifying entries         RET  #    Call editor    U     Undo
+Modifying entries         RET  #    Call editor    _     Undo
 TAB   Remove fuzzy mark   k    K    Kill to        E     Edit out full
 /DEL  Fuzzy or fade out   w    W    Copy to        Q     Forceful quit
 LFD   Init with msgid     y    Y    Yank from      q     Confirm and quit
@@ -626,7 +626,7 @@ M-.  Change mark, mark    *M-C  Select, save       x  Exchange current/top
 
 Program Sources           Auxiliary Files          Lexicography
 s    Cycle reference      a    Cycle file          *l    Lookup translation
-M-s  Select reference     M-a  Select file         *M-l  Add/edit translation
+M-s  Select reference     C-cC-a  Select file      *M-l  Add/edit translation
 S    Consider path        A    Consider PO file    *L    Consider lexicon
 M-S  Ignore path          M-A  Ignore PO file      *M-L  Ignore lexicon
 ")
@@ -981,26 +981,26 @@ Called through file-coding-system-alist, before the file is visited for real."
   (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 "F" 'po-previous-fuzzy-entry)
   (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 "O" 'po-previous-obsolete-entry)
+  (define-key po-mode-map "T" 'po-previous-translated-entry)
+  (define-key po-mode-map "U" 'po-previous-untranslated-entry)
   (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 "_" 'po-undo)
+  (define-key po-mode-map "0" 'po-other-window)
   (define-key po-mode-map "\177" 'po-fade-out-entry)
+  (define-key po-mode-map "\C-c\C-a" 'po-select-auxiliary)
   (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)