>>>> "Neal" == Neal D Becker
<nbecker(a)fred.net> writes:
Neal> Symbol's value as variable is void: top-gutter
ediff-wind.el doesn't check for gutter support before using it. The
following patch is in ediff.el style and "obviously correct", but I
don't have a no-gutter XEmacs around to test it. S'il vous plait....
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ChangeLog,v
retrieving revision 1.42
diff -U 0 -r1.42 ChangeLog
--- ChangeLog 2002/01/12 05:01:56 1.42
+++ ChangeLog 2002/01/31 14:31:12
@@ -0,0 +1,5 @@
+2002-01-31 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * ediff-init.el (ediff-has-gutter-support-p): New predicate.
+ * ediff-wind.el (ediff-setup-control-frame): Use it.
+
Index: ediff-init.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-init.el,v
retrieving revision 1.22
diff -u -r1.22 ediff-init.el
--- ediff-init.el 2002/01/08 04:27:57 1.22
+++ ediff-init.el 2002/01/31 14:31:12
@@ -87,6 +87,13 @@
nil ; emacs form
))
+;; gutter/fringe support for emacs hasn't been implemented in ediff
+(defun ediff-has-gutter-support-p ()
+ (ediff-cond-compile-for-xemacs-or-emacs
+ (and (featurep 'gutter) (console-on-window-system-p)) ; xemacs form
+ nil ; emacs form
+ ))
+
(defun ediff-use-toolbar-p ()
(and (ediff-has-toolbar-support-p) ;Can it do it ?
(boundp 'ediff-use-toolbar-p)
Index: ediff-wind.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-wind.el,v
retrieving revision 1.12
diff -u -r1.12 ediff-wind.el
--- ediff-wind.el 2002/01/08 04:27:56 1.12
+++ ediff-wind.el 2002/01/31 14:31:13
@@ -969,7 +969,8 @@
(ediff-cond-compile-for-xemacs-or-emacs
(progn ; xemacs
(set-specifier top-toolbar-height (list ctl-frame 2))
- (set-specifier top-gutter (list ctl-frame nil))
+ (if (ediff-has-gutter-support-p)
+ (set-specifier top-gutter (list ctl-frame nil)))
(sit-for 0)
(set-specifier top-toolbar-height (list ctl-frame 0))
;;(set-specifier bottom-toolbar-height (list ctl-frame 0))
--
Institute of Policy and Planning Sciences
http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Don't ask how you can "do" free software business;
ask what your business can "do for" free software.