emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/ediff-init.el


From: Michael Kifer
Subject: [Emacs-diffs] Changes to emacs/lisp/ediff-init.el
Date: Wed, 20 Mar 2002 01:37:59 -0500

Index: emacs/lisp/ediff-init.el
diff -c emacs/lisp/ediff-init.el:1.56 emacs/lisp/ediff-init.el:1.57
*** emacs/lisp/ediff-init.el:1.56       Tue Mar  5 00:34:19 2002
--- emacs/lisp/ediff-init.el    Wed Mar 20 01:36:18 2002
***************
*** 78,84 ****
        (ediff-force-faces)
        ((ediff-color-display-p))
        (ediff-emacs-p (memq (ediff-device-type) '(pc)))
!       (ediff-xemacs-p (memq (ediff-device-type) '(tty pc)))))
  
  ;; toolbar support for emacs hasn't been implemented in ediff
  (defun ediff-has-toolbar-support-p ()
--- 78,85 ----
        (ediff-force-faces)
        ((ediff-color-display-p))
        (ediff-emacs-p (memq (ediff-device-type) '(pc)))
!       (ediff-xemacs-p (memq (ediff-device-type) '(tty pc)))
!       ))
  
  ;; toolbar support for emacs hasn't been implemented in ediff
  (defun ediff-has-toolbar-support-p ()
***************
*** 289,294 ****
--- 290,298 ----
        ediff-merge-revisions-with-ancestor)))
  (ediff-defvar-local ediff-merge-job nil "")
  
+ (defmacro ediff-patch-job ()
+   `(eq ediff-job-name 'epatch))
+ 
  (defmacro ediff-merge-with-ancestor-job ()
    `(memq
      ediff-job-name
***************
*** 630,640 ****
    :type 'boolean
    :group 'ediff-highlighting)
  
- ;; A var local to each control panel buffer.  Indicates highlighting style
- ;; in effect for this buffer: `face', `ascii', nil -- temporarily
- ;; unhighlighted, `off' -- turned off \(on a dumb terminal only\).
- (ediff-defvar-local ediff-highlighting-style nil "")
- 
  
  ;; The suffix of the control buffer name.
  (ediff-defvar-local ediff-control-buffer-suffix nil "")
--- 634,639 ----
***************
*** 807,812 ****
--- 806,819 ----
         (x-display-color-p))
        )
      (error nil)))
+ 
+ 
+ ;; A var local to each control panel buffer.  Indicates highlighting style
+ ;; in effect for this buffer: `face', `ascii',
+ ;; `off' -- turned off \(on a dumb terminal only\).
+ (ediff-defvar-local ediff-highlighting-style 
+   (if (and (ediff-has-face-support-p) ediff-use-faces) 'face 'ascii)
+   "")
  
  
  (if (ediff-has-face-support-p)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]