aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2004-07-10 10:53:19 +0000
committerEli Zaretskii2004-07-10 10:53:19 +0000
commit831dc66dfcda69d8447bb21a483f329138d28fc0 (patch)
tree25284156056d1ef57dce61611ac87480bb5431fd
parent5668fbb8b1b555208ea82664ee4ecbbf3833467d (diff)
downloademacs-831dc66dfcda69d8447bb21a483f329138d28fc0.tar.gz
emacs-831dc66dfcda69d8447bb21a483f329138d28fc0.zip
(ediff-meta-truncate-filenames): Change type to boolean.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/ediff-mult.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 85d71487d75..1264c4077b3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12004-07-10 Stephan Stahl <stahl@eos.franken.de> (tiny change)
2
3 * ediff-mult.el (ediff-meta-truncate-filenames): Change type to
4 boolean.
5
12004-07-09 Lars Hansen <larsh@math.ku.dk> 62004-07-09 Lars Hansen <larsh@math.ku.dk>
2 7
3 * wid-edit.el (widget-field-buffer): Doc fix. 8 * wid-edit.el (widget-field-buffer): Doc fix.
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index f5eff1eb49d..cf6edc2d129 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -200,7 +200,7 @@ Should be a sexp. For instance (car ediff-filtering-regexp-history) or nil."
200(defcustom ediff-meta-truncate-filenames t 200(defcustom ediff-meta-truncate-filenames t
201 "*If non-nil, truncate long file names in the session group buffers. 201 "*If non-nil, truncate long file names in the session group buffers.
202This can be toggled with `ediff-toggle-filename-truncation'." 202This can be toggled with `ediff-toggle-filename-truncation'."
203 :type 'hook 203 :type 'boolean
204 :group 'ediff-mult) 204 :group 'ediff-mult)
205(defcustom ediff-registry-setup-hook nil 205(defcustom ediff-registry-setup-hook nil
206 "*Hooks run just after the registry control panel is set up." 206 "*Hooks run just after the registry control panel is set up."