Hi,

This patch fix the window configuration saving for
`tla-gnus-apply-patch' and also add a call to
`dvc-gnus-article-extract-log-message', which sets
`dvc-memorized-version' for further processing during the application
of the patch.

Thanks,
Andrea.

Please change the Subject header to a concise description of your patch.
Please describe your patch between the LOG-START and LOG-END markers:
<<LOG-START>>

* lisp/dvc-gnus.el (dvc-gnus-article-apply-patch): Don't save window
  excursion now.  Let `tla-gnus-apply-patch' do it.

* lisp/tla-gnus.el (tla-gnus-apply-patch): Extract the log message from
  the current article before doing anything else.  Save the window
  configuration in the changeset buffer to be restored by
  `dvc-buffer-quit'.

<<LOG-END>>



[VERSION] dvc-dev-bzr

Bazaar (bzr) 0.11.0

Emacs  : GNU Emacs 22.0.91.2 (i686-pc-linux-gnu, GTK+ Version 2.8.20)
 of 2006-11-20 on onosendai.org
-- 
Reclama i tuoi diritti digitali, elimina il DRM.  Approfondisci su
http://www.no1984.org
Reclaim your digital rights, eliminate DRM.  Learn more at
http://www.defectivebydesign.org/what_is_drm
=== modified file 'lisp/dvc-gnus.el'
--- lisp/dvc-gnus.el	2006-11-21 19:59:25 +0000
+++ lisp/dvc-gnus.el	2006-11-23 14:26:01 +0000
@@ -127,8 +127,7 @@
             (setq patch-type 'xhg)
           (setq patch-type 'dvc))))
     (cond ((eq patch-type 'tla)
-           (save-window-excursion
-             (tla-gnus-article-apply-patch n)))
+	   (tla-gnus-article-apply-patch n))
           ((eq patch-type 'xhg)
            (xhg-gnus-article-import-patch n))
           (t

=== modified file 'lisp/tla-gnus.el'
--- lisp/tla-gnus.el	2006-11-21 19:53:23 +0000
+++ lisp/tla-gnus.el	2006-11-23 14:32:52 +0000
@@ -144,17 +144,19 @@
 
 (defun tla-gnus-apply-patch (handle)
   "Apply the patch corresponding to HANDLE."
-  (dvc-buffer-push-previous-window-config)
+  (dvc-gnus-article-extract-log-message)
   (let ((archive-name (dvc-make-temp-name "gnus-patch-tgz"))
         (tree-dir (tla--name-match-from-list
                    (when dvc-memorized-version
                      (tla--name-split dvc-memorized-version))
                    tla-apply-patch-mapping))
-        (tree))
+        (tree)
+	(window-conf (current-window-configuration)))
     (mm-save-part-to-file handle archive-name)
     (gnus-summary-select-article-buffer)
     (split-window-vertically)
     (tla-show-changeset-from-tgz archive-name)
+    (dvc-buffer-push-previous-window-config window-conf)
     (setq tree (dvc-read-directory-name "Apply to tree: "
                                          tree-dir tree-dir))
     (tla-apply-changeset-from-tgz archive-name tree nil)

_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev

Reply via email to