;ELC ;;; compiled by rms@mole.gnu.ai.mit.edu on Fri Nov 10 23:59:28 1995 ;;; from file /home/fsf/rms/e19/lisp/ediff-init.el ;;; emacs version 19.29.1.1. ;;; 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 "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) "ÀÁ\nÃBBÄBB‡" [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) "ÀÁ\nÃBBÄBÁ\nÅBBÆBÁ\nÇBBÈBÁ\nÉBBÊB¯‡" [cond eq arg ((quote A)) (ediff-buffer-A) ((quote B)) (ediff-buffer-B) ((quote C)) (ediff-buffer-C) ((quote Ancestor)) (ediff-ancestor-buffer)] 7])) (defalias 'ediff-get-value-according-to-buffer-type '(macro . #[(buf-type list) "ÀÁ\nÃBBÄÅEDÁ\nÇBBÄÈEDÁ\nÉBBÄÊEDF‡" [cond eq buf-type ((quote A)) nth 0 list ((quote B)) 1 ((quote C)) 2] 7])) (defalias 'ediff-char-to-buftype '(macro . #[(arg) "ÀÁ\nÃBBÄBÁ\nÅBBÆBÁ\nÇBBÈBF‡" [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) "ÀÁ\nÃBBÄBB‡" [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 EÆBBE‡" [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) "ÀÁ‰Á EÄBBE‡" [if ediff-state-of-merge aref n (0)] 6])) (defalias 'ediff-get-state-of-ancestor '(macro . #[(n) "ÀÁ‰Á EÄBBE‡" [if ediff-state-of-merge aref n (1)] 6])) (defalias 'ediff-set-state-of-merge '(macro . #[(n val) "ÀÁÂÃÁ\fEÅFE‡" [if ediff-state-of-merge aset aref n 0 val] 6])) (defalias 'ediff-mark-diff-as-space-only '(macro . #[(n flag) "ÀÁ\nÃBBÄ 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ÇÆ\nDÈBBF‡" [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ÅÆÇ\fDBBÉBBÊBBBE‡" [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 #[nil "ƒ ‚\fÂà !…\"ƒ ‚Âà !Ä>?…\" ‡" [ediff-emacs-p window-system device-type selected-device (tty stream) ediff-multiframe] 2]) (put (quote ediff-multiframe-setup-p) (quote byte-optimizer) (quote byte-compile-inline-expand)) (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 (#$ . 4637)) (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 (#$ . 5047)) (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 (#$ . 5391)) (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 (#$ . 5661)) (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 (#$ . 5916)) (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 (#$ . 6192)) (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 (#$ . 6474)) (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 (#$ . 6803)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-narrow-job put permanent-local t] 4) (defalias 'ediff-ancestor-metajob #[(&optional metajob) "† Â>‡" [metajob ediff-metajob-name (ediff-merge-directories-with-ancestor ediff-merge-filegroups-with-ancestor)] 2]) (put (quote ediff-ancestor-metajob) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-revision-metajob #[(&optional metajob) "† Â>‡" [metajob ediff-metajob-name (ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor)] 2]) (put (quote ediff-revision-metajob) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-dir1-metajob #[(&optional metajob) "‰† Â>)‡" [metajob ediff-metajob-name (ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor)] 3]) (put (quote ediff-dir1-metajob) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-collect-diffs-metajob #[(&optional metajob) "‰† Â>)† Ã>‡" [metajob ediff-metajob-name (ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor) (ediff-directories ediff-directory-revisions)] 3]) (put (quote ediff-collect-diffs-metajob) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-metajob3 #[(&optional metajob) "† Â>‡" [metajob ediff-metajob-name (ediff-merge-directories-with-ancestor ediff-merge-filegroups-with-ancestor ediff-directories3 ediff-filegroups3)] 2]) (put (quote ediff-metajob3) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-comparison-metajob3 #[(&optional metajob) "† Â>‡" [metajob ediff-metajob-name (ediff-directories3 ediff-filegroups3)] 2]) (put (quote ediff-comparison-metajob3) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-barf-if-not-control-buffer #[(&optional meta-buf) "ƒ ‚ \np=†ÃÄ \"‡" [meta-buf ediff-meta-buffer ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command] 3]) (put (quote ediff-barf-if-not-control-buffer) (quote byte-optimizer) (quote byte-compile-inline-expand)) #@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. (defvar ediff-before-setup-windows-hook nil (#$ . -9039)) #@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. (defvar ediff-after-setup-windows-hook nil (#$ . -9270)) #@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-hook nil (#$ . -9462)) #@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-hook nil (#$ . -9689)) #@66 *Hooks to run in the control buffer after Ediff has been set up. (defvar ediff-startup-hook nil (#$ . -9879)) #@53 *Hooks to run after a difference has been selected. (defvar ediff-select-hook nil (#$ . -9995)) #@55 *Hooks to run after a difference has been unselected. (defvar ediff-unselect-hook nil (#$ . -10097)) #@53 *Hooks called after buffers A, B, and C are set up. (defvar ediff-prepare-buffer-hook nil (#$ . -10204)) #@67 *Hook run after Ediff is loaded. Can be used to change defaults. (defvar ediff-load-hook nil (#$ . -10315)) #@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-hook nil (#$ . -10431)) #@71 *Hook run just after the default bindings in Ediff keymap are set up. (defvar ediff-keymap-setup-hook nil (#$ . -10682)) #@46 *Hooks run after preparing the help message. (defvar ediff-display-help-hook nil (#$ . -10809)) #@68 *Hooks to run in the Ediff control buffer when Ediff is suspended. (defvar ediff-suspend-hook (list (quote ediff-default-suspend-function)) (#$ . -10911)) #@66 *Hooks to run in the Ediff control buffer after finishing Ediff. (defvar ediff-quit-hook (list (quote ediff-cleanup-mess)) (#$ . -11072)) #@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-hook nil (#$ . -11217)) #@36 The head of the full help message. (defconst ediff-long-help-message-head " Moving around | Toggling features | Manipulations\n=====================|===========================|=============================" (#$ . 11488)) #@36 The tail of the full-help message. (defconst ediff-long-help-message-tail "=====================|===========================|=============================\n R -show registry | | M -show session group\n D -diff output | E -browse Ediff manual| G -send bug report \n i -status info | ? -help off | z/q -suspend/quit\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." (#$ . 11736)) #@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 | m -wide display | ~ -rotate buffers\n" (#$ . 12411)) #@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 | m -wide display | ~ -swap buffers\n" (#$ . 13174)) #@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 | m -wide display | ~ -swap buffers\n" (#$ . 13935)) #@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 | m -wide display | ~ -swap buffers\n" (#$ . 14708)) #@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 / -ancestor buff | s -shrink window C | ~ -swap buffers\n | $ -show clashes only | & -merge w/new default\n" (#$ . 15471)) #@68 Normally, not a user option. See `ediff-help-message' for details. (defvar ediff-long-help-message "" (#$ . 16310)) (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 " (#$ . 16534)) #@68 Normally, not a user option. See `ediff-help-message' for details. (defvar ediff-brief-help-message "" (#$ . 16642)) (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-function nil (#$ . 16869)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-brief-help-message-function put permanent-local t] 4) #@102 The long help message that the user can customize. See `ediff-brief-help-message-function' for more. (defvar ediff-long-help-message-function nil (#$ . 17241)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-long-help-message-function 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 (#$ . -17518)) #@263 The actual help message. Normally, the user shouldn't touch this. However, if you want Ediff to start up with different help messages for different jobs, you can change the value of this variable and the variables `ediff-help-message-*' in `ediff-startup-hook'. (defvar ediff-help-message "" (#$ . 17655)) (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) (#$ . 18065)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [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 (quote ediff-hide-regexp-matches) (#$ . 18543)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [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 (quote ediff-focus-on-regexp-matches) (#$ . 18881)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-focus-on-regexp-matches-function put permanent-local t] 4) #@2  (defvar ediff-regexp-focus-A "" (#$ . 19237)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-regexp-focus-A put permanent-local t] 4) #@2  (defvar ediff-regexp-focus-B "" (#$ . 19388)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-regexp-focus-B put permanent-local t] 4) #@2  (defvar ediff-regexp-focus-C "" (#$ . 19539)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-regexp-focus-C put permanent-local t] 4) #@2  (defvar ediff-focus-regexp-connective (quote and) (#$ . 19690)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-focus-regexp-connective put permanent-local t] 4) #@2  (defvar ediff-regexp-hide-A "" (#$ . 19868)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-regexp-hide-A put permanent-local t] 4) #@2  (defvar ediff-regexp-hide-B "" (#$ . 20017)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-regexp-hide-B put permanent-local t] 4) #@2  (defvar ediff-regexp-hide-C "" (#$ . 20166)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-regexp-hide-C put permanent-local t] 4) #@2  (defvar ediff-hide-regexp-connective (quote and) (#$ . 20315)) (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) (#$ . 20492)) #@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 (#$ . 20677)) (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) (#$ . -21076)) #@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) (#$ . -21269)) #@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) (#$ . -21460)) #@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) (#$ . -21640)) #@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 (#$ . 21819)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-use-faces put permanent-local t] 4) #@2  (defvar ediff-word-mode nil (#$ . 22302)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-word-mode put permanent-local t] 4) #@2  (defvar ediff-job-name nil (#$ . 22444)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-job-name put permanent-local t] 4) #@2  (defvar ediff-narrow-bounds nil (#$ . 22584)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-narrow-bounds put permanent-local t] 4) #@2  (defvar ediff-wide-bounds nil (#$ . 22734)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-wide-bounds put permanent-local t] 4) #@2  (defvar ediff-visible-bounds nil (#$ . 22880)) (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 (#$ . 23033)) (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 (#$ . -23258)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-quit-widened put permanent-local t] 4) #@192 *Nil means that non-modified variant buffers should be removed after some interrogation. Supplying a prefix agument to the quit command `q' temporarily reverses the meaning of this variable. (defvar ediff-keep-variants t (#$ . -23537)) #@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 (#$ . 23780)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-highlight-all-diffs put permanent-local t] 4) #@2  (defvar ediff-highlighting-style nil (#$ . 24118)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-highlighting-style put permanent-local t] 4) #@2  (defvar ediff-buffer-A nil (#$ . 24278)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-buffer-A put permanent-local t] 4) #@2  (defvar ediff-buffer-B nil (#$ . 24418)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-buffer-B put permanent-local t] 4) #@2  (defvar ediff-buffer-C nil (#$ . 24558)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-buffer-C put permanent-local t] 4) #@2  (defvar ediff-ancestor-buffer nil (#$ . 24698)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-ancestor-buffer put permanent-local t] 4) #@2  (defvar ediff-control-buffer nil (#$ . 24852)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-control-buffer put permanent-local t] 4) #@2  (defvar ediff-control-buffer-suffix nil (#$ . 25004)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-control-buffer-suffix put permanent-local t] 4) #@2  (defvar ediff-control-buffer-number nil (#$ . 25170)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-control-buffer-number put permanent-local t] 4) #@2  (defvar ediff-buffer-values-orig-A nil (#$ . 25336)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-buffer-values-orig-A put permanent-local t] 4) #@2  (defvar ediff-buffer-values-orig-B nil (#$ . 25500)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-buffer-values-orig-B put permanent-local t] 4) #@2  (defvar ediff-buffer-values-orig-C nil (#$ . 25664)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-buffer-values-orig-C put permanent-local t] 4) #@2  (defvar ediff-buffer-values-orig-Ancestor nil (#$ . 25828)) (byte-code "ÀÁ!ˆÂÁÃÄ#ˆÅÆBÀ‡" [make-variable-buffer-local ediff-buffer-values-orig-Ancestor put permanent-local t (buffer-read-only synchronize-minibuffers mode-line-format) ediff-protected-variables current-load-list] 4) #@2  (defvar ediff-difference-vector-A nil (#$ . 26121)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-difference-vector-A put permanent-local t] 4) #@2  (defvar ediff-difference-vector-B nil (#$ . 26283)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-difference-vector-B put permanent-local t] 4) #@2  (defvar ediff-difference-vector-C nil (#$ . 26445)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-difference-vector-C put permanent-local t] 4) #@2  (defvar ediff-difference-vector-Ancestor nil (#$ . 26607)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-difference-vector-Ancestor put permanent-local t] 4) #@2  (defvar ediff-state-of-merge nil (#$ . 26783)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-state-of-merge put permanent-local t] 4) #@2  (defvar ediff-current-difference -1 (#$ . 26935)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-current-difference put permanent-local t] 4) #@2  (defvar ediff-number-of-differences nil (#$ . 27094)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-number-of-differences put permanent-local t] 4) #@2  (defvar ediff-diff-buffer nil (#$ . 27260)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-diff-buffer put permanent-local t] 4) #@2  (defvar ediff-custom-diff-buffer nil (#$ . 27406)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-custom-diff-buffer put permanent-local t] 4) #@2  (defvar ediff-fine-diff-buffer nil (#$ . 27566)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-fine-diff-buffer put permanent-local t] 4) #@2  (defconst ediff-tmp-buffer " *ediff-tmp*" (#$ . 27722)) #@2  (defconst ediff-msg-buffer " *ediff-message*" (#$ . 27784)) #@2  (defvar ediff-error-buffer nil (#$ . 27850)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-error-buffer put permanent-local t] 4) #@2  (defvar ediff-debug-buffer "*ediff-debug*" (#$ . 27998)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-debug-buffer put permanent-local t] 4) #@2  (defvar ediff-this-buffer-ediff-sessions nil (#$ . 28158)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-this-buffer-ediff-sessions put permanent-local t] 4) #@2  (defvar ediff-disturbed-overlays nil (#$ . 28334)) #@2  (defvar ediff-shadow-overlay-priority 100 (#$ . 28391)) #@287 Version control package used. Currently, Ediff supports vc.el, rcs.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 `rcs' or `generic-sc' if you are such a person. (defvar ediff-version-control-package (quote vc) (#$ . 28455)) (byte-code "ƒ%ÁÂKMˆÃÄKMˆÅÆKMˆÇÈKMˆÉÊKMˆËÌKMˆ‚HÁÍKMˆÃÎKMˆÃÎKMˆÅÏKMˆÇÐKMˆÉÑKMˆËÒKMˆÁ‡" [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 U…d \fU‡ Í>ƒ_ \f\"„O \fU…d \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ƒ( ‚,Âà !Å=ƒEÆÇKMˆÈÉKMˆÊËKMˆÌÍKMˆÂ‡" [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 ƒBÊËKMˆÌÍKMˆÎÏKMˆÐÑKMˆ‚nÊÒKMˆÌÓKMˆ\fƒT ‚XÆÇ !Ô=ƒdÎÕMˆ‚iÎÖKMˆÐ×KMˆÀ‡" [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] 4) (defalias 'ediff-make-current-diff-overlay #[(type) "ƒ ‚\fÂà !…ƒ ‚Âà !Ä>?…ÅÆÇ\"!É=ƒ4\n‚UË=ƒ@\f‚UÍ=ƒL‚UÏ=…UÑÅÆÒ\"!J!‰Ödd#Lˆ×J\"ˆØJÙ#+‡" [ediff-emacs-p window-system device-type selected-device (tty stream) intern format "ediff-current-diff-overlay-%S" type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C Ancestor ediff-ancestor-buffer face-name "ediff-current-diff-face-%S" face buffer overlay ediff-make-bullet-proof-overlay ediff-set-overlay-face ediff-overlay-put ediff ediff-control-buffer] 8]) (defalias 'ediff-set-overlay-face #[(extent face) "À Â\n#ˆÀ ÃÄ#‡" [ediff-overlay-put extent face help-echo ediff-region-help-echo] 4]) (defalias 'ediff-region-help-echo #[(extent) "À Â\"À Ã\"À Ä\"ʼn … ÊN ƒ3ƒ3ËÌT\"‚G†GƒFËÍT\"‚GΉ-‡" [ediff-overlay-get extent ediff face ediff-diff-num nil help-msg face-help diff-num is-current ediff-help-echo format "Difference region %S -- current" "Difference region %S -- non-current" ""] 5]) #@33 Set face foreground/background. (defalias 'ediff-set-face #[(ground face color) "ƒ ‚\fÂà !…iƒ ‚Âà !Ä>?…iÅ!ƒ=È=ƒ6É\n\"‡Ë\n\"‡\nÌ>ƒJÍÎ\n\"‡\nÏ>ƒ]ÍÐ\n\"ˆÑ\nÒ\"‡\nÓ>…iÍÐ\n\"‡" [ediff-emacs-p window-system device-type selected-device (tty stream) 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 ediff-current-diff-face-Ancestor) copy-face highlight (ediff-fine-diff-face-A ediff-fine-diff-face-B ediff-fine-diff-face-C ediff-fine-diff-face-Ancestor) 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 ediff-even-diff-face-Ancestor ediff-odd-diff-face-Ancestor)] 3 (#$ . 31653)]) (add-to-list (quote facemenu-unlisted-faces) (quote ediff-current-diff-face-A)) #@60 Face for highlighting the selected difference in buffer A. (defvar ediff-current-diff-face-A (byte-code "ƒ ‚\fÂà !…_ƒ ‚Âà !Ä>?…_ÅÆ!ˆÇÆ!„^ƒ4È ‚:Éà !Ê=ƒLËÌÆÍ#ˆËÎÆÏ#ˆ‚^ƒYÑÒÆ\"ˆ‚^ÑÓÆ\"ˆÆ‡" [ediff-emacs-p window-system device-type selected-device (tty stream) make-face ediff-current-diff-face-A face-differs-from-default-p x-display-color-p device-class color ediff-set-face foreground "firebrick" background "pale green" ediff-xemacs-p copy-face modeline highlight] 4) (#$ . 32594)) (add-to-list (quote facemenu-unlisted-faces) (quote ediff-current-diff-face-B)) #@60 Face for highlighting the selected difference in buffer B. (defvar ediff-current-diff-face-B (byte-code "ƒ ‚\fÂà !…_ƒ ‚Âà !Ä>?…_ÅÆ!ˆÇÆ!„^ƒ4È ‚:Éà !Ê=ƒLËÌÆÍ#ˆËÎÆÏ#ˆ‚^ƒYÑÒÆ\"ˆ‚^ÑÓÆ\"ˆÆ‡" [ediff-emacs-p window-system device-type selected-device (tty stream) make-face ediff-current-diff-face-B face-differs-from-default-p x-display-color-p device-class color ediff-set-face foreground "DarkOrchid" background "Yellow" ediff-xemacs-p copy-face modeline highlight] 4) (#$ . 33181)) (add-to-list (quote facemenu-unlisted-faces) (quote ediff-current-diff-face-C)) #@60 Face for highlighting the selected difference in buffer C. (defvar ediff-current-diff-face-C (byte-code "ƒ ‚\fÂà !…_ƒ ‚Âà !Ä>?…_ÅÆ!ˆÇÆ!„^ƒ4È ‚:Éà !Ê=ƒLËÌÆÍ#ˆËÎÆÏ#ˆ‚^ƒYÑÒÆ\"ˆ‚^ÑÓÆ\"ˆÆ‡" [ediff-emacs-p window-system device-type selected-device (tty stream) make-face ediff-current-diff-face-C face-differs-from-default-p x-display-color-p device-class color ediff-set-face foreground "Navy" background "Pink" ediff-xemacs-p copy-face modeline highlight] 4) (#$ . 33765)) (add-to-list (quote facemenu-unlisted-faces) (quote ediff-current-diff-face-Ancestor)) #@71 Face for highlighting the selected difference in the ancestor buffer. (defvar ediff-current-diff-face-Ancestor (byte-code "ƒ ‚\fÂà !…/ƒ ‚Âà !Ä>?…/ÅÆ!ˆÇÆ!†/ÈÉÆ\"‡" [ediff-emacs-p window-system device-type selected-device (tty stream) make-face ediff-current-diff-face-Ancestor face-differs-from-default-p copy-face ediff-current-diff-face-C] 3) (#$ . 34348)) (add-to-list (quote facemenu-unlisted-faces) (quote ediff-fine-diff-face-A)) #@72 Face for highlighting the refinement of the selected diff in buffer A. (defvar ediff-fine-diff-face-A (byte-code "ƒ ‚\fÂà !…Rƒ ‚Âà !Ä>?…RÅÆ!ˆÇÆ!„Qƒ4È ‚:Éà !Ê=ƒLËÌÆÍ#ˆËÎÆÏ#ˆ‚QÐÆÑ\"ˆÆ‡" [ediff-emacs-p window-system device-type selected-device (tty stream) make-face ediff-fine-diff-face-A face-differs-from-default-p x-display-color-p device-class color ediff-set-face foreground "Navy" background "sky blue" set-face-underline-p t] 4) (#$ . 34801)) (add-to-list (quote facemenu-unlisted-faces) (quote ediff-fine-diff-face-B)) #@72 Face for highlighting the refinement of the selected diff in buffer B. (defvar ediff-fine-diff-face-B (byte-code "ƒ ‚\fÂà !…Rƒ ‚Âà !Ä>?…RÅÆ!ˆÇÆ!„Qƒ4È ‚:Éà !Ê=ƒLËÌÆÍ#ˆËÎÆÏ#ˆ‚QÐÆÑ\"ˆÆ‡" [ediff-emacs-p window-system device-type selected-device (tty stream) make-face ediff-fine-diff-face-B face-differs-from-default-p x-display-color-p device-class color ediff-set-face foreground "Black" background "cyan" set-face-underline-p t] 4) (#$ . 35349)) (add-to-list (quote facemenu-unlisted-faces) (quote ediff-fine-diff-face-C)) #@72 Face for highlighting the refinement of the selected diff in buffer C. (defvar ediff-fine-diff-face-C (byte-code "ƒ ‚\fÂà !…Rƒ ‚Âà !Ä>?…RÅÆ!ˆÇÆ!„Qƒ4È ‚:Éà !Ê=ƒLËÌÆÍ#ˆËÎÆÏ#ˆ‚QÐÆÑ\"ˆÆ‡" [ediff-emacs-p window-system device-type selected-device (tty stream) make-face ediff-fine-diff-face-C face-differs-from-default-p x-display-color-p device-class color ediff-set-face foreground "black" background "Turquoise" set-face-underline-p t] 4) (#$ . 35894)) (add-to-list (quote facemenu-unlisted-faces) (quote ediff-fine-diff-face-Ancestor)) #@163 Face highlighting refinements of the selected diff in ancestor buffer. Presently, this is not used, as difference regions are not refined in the ancestor buffer. (defvar ediff-fine-diff-face-Ancestor (byte-code "ƒ ‚\fÂà !…/ƒ ‚Âà !Ä>?…/ÅÆ!ˆÇÆ!†/ÈÉÆ\"‡" [ediff-emacs-p window-system device-type selected-device (tty stream) make-face ediff-fine-diff-face-Ancestor face-differs-from-default-p copy-face ediff-fine-diff-face-C] 3) (#$ . 36452)) (add-to-list (quote facemenu-unlisted-faces) (quote ediff-even-diff-face-A)) #@63 Face used to highlight even-numbered differences in buffer A. (defvar ediff-even-diff-face-A (byte-code "ƒ ‚\fÂà !…Rƒ ‚Âà !Ä>?…RÅÆ!ˆÇÆ!„Qƒ4È ‚:Éà !Ê=ƒLËÌÆÍ#ˆËÎÆÏ#ˆ‚QÐÑÆ\"ˆÆ‡" [ediff-emacs-p window-system device-type selected-device (tty stream) make-face ediff-even-diff-face-A face-differs-from-default-p x-display-color-p device-class color ediff-set-face foreground "black" background "light grey" copy-face italic] 4) (#$ . 36988)) (add-to-list (quote facemenu-unlisted-faces) (quote ediff-even-diff-face-B)) #@63 Face used to highlight even-numbered differences in buffer B. (defvar ediff-even-diff-face-B (byte-code "ƒ ‚\fÂà !…Rƒ ‚Âà !Ä>?…RÅÆ!ˆÇÆ!„Qƒ4È ‚:Éà !Ê=ƒLËÌÆÍ#ˆËÎÆÏ#ˆ‚QÐÑÆ\"ˆÆ‡" [ediff-emacs-p window-system device-type selected-device (tty stream) make-face ediff-even-diff-face-B face-differs-from-default-p x-display-color-p device-class color ediff-set-face foreground "White" background "Gray" copy-face italic] 4) (#$ . 37524)) (add-to-list (quote facemenu-unlisted-faces) (quote ediff-even-diff-face-C)) #@63 Face used to highlight even-numbered differences in buffer C. (defvar ediff-even-diff-face-C (byte-code "ƒ ‚\fÂà !…1ƒ ‚Âà !Ä>?…1ÅÆ!ˆÇÆ!„0ÈÉÆ\"ˆÆ‡" [ediff-emacs-p window-system device-type selected-device (tty stream) make-face ediff-even-diff-face-C face-differs-from-default-p copy-face ediff-even-diff-face-A] 3) (#$ . 38054)) (add-to-list (quote facemenu-unlisted-faces) (quote ediff-even-diff-face-Ancestor)) #@69 Face highlighting even-numbered differences in the ancestor buffer. (defvar ediff-even-diff-face-Ancestor (byte-code "ƒ ‚\fÂà !…1ƒ ‚Âà !Ä>?…1ÅÆ!ˆÇÆ!„0ÈÉÆ\"ˆÆ‡" [ediff-emacs-p window-system device-type selected-device (tty stream) make-face ediff-even-diff-face-Ancestor face-differs-from-default-p copy-face ediff-even-diff-face-C] 3) (#$ . 38485)) (add-to-list (quote facemenu-unlisted-faces) (quote ediff-odd-diff-face-A)) #@62 Face used to highlight odd-numbered differences in buffer A. (defvar ediff-odd-diff-face-A (byte-code "ƒ ‚\fÂà !…Rƒ ‚Âà !Ä>?…RÅÆ!ˆÇÆ!„Qƒ4È ‚:Éà !Ê=ƒLËÌÆÍ#ˆËÎÆÏ#ˆ‚QÐÑÆ\"ˆÆ‡" [ediff-emacs-p window-system device-type selected-device (tty stream) make-face ediff-odd-diff-face-A face-differs-from-default-p x-display-color-p device-class color ediff-set-face foreground "White" background "Gray" copy-face italic] 4) (#$ . 38928)) (add-to-list (quote facemenu-unlisted-faces) (quote ediff-odd-diff-face-B)) #@62 Face used to highlight odd-numbered differences in buffer B. (defvar ediff-odd-diff-face-B (byte-code "ƒ ‚\fÂà !…Rƒ ‚Âà !Ä>?…RÅÆ!ˆÇÆ!„Qƒ4È ‚:Éà !Ê=ƒLËÌÆÍ#ˆËÎÆÏ#ˆ‚QÐÑÆ\"ˆÆ‡" [ediff-emacs-p window-system device-type selected-device (tty stream) make-face ediff-odd-diff-face-B face-differs-from-default-p x-display-color-p device-class color ediff-set-face foreground "Black" background "light grey" copy-face italic] 4) (#$ . 39454)) (add-to-list (quote facemenu-unlisted-faces) (quote ediff-odd-diff-face-C)) #@62 Face used to highlight odd-numbered differences in buffer C. (defvar ediff-odd-diff-face-C (byte-code "ƒ ‚\fÂà !…1ƒ ‚Âà !Ä>?…1ÅÆ!ˆÇÆ!„0ÈÉÆ\"ˆÆ‡" [ediff-emacs-p window-system device-type selected-device (tty stream) make-face ediff-odd-diff-face-C face-differs-from-default-p copy-face ediff-odd-diff-face-A] 3) (#$ . 39986)) (add-to-list (quote facemenu-unlisted-faces) (quote ediff-odd-diff-face-Ancestor)) #@74 Face used to highlight even-numbered differences in the ancestor buffer. (defvar ediff-odd-diff-face-Ancestor (byte-code "ƒ ‚\fÂà !…1ƒ ‚Âà !Ä>?…1ÅÆ!ˆÇÆ!„0ÈÉÆ\"ˆÆ‡" [ediff-emacs-p window-system device-type selected-device (tty stream) make-face ediff-odd-diff-face-Ancestor face-differs-from-default-p copy-face ediff-odd-diff-face-C] 3) (#$ . 40412)) (byte-code "ÀÁÂÃ#ˆÀÄÂÃ#ˆÀÅÂÃ#ˆÀÆÂÃ#‡" [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 (#$ . 40993)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [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 (#$ . 41216)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [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 (#$ . 41439)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [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 (#$ . 41662)) (byte-code "ÀÁ!ˆÂÁÃÄ#‡" [make-variable-buffer-local ediff-current-diff-overlay-Ancestor put permanent-local t] 4) (defalias 'ediff-highest-priority #[(start end buffer) "À S] ƒT‚_pƒTÉ!ƒTÊÉ!!ƒTËŽqˆ\fd\fT^WƒHÍÎ\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]) #@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 (#$ . -42433)) (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 (#$ . -42836)) #@88 *Prefix to put on Ediff temporary file names. Do not start with `~/' or `~user-name/'. (defvar ediff-temp-file-prefix (byte-code "ÀÁ!†ÀÂ!†ÀÃ!ĉƒ$GÇVƒ$‚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) (#$ . -43017)) #@34 *Mode for Ediff temporary files. (defvar ediff-temp-file-mode 384 (#$ . -43369)) #@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!\"#$&'()*;<=>?[\\^`{|~]" (#$ . 43457)) #@66 Temporary file used for refining difference regions in buffer A. (defvar ediff-temp-file-A nil (#$ . 43664)) (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 (#$ . 43875)) (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 (#$ . 44086)) (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)) #@31 Kill buffer BUF if it exists. (defalias 'ediff-kill-buffer-carefully #[(buf) "…Á!…ÂÁ!!…ÃÁ!!‡" [buf get-buffer buffer-name kill-buffer] 3 (#$ . 44930)]) (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 Ancestor] 3 (#$ . 45198)]) (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 Ancestor] 2 (#$ . 45483)]) (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 Ancestor] 2]) (put (quote ediff-unhighlight-diffs-totally) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-background-face #[(buf-type dif-num) "ÀÁ Ä\"Ä=ƒÅ‚Æ\"!‡" [intern format logand dif-num 1 "ediff-even-diff-face-%S" "ediff-odd-diff-face-%S" buf-type] 5]) (put (quote ediff-background-face) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-clear-fine-diff-vector #[(diff-record) "…\nÁÂÃH\"‡" [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\fHÈÉI‡" [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\"!JH‰ƒÇÈÉH\"ˆ)ÃÄÅ\n\"!JHÉÊIˆ*ËÃÄÅ\n\"!JH‰ƒEÇÈÉH\"ˆ)ÃÄÅ\n\"!JHÉÊIˆ*\f…‚ÍÃÄÅ\n\"!JH‰ƒtÇÈÉH\"ˆ)ÃÄÅ\n\"!JHÉÊI*‡" [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-key-press-event-p #[(event) "ƒÁ\n!‡Ã\n!†\n9‡" [ediff-xemacs-p key-press-event-p event char-or-string-p] 2]) (put (quote ediff-key-press-event-p) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-event-point #[(event) " ƒ\fÂ!‚ÃÄÅÆÇ!\"\")ƒ> ƒ!È!‡‰A@)‰ A@:ƒ8 A@@‚< A@)‡ ƒJÊ!‚RË!†R9)ƒX`‡Ì ‡" [event ediff-xemacs-p button-event-p string-match "mouse" format "%S" event-basic-type event-point position key-press-event-p char-or-string-p error] 7]) (defalias 'ediff-event-buffer #[(event) " ƒ\fÂ!‚ÃÄÅÆÇ!\"\")ƒ/ ƒ!È!‡É‰A@)‰\n@)!‡ ƒ;Ë!‚CÌ!†C9)ƒIp‡Í ‡" [event ediff-xemacs-p button-event-p string-match "mouse" format "%S" event-basic-type event-buffer window-buffer position key-press-event-p char-or-string-p error] 7]) (defalias 'ediff-frame-iconified-p #[(frame) "ƒ ‚\fÂà !…8ƒ ‚Âà !Ä>?…8Å!…8ƒ2È!‡É!Ê=‡" [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 do-not-grab-mouse) "„Á \nƒ ‚ÄÅ !…U\nƒ ‚\"ÄÅ !Æ>?…Uƒ5É!\n†T ?†T Ì=ƒN Î>†TÏÐÑ#)‡" [frame selected-frame ediff-emacs-p window-system device-type selected-device (tty stream) frame-or-wind ediff-xemacs-p frame-selected-window do-not-grab-mouse ediff-grab-mouse maybe this-command (ediff-quit ediff-update-diffs) set-mouse-position 1 0] 4]) (defalias 'ediff-spy-after-mouse #[nil "À ‰‡" [mouse-pixel-position ediff-mouse-pixel-position] 2]) (put (quote ediff-spy-after-mouse) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-user-grabbed-mouse #[nil "…F@Á @=?†FA@ƒEÁ A@ƒEAAƒEÁ AAƒEÂA@Á A@Z! W…CÂAAÁ AAZ! W?‡Ä‡" [ediff-mouse-pixel-position mouse-pixel-position abs ediff-mouse-pixel-threshhold nil] 3]) (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?†÷Ã\f\"†÷ÅÆ\f#ÅÇ\f#pÉ=ƒ.\n‚LË=ƒ9\f‚LÁ=ƒD ‚LÎ=ƒìƒìÐÉ=ƒ[\n‚yË=ƒf\f‚yÁ=ƒq ‚yÎ=…y!ƒìÑÐÉ=ƒŠ\n‚¨Ë=ƒ•\f‚¨Á=ƒ  ‚¨Î=…¨!!ƒìÒŽÉ=ƒº\n‚ØË=ƒÅ\f‚ØÁ=ƒÐ ‚ØÎ=…ØqˆŠbˆÔwˆ`Y*‚öÖ=†ö×Ø!+‡" [buf-type C ediff-3way-job ediff-empty-diff-region-p n ediff-get-diff-posn beg end StartBuffer A ediff-buffer-A B ediff-buffer-B ediff-buffer-C Ancestor ediff-ancestor-buffer 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-file-name #[(file &optional dir) ";ƒÁBCÃ\f!)‡ ƒÃ\f!‡Ã\fÆ\"‡" [dir "" directory-abbrev-alist abbreviate-file-name file ediff-emacs-p t] 3]) (put (quote ediff-abbreviate-file-name) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-strip-last-dir #[(dir) ";„ Â!Ã!„Ä!GS H ÇVƒ0ÈUƒ0Ç OÄ!É\n;ƒJËBC\fÍ\n!)‚[ƒVÍ\n!‚[Í\nÏ\",‡" [dir default-directory expand-file-name file-directory-p file-name-directory pos last-char 0 47 nil file "" directory-abbrev-alist abbreviate-file-name ediff-emacs-p t] 3]) (defalias 'ediff-truncate-string-left #[(str newlen) "GÁ‰\fXƒ‚#Å\fÆZ]Å \fZÇZ]ÁOÈ\nP*‡" [str nil substr len newlen 0 3 1 "..."] 5]) (defalias 'ediff-abbrev-jobname #[(jobname) "Á=ƒ‡Ã=ƒćÅ=ƒƇÇ=ƒ ȇÉ=ƒ(ʇË=ƒ0̇Í=ƒ8·Ï=ƒ@ЇÑ=ƒHÒ‡Ó=ƒPÔ‡Õ!Ö×O‰GÚÚWƒ“ÚUƒyH–IˆHÜUƒŠÝIˆT‰‚`+‡" [jobname ediff-directories "Compare two directories" ediff-files "Compare two files" ediff-buffers "Compare two buffers" ediff-directories3 "Compare three directories" ediff-files3 "Compare three files" ediff-buffers3 "Compare three buffers" ediff-revision "Compare file with a version" ediff-directory-revisions "Compare dir files with versions" ediff-merge-directory-revisions "Merge dir files with versions" ediff-merge-directory-revisions-with-ancestor "Merge dir versions via ancestors" symbol-name 6 nil str len 0 pos 45 32] 5]) (defalias 'ediff-get-region-contents #[(n buf-type ctrl-buf &optional start end) "pp ƒH !ƒHà!!ƒHÄŽ qˆ Æ=ƒ&‚D È=ƒ1 ‚D Ê=ƒ< ‚D Ì=…D )‚RÏ=†RÐÑ!)ƒvÂp ƒÂ !ƒÃ !!ƒÒŽ qˆ Æ=ƒ{‚™ È=ƒ† ‚™ Ê=ƒ‘ ‚™ Ì=…™ )‚§Ï=†§ÐÑ!)!ƒvÃÂp ƒô !ƒôà!!ƒôÓŽ qˆ Æ=ƒÒ‚ð È=ƒÝ ‚ð Ê=ƒè ‚ð Ì=…ð )‚þÏ=†þÐÑ!)!!ƒvÔŽp ƒL !ƒLà!!ƒLÕŽ qˆ Æ=ƒ*‚H È=ƒ5 ‚H Ê=ƒ@ ‚H Ì=…H )‚VÏ=†VÐÑ!)qˆ†e× Ø $†q× Ú ${)‚€Ï=†€ÐÑ!)‡" [StartBuffer ctrl-buf get-buffer buffer-name ((set-buffer StartBuffer)) buf-type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C Ancestor ediff-ancestor-buffer 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 "@Á…\fÂ8‰‡" [mode-line-format (" A: " " B: " " C: " " Ancestor: ") 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 (#$ . 54473)]) (put (quote ediff-show-all-diffs) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'Xor #[(a b) "ƒ ?†?… ‡" [a b] 1]) (put (quote Xor) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-message-if-verbose #[(string &rest args) "… Á \f#‡" [ediff-verbose-p apply message string args] 4]) (byte-code "ÀÁÂÃ#ˆÄÅ!‡" [put ediff-message-if-verbose byte-optimizer byte-compile-inline-expand provide ediff-init] 4)