;ELC ;;; Compiled by rms@psilocin.ai.mit.edu on Wed Jun 24 14:13:07 1998 ;;; from file /gd/gnu/emacs/lisp/ediff-init.el ;;; in Emacs version 20.2.95.4 ;;; with bytecomp version 2.46 ;;; 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 "\304B\305B\306B\307B\310B\311B\312B\313B\314B\315\316 \"\302B\n?\303B\304\207" [current-load-list emacs-version ediff-xemacs-p ediff-emacs-p ediff-metajob-name ediff-meta-buffer pm-color-alist ediff-grab-mouse ediff-mouse-pixel-position ediff-mouse-pixel-threshold ediff-whitespace ediff-multiframe ediff-use-toolbar-p string-match "XEmacs"] 3) #@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 (#$ . 990)) (defalias 'ediff-device-type #[nil "\203 \207\302\303 !\207" [ediff-emacs-p window-system device-type selected-device] 2]) (put 'ediff-device-type 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-window-display-p #[nil "\203 \202\f\302\303 !\205\203 \202\302\303 !\304>?\207" [ediff-emacs-p window-system device-type selected-device (tty pc stream)] 2]) (defalias 'ediff-has-face-support-p #[nil "\304 \206.\206. \203 \203\n\202\305\306 !\307>\207 \205. \203(\n\202,\305\306 !\310>\207" [ediff-force-faces ediff-emacs-p window-system ediff-xemacs-p ediff-window-display-p device-type selected-device (pc) (tty pc)] 2]) (defalias 'ediff-has-toolbar-support-p #[nil "\205\f\301\302!\205\f\303 \207" [ediff-xemacs-p featurep toolbar console-on-window-system-p] 2]) (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\306DD\307\306D\310BBF\207" [var value doc progn defvar make-variable-buffer-local quote put ('permanent-local t)] 6])) #@2  (defvar ediff-buffer-A nil (#$ . 2354)) (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 (#$ . 2517)) (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 (#$ . 2680)) (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 (#$ . 2843)) (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 (#$ . 3020)) (byte-code "\302\303!\210\304\303\305\306#\210\307\300 B\302\207" [ediff-buffer-alist current-load-list make-variable-buffer-local ediff-control-buffer put permanent-local t ((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\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]) (byte-code "\302\303\304\305#\210\306\300 B\302\207" [ediff-difference-vector-alist current-load-list put ediff-get-symbol-from-alist byte-optimizer byte-compile-inline-expand ((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\302E\304BBE\207" [n if ediff-state-of-merge 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-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-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\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])) (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 (#$ . 7195)) (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 (#$ . 7628)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-merge-job put permanent-local t] 4) (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 (#$ . 7995)) (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 (#$ . 8295)) (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 (#$ . 8580)) (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 (#$ . 8879)) (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 (#$ . 9184)) (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 (#$ . 9536)) (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-directory-revisions ediff-merge-directories ediff-merge-directories-with-ancestor 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 "\302\303\304\305#\210\306\307\310\311\312 \313&\210\306\314\310\315\312 \313&\210\306\316\310\317\312 \313&\207" [:prefix :group 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" "ediff-" ediff ediff-merge "Merging utilities" ediff-hook "Hooks called by Ediff"] 8) #@167 *Hooks to run before Ediff sets its window configuration. This 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-windows-hook 'nil '(#$ . -12834) :type 'hook :group 'ediff-hook) #@129 *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 '(#$ . -13117) :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 '(#$ . -13361) :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 '(#$ . -13640) :type 'hook :group 'ediff-hook) #@66 *Hooks to run in the control buffer after Ediff has been set up. (custom-declare-variable 'ediff-startup-hook 'nil '(#$ . -13882) :type 'hook :group 'ediff-hook) #@53 *Hooks to run after a difference has been selected. (custom-declare-variable 'ediff-select-hook 'nil '(#$ . -14050) :type 'hook :group 'ediff-hook) #@55 *Hooks to run after a difference has been unselected. (custom-declare-variable 'ediff-unselect-hook 'nil '(#$ . -14204) :type 'hook :group 'ediff-hook) #@53 *Hooks called after buffers A, B, and C are set up. (custom-declare-variable 'ediff-prepare-buffer-hook 'nil '(#$ . -14362) :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 '(#$ . -14524) :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 '(#$ . -14691) :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 '(#$ . -14993) :type 'hook :group 'ediff-hook) #@46 *Hooks run after preparing the help message. (custom-declare-variable 'ediff-display-help-hook 'nil '(#$ . -15171) :type 'hook :group 'ediff-hook) #@68 *Hooks to run in the Ediff control buffer when Ediff is suspended. (custom-declare-variable 'ediff-suspend-hook '(list 'ediff-default-suspend-function) '(#$ . -15324) :type 'hook :group 'ediff-hook) #@66 *Hooks to run in the Ediff control buffer after finishing Ediff. (custom-declare-variable 'ediff-quit-hook '(list 'ediff-cleanup-mess) '(#$ . -15529) :type 'hook :group 'ediff-hook) #@220 *Hooks to run on exiting Ediff but before killing the control buffer. This is a place to do various cleanups, such as deleting the variant buffers. Ediff provides a function, `ediff-janitor', as one such possible hook. (custom-declare-variable 'ediff-cleanup-hook 'nil '(#$ . -15718) :type 'hook :group 'ediff-hook) (byte-code "\306\300 B\307\302 B\310\303 B\311\312\f\203\313\202\314\"\305 B\300\207" [ediff-KILLED-VITAL-BUFFER current-load-list ediff-NO-DIFFERENCES ediff-BAD-DIFF-NUMBER ediff-xemacs-p ediff-BAD-INFO "You have killed a vital Ediff buffer---you must leave Ediff now!" "Sorry, comparison of identical variants is not what I am made for..." "%S: Bad diff region number, %d. Valid numbers are 1 to %d" 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" ""] 3) #@279 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 (#$ . 16653)) (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 (#$ . 17148)) (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 (#$ . 17503)) (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 "" (#$ . 17876)) (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 "" (#$ . 18051)) (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 "" (#$ . 18226)) (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 (#$ . 18401)) (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 "" (#$ . 18596)) (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 "" (#$ . 18769)) (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 "" (#$ . 18942)) (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 (#$ . 19115)) (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 (#$ . 19308)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-killed-diffs-alist 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 ediff-xemacs-p (make-glyph "->>") "->>") '(#$ . -19493) :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 ediff-xemacs-p (make-glyph "<<-") "<<-") '(#$ . -19780) :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 ediff-xemacs-p (make-glyph "->>") "->>") '(#$ . -20050) :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 ediff-xemacs-p (make-glyph "<<-") "<<-") '(#$ . -20327) :type 'string :tag "Region after-flag in the middle of line" :group 'ediff) #@2  (defvar ediff-use-faces t (#$ . 20598)) (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 '(#$ . 20764) :type 'boolean :group 'ediff-highlighting) #@2  (defvar ediff-word-mode nil (#$ . 21118)) (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 (#$ . 21284)) (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 (#$ . 21448)) (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 (#$ . 21622)) (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 (#$ . 21792)) (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 (#$ . 21969)) (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 (#$ . -22218)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-quit-widened put permanent-local t] 4) #@219 *Nil means that non-modified variant buffers should be removed at the end of the session after some interrogation. Supplying a prefix argument to the quit command `q' temporarily reverses the meaning of this variable. (custom-declare-variable 'ediff-keep-variants 't '(#$ . -22521) :type 'boolean :group 'ediff) #@2  (defvar ediff-highlight-all-diffs t (#$ . 22838)) (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 '(#$ . 23024) :type 'boolean :group 'ediff-highlighting) #@2  (defvar ediff-highlighting-style nil (#$ . 23300)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-highlighting-style put permanent-local t] 4) #@2  (defvar ediff-control-buffer-suffix nil (#$ . 23484)) (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 (#$ . 23674)) (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 (#$ . 23864)) (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 (#$ . 24052)) (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 (#$ . 24240)) (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 (#$ . 24428)) (byte-code "\303\304!\210\305\304\306\307#\210\310\300 B\311\302 B\303\207" [ediff-buffer-values-orig-alist current-load-list ediff-protected-variables make-variable-buffer-local ediff-buffer-values-orig-Ancestor put permanent-local t ((A . ediff-buffer-values-orig-A) (B . ediff-buffer-values-orig-B) (C . ediff-buffer-values-orig-C) (Ancestor . ediff-buffer-values-orig-Ancestor)) (mode-line-format)] 4) #@2  (defvar ediff-difference-vector-A nil (#$ . 24904)) (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 (#$ . 25090)) (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 (#$ . 25276)) (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 (#$ . 25462)) (byte-code "\302\303!\210\304\303\305\306#\210\307\300 B\302\207" [ediff-difference-vector-alist current-load-list make-variable-buffer-local ediff-difference-vector-Ancestor put permanent-local t ((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 (#$ . 25874)) (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 (#$ . 26050)) (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 (#$ . 26233)) (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 (#$ . 26423)) (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 (#$ . 26593)) (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 (#$ . 26777)) (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*" (#$ . 26957)) #@2  (defconst ediff-msg-buffer " *ediff-message*" (#$ . 27019)) #@2  (defvar ediff-error-buffer nil (#$ . 27085)) (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*" (#$ . 27257)) (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 (#$ . 27441)) (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 (#$ . 27641)) #@2  (defvar ediff-shadow-overlay-priority 100 (#$ . 27698)) #@330 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 '(#$ . 27762) :type 'symbol :group 'ediff) (byte-code "\203\301\302KM\210\303\304KM\210\305\306KM\210\307\310KM\210\202/\301\311KM\210\303\312KM\210\305\313KM\210\307\314KM\210\301\207" [ediff-xemacs-p ediff-read-event next-command-event ediff-overlayp extentp ediff-make-overlay make-extent ediff-delete-overlay delete-extent read-event overlayp make-overlay delete-overlay] 2) (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\\ \"\204MU\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]) (byte-code "\302 \203*\203 \202\303\304 !\305=\203*\306\307KM\210\310\311KM\210\312\313KM\210\314\315KM\210\302\207" [ediff-emacs-p window-system ediff-window-display-p device-type selected-device ns x-display-color-p ns-display-color-p x-color-defined-p ns-color-defined-p x-display-pixel-height ns-display-pixel-height x-display-pixel-width ns-display-pixel-width] 2) (defalias 'ediff-color-display-p #[nil "\203\301 \207\302\303 !\304=\207" [ediff-emacs-p x-display-color-p device-class selected-device color] 2]) (byte-code "\306\307\310\311#\210\312 \203>\203\313\314KM\210\315\316KM\210\202> \203$\n\202(\317\320 !\321=\2034\313\322M\210\2029\313\323KM\210\315\324KM\210\325 \203^\203T\326\327KM\210\330\331KM\210\202^\326\332KM\210\330\333KM\210\334\303\fB\335\305\fB\306\207" [ediff-xemacs-p ediff-emacs-p window-system ediff-current-diff-overlay-alist current-load-list ediff-current-diff-face-alist put ediff-color-display-p byte-optimizer byte-compile-inline-expand ediff-has-face-support-p ediff-valid-color-p valid-color-name-p ediff-get-face get-face device-type selected-device pm #[(color) "\302 \"\207" [color pm-color-alist assoc] 3] x-color-defined-p internal-get-face ediff-window-display-p ediff-display-pixel-width device-pixel-width ediff-display-pixel-height device-pixel-height x-display-pixel-width x-display-pixel-height ((A . ediff-current-diff-overlay-A) (B . ediff-current-diff-overlay-B) (C . ediff-current-diff-overlay-C) (Ancestor . ediff-current-diff-overlay-Ancestor)) ((A . ediff-current-diff-face-A) (B . ediff-current-diff-face-B) (C . ediff-current-diff-face-C) (Ancestor . ediff-current-diff-face-Ancestor))] 4) (defalias 'ediff-make-current-diff-overlay #[(type) "\306 \205d \307 \n\"A*\310=\203\f\2026\311=\203# \2026\312=\203.\2026\313=\2056\314\307 \n\"A*J!\211\315dd#L\210\316J\"\210\317J\320#+\207" [type ediff-current-diff-overlay-alist alist buf-type ediff-buffer-A ediff-buffer-B ediff-has-face-support-p assoc A B C Ancestor face-name ediff-make-bullet-proof-overlay ediff-set-overlay-face ediff-overlay-put ediff ediff-buffer-C ediff-ancestor-buffer ediff-current-diff-face-alist face buffer overlay ediff-control-buffer] 7]) (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) "\305\306\"\305\303\"\305\307\"\310 \205 \311N\f\203)\n\203)\312\313\nT\"\202: \206:\n\2039\312\314\nT\"\202:\315,\207" [extent face-help diff-num face is-current ediff-overlay-get ediff ediff-diff-num nil 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) "\301 \205\203\302 \202\303\304 !\305=?\205\306\307\310\217\207" [ediff-emacs-p ediff-window-display-p x-display-color-p device-class selected-device color 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 (#$ . 31826)]) (defalias 'ediff-hide-face #[(face) "\302 \205 \205 \303\304 \"\207" [ediff-emacs-p face ediff-has-face-support-p add-to-list facemenu-unlisted-faces] 3]) (custom-declare-face 'ediff-current-diff-face-A '((((class color)) (:foreground "firebrick" :background "pale green")) (t (:inverse-video t))) "Face for highlighting the selected difference in buffer A." :group 'ediff-highlighting) #@217 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-face-A' this variable represents. (defvar ediff-current-diff-face-A 'ediff-current-diff-face-A (#$ . 32673)) (byte-code "\303\304!\210\203$\305 \203$ \203\306 \202\307\310 !\311=\204$\312\313\304\"\210\314\315\316\317\n\320%\207" [ediff-xemacs-p ediff-emacs-p :group ediff-hide-face ediff-current-diff-face-A ediff-has-face-support-p x-display-color-p device-class selected-device color copy-face modeline custom-declare-face ediff-current-diff-face-B ((((class color)) (:foreground "DarkOrchid" :background "Yellow")) (t (:inverse-video t))) "Face for highlighting the selected difference in buffer B." ediff-highlighting] 6) #@197 Face for highlighting the selected difference in buffer B. this variable. Instead, use the customization widget to customize the actual face `ediff-current-diff-face-B' this variable represents. (defvar ediff-current-diff-face-B 'ediff-current-diff-face-B (#$ . 33497)) (byte-code "\303\304!\210\203$\305 \203$ \203\306 \202\307\310 !\311=\204$\312\313\304\"\210\314\315\316\317\n\320%\207" [ediff-xemacs-p ediff-emacs-p :group ediff-hide-face ediff-current-diff-face-B ediff-has-face-support-p x-display-color-p device-class selected-device color copy-face modeline custom-declare-face ediff-current-diff-face-C ((((class color)) (:foreground "Navy" :background "Pink")) (t (:inverse-video t))) "Face for highlighting the selected difference in buffer C." ediff-highlighting] 6) #@217 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-face-C' this variable represents. (defvar ediff-current-diff-face-C 'ediff-current-diff-face-C (#$ . 34293)) (byte-code "\303\304!\210\203$\305 \203$ \203\306 \202\307\310 !\311=\204$\312\313\304\"\210\314\315\316\317\n\320%\207" [ediff-xemacs-p ediff-emacs-p :group ediff-hide-face ediff-current-diff-face-C ediff-has-face-support-p x-display-color-p device-class selected-device color copy-face modeline custom-declare-face ediff-current-diff-face-Ancestor ((((class color)) (:foreground "Black" :background "VioletRed")) (t (:inverse-video t))) "Face for highlighting the selected difference in buffer Ancestor." ediff-highlighting] 6) #@231 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-face-Ancestor' this variable represents. (defvar ediff-current-diff-face-Ancestor 'ediff-current-diff-face-Ancestor (#$ . 35129)) (byte-code "\303\304!\210\203$\305 \203$ \203\306 \202\307\310 !\311=\204$\312\313\304\"\210\314\315\316\317\n\320%\207" [ediff-xemacs-p ediff-emacs-p :group ediff-hide-face ediff-current-diff-face-Ancestor ediff-has-face-support-p x-display-color-p device-class selected-device color copy-face modeline custom-declare-face ediff-fine-diff-face-A ((((class color)) (:foreground "Navy" :background "sky blue")) (t (:underline t :stipple "gray3"))) "Face for highlighting the refinement of the selected diff in buffer A." ediff-highlighting] 6) #@211 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-face-A' this variable represents. (defvar ediff-fine-diff-face-A 'ediff-fine-diff-face-A (#$ . 36006)) (byte-code "\301\302!\210\303\304\305\306\307%\207" [:group ediff-hide-face ediff-fine-diff-face-A custom-declare-face ediff-fine-diff-face-B ((((class color)) (:foreground "Black" :background "cyan")) (t (:underline t :stipple "gray3"))) "Face for highlighting the refinement of the selected diff in buffer B." ediff-highlighting] 6) #@211 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-face-B' this variable represents. (defvar ediff-fine-diff-face-B 'ediff-fine-diff-face-B (#$ . 36628)) (byte-code "\301\302!\210\303\304\305\306\307%\207" [:group ediff-hide-face ediff-fine-diff-face-B custom-declare-face ediff-fine-diff-face-C ((((class color)) (:foreground "Black" :background "Turquoise")) (t (:underline t :stipple "gray3"))) "Face for highlighting the refinement of the selected diff in buffer C." ediff-highlighting] 6) #@211 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-face-C' this variable represents. (defvar ediff-fine-diff-face-C 'ediff-fine-diff-face-C (#$ . 37255)) (byte-code "\301\302!\210\303\304\305\306\307%\207" [:group ediff-hide-face ediff-fine-diff-face-C custom-declare-face ediff-fine-diff-face-Ancestor ((((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." ediff-highlighting] 6) #@225 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-face-Ancestor' this variable represents. (defvar ediff-fine-diff-face-Ancestor 'ediff-fine-diff-face-Ancestor (#$ . 37994)) (byte-code "\301\302!\210\303\304\305\306\307%\207" [:group ediff-hide-face ediff-fine-diff-face-Ancestor custom-declare-face ediff-even-diff-face-A ((((class color)) (:foreground "Black" :background "light grey")) (t (:italic t :stipple "Stipple"))) "Face for highlighting even-numbered non-current differences in buffer A." ediff-highlighting] 6) #@228 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-face-A' this variable represents. (defvar ediff-even-diff-face-A 'ediff-even-diff-face-A (#$ . 38658)) (byte-code "\301\302!\210\303\304\305\306\307%\207" [:group ediff-hide-face ediff-even-diff-face-A custom-declare-face ediff-even-diff-face-B ((((class color)) (:foreground "White" :background "Grey")) (t (:italic t :stipple "Stipple"))) "Face for highlighting even-numbered non-current differences in buffer B." ediff-highlighting] 6) #@228 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-face-B' this variable represents. (defvar ediff-even-diff-face-B 'ediff-even-diff-face-B (#$ . 39298)) (byte-code "\301\302!\210\303\304\305\306\307%\207" [:group ediff-hide-face ediff-even-diff-face-B custom-declare-face ediff-even-diff-face-C ((((class color)) (:foreground "Black" :background "light grey")) (t (:italic t :stipple "Stipple"))) "Face for highlighting even-numbered non-current differences in buffer C." ediff-highlighting] 6) #@228 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-face-C' this variable represents. (defvar ediff-even-diff-face-C 'ediff-even-diff-face-C (#$ . 39944)) (byte-code "\301\302!\210\303\304\305\306\307%\207" [:group ediff-hide-face ediff-even-diff-face-C custom-declare-face ediff-even-diff-face-Ancestor ((((class color)) (:foreground "White" :background "Grey")) (t (:italic t :stipple "Stipple"))) "Face for highlighting even-numbered non-current differences in the ancestor buffer." ediff-highlighting] 6) #@242 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-face-Ancestor' this variable represents. (defvar ediff-even-diff-face-Ancestor 'ediff-even-diff-face-Ancestor (#$ . 40602)) (byte-code "\303\304!\210\305\300 B\306\307\310\311\n\312%\207" [ediff-even-diff-face-alist current-load-list :group ediff-hide-face ediff-even-diff-face-Ancestor ((A . ediff-even-diff-face-A) (B . ediff-even-diff-face-B) (C . ediff-even-diff-face-C) (Ancestor . ediff-even-diff-face-Ancestor)) custom-declare-face ediff-odd-diff-face-A ((((class color)) (:foreground "White" :background "Grey")) (t (:italic t :stipple "gray1"))) "Face for highlighting odd-numbered non-current differences in buffer A." ediff-highlighting] 6) #@226 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-face-A' this variable represents. (defvar ediff-odd-diff-face-A 'ediff-odd-diff-face-A (#$ . 41463)) (byte-code "\301\302!\210\303\304\305\306\307%\207" [:group ediff-hide-face ediff-odd-diff-face-A custom-declare-face ediff-odd-diff-face-B ((((class color)) (:foreground "Black" :background "light grey")) (t (:italic t :stipple "gray1"))) "Face for highlighting odd-numbered non-current differences in buffer B." ediff-highlighting] 6) #@226 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-face-B' this variable represents. (defvar ediff-odd-diff-face-B 'ediff-odd-diff-face-B (#$ . 42100)) (byte-code "\301\302!\210\303\304\305\306\307%\207" [:group ediff-hide-face ediff-odd-diff-face-B custom-declare-face ediff-odd-diff-face-C ((((class color)) (:foreground "White" :background "Grey")) (t (:italic t :stipple "gray1"))) "Face for highlighting odd-numbered non-current differences in buffer C." ediff-highlighting] 6) #@226 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-face-C' this variable represents. (defvar ediff-odd-diff-face-C 'ediff-odd-diff-face-C (#$ . 42731)) (byte-code "\301\302!\210\303\304\305\306\307%\207" [:group ediff-hide-face ediff-odd-diff-face-C custom-declare-face ediff-odd-diff-face-Ancestor ((((class color)) (:foreground "Black" :background "light grey")) (t (:italic t :stipple "gray1"))) "Face for highlighting odd-numbered non-current differences in the ancestor buffer." ediff-highlighting] 6) #@240 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-face-Ancestor' this variable represents. (defvar ediff-odd-diff-face-Ancestor 'ediff-odd-diff-face-Ancestor (#$ . 43386)) (byte-code "\303\304!\210\305\300 B\306\302 B\307\310\311\312#\210\307\313\311\312#\210\307\314\311\312#\210\307\315\311\312#\207" [ediff-odd-diff-face-alist current-load-list ediff-fine-diff-face-alist ediff-hide-face ediff-odd-diff-face-Ancestor ((A . ediff-odd-diff-face-A) (B . ediff-odd-diff-face-B) (C . ediff-odd-diff-face-C) (Ancestor . ediff-odd-diff-face-Ancestor)) ((A . ediff-fine-diff-face-A) (B . ediff-fine-diff-face-B) (C . ediff-fine-diff-face-C) (Ancestor . ediff-fine-diff-face-Ancestor)) put ediff-fine-diff-face-A ediff-help-echo "A `refinement' of the current difference region" ediff-fine-diff-face-B ediff-fine-diff-face-C ediff-fine-diff-face-Ancestor] 4) #@56 Overlay for the current difference region in buffer A. (defvar ediff-current-diff-overlay-A nil (#$ . 44397)) (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 (#$ . 44644)) (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 (#$ . 44891)) (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 (#$ . 45138)) (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 \203\fT\202V \203K\310 !\203K\311\310 !!\203Kr q\210\ndT^W\203?\312\313\n! \"\314\n!\211\202'\315\316\317\320 \"\"T)\202V\321=\206V\322!*\207" [start ovr-list pos ediff-xemacs-p ediff-shadow-overlay-priority buffer 1 nil get-buffer buffer-name append overlays-at next-overlay-change apply + mapcar #[(ovr) "\203 \301\302\"\206\303\207\303\207" [ovr ediff-overlay-get priority 0] 3] ediff-quit error end this-command ediff-KILLED-VITAL-BUFFER] 6]) #@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 (#$ . -45951)) #@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 '(#$ . -46290) :type 'boolean :group 'ediff) (byte-code "\302\300 B\302\207" [ediff-verbose-p current-load-list t] 2) #@272 *Save the results of merge jobs automatically. Nil means don't save automatically. t means always save. Anything but nil or t 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 '(#$ . -46589) :type '(choice (const nil) (const t) (other :tag "group-jobs-only" group-jobs-only)) :group 'ediff-merge) (make-variable-buffer-local 'ediff-autostore-merges) #@2  (defvar ediff-merge-store-file nil (#$ . 47106)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-merge-store-file put permanent-local t] 4) #@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 '(#$ . -47288) :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 temporary-file-directory) '(#$ . -47523) :type 'string :group 'ediff) #@34 *Mode for Ediff temporary files. (custom-declare-variable 'ediff-temp-file-mode '384 '(#$ . -47759) :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!\"#$&'()*;<=>?[\\^`{|~]" '(#$ . 47896) :type 'string :group 'ediff) (byte-code "\303\301!\204\205 \304\305!\301\nB\303\207" [ediff-xemacs-p ediff-H-glyph current-load-list boundp make-glyph "H"] 2) #@2  (defvar ediff-temp-file-A nil (#$ . 48280)) (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 (#$ . 48450)) (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 (#$ . 48620)) (byte-code "\300\301!\210\302\301\303\304#\210\305\306!\204\306\307M\210\300\207" [make-variable-buffer-local ediff-temp-file-C put permanent-local t fboundp ediff-file-remote-p #[(file-name) "\301\302!\203\f\303!\202\304\305!\203\305!\202\306\307!\210\310!@\207" [file-name featurep efs-auto efs-ftp-path fboundp file-remote-p require ange-ftp ange-ftp-ftp-name] 2]] 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!\206 \203\303!\202\304 \211\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 (#$ . 49480)]) (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-highlight-diff-in-one-buffer #[(n buf-type) "\306=\203\n \202%\307=\203\n\202%\310=\203 \202%\311=\205M\f\205M\312\306=\2033 \202N\307=\203=\n\202N\310=\203G \202N\311=\205N\f!\205M\313\312\306=\203^ \202y\307=\203h\n\202y\310=\203r \202y\311=\205y\f!!\205M\306=\203\210 \202\243\307=\203\222\n\202\243\310=\203\234 \202\243\311=\205\243\f\211\203\277\312 !\203\277\313\312 !!\203\277r q\210d)\202\312\314=\206\312\315!\316\317#\316\320#\232\203\350\321\202\351\322  \\^!\"#\323#\"A*J$%\203\324$!#\210\202 \324$! $\210\325$\326\327! ##\210\325$\330#\210\331&#\323#\"A*JH\322H\332\".\207" [buf-type ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer buff A B C Ancestor get-buffer buffer-name ediff-quit error ediff-get-diff-posn beg end 1 0 assoc ediff-move-overlay ediff-overlay-put priority ediff-highest-priority ediff-diff-num ediff-set-overlay-face nil this-command ediff-KILLED-VITAL-BUFFER last n begin xtra end-hilit ediff-current-diff-overlay-alist alist current-diff-overlay ediff-xemacs-p ediff-difference-vector-alist] 8]) (defalias 'ediff-unhighlight-diff-in-one-buffer #[(buf-type) "\306=\203\n \202%\307=\203\n\202%\310=\203 \202%\311=\205\337\f\205\337\312\306=\2033 \202N\307=\203=\n\202N\310=\203G \202N\311=\205N\f!\205\337\313\312\306=\203^ \202y\307=\203h\n\202y\310=\203r \202y\311=\205y\f!!\205\337 \314\"A*J\314\"A*JH\315H\316\317\211#\210\320\321 \205\335\205\335\205\335\211\322\317\"\317=\203\321\202\323\314\"A,\"*\207" [buf-type ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer ediff-current-diff-overlay-alist A B C Ancestor get-buffer buffer-name assoc 0 ediff-move-overlay 1 ediff-set-overlay-face ediff-has-face-support-p logand alist ediff-difference-vector-alist ediff-current-difference overlay current-diff-overlay ediff-use-faces ediff-highlight-all-diffs dif-num ediff-even-diff-face-alist ediff-odd-diff-face-alist] 7]) (defalias 'ediff-unhighlight-diffs-totally-in-one-buffer #[(buf-type) "\306\307!\210\310 \2052\2052\311\n \312\n\f\"A*\211J\313\314!\210\315!\203.\316!\210 \317L+\207" [ediff-use-faces inhibit-quit buf-type ediff-current-diff-overlay-alist alist current-diff-overlay-var ediff-unselect-and-select-difference -1 ediff-has-face-support-p t assoc ediff-paint-background-regions unhighlight ediff-overlayp ediff-delete-overlay nil current-diff-overlay] 4]) #@51 Put face on diff N. Invoked for X displays only. (defalias 'ediff-highlight-diff #[(n) "\301\302\"\210\301\303\"\210\301\304\"\210\301\305\"\207" [n ediff-highlight-diff-in-one-buffer A B C Ancestor] 3 (#$ . 53382)]) (put 'ediff-highlight-diff 'byte-optimizer 'byte-compile-inline-expand) #@43 Remove overlays from buffers A, B, and C. (defalias 'ediff-unhighlight-diff #[nil "\300\301!\210\300\302!\210\300\303!\210\300\304!\207" [ediff-unhighlight-diff-in-one-buffer A B C Ancestor] 2 (#$ . 53682)]) (put 'ediff-unhighlight-diff 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-unhighlight-diffs-totally #[nil "\300\301!\210\300\302!\210\300\303!\210\300\304!\207" [ediff-unhighlight-diffs-totally-in-one-buffer A B C Ancestor] 2]) (put 'ediff-unhighlight-diffs-totally 'byte-optimizer 'byte-compile-inline-expand) (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*JH\211\203\310\311\f\312H\"\210) \n\307 \"A*JH\312\313I\210*\314 \n\307 \"A*JH\211\203M\310\311\f\312H\"\210) \n\307 \"A*JH\312\313I\210* \205\223\315 \n\307 \"A*JH\211\203\201\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 mapcar ediff-delete-overlay 1 nil B C] 5]) (put 'ediff-clear-fine-differences 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-convert-fine-diffs-to-overlays #[(diff-list region-num) "\303\304 #\210\303\305 #\210\n\205\303\306 #\207" [diff-list region-num ediff-3way-job ediff-set-fine-overlays-in-one-buffer A B C] 4]) (put 'ediff-convert-fine-diffs-to-overlays 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-mouse-event-p #[(event) "\203\302 !\207\303\304\305\306\307 !\"\"\207" [ediff-xemacs-p event button-event-p 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) "\203\302 !\207\303 !\206 9\207" [ediff-xemacs-p event key-press-event-p char-or-string-p] 2]) (put 'ediff-key-press-event-p 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-event-point #[(event) " \203\f\303!\202\304\305\306\307\310!\"\")\203; \203!\311!\207\211A@)\211A@:\2036\nA@@\2029\nA@)\207 \203G\312!\202O\313!\206O9)\203U`\207\314 \207" [event ediff-xemacs-p position button-event-p string-match "mouse" format "%S" event-basic-type event-point key-press-event-p char-or-string-p error] 7]) (defalias 'ediff-event-buffer #[(event) " \203\f\303!\202\304\305\306\307\310!\"\")\203. \203!\311!\207\312\211A@)\211@)!\207 \203:\313!\202B\314!\206B9)\203Hp\207\315 \207" [event ediff-xemacs-p position button-event-p string-match "mouse" format "%S" event-basic-type event-buffer window-buffer key-press-event-p char-or-string-p error] 7]) (defalias 'ediff-frame-iconified-p #[(frame) "\302 \205\303!\205 \203\304!\207\305!\306=\207" [frame ediff-xemacs-p ediff-window-display-p frame-live-p frame-iconified-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) "\203\f\302 !\303 !\245\207\304 !\207" [ediff-xemacs-p frame frame-pixel-width frame-width frame-char-width] 3]) (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 @=?\206FA@\203E\302 A@\203EAA\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) "\203 \303 \304\n!\"\207\305\n!\207" [ediff-xemacs-p ediff-H-glyph frame glyph-height selected-window frame-char-height] 4]) (put 'ediff-frame-char-height 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-overlay-start #[(overl) "\302!\205 \203\303!\207\304!\207" [overl ediff-emacs-p ediff-overlayp overlay-start extent-start-position] 2]) (put 'ediff-overlay-start 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-overlay-end #[(overl) "\302!\205 \203\303!\207\304!\207" [overl ediff-emacs-p ediff-overlayp overlay-end extent-end-position] 2]) (put 'ediff-overlay-end 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-empty-overlay-p #[(overl) "\302!\205 \203\303!\202\304!)\302!\205+ \203(\305!\202+\306!)U\207" [overl ediff-emacs-p ediff-overlayp overlay-start extent-start-position overlay-end extent-end-position] 3]) (put 'ediff-empty-overlay-p 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-overlay-buffer #[(overl) "\203\302 !\207\303 !\205\304 !\207" [ediff-emacs-p overl overlay-buffer extent-live-p extent-object] 2]) (defalias 'ediff-overlay-get #[(overl property) "\203 \303 \n\"\207\304 !\205\305 \n\"\207" [ediff-emacs-p overl property overlay-get extent-live-p extent-property] 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\306!\211\203/\307 !\203/\310\307 !!\203/\n\203&\311 \f#\2026\312 \f $\2026\2056\313!)\207" [overlay buf ediff-xemacs-p beg end buffer ediff-overlay-buffer get-buffer buffer-name set-extent-endpoints move-overlay ediff-delete-overlay] 6 (#$ . 59750)]) #@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) "\304!\203(\305\304!!\203(\306\305\304!!!\203( \203\"\307\n #\207\310\n #\207\311!\207" [overlay ediff-xemacs-p prop value ediff-overlay-buffer get-buffer buffer-name set-extent-property overlay-put ediff-delete-overlay] 4 (#$ . 60231)]) (defalias 'ediff-empty-diff-region-p #[(n buf-type) "\303=\203 ?\206\"\304\303\305\n#\304\303\306\n#U\207\304\305\n#\304\306\n#U\207" [buf-type ediff-3way-comparison-job n C ediff-get-diff-posn beg end] 5]) (defalias 'ediff-whitespace-diff-region-p #[(n buf-type) "\306=\203 ?\206\354\307\n\"\206\354\310\304\n#\310\303\n#\311=\203( \202F\312=\2033\202F\306=\203>\202F\313=\203\340\203\340\314\311=\203T \202r\312=\203_\202r\306=\203j\202r\313=\205r!\203\340\315\314\311=\203\202 \202\240\312=\203\215\202\240\306=\203\230\202\240\313=\205\240!!\203\340r\311=\203\260 \202\316\312=\203\273\202\316\306=\203\306\202\316\313=\205\316q\210\212\fb\210\316w\210` Y*\202\353\317=\206\353\320!*\207" [buf-type ediff-3way-job n end beg ediff-buffer-A C ediff-empty-diff-region-p ediff-get-diff-posn A B Ancestor get-buffer buffer-name nil ediff-quit error ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer ediff-whitespace this-command ediff-KILLED-VITAL-BUFFER] 5]) (defalias 'ediff-abbreviate-file-name #[(file &optional dir) ";\203\304BC\305\n!)\207 \203\305\n!\207\305\n\306\"\207" [dir directory-abbrev-alist file ediff-emacs-p "" abbreviate-file-name t] 3]) (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-abbrev-jobname #[(jobname) "\304=\203\305\207\306=\203\307\207\310=\203\311\207\312=\203 \313\207\314=\203(\315\207\316=\2030\317\207\320=\2038\321\207\322=\203@\323\207\324=\203H\325\207\326=\203P\327\207\330!\331\332O\211G\333\333\nW\203\204 \333U\203p H\226I\210 H\334U\203} \335I\210 T\211\202] +\207" [jobname str len pos 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" symbol-name 6 nil 0 45 32] 5]) (defalias 'ediff-get-region-contents #[(n buf-type ctrl-buf &optional start end) "\203?\306!\203?\307\306!!\203?rq\210 \310=\203 \n\202; \311=\203* \202; \312=\2034\f\202; \313=\205; )\202J\314=\204M\315!\203U\306\203\215\306!\203\215\307\306!!\203\215rq\210 \310=\203n\n\202\211 \311=\203x \202\211 \312=\203\202\f\202\211 \313=\205\211 )\202\230\314=\206\230\315!!\203U\307\306\203\335\306!\203\335\307\306!!\203\335rq\210 \310=\203\276\n\202\331 \311=\203\310 \202\331 \312=\203\322\f\202\331 \313=\205\331 )\202\350\314=\206\350\315!!!\203Ur\203-\306!\203-\307\306!!\203-rq\210 \310=\203\n\202) \311=\203 \202) \312=\203\"\f\202) \313=\205) )\2028\314=\2068\315!q\210\206F\316 \317$\206R\316 \320${)\207\314=\206`\315!\207" [ctrl-buf buf-type ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer get-buffer buffer-name A B C Ancestor ediff-quit error ediff-get-diff-posn beg end this-command ediff-KILLED-VITAL-BUFFER start n] 6]) (put 'ediff-get-region-contents 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-strip-mode-line-format #[nil "@\301\235\205\f\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 (#$ . 64811)]) (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\303\207 \304!8\207" [filename attr-number ediff-file-remote-p -1 file-attributes] 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]) (provide 'ediff-init)