summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2002-01-07 17:53:01 +0000
committerBruno Haible <bruno@clisp.org>2009-06-22 00:37:03 +0200
commit04845336c147c1f30527828abab5a38bdb76e1ec (patch)
tree58ec6a148c044809dbf3f02eeec593c51f5aab1b /misc
parentd3420f546076e83b3098c5aadf9135ff239d2aec (diff)
downloadexternal_gettext-04845336c147c1f30527828abab5a38bdb76e1ec.zip
external_gettext-04845336c147c1f30527828abab5a38bdb76e1ec.tar.gz
external_gettext-04845336c147c1f30527828abab5a38bdb76e1ec.tar.bz2
Kill ediff buffers after quitting the ediff session.
Diffstat (limited to 'misc')
-rw-r--r--misc/ChangeLog5
-rw-r--r--misc/po-mode.el7
2 files changed, 10 insertions, 2 deletions
diff --git a/misc/ChangeLog b/misc/ChangeLog
index bc47b14..aef1b0a 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-20 Karl Eichwalder <ke@suse.de>
+
+ * po-mode.el (po-ediff-buffers-exit-recursive): Kill ediff buffers
+ after quitting the ediff session.
+
2002-01-03 Bruno Haible <bruno@clisp.org>
* gettextize.in: Recommend installation of gettext.h.
diff --git a/misc/po-mode.el b/misc/po-mode.el
index dd9ae0a..57d5aad 100644
--- a/misc/po-mode.el
+++ b/misc/po-mode.el
@@ -2037,8 +2037,10 @@ The string is properly recommented before the replacement occurs."
(defun po-ediff-buffers-exit-recursive (b1 b2 oldbuf end)
"Ediff buffer B1 and B2, pop back to OLDBUF and replace the old variants.
-This function will delete the first two variants in OLDBUF and replace this
-text with the contents of B2.
+This function will delete the first two variants in OLDBUF, call
+`ediff-buffers' to compare both strings and replace the two variants in
+OLDBUF with the contents of B2.
+Once done kill B1 and B2.
For more info cf. `po-subedit-ediff'."
(ediff-buffers b1 b2)
@@ -2046,6 +2048,7 @@ For more info cf. `po-subedit-ediff'."
(pop-to-buffer oldbuf)
(delete-region (point-min) end)
(insert-buffer b2)
+ (mapc 'kill-buffer `(,b1 ,b2))
(display-buffer entry-buffer t))
(defun po-subedit-ediff ()