summaryrefslogtreecommitdiff
path: root/man/ediff.texi
diff options
context:
space:
mode:
authorMichael Kifer <kifer@cs.stonybrook.edu>2002-02-10 06:46:12 +0000
committerMichael Kifer <kifer@cs.stonybrook.edu>2002-02-10 06:46:12 +0000
commit8bdd0bf7853d4803c2949d3048574859ce243acd (patch)
treedaa173356b426c5ba682ca107d8daaef8e37d9d2 /man/ediff.texi
parent73df3b72f653c4c6ff557d2165672bab3e80a391 (diff)
downloademacs-8bdd0bf7853d4803c2949d3048574859ce243acd.tar.gz
2002-02-10 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-util.el (viper-read-key-sequence): fixed so it'll read fast key sequences in emacs native mode (viper-events-to-keys): deleted * viper.el (describe-key, describe-key-briefly): get rid of viper-events-to-keys. * ediff-init.el (ediff-has-gutter-support): Steven Turnbull's patch. * ediff-wind.el (ediff-setup-control-frame): Use ediff-has-gutter-support. * ediff-util.el (ediff-dispose-of-variant-according-to-user): check if buff is alive. * ediff.el: typo in comment.
Diffstat (limited to 'man/ediff.texi')
-rw-r--r--man/ediff.texi1
1 files changed, 1 insertions, 0 deletions
diff --git a/man/ediff.texi b/man/ediff.texi
index 1747a9bc3c5..76c6bf688c1 100644
--- a/man/ediff.texi
+++ b/man/ediff.texi
@@ -2458,6 +2458,7 @@ Peter Stout (Peter_Stout@@cs.cmu.edu),
Chuck Thompson (cthomp@@cs.uiuc.edu),
Ray Tomlinson (tomlinso@@bbn.com),
Raymond Toy (toy@@rtp.ericsson.se),
+Stephen J. Turnbull (stephen@@xemacs.org),
Jan Vroonhof (vroonhof@@math.ethz.ch),
Colin Walters (walters@@cis.ohio-state.edu),
Philippe Waroquiers (philippe.waroquiers@@eurocontrol.be),