;ELC ;;; compiled by kwzh@nutrimat.gnu.ai.mit.edu on Wed Jul 17 15:44:55 1996 ;;; from file /gd/gnu/emacs/19.0/lisp/ediff.el ;;; emacs version 19.31.94.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.29"))) (error "`ediff.el' was compiled for Emacs 19.29 or later")) #@30 The current version of Ediff (defconst ediff-version "2.61" (#$ . 474)) #@21 Date of last update (defconst ediff-date "June 10, 1996" (#$ . 552)) (byte-code "ÀÁ!ˆÀÂ!‡" [require ediff-init ediff-mult] 2) #@73 *If t, Ediff uses previous directory as default when reading file name. (defvar ediff-use-last-dir nil (#$ . -684)) #@53 Last directory used by an Ediff command for file-A. (defvar ediff-last-dir-A nil (#$ . 806)) #@53 Last directory used by an Ediff command for file-B. (defvar ediff-last-dir-B nil (#$ . 905)) #@53 Last directory used by an Ediff command for file-C. (defvar ediff-last-dir-C nil (#$ . 1004)) #@64 Last directory used by an Ediff command for the ancestor file. (defvar ediff-last-dir-ancestor nil (#$ . 1104)) (byte-code "À B Bà BÀ‡" [cvs-cookie-handle current-load-list ediff-last-dir-patch ediff-patch-default-directory] 2) (defalias 'ediff-set-read-only-in-buf-A #[nil "p ƒ  !ƒ à!!ƒ ÄŽ qˆÅÆ!)‚+È=†+É\n!)‡" [StartBuffer ediff-buffer-A get-buffer buffer-name ((set-buffer StartBuffer)) toggle-read-only 1 this-command ediff-quit error ediff-KILLED-VITAL-BUFFER] 3]) (defalias 'ediff-get-default-file-name #[nil "Á=ƒÂÃÄ\"‰;…Æ !?… )‡Çp!…%ÈÇp!!‡" [major-mode dired-mode dired-get-filename nil no-error f file-directory-p buffer-file-name file-name-nondirectory] 4]) #@50 Run Ediff on a pair of files, FILE-A and FILE-B. (defalias 'ediff-files #[(file-A file-B &optional startup-hooks) "À  !ƒÄÅ ! \"‚ ÆÈ%‡" [ediff-files-internal file-A file-directory-p file-B expand-file-name file-name-nondirectory nil startup-hooks ediff-files] 6 (#$ . 1801) (let ((dir-A (if ediff-use-last-dir ediff-last-dir-A default-directory)) dir-B f) (list (setq f (ediff-read-file-name "File A to compare" dir-A (ediff-get-default-file-name))) (ediff-read-file-name "File B to compare" (setq dir-B (if ediff-use-last-dir ediff-last-dir-B (file-name-directory f))) (progn (setq file-name-history (cons (ediff-abbreviate-file-name (expand-file-name (file-name-nondirectory f) dir-B)) file-name-history)) f))))]) #@55 Run Ediff on three files, FILE-A, FILE-B, and FILE-C. (defalias 'ediff-files3 #[(file-A file-B file-C &optional startup-hooks) "À  !ƒÄÅ ! \"‚ Â!ƒ#ÄÅ !\"‚%È%‡" [ediff-files-internal file-A file-directory-p file-B expand-file-name file-name-nondirectory file-C startup-hooks ediff-files3] 6 (#$ . 2529) (let ((dir-A (if ediff-use-last-dir ediff-last-dir-A default-directory)) dir-B dir-C f ff) (list (setq f (ediff-read-file-name "File A to compare" dir-A (ediff-get-default-file-name))) (setq ff (ediff-read-file-name "File B to compare" (setq dir-B (if ediff-use-last-dir ediff-last-dir-B (file-name-directory f))) (progn (setq file-name-history (cons (ediff-abbreviate-file-name (expand-file-name (file-name-nondirectory f) dir-B)) file-name-history)) f))) (ediff-read-file-name "File C to compare" (setq dir-C (if ediff-use-last-dir ediff-last-dir-C (file-name-directory ff))) (progn (setq file-name-history (cons (ediff-abbreviate-file-name (expand-file-name (file-name-nondirectory ff) dir-C)) file-name-history)) ff))))]) (defalias (quote ediff3) (quote ediff-files3)) (defalias 'ediff-find-file #[(file-var buffer-name &optional last-dir hooks-var) "J Ã\"Å !Ç !„ÈÉ \"ˆ‚&Ê !ƒ&ÈË \"ˆÌ ! ƒ8 ÌÎ !!Lˆà !LˆpJƒ«ÑJ!ƒ«ÏÑJ!!ƒ«ÒŽJqˆ~ˆ\fƒ‚ÓÔ!ˆÕp\"×ØÙ DEJBLˆ‚§Ú !ÚÛ !š„¤Õp\"×ØÙ DEJBLˆ‚§Ó ˆ)‚·Ý=„·È!ˆ) L+‡" [file-var file find-file-name-handler find-file-noselect file-magic file-name-nondirectory temp-file-name-prefix file-readable-p error "File `%s' does not exist or is not readable" file-directory-p "File `%s' is a directory" expand-file-name last-dir file-name-directory buffer-name StartBuffer get-buffer ((set-buffer StartBuffer)) ediff-verify-file-buffer magic ediff-make-temp-file hooks-var lambda nil delete-file file-truename buffer-file-name this-command ediff-quit ediff-KILLED-VITAL-BUFFER] 5]) (defalias 'ediff-files-internal #[(file-A file-B file-C startup-hooks job-name) "À‰‰ÄÅ\"ˆÇÆÃÈÉ$ˆÄÅ\n\"ˆÇÊÂËÉ$ˆ\f;ƒ>ÄÅ\f\"ˆÇÌÁ Î=ƒ:Ï‚;ÐÉ$ˆÑ \n\n \f Ò BC&+‡" [nil buf-C buf-B buf-A message "Reading file %s ... " file-A ediff-find-file ediff-last-dir-A startup-hooks file-B ediff-last-dir-B file-C job-name ediff-merge-files-with-ancestor ediff-last-dir-ancestor ediff-last-dir-C ediff-setup ediff-job-name] 10]) (defalias (quote ediff) (quote ediff-files)) #@56 Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B. (defalias 'ediff-buffers #[(buffer-A buffer-B &optional startup-hooks job-name) "„Á \fÅ%‡" [job-name ediff-buffers ediff-buffers-internal buffer-A buffer-B nil startup-hooks] 6 (#$ . 4881) (let (bf) (list (setq bf (read-buffer "Buffer A to compare: " (ediff-other-buffer "") t)) (read-buffer "Buffer B to compare: " (progn (save-window-excursion (other-window 1)) (ediff-other-buffer bf)) t)))]) (defalias (quote ebuffers) (quote ediff-buffers)) #@63 Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C. (defalias 'ediff-buffers3 #[(buffer-A buffer-B buffer-C &optional startup-hooks job-name) "„Á \f %‡" [job-name ediff-buffers3 ediff-buffers-internal buffer-A buffer-B buffer-C startup-hooks] 6 (#$ . 5396) (let (bf bff) (list (setq bf (read-buffer "Buffer A to compare: " (ediff-other-buffer "") t)) (setq bff (read-buffer "Buffer B to compare: " (progn (save-window-excursion (other-window 1)) (ediff-other-buffer bf)) t)) (read-buffer "Buffer C to compare: " (progn (save-window-excursion (other-window 1)) (ediff-other-buffer (list bf bff))) t)))]) (defalias (quote ebuffers3) (quote ediff-buffers3)) (defalias 'ediff-buffers-internal #[(buf-A buf-B buf-C startup-hooks job-name) "ÀÁ\n!!ÀÁ\f!!…Á!…ÇÁ!!‰…)ÀÁ\f!! Ê Ê\fÊ \nƒFÁ\n!ƒFÇÁ\n!!„KÎÏ\n\"ˆ\fƒ]Á\f!ƒ]ÇÁ\f!!„bÎÏ\f\"ˆƒv„vÎÏ\"ˆ) ;ƒ€Ó ! ;ƒ‰Ó ! ;ƒ•Ó ! Ô\n \" Ô\f \"\fƒ®Ô \" ÕÁ\n! Á\f!\f…ÂÁ! ÖÊ× D×\fDØÙ D× DE¯BÑBC&.‡" [buffer-file-name get-buffer buf-A buf-A-file-name buf-B buf-B-file-name buf-C buffer-name buf-C-is-alive buf-C-file-name nil file-A file-B file-C error "Buffer %S doesn't exist" job-name ediff-job-name ediff-3way-comparison-job file-name-nondirectory ediff-make-temp-file ediff-setup lambda delete-file if stringp startup-hooks] 16]) (defalias 'ediff-get-default-directory-name #[nil "ƒ ‡\nÃ=ƒ'ÄÅÆ\"‰;ƒ#È!ƒ#‚% )‡ ‡" [ediff-use-last-dir ediff-last-dir-A major-mode dired-mode dired-get-filename nil noerror f file-directory-p default-directory] 4]) #@204 Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have the same name in both. The third argument, REGEXP, is a regular expression that can be used to filter out certain file names. (defalias 'ediff-directories #[(dir1 dir2 regexp) "À \nÃ\fÅÆ&‡" [ediff-directories-internal dir1 dir2 nil regexp ediff-files ediff-directories] 7 (#$ . 6978) (let ((dir-A (ediff-get-default-directory-name)) f) (list (setq f (ediff-read-file-name "Directory A to compare:" dir-A nil)) (ediff-read-file-name "Directory B to compare:" (if ediff-use-last-dir ediff-last-dir-B (ediff-strip-last-dir f)) nil) (read-string "Filter through regular expression: " nil (quote ediff-filtering-regexp-history))))]) (defalias (quote edirs) (quote ediff-directories)) #@228 Run Ediff on a directory, DIR1, comparing its files with their revisions. The second argument, REGEXP, is a regular expression that filters the file names. Only the files that are under revision control are taken into account. (defalias 'ediff-directory-revisions #[(dir1 regexp) "À \nÃÄ$‡" [ediff-directory-revisions-internal dir1 regexp ediff-revision ediff-directory-revisions] 5 (#$ . 7742) (let ((dir-A (ediff-get-default-directory-name))) (list (ediff-read-file-name "Directory to compare with revision:" dir-A nil) (read-string "Filter through regular expression: " nil (quote ediff-filtering-regexp-history))))]) (defalias (quote edir-revisions) (quote ediff-directory-revisions)) #@211 Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that have the same name in all three. The last argument, REGEXP, is a regular expression that can be used to filter out certain file names. (defalias 'ediff-directories3 #[(dir1 dir2 dir3 regexp) "À \n \fÅÆ&‡" [ediff-directories-internal dir1 dir2 dir3 regexp ediff-files3 ediff-directories3] 7 (#$ . 8438) (let ((dir-A (ediff-get-default-directory-name)) f) (list (setq f (ediff-read-file-name "Directory A to compare:" dir-A nil)) (setq f (ediff-read-file-name "Directory B to compare:" (if ediff-use-last-dir ediff-last-dir-B (ediff-strip-last-dir f)) nil)) (ediff-read-file-name "Directory C to compare:" (if ediff-use-last-dir ediff-last-dir-C (ediff-strip-last-dir f)) nil) (read-string "Filter through regular expression: " nil (quote ediff-filtering-regexp-history))))]) (defalias (quote edirs3) (quote ediff-directories3)) #@202 Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have the same name in both. The third argument, REGEXP, is a regular expression that can be used to filter out certain file names. (defalias 'ediff-merge-directories #[(dir1 dir2 regexp) "À \nÃ\fÅÆ&‡" [ediff-directories-internal dir1 dir2 nil regexp ediff-merge-files ediff-merge-directories] 7 (#$ . 9348) (let ((dir-A (ediff-get-default-directory-name)) f) (list (setq f (ediff-read-file-name "Directory A to merge:" dir-A nil)) (ediff-read-file-name "Directory B to merge:" (if ediff-use-last-dir ediff-last-dir-B (ediff-strip-last-dir f)) nil) (read-string "Filter through regular expression: " nil (quote ediff-filtering-regexp-history))))]) (defalias (quote edirs-merge) (quote ediff-merge-directories)) #@361 Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors. Ediff merges files that have identical names in DIR1, DIR2. If a pair of files in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge without ancestor. The fourth argument, REGEXP, is a regular expression that can be used to filter out certain file names. (defalias 'ediff-merge-directories-with-ancestor #[(dir1 dir2 ancestor-dir regexp) "À \n \fÅÆ&‡" [ediff-directories-internal dir1 dir2 ancestor-dir regexp ediff-merge-files-with-ancestor ediff-merge-directories-with-ancestor] 7 (#$ . 10136) (let ((dir-A (ediff-get-default-directory-name)) f) (list (setq f (ediff-read-file-name "Directory A to merge:" dir-A nil)) (setq f (ediff-read-file-name "Directory B to merge:" (if ediff-use-last-dir ediff-last-dir-B (ediff-strip-last-dir f)) nil)) (ediff-read-file-name "Ancestor directory:" (if ediff-use-last-dir ediff-last-dir-C (ediff-strip-last-dir f)) nil) (read-string "Filter through regular expression: " nil (quote ediff-filtering-regexp-history))))]) #@226 Run Ediff on a directory, DIR1, merging its files with their revisions. The second argument, REGEXP, is a regular expression that filters the file names. Only the files that are under revision control are taken into account. (defalias 'ediff-merge-directory-revisions #[(dir1 regexp) "À \nÃÄ$‡" [ediff-directory-revisions-internal dir1 regexp ediff-merge-revisions ediff-merge-directory-revisions] 5 (#$ . 11209) (let ((dir-A (ediff-get-default-directory-name))) (list (ediff-read-file-name "Directory to merge with revisions:" dir-A nil) (read-string "Filter through regular expression: " nil (quote ediff-filtering-regexp-history))))]) (defalias (quote edir-merge-revisions) (quote ediff-merge-directory-revisions)) #@240 Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors. The second argument, REGEXP, is a regular expression that filters the file names. Only the files that are under revision control are taken into account. (defalias 'ediff-merge-directory-revisions-with-ancestor #[(dir1 regexp) "À \nÃÄ$‡" [ediff-directory-revisions-internal dir1 regexp ediff-merge-revisions-with-ancestor ediff-merge-directory-revisions-with-ancestor] 5 (#$ . 11934) (let ((dir-A (ediff-get-default-directory-name))) (list (ediff-read-file-name "Directory to merge with revisions and ancestors:" dir-A nil) (read-string "Filter through regular expression: " nil (quote ediff-filtering-regexp-history))))]) (byte-code "ÀÁÂ\"ˆÀÃÄ\"‡" [defalias edir-merge-revisions-with-ancestor ediff-merge-directory-revisions-with-ancestor edirs-merge-with-ancestor ediff-merge-directories-with-ancestor] 3) (defalias 'ediff-directories-internal #[(dir1 dir2 dir3 regexp action jobname &optional startup-hooks) "À !ƒ\n ‚  !À !ƒ ‚ !\f;ƒ/À\f!ƒ+\f‚.Â\f! ˜ƒ=ÅÆ \"ˆ‚dÈ=ƒR \f˜ƒRÅÉ \"ˆ‚dÈ=ƒd \f˜ƒdÅÊ \"ˆË‰‰\f ÏÎ \f& ÑËÒÓÔDEÒÖÔDEFBØÙ ÚÛ&\fÜ\f!+‡" [file-directory-p dir1 file-name-directory dir2 dir3 error "Directories A and B are the same: %s" jobname ediff-directories3 "Directories A and C are the same: %s" "Directories B and C are the same: %s" nil meta-buf file-list diffs ediff-intersect-directories regexp lambda setq ediff-session-action-function quote action ediff-dir-difference-list startup-hooks ediff-prepare-meta-buffer ediff-filegroup-action "*Ediff Session Group Panel" ediff-redraw-directory-group-buffer ediff-show-meta-buffer] 7]) (defalias 'ediff-directory-revisions-internal #[(dir1 regexp action jobname &optional startup-hooks) "À !ƒ\n ‚  !ÉÆ #ÉÃÊËÌ DEEBÏÐ ÑÒ&Ó\f!*‡" [file-directory-p dir1 file-name-directory nil meta-buf file-list ediff-get-directory-files-under-revision jobname regexp lambda setq ediff-session-action-function quote action startup-hooks ediff-prepare-meta-buffer ediff-filegroup-action "*Ediff Session Group Panel" ediff-redraw-directory-group-buffer ediff-show-meta-buffer] 7]) #@236 Compare WIND-A and WIND-B, which are selected by clicking, wordwise. With prefix argument, DUMB-MODE, or on a non-windowing display, works as follows: If WIND-A is nil, use selected window. If WIND-B is nil, use window next to WIND-A. (defalias 'ediff-windows-wordwise #[(dumb-mode &optional wind-A wind-B startup-hooks) "À \n \fÅÆ&‡" [ediff-windows dumb-mode wind-A wind-B startup-hooks ediff-windows-wordwise word-mode] 7 (#$ . 14119) "P"]) #@236 Compare WIND-A and WIND-B, which are selected by clicking, linewise. With prefix argument, DUMB-MODE, or on a non-windowing display, works as follows: If WIND-A is nil, use selected window. If WIND-B is nil, use window next to WIND-A. (defalias 'ediff-windows-linewise #[(dumb-mode &optional wind-A wind-B startup-hooks) "À \n \fÅÆ&‡" [ediff-windows dumb-mode wind-A wind-B startup-hooks ediff-windows-linewise nil] 7 (#$ . 14570) "P"]) (defalias 'ediff-windows #[(dumb-mode wind-A wind-B startup-hooks job-name word-mode) "„ Á „B\nÃÆ !†!\fƒÇ !‚È ‰* \nÆ !†<\fƒ8Ç !‚:È ‰* ‚PÊ\nÃË#Ê \nÌ# Í\n!Í !ɉ‰ŠÔ‹ˆ)Õ& .‡" [dumb-mode ediff-window-display-p wind-A nil prev-wind wind window-live-p next-window selected-window wind-B ediff-get-window-by-clicking 1 2 window-buffer end-B beg-B end-A beg-A buffer-B buffer-A ((byte-code "ÀÁ!ˆÂ !ˆÄ Æ Â!ˆÄ  Æ \nÀ‡" [sit-for 0 select-window wind-A window-start beg-A window-end end-A wind-B beg-B end-B] 2)) ediff-regions-internal startup-hooks job-name word-mode] 10]) #@251 Run Ediff on a pair of regions in two different buffers. Regions (i.e., point and mark) are assumed to be set in advance. This function is effective only for relatively small regions, up to 200 lines. For large regions, use `ediff-regions-linewise'. (defalias 'ediff-regions-wordwise #[(buffer-A buffer-B &optional startup-hooks) "ƒÁ!ƒÂÁ!!„ÃÄ\"ˆ ƒ)Á !ƒ)ÂÁ !!„.ÃÄ \"ˆÆ‰‰‰ \nŠqˆË \nÌ  qˆË Ì )ÍÁ!\n Á !ÏÐ& ,‡" [buffer-A get-buffer buffer-name error "Buffer %S doesn't exist" buffer-B nil reg-B-end reg-B-beg reg-A-end reg-A-beg region-beginning region-end ediff-regions-internal startup-hooks ediff-regions-wordwise word-mode] 10 (#$ . 15641) (let (bf) (list (setq bf (read-buffer "Region's A buffer: " (ediff-other-buffer "") t)) (read-buffer "Region's B buffer: " (progn (save-window-excursion (other-window 1)) (ediff-other-buffer bf)) t)))]) #@285 Run Ediff on a pair of regions in two different buffers. Regions (i.e., point and mark) are assumed to be set in advance. Each region is enlarged to contain full lines. This function is effective for large regions, over 100-200 lines. For small regions, use `ediff-regions-wordwise'. (defalias 'ediff-regions-linewise #[(buffer-A buffer-B &optional startup-hooks) "ƒÁ!ƒÂÁ!!„ÃÄ\"ˆ ƒ)Á !ƒ)ÂÁ !!„.ÃÄ \"ˆÆ‰‰‰ \nŠqˆË \nÌ  \nbˆÍyˆ`\n bˆÆˆm„^Æuˆ` qˆË Ì \nbˆbˆÍyˆ`bˆÆˆm„ˆÆuˆ`)ÎÁ!\n Á !ÐÆ& ,‡" [buffer-A get-buffer buffer-name error "Buffer %S doesn't exist" buffer-B nil reg-B-end reg-B-beg reg-A-end reg-A-beg region-beginning region-end 0 ediff-regions-internal startup-hooks ediff-regions-linewise] 10 (#$ . 16527) (let (bf) (list (setq bf (read-buffer "Region A's buffer: " (ediff-other-buffer "") t)) (read-buffer "Region B's buffer: " (progn (save-window-excursion (other-window 1)) (ediff-other-buffer bf)) t)))]) (defalias 'ediff-regions-internal #[(buffer-A beg-A end-A buffer-B beg-B end-B startup-hooks job-name word-mode) "À !‰‰‰p ƒ@Ê !ƒ@ËÊ !!ƒ@ÌŽ qˆÍ “Í “)‚LÑ=„LÒ!ˆ)pƒÊ!ƒËÊ!!ƒÕŽqˆÍ “Í “)‚‹Ñ=„‹Ò!ˆ) =ƒÈWƒ¤X„´WƒÈXƒÈÙÚ!‘ˆÛÜ!„ÈÒÝ\"ˆƒÛà $ˆ‚æá $ˆâã\"ƒÿà$ˆ‚\ná$ˆâä\"å #å#æ \f ‰çÂè\fDè DF)BêBë DBìBE&-‡" [get-buffer-create ediff-tmp-buffer nil file-B file-A overl-B overl-A tmp-buffer StartBuffer buffer-A get-buffer buffer-name ((set-buffer StartBuffer)) make-marker beg-A end-A this-command ediff-quit error ediff-KILLED-VITAL-BUFFER buffer-B ((set-buffer StartBuffer)) beg-B end-B ediff-msg-buffer princ "\nYou have requested to compare overlapping regions of the same buffer.\n\nIn this case, Ediff's highlighting may be confusing---in the same window,\nyou may see highlighted regions that belong to different regions.\n\nContinue anyway? (y/n) " y-or-n-p "Continue anyway? " "%S aborted" job-name word-mode ediff-wordify ediff-copy-to-buffer ediff-make-temp-file "regA" "regB" ediff-make-bullet-proof-overlay ediff-setup lambda delete-file startup-hooks ediff-word-mode ediff-narrow-bounds ediff-job-name] 12]) (defalias (quote ediff-merge) (quote ediff-merge-files)) (defalias 'ediff-merge-on-startup #[nil "ÀÁ!ˆp ƒ$Ä !ƒ$ÅÄ !!ƒ$ÆŽ qˆÇÈ!)‚/ Ê=†/Ë\f!)‡" [ediff-do-merge 0 StartBuffer ediff-buffer-C get-buffer buffer-name ((set-buffer StartBuffer)) set-buffer-modified-p nil this-command ediff-quit error ediff-KILLED-VITAL-BUFFER] 3]) (put (quote ediff-merge-on-startup) (quote byte-optimizer) (quote byte-compile-inline-expand)) #@35 Merge two files without ancestor. (defalias 'ediff-merge-files #[(file-A file-B &optional startup-hooks) "À BÂ Ä !ƒÆÇ ! \"‚ È É%‡" [ediff-merge-on-startup startup-hooks ediff-files-internal file-A file-directory-p file-B expand-file-name file-name-nondirectory nil ediff-merge-files] 6 (#$ . 19192) (let ((dir-A (if ediff-use-last-dir ediff-last-dir-A default-directory)) dir-B f) (list (setq f (ediff-read-file-name "File A to merge" dir-A (ediff-get-default-file-name))) (ediff-read-file-name "File B to merge" (setq dir-B (if ediff-use-last-dir ediff-last-dir-B (file-name-directory f))) (progn (setq file-name-history (cons (ediff-abbreviate-file-name (expand-file-name (file-name-nondirectory f) dir-B)) file-name-history)) f))))]) #@32 Merge two files with ancestor. (defalias 'ediff-merge-files-with-ancestor #[(file-A file-B file-ancestor &optional startup-hooks) "À BÂ Ä !ƒÆÇ ! \"‚  É%‡" [ediff-merge-on-startup startup-hooks ediff-files-internal file-A file-directory-p file-B expand-file-name file-name-nondirectory file-ancestor ediff-merge-files-with-ancestor] 6 (#$ . 19940) (let ((dir-A (if ediff-use-last-dir ediff-last-dir-A default-directory)) dir-B dir-ancestor f ff) (list (setq f (ediff-read-file-name "File A to merge" dir-A (ediff-get-default-file-name))) (setq ff (ediff-read-file-name "File B to merge" (setq dir-B (if ediff-use-last-dir ediff-last-dir-B (file-name-directory f))) (progn (setq file-name-history (cons (ediff-abbreviate-file-name (expand-file-name (file-name-nondirectory f) dir-B)) file-name-history)) f))) (ediff-read-file-name "Ancestor file" (setq dir-ancestor (if ediff-use-last-dir ediff-last-dir-ancestor (file-name-directory ff))) (progn (setq file-name-history (cons (ediff-abbreviate-file-name (expand-file-name (file-name-nondirectory ff) dir-ancestor)) file-name-history)) ff))))]) (defalias (quote ediff-merge-with-ancestor) (quote ediff-merge-files-with-ancestor)) #@33 Merge buffers without ancestor. (defalias 'ediff-merge-buffers #[(buffer-A buffer-B &optional startup-hooks job-name) "À B\n„\nÃÄ Ç \n%‡" [ediff-merge-on-startup startup-hooks job-name ediff-merge-buffers ediff-buffers-internal buffer-A buffer-B nil] 6 (#$ . 21131) (let (bf) (list (setq bf (read-buffer "Buffer A to merge: " (ediff-other-buffer "") t)) (read-buffer "Buffer B to merge: " (progn (save-window-excursion (other-window 1)) (ediff-other-buffer bf)) t)))]) #@30 Merge buffers with ancestor. (defalias 'ediff-merge-buffers-with-ancestor #[(buffer-A buffer-B buffer-ancestor &optional startup-hooks job-name) "À B\n„\nÃÄ  \n%‡" [ediff-merge-on-startup startup-hooks job-name ediff-merge-buffers-with-ancestor ediff-buffers-internal buffer-A buffer-B buffer-ancestor] 6 (#$ . 21611) (let (bf bff) (list (setq bf (read-buffer "Buffer A to merge: " (ediff-other-buffer "") t)) (setq bff (read-buffer "Buffer B to merge: " (progn (save-window-excursion (other-window 1)) (ediff-other-buffer bf)) t)) (read-buffer "Ancestor buffer: " (progn (save-window-excursion (other-window 1)) (ediff-other-buffer (list bf bff))) t)))]) #@129 Run Ediff by merging two revisions of a file. The file is the optional FILE argument or the file visited by the current buffer. (defalias 'ediff-merge-revisions #[(&optional file startup-hooks) ";ƒ Á!ˆÂ‰ÅÆÇ;ƒÈ!‚É\"!ÅÆÊ;ƒ-È!‚.É\"!Ë ˆÌÆÍ\"!\f Â$*‡" [file find-file nil rev2 rev1 read-string format "Version 1 to merge (default: %s's latest version): " file-name-nondirectory "current buffer" "Version 2 to merge (default: %s): " ediff-load-version-control intern "%S-ediff-merge-internal" ediff-version-control-package startup-hooks] 5 (#$ . 22281) nil]) #@156 Run Ediff by merging two revisions of a file with a common ancestor. The file is the the optional FILE argument or the file visited by the current buffer. (defalias 'ediff-merge-revisions-with-ancestor #[(&optional file startup-hooks) ";ƒ Á!ˆÂ‰‰ÆÇÈ;ƒÉ!‚Ê\"!ÆÇË;ƒ/É!‚0Ê\"!ÆÇÌ;ƒAÉ!‚BÊ\"!Í ˆÎÇÏ\"! \f $+‡" [file find-file nil ancestor-rev rev2 rev1 read-string format "Version 1 to merge (default: %s's latest version): " file-name-nondirectory "current buffer" "Version 2 to merge (default: %s): " "Ancestor version (default: %s): " ediff-load-version-control intern "%S-ediff-merge-internal" ediff-version-control-package startup-hooks] 5 (#$ . 22862) nil]) #@190 Run Ediff-merge on appropriate revisions of the selected file. First run after `M-x cvs-update'. Then place the cursor on a lide describing a file and then run `run-ediff-from-cvs-buffer'. (defalias 'run-ediff-from-cvs-buffer #[(pos) "À ˆÁ\n \"‰ƒÅ\f!‚ÆÇ!)‡" [ediff-load-version-control tin-locate cvs-cookie-handle pos tin cvs-run-ediff-on-file-descriptor error "There is no file to merge"] 4 (#$ . 23553) "d"]) #@40 Run Ediff by patching SOURCE-FILENAME. (defalias 'ediff-patch-file #[nil "À‰‰ÄÅ!ˆÆ ƒ‚. „,Ê !ƒ,ËÌÊ !!!‚. ÎÏ ‰#Ð \n\"+‡" [nil patch-buf source-file source-dir require ediff-ptch ediff-get-patch-buffer ediff-use-last-dir ediff-last-dir-patch ediff-patch-default-directory buffer-file-name file-name-directory expand-file-name default-directory ediff-read-file-name "Which file to patch? " ediff-dispatch-file-patching-job] 4 (#$ . 23976) nil]) #@36 Run Ediff by patching BUFFER-NAME. (defalias 'ediff-patch-buffer #[nil "ÀÂÃ!ˆÄ Å ÆÇ p=ƒÈÉÊ!!‚pË#\")‡" [nil patch-buf require ediff-ptch ediff-get-patch-buffer ediff-patch-buffer-internal read-buffer "Which buffer to patch? " window-buffer other-window 1 must-match] 7 (#$ . 24441) nil]) (byte-code "ÀÁÂ\"ˆÀÃÄ\"‡" [defalias epatch ediff-patch-file epatch-buffer ediff-patch-buffer] 3) #@195 Run Ediff by comparing versions of a file. The file is an optional FILE argument or the file visited by the current buffer. Use `vc.el' or `rcs.el' depending on `ediff-version-control-package'. (defalias 'ediff-revision #[(&optional file startup-hooks) ";ƒ Á!ˆÂ‰ÅÆÇ;ƒÈ!‚É\"!ÅÆÊ;ƒ-È!‚.É\"!Ë ˆÌÆÍ\"!\f #*‡" [file find-file nil rev2 rev1 read-string format "Version 1 to compare (default: %s's latest version): " file-name-nondirectory "current buffer" "Version 2 to compare (default: %s): " ediff-load-version-control intern "%S-ediff-internal" ediff-version-control-package startup-hooks] 5 (#$ . 24838) "P"]) (defalias 'ediff-load-version-control #[(&optional silent) "ÀÁ!ˆÂ !†#ÄÅ !!ƒÆÇ!ˆÀ !‡†#ÉÊ \"‡" [require ediff-vers featurep ediff-version-control-package locate-library symbol-name message "" silent error "Version control package %S.el not found. Use vc.el instead"] 3]) #@97 Return string describing the version of Ediff. When called interactively, displays the version. (defalias 'ediff-version #[nil "tƒ ÀÁ !‡Âà \f#‡" [message ediff-version format "Ediff %s of %s" ediff-date] 4 (#$ . 25749) nil]) #@25 Display Ediff's manual. (defalias 'ediff-documentation #[nil " Ä ˆÅÆÇ*‡" [ediff-control-window ediff-control-buffer ctl-buf ctl-window ediff-skip-unsuitable-frames nil (byte-code "ÀÁÂ!!ˆÃ\fƒÅ‚Æ!ˆÇÈ!‡" [pop-to-buffer get-buffer-create "*info*" info ediff-xemacs-p "ediff.info" "ediff" message "Type `i' to search for a specific topic"] 3) ((error (byte-code "ÀÁ!ˆ\nÃÄŃǂÈ\"!‘ˆÉ\n!…)Ë\n!ˆÌ\n \"‡" [beep 1 ediff-msg-buffer princ format "\nThe Info file for Ediff does not seem to be installed.\n\nThis file is part of the distribution of %sEmacs.\nPlease contact your system administrator. " ediff-xemacs-p "X" "" window-live-p ctl-window select-window set-window-buffer ctl-buf] 5)))] 3 (#$ . 25981) nil]) (byte-code "ÀÁ!ˆÂÃ!‡" [provide ediff require ediff-util] 2)