emacs: lisp/ediff-init.el comparison

comparison lisp/ediff-init.el @ 14582:c768f6d7daaa

*** empty log message ***

author	Michael Kifer <kifer@cs.stonybrook.edu>
date	Fri, 16 Feb 1996 06:36:35 +0000
parents	3c38a5112cb6
children	43a3308fcf61

comparison

equal deleted inserted replaced

-:4951b11970a1
+:c768f6d7daaa
 (defsubst ediff-device-type ()
 (if ediff-emacs-p
 window-system
 (device-type (selected-device))))
 ;; in XEmacs: device-type is tty on tty and stream in batch.
-(defsubst ediff-window-display-p ()
+(defun ediff-window-display-p ()
-(and (ediff-device-type) (not (memq (ediff-device-type) '(tty stream)))))
+(and (ediff-device-type) (not (memq (ediff-device-type) '(tty pc stream)))))
+;; test if supports faces
+;; ediff-force-faces is for those devices that support faces, but we don't know
+;; this yet
+(defun ediff-has-face-support-p ()
+(cond ((ediff-window-display-p))
+	(ediff-force-faces)
+	(ediff-emacs-p (memq (ediff-device-type) '(pc)))
+	(ediff-xemacs-p (memq (ediff-device-type) '(tty pc)))))
 ;;; Macros
 (defmacro ediff-odd-p (arg)
 (` (eq (logand (, arg) 1) 1)))
 	       (progn
 		 (set-buffer (, buffer))
 		 (,@ forms))
 	     (set-buffer StartBuffer))
 	 (or (eq this-command 'ediff-quit)
-	     (error
+	     (error ediff-KILLED-VITAL-BUFFER))
-	      "You've killed an essential Ediff buffer---Please quit Ediff"))
 	 ))))
 (defsubst ediff-multiframe-setup-p ()
 (and (ediff-window-display-p) ediff-multiframe))
 (defsubst ediff-dir1-metajob (&optional metajob)
 (or (ediff-revision-metajob metajob)
 ;; add more here
 ))
 (defsubst ediff-collect-diffs-metajob (&optional metajob)
-(or (ediff-revision-metajob metajob)
+(memq (or metajob ediff-metajob-name)
-(memq ediff-metajob-name
+	'(ediff-directories
-	    '(ediff-directories
+	  ediff-directory-revisions
-	      ;; add more here
+	  ediff-merge-directories
-	      ediff-directory-revisions))))
+	  ediff-merge-directories-with-ancestor
+	  ediff-merge-directory-revisions
+	  ediff-merge-directory-revisions-with-ancestor
+	  ;; add more here
+	  )))
 (defsubst ediff-metajob3 (&optional metajob)
 (memq (or metajob ediff-metajob-name)
 	'(ediff-merge-directories-with-ancestor
 	  ediff-merge-filegroups-with-ancestor
 	  ediff-directories3
 j -jump to diff  |     @ -auto-refinement    |  * -refine current region
 gx -goto X's point|                           |  ! -update diff regions
 C-l -recenter      |    ## -ignore whitespace  |
 v/V -scroll up/dn  | #f/#h -focus/hide regions | wx -save buf X
 </> -scroll lt/rt  |     X -read-only in buf X | wd -save diff output
-|     m -wide display       |  ~ -swap buffers
+~ -swap variants |     m -wide display       |
 "
 "Help message usually used for 2-way comparison.
 Normally, not a user option. See `ediff-help-message' for details.")
 (defconst ediff-long-help-message-narrow2
 j -jump to diff  |     @ -auto-refinement    |  * -refine current region
 gx -goto X's point|     % -narrow/widen buffs |  ! -update diff regions
 C-l -recenter      |    ## -ignore whitespace  |
 v/V -scroll up/dn  | #f/#h -focus/hide regions | wx -save buf X
 </> -scroll lt/rt  |     X -read-only in buf X | wd -save diff output
-|     m -wide display       |  ~ -swap buffers
+~ -swap variants |     m -wide display       |
 "
 "Help message when comparing windows or regions line-by-line.
 Normally, not a user option. See `ediff-help-message' for details.")
 (defconst ediff-long-help-message-word-mode
 j -jump to diff  |                           |
 gx -goto X's point|     % -narrow/widen buffs |  ! -recompute diffs
 C-l -recenter      |                           |
 v/V -scroll up/dn  | #f/#h -focus/hide regions | wx -save buf X
 </> -scroll lt/rt  |     X -read-only in buf X | wd -save diff output
-|     m -wide display       |  ~ -swap buffers
+~ -swap variants |     m -wide display       |
 "
 "Help message when comparing windows or regions word-by-word.
 Normally, not a user option. See `ediff-help-message' for details.")
 (defconst ediff-long-help-message-merge
 j -jump to diff  |     @ -auto-refinement    |  * -refine current region
 gx -goto X's point|    ## -ignore whitespace  |  ! -update diff regions
 C-l -recenter      | #f/#h -focus/hide regions |  + -combine diff regions
 v/V -scroll up/dn  |     X -read-only in buf X | wx -save buf X
 </> -scroll lt/rt  |     m -wide display       | wd -save diff output
-/ -ancestor buff |     s -shrink window C    |  ~ -swap buffers
+~ -swap variants |     s -shrink window C    |  / -show ancestor buff
 |     $ -show clashes only  |  & -merge w/new default
 "
 "Help message during merging.
 Normally, not a user option. See `ediff-help-message' for details.")
 produce the brief help message. This function must return a string.")
 (ediff-defvar-local ediff-long-help-message-function nil
 "The long help message that the user can customize.
 See `ediff-brief-help-message-function' for more.")
-(defvar ediff-prefer-long-help-message nil
+(defvar ediff-use-long-help-message nil
-"*If t, Ediff starts with a long help message. Short help msg otherwise.")
+"*If t, Ediff displays a long help message. Short help message otherwise.")
 ;; The actual help message.
 (ediff-defvar-local ediff-help-message ""
 "The actual help message.
 Normally, the user shouldn't touch this. However, if you want Ediff to
 start up with different help messages for different jobs, you can change
 the value of this variable and the variables `ediff-help-message-*' in
 `ediff-startup-hook'.")
+;; Error messages
+(defconst ediff-KILLED-VITAL-BUFFER
+"You have killed a vital Ediff buffer---you must leave Ediff now!")
+(defconst ediff-NO-DIFFERENCES
+"Sorry, it is not my job to munch identical variants...")
 ;; Selective browsing
 (ediff-defvar-local ediff-skip-diff-region-function 'ediff-show-all-diffs
 "Function that determines the next/previous diff region to show.
 (defvar ediff-after-flag-mol  (if ediff-xemacs-p (make-glyph "<<-") "<<-")
 "*Like ediff-after-flag, used when a difference starts in mid-line.")
 (ediff-defvar-local ediff-use-faces t
-"If t, differences are highlighted using faces on a window system.
+"If t, differences are highlighted using faces, if device supports faces.
-If nil, they are highlighted using ASCII flags, ediff-before-flag
+If nil, differences are highlighted using ASCII flags, ediff-before-flag
 and ediff-after-flag.  On a non-window system, differences are always
 highlighted using ASCII flags.
 This variable can be set either in .emacs or toggled interactively.
 Use `setq-default' if setting it in .emacs")
+(defvar ediff-force-faces nil
+"If t, Ediff will think that it is running on a display that supports faces.
+This is provided as a temporary relief for users of face-capable displays
+that Ediff doesn't know about.")
 ;; this indicates that diff regions are word-size, so fine diffs are
 ;; permanently nixed; used in ediff-windows-wordwise and ediff-regions-wordwise
 (ediff-defvar-local ediff-word-mode nil "")
 ;; The original values of ediff-protected-variables for buffer Ancestor
 (ediff-defvar-local ediff-buffer-values-orig-Ancestor nil "")
 ;; Buffer-local variables to be saved then restored during Ediff sessions
 ;; Buffer-local variables to be saved then restored during Ediff sessions
 (defconst ediff-protected-variables '(buffer-read-only
-				      synchronize-minibuffers
+;;;				      synchronize-minibuffers
 				      mode-line-format))
 ;; Vector of differences between the variants.  Each difference is
 ;; represented by a vector of two overlays plus a vector of fine diffs,
 ;; plus a no-fine-diffs flag.  The first overlay spans the
 ;; Priority of non-selected overlays.
 (defvar ediff-shadow-overlay-priority  100 "")
 (defvar ediff-version-control-package 'vc
 "Version control package used.
-Currently, Ediff supports vc.el, rcs.el, and generic-sc.el. The standard Emacs
+Currently, Ediff supports vc.el, rcs.el, pcl-cvs.el, and generic-sc.el. The
-interface to RCS, CVS, SCCS, etc., is vc.el. However, some people find the
+standard Emacs interface to RCS, CVS, SCCS, etc., is vc.el. However, some
-other two packages more convenient. Set this variable `rcs' or `generic-sc' if
+people find the other two packages more convenient. Set this variable to the
-you are such a person.")
+appropriate symbol: `rcs', `pcl-cvs', or `generic-sc' if you so desire.")
 (if ediff-xemacs-p
 (progn
 (fset 'ediff-read-event (symbol-function 'next-command-event))
 (fset 'ediff-overlayp (symbol-function 'extentp))
 (fset 'ediff-make-overlay (symbol-function 'make-extent))
-(fset 'ediff-delete-overlay (symbol-function 'delete-extent))
+(fset 'ediff-delete-overlay (symbol-function 'delete-extent)))
-(fset 'ediff-overlay-buffer (symbol-function 'extent-buffer))
-(fset 'ediff-overlay-get (symbol-function 'extent-property)))
 (fset 'ediff-read-event (symbol-function 'read-event))
 (fset 'ediff-overlayp (symbol-function 'overlayp))
 (fset 'ediff-overlayp (symbol-function 'overlayp))
 (fset 'ediff-make-overlay (symbol-function 'make-overlay))
-(fset 'ediff-delete-overlay (symbol-function 'delete-overlay))
+(fset 'ediff-delete-overlay (symbol-function 'delete-overlay)))
-(fset 'ediff-overlay-buffer (symbol-function 'overlay-buffer))
-(fset 'ediff-overlay-get (symbol-function 'overlay-get)))
 ;; Check the current version against the major and minor version numbers
 ;; using op: cur-vers op major.minor If emacs-major-version or
 ;; emacs-minor-version are not defined, we assume that the current version
 ;; is hopelessly outdated.  We assume that emacs-major-version and
 (if ediff-emacs-p
 (x-display-color-p)
 (eq (device-class (selected-device)) 'color)))
+(if (ediff-has-face-support-p)
+(if ediff-xemacs-p
+	(progn
+	  (fset 'ediff-valid-color-p (symbol-function 'valid-color-name-p))
+	  (fset 'ediff-get-face (symbol-function 'get-face)))
+;; Temporary fix for OS/2 port of Emacs
+;; pm-win.el in PM-Emacs should be fixed.
+(if (eq (ediff-device-type) 'pm)
+	  (fset 'ediff-valid-color-p
+		(function (lambda (color) (assoc color pm-color-alist))))
+	(fset 'ediff-valid-color-p (symbol-function 'x-color-defined-p)))
+(fset 'ediff-get-face (symbol-function 'internal-get-face))))
 (if (ediff-window-display-p)
 (if ediff-xemacs-p
 	(progn
 	  (fset 'ediff-display-pixel-width
 		(symbol-function 'device-pixel-width))
 	  (fset 'ediff-display-pixel-height
-		(symbol-function 'device-pixel-height))
+		(symbol-function 'device-pixel-height)))
-	  (fset 'ediff-valid-color-p (symbol-function 'valid-color-name-p))
-	  (fset 'ediff-get-face (symbol-function 'get-face)))
-;; Temporary fix for OS/2 port of Emacs
-;; pm-win.el in PM-Emacs should be fixed.
 (fset 'ediff-display-pixel-width
 	    (symbol-function 'x-display-pixel-width))
 (fset 'ediff-display-pixel-height
-	    (symbol-function 'x-display-pixel-height))
+	    (symbol-function 'x-display-pixel-height))))
-(if (eq (ediff-device-type) 'pm)
-	  (fset 'ediff-valid-color-p
-		(function (lambda (color) (assoc color pm-color-alist))))
-	(fset 'ediff-valid-color-p (symbol-function 'x-color-defined-p)))
-(fset 'ediff-get-face (symbol-function 'internal-get-face))))
 (defun ediff-make-current-diff-overlay (type)
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (let ((overlay (intern (format "ediff-current-diff-overlay-%S" type)))
 	    (buffer (ediff-get-buffer type))
 	    (face (face-name
 		   (symbol-value
 		    (intern (format "ediff-current-diff-face-%S" type))))))
 		 (format "Difference region %S -- non-current" (1+ diff-num)))
 		(t ""))))) ; none
 (defun ediff-set-face (ground face color)
 "Set face foreground/background."
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (if (ediff-valid-color-p color)
 	  (if (eq ground 'foreground)
 	      (set-face-foreground face color)
 	    (set-face-background face color))
 	(cond ((memq face
 		       ediff-even-diff-face-Ancestor
 		       ediff-odd-diff-face-Ancestor))
 	       (copy-face 'secondary-selection face))))
 ))
-(or (boundp 'facemenu-unlisted-faces)
+(defun ediff-hide-face (face)
-(setq facemenu-unlisted-faces nil))
+(if (and (ediff-has-face-support-p) ediff-emacs-p)
+(add-to-list 'facemenu-unlisted-faces face)))
-(add-to-list 'facemenu-unlisted-faces 'ediff-current-diff-face-A)
 (defvar ediff-current-diff-face-A
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (progn
 	(make-face 'ediff-current-diff-face-A)
+	(ediff-hide-face 'ediff-current-diff-face-A)
 	(or (face-differs-from-default-p 'ediff-current-diff-face-A)
 	    (cond ((ediff-color-display-p)
 		   (ediff-set-face
 		    'foreground 'ediff-current-diff-face-A "firebrick")
 		   (ediff-set-face
 		     (copy-face 'highlight 'ediff-current-diff-face-A))
 		   )))
 	'ediff-current-diff-face-A))
 "Face for highlighting the selected difference in buffer A.")
-(add-to-list 'facemenu-unlisted-faces 'ediff-current-diff-face-B)
 (defvar ediff-current-diff-face-B
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (progn
 	(make-face 'ediff-current-diff-face-B)
+	(ediff-hide-face 'ediff-current-diff-face-B)
 	(or (face-differs-from-default-p 'ediff-current-diff-face-B)
 	    (cond ((ediff-color-display-p)
 		   (ediff-set-face
 		    'foreground 'ediff-current-diff-face-B "DarkOrchid")
 		   (ediff-set-face
 		   )))
 	'ediff-current-diff-face-B))
 "Face for highlighting the selected difference in buffer B.")
-(add-to-list 'facemenu-unlisted-faces 'ediff-current-diff-face-C)
 (defvar ediff-current-diff-face-C
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (progn
 	(make-face 'ediff-current-diff-face-C)
+	(ediff-hide-face 'ediff-current-diff-face-C)
 	(or (face-differs-from-default-p 'ediff-current-diff-face-C)
 	    (cond ((ediff-color-display-p)
 		   (ediff-set-face
 		    'foreground 'ediff-current-diff-face-C "Navy")
 		   (ediff-set-face
 		     (copy-face 'highlight 'ediff-current-diff-face-C))
 		   )))
 	'ediff-current-diff-face-C))
 "Face for highlighting the selected difference in buffer C.")
-(add-to-list 'facemenu-unlisted-faces 'ediff-current-diff-face-Ancestor)
 (defvar ediff-current-diff-face-Ancestor
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (progn
 	(make-face 'ediff-current-diff-face-Ancestor)
+	(ediff-hide-face 'ediff-current-diff-face-Ancestor)
 	(or (face-differs-from-default-p 'ediff-current-diff-face-Ancestor)
 	    (copy-face
 	     'ediff-current-diff-face-C 'ediff-current-diff-face-Ancestor))))
 "Face for highlighting the selected difference in the ancestor buffer.")
-(add-to-list 'facemenu-unlisted-faces 'ediff-fine-diff-face-A)
 (defvar ediff-fine-diff-face-A
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (progn
 	(make-face 'ediff-fine-diff-face-A)
+	(ediff-hide-face 'ediff-fine-diff-face-A)
 	(or (face-differs-from-default-p 'ediff-fine-diff-face-A)
 	    (cond ((ediff-color-display-p)
 		   (ediff-set-face 'foreground 'ediff-fine-diff-face-A
 				   "Navy")
 		   (ediff-set-face 'background 'ediff-fine-diff-face-A
 				   "sky blue"))
 		  (t (set-face-underline-p 'ediff-fine-diff-face-A t))))
 	'ediff-fine-diff-face-A))
 "Face for highlighting the refinement of the selected diff in buffer A.")
-(add-to-list 'facemenu-unlisted-faces 'ediff-fine-diff-face-B)
 (defvar ediff-fine-diff-face-B
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (progn
 	(make-face 'ediff-fine-diff-face-B)
+	(ediff-hide-face 'ediff-fine-diff-face-B)
 	(or (face-differs-from-default-p 'ediff-fine-diff-face-B)
 	    (cond ((ediff-color-display-p)
 		   (ediff-set-face 'foreground 'ediff-fine-diff-face-B "Black")
 		   (ediff-set-face 'background 'ediff-fine-diff-face-B "cyan"))
 		  (t (set-face-underline-p 'ediff-fine-diff-face-B t))))
 	'ediff-fine-diff-face-B))
 "Face for highlighting the refinement of the selected diff in buffer B.")
-(add-to-list 'facemenu-unlisted-faces 'ediff-fine-diff-face-C)
 (defvar ediff-fine-diff-face-C
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (progn
 	(make-face 'ediff-fine-diff-face-C)
+	(ediff-hide-face 'ediff-fine-diff-face-C)
 	(or (face-differs-from-default-p 'ediff-fine-diff-face-C)
 	    (cond ((ediff-color-display-p)
 		   (ediff-set-face 'foreground 'ediff-fine-diff-face-C "black")
 		   (ediff-set-face
 		    'background 'ediff-fine-diff-face-C "Turquoise"))
 		  (t (set-face-underline-p 'ediff-fine-diff-face-C t))))
 	'ediff-fine-diff-face-C))
 "Face for highlighting the refinement of the selected diff in buffer C.")
-(add-to-list 'facemenu-unlisted-faces 'ediff-fine-diff-face-Ancestor)
 (defvar ediff-fine-diff-face-Ancestor
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (progn
 	(make-face 'ediff-fine-diff-face-Ancestor)
+	(ediff-hide-face 'ediff-fine-diff-face-Ancestor)
 	(or (face-differs-from-default-p 'ediff-fine-diff-face-Ancestor)
 	    (copy-face
 	     'ediff-fine-diff-face-C 'ediff-fine-diff-face-Ancestor))))
 "Face highlighting refinements of the selected diff in ancestor buffer.
 Presently, this is not used, as difference regions are not refined in the
 ancestor buffer.")
-(add-to-list 'facemenu-unlisted-faces 'ediff-even-diff-face-A)
 (defvar ediff-even-diff-face-A
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (progn
 	(make-face 'ediff-even-diff-face-A)
+	(ediff-hide-face 'ediff-even-diff-face-A)
 	(or (face-differs-from-default-p 'ediff-even-diff-face-A)
 	    (cond ((ediff-color-display-p)
 		   (ediff-set-face
 		    'foreground 'ediff-even-diff-face-A "black")
 		   (ediff-set-face
 		  (t
 		   (copy-face 'italic 'ediff-even-diff-face-A))))
 	'ediff-even-diff-face-A))
 "Face used to highlight even-numbered differences in buffer A.")
-(add-to-list 'facemenu-unlisted-faces 'ediff-even-diff-face-B)
 (defvar ediff-even-diff-face-B
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (progn
 	(make-face 'ediff-even-diff-face-B)
+	(ediff-hide-face 'ediff-even-diff-face-B)
 	(or (face-differs-from-default-p 'ediff-even-diff-face-B)
 	    (cond ((ediff-color-display-p)
 		   (ediff-set-face
 		    'foreground 'ediff-even-diff-face-B "White")
 		   (ediff-set-face
 		  (t
 		   (copy-face 'italic 'ediff-even-diff-face-B))))
 	'ediff-even-diff-face-B))
 "Face used to highlight even-numbered differences in buffer B.")
-(add-to-list 'facemenu-unlisted-faces 'ediff-even-diff-face-C)
 (defvar ediff-even-diff-face-C
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (progn
 	(make-face 'ediff-even-diff-face-C)
+	(ediff-hide-face 'ediff-even-diff-face-C)
 	(or (face-differs-from-default-p 'ediff-even-diff-face-C)
 	    (copy-face 'ediff-even-diff-face-A 'ediff-even-diff-face-C))
 	'ediff-even-diff-face-C))
 "Face used to highlight even-numbered differences in buffer C.")
-(add-to-list 'facemenu-unlisted-faces 'ediff-even-diff-face-Ancestor)
 (defvar ediff-even-diff-face-Ancestor
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (progn
 	(make-face 'ediff-even-diff-face-Ancestor)
+	(ediff-hide-face 'ediff-even-diff-face-Ancestor)
 	(or (face-differs-from-default-p 'ediff-even-diff-face-Ancestor)
 	    (copy-face 'ediff-even-diff-face-C 'ediff-even-diff-face-Ancestor))
 	'ediff-even-diff-face-Ancestor))
 "Face highlighting even-numbered differences in the ancestor buffer.")
-(add-to-list 'facemenu-unlisted-faces 'ediff-odd-diff-face-A)
 (defvar ediff-odd-diff-face-A
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (progn
 	(make-face 'ediff-odd-diff-face-A)
+	(ediff-hide-face 'ediff-odd-diff-face-A)
 	(or (face-differs-from-default-p 'ediff-odd-diff-face-A)
 	    (cond ((ediff-color-display-p)
 		   (ediff-set-face
 		    'foreground 'ediff-odd-diff-face-A "White")
 		   (ediff-set-face
 		  (t
 		   (copy-face 'italic 'ediff-odd-diff-face-A))))
 	'ediff-odd-diff-face-A))
 "Face used to highlight odd-numbered differences in buffer A.")
-(add-to-list 'facemenu-unlisted-faces 'ediff-odd-diff-face-B)
 (defvar ediff-odd-diff-face-B
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (progn
 	(make-face 'ediff-odd-diff-face-B)
+	(ediff-hide-face 'ediff-odd-diff-face-B)
 	(or (face-differs-from-default-p 'ediff-odd-diff-face-B)
 	    (cond ((ediff-color-display-p)
 		   (ediff-set-face
 		    'foreground 'ediff-odd-diff-face-B "Black")
 		   (ediff-set-face
 		  (t
 		   (copy-face 'italic 'ediff-odd-diff-face-B))))
 	'ediff-odd-diff-face-B))
 "Face used to highlight odd-numbered differences in buffer B.")
-(add-to-list 'facemenu-unlisted-faces 'ediff-odd-diff-face-C)
 (defvar ediff-odd-diff-face-C
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (progn
 	(make-face 'ediff-odd-diff-face-C)
+	(ediff-hide-face 'ediff-odd-diff-face-C)
 	(or (face-differs-from-default-p 'ediff-odd-diff-face-C)
 	    (copy-face 'ediff-odd-diff-face-A 'ediff-odd-diff-face-C))
 	'ediff-odd-diff-face-C))
 "Face used to highlight odd-numbered differences in buffer C.")
-(add-to-list 'facemenu-unlisted-faces 'ediff-odd-diff-face-Ancestor )
 (defvar ediff-odd-diff-face-Ancestor
-(if (ediff-window-display-p)
+(if (ediff-has-face-support-p)
 (progn
 	(make-face 'ediff-odd-diff-face-Ancestor)
+	(ediff-hide-face 'ediff-odd-diff-face-Ancestor)
 	(or (face-differs-from-default-p 'ediff-odd-diff-face-Ancestor)
 	    (copy-face 'ediff-odd-diff-face-C 'ediff-odd-diff-face-Ancestor))
 	'ediff-odd-diff-face-Ancestor))
 "Face used to highlight even-numbered differences in the ancestor buffer.")
 		 (getenv "TMP")
 		 (getenv "TEMP")))
 	d)
 (setq d (if (and env (> (length env) 0))
 		env
-	      (if (memq system-type '(vax-vms axp-vms))
+	      (cond ((memq system-type '(vax-vms axp-vms)) "SYS$SCRATCH:")
-		  "SYS$SCRATCH:"
+		    ((eq system-type 'ms-dos) "c:/")
-		"/tmp")))
+		    (t "/tmp"))))
 ;; The following is to make sure we get something to which we can
 ;; add directory levels on VMS.
 (setq d (file-name-as-directory (directory-file-name d)))
 )
 "*Prefix to put on Ediff temporary file names.
 ;; a diff/diff3 command.
 (defvar ediff-metachars "[ \t\n!\"#$&'()*;<=>?[\\^`{|~]"
 "Characters that must be quoted with \\ when used in a shell command line.
 More precisely, a regexp to match any one such character.")
+;; needed to simulate frame-char-width in XEmacs.
+(defvar ediff-H-glyph (if ediff-xemacs-p (make-glyph "H")))
 (ediff-defvar-local ediff-temp-file-A nil
 "Temporary file used for refining difference regions in buffer A.")
 (ediff-defvar-local ediff-temp-file-B nil
 "Temporary file used for refining difference regions in buffer B.")
 (defsubst ediff-file-remote-p (file-name)
 (if (fboundp ediff-ange-ftp-ftp-name)
 (funcall ediff-ange-ftp-ftp-name file-name)))
-;;(defun ediff-frame-has-menubar ()
-;;  (and (ediff-window-display-p)
-;;       (if ediff-xemacs-p
-;;	   current-menubar
-;;	 (let ((lines (cdr (assq 'menu-bar-lines
-;;				 (frame-parameters (selected-frame))))))
-;;	   (or (eq lines t) (and (numberp lines) (< 0 lines))))
-;;	 )))
 (defsubst ediff-frame-unsplittable-p (frame)
 (cdr (assq 'unsplittable (frame-parameters frame))))
 (defsubst ediff-get-next-window (wind prev-wind)
 	 (if ediff-xemacs-p
 	     (event-point event)
 	   (posn-point (event-start event))))
 	((ediff-key-press-event-p event)
 	 (point))
-	(t (error ""))))
+	(t (error))))
 (defun ediff-event-buffer (event)
 (cond ((ediff-mouse-event-p event)
 	 (if ediff-xemacs-p
 	     (event-buffer event)
 	   (window-buffer (posn-window (event-start event)))))
 	((ediff-key-press-event-p event)
 	 (current-buffer))
-	(t (error ""))))
+	(t (error))))
 (defsubst ediff-frame-iconified-p (frame)
 (if (and (ediff-window-display-p) (frame-live-p frame))
 (if ediff-xemacs-p
 	)))
 (defsubst ediff-spy-after-mouse ()
 (setq ediff-mouse-pixel-position (mouse-pixel-position)))
-;; This is actually not easy to find out since emacs and xemacs behave
+;; It is not easy to find out when the user grabs the mouse, since emacs and
-;; differently when mouse is not in any frame. Also, this is sensitive to
+;; xemacs behave differently when mouse is not in any frame. Also, this is
-;; when the user grabbed mouse.
+;; sensitive to when the user grabbed mouse.  Not used for now.
-;; Not used for now.
 (defun ediff-user-grabbed-mouse ()
 (if ediff-mouse-pixel-position
 (cond ((not (eq (car ediff-mouse-pixel-position)
 		      (car (mouse-pixel-position)))))
 	    ((and (car (cdr ediff-mouse-pixel-position))
 			  ediff-mouse-pixel-threshold))))
 	    (t nil))))
 (defsubst ediff-frame-char-height (frame)
 (if ediff-xemacs-p
-(/ (frame-pixel-height frame) (frame-height frame))
+(glyph-height ediff-H-glyph (selected-window frame))
 (frame-char-height frame)))
 (defsubst ediff-empty-overlay-p (overl)
 (= (ediff-overlay-start overl) (ediff-overlay-end overl)))
+;; like overlay-buffer in Emacs. In XEmacs, returns nil if the extent is
+;; dead. Otherwise, works like extent-buffer
+(defun ediff-overlay-buffer (overl)
+(if ediff-emacs-p
+(overlay-buffer overl)
+(and (extent-live-p overl) (extent-buffer overl))))
+;; like overlay-get in Emacs. In XEmacs, returns nil if the extent is
+;; dead. Otherwise, like extent-property
+(defun ediff-overlay-get (overl property)
+(if ediff-emacs-p
+(overlay-get overl property)
+(and (extent-live-p overl) (extent-property overl property))))
 ;; t if diff region is empty.
 ;; In case of buffer C, t also if it is not a 3way
 ;; comparison job (merging jobs return t as well).
 (defun ediff-empty-diff-region-p (n buf-type)
 	    (skip-chars-forward ediff-whitespace)
 	    (>= (point) end))))))
 ;; temporarily uses DIR to abbreviate file name
 ;; if DIR is nil, use default-directory
-(defsubst ediff-abbreviate-file-name (file &optional dir)
+(defun ediff-abbreviate-file-name (file &optional dir)
 (cond ((stringp dir)
 	 (let ((directory-abbrev-alist (list (cons dir ""))))
 	   (abbreviate-file-name file)))
 	(ediff-emacs-p (abbreviate-file-name file))
 	(t ; XEmacs requires addl argument
 (or (and a (not b)) (and (not a) b)))
 (defsubst ediff-message-if-verbose (string &rest args)
 (if ediff-verbose-p
 (apply 'message string args)))
 (provide 'ediff-init)
 ;;; ediff-init.el  ends here

Mercurial > emacs

comparison lisp/ediff-init.el @ 14582:c768f6d7daaa