[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-wind.el,v
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-wind.el,v |
Date: |
Sun, 06 Apr 2008 19:26:07 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Michael Kifer <kifer> 08/04/06 19:26:05
Index: ediff-wind.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-wind.el,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- ediff-wind.el 4 Apr 2008 07:51:25 -0000 1.57
+++ ediff-wind.el 6 Apr 2008 19:26:01 -0000 1.58
@@ -49,7 +49,8 @@
(require 'ediff-init)
(require 'ediff-util)
(require 'ediff-help)
- (require 'ediff-tbar nil 'noerror)
+ (if (featurep 'xemacs)
+ (require 'ediff-tbar))
)
;; end pacifier
@@ -57,10 +58,7 @@
;; be careful with ediff-tbar
(if (featurep 'xemacs)
- (condition-case nil
(require 'ediff-tbar)
- (error
- (defun ediff-compute-toolbar-width () 0)))
(defun ediff-compute-toolbar-width () 0))
(defgroup ediff-window nil