;ELC ;;; compiled by kwzh@nutrimat.gnu.ai.mit.edu on Thu Jun 15 16:31:07 1995 ;;; from file /gd/gnu/emacs/19.0/lisp/ediff-init.el ;;; emacs version 19.28.94.2. ;;; bytecomp version FSF 2.10 ;;; optimization is on. ;;; this file uses opcodes which do not exist in Emacs 18. (if (and (boundp 'emacs-version) (or (and (boundp 'epoch::version) epoch::version) (string-lessp emacs-version "19.28.90"))) (error "`ediff-init.el' was compiled for Emacs 19.29 or later")) (byte-code "\n\"\fB ?\fB" [string-match "\\(Lucid\\|Xemacs\\)" emacs-version ediff-xemacs-p current-load-list ediff-emacs-p] 3) (defalias 'ediff-device-type #[nil " !" [ediff-emacs-p window-system device-type selected-device] 2]) (put (quote ediff-device-type) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-window-display-p #[nil " \f !  !>?" [ediff-emacs-p window-system device-type selected-device (tty stream)] 2]) (put (quote ediff-window-display-p) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-odd-p '(macro . #[(arg) "\nBBBB" [eq logand arg (1) (1)] 4])) (defalias 'ediff-buffer-live-p '(macro . #[(buf) " D DDF" [and buf get-buffer buffer-name] 6])) (defalias 'ediff-get-buffer '(macro . #[(arg) "\nBBB\nBBB\nBBBF" [cond eq arg ((quote A)) (ediff-buffer-A) ((quote B)) (ediff-buffer-B) ((quote C)) (ediff-buffer-C)] 6])) (defalias 'ediff-get-value-according-to-buffer-type '(macro . #[(buf-type list) "\nBBED\nBBED\nBBEDF" [cond eq buf-type ((quote A)) nth 0 list ((quote B)) 1 ((quote C)) 2] 7])) (defalias 'ediff-char-to-buftype '(macro . #[(arg) "\nBBB\nBBB\nBBBF" [cond memq arg ((quote (97 65))) ((quote A)) ((quote (98 66))) ((quote B)) ((quote (99 67))) ((quote C))] 6])) (defalias 'ediff-get-difference '(macro . #[(n buf-type) " EDDE" [aref symbol-value intern format "ediff-difference-vector-%S" buf-type n] 6])) (defalias 'ediff-no-fine-diffs-p '(macro . #[(n) "\nBBBB" [aref ediff-get-difference n ((quote A)) (2)] 4])) (defalias 'ediff-get-diff-overlay-from-diff-record '(macro . #[(diff-rec) " BB" [aref diff-rec (0)] 3])) (defalias 'ediff-get-diff-overlay '(macro . #[(n buf-type) "\n ED" [ediff-get-diff-overlay-from-diff-record ediff-get-difference n buf-type] 4])) (defalias 'ediff-get-fine-diff-vector-from-diff-record '(macro . #[(diff-rec) " BB" [aref diff-rec (1)] 3])) (defalias 'ediff-set-fine-diff-vector '(macro . #[(n buf-type fine-vec) "\n E F" [aset ediff-get-difference n buf-type 1 fine-vec] 4])) (defalias 'ediff-get-state-of-diff '(macro . #[(n buf-type) "\f EBBE" [if (ediff-buffer-live-p ediff-buffer-C) aref ediff-get-difference n buf-type (3)] 6])) (defalias 'ediff-set-state-of-diff '(macro . #[(n buf-type val) "\n E F" [aset ediff-get-difference n buf-type 3 val] 4])) (defalias 'ediff-get-state-of-merge '(macro . #[(n) "\fBBBBE" [if (ediff-buffer-live-p ediff-buffer-C) aref ediff-get-difference n ((quote C)) (4)] 6])) (defalias 'ediff-set-state-of-merge '(macro . #[(n val) "\nBB F" [aset ediff-get-difference n ((quote C)) 4 val] 4])) (defalias 'ediff-mark-diff-as-space-only '(macro . #[(n flag) "\nBB F" [aset ediff-get-difference n ((quote A)) 2 flag] 4])) (defalias 'ediff-get-fine-diff-vector '(macro . #[(n buf-type) "\n ED" [ediff-get-fine-diff-vector-from-diff-record ediff-get-difference n buf-type] 4])) (defalias 'ediff-defvar-local '(macro . #[(var value doc) "\n \fF\nDD\nDBBF" [progn defvar var value doc make-variable-buffer-local quote put ((quote permanent-local) t)] 6])) (defalias 'ediff-eval-in-buffer '(macro . #[(buffer &rest forms) "\fD\fDBBBBBBBE" [let ((StartBuffer (current-buffer))) if ediff-buffer-live-p buffer unwind-protect progn set-buffer forms ((set-buffer StartBuffer)) ((or (eq this-command (quote ediff-quit)) (error "You've killed an essential Ediff buffer---Please quit Ediff")))] 8])) (defalias 'ediff-multiframe-setup-p '(macro . #[nil "" [(and (ediff-window-display-p) ediff-multiframe)] 1])) (defalias 'ediff-narrow-control-frame-p '(macro . #[nil "" [(and (ediff-multiframe-setup-p) (equal ediff-help-message ediff-brief-message-string))] 1])) (defalias 'ediff-3way-comparison-job '(macro . #[nil "" [(memq ediff-job-name (quote (ediff-files3 ediff-buffers3)))] 1])) #@2  (defvar ediff-3way-comparison-job nil (#$ . 4386)) (byte-code "!#" [make-variable-buffer-local ediff-3way-comparison-job put permanent-local t] 4) (defalias 'ediff-merge-job '(macro . #[nil "" [(memq ediff-job-name (quote (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 (#$ . 4796)) (byte-code "!#" [make-variable-buffer-local ediff-merge-job put permanent-local t] 4) (defalias 'ediff-merge-with-ancestor-job '(macro . #[nil "" [(memq ediff-job-name (quote (ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions-with-ancestor)))] 1])) #@2  (defvar ediff-merge-with-ancestor-job nil (#$ . 5140)) (byte-code "!#" [make-variable-buffer-local ediff-merge-with-ancestor-job put permanent-local t] 4) (defalias 'ediff-3way-job '(macro . #[nil "" [(or ediff-3way-comparison-job ediff-merge-job)] 1])) #@2  (defvar ediff-3way-job nil (#$ . 5410)) (byte-code "!#" [make-variable-buffer-local ediff-3way-job put permanent-local t] 4) (defalias 'ediff-diff3-job '(macro . #[nil "" [(or ediff-3way-comparison-job ediff-merge-with-ancestor-job)] 1])) #@2  (defvar ediff-diff3-job nil (#$ . 5665)) (byte-code "!#" [make-variable-buffer-local ediff-diff3-job put permanent-local t] 4) (defalias 'ediff-windows-job '(macro . #[nil "" [(memq ediff-job-name (quote (ediff-windows-wordwise ediff-windows-linewise)))] 1])) #@2  (defvar ediff-windows-job nil (#$ . 5941)) (byte-code "!#" [make-variable-buffer-local ediff-windows-job put permanent-local t] 4) (defalias 'ediff-word-mode-job '(macro . #[nil "" [(memq ediff-job-name (quote (ediff-windows-wordwise ediff-regions-wordwise)))] 1])) #@2  (defvar ediff-word-mode-job nil (#$ . 6223)) (byte-code "!#" [make-variable-buffer-local ediff-word-mode-job put permanent-local t] 4) (defalias 'ediff-narrow-job '(macro . #[nil "" [(memq ediff-job-name (quote (ediff-windows-wordwise ediff-regions-wordwise ediff-windows-linewise ediff-regions-linewise)))] 1])) #@2  (defvar ediff-narrow-job nil (#$ . 6552)) (byte-code "!#" [make-variable-buffer-local ediff-narrow-job put permanent-local t] 4) #@164 *Hooks to run before Ediff sets its own window config. This can be used to save the previous window config, which can be restored on ediff-quit or ediff-suspend. (defvar ediff-before-setup-windows-hooks nil (#$ . -6697)) #@126 *Hooks to run after Ediff sets its own window config. This can be used to set up control window or icon in a desired place. (defvar ediff-after-setup-windows-hooks nil (#$ . -6926)) #@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. (defvar ediff-before-setup-control-frame-hooks nil (#$ . -7116)) #@122 *Hooks run after setting up the frame to display Ediff Control Panel. Can be used to move the frame where it is desired. (defvar ediff-after-setup-control-frame-hooks nil (#$ . -7344)) #@66 *Hooks to run in the control buffer after Ediff has been set up. (defvar ediff-startup-hooks nil (#$ . -7535)) #@53 *Hooks to run after a difference has been selected. (defvar ediff-select-hooks nil (#$ . -7652)) #@55 *Hooks to run after a difference has been unselected. (defvar ediff-unselect-hooks nil (#$ . -7755)) #@53 *Hooks called after buffers A, B, and C are set up. (defvar ediff-prepare-buffer-hooks nil (#$ . -7862)) #@67 *Hook run after Ediff is loaded. Can be used to change defaults. (defvar ediff-load-hooks nil (#$ . -7973)) #@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. (defvar ediff-mode-hooks nil (#$ . -8089)) #@71 *Hook run just after the default bindings in Ediff keymap are set up. (defvar ediff-keymap-setup-hooks nil (#$ . -8340)) #@46 *Hooks run after preparing the help message. (defvar ediff-display-help-hooks nil (#$ . -8467)) #@68 *Hooks to run in the Ediff control buffer when Ediff is suspended. (defvar ediff-suspend-hooks (list (quote ediff-default-suspend-hook)) (#$ . -8569)) #@66 *Hooks to run in the Ediff control buffer after finishing Ediff. (defvar ediff-quit-hooks (list (quote ediff-cleanup-mess)) (#$ . -8726)) #@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. (defvar ediff-cleanup-hooks nil (#$ . -8871)) #@36 The head of the full help message. (defconst ediff-long-help-message-head " Moving around | Toggling features | Manipulations\n=====================|===========================|=============================" (#$ . 9142)) #@36 The tail of the full-help message. (defconst ediff-long-help-message-tail "=====================|===========================|=============================\n | D -on-line manual |\n i -status info | ? -help off | G -send bug report \n-------------------------------------------------------------------------------\nX,Y (x,y) on the left are meta-symbols for the keys A,B,C (a,b,c).\nX,Y on the right are meta-symbols for buffers A,B,C.\nA,B,C on the right denote the working buffers A,B,C, respectively." (#$ . 9389)) #@116 Help message usually used for 3-way comparison. Normally, not a user option. See `ediff-help-message' for details. (defconst ediff-long-help-message-compare3 "\np,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y\nn,SPC -next diff | h -hiliting | rx -restore buf X's old diff\n j -jump to diff | @ -auto-refinement | * -refine current region\n gx -goto X's point| | ! -update diff regions\n C-l -recenter | ## -ignore whitespace |\n v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X\n -scroll lt/rt | X -read-only in buf X | wd -save diff output\n z/q -suspend/quit | m -wide display | ~ -rotate buffers\n" (#$ . 9965)) #@116 Help message usually used for 2-way comparison. Normally, not a user option. See `ediff-help-message' for details. (defconst ediff-long-help-message-compare2 "\np,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A\nn,SPC -next diff | h -hiliting | rx -restore buf X's old diff\n j -jump to diff | @ -auto-refinement | * -refine current region\n gx -goto X's point| | ! -update diff regions\n C-l -recenter | ## -ignore whitespace |\n v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X\n -scroll lt/rt | X -read-only in buf X | wd -save diff output\n z/q -suspend/quit | m -wide display | ~ -swap buffers\n" (#$ . 10727)) #@129 Help message when comparing windows or regions line-by-line. Normally, not a user option. See `ediff-help-message' for details. (defconst ediff-long-help-message-narrow2 "\np,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A\nn,SPC -next diff | h -hiliting | rx -restore buf X's old diff\n j -jump to diff | @ -auto-refinement | * -refine current region\n gx -goto X's point| % -narrow/widen buffs | ! -update diff regions\n C-l -recenter | ## -ignore whitespace |\n v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X\n -scroll lt/rt | X -read-only in buf X | wd -save diff output\n z/q -suspend/quit | m -wide display | ~ -swap buffers\n" (#$ . 11488)) #@129 Help message when comparing windows or regions word-by-word. Normally, not a user option. See `ediff-help-message' for details. (defconst ediff-long-help-message-word-mode "\np,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y\nn,SPC -next diff | h -hiliting | rx -restore buf X's old diff\n j -jump to diff | | \n gx -goto X's point| % -narrow/widen buffs | ! -recompute diffs\n C-l -recenter | |\n v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X\n -scroll lt/rt | X -read-only in buf X | wd -save diff output\n z/q -suspend/quit | m -wide display | ~ -swap buffers\n" (#$ . 12261)) #@97 Help message during merging. Normally, not a user option. See `ediff-help-message' for details. (defconst ediff-long-help-message-merge "\np,DEL -previous diff | | -vert/horiz split | x -copy buf X's region to C\nn,SPC -next diff | h -hiliting | r -restore buf C's old diff\n j -jump to diff | @ -auto-refinement | * -refine current region\n gx -goto X's point| ## -ignore whitespace | ! -update diff regions\n C-l -recenter | #f/#h -focus/hide regions | + -combine diff regions\n v/V -scroll up/dn | X -read-only in buf X | wx -save buf X\n -scroll lt/rt | m -wide display | wd -save diff output\n z/q -suspend/quit | s -shrink window C | ~ -swap buffers\n | $ -show clashes only | & -merge w/new default\n" (#$ . 13024)) #@68 Normally, not a user option. See `ediff-help-message' for details. (defvar ediff-long-help-message "" (#$ . 13863)) (byte-code "!#" [make-variable-buffer-local ediff-long-help-message put permanent-local t] 4) #@37 Contents of the brief help message. (defconst ediff-brief-message-string " ? - help " (#$ . 14087)) #@68 Normally, not a user option. See `ediff-help-message' for details. (defvar ediff-brief-help-message "" (#$ . 14195)) (byte-code "!#" [make-variable-buffer-local ediff-brief-help-message put permanent-local t] 4) #@194 The brief help message that the user can customize. If the user sets this to a parameter-less function, Ediff will use it to produce the brief help message. This function must return a string. (defvar ediff-brief-help-message-custom nil (#$ . 14422)) (byte-code "!#" [make-variable-buffer-local ediff-brief-help-message-custom put permanent-local t] 4) #@100 The long help message that the user can customize. See `ediff-brief-help-message-custom' for more. (defvar ediff-long-help-message-custom nil (#$ . 14790)) (byte-code "!#" [make-variable-buffer-local ediff-long-help-message-custom put permanent-local t] 4) #@73 *If t, Ediff starts with a long help message. Short help msg otherwise. (defvar ediff-prefer-long-help-message nil (#$ . -15061)) #@264 The actual help message. Normally, the user shouldn't touch this. However, if you want Ediff to start up with different help messages for different jobs, you can change the value of this variable and the variables `ediff-help-message-*' in `ediff-startup-hooks'. (defvar ediff-help-message "" (#$ . 15198)) (byte-code "!#" [make-variable-buffer-local ediff-help-message put permanent-local t] 4) #@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 (quote ediff-show-all-diffs) (#$ . 15609)) (byte-code "!#" [make-variable-buffer-local ediff-skip-diff-region-function put permanent-local t] 4) #@2  (defvar ediff-regexp-focus-A "" (#$ . 16085)) (byte-code "!#" [make-variable-buffer-local ediff-regexp-focus-A put permanent-local t] 4) #@2  (defvar ediff-regexp-focus-B "" (#$ . 16236)) (byte-code "!#" [make-variable-buffer-local ediff-regexp-focus-B put permanent-local t] 4) #@2  (defvar ediff-regexp-focus-C "" (#$ . 16387)) (byte-code "!#" [make-variable-buffer-local ediff-regexp-focus-C put permanent-local t] 4) #@2  (defvar ediff-focus-regexp-connective (quote and) (#$ . 16538)) (byte-code "!#" [make-variable-buffer-local ediff-focus-regexp-connective put permanent-local t] 4) #@2  (defvar ediff-regexp-hide-A "" (#$ . 16716)) (byte-code "!#" [make-variable-buffer-local ediff-regexp-hide-A put permanent-local t] 4) #@2  (defvar ediff-regexp-hide-B "" (#$ . 16865)) (byte-code "!#" [make-variable-buffer-local ediff-regexp-hide-B put permanent-local t] 4) #@2  (defvar ediff-regexp-hide-C "" (#$ . 17014)) (byte-code "!#" [make-variable-buffer-local ediff-regexp-hide-C put permanent-local t] 4) #@2  (defvar ediff-hide-regexp-connective (quote and) (#$ . 17163)) (byte-code "!#" [make-variable-buffer-local ediff-hide-regexp-connective put permanent-local t] 4) #@55 Function ange-ftp uses to find out if file is remote. (defvar ediff-ange-ftp-ftp-name (byte-code "‡" [ediff-xemacs-p ange-ftp-ftp-path ange-ftp-ftp-name] 1) (#$ . 17340)) #@240 A list of killed diffs. A diff is saved here if it is replaced by a diff from another buffer. This alist has the form: ((num (buff-object . diff) (buff-object . diff) (buff-object . diff)) ...), where some buffer-objects may be missing. (defvar ediff-killed-diffs-alist nil (#$ . 17525)) (byte-code "!#" [make-variable-buffer-local ediff-killed-diffs-alist put permanent-local t] 4) #@82 *Flag placed above the highlighted block of differences. Must end with newline. (defvar ediff-before-flag-bol (byte-code "!‡" [ediff-xemacs-p make-glyph "->>"] 2) (#$ . -17924)) #@81 *Flag placed below the highlighted block of differences. Must end with newline. (defvar ediff-after-flag-eol (byte-code "!‡" [ediff-xemacs-p make-glyph "<<-"] 2) (#$ . -18117)) #@69 *Like ediff-before-flag, used when a difference starts in mid-line. (defvar ediff-before-flag-mol (byte-code "!‡" [ediff-xemacs-p make-glyph "->>"] 2) (#$ . -18308)) #@68 *Like ediff-after-flag, used when a difference starts in mid-line. (defvar ediff-after-flag-mol (byte-code "!‡" [ediff-xemacs-p make-glyph "<<-"] 2) (#$ . -18488)) #@345 If t, differences are highlighted using faces on a window system. If nil, they are highlighted using ASCII flags, ediff-before-flag and ediff-after-flag. On a non-window system, differences are always highlighted using ASCII flags. This variable can be set either in .emacs or toggled interactively. Use `setq-default' if setting it in .emacs (defvar ediff-use-faces t (#$ . 18667)) (byte-code "!#" [make-variable-buffer-local ediff-use-faces put permanent-local t] 4) #@2  (defvar ediff-word-mode nil (#$ . 19150)) (byte-code "!#" [make-variable-buffer-local ediff-word-mode put permanent-local t] 4) #@2  (defvar ediff-job-name nil (#$ . 19292)) (byte-code "!#" [make-variable-buffer-local ediff-job-name put permanent-local t] 4) #@2  (defvar ediff-narrow-bounds nil (#$ . 19432)) (byte-code "!#" [make-variable-buffer-local ediff-narrow-bounds put permanent-local t] 4) #@2  (defvar ediff-wide-bounds nil (#$ . 19582)) (byte-code "!#" [make-variable-buffer-local ediff-wide-bounds put permanent-local t] 4) #@2  (defvar ediff-visible-bounds nil (#$ . 19728)) (byte-code "!#" [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 (#$ . 19881)) (byte-code "!#" [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 (#$ . -20106)) (byte-code "!#" [make-variable-buffer-local ediff-quit-widened put permanent-local t] 4) #@180 If nil, only the selected differences are highlighted. This variable can be set either in .emacs or toggled interactively, using ediff-toggle-hilit. Use `setq-default' to set it. (defvar ediff-highlight-all-diffs t (#$ . 20385)) (byte-code "!#" [make-variable-buffer-local ediff-highlight-all-diffs put permanent-local t] 4) #@2  (defvar ediff-highlighting-style nil (#$ . 20723)) (byte-code "!#" [make-variable-buffer-local ediff-highlighting-style put permanent-local t] 4) #@2  (defvar ediff-buffer-A nil (#$ . 20883)) (byte-code "!#" [make-variable-buffer-local ediff-buffer-A put permanent-local t] 4) #@2  (defvar ediff-buffer-B nil (#$ . 21023)) (byte-code "!#" [make-variable-buffer-local ediff-buffer-B put permanent-local t] 4) #@2  (defvar ediff-buffer-C nil (#$ . 21163)) (byte-code "!#" [make-variable-buffer-local ediff-buffer-C put permanent-local t] 4) #@2  (defvar ediff-ancestor-buffer nil (#$ . 21303)) (byte-code "!#" [make-variable-buffer-local ediff-ancestor-buffer put permanent-local t] 4) #@2  (defvar ediff-control-buffer nil (#$ . 21457)) (byte-code "!#" [make-variable-buffer-local ediff-control-buffer put permanent-local t] 4) #@2  (defvar ediff-control-buffer-suffix nil (#$ . 21609)) (byte-code "!#" [make-variable-buffer-local ediff-control-buffer-suffix put permanent-local t] 4) #@2  (defvar ediff-control-buffer-number nil (#$ . 21775)) (byte-code "!#" [make-variable-buffer-local ediff-control-buffer-number put permanent-local t] 4) #@2  (defvar ediff-buffer-values-orig-A nil (#$ . 21941)) (byte-code "!#" [make-variable-buffer-local ediff-buffer-values-orig-A put permanent-local t] 4) #@2  (defvar ediff-buffer-values-orig-B nil (#$ . 22105)) (byte-code "!#" [make-variable-buffer-local ediff-buffer-values-orig-B put permanent-local t] 4) #@2  (defvar ediff-buffer-values-orig-C nil (#$ . 22269)) (byte-code "!#B" [make-variable-buffer-local ediff-buffer-values-orig-C put permanent-local t (buffer-read-only mode-line-format) ediff-protected-variables current-load-list] 4) #@2  (defvar ediff-difference-vector-A nil (#$ . 22524)) (byte-code "!#" [make-variable-buffer-local ediff-difference-vector-A put permanent-local t] 4) #@2  (defvar ediff-difference-vector-B nil (#$ . 22686)) (byte-code "!#" [make-variable-buffer-local ediff-difference-vector-B put permanent-local t] 4) #@2  (defvar ediff-difference-vector-C nil (#$ . 22848)) (byte-code "!#" [make-variable-buffer-local ediff-difference-vector-C put permanent-local t] 4) #@2  (defvar ediff-current-difference -1 (#$ . 23010)) (byte-code "!#" [make-variable-buffer-local ediff-current-difference put permanent-local t] 4) #@2  (defvar ediff-number-of-differences nil (#$ . 23169)) (byte-code "!#" [make-variable-buffer-local ediff-number-of-differences put permanent-local t] 4) #@2  (defvar ediff-diff-buffer nil (#$ . 23335)) (byte-code "!#" [make-variable-buffer-local ediff-diff-buffer put permanent-local t] 4) #@2  (defvar ediff-custom-diff-buffer nil (#$ . 23481)) (byte-code "!#" [make-variable-buffer-local ediff-custom-diff-buffer put permanent-local t] 4) #@2  (defvar ediff-fine-diff-buffer nil (#$ . 23641)) (byte-code "!#" [make-variable-buffer-local ediff-fine-diff-buffer put permanent-local t] 4) #@2  (defconst ediff-tmp-buffer " *ediff-tmp*" (#$ . 23797)) #@2  (defconst ediff-msg-buffer " *ediff-message*" (#$ . 23859)) #@2  (defvar ediff-error-buffer nil (#$ . 23925)) (byte-code "!#" [make-variable-buffer-local ediff-error-buffer put permanent-local t] 4) #@2  (defvar ediff-debug-buffer "*ediff-debug*" (#$ . 24073)) (byte-code "!#" [make-variable-buffer-local ediff-debug-buffer put permanent-local t] 4) #@2  (defvar ediff-this-buffer-control-sessions nil (#$ . 24233)) (byte-code "!#" [make-variable-buffer-local ediff-this-buffer-control-sessions put permanent-local t] 4) #@2  (defvar ediff-disturbed-overlays nil (#$ . 24413)) #@2  (defvar ediff-shadow-overlay-priority 100 (#$ . 24470)) (byte-code "%KMKMKMKMKMKMHKMKMKMKMKMKMKM" [ediff-xemacs-p ediff-read-event next-command-event ediff-overlayp extentp ediff-make-overlay make-extent ediff-delete-overlay delete-extent ediff-overlay-buffer extent-buffer ediff-overlay-get extent-property read-event overlayp make-overlay delete-overlay overlay-buffer overlay-get] 2) (defalias 'ediff-check-version #[(op major minor &optional type-of-emacs) "!e!e = \" =!\"ȅv =8\n Ud \fU >_ \f\"O \fUd \fU] \n \"ȇ \" >nч >vȇ" [boundp emacs-major-version emacs-minor-version type-of-emacs xemacs ediff-xemacs-p emacs ediff-emacs-p t op = minor major (> >= < <=) error "%S: Invalid op in ediff-check-version" (= > >=) nil (< <=)] 3]) (byte-code " \f !E  !>E( , !=EKMKMKMKM‡" [ediff-emacs-p window-system device-type selected-device (tty stream) 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 " !=" [ediff-emacs-p x-display-color-p device-class selected-device color] 2]) (byte-code "#\f  !n\f ! !>n BKMKMKMKMnKMKM\fT X !=dMiKMKM\fv z !\f !>MM!!!\f !=## \"\"*B*#!1!!.\f \n !=##. )\".\"-*B*#!!!\fV \\ !=n## {\"\"1*B*#!!!\f  !=##\"5*B*#! !!\n\f  !=##\n\":*B*#!T!!Q\f2 8 !=L#@#Q\">*B*A#܁B!ށB!߁B!\f  !=B#BC#DB\"BBB*B*BE#܁F!\fށF!߁F!\f  !=FG#FH#DF\"FFF*B*FI#܁J!:ށJ!BJ\"JJJ*B*JK#܁L!ށL!߁L!\fk q !=LG#LH#DL\"LLL*B*LM#܁N!ށN!߁N!\f  !=N#NC#DN\"NNN*B*NO#܁P!$ށP!LP\"PPP*B*PQ#ށR!ށS!ށT!ށU!ށV!ށW!XYM܁Z!o[ZZ*B*Z\\#]Z!Z^#܁_![__*B*_`#]_!_^#܁a![aa*B*ab#]a!a^#؁cMdeM[" [put ediff-color-display-p byte-optimizer byte-compile-inline-expand ediff-emacs-p window-system device-type selected-device (tty stream) ediff-xemacs-p ediff-display-pixel-width device-pixel-width ediff-display-pixel-height device-pixel-height ediff-valid-color-p valid-color-name-p ediff-get-face get-face x-display-pixel-width x-display-pixel-height pm #[(color) " \n\"" [assoc color pm-color-alist] 3] x-color-defined-p internal-get-face ediff-make-current-diff-overlay #[(type) "" [nil] 1] ediff-set-face #[(ground face color) " !\n= \" \" >! \" >1 \" \" >; \"" [ediff-valid-color-p color ground foreground set-face-foreground face set-face-background (ediff-current-diff-face-A ediff-current-diff-face-B ediff-current-diff-face-C) copy-face highlight (ediff-fine-diff-face-A ediff-fine-diff-face-B ediff-fine-diff-face-C) secondary-selection set-face-underline-p t (ediff-even-diff-face-A ediff-odd-diff-face-A ediff-even-diff-face-B ediff-odd-diff-face-B ediff-even-diff-face-C ediff-odd-diff-face-C)] 3 "Sets face foreground/background."] boundp ediff-current-diff-face-A make-face face-differs-from-default-p x-display-color-p device-class color foreground "firebrick" background "pale green" copy-face modeline highlight current-load-list variable-documentation "Face for highlighting the selected difference in buffer A." ediff-current-diff-face-B "DarkOrchid" "Yellow" "Face for highlighting the selected difference in buffer B." ediff-current-diff-face-C "Navy" "Pink" "Face for highlighting the selected difference in buffer C." ediff-fine-diff-face-A "sky blue" set-face-underline-p t "Face for highlighting the refinement of the selected diff in buffer A." ediff-fine-diff-face-B "Black" "cyan" "Face for highlighting the refinement of the selected diff in buffer B." ediff-fine-diff-face-C "black" "Turquoise" "Face for highlighting the refinement of the selected diff in buffer C." ediff-even-diff-face-A "light grey" italic "Face used to highlight even-numbered differences in buffer A." ediff-even-diff-face-B "White" "Gray" "Face used to highlight even-numbered differences in buffer B." ediff-even-diff-face-C "Face used to highlight even-numbered differences in buffer C." ediff-odd-diff-face-A "Face used to highlight odd-numbered differences in buffer A." ediff-odd-diff-face-B "Face used to highlight odd-numbered differences in buffer B." ediff-odd-diff-face-C "Face used to highlight odd-numbered differences in buffer C." ediff-even-diff-face-A-var ediff-even-diff-face-B-var ediff-even-diff-face-C-var ediff-odd-diff-face-A-var ediff-odd-diff-face-B-var ediff-odd-diff-face-C-var ediff-init-var-faces #[nil " \n \" \n \" 1\n12\" C\nC\nD\" U\nU\fV\" g\ngh\"" [copy-face ediff-use-faces ediff-highlight-all-diffs ediff-even-diff-face-A default ediff-even-diff-face-A-var ediff-even-diff-face-B ediff-even-diff-face-B-var ediff-even-diff-face-C ediff-even-diff-face-C-var ediff-odd-diff-face-A ediff-odd-diff-face-A-var ediff-odd-diff-face-B ediff-odd-diff-face-B-var ediff-odd-diff-face-C ediff-odd-diff-face-C-var] 3] ediff-current-diff-overlay-A nil "Overlay for the current difference region in buffer A." make-variable-buffer-local permanent-local ediff-current-diff-overlay-B "Overlay for the current difference region in buffer B." ediff-current-diff-overlay-C "Overlay for the current difference region in buffer C." #[(type) " \"! = # =# =# \"!J!\f dd #LJ\f#J#+" [intern format "ediff-current-diff-overlay-%S" type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C face-name "ediff-current-diff-face-%S" face buffer overlay ediff-make-bullet-proof-overlay ediff-overlay-put ediff ediff-control-buffer] 8] ediff-highest-priority #[(start end buffer) " S] T_pT!T!!Tˎq\fd\fT^WH\f! \"\f!0 \"\"T)^=^!)*" [1 start nil ovr-list pos ediff-xemacs-p ediff-shadow-overlay-priority StartBuffer buffer get-buffer buffer-name ((set-buffer StartBuffer)) end append overlays-at next-overlay-change apply + mapcar #[(ovr) " \"ÇÇ" [ovr ediff-overlay-get priority 0] 3] this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff"] 6]] 4) #@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 (#$ . -31434)) (byte-code "\nB" [t ediff-verbose-p current-load-list] 2) #@111 *Non-nil means C-h should not invoke Emacs help in control buffer. Instead, C-h jumps to previous difference. (defvar ediff-no-emacs-help-in-control-buffer nil (#$ . -31837)) #@88 *Prefix to put on Ediff temporary file names. Do not start with `~/' or `~user-name/'. (defvar ediff-temp-file-prefix (byte-code "!!!$GV$0>/ʂ0 !!*" [getenv "TMPDIR" "TMP" "TEMP" nil d env 0 system-type (vax-vms axp-vms) "SYS$SCRATCH:" "/tmp" file-name-as-directory directory-file-name] 4) (#$ . -32018)) #@34 *Mode for Ediff temporary files. (defvar ediff-temp-file-mode 384 (#$ . -32370)) #@132 Characters that must be quoted with \ when used in a shell command line. More precisely, a regexp to match any one such character. (defvar ediff-metachars "[ \n!\"#$&'()*;<=>?[\\^`{|~]" (#$ . 32458)) #@66 Temporary file used for refining difference regions in buffer A. (defvar ediff-temp-file-A nil (#$ . 32665)) (byte-code "!#" [make-variable-buffer-local ediff-temp-file-A put permanent-local t] 4) #@66 Temporary file used for refining difference regions in buffer B. (defvar ediff-temp-file-B nil (#$ . 32876)) (byte-code "!#" [make-variable-buffer-local ediff-temp-file-B put permanent-local t] 4) #@66 Temporary file used for refining difference regions in buffer C. (defvar ediff-temp-file-C nil (#$ . 33087)) (byte-code "!#" [make-variable-buffer-local ediff-temp-file-C put permanent-local t] 4) (defalias 'ediff-file-remote-p #[(file-name) " ! \n!" [fboundp ediff-ange-ftp-ftp-name file-name] 2]) (put (quote ediff-file-remote-p) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-frame-unsplittable-p #[(frame) "\n!A" [unsplittable frame-parameters frame] 3]) (put (quote ediff-frame-unsplittable-p) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-get-next-window #[(wind prev-wind) " !\n ! " [window-live-p wind prev-wind next-window selected-window] 2]) (put (quote ediff-get-next-window) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-convert-diffs-to-overlays #[(diff-list) "\n\"\n\"\f\n\"!" [ediff-set-diff-overlays-in-one-buffer A diff-list B ediff-3way-job C message "Processing difference regions ... done"] 3]) (put (quote ediff-convert-diffs-to-overlays) (quote byte-optimizer) (quote byte-compile-inline-expand)) #@31 Kill buffer BUF if it exists. (defalias 'ediff-kill-buffer-carefully #[(buf) "!!!!!" [buf get-buffer buffer-name kill-buffer] 3 (#$ . 34249)]) (put (quote ediff-kill-buffer-carefully) (quote byte-optimizer) (quote byte-compile-inline-expand)) #@51 Put face on diff N. Invoked for X displays only. (defalias 'ediff-highlight-diff #[(n) " \" \" \"" [ediff-highlight-diff-in-one-buffer n A B C] 3 (#$ . 34517)]) (put (quote ediff-highlight-diff) (quote byte-optimizer) (quote byte-compile-inline-expand)) #@43 Remove overlays from buffers A, B, and C. (defalias 'ediff-unhighlight-diff #[nil "!!!" [ediff-unhighlight-diff-in-one-buffer A B C] 2 (#$ . 34787)]) (put (quote ediff-unhighlight-diff) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-unhighlight-diffs-totally #[nil "!!!" [ediff-unhighlight-diffs-totally-in-one-buffer A B C] 2]) (put (quote ediff-unhighlight-diffs-totally) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-clear-fine-diff-vector #[(diff-record) "\nH\"" [diff-record mapcar ediff-delete-overlay 1] 4]) (put (quote ediff-clear-fine-diff-vector) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-clear-fine-differences-in-one-buffer #[(n buf-type) " \"!J\fH H\") \"!J\fHI" [intern format "ediff-difference-vector-%S" buf-type n diff-record mapcar ediff-delete-overlay 1 nil] 5]) (put (quote ediff-clear-fine-differences-in-one-buffer) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-clear-fine-differences #[(n) "\n\"!JHH\")\n\"!JHI*\n\"!JHEH\")\n\"!JHI*\f\n\"!JHtH\")\n\"!JHI*" [n A buf-type intern format "ediff-difference-vector-%S" diff-record mapcar ediff-delete-overlay 1 nil B ediff-3way-job C] 5]) (put (quote ediff-clear-fine-differences) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-convert-fine-diffs-to-overlays #[(diff-list region-num) "\n #\n # \n #" [ediff-set-fine-overlays-in-one-buffer A diff-list region-num B ediff-3way-job C] 4]) (put (quote ediff-convert-fine-diffs-to-overlays) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-mouse-event-p #[(event) "\n!\n!\"\"" [ediff-xemacs-p button-event-p event string-match "mouse" format "%S" event-basic-type] 6]) (put (quote ediff-mouse-event-p) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-frame-iconified-p #[(frame) " \f !8  !>?8!82!!=" [ediff-emacs-p window-system device-type selected-device (tty stream) frame-live-p frame ediff-xemacs-p frame-iconified-p frame-visible-p icon] 2]) (put (quote ediff-frame-iconified-p) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-window-visible-p #[(wind) " !-\n  !$\n ! !>??- !!" [window-live-p wind ediff-emacs-p window-system device-type selected-device (tty stream) frame-visible-p window-frame] 3]) (put (quote ediff-window-visible-p) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-frame-char-width #[(frame) "\f\n!\n!\n!" [ediff-xemacs-p frame-pixel-width frame frame-width frame-char-width] 3]) (put (quote ediff-frame-char-width) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-reset-mouse #[(&optional frame) "\n !\n \f \" !<\f- 1 !>?<\n#" [ediff-xemacs-p frame-selected-window frame selected-frame ediff-emacs-p window-system device-type selected-device (tty stream) set-mouse-position 1 0] 4]) (put (quote ediff-reset-mouse) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-frame-char-height #[(frame) "\f\n!\n!\n!" [ediff-xemacs-p frame-pixel-height frame frame-height frame-char-height] 3]) (put (quote ediff-frame-char-height) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-empty-overlay-p #[(overl) " ! !U" [ediff-overlay-start overl ediff-overlay-end] 3]) (put (quote ediff-empty-overlay-p) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-empty-diff-region-p #[(n buf-type) "=\n?\" # #U # #U" [buf-type C ediff-3way-comparison-job ediff-get-diff-posn beg n end] 5]) (defalias 'ediff-whitespace-diff-region-p #[(n buf-type) "= \n? # #p=& 9=1 9=\f=H [=S [=[\f!=l =w =\f!!ώ= = =\fq\fbw`Y*=!+" [buf-type C ediff-3way-job ediff-get-diff-posn beg n end StartBuffer A ediff-buffer-A B ediff-buffer-B ediff-buffer-C get-buffer buffer-name ((set-buffer StartBuffer)) ediff-whitespace nil this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff"] 5]) (defalias 'ediff-abbreviate-filename #[(file dir) " BC !*" [dir default-directory "" directory-abbrev-alist abbreviate-file-name file] 3]) (put (quote ediff-abbreviate-filename) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-get-region-contents #[(n buf-type ctrl-buf &optional start end) "pp = != !!=Ď q =&9 =1 9 =9 )G\f=G!)Jp ! !!Ў q =p ={ = )\f=!)!Jp ! !!ю q = = = )\f=!)!!JҎp  !  !! ӎ q =  =  = )*\f=*!)q9  $E  ${)T\f=T!)" [StartBuffer ctrl-buf get-buffer buffer-name ((set-buffer StartBuffer)) buf-type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) start ediff-get-diff-posn beg n end] 6]) (put (quote ediff-get-region-contents) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-strip-mode-line-format #[nil "@\f8" [mode-line-format (" A: " " B: " " C: ") 2] 2]) (put (quote ediff-strip-mode-line-format) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-valid-difference-p #[(&optional n) " Y W" [n ediff-current-difference 0 ediff-number-of-differences] 2]) (put (quote ediff-valid-difference-p) (quote byte-optimizer) (quote byte-compile-inline-expand)) #@32 Don't skip difference regions. (defalias 'ediff-show-all-diffs #[(n) "" [nil] 1 (#$ . 40803)]) (byte-code "#!" [put ediff-show-all-diffs byte-optimizer byte-compile-inline-expand provide ediff-init] 4)