;ELC   
;;; Compiled by cyd@localhost on Mon Apr 23 22:20:40 2007
;;; from file /home/cyd/emacs/lisp/ediff-init.el
;;; in Emacs version 22.0.99
;;; with all optimizations.

;;; This file uses dynamic docstrings, first added in Emacs 19.29.
(if (and (boundp 'emacs-version)
	 (< (aref emacs-version (1- (length emacs-version))) ?A)
	 (or (and (boundp 'epoch::version) epoch::version)
	     (string-lessp emacs-version "19.29")))
    (error "`ediff-init.el' was compiled for Emacs 19.29 or later"))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;


(byte-code "\210\302	B\303\304!\210\305	B\306\n?!\207" [noninteractive current-load-list ediff-xemacs-p (lambda (#1=#:defconst-tmp-var) (defconst ediff-xemacs-p #1#)) nil ediff-emacs-p (lambda (#2=#:defconst-tmp-var) (defconst ediff-emacs-p #2#))] 2)
(defalias 'ediff-cond-compile-for-xemacs-or-emacs '(macro . #[(xemacs-form emacs-form) "\207" [emacs-form] 1]))
#@182 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.
(defvar ediff-force-faces nil (#$ . 935))
(defalias 'ediff-device-type #[nil "\207" [window-system] 1])
(put 'ediff-device-type 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-window-display-p #[nil "\205 \301>?\207" [window-system (tty pc stream)] 2])
(defalias 'ediff-has-face-support-p #[nil "\304 \206 \206 \305 \206 	\203 \n\306>\207\205 \n\307>\207" [ediff-force-faces ediff-emacs-p window-system ediff-xemacs-p ediff-window-display-p ediff-color-display-p (pc) (tty pc)] 2])
(defalias 'ediff-has-toolbar-support-p #[nil "\300\207" [nil] 1])
(defalias 'ediff-has-gutter-support-p #[nil "\300\207" [nil] 1])
(defalias 'ediff-use-toolbar-p #[nil "\301 \205\f \302\300!\205\f \207" [ediff-use-toolbar-p ediff-has-toolbar-support-p boundp] 2])
(defalias 'ediff-defvar-local '(macro . #[(var value doc) "\303\304	\nF\305\306DD\307\306D\310BBF\207" [var value doc progn defvar make-variable-buffer-local quote put ('permanent-local t)] 6]))
#@2 
(defvar ediff-buffer-A nil (#$ . 2091))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-buffer-A put permanent-local t] 4)
#@2 
(defvar ediff-buffer-B nil (#$ . 2254))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-buffer-B put permanent-local t] 4)
#@2 
(defvar ediff-buffer-C nil (#$ . 2417))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-buffer-C put permanent-local t] 4)
#@2 
(defvar ediff-ancestor-buffer nil (#$ . 2580))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-ancestor-buffer put permanent-local t] 4)
#@2 
(defvar ediff-control-buffer nil (#$ . 2757))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-control-buffer put permanent-local t] 4)
#@98 If t, the buffer is a temporary indirect buffer.
It needs to be killed when we quit the session.
(defvar ediff-temp-indirect-buffer nil (#$ . 2933))
(byte-code "\301\302!\210\303\302\304\305#\210\306B\307\310!\207" [current-load-list make-variable-buffer-local ediff-temp-indirect-buffer put permanent-local t ediff-buffer-alist (lambda (#1=#:defconst-tmp-var) (defconst ediff-buffer-alist #1#)) ((65 . ediff-buffer-A) (66 . ediff-buffer-B) (67 . ediff-buffer-C))] 4)
(defalias 'ediff-odd-p '(macro . #[(arg) "\301\302\303BB\304BB\207" [arg eq logand (1) (1)] 4]))
(defalias 'ediff-buffer-live-p '(macro . #[(buf) "\301\302D\303\302DDF\207" [buf and get-buffer buffer-name] 6]))
(defalias 'ediff-get-buffer '(macro . #[(arg) "\301\302\303BB\304B\302\305BB\306B\302\307BB\310B\302\311BB\312B\257\207" [arg cond eq ('A) (ediff-buffer-A) ('B) (ediff-buffer-B) ('C) (ediff-buffer-C) ('Ancestor) (ediff-ancestor-buffer)] 7]))
(defalias 'ediff-get-value-according-to-buffer-type '(macro . #[(buf-type list) "\302\303\304BB\305\306	ED\303\307BB\305\310	ED\303\311BB\305\312	EDF\207" [buf-type list cond eq ('A) nth 0 ('B) 1 ('C) 2] 7]))
(defalias 'ediff-char-to-buftype '(macro . #[(arg) "\301\302\303BB\304B\302\305BB\306B\302\307BB\310BF\207" [arg cond memq ('(97 65)) ('A) ('(98 66)) ('B) ('(99 67)) ('C)] 6]))
(defalias 'ediff-get-symbol-from-alist #[(buf-type alist) "\302	\"A\207" [buf-type alist assoc] 3])
(byte-code "\301\302\303\304#\210\305B\306\307!\207" [current-load-list put ediff-get-symbol-from-alist byte-optimizer byte-compile-inline-expand ediff-difference-vector-alist (lambda (#1=#:defconst-tmp-var) (defconst ediff-difference-vector-alist #1#)) ((A . ediff-difference-vector-A) (B . ediff-difference-vector-B) (C . ediff-difference-vector-C) (Ancestor . ediff-difference-vector-Ancestor))] 4)
(defalias 'ediff-get-difference '(macro . #[(n buf-type) "\302\303\304\305BBD	E\207" [buf-type n aref symbol-value ediff-get-symbol-from-alist (ediff-difference-vector-alist)] 5]))
(defalias 'ediff-no-fine-diffs-p '(macro . #[(n) "\301\302\303BB\304BB\207" [n aref ediff-get-difference ('A) (2)] 4]))
(defalias 'ediff-get-diff-overlay-from-diff-record '(macro . #[(diff-rec) "\301\302BB\207" [diff-rec aref (0)] 3]))
(defalias 'ediff-get-diff-overlay '(macro . #[(n buf-type) "\302\303	ED\207" [n buf-type ediff-get-diff-overlay-from-diff-record ediff-get-difference] 4]))
(defalias 'ediff-get-fine-diff-vector-from-diff-record '(macro . #[(diff-rec) "\301\302BB\207" [diff-rec aref (1)] 3]))
(defalias 'ediff-set-fine-diff-vector '(macro . #[(n buf-type fine-vec) "\303\304	E\305\nF\207" [n buf-type fine-vec aset ediff-get-difference 1] 4]))
(defalias 'ediff-get-state-of-diff '(macro . #[(n buf-type) "\302\303\304\305	E\306BBE\207" [n buf-type if (ediff-buffer-live-p ediff-buffer-C) aref ediff-get-difference (3)] 6]))
(defalias 'ediff-set-state-of-diff '(macro . #[(n buf-type val) "\303\304	E\305\nF\207" [n buf-type val aset ediff-get-difference 3] 4]))
(defalias 'ediff-get-state-of-merge '(macro . #[(n) "\301\302\303\211\302E\304BBE\207" [n if ediff-state-of-merge aref (0)] 6]))
(defalias 'ediff-set-state-of-merge '(macro . #[(n val) "\302\303\304\305\303E\306	FE\207" [n val if ediff-state-of-merge aset aref 0] 6]))
(defalias 'ediff-get-state-of-ancestor '(macro . #[(n) "\301\302\303\211\302E\304BBE\207" [n if ediff-state-of-merge aref (1)] 6]))
(defalias 'ediff-mark-diff-as-space-only '(macro . #[(n flag) "\302\303\304BB\305	F\207" [n flag aset ediff-get-difference ('A) 2] 4]))
(defalias 'ediff-get-fine-diff-vector '(macro . #[(n buf-type) "\302\303	ED\207" [n buf-type ediff-get-fine-diff-vector-from-diff-record ediff-get-difference] 4]))
(defalias 'ediff-with-current-buffer '(macro . #[(buffer &rest body) "\302\303D\304\305D	BB\306BBB\207" [buffer body if ediff-buffer-live-p save-current-buffer set-buffer ((or (eq this-command 'ediff-quit) (error ediff-KILLED-VITAL-BUFFER)))] 5]))
(defalias 'ediff-multiframe-setup-p #[nil "\301 \205 \207" [ediff-multiframe ediff-window-display-p] 1])
(put 'ediff-multiframe-setup-p 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-narrow-control-frame-p '(macro . #[nil "\300\207" [(and (ediff-multiframe-setup-p) (equal ediff-help-message ediff-brief-message-string))] 1]))
(defalias 'ediff-3way-comparison-job '(macro . #[nil "\300\207" [(memq ediff-job-name '(ediff-files3 ediff-buffers3))] 1]))
#@2 
(defvar ediff-3way-comparison-job nil (#$ . 7361))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-3way-comparison-job put permanent-local t] 4)
(defalias 'ediff-merge-job '(macro . #[nil "\300\207" [(memq ediff-job-name '(ediff-merge-files ediff-merge-buffers ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions ediff-merge-revisions-with-ancestor))] 1]))
#@2 
(defvar ediff-merge-job nil (#$ . 7794))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-merge-job put permanent-local t] 4)
(defalias 'ediff-patch-job '(macro . #[nil "\300\207" [(eq ediff-job-name 'epatch)] 1]))
(defalias 'ediff-merge-with-ancestor-job '(macro . #[nil "\300\207" [(memq ediff-job-name '(ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions-with-ancestor))] 1]))
#@2 
(defvar ediff-merge-with-ancestor-job nil (#$ . 8250))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-merge-with-ancestor-job put permanent-local t] 4)
(defalias 'ediff-3way-job '(macro . #[nil "\300\207" [(or ediff-3way-comparison-job ediff-merge-job)] 1]))
#@2 
(defvar ediff-3way-job nil (#$ . 8550))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-3way-job put permanent-local t] 4)
(defalias 'ediff-diff3-job '(macro . #[nil "\300\207" [(or ediff-3way-comparison-job ediff-merge-with-ancestor-job)] 1]))
#@2 
(defvar ediff-diff3-job nil (#$ . 8835))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-diff3-job put permanent-local t] 4)
(defalias 'ediff-windows-job '(macro . #[nil "\300\207" [(memq ediff-job-name '(ediff-windows-wordwise ediff-windows-linewise))] 1]))
#@2 
(defvar ediff-windows-job nil (#$ . 9134))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-windows-job put permanent-local t] 4)
(defalias 'ediff-word-mode-job '(macro . #[nil "\300\207" [(memq ediff-job-name '(ediff-windows-wordwise ediff-regions-wordwise))] 1]))
#@2 
(defvar ediff-word-mode-job nil (#$ . 9439))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-word-mode-job put permanent-local t] 4)
(defalias 'ediff-narrow-job '(macro . #[nil "\300\207" [(memq ediff-job-name '(ediff-windows-wordwise ediff-regions-wordwise ediff-windows-linewise ediff-regions-linewise))] 1]))
#@2 
(defvar ediff-narrow-job nil (#$ . 9791))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-narrow-job put permanent-local t] 4)
(defalias 'ediff-ancestor-metajob #[(&optional metajob) "\206 	\302>\207" [metajob ediff-metajob-name (ediff-merge-directories-with-ancestor ediff-merge-filegroups-with-ancestor)] 2])
(put 'ediff-ancestor-metajob 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-revision-metajob #[(&optional metajob) "\206 	\302>\207" [metajob ediff-metajob-name (ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor)] 2])
(put 'ediff-revision-metajob 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-patch-metajob #[(&optional metajob) "\206 	\302>\207" [metajob ediff-metajob-name (ediff-multifile-patch)] 2])
(put 'ediff-patch-metajob 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-one-filegroup-metajob #[(&optional metajob) "\211\206 	\302>)\206 \211\206 	\303>)\207" [metajob ediff-metajob-name (ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor) (ediff-multifile-patch)] 3])
(put 'ediff-one-filegroup-metajob 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-collect-diffs-metajob #[(&optional metajob) "\206 	\302>\207" [metajob ediff-metajob-name (ediff-directories ediff-merge-directories ediff-merge-directories-with-ancestor ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor)] 2])
(put 'ediff-collect-diffs-metajob 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-merge-metajob #[(&optional metajob) "\206 	\302>\207" [metajob ediff-metajob-name (ediff-merge-directories ediff-merge-directories-with-ancestor ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor ediff-merge-filegroups-with-ancestor)] 2])
(put 'ediff-merge-metajob 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-metajob3 #[(&optional metajob) "\206 	\302>\207" [metajob ediff-metajob-name (ediff-merge-directories-with-ancestor ediff-merge-filegroups-with-ancestor ediff-directories3 ediff-filegroups3)] 2])
(put 'ediff-metajob3 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-comparison-metajob3 #[(&optional metajob) "\206 	\302>\207" [metajob ediff-metajob-name (ediff-directories3 ediff-filegroups3)] 2])
(put 'ediff-comparison-metajob3 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-in-control-buffer-p #[(&optional meta-buf-p) "\303\302!\205 \203 	\202 \np=\207" [meta-buf-p ediff-meta-buffer ediff-control-buffer boundp] 2])
(defalias 'ediff-barf-if-not-control-buffer #[(&optional meta-buf-p) "\302!\206\n \303\304	\"\207" [meta-buf-p this-command ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!"] 3])
(byte-code "\300\301\302\303#\210\304\305\306\307\310\311\312\313&\210\304\314\306\315\310\311\312\313&\210\304\316\306\317\310\311\312\313&\207" [put ediff-barf-if-not-control-buffer byte-optimizer byte-compile-inline-expand custom-declare-group ediff-highlighting nil "Hilighting of difference regions in Ediff." :prefix "ediff-" :group ediff ediff-merge "Merging utilities." ediff-hook "Hooks run by Ediff."] 8)
#@178 *Hooks to run before Ediff begins to set up windows and buffers.
This hook can be used to save the previous window config, which can be restored
on ediff-quit or ediff-suspend.
(custom-declare-variable 'ediff-before-setup-hook 'nil '(#$ . -13107) :type 'hook :group 'ediff-hook)
#@202 *Hooks to run before Ediff sets its window configuration.
This hook is run every time when Ediff arranges its windows.
This happens each time Ediff detects that the windows were messed up by the
user.
(custom-declare-variable 'ediff-before-setup-windows-hook 'nil '(#$ . -13393) :type 'hook :group 'ediff-hook)
#@128 *Hooks to run after Ediff sets its window configuration.
This can be used to set up control window or icon in a desired place.
(custom-declare-variable 'ediff-after-setup-windows-hook 'nil '(#$ . -13711) :type 'hook :group 'ediff-hook)
#@157 *Hooks run before setting up the frame to display Ediff Control Panel.
Can be used to change control frame parameters to position it where it
is desirable.
(custom-declare-variable 'ediff-before-setup-control-frame-hook 'nil '(#$ . -13954) :type 'hook :group 'ediff-hook)
#@122 *Hooks run after setting up the frame to display Ediff Control Panel.
Can be used to move the frame where it is desired.
(custom-declare-variable 'ediff-after-setup-control-frame-hook 'nil '(#$ . -14233) :type 'hook :group 'ediff-hook)
#@91 *Hooks to run in the control buffer after Ediff has been set up and is ready for the job.
(custom-declare-variable 'ediff-startup-hook 'nil '(#$ . -14475) :type 'hook :group 'ediff-hook)
#@53 *Hooks to run after a difference has been selected.
(custom-declare-variable 'ediff-select-hook 'nil '(#$ . -14668) :type 'hook :group 'ediff-hook)
#@55 *Hooks to run after a difference has been unselected.
(custom-declare-variable 'ediff-unselect-hook 'nil '(#$ . -14822) :type 'hook :group 'ediff-hook)
#@116 *Hooks run after buffers A, B, and C are set up.
For each buffer, the hooks are run with that buffer made current.
(custom-declare-variable 'ediff-prepare-buffer-hook 'nil '(#$ . -14981) :type 'hook :group 'ediff-hook)
#@67 *Hook run after Ediff is loaded.  Can be used to change defaults.
(custom-declare-variable 'ediff-load-hook 'nil '(#$ . -15206) :type 'hook :group 'ediff-hook)
#@203 *Hook run just after ediff-mode is set up in the control buffer.
This is done before any windows or frames are created.  One can use it to
set local variables that determine how the display looks like.
(custom-declare-variable 'ediff-mode-hook 'nil '(#$ . -15373) :type 'hook :group 'ediff-hook)
#@71 *Hook run just after the default bindings in Ediff keymap are set up.
(custom-declare-variable 'ediff-keymap-setup-hook 'nil '(#$ . -15675) :type 'hook :group 'ediff-hook)
#@46 *Hooks run after preparing the help message.
(custom-declare-variable 'ediff-display-help-hook 'nil '(#$ . -15853) :type 'hook :group 'ediff-hook)
#@68 *Hooks to run in the Ediff control buffer when Ediff is suspended.
(custom-declare-variable 'ediff-suspend-hook 'nil '(#$ . -16006) :type 'hook :group 'ediff-hook)
#@66 *Hooks to run in the Ediff control buffer after finishing Ediff.
(custom-declare-variable 'ediff-quit-hook 'nil '(#$ . -16176) :type 'hook :group 'ediff-hook)
#@84 *Hooks to run on exiting Ediff but before killing the control and variant buffers.
(custom-declare-variable 'ediff-cleanup-hook 'nil '(#$ . -16341) :type 'hook :group 'ediff-hook)
(byte-code "\302B\303\304!\210\305B\306\307!\210\310B\311\312!\210\313B\314\315\316	\203' \317\202( \320\"!\207" [current-load-list ediff-xemacs-p ediff-KILLED-VITAL-BUFFER (lambda (#1=#:defconst-tmp-var) (defconst ediff-KILLED-VITAL-BUFFER #1#)) "You have killed a vital Ediff buffer---you must leave Ediff now!" ediff-NO-DIFFERENCES (lambda (#2=#:defconst-tmp-var) (defconst ediff-NO-DIFFERENCES #2#)) "Sorry, comparison of identical variants is not what I am made for..." ediff-BAD-DIFF-NUMBER (lambda (#3=#:defconst-tmp-var) (defconst ediff-BAD-DIFF-NUMBER #3#)) "%S: Bad diff region number, %d.  Valid numbers are 1 to %d" ediff-BAD-INFO (lambda (#4=#:defconst-tmp-var) (defconst ediff-BAD-INFO #4#)) format "\n*** The Info file for Ediff, a part of the standard distribution\n*** of %sEmacs, does not seem to be properly installed.\n***\n*** Please contact your system administrator. " "X" ""] 4)
#@281 Function that determines the next/previous diff region to show.
Should return t for regions to be ignored and nil otherwise.
This function gets a region number as an argument.  The region number
is the one used internally by Ediff.  It is 1 less than the number seen
by the user.
(defvar ediff-skip-diff-region-function 'ediff-show-all-diffs (#$ . 17439))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-skip-diff-region-function put permanent-local t] 4)
#@128 Function to use in determining which regions to hide.
See the documentation string of `ediff-hide-regexp-matches' for details.
(defvar ediff-hide-regexp-matches-function 'ediff-hide-regexp-matches (#$ . 17936))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-hide-regexp-matches-function put permanent-local t] 4)
#@136 Function to use in determining which regions to focus on.
See the documentation string of `ediff-focus-on-regexp-matches' for details.
(defvar ediff-focus-on-regexp-matches-function 'ediff-focus-on-regexp-matches (#$ . 18291))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-focus-on-regexp-matches-function put permanent-local t] 4)
#@2 
(defvar ediff-regexp-focus-A "" (#$ . 18664))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-regexp-focus-A put permanent-local t] 4)
#@2 
(defvar ediff-regexp-focus-B "" (#$ . 18839))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-regexp-focus-B put permanent-local t] 4)
#@2 
(defvar ediff-regexp-focus-C "" (#$ . 19014))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-regexp-focus-C put permanent-local t] 4)
#@2 
(defvar ediff-focus-regexp-connective 'and (#$ . 19189))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-focus-regexp-connective put permanent-local t] 4)
#@2 
(defvar ediff-regexp-hide-A "" (#$ . 19384))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-regexp-hide-A put permanent-local t] 4)
#@2 
(defvar ediff-regexp-hide-B "" (#$ . 19557))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-regexp-hide-B put permanent-local t] 4)
#@2 
(defvar ediff-regexp-hide-C "" (#$ . 19730))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-regexp-hide-C put permanent-local t] 4)
#@2 
(defvar ediff-hide-regexp-connective 'and (#$ . 19903))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-hide-regexp-connective put permanent-local t] 4)
#@2 
(defvar ediff-killed-diffs-alist nil (#$ . 20096))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-killed-diffs-alist put permanent-local t] 4)
#@2 
(defvar ediff-syntax-table nil (#$ . 20280))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-syntax-table put permanent-local t] 4)
#@97 *Flag placed before a highlighted block of differences, if block starts at beginning of a line.
(custom-declare-variable 'ediff-before-flag-bol '(if (featurep 'xemacs) (make-glyph "->>") "->>") '(#$ . -20453) :type 'string :tag "Region before-flag at beginning of line" :group 'ediff)
#@88 *Flag placed after a highlighted block of differences, if block ends at end of a line.
(custom-declare-variable 'ediff-after-flag-eol '(if (featurep 'xemacs) (make-glyph "<<-") "<<-") '(#$ . -20744) :type 'string :tag "Region after-flag at end of line" :group 'ediff)
#@86 *Flag placed before a highlighted block of differences, if block starts in mid-line.
(custom-declare-variable 'ediff-before-flag-mol '(if (featurep 'xemacs) (make-glyph "->>") "->>") '(#$ . -21018) :type 'string :tag "Region before-flag in the middle of line" :group 'ediff)
#@83 *Flag placed after a highlighted block of differences, if block ends in mid-line.
(custom-declare-variable 'ediff-after-flag-mol '(if (featurep 'xemacs) (make-glyph "<<-") "<<-") '(#$ . -21299) :type 'string :tag "Region after-flag in the middle of line" :group 'ediff)
#@2 
(defvar ediff-use-faces t (#$ . 21574))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-use-faces put permanent-local t] 4)
#@248 If t, differences are highlighted using faces, if device supports faces.
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.
(custom-declare-variable 'ediff-use-faces 't '(#$ . 21740) :type 'boolean :group 'ediff-highlighting)
#@2 
(defvar ediff-word-mode nil (#$ . 22094))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-word-mode put permanent-local t] 4)
#@2 
(defvar ediff-job-name nil (#$ . 22260))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-job-name put permanent-local t] 4)
#@2 
(defvar ediff-narrow-bounds nil (#$ . 22424))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-narrow-bounds put permanent-local t] 4)
#@2 
(defvar ediff-wide-bounds nil (#$ . 22598))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-wide-bounds put permanent-local t] 4)
#@2 
(defvar ediff-visible-bounds nil (#$ . 22768))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-visible-bounds put permanent-local t] 4)
#@75 Non-nil means start narrowed, if doing ediff-windows-* or ediff-regions-*
(defvar ediff-start-narrowed t (#$ . 22945))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-start-narrowed put permanent-local t] 4)
#@132 *Non-nil means: when finished, Ediff widens buffers A/B.
Actually, Ediff restores the scope of visibility that existed at startup.
(defvar ediff-quit-widened t (#$ . -23194))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-quit-widened put permanent-local t] 4)
#@173 *nil means prompt to remove unmodified buffers A/B/C at session end.
Supplying a prefix argument to the quit command `q' temporarily reverses the
meaning of this variable.
(custom-declare-variable 'ediff-keep-variants 't '(#$ . -23497) :type 'boolean :group 'ediff)
#@2 
(defvar ediff-highlight-all-diffs t (#$ . 23768))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-highlight-all-diffs put permanent-local t] 4)
#@160 If nil, only the selected differences are highlighted.
Otherwise, all difference regions are highlighted, but the selected region is
shown in brighter colors.
(custom-declare-variable 'ediff-highlight-all-diffs 't '(#$ . 23954) :type 'boolean :group 'ediff-highlighting)
#@2 
(defvar ediff-control-buffer-suffix nil (#$ . 24230))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-control-buffer-suffix put permanent-local t] 4)
#@2 
(defvar ediff-control-buffer-number nil (#$ . 24420))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-control-buffer-number put permanent-local t] 4)
#@2 
(defvar ediff-buffer-values-orig-A nil (#$ . 24610))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-buffer-values-orig-A put permanent-local t] 4)
#@2 
(defvar ediff-buffer-values-orig-B nil (#$ . 24798))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-buffer-values-orig-B put permanent-local t] 4)
#@2 
(defvar ediff-buffer-values-orig-C nil (#$ . 24986))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-buffer-values-orig-C put permanent-local t] 4)
#@2 
(defvar ediff-buffer-values-orig-Ancestor nil (#$ . 25174))
(byte-code "\301\302!\210\303\302\304\305#\210\306B\307\310!\210\311B\312\313!\207" [current-load-list make-variable-buffer-local ediff-buffer-values-orig-Ancestor put permanent-local t ediff-buffer-values-orig-alist (lambda (#1=#:defconst-tmp-var) (defconst ediff-buffer-values-orig-alist #1#)) ((A . ediff-buffer-values-orig-A) (B . ediff-buffer-values-orig-B) (C . ediff-buffer-values-orig-C) (Ancestor . ediff-buffer-values-orig-Ancestor)) ediff-protected-variables (lambda (#2=#:defconst-tmp-var) (defconst ediff-protected-variables #2#)) (mode-line-format)] 4)
#@2 
(defvar ediff-difference-vector-A nil (#$ . 25811))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-difference-vector-A put permanent-local t] 4)
#@2 
(defvar ediff-difference-vector-B nil (#$ . 25997))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-difference-vector-B put permanent-local t] 4)
#@2 
(defvar ediff-difference-vector-C nil (#$ . 26183))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-difference-vector-C put permanent-local t] 4)
#@2 
(defvar ediff-difference-vector-Ancestor nil (#$ . 26369))
(byte-code "\301\302!\210\303\302\304\305#\210\306B\307\310!\207" [current-load-list make-variable-buffer-local ediff-difference-vector-Ancestor put permanent-local t ediff-difference-vector-alist (lambda (#1=#:defconst-tmp-var) (defconst ediff-difference-vector-alist #1#)) ((A . ediff-difference-vector-A) (B . ediff-difference-vector-B) (C . ediff-difference-vector-C) (Ancestor . ediff-difference-vector-Ancestor))] 4)
#@2 
(defvar ediff-state-of-merge nil (#$ . 26859))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-state-of-merge put permanent-local t] 4)
#@2 
(defvar ediff-current-difference -1 (#$ . 27035))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-current-difference put permanent-local t] 4)
#@2 
(defvar ediff-number-of-differences nil (#$ . 27218))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-number-of-differences put permanent-local t] 4)
#@2 
(defvar ediff-diff-buffer nil (#$ . 27408))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-diff-buffer put permanent-local t] 4)
#@2 
(defvar ediff-custom-diff-buffer nil (#$ . 27578))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-custom-diff-buffer put permanent-local t] 4)
#@2 
(defvar ediff-fine-diff-buffer nil (#$ . 27762))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-fine-diff-buffer put permanent-local t] 4)
#@2 
(defconst ediff-tmp-buffer " *ediff-tmp*" (#$ . 27942))
#@2 
(defconst ediff-msg-buffer " *ediff-message*" (#$ . 28004))
#@2 
(defvar ediff-error-buffer nil (#$ . 28070))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-error-buffer put permanent-local t] 4)
#@2 
(defvar ediff-debug-buffer "*ediff-debug*" (#$ . 28242))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-debug-buffer put permanent-local t] 4)
#@2 
(defvar ediff-this-buffer-ediff-sessions nil (#$ . 28426))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-this-buffer-ediff-sessions put permanent-local t] 4)
#@2 
(defvar ediff-disturbed-overlays nil (#$ . 28626))
#@2 
(defvar ediff-shadow-overlay-priority 100 (#$ . 28683))
#@333 Version control package used.
Currently, Ediff supports vc.el, rcs.el, pcl-cvs.el, and generic-sc.el.  The
standard Emacs interface to RCS, CVS, SCCS, etc., is vc.el.  However, some
people find the other two packages more convenient.  Set this variable to the
appropriate symbol: `rcs', `pcl-cvs', or `generic-sc' if you so desire.
(custom-declare-variable 'ediff-version-control-package ''vc '(#$ . 28747) :type 'symbol :group 'ediff)
#@391 *The coding system for read to use when running the diff program as a subprocess.
In most cases, the default will do. However, under certain circumstances in
Windows NT/98/95 you might need to use something like 'raw-text-dos here.
So, if the output that your diff program sends to Emacs contains extra ^M's,
you might need to experiment here, if the default or 'raw-text-dos doesn't
work.
(custom-declare-variable 'ediff-coding-system-for-read ''raw-text '(#$ . -29190) :type 'symbol :group 'ediff)
#@130 *The coding system for write to use when writing out difference regions
to temp files when Ediff needs to find fine differences.
(custom-declare-variable 'ediff-coding-system-for-write ''no-conversion '(#$ . -29697) :type 'symbol :group 'ediff)
(byte-code "\300\301\302\"\210\300\303\304\"\210\300\305\306\"\210\300\307\310\"\207" [defalias ediff-read-event read-event ediff-overlayp overlayp ediff-make-overlay make-overlay ediff-delete-overlay delete-overlay] 3)
(defalias 'ediff-check-version #[(op major minor &optional type-of-emacs) "\306\307!\203a \306\304!\203a \310=\203 	\202! \311=\203  \n\202! \312\205p \313=\2036 \fU\205` U\207\314>\203\\ \"\204M U\205` U\203Z \f\"\207\312\207\315\316\"\207\317>\203i \320\207\321>\205p \312\207" [type-of-emacs ediff-xemacs-p ediff-emacs-p op emacs-minor-version minor boundp emacs-major-version xemacs emacs t = (> >= < <=) error "%S: Invalid op in ediff-check-version" (= > >=) nil (< <=) major] 3])
(defalias 'ediff-color-display-p #[nil "\300\301\302\217\207" [nil (byte-code "\300\301!\203	 \301 \207\302 \207" [fboundp display-color-p x-display-color-p] 2) ((error))] 3])
#@2 
(defvar ediff-highlighting-style (byte-code "\301 \203 \203 \302\207\303\207" [ediff-use-faces ediff-has-face-support-p face ascii] 1) (#$ . 30857))
(byte-code "\301\302!\210\303\302\304\305#\210\306 \203# \307\310\311\312!\203 \312\202 \313\"\210\307\314\315\"\210\316 \203F \307\317\311\320!\2034 \320\2025 \321\"\210\307\322\311\323!\203C \323\202D \324\"\210\325B\326\327!\210\330B\331\332!\207" [current-load-list make-variable-buffer-local ediff-highlighting-style put permanent-local t ediff-has-face-support-p defalias ediff-valid-color-p fboundp color-defined-p x-color-defined-p ediff-get-face internal-get-face ediff-window-display-p ediff-display-pixel-width display-pixel-width x-display-pixel-width ediff-display-pixel-height display-pixel-height x-display-pixel-height ediff-current-diff-overlay-alist (lambda (#1=#:defconst-tmp-var) (defconst ediff-current-diff-overlay-alist #1#)) ((A . ediff-current-diff-overlay-A) (B . ediff-current-diff-overlay-B) (C . ediff-current-diff-overlay-C) (Ancestor . ediff-current-diff-overlay-Ancestor)) ediff-current-diff-face-alist (lambda (#2=#:defconst-tmp-var) (defconst ediff-current-diff-face-alist #2#)) ((A . ediff-current-diff-A) (B . ediff-current-diff-B) (C . ediff-current-diff-C) (Ancestor . ediff-current-diff-Ancestor))] 4)
(defalias 'ediff-set-overlay-face #[(extent face) "\302\301	#\210\302\303\304#\207" [extent face ediff-overlay-put help-echo ediff-region-help-echo] 4])
(defalias 'ediff-region-help-echo #[(extent-or-window &optional overlay point) "\204 	\306\307\"\306\304\"\306\310\"\311\f;\203  \312\f!\f\205' \f\313N\2038 \2038 \314\315T\"\202I \n\206I \203H \314\316T\"\202I \317,\207" [overlay extent-or-window face-help diff-num face is-current ediff-overlay-get ediff ediff-diff-num nil intern ediff-help-echo format "Difference region %S -- current" "Difference region %S -- non-current" ""] 5])
#@42 Set face pixmap on a monochrome display.
(defalias 'ediff-set-face-pixmap #[(face pixmap) "\300 \205 \301 ?\205 \302\303\304\217\207" [ediff-window-display-p ediff-color-display-p nil (set-face-background-pixmap face pixmap) ((error (byte-code "\302\303\304!	#\210\305\306!\207" [face pixmap message "Pixmap not found for %S: %s" face-name sit-for 1] 4)))] 3 (#$ . 32771)])
(defalias 'ediff-hide-face #[(face) "\301 \205 \302\303!\205 \302\304!\205 \303\304\"\207" [face ediff-has-face-support-p boundp add-to-list facemenu-unlisted-faces] 3])
(byte-code "\301\302\203\n \303\202 \304\305\306\307%\207" [ediff-emacs-p custom-declare-face ediff-current-diff-A ((((class color) (min-colors 16)) (:foreground "firebrick" :background "pale green")) (((class color)) (:foreground "blue3" :background "yellow3")) (t (:inverse-video t))) ((((type tty)) (:foreground "blue3" :background "yellow3")) (((class color)) (:foreground "firebrick" :background "pale green")) (t (:inverse-video t))) "Face for highlighting the selected difference in buffer A." :group ediff-highlighting] 6)
#@213 Face for highlighting the selected difference in buffer A.
DO NOT CHANGE this variable.  Instead, use the customization
widget to customize the actual face object `ediff-current-diff-A'
this variable represents.
(defvar ediff-current-diff-face-A 'ediff-current-diff-A (#$ . 33862))
(byte-code "\303!\210	\203 \304 \203 \305 \204 \306\307\"\210\310\311\n\203! \312\202\" \313\314\315\316%\207" [ediff-current-diff-face-A ediff-xemacs-p ediff-emacs-p ediff-hide-face ediff-has-face-support-p ediff-color-display-p copy-face modeline custom-declare-face ediff-current-diff-B ((((class color) (min-colors 16)) (:foreground "DarkOrchid" :background "Yellow")) (((class color)) (:foreground "magenta3" :background "yellow3" :weight bold)) (t (:inverse-video t))) ((((type tty)) (:foreground "magenta3" :background "yellow3" :weight bold)) (((class color)) (:foreground "DarkOrchid" :background "Yellow")) (t (:inverse-video t))) "Face for highlighting the selected difference in buffer B." :group ediff-highlighting] 6)
#@193 Face for highlighting the selected difference in buffer B.
 this variable.  Instead, use the customization
widget to customize the actual face `ediff-current-diff-B'
this variable represents.
(defvar ediff-current-diff-face-B 'ediff-current-diff-B (#$ . 34888))
(byte-code "\303!\210	\203 \304 \203 \305 \204 \306\307\"\210\310\311\n\203! \312\202\" \313\314\315\316%\207" [ediff-current-diff-face-B ediff-xemacs-p ediff-emacs-p ediff-hide-face ediff-has-face-support-p ediff-color-display-p copy-face modeline custom-declare-face ediff-current-diff-C ((((class color) (min-colors 16)) (:foreground "Navy" :background "Pink")) (((class color)) (:foreground "cyan3" :background "yellow3" :weight bold)) (t (:inverse-video t))) ((((type tty)) (:foreground "cyan3" :background "yellow3" :weight bold)) (((class color)) (:foreground "Navy" :background "Pink")) (t (:inverse-video t))) "Face for highlighting the selected difference in buffer C." :group ediff-highlighting] 6)
#@213 Face for highlighting the selected difference in buffer C.
DO NOT CHANGE this variable.  Instead, use the customization
widget to customize the actual face object `ediff-current-diff-C'
this variable represents.
(defvar ediff-current-diff-face-C 'ediff-current-diff-C (#$ . 35872))
(byte-code "\303!\210	\203 \304 \203 \305 \204 \306\307\"\210\310\311\n\203! \312\202\" \313\314\315\316%\207" [ediff-current-diff-face-C ediff-xemacs-p ediff-emacs-p ediff-hide-face ediff-has-face-support-p ediff-color-display-p copy-face modeline custom-declare-face ediff-current-diff-Ancestor ((((class color) (min-colors 16)) (:foreground "Black" :background "VioletRed")) (((class color)) (:foreground "black" :background "magenta3")) (t (:inverse-video t))) ((((type tty)) (:foreground "black" :background "magenta3")) (((class color)) (:foreground "Black" :background "VioletRed")) (t (:inverse-video t))) "Face for highlighting the selected difference in buffer Ancestor." :group ediff-highlighting] 6)
#@227 Face for highlighting the selected difference in buffer Ancestor.
DO NOT CHANGE this variable.  Instead, use the customization
widget to customize the actual face object `ediff-current-diff-Ancestor'
this variable represents.
(defvar ediff-current-diff-face-Ancestor 'ediff-current-diff-Ancestor (#$ . 36878))
(byte-code "\303!\210	\203 \304 \203 \305 \204 \306\307\"\210\310\311\n\203! \312\202\" \313\314\315\316%\207" [ediff-current-diff-face-Ancestor ediff-xemacs-p ediff-emacs-p ediff-hide-face ediff-has-face-support-p ediff-color-display-p copy-face modeline custom-declare-face ediff-fine-diff-A ((((class color) (min-colors 16)) (:foreground "Navy" :background "sky blue")) (((class color)) (:foreground "white" :background "sky blue" :weight bold)) (t (:underline t :stipple "gray3"))) ((((type tty)) (:foreground "white" :background "sky blue" :weight bold)) (((class color)) (:foreground "Navy" :background "sky blue")) (t (:underline t :stipple "gray3"))) "Face for highlighting the refinement of the selected diff in buffer A." :group ediff-highlighting] 6)
#@207 Face for highlighting the fine differences in buffer A.
DO NOT CHANGE this variable.  Instead, use the customization
widget to customize the actual face object `ediff-fine-diff-A'
this variable represents.
(defvar ediff-fine-diff-face-A 'ediff-fine-diff-A (#$ . 37962))
(byte-code "\302!\210\303\304	\203 \305\202 \306\307\310\311%\207" [ediff-fine-diff-face-A ediff-emacs-p ediff-hide-face custom-declare-face ediff-fine-diff-B ((((class color) (min-colors 16)) (:foreground "Black" :background "cyan")) (((class color)) (:foreground "magenta3" :background "cyan3")) (t (:underline t :stipple "gray3"))) ((((type tty)) (:foreground "magenta3" :background "cyan3")) (((class color)) (:foreground "Black" :background "cyan")) (t (:underline t :stipple "gray3"))) "Face for highlighting the refinement of the selected diff in buffer B." :group ediff-highlighting] 6)
#@207 Face for highlighting the fine differences in buffer B.
DO NOT CHANGE this variable.  Instead, use the customization
widget to customize the actual face object `ediff-fine-diff-B'
this variable represents.
(defvar ediff-fine-diff-face-B 'ediff-fine-diff-B (#$ . 38837))
(byte-code "\302!\210\303\304	\203 \305\202 \306\307\310\311%\207" [ediff-fine-diff-face-B ediff-emacs-p ediff-hide-face custom-declare-face ediff-fine-diff-C ((((type pc)) (:foreground "white" :background "Turquoise")) (((class color) (min-colors 16)) (:foreground "Black" :background "Turquoise")) (((class color)) (:foreground "yellow3" :background "Turquoise" :weight bold)) (t (:underline t :stipple "gray3"))) ((((type tty)) (:foreground "yellow3" :background "Turquoise" :weight bold)) (((type pc)) (:foreground "white" :background "Turquoise")) (((class color)) (:foreground "Black" :background "Turquoise")) (t (:underline t :stipple "gray3"))) "Face for highlighting the refinement of the selected diff in buffer C." :group ediff-highlighting] 6)
#@207 Face for highlighting the fine differences in buffer C.
DO NOT CHANGE this variable.  Instead, use the customization
widget to customize the actual face object `ediff-fine-diff-C'
this variable represents.
(defvar ediff-fine-diff-face-C 'ediff-fine-diff-C (#$ . 39874))
(byte-code "\302!\210\303\304	\203 \305\202 \306\307\310\311%\207" [ediff-fine-diff-face-C ediff-emacs-p ediff-hide-face custom-declare-face ediff-fine-diff-Ancestor ((((class color) (min-colors 16)) (:foreground "Black" :background "Green")) (((class color)) (:foreground "red3" :background "green")) (t (:underline t :stipple "gray3"))) ((((type tty)) (:foreground "red3" :background "green")) (((class color)) (:foreground "Black" :background "Green")) (t (:underline t :stipple "gray3"))) "Face for highlighting the refinement of the selected diff in the ancestor buffer.\nAt present, this face is not used and no fine differences are computed for the\nancestor buffer." :group ediff-highlighting] 6)
#@221 Face for highlighting the fine differences in buffer Ancestor.
DO NOT CHANGE this variable.  Instead, use the customization
widget to customize the actual face object `ediff-fine-diff-Ancestor'
this variable represents.
(defvar ediff-fine-diff-face-Ancestor 'ediff-fine-diff-Ancestor (#$ . 40859))
(byte-code "\306!\210\305	B\307\305!\204@ \310\305\311 \204 \312\202> \313\302!\203+ \314\315\316\n#\203+ \315\202> \313\303!\203= \314\315\316#\203= \315\202> \317\"\210\320\321\f\203T \322\323\324\316\325\316\326FDF\202_ \327\330\331\316\325\316\326FDF\332\333\334%\207" [ediff-fine-diff-face-Ancestor current-load-list x-bitmap-file-path mswindowsx-bitmap-file-path ediff-emacs-p stipple-pixmap ediff-hide-face default-boundp set-default ediff-has-face-support-p nil boundp locate-library "stipple" t "Stipple" custom-declare-face ediff-even-diff-A (((type pc)) (:foreground "green3" :background "light grey")) (((class color) (min-colors 16)) (:foreground "Black" :background "light grey")) (((class color)) (:foreground "red3" :background "light grey" :weight bold)) :italic :stipple (((type tty)) (:foreground "red3" :background "light grey" :weight bold)) (((type pc)) (:foreground "green3" :background "light grey")) (((class color)) (:foreground "Black" :background "light grey")) "Face for highlighting even-numbered non-current differences in buffer A." :group ediff-highlighting] 10)
#@224 Face for highlighting even-numbered non-current differences in buffer A.
DO NOT CHANGE this variable.  Instead, use the customization
widget to customize the actual face object `ediff-even-diff-A'
this variable represents.
(defvar ediff-even-diff-face-A 'ediff-even-diff-A (#$ . 42266))
(byte-code "\303!\210\304\305	\203 \306\307\310\311\310\312\nFDE\202! \313\314\310\311\310\312\nFDE\315\316\317%\207" [ediff-even-diff-face-A ediff-emacs-p stipple-pixmap ediff-hide-face custom-declare-face ediff-even-diff-B (((class color) (min-colors 16)) (:foreground "White" :background "Grey")) (((class color)) (:foreground "blue3" :background "Grey" :weight bold)) t :italic :stipple (((type tty)) (:foreground "blue3" :background "Grey" :weight bold)) (((class color)) (:foreground "White" :background "Grey")) "Face for highlighting even-numbered non-current differences in buffer B." :group ediff-highlighting] 9)
#@224 Face for highlighting even-numbered non-current differences in buffer B.
DO NOT CHANGE this variable.  Instead, use the customization
widget to customize the actual face object `ediff-even-diff-B'
this variable represents.
(defvar ediff-even-diff-face-B 'ediff-even-diff-B (#$ . 43186))
(byte-code "\303!\210\304\305	\203 \306\307\310\311\312\311\313\nFDF\202# \314\315\316\311\312\311\313\nFDF\317\320\321%\207" [ediff-even-diff-face-B ediff-emacs-p stipple-pixmap ediff-hide-face custom-declare-face ediff-even-diff-C (((type pc)) (:foreground "yellow3" :background "light grey")) (((class color) (min-colors 16)) (:foreground "Black" :background "light grey")) (((class color)) (:foreground "yellow3" :background "light grey" :weight bold)) t :italic :stipple (((type tty)) (:foreground "yellow3" :background "light grey" :weight bold)) (((type pc)) (:foreground "yellow3" :background "light grey")) (((class color)) (:foreground "Black" :background "light grey")) "Face for highlighting even-numbered non-current differences in buffer C." :group ediff-highlighting] 10)
#@224 Face for highlighting even-numbered non-current differences in buffer C.
DO NOT CHANGE this variable.  Instead, use the customization
widget to customize the actual face object `ediff-even-diff-C'
this variable represents.
(defvar ediff-even-diff-face-C 'ediff-even-diff-C (#$ . 44269))
(byte-code "\303!\210\304\305	\203 \306\307\310\311\312\311\313\nFDF\202# \314\315\316\311\312\311\313\nFDF\317\320\321%\207" [ediff-even-diff-face-C ediff-emacs-p stipple-pixmap ediff-hide-face custom-declare-face ediff-even-diff-Ancestor (((type pc)) (:foreground "cyan3" :background "light grey")) (((class color) (min-colors 16)) (:foreground "White" :background "Grey")) (((class color)) (:foreground "cyan3" :background "light grey" :weight bold)) t :italic :stipple (((type tty)) (:foreground "cyan3" :background "light grey" :weight bold)) (((type pc)) (:foreground "cyan3" :background "light grey")) (((class color)) (:foreground "White" :background "Grey")) "Face for highlighting even-numbered non-current differences in the ancestor buffer." :group ediff-highlighting] 10)
#@238 Face for highlighting even-numbered non-current differences in buffer Ancestor.
DO NOT CHANGE this variable.  Instead, use the customization
widget to customize the actual face object `ediff-even-diff-Ancestor'
this variable represents.
(defvar ediff-even-diff-face-Ancestor 'ediff-even-diff-Ancestor (#$ . 45350))
(byte-code "\303!\210\304	B\305\306!\210\307\310\n\203 \311\202 \312\313\314\315%\207" [ediff-even-diff-face-Ancestor current-load-list ediff-emacs-p ediff-hide-face ediff-even-diff-face-alist (lambda (#1=#:defconst-tmp-var) (defconst ediff-even-diff-face-alist #1#)) ((A . ediff-even-diff-A) (B . ediff-even-diff-B) (C . ediff-even-diff-C) (Ancestor . ediff-even-diff-Ancestor)) custom-declare-face ediff-odd-diff-A ((((type pc)) (:foreground "green3" :background "gray40")) (((class color) (min-colors 16)) (:foreground "White" :background "Grey")) (((class color)) (:foreground "red3" :background "black" :weight bold)) (t (:italic t :stipple "gray1"))) ((((type tty)) (:foreground "red3" :background "black" :weight bold)) (((type pc)) (:foreground "green3" :background "gray40")) (((class color)) (:foreground "White" :background "Grey")) (t (:italic t :stipple "gray1"))) "Face for highlighting odd-numbered non-current differences in buffer A." :group ediff-highlighting] 6)
#@222 Face for highlighting odd-numbered non-current differences in buffer A.
DO NOT CHANGE this variable.  Instead, use the customization
widget to customize the actual face object `ediff-odd-diff-A'
this variable represents.
(defvar ediff-odd-diff-face-A 'ediff-odd-diff-A (#$ . 46658))
(byte-code "\302!\210\303\304	\203 \305\202 \306\307\310\311%\207" [ediff-odd-diff-face-A ediff-emacs-p ediff-hide-face custom-declare-face ediff-odd-diff-B ((((type pc)) (:foreground "White" :background "gray40")) (((class color) (min-colors 16)) (:foreground "Black" :background "light grey")) (((class color)) (:foreground "cyan3" :background "black" :weight bold)) (t (:italic t :stipple "gray1"))) ((((type tty)) (:foreground "cyan3" :background "black" :weight bold)) (((type pc)) (:foreground "White" :background "gray40")) (((class color)) (:foreground "Black" :background "light grey")) (t (:italic t :stipple "gray1"))) "Face for highlighting odd-numbered non-current differences in buffer B." :group ediff-highlighting] 6)
#@222 Face for highlighting odd-numbered non-current differences in buffer B.
DO NOT CHANGE this variable.  Instead, use the customization
widget to customize the actual face object `ediff-odd-diff-B'
this variable represents.
(defvar ediff-odd-diff-face-B 'ediff-odd-diff-B (#$ . 47685))
(byte-code "\302!\210\303\304	\203 \305\202 \306\307\310\311%\207" [ediff-odd-diff-face-B ediff-emacs-p ediff-hide-face custom-declare-face ediff-odd-diff-C ((((type pc)) (:foreground "yellow3" :background "gray40")) (((class color) (min-colors 16)) (:foreground "White" :background "Grey")) (((class color)) (:foreground "yellow3" :background "black" :weight bold)) (t (:italic t :stipple "gray1"))) ((((type tty)) (:foreground "yellow3" :background "black" :weight bold)) (((type pc)) (:foreground "yellow3" :background "gray40")) (((class color)) (:foreground "White" :background "Grey")) (t (:italic t :stipple "gray1"))) "Face for highlighting odd-numbered non-current differences in buffer C." :group ediff-highlighting] 6)
#@222 Face for highlighting odd-numbered non-current differences in buffer C.
DO NOT CHANGE this variable.  Instead, use the customization
widget to customize the actual face object `ediff-odd-diff-C'
this variable represents.
(defvar ediff-odd-diff-face-C 'ediff-odd-diff-C (#$ . 48708))
(byte-code "\302!\210\303\304	\203 \305\202 \306\307\310\311%\207" [ediff-odd-diff-face-C ediff-emacs-p ediff-hide-face custom-declare-face ediff-odd-diff-Ancestor ((((class color) (min-colors 16)) (:foreground "cyan3" :background "gray40")) (((class color)) (:foreground "green3" :background "black" :weight bold)) (t (:italic t :stipple "gray1"))) ((((type tty)) (:foreground "green3" :background "black" :weight bold)) (((class color)) (:foreground "cyan3" :background "gray40")) (t (:italic t :stipple "gray1"))) "Face for highlighting odd-numbered non-current differences in the ancestor buffer." :group ediff-highlighting] 6)
#@236 Face for highlighting odd-numbered non-current differences in buffer Ancestor.
DO NOT CHANGE this variable.  Instead, use the customization
widget to customize the actual face object `ediff-odd-diff-Ancestor'
this variable represents.
(defvar ediff-odd-diff-face-Ancestor 'ediff-odd-diff-Ancestor (#$ . 49633))
(byte-code "\306!\210\307	B\310\311!\210\312	B\313\314!\210\315\n\316\317#\210\315\316\317#\210\315\f\316\317#\210\315\316\317#\210\320\321\322\"\210\320\323\324\"\207" [ediff-odd-diff-face-Ancestor current-load-list ediff-fine-diff-face-A ediff-fine-diff-face-B ediff-fine-diff-face-C ediff-fine-diff-face-Ancestor ediff-hide-face ediff-odd-diff-face-alist (lambda (#1=#:defconst-tmp-var) (defconst ediff-odd-diff-face-alist #1#)) ((A . ediff-odd-diff-A) (B . ediff-odd-diff-B) (C . ediff-odd-diff-C) (Ancestor . ediff-odd-diff-Ancestor)) ediff-fine-diff-face-alist (lambda (#2=#:defconst-tmp-var) (defconst ediff-fine-diff-face-alist #2#)) ((A . ediff-fine-diff-A) (B . ediff-fine-diff-B) (C . ediff-fine-diff-C) (Ancestor . ediff-fine-diff-Ancestor)) put ediff-help-echo "A `refinement' of the current difference region" add-hook ediff-quit-hook ediff-cleanup-mess ediff-suspend-hook ediff-default-suspend-function] 4)
#@56 Overlay for the current difference region in buffer A.
(defvar ediff-current-diff-overlay-A nil (#$ . 50877))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-current-diff-overlay-A put permanent-local t] 4)
#@56 Overlay for the current difference region in buffer B.
(defvar ediff-current-diff-overlay-B nil (#$ . 51124))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-current-diff-overlay-B put permanent-local t] 4)
#@56 Overlay for the current difference region in buffer C.
(defvar ediff-current-diff-overlay-C nil (#$ . 51371))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-current-diff-overlay-C put permanent-local t] 4)
#@67 Overlay for the current difference region in the ancestor buffer.
(defvar ediff-current-diff-overlay-Ancestor nil (#$ . 51618))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-current-diff-overlay-Ancestor put permanent-local t] 4)
(defalias 'ediff-highest-priority #[(start end buffer) "\306S]\307\203F \310!\203F \311\310!!\203F rq\210\nd\fT^W\2035 \312\313\n!	\"\314\n!\211\202 \315\316\306\317\320	\"B\"\\\306\\)\202Q \321=\206Q \322!*\207" [start ovr-list pos buffer end ediff-shadow-overlay-priority 1 nil get-buffer buffer-name append overlays-at next-overlay-change apply max mapcar #[(ovr) "\203 \301\302\"\204 \301\303\"\204 \301\304\"\206 \305\207\305\207" [ovr ediff-overlay-get ediff ediff-diff-num priority 0] 3] ediff-quit error this-command ediff-KILLED-VITAL-BUFFER] 8])
#@274 *Specifies the function to be used to toggle read-only.
If nil, Ediff tries to deduce the function from the binding of C-x C-q.
Normally, this is the `toggle-read-only' function, but, if version
control is used, it could be `vc-toggle-read-only' or `rcs-toggle-read-only'.
(defvar ediff-toggle-read-only-function nil (#$ . -52470))
#@103 *Make all variant buffers read-only when Ediff starts up.
This property can be toggled interactively.
(custom-declare-variable 'ediff-make-buffers-readonly-at-startup 'nil '(#$ . -52809) :type 'boolean :group 'ediff)
(byte-code "\301B\302\303!\207" [current-load-list ediff-verbose-p (lambda (#1=#:defconst-tmp-var) (defconst ediff-verbose-p #1#)) t] 2)
#@278 *Save the results of merge jobs automatically.
With value nil, don't save automatically.  With value t, always
save.  Anything else means save automatically only if the merge
job is part of a group of jobs, such as `ediff-merge-directory'
or `ediff-merge-directory-revisions'.
(custom-declare-variable 'ediff-autostore-merges ''group-jobs-only '(#$ . -53172) :type '(choice (const nil) (const t) (const group-jobs-only)) :group 'ediff-merge)
(make-variable-buffer-local 'ediff-autostore-merges)
#@2 
(defvar ediff-merge-store-file nil (#$ . 53672))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-merge-store-file put permanent-local t] 4)
#@48 *Prefix to be attached to saved merge buffers.
(custom-declare-variable 'ediff-merge-filename-prefix '"merge_" '(#$ . -53853) :type 'string :group 'ediff-merge)
#@116 *Non-nil means C-h should not invoke Emacs help in control buffer.
Instead, C-h would jump to previous difference.
(custom-declare-variable 'ediff-no-emacs-help-in-control-buffer 'nil '(#$ . -54021) :type 'boolean :group 'ediff)
#@87 *Prefix to put on Ediff temporary file names.
Do not start with `~/' or `~USERNAME/'.
(custom-declare-variable 'ediff-temp-file-prefix '(file-name-as-directory (cond ((boundp 'temporary-file-directory) temporary-file-directory) ((fboundp 'temp-directory) (temp-directory)) (t "/tmp/"))) '(#$ . -54256) :type 'string :group 'ediff)
#@34 *Mode for Ediff temporary files.
(custom-declare-variable 'ediff-temp-file-mode '384 '(#$ . -54593) :type 'integer :group 'ediff)
#@126 Regexp that matches characters that must be quoted with `\' in shell command line.
This default should work without changes.
(custom-declare-variable 'ediff-metachars '"[ 	\n!\"#$&'()*;<=>?[\\^`{|~]" '(#$ . 54730) :type 'string :group 'ediff)
(byte-code "\301B\302\301!\204 \303\301\304\"\210\304\207" [current-load-list ediff-H-glyph default-boundp set-default nil] 3)
#@2 
(defvar ediff-temp-file-A nil (#$ . 55108))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-temp-file-A put permanent-local t] 4)
#@2 
(defvar ediff-temp-file-B nil (#$ . 55278))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-temp-file-B put permanent-local t] 4)
#@2 
(defvar ediff-temp-file-C nil (#$ . 55448))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-temp-file-C put permanent-local t] 4)
(defalias 'ediff-file-remote-p #[(file-name) "\301!\207" [file-name file-remote-p] 2])
(defalias 'ediff-listable-file #[(file-name) "\302\303\"\211?\206 	\304=)\207" [file-name handler find-file-name-handler file-local-copy dired-handler-fn] 4])
(defalias 'ediff-frame-unsplittable-p #[(frame) "\301\302!\236A\207" [frame unsplittable frame-parameters] 3])
(put 'ediff-frame-unsplittable-p 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-get-next-window #[(wind prev-wind) "\302!\203 \207	\203 \303!\207\304 \207" [wind prev-wind window-live-p next-window selected-window] 2])
(put 'ediff-get-next-window 'byte-optimizer 'byte-compile-inline-expand)
#@31 Kill buffer BUF if it exists.
(defalias 'ediff-kill-buffer-carefully #[(buf) "\205 \301!\205 \302\301!!\205 \303\301!!\207" [buf get-buffer buffer-name kill-buffer] 3 (#$ . 56293)])
(put 'ediff-kill-buffer-carefully 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-background-face #[(buf-type dif-num) "\305	\306\"\306=\203 \n\202 \307\f\"A*\207" [buf-type dif-num ediff-even-diff-face-alist ediff-odd-diff-face-alist alist logand 1 assoc] 4])
(put 'ediff-background-face 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-paint-background-regions-in-one-buffer #[(buf-type unhighlight) "\306	\307\n\"A*!\310\211\311\312\"+\207" [buf-type ediff-difference-vector-alist alist diff-num overl diff-vector eval assoc nil mapcar #[(rec) "\306H\307	\310\"\311	!\2056 \312	?\2055 \f\n\211\313\314\"\314=\203) \202+ \315\f\"A,\"\207" [rec overl diff-num unhighlight buf-type dif-num 0 ediff-overlay-get ediff-diff-num ediff-overlay-buffer ediff-set-overlay-face logand 1 assoc ediff-even-diff-face-alist ediff-odd-diff-face-alist alist] 7]] 4])
(defalias 'ediff-paint-background-regions #[(&optional unhighlight) "\301\302\"\210\301\303\"\210\301\304\"\210\301\305\"\207" [unhighlight ediff-paint-background-regions-in-one-buffer A B C Ancestor] 3])
(defalias 'ediff-clear-fine-diff-vector #[(diff-record) "\205\n \301\302\303H\"\207" [diff-record mapcar ediff-delete-overlay 1] 4])
(put 'ediff-clear-fine-diff-vector 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-clear-fine-differences-in-one-buffer #[(n buf-type) "	\305\n\"A*JH\211\203 \306\307\f\310H\"\210)	\305\n\"A*JH\310\311I\207" [buf-type ediff-difference-vector-alist alist n diff-record assoc mapcar ediff-delete-overlay 1 nil] 5])
(put 'ediff-clear-fine-differences-in-one-buffer 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-clear-fine-differences #[(n) "\306	\n\307	\"A*JH\211\203 \310\311\f\312H\"\210)	\n\307	\"A*JH\312\313I\210*\314	\n\307	\"A*JH\211\203M \310\311\f\312H\"\210)	\n\307	\"A*JH\312\313I\210*\205\223 \315	\n\307	\"A*JH\211\203\201 \310\311\f\312H\"\210)	\n\307	\"A*JH\312\313I*\207" [n buf-type ediff-difference-vector-alist alist diff-record ediff-3way-job A assoc mapcar ediff-delete-overlay 1 nil B C] 5])
(put 'ediff-clear-fine-differences 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-mouse-event-p #[(event) "\301\302\303\304\305!\"\"\207" [event string-match "mouse" format "%S" event-basic-type] 6])
(put 'ediff-mouse-event-p 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-key-press-event-p #[(event) "\301!\206 9\207" [event char-or-string-p] 2])
(put 'ediff-key-press-event-p 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-event-point #[(event) "\302\303\304\305\306!\"\")\203= \211:\203 \3078\202\" \310 `\311\312F)\313	8\206; \307	8:\2038 \307	8@\202; \307	8)\207\314!\206G 9)\203M `\207\315\316!\207" [event position string-match "mouse" format "%S" event-basic-type 1 selected-window (0 . 0) 0 5 char-or-string-p error nil] 7])
(defalias 'ediff-event-buffer #[(event) "\302\303\304\305\306!\"\")\203+ \307\211:\203 \3108\202# \311 `\312\313F)\313	8)!\207\314!\2065 9)\203; p\207\315\316!\207" [event position string-match "mouse" format "%S" event-basic-type window-buffer 1 selected-window (0 . 0) 0 char-or-string-p error nil] 7])
(defalias 'ediff-event-key #[(event-or-key) "\207" [event-or-key] 1])
(defalias 'ediff-frame-iconified-p #[(frame) "\301 \205 \302!\205 \303!\304=\207" [frame ediff-window-display-p frame-live-p frame-visible-p icon] 2])
(put 'ediff-frame-iconified-p 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-window-visible-p #[(wind) "\301!\205 \302 ?\206 \303\304!!\207" [wind window-live-p ediff-window-display-p frame-visible-p window-frame] 3])
(put 'ediff-window-visible-p 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-frame-char-width #[(frame) "\301!\207" [frame frame-char-width] 2])
(put 'ediff-frame-char-width 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-reset-mouse #[(&optional frame do-not-grab-mouse) "\204 \306 \307 \2051 \n\203 \310!\2060 \f?\2060 \f\311=\203+ \312>\2060 \313	\314\315#)\207" [frame frame-or-wind ediff-xemacs-p do-not-grab-mouse ediff-grab-mouse this-command selected-frame ediff-window-display-p frame-selected-window maybe (ediff-quit ediff-update-diffs) set-mouse-position 1 0] 4])
(defalias 'ediff-spy-after-mouse #[nil "\301 \211\207" [ediff-mouse-pixel-position mouse-pixel-position] 2])
(put 'ediff-spy-after-mouse 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-user-grabbed-mouse #[nil "\205F @\302 @=?\206F A@\203E \302 A@\203E AA\203E \302 AA\203E \303A@\302 A@Z!	W\205C \303AA\302 AAZ!	W?\207\304\207" [ediff-mouse-pixel-position ediff-mouse-pixel-threshold mouse-pixel-position abs nil] 3])
(defalias 'ediff-frame-char-height #[(frame) "\301!\207" [frame frame-char-height] 2])
(put 'ediff-frame-char-height 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-overlay-start #[(overl) "\301!\205	 \302!\207" [overl ediff-overlayp overlay-start] 2])
(put 'ediff-overlay-start 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-overlay-end #[(overl) "\301!\205	 \302!\207" [overl ediff-overlayp overlay-end] 2])
(put 'ediff-overlay-end 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-empty-overlay-p #[(overl) "\301!\205 \302!)\301!\205 \303!)U\207" [overl ediff-overlayp overlay-start overlay-end] 3])
(put 'ediff-empty-overlay-p 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-overlay-buffer #[(overl) "\301!\207" [overl overlay-buffer] 2])
(defalias 'ediff-overlay-get #[(overl property) "\302	\"\207" [overl property overlay-get] 3])
#@135 Calls `move-overlay' in Emacs and `set-extent-endpoints' in Lemacs.
Checks if overlay's buffer exists before actually doing the move.
(defalias 'ediff-move-overlay #[(overlay beg end &optional buffer) "\205 \305!\211\203# \306	!\203# \307\306	!!\203# \310\n\f$\202* \205* \311!)\207" [overlay buf beg end buffer ediff-overlay-buffer get-buffer buffer-name move-overlay ediff-delete-overlay] 6 (#$ . 62174)])
#@109 Calls `overlay-put' or `set-extent-property' depending on Emacs version.
Checks if overlay's buffer exists.
(defalias 'ediff-overlay-put #[(overlay prop value) "\303!\203 \304\303!!\203 \305\304\303!!!\203 \306	\n#\207\307!\207" [overlay prop value ediff-overlay-buffer get-buffer buffer-name overlay-put ediff-delete-overlay] 4 (#$ . 62597)])
(defalias 'ediff-abbreviate-file-name #[(file &optional dir) ";\203 \303BC\304\n!)\207\304\n!\207" [dir directory-abbrev-alist file "" abbreviate-file-name] 2])
(defalias 'ediff-strip-last-dir #[(dir) ";\204 	\304!\305!\204 \306!GS\nH\n\307V\203. \310U\203. \307\nO\311\306!!*\207" [dir default-directory pos last-char expand-file-name file-directory-p file-name-directory 0 47 ediff-abbreviate-file-name] 3])
(defalias 'ediff-truncate-string-left #[(str newlen) "G\304\211X\203 \202# \305\306Z]\305\nZ\307Z]\304O\310	P*\207" [str substr len newlen nil 0 3 1 "..."] 5])
(defalias 'ediff-nonempty-string-p #[(string) ";\205	 \301\230?\207" [string ""] 2])
(byte-code "\300\301\302\303#\210\304\305!\204 \306\305\307\"\210\300\207" [put ediff-nonempty-string-p byte-optimizer byte-compile-inline-expand fboundp subst-char-in-string defalias #[(fromchar tochar string &optional inplace) "G	\203\n \202 \306!\307V\203( S\nH\f=\203 \nI\210\202 \n*\207" [string inplace newstr i fromchar tochar copy-sequence 0] 3 "Replace FROMCHAR with TOCHAR in STRING each time it occurs.\nUnless optional argument INPLACE is non-nil, return a new string."]] 4)
(defalias 'ediff-abbrev-jobname #[(jobname) "\301=\203 \302\207\303=\203 \304\207\305=\203 \306\207\307=\203  \310\207\311=\203( \312\207\313=\2030 \314\207\315=\2038 \316\207\317=\203@ \320\207\321=\203H \322\207\323=\203P \324\207\325\326\327\330\331!\332\333O#!\207" [jobname ediff-directories "Compare two directories" ediff-files "Compare two files" ediff-buffers "Compare two buffers" ediff-directories3 "Compare three directories" ediff-files3 "Compare three files" ediff-buffers3 "Compare three buffers" ediff-revision "Compare file with a version" ediff-directory-revisions "Compare dir files with versions" ediff-merge-directory-revisions "Merge dir files with versions" ediff-merge-directory-revisions-with-ancestor "Merge dir versions via ancestors" capitalize subst-char-in-string 45 32 symbol-name 6 nil] 7])
(defalias 'ediff-strip-mode-line-format #[nil "@\301\235\205\f \3028\211\207" [mode-line-format (" A: " " B: " " C: " " Ancestor: ") 2] 2])
(put 'ediff-strip-mode-line-format 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-valid-difference-p #[(&optional n) "\204 	\303Y\205 \nW\207" [n ediff-current-difference ediff-number-of-differences 0] 2])
(put 'ediff-valid-difference-p 'byte-optimizer 'byte-compile-inline-expand)
#@32 Don't skip difference regions.
(defalias 'ediff-show-all-diffs #[(n) "\300\207" [nil] 1 (#$ . 65429)])
(put 'ediff-show-all-diffs 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'Xor #[(a b) "\203	 	?\206 ?\205 	\207" [a b] 1])
(put 'Xor 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-message-if-verbose #[(string &rest args) "\205	 \303\304	\n#\207" [ediff-verbose-p string args apply message] 4])
(put 'ediff-message-if-verbose 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-file-attributes #[(filename attr-number) "\302!\203\f 	\303!8\207\304\207" [filename attr-number ediff-listable-file file-attributes -1] 3])
(defalias 'ediff-file-size #[(filename) "\301\302\"\207" [filename ediff-file-attributes 7] 3])
(put 'ediff-file-size 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-file-modtime #[(filename) "\301\302\"\207" [filename ediff-file-attributes 5] 3])
(put 'ediff-file-modtime 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-convert-standard-filename #[(fname) "\301\302!\203\n \302!\207\207" [fname fboundp convert-standard-filename] 2])
(byte-code "\300\301!\203 \302\303\301\"\210\202 \303\304M\210\305\306!\207" [fboundp with-syntax-table defalias ediff-with-syntax-table (macro . #[(table &rest body) "\304\305!\304\306!\307	\310B\311BD\312\313\314\315\nDDBB\316\317D\314	DEEE*\207" [old-buffer old-table table body make-symbol "table" "buffer" let ((syntax-table)) ((current-buffer)) unwind-protect progn set-syntax-table copy-syntax-table save-current-buffer set-buffer] 8]) provide ediff-init] 3)