summaryrefslogtreecommitdiff
path: root/lisp/ediff-init.el
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>1998-06-24 08:58:07 +0000
committerAndreas Schwab <schwab@suse.de>1998-06-24 08:58:07 +0000
commitb2cd9961238194a8194c0961478fcc3482551a3a (patch)
treeba4f891161ba8200f5be3ee789fdc1a6c5db1d95 /lisp/ediff-init.el
parent9f646a9e71bec48421d3135901d7b92a39a2da54 (diff)
downloademacs-b2cd9961238194a8194c0961478fcc3482551a3a.tar.gz
(ediff-autostore-merges): Use `other' widget
type.
Diffstat (limited to 'lisp/ediff-init.el')
-rw-r--r--lisp/ediff-init.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index b514a534d15..833c55f87e3 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -1190,7 +1190,8 @@ This property can be toggled interactively."
Nil means don't save automatically. t means always save. Anything but nil or t
means save automatically only if the merge job is part of a group of jobs, such
as `ediff-merge-directory' or `ediff-merge-directory-revisions'."
- :type '(choice (const nil) (const t) (const group-jobs-only))
+ :type '(choice (const nil) (const t)
+ (other :tag "group-jobs-only" group-jobs-only))
:group 'ediff-merge)
(make-variable-buffer-local 'ediff-autostore-merges)