Big merge part 9.

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 8f1e4c34a2a48624a137e1ee29e6692f4937edf3..b753c96ffb7acf14392abab847f9d3659a0096b5 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,10 @@
+2000-01-17  François Pinard  <pinard@iro.umontreal.ca>
+
+       * po-mode.el (po-subedit-abort): Change variable names.
+       (po-seek-equivalent-translation): Call set-buffer instead of
+       select-buffer.
+       (po-subedit-cycle-auxiliary): Adapt to multiple edits.
+
 2001-08-12  François Pinard  <pinard@iro.umontreal.ca>
 
        * po-mode.el (po-find-charset, po-compute-counters,

diff --git a/misc/po-mode.el b/misc/po-mode.el
index ac02dcbfb297f7c3400c2c8d4108396a57ebda3b..ff2e146839c79f0f090d716452048f0746201e80 100644 (file)
--- a/misc/po-mode.el
+++ b/misc/po-mode.el
@@ -1856,15 +1856,15 @@ The string is properly recommented before the replacement occurs."
   (interactive)
   (let* ((edit-buffer (current-buffer))
         (back-pointer po-subedit-back-pointer)
-        (marker (nth 0 back-pointer))
-        (overlay (nth 2 back-pointer))
-        (buffer (marker-buffer marker)))
-    (if (null buffer)
+        (entry-marker (nth 0 back-pointer))
+        (overlay-info (nth 2 back-pointer))
+        (entry-buffer (marker-buffer entry-marker)))
+    (if (null entry-buffer)
        (error (_"Corresponding PO buffer does not exist anymore"))
       (or (one-window-p) (delete-window))
-      (switch-to-buffer buffer)
-      (goto-char marker)
-      (and overlay (po-dehighlight overlay))
+      (switch-to-buffer entry-buffer)
+      (goto-char entry-marker)
+      (and overlay-info (po-dehighlight overlay-info))
       (kill-buffer edit-buffer)
       (setq po-edited-fields (delete back-pointer po-edited-fields)))))
 
@@ -2077,7 +2077,7 @@ Otherwise, move nothing, and just return `nil'."
            (goto-char po-start-of-msgid))
        (goto-char start)
        (po-find-span-of-entry)
-       (select-buffer current))
+       (set-buffer current))
       found)))
 
 (defun po-cycle-auxiliary ()
@@ -2109,12 +2109,12 @@ Otherwise, move nothing, and just return `nil'."
 (defun po-subedit-cycle-auxiliary ()
   "Cycle auxiliary file, but from the translation edit buffer."
   (interactive)
-  (if po-buffer-of-edited-entry
-      (let ((buffer (current-buffer)))
-       (pop-to-buffer po-buffer-of-edited-entry)
-       (po-cycle-auxiliary)
-       (pop-to-buffer buffer))
-    (error (_"Not editing a PO file entry"))))
+  (let* ((entry-marker (nth 0 po-subedit-back-pointer))
+        (entry-buffer (marker-buffer entry-marker))
+        (buffer (current-buffer)))
+    (pop-to-buffer entry-buffer)
+    (po-cycle-auxiliary)
+    (pop-to-buffer buffer)))
 
 (defun po-select-auxiliary ()
   "Select one of the available auxiliary files and locate an equivalent