| Current Path : /usr/share/emacs/24.3/lisp/vc/ |
Linux gator3171.hostgator.com 4.19.286-203.ELK.el7.x86_64 #1 SMP Wed Jun 14 04:33:55 CDT 2023 x86_64 |
| Current File : //usr/share/emacs/24.3/lisp/vc/ediff-init.elc |
;ELC
;;; Compiled by mockbuild@buildfarm06-new.corp.cloudlinux.com on Fri Oct 11 10:08:51 2024
;;; from file /builddir/build/BUILD/emacs-24.3/lisp/vc/ediff-init.el
;;; in Emacs version 24.3.1
;;; with all optimizations.
;;; This file uses dynamic docstrings, first added in Emacs 19.29.
;;; This file does not contain utf-8 non-ASCII characters,
;;; and so can be loaded in Emacs versions earlier than 23.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
#@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 (#$ . 557))
(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 "\302 \206 \206 \303 \206 \304>\207" [ediff-force-faces window-system ediff-window-display-p ediff-color-display-p (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])
#@34 Defines VAR as a local variable.
(defalias 'ediff-defvar-local '(macro . #[(var value doc) "\303\304 \nF\305\306DD\307\306D\310BBF\207" [var value doc progn defvar make-variable-buffer-local quote put ('permanent-local t)] 6 (#$ . 1452)]))
(put 'ediff-defvar-local 'lisp-indent-function 'defun)
#@2
(defvar ediff-buffer-A nil (#$ . 1755))
(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 (#$ . 1918))
(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 (#$ . 2081))
(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 (#$ . 2244))
(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 (#$ . 2421))
(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 (#$ . 2597))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-temp-indirect-buffer put permanent-local t] 4)
(defconst ediff-buffer-alist '((65 . ediff-buffer-A) (66 . ediff-buffer-B) (67 . ediff-buffer-C)))
(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\302D\303\302DDF\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])
(put 'ediff-get-symbol-from-alist 'byte-optimizer 'byte-compile-inline-expand)
(defconst ediff-difference-vector-alist '((A . ediff-difference-vector-A) (B . ediff-difference-vector-B) (C . ediff-difference-vector-C) (Ancestor . ediff-difference-vector-Ancestor)))
(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\302E\304BBE\207" [n if ediff-state-of-merge aref (0)] 6]))
(defalias 'ediff-set-state-of-merge '(macro . #[(n val) "\302\303\304\305\303E\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\302E\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]))
#@27 Evaluates BODY in BUFFER.
(defalias 'ediff-with-current-buffer '(macro . #[(buffer &rest body) "\302\303D\304\305D 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 (#$ . 6076)]))
(byte-code "\300\301\302\303#\210\300\301\304\305#\207" [put ediff-with-current-buffer lisp-indent-function 1 edebug-form-spec (form body)] 4)
(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 (#$ . 6980))
(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 (#$ . 7413))
(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 (#$ . 7869))
(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 (#$ . 8169))
(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 (#$ . 8454))
(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 (#$ . 8753))
(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 (#$ . 9058))
(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 (#$ . 9410))
(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&\210\320\321\306\322\323\324\312\316&\210\320\325\306\326\323\324\312\316&\210\320\327\306\330\323\324\312\316&\210\320\331\306\332\323\324\312\316&\210\320\333\306\334\323\324\312\316&\210\320\335\306\336\323\324\312\316&\210\320\337\306\340\323\324\312\316&\210\320\341\306\342\323\324\312\316&\210\320\343\306\344\323\324\312\316&\210\320\345\306\346\323\324\312\316&\210\320\347\306\350\323\324\312\316&\210\320\351\306\352\323\324\312\316&\210\320\353\306\354\323\324\312\316&\210\320\355\306\356\323\324\312\316&\210\320\357\306\360\323\324\312\316&\210\320\361\306\362\323\324\312\316&\207" [put ediff-barf-if-not-control-buffer byte-optimizer byte-compile-inline-expand custom-declare-group ediff-highlighting nil "Highlighting of difference regions in Ediff." :prefix "ediff-" :group ediff ediff-merge "Merging utilities." ediff-hook "Hooks run by Ediff." custom-declare-variable ediff-before-setup-hook "Hooks to run before Ediff begins to set up windows and buffers.\nThis hook can be used to save the previous window config, which can be restored\non ediff-quit or ediff-suspend." :type hook ediff-before-setup-windows-hook "Hooks to run before Ediff sets its window configuration.\nThis hook is run every time when Ediff arranges its windows.\nThis happens each time Ediff detects that the windows were messed up by the\nuser." ediff-after-setup-windows-hook "Hooks to run after Ediff sets its window configuration.\nThis can be used to set up control window or icon in a desired place." ediff-before-setup-control-frame-hook "Hooks run before setting up the frame to display Ediff Control Panel.\nCan be used to change control frame parameters to position it where it\nis desirable." ediff-after-setup-control-frame-hook "Hooks run after setting up the frame to display Ediff Control Panel.\nCan be used to move the frame where it is desired." ediff-startup-hook "Hooks to run in the control buffer after Ediff has been set up and is ready for the job." ediff-select-hook "Hooks to run after a difference has been selected." ediff-unselect-hook "Hooks to run after a difference has been unselected." ediff-prepare-buffer-hook "Hooks run after buffers A, B, and C are set up.\nFor each buffer, the hooks are run with that buffer made current." ediff-load-hook "Hook run after Ediff is loaded. Can be used to change defaults." ediff-mode-hook "Hook run just after ediff-mode is set up in the control buffer.\nThis is done before any windows or frames are created. One can use it to\nset local variables that determine how the display looks like." ediff-keymap-setup-hook "Hook run just after the default bindings in Ediff keymap are set up." ediff-display-help-hook "Hooks run after preparing the help message." ediff-suspend-hook "Hooks to run in the Ediff control buffer when Ediff is suspended." ediff-quit-hook "Hooks to run in the Ediff control buffer after finishing Ediff." ediff-cleanup-hook "Hooks to run on exiting Ediff but before killing the control and variant buffers."] 8)
(defconst ediff-KILLED-VITAL-BUFFER "You have killed a vital Ediff buffer---you must leave Ediff now!")
(defconst ediff-NO-DIFFERENCES "Sorry, comparison of identical variants is not what I am made for...")
(defconst ediff-BAD-DIFF-NUMBER "%S: Bad diff region number, %d. Valid numbers are 1 to %d")
(defconst ediff-BAD-INFO (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. " ""))
#@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 (#$ . 15987))
(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 (#$ . 16484))
(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 (#$ . 16839))
(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 "" (#$ . 17212))
(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 "" (#$ . 17387))
(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 "" (#$ . 17562))
(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 (#$ . 17737))
(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 "" (#$ . 17932))
(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 "" (#$ . 18105))
(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 "" (#$ . 18278))
(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 (#$ . 18451))
(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 (#$ . 18644))
(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 (#$ . 18828))
(byte-code "\300\301!\210\302\301\303\304#\210\305\306\307\310\311\312\313\314\315\316& \210\305\317\320\321\311\312\313\322\315\316& \210\305\323\324\325\311\312\313\326\315\316& \210\305\327\330\331\311\312\313\332\315\316& \210\305\333\304\334\311\335\315\336&\207" [make-variable-buffer-local ediff-syntax-table put permanent-local t custom-declare-variable ediff-before-flag-bol (if (featurep 'xemacs) (make-glyph "->>") "->>") "Flag placed before a highlighted block of differences, if block starts at beginning of a line." :type string :tag "Region before-flag at beginning of line" :group ediff ediff-after-flag-eol (if (featurep 'xemacs) (make-glyph "<<-") "<<-") "Flag placed after a highlighted block of differences, if block ends at end of a line." "Region after-flag at end of line" ediff-before-flag-mol (if (featurep 'xemacs) (make-glyph "->>") "->>") "Flag placed before a highlighted block of differences, if block starts in mid-line." "Region before-flag in the middle of line" ediff-after-flag-mol (if (featurep 'xemacs) (make-glyph "<<-") "<<-") "Flag placed after a highlighted block of differences, if block ends in mid-line." "Region after-flag in the middle of line" ediff-use-faces "If t, differences are highlighted using faces, if device supports faces.\nIf nil, differences are highlighted using ASCII flags, ediff-before-flag\nand ediff-after-flag. On a non-window system, differences are always\nhighlighted using ASCII flags." boolean ediff-highlighting] 10)
#@2
(defvar ediff-use-faces t (#$ . 20371))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-use-faces put permanent-local t] 4)
#@2
(defvar ediff-word-mode nil (#$ . 20535))
(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 (#$ . 20701))
(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 (#$ . 20865))
(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 (#$ . 21039))
(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 (#$ . 21209))
(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 (#$ . 21386))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-start-narrowed put permanent-local t] 4)
#@131 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 (#$ . 21635))
(byte-code "\300\301!\210\302\301\303\304#\210\305\306\304\307\310\311\312\313&\210\305\314\304\315\310\311\312\316&\207" [make-variable-buffer-local ediff-quit-widened put permanent-local t custom-declare-variable ediff-keep-variants "nil means prompt to remove unmodified buffers A/B/C at session end.\nSupplying a prefix argument to the quit command `q' temporarily reverses the\nmeaning of this variable." :type boolean :group ediff ediff-highlight-all-diffs "If nil, only the selected differences are highlighted.\nOtherwise, all difference regions are highlighted, but the selected region is\nshown in brighter colors." ediff-highlighting] 8)
#@2
(defvar ediff-highlight-all-diffs t (#$ . 22464))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-highlight-all-diffs put permanent-local t] 4)
#@2
(defvar ediff-control-buffer-suffix nil (#$ . 22648))
(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 (#$ . 22838))
(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 (#$ . 23028))
(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 (#$ . 23216))
(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 (#$ . 23404))
(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 (#$ . 23592))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-buffer-values-orig-Ancestor put permanent-local t] 4)
(defconst ediff-buffer-values-orig-alist '((A . ediff-buffer-values-orig-A) (B . ediff-buffer-values-orig-B) (C . ediff-buffer-values-orig-C) (Ancestor . ediff-buffer-values-orig-Ancestor)))
(defconst ediff-protected-variables '(mode-line-format))
#@2
(defvar ediff-difference-vector-A nil (#$ . 24042))
(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 (#$ . 24228))
(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 (#$ . 24414))
(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 (#$ . 24600))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-difference-vector-Ancestor put permanent-local t] 4)
(defconst ediff-difference-vector-alist '((A . ediff-difference-vector-A) (B . ediff-difference-vector-B) (C . ediff-difference-vector-C) (Ancestor . ediff-difference-vector-Ancestor)))
#@2
(defvar ediff-state-of-merge nil (#$ . 24986))
(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 (#$ . 25162))
(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 (#$ . 25345))
(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 (#$ . 25535))
(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 (#$ . 25705))
(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 (#$ . 25889))
(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*" (#$ . 26069))
#@2
(defconst ediff-msg-buffer " *ediff-message*" (#$ . 26131))
#@2
(defvar ediff-error-buffer nil (#$ . 26197))
(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*" (#$ . 26369))
(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 (#$ . 26553))
(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 (#$ . 26753))
#@2
(defvar ediff-shadow-overlay-priority 100 (#$ . 26810))
(byte-code "\300\301\302\303\304\305\306\307&\210\300\310\311\312\304\305\306\307&\210\300\313\314\315\304\305\306\307&\210\316\317\320\"\210\316\321\322\"\210\316\323\324\"\210\316\325\326\"\207" [custom-declare-variable ediff-version-control-package 'vc "Version control package used.\nCurrently, Ediff supports vc.el, rcs.el, pcl-cvs.el, and generic-sc.el. The\nstandard Emacs interface to RCS, CVS, SCCS, etc., is vc.el. However, some\npeople find the other two packages more convenient. Set this variable to the\nappropriate symbol: `rcs', `pcl-cvs', or `generic-sc' if you so desire." :type symbol :group ediff ediff-coding-system-for-read 'raw-text "The coding system for read to use when running the diff program as a subprocess.\nIn most cases, the default will do. However, under certain circumstances in\nMS-Windows you might need to use something like 'raw-text-dos here.\nSo, if the output that your diff program sends to Emacs contains extra ^M's,\nyou might need to experiment here, if the default or 'raw-text-dos doesn't\nwork." ediff-coding-system-for-write (if (featurep 'xemacs) 'escape-quoted 'emacs-internal) "The coding system for write to use when writing out difference regions\nto temp files in buffer jobs and when Ediff needs to find fine differences." defalias ediff-read-event read-event ediff-overlayp overlayp ediff-make-overlay make-overlay ediff-delete-overlay delete-overlay] 8)
#@182 Check the current version against MAJOR and MINOR version numbers.
The comparison uses operator OP, which may be any of: =, >, >=, <, <=.
TYPE-OF-EMACS is either 'xemacs or 'emacs.
(defalias 'ediff-check-version #[(op major minor &optional type-of-emacs) "\306=\203 \307\207\210 \310=\203 \n U\205> \f
U\207 \311>\203: \f
\"\204- \f
U\205> \f
U\2038 \n \"\207\312\207\313\314 \"\207" [type-of-emacs op emacs-minor-version minor emacs-major-version major xemacs nil = (> >= < <=) t error "%S: Invalid op in ediff-check-version"] 3 (#$ . 28295)])
(make-obsolete 'ediff-check-version 'version< "23.1")
(defalias 'ediff-color-display-p #[nil "\300\301\302\217\207" [nil (display-color-p) ((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) (#$ . 29005))
(byte-code "\300\301!\210\302\301\303\304#\210\305\306\307\"\210\305\310\311\"\207" [make-variable-buffer-local ediff-highlighting-style put permanent-local t defalias ediff-display-pixel-width display-pixel-width ediff-display-pixel-height display-pixel-height] 4)
(defconst ediff-current-diff-overlay-alist '((A . ediff-current-diff-overlay-A) (B . ediff-current-diff-overlay-B) (C . ediff-current-diff-overlay-C) (Ancestor . ediff-current-diff-overlay-Ancestor)))
(defconst ediff-current-diff-face-alist '((A . ediff-current-diff-A) (B . ediff-current-diff-B) (C . ediff-current-diff-C) (Ancestor . ediff-current-diff-Ancestor)))
(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 (#$ . 30405)])
(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])
(custom-declare-face 'ediff-current-diff-A '((((class color) (min-colors 88) (background light)) :background "#ffdddd") (((class color) (min-colors 88) (background dark)) :background "#553333") (((class color) (min-colors 16)) (:foreground "firebrick" :background "pale green")) (((class color)) (:foreground "blue3" :background "yellow3")) (t (:inverse-video t))) "Face for highlighting the selected difference in buffer A." :group 'ediff-highlighting)
#@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 (#$ . 31417))
(byte-code "\301!\210\302\303\304\305\306\307%\207" [ediff-current-diff-face-A ediff-hide-face custom-declare-face ediff-current-diff-B ((((class color) (min-colors 88) (background light)) :background "#ddffdd") (((class color) (min-colors 88) (background dark)) :background "#335533") (((class color) (min-colors 16)) (:foreground "DarkOrchid" :background "Yellow")) (((class color)) (:foreground "magenta3" :background "yellow3" :weight bold)) (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 (#$ . 32268))
(byte-code "\301!\210\302\303\304\305\306\307%\207" [ediff-current-diff-face-B ediff-hide-face custom-declare-face ediff-current-diff-C ((((class color) (min-colors 88) (background light)) :background "#ffffaa") (((class color) (min-colors 88) (background dark)) :background "#888833") (((class color) (min-colors 16)) (:foreground "Navy" :background "Pink")) (((class color)) (:foreground "cyan3" :background "yellow3" :weight bold)) (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 (#$ . 33088))
(byte-code "\301!\210\302\303\304\305\306\307%\207" [ediff-current-diff-face-C ediff-hide-face 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))) "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 (#$ . 33787))
(byte-code "\301!\210\302\303\304\305\306\307%\207" [ediff-current-diff-face-Ancestor ediff-hide-face custom-declare-face ediff-fine-diff-A ((((class color) (min-colors 88) (background light)) :background "#ffbbbb") (((class color) (min-colors 88) (background dark)) :background "#aa2222") (((class color) (min-colors 16)) (:foreground "Navy" :background "sky blue")) (((class color)) (:foreground "white" :background "sky blue" :weight bold)) (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 (#$ . 34689))
(byte-code "\301!\210\302\303\304\305\306\307%\207" [ediff-fine-diff-face-A ediff-hide-face custom-declare-face ediff-fine-diff-B ((((class color) (min-colors 88) (background light)) :background "#aaffaa") (((class color) (min-colors 88) (background dark)) :background "#22aa22") (((class color) (min-colors 16)) (:foreground "Black" :background "cyan")) (((class color)) (:foreground "magenta3" :background "cyan3")) (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 (#$ . 35525))
(byte-code "\301!\210\302\303\304\305\306\307%\207" [ediff-fine-diff-face-B ediff-hide-face custom-declare-face ediff-fine-diff-C ((((class color) (min-colors 88) (background light)) :background "#ffff55") (((class color) (min-colors 88) (background dark)) :background "#aaaa22") (((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"))) "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 (#$ . 36442))
(byte-code "\301!\210\302\303\304\305\306\307%\207" [ediff-fine-diff-face-C 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"))) "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 (#$ . 37242))
(ediff-hide-face ediff-fine-diff-face-Ancestor)
(defvar stipple-pixmap (byte-code "\302 \204 \303\207\304\300!\203 \305\306\307#\203 \306\207\304\301!\203' \305\306\307 #\203' \306\207\310\207" [x-bitmap-file-path mswindowsx-bitmap-file-path ediff-has-face-support-p nil boundp locate-library "stipple" t "Stipple"] 4))
(byte-code "\301\302\303\304\305\306\307\306\310FDF\311\312\313%\207" [stipple-pixmap 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)) t :italic :stipple "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 (#$ . 38341))
(byte-code "\302!\210\303\304\305\306\307\310\307\311 FDE\312\313\314%\207" [ediff-even-diff-face-A 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 "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 (#$ . 39076))
(byte-code "\302!\210\303\304\305\306\307\310\311\310\312 FDF\313\314\315%\207" [ediff-even-diff-face-B 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 "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 (#$ . 39893))
(byte-code "\302!\210\303\304\305\306\307\310\311\310\312 FDF\313\314\315%\207" [ediff-even-diff-face-C 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 "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 (#$ . 40718))
(ediff-hide-face ediff-even-diff-face-Ancestor)
(defconst ediff-even-diff-face-alist '((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"))) "Face for highlighting odd-numbered non-current differences in buffer A." :group 'ediff-highlighting)
#@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 (#$ . 41621))
(byte-code "\301!\210\302\303\304\305\306\307%\207" [ediff-odd-diff-face-A 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"))) "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 (#$ . 42390))
(byte-code "\301!\210\302\303\304\305\306\307%\207" [ediff-odd-diff-face-B 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"))) "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 (#$ . 43157))
(byte-code "\301!\210\302\303\304\305\306\307%\207" [ediff-odd-diff-face-C 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"))) "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 (#$ . 43884))
(ediff-hide-face ediff-odd-diff-face-Ancestor)
(defconst ediff-odd-diff-face-alist '((A . ediff-odd-diff-A) (B . ediff-odd-diff-B) (C . ediff-odd-diff-C) (Ancestor . ediff-odd-diff-Ancestor)))
(defconst ediff-fine-diff-face-alist '((A . ediff-fine-diff-A) (B . ediff-fine-diff-B) (C . ediff-fine-diff-C) (Ancestor . ediff-fine-diff-Ancestor)))
(byte-code "\304\305\306#\210\304 \305\306#\210\304\n\305\306#\210\304 \305\306#\210\307\310\311\"\210\307\312\313\"\207" [ediff-fine-diff-face-A ediff-fine-diff-face-B ediff-fine-diff-face-C ediff-fine-diff-face-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 (#$ . 44936))
(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 (#$ . 45183))
(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 (#$ . 45430))
(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 (#$ . 45677))
(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) "\306S]\307 \203F \310 !\203F \311\310 !!\203F r q\210\nd\fT^W\2035 \312\313\n! \"\314\n!\211\202 \315\306
\316\317\306\320\321 \"B\"#)\202Q \322=\206Q \323!*\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] 10])
#@119 Function to be used to toggle read-only status of the buffer.
If nil, Ediff tries using the command bound to C-x C-q.
(defvar ediff-toggle-read-only-function 'toggle-read-only (#$ . 46533))
#@102 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 '(#$ . 46730) :type 'boolean :group 'ediff)
(defvar ediff-verbose-p t)
(byte-code "\300\301\302\303\304\305\306\307&\210\310\301!\207" [custom-declare-variable ediff-autostore-merges 'group-jobs-only "Save the results of merge jobs automatically.\nWith value nil, don't save automatically. With value t, always\nsave. Anything else means save automatically only if the merge\njob is part of a group of jobs, such as `ediff-merge-directory'\nor `ediff-merge-directory-revisions'." :type (choice (const nil) (const t) (const group-jobs-only)) :group ediff-merge make-variable-buffer-local] 8)
#@2
(defvar ediff-merge-store-file nil (#$ . 47499))
(byte-code "\300\301!\210\302\301\303\304#\210\305\306\307\310\311\312\313\314&\210\305\315\316\317\311\320\313\321&\210\305\322\323\324\311\312\313\321&\210\305\325\326\327\311\330\313\321&\210\305\331\332\333\311\312\313\321&\207" [make-variable-buffer-local ediff-merge-store-file put permanent-local t custom-declare-variable ediff-merge-filename-prefix "merge_" "Prefix to be attached to saved merge buffers." :type string :group ediff-merge ediff-no-emacs-help-in-control-buffer nil "Non-nil means C-h should not invoke Emacs help in control buffer.\nInstead, C-h would jump to previous difference." boolean ediff ediff-temp-file-prefix (file-name-as-directory (cond ((boundp 'temporary-file-directory) temporary-file-directory) ((fboundp 'temp-directory) (temp-directory)) (t "/tmp/"))) "Prefix to put on Ediff temporary file names.\nDo not start with `~/' or `~USERNAME/'." ediff-temp-file-mode 384 "Mode for Ediff temporary files." integer ediff-metachars "[ \n!\"#$&'()*;<=>?[\\^`{|~]" "Regexp that matches characters that must be quoted with `\\' in shell command line.\nThis default should work without changes."] 8)
(defvar ediff-H-glyph nil)
#@2
(defvar ediff-temp-file-A nil (#$ . 48716))
(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 (#$ . 48886))
(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 (#$ . 49056))
(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 (#$ . 49901)])
(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 mapc 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 \205 \306\307\f\310H\")\210 \305\n\"A*J H\310\311I\207" [buf-type ediff-difference-vector-alist alist n diff-record assoc mapc 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*JH\211 \205 \310\311\f\312H\")\210 \n\307 \"A*JH\312\313I*\210\314 \n\307 \"A*JH\211 \205L \310\311\f\312H\")\210 \n\307 \"A*JH\312\313I*\210
\205\223 \315 \n\307 \"A*JH\211 \205\200 \310\311\f\312H\")\210 \n\307 \"A*JH\312\313I*\207" [n buf-type ediff-difference-vector-alist alist diff-record ediff-3way-job A assoc mapc ediff-delete-overlay 1 nil B C] 4])
(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, \307!\310 8\206* A@:\203' A@@\202* A@)\207\311!\2066 9)\203< `\207\312\313!\207" [event position string-match "mouse" format "%S" event-basic-type event-start 5 char-or-string-p error "Error"] 6])
(defalias 'ediff-event-buffer #[(event) "\302\303\304\305\306!\"\")\203 \307\310!\211@)!\207\311!\206# 9)\203) p\207\312\313!\207" [event position string-match "mouse" format "%S" event-basic-type window-buffer event-start char-or-string-p error "Error"] 7])
(defalias 'ediff-event-key #[(event-or-key) "\207" [event-or-key] 1])
(defalias 'ediff-last-command-char #[nil "\301!\207" [last-command-event ediff-event-key] 2])
(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 \305 \306 \205) \n\206( ?\206( \307=\203# \f\310>\206( \311 \312\313#)\207" [frame frame-or-wind do-not-grab-mouse ediff-grab-mouse this-command selected-frame ediff-window-display-p 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 \303A@\302 A@Z! W\205C \303AA\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 (#$ . 55714)])
#@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 (#$ . 56137)])
(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\307\n\310 #]\304O\311 P*\207" [str substr len newlen nil 0 3 - 1 "..."] 7])
(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 ":\205 @\301\235\205 \3028\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 (#$ . 58981)])
(put 'ediff-show-all-diffs '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\302\"\210\303\304!\207" [defalias ediff-with-syntax-table with-syntax-table provide ediff-init] 3)