Mercurial > emacs
comparison lisp/ediff-mult.el @ 83176:d5674d957cdc
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-447
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-448
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-449
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-216
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sun, 11 Jul 2004 02:28:46 +0000 |
| parents | 6d79704b2630 |
| children | 905bf9de87af 029a652ac817 |
comparison
equal
deleted
inserted
replaced
| 83175:257f5492d958 | 83176:d5674d957cdc |
|---|---|
| 198 (defvar ediff-session-registry nil) | 198 (defvar ediff-session-registry nil) |
| 199 | 199 |
| 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. |
| 202 This can be toggled with `ediff-toggle-filename-truncation'." | 202 This 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." |
| 207 :type 'hook | 207 :type 'hook |
| 208 :group 'ediff-mult) | 208 :group 'ediff-mult) |