Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-init.el @ 82:6a378aca36af r20-0b91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-0b91
author cvs
date Mon, 13 Aug 2007 09:07:36 +0200
parents 1ce6082ce73f
children 4be1180a9e89
comparison
equal deleted inserted replaced
81:ebca3d831cea 82:6a378aca36af
1 ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff 1 ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
2 2
3 ;; Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. 3 ;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
4 4
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> 5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
6 6
7 ;; This file is part of GNU Emacs. 7 ;; This file is part of GNU Emacs.
8 8
30 (defvar ediff-grab-mouse) 30 (defvar ediff-grab-mouse)
31 (defvar ediff-mouse-pixel-position) 31 (defvar ediff-mouse-pixel-position)
32 (defvar ediff-mouse-pixel-threshold) 32 (defvar ediff-mouse-pixel-threshold)
33 (defvar ediff-whitespace) 33 (defvar ediff-whitespace)
34 (defvar ediff-multiframe) 34 (defvar ediff-multiframe)
35
36 (and noninteractive
37 (eval-when-compile
38 (load "ange-ftp" 'noerror)))
35 ;; end pacifier 39 ;; end pacifier
36 40
37 ;; Is it XEmacs? 41 ;; Is it XEmacs?
38 (defconst ediff-xemacs-p (string-match "XEmacs" emacs-version)) 42 (defconst ediff-xemacs-p (string-match "XEmacs" emacs-version))
39 ;; Is it Emacs? 43 ;; Is it Emacs?
88 (ediff-defvar-local ediff-buffer-B nil "") 92 (ediff-defvar-local ediff-buffer-B nil "")
89 ;; The buffer in which the C variant is stored. 93 ;; The buffer in which the C variant is stored.
90 (ediff-defvar-local ediff-buffer-C nil "") 94 (ediff-defvar-local ediff-buffer-C nil "")
91 ;; Ancestor buffer 95 ;; Ancestor buffer
92 (ediff-defvar-local ediff-ancestor-buffer nil "") 96 (ediff-defvar-local ediff-ancestor-buffer nil "")
93 ;; The control buffer of ediff. 97 ;; The Ediff control buffer
94 (ediff-defvar-local ediff-control-buffer nil "") 98 (ediff-defvar-local ediff-control-buffer nil "")
95 99
96 ;;; Macros 100 ;;; Macros
97 (defmacro ediff-odd-p (arg) 101 (defmacro ediff-odd-p (arg)
98 (` (eq (logand (, arg) 1) 1))) 102 (` (eq (logand (, arg) 1) 1)))
623 (cond ((memq op '(= > >=)) nil) 627 (cond ((memq op '(= > >=)) nil)
624 ((memq op '(< <=)) t)))) 628 ((memq op '(< <=)) t))))
625 629
626 630
627 ;;;; warn if it is a wrong version of emacs 631 ;;;; warn if it is a wrong version of emacs
628 ;;(if (or (ediff-check-version '< 19 29 'emacs) 632 ;;(if (or (ediff-check-version '< 19 35 'emacs)
629 ;; (ediff-check-version '< 19 12 'xemacs)) 633 ;; (ediff-check-version '< 19 15 'xemacs))
630 ;; (progn 634 ;; (progn
631 ;; (with-output-to-temp-buffer ediff-msg-buffer 635 ;; (with-output-to-temp-buffer ediff-msg-buffer
632 ;; (switch-to-buffer ediff-msg-buffer) 636 ;; (switch-to-buffer ediff-msg-buffer)
633 ;; (insert 637 ;; (insert
634 ;; (format " 638 ;; (format "
635 ;; 639 ;;
636 ;;This version of Ediff requires 640 ;;This version of Ediff requires
637 ;; 641 ;;
638 ;;\t Emacs 19.29 and higher 642 ;;\t Emacs 19.35 and higher
639 ;;\t OR 643 ;;\t OR
640 ;;\t XEmacs 19.12 and higher 644 ;;\t XEmacs 19.15 and higher
641 ;; 645 ;;
642 ;;It is unlikely to work under Emacs version %s 646 ;;It is unlikely to work under Emacs version %s
643 ;;that you are using... " emacs-version)) 647 ;;that you are using... " emacs-version))
644 ;; (if noninteractive 648 ;; (if noninteractive
645 ;; () 649 ;; ()