Linux ns8.secondary29.go.th 2.6.32-754.28.1.el6.x86_64 #1 SMP Wed Mar 11 18:38:45 UTC 2020 x86_64
Apache/2.2.15 (CentOS)
: 122.154.134.11 | : 122.154.134.9
Cant Read [ /etc/named.conf ]
5.6.40
apache
www.github.com/MadExploits
Terminal
AUTO ROOT
Adminer
Backdoor Destroyer
Linux Exploit
Lock Shell
Lock File
Create User
CREATE RDP
PHP Mailer
BACKCONNECT
UNLOCK SHELL
HASH IDENTIFIER
CPANEL RESET
CREATE WP USER
README
+ Create Folder
+ Create File
/
usr /
share /
emacs /
23.1 /
lisp /
[ HOME SHELL ]
Name
Size
Permission
Action
calc
[ DIR ]
drwxr-xr-x
calendar
[ DIR ]
drwxr-xr-x
emacs-lisp
[ DIR ]
drwxr-xr-x
emulation
[ DIR ]
drwxr-xr-x
erc
[ DIR ]
drwxr-xr-x
eshell
[ DIR ]
drwxr-xr-x
gnus
[ DIR ]
drwxr-xr-x
international
[ DIR ]
drwxr-xr-x
language
[ DIR ]
drwxr-xr-x
mail
[ DIR ]
drwxr-xr-x
mh-e
[ DIR ]
drwxr-xr-x
net
[ DIR ]
drwxr-xr-x
nxml
[ DIR ]
drwxr-xr-x
obsolete
[ DIR ]
drwxr-xr-x
org
[ DIR ]
drwxr-xr-x
play
[ DIR ]
drwxr-xr-x
progmodes
[ DIR ]
drwxr-xr-x
term
[ DIR ]
drwxr-xr-x
textmodes
[ DIR ]
drwxr-xr-x
url
[ DIR ]
drwxr-xr-x
COPYING
34.32
KB
-rw-r--r--
README
538
B
-rw-r--r--
abbrev.elc
29.69
KB
-rw-r--r--
abbrevlist.elc
1.12
KB
-rw-r--r--
add-log.elc
35.21
KB
-rw-r--r--
align.elc
38.38
KB
-rw-r--r--
allout.elc
208.3
KB
-rw-r--r--
ansi-color.elc
16.3
KB
-rw-r--r--
apropos.elc
31.93
KB
-rw-r--r--
arc-mode.elc
54.72
KB
-rw-r--r--
array.elc
25.83
KB
-rw-r--r--
autoarg.elc
5.98
KB
-rw-r--r--
autoinsert.elc
12.01
KB
-rw-r--r--
autorevert.elc
18.25
KB
-rw-r--r--
avoid.elc
10.17
KB
-rw-r--r--
battery.elc
17.98
KB
-rw-r--r--
bindings.elc
39.04
KB
-rw-r--r--
bookmark.elc
55.9
KB
-rw-r--r--
bs.elc
48.34
KB
-rw-r--r--
buff-menu.elc
28
KB
-rw-r--r--
button.elc
13.92
KB
-rw-r--r--
calculator.elc
49.18
KB
-rw-r--r--
case-table.elc
4.42
KB
-rw-r--r--
cdl.elc
1.26
KB
-rw-r--r--
chistory.elc
5.75
KB
-rw-r--r--
cmuscheme.elc
17.43
KB
-rw-r--r--
comint.elc
100.97
KB
-rw-r--r--
compare-w.elc
10.98
KB
-rw-r--r--
complete.elc
23.62
KB
-rw-r--r--
completion.elc
45.06
KB
-rw-r--r--
composite.elc
29.39
KB
-rw-r--r--
cus-dep.elc
5.04
KB
-rw-r--r--
cus-edit.elc
129.67
KB
-rw-r--r--
cus-face.elc
10.46
KB
-rw-r--r--
cus-load.el
63.45
KB
-rw-r--r--
cus-start.elc
10.67
KB
-rw-r--r--
cus-theme.elc
13.7
KB
-rw-r--r--
custom.elc
36.46
KB
-rw-r--r--
cvs-status.elc
23
KB
-rw-r--r--
dabbrev.elc
23.08
KB
-rw-r--r--
delim-col.elc
8.41
KB
-rw-r--r--
delsel.elc
5.24
KB
-rw-r--r--
descr-text.elc
20.69
KB
-rw-r--r--
desktop.elc
34.52
KB
-rw-r--r--
dframe.elc
22.51
KB
-rw-r--r--
diff-mode.elc
55.58
KB
-rw-r--r--
diff.elc
5.51
KB
-rw-r--r--
dired-aux.elc
67.5
KB
-rw-r--r--
dired-x.elc
44.96
KB
-rw-r--r--
dired.elc
96.48
KB
-rw-r--r--
dirtrack.elc
7.39
KB
-rw-r--r--
disp-table.elc
8.33
KB
-rw-r--r--
dnd.elc
7.04
KB
-rw-r--r--
doc-view.elc
36.01
KB
-rw-r--r--
dos-fns.elc
5.53
KB
-rw-r--r--
dos-vars.elc
1.24
KB
-rw-r--r--
dos-w32.elc
11.12
KB
-rw-r--r--
double.elc
4.13
KB
-rw-r--r--
ebuff-menu.elc
9.11
KB
-rw-r--r--
echistory.elc
4.93
KB
-rw-r--r--
ediff-diff.elc
35.54
KB
-rw-r--r--
ediff-help.elc
11.47
KB
-rw-r--r--
ediff-hook.elc
5.89
KB
-rw-r--r--
ediff-init.elc
60.88
KB
-rw-r--r--
ediff-merg.elc
10.04
KB
-rw-r--r--
ediff-mult.elc
58.31
KB
-rw-r--r--
ediff-ptch.elc
18.63
KB
-rw-r--r--
ediff-util.elc
118.44
KB
-rw-r--r--
ediff-vers.elc
4.74
KB
-rw-r--r--
ediff-wind.elc
30.56
KB
-rw-r--r--
ediff.elc
36.28
KB
-rw-r--r--
edmacro.elc
21.45
KB
-rw-r--r--
ehelp.elc
11.03
KB
-rw-r--r--
electric.elc
2.81
KB
-rw-r--r--
elide-head.elc
2.8
KB
-rw-r--r--
emacs-lock.elc
2.77
KB
-rw-r--r--
emerge.elc
80.16
KB
-rw-r--r--
env.elc
5.69
KB
-rw-r--r--
epa-dired.elc
1.87
KB
-rw-r--r--
epa-file.elc
6.77
KB
-rw-r--r--
epa-hook.elc
4.28
KB
-rw-r--r--
epa-mail.elc
7.04
KB
-rw-r--r--
epa.elc
34.03
KB
-rw-r--r--
epg-config.elc
4.01
KB
-rw-r--r--
epg.elc
85.05
KB
-rw-r--r--
expand.elc
9.42
KB
-rw-r--r--
ezimage.elc
9.2
KB
-rw-r--r--
face-remap.elc
13.15
KB
-rw-r--r--
facemenu.elc
23.61
KB
-rw-r--r--
faces.elc
81.51
KB
-rw-r--r--
ffap.elc
46.14
KB
-rw-r--r--
filecache.elc
16.1
KB
-rw-r--r--
files.elc
175.25
KB
-rw-r--r--
filesets.elc
73.03
KB
-rw-r--r--
find-cmd.elc
4.94
KB
-rw-r--r--
find-dired.elc
7.4
KB
-rw-r--r--
find-file.elc
18.68
KB
-rw-r--r--
find-lisp.elc
7.42
KB
-rw-r--r--
finder-inf.el
93.47
KB
-rw-r--r--
finder.elc
12.11
KB
-rw-r--r--
flow-ctrl.elc
2.44
KB
-rw-r--r--
foldout.elc
7.6
KB
-rw-r--r--
follow.elc
37.11
KB
-rw-r--r--
font-core.elc
12.92
KB
-rw-r--r--
font-lock.elc
61.1
KB
-rw-r--r--
format-spec.elc
1.98
KB
-rw-r--r--
format.elc
27.73
KB
-rw-r--r--
forms-d2.el
3.13
KB
-rw-r--r--
forms-pass.el
742
B
-rw-r--r--
forms.elc
35.13
KB
-rw-r--r--
frame.elc
48.66
KB
-rw-r--r--
fringe.elc
8.01
KB
-rw-r--r--
generic-x.elc
44.25
KB
-rw-r--r--
gs.elc
3.93
KB
-rw-r--r--
help-at-pt.elc
11.27
KB
-rw-r--r--
help-fns.elc
21.77
KB
-rw-r--r--
help-macro.elc
4.37
KB
-rw-r--r--
help-mode.elc
19.38
KB
-rw-r--r--
help.elc
40.91
KB
-rw-r--r--
hex-util.elc
1.48
KB
-rw-r--r--
hexl.elc
32.06
KB
-rw-r--r--
hi-lock.elc
23.27
KB
-rw-r--r--
hilit-chg.elc
28.02
KB
-rw-r--r--
hippie-exp.elc
23.39
KB
-rw-r--r--
hl-line.elc
7.71
KB
-rw-r--r--
ibuf-ext.elc
54.62
KB
-rw-r--r--
ibuf-macs.elc
11.65
KB
-rw-r--r--
ibuffer.elc
91.96
KB
-rw-r--r--
icomplete.elc
10.36
KB
-rw-r--r--
ido.elc
110.93
KB
-rw-r--r--
ielm.elc
17.67
KB
-rw-r--r--
iimage.elc
4.06
KB
-rw-r--r--
image-dired.elc
82.24
KB
-rw-r--r--
image-file.elc
6.11
KB
-rw-r--r--
image-mode.elc
14.54
KB
-rw-r--r--
image.elc
17.09
KB
-rw-r--r--
imenu.elc
24.8
KB
-rw-r--r--
indent.elc
17
KB
-rw-r--r--
info-look.elc
26.13
KB
-rw-r--r--
info-xref.elc
7.04
KB
-rw-r--r--
info.elc
119.11
KB
-rw-r--r--
informat.elc
9.69
KB
-rw-r--r--
isearch.elc
76.23
KB
-rw-r--r--
isearchb.elc
4.92
KB
-rw-r--r--
iswitchb.elc
32.11
KB
-rw-r--r--
jit-lock.elc
17.93
KB
-rw-r--r--
jka-cmpr-hook.elc
11.67
KB
-rw-r--r--
jka-compr.elc
12.64
KB
-rw-r--r--
json.elc
13.04
KB
-rw-r--r--
kermit.elc
2.96
KB
-rw-r--r--
kmacro.elc
31.07
KB
-rw-r--r--
ldefs-boot.el
1.17
MB
-rw-r--r--
ledit.elc
4.74
KB
-rw-r--r--
linum.elc
9.56
KB
-rw-r--r--
loaddefs.el
1.17
MB
-rw-r--r--
loadhist.elc
8.65
KB
-rw-r--r--
loadup.el
12.67
KB
-rw-r--r--
locate.elc
17.81
KB
-rw-r--r--
log-edit.elc
24.93
KB
-rw-r--r--
log-view.elc
14.06
KB
-rw-r--r--
longlines.elc
14.94
KB
-rw-r--r--
lpr.elc
8.61
KB
-rw-r--r--
ls-lisp.elc
17.35
KB
-rw-r--r--
macros.elc
6.99
KB
-rw-r--r--
makesum.elc
2.16
KB
-rw-r--r--
man.elc
40.03
KB
-rw-r--r--
master.elc
4.52
KB
-rw-r--r--
mb-depth.elc
3.12
KB
-rw-r--r--
md4.elc
8.14
KB
-rw-r--r--
menu-bar.elc
67.01
KB
-rw-r--r--
midnight.elc
8.92
KB
-rw-r--r--
minibuf-eldef.elc
5.15
KB
-rw-r--r--
minibuffer.elc
42.75
KB
-rw-r--r--
misc.elc
3.67
KB
-rw-r--r--
misearch.elc
8.96
KB
-rw-r--r--
mouse-copy.elc
4.07
KB
-rw-r--r--
mouse-drag.elc
7.33
KB
-rw-r--r--
mouse-sel.elc
20.93
KB
-rw-r--r--
mouse.elc
60.03
KB
-rw-r--r--
msb.elc
27.27
KB
-rw-r--r--
mwheel.elc
9.41
KB
-rw-r--r--
newcomment.elc
32.76
KB
-rw-r--r--
novice.elc
4.75
KB
-rw-r--r--
outline.elc
34.54
KB
-rw-r--r--
paren.elc
6.43
KB
-rw-r--r--
password-cache.elc
3.58
KB
-rw-r--r--
patcomp.el
775
B
-rw-r--r--
paths.el
7.28
KB
-rw-r--r--
pcmpl-cvs.elc
6
KB
-rw-r--r--
pcmpl-gnu.elc
8.21
KB
-rw-r--r--
pcmpl-linux.elc
3.17
KB
-rw-r--r--
pcmpl-rpm.elc
7.5
KB
-rw-r--r--
pcmpl-unix.elc
5.44
KB
-rw-r--r--
pcomplete.elc
34.1
KB
-rw-r--r--
pcvs-defs.elc
16.27
KB
-rw-r--r--
pcvs-info.elc
25.83
KB
-rw-r--r--
pcvs-parse.elc
15.34
KB
-rw-r--r--
pcvs-util.elc
26.8
KB
-rw-r--r--
pcvs.elc
85.52
KB
-rw-r--r--
pgg-def.elc
2.78
KB
-rw-r--r--
pgg-gpg.elc
13.09
KB
-rw-r--r--
pgg-parse.elc
13.45
KB
-rw-r--r--
pgg-pgp.elc
7.64
KB
-rw-r--r--
pgg-pgp5.elc
7.68
KB
-rw-r--r--
pgg.elc
18.01
KB
-rw-r--r--
printing.elc
157.56
KB
-rw-r--r--
proced.elc
57.95
KB
-rw-r--r--
ps-bdf.elc
13.34
KB
-rw-r--r--
ps-def.elc
3.09
KB
-rw-r--r--
ps-mule.elc
36.17
KB
-rw-r--r--
ps-print.elc
145.59
KB
-rw-r--r--
ps-samp.elc
5.5
KB
-rw-r--r--
recentf.elc
49.04
KB
-rw-r--r--
rect.elc
10.79
KB
-rw-r--r--
register.elc
10.69
KB
-rw-r--r--
repeat.elc
6.05
KB
-rw-r--r--
replace.elc
55.02
KB
-rw-r--r--
reposition.elc
2.88
KB
-rw-r--r--
reveal.elc
6.61
KB
-rw-r--r--
rfn-eshadow.elc
7.12
KB
-rw-r--r--
rot13.elc
2.6
KB
-rw-r--r--
ruler-mode.elc
22.48
KB
-rw-r--r--
s-region.elc
3.3
KB
-rw-r--r--
savehist.elc
10.57
KB
-rw-r--r--
saveplace.elc
7.51
KB
-rw-r--r--
sb-image.elc
2.51
KB
-rw-r--r--
scroll-all.elc
4.05
KB
-rw-r--r--
scroll-bar.elc
11.47
KB
-rw-r--r--
scroll-lock.elc
4.64
KB
-rw-r--r--
select.elc
11.8
KB
-rw-r--r--
server.elc
39.79
KB
-rw-r--r--
ses.elc
87.39
KB
-rw-r--r--
sha1.elc
8
KB
-rw-r--r--
shadowfile.elc
22.61
KB
-rw-r--r--
shell.elc
34.08
KB
-rw-r--r--
simple.elc
196.35
KB
-rw-r--r--
skeleton.elc
15.78
KB
-rw-r--r--
smerge-mode.elc
33.61
KB
-rw-r--r--
sort.elc
12.94
KB
-rw-r--r--
soundex.elc
1.34
KB
-rw-r--r--
speedbar.elc
115.06
KB
-rw-r--r--
startup.elc
60.78
KB
-rw-r--r--
strokes.elc
44.11
KB
-rw-r--r--
subdirs.el
426
B
-rw-r--r--
subr.elc
113.48
KB
-rw-r--r--
t-mouse.elc
3.38
KB
-rw-r--r--
tabify.elc
2
KB
-rw-r--r--
talk.elc
3.19
KB
-rw-r--r--
tar-mode.elc
52.24
KB
-rw-r--r--
tempo.elc
18.63
KB
-rw-r--r--
term.elc
99.67
KB
-rw-r--r--
terminal.elc
31.36
KB
-rw-r--r--
thingatpt.elc
10.84
KB
-rw-r--r--
thumbs.elc
26.23
KB
-rw-r--r--
time-stamp.elc
21.03
KB
-rw-r--r--
time.elc
18.2
KB
-rw-r--r--
timezone.elc
10.99
KB
-rw-r--r--
tmm.elc
13.9
KB
-rw-r--r--
tool-bar.elc
9.69
KB
-rw-r--r--
tooltip.elc
12.35
KB
-rw-r--r--
tree-widget.elc
20.87
KB
-rw-r--r--
tutorial.elc
21.41
KB
-rw-r--r--
type-break.elc
35.61
KB
-rw-r--r--
uniquify.elc
19.91
KB
-rw-r--r--
userlock.elc
4.69
KB
-rw-r--r--
vc-annotate.elc
22.68
KB
-rw-r--r--
vc-arch.elc
17.58
KB
-rw-r--r--
vc-bzr.elc
26.84
KB
-rw-r--r--
vc-cvs.elc
32.19
KB
-rw-r--r--
vc-dav.elc
5.3
KB
-rw-r--r--
vc-dir.elc
39.5
KB
-rw-r--r--
vc-dispatcher.elc
14.61
KB
-rw-r--r--
vc-git.elc
32.75
KB
-rw-r--r--
vc-hg.elc
25.95
KB
-rw-r--r--
vc-hooks.elc
32.75
KB
-rw-r--r--
vc-mtn.elc
10.95
KB
-rw-r--r--
vc-rcs.elc
34.99
KB
-rw-r--r--
vc-sccs.elc
13.24
KB
-rw-r--r--
vc-svn.elc
20.57
KB
-rw-r--r--
vc.elc
59.4
KB
-rw-r--r--
vcursor.elc
23.44
KB
-rw-r--r--
version.el
3.37
KB
-rw-r--r--
view.elc
35.96
KB
-rw-r--r--
vt-control.elc
2.06
KB
-rw-r--r--
vt100-led.elc
1.53
KB
-rw-r--r--
w32-fns.elc
15.82
KB
-rw-r--r--
w32-vars.elc
5.53
KB
-rw-r--r--
wdired.elc
21.69
KB
-rw-r--r--
whitespace.elc
59.83
KB
-rw-r--r--
wid-browse.elc
7.89
KB
-rw-r--r--
wid-edit.elc
104.76
KB
-rw-r--r--
widget.elc
1.37
KB
-rw-r--r--
windmove.elc
9.57
KB
-rw-r--r--
window.elc
57.4
KB
-rw-r--r--
winner.elc
11.61
KB
-rw-r--r--
woman.elc
107.73
KB
-rw-r--r--
x-dnd.elc
19.35
KB
-rw-r--r--
xml.elc
18.38
KB
-rw-r--r--
xt-mouse.elc
7.43
KB
-rw-r--r--
Delete
Unzip
Zip
${this.title}
Close
Code Editor : ediff-merg.elc
;ELC ;;; Compiled by mockbuild@c6b8.bsys.dev.centos.org on Thu Feb 19 13:02:50 2015 ;;; from file /builddir/build/BUILD/emacs-23.1/lisp/ediff-merg.el ;;; in Emacs version 23.1.1 ;;; with all optimizations. ;;; This file uses dynamic docstrings, first added in Emacs 19.29. (if (and (boundp 'emacs-version) (< (aref emacs-version (1- (length emacs-version))) ?A) (or (and (boundp 'epoch::version) epoch::version) (string-lessp emacs-version "19.29"))) (error "`ediff-merg.el' was compiled for Emacs 19.29 or later")) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (require 'ediff-init) #@103 Hooks to run before quitting a merge job. The most common use is to save and delete the merge buffer. (custom-declare-variable 'ediff-quit-merge-hook ''ediff-maybe-save-and-delete-merge '(#$ . 634) :type 'hook :group 'ediff-merge) #@133 The variant to be used as a default for buffer C in merging. Valid values are the symbols `default-A', `default-B', and `combined'. (custom-declare-variable 'ediff-default-variant ''combined '(#$ . 872) :type '(radio (const default-A) (const default-B) (const combined)) :group 'ediff-merge) #@460 Pattern to be used for combining difference regions in buffers A and B. The value must be a list of the form (STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4) where bufspec is the symbol A, B, or Ancestor. For instance, if the value is '(STRING1 A STRING2 Ancestor STRING3 B STRING4) then the combined text will look like this: STRING1 diff region from variant A STRING2 diff region from the ancestor STRING3 diff region from variant B STRING4 (custom-declare-variable 'ediff-combination-pattern ''("<<<<<<< variant A" A ">>>>>>> variant B" B "####### Ancestor" Ancestor "======= end") '(#$ . 1171) :type '(choice (list string symbol string symbol string) (list string symbol string symbol string symbol string)) :group 'ediff-merge) #@207 If t, show only those diff regions where both buffers disagree with the ancestor. This means that regions that have status prefer-A or prefer-B will be skipped over. A value of nil means show all regions. (custom-declare-variable 'ediff-show-clashes-only 'nil '(#$ . 1927) :type 'boolean :group 'ediff-merge) (make-variable-buffer-local 'ediff-show-clashes-only) #@485 If t, show only the regions that have not been changed by the user. A region is considered to have been changed if it is different from the current default (`default-A', `default-B', `combined') and it hasn't been marked as `prefer-A' or `prefer-B'. A region is considered to have been changed also when it is marked as as `prefer-A', but is different from the corresponding difference region in Buffer A or if it is marked as `prefer-B' and is different from the region in Buffer B. (custom-declare-variable 'ediff-skip-merge-regions-that-differ-from-default 'nil '(#$ . 2298) :type 'boolean :group 'ediff-merge) (make-variable-buffer-local 'ediff-skip-merge-regions-that-differ-from-default) (defalias 'ediff-merge-region-is-non-clash #[(n) "\303>\203 \304\305 \203 \nH\306H\206 \307\"\207\310\207" [ediff-job-name ediff-state-of-merge n (ediff-merge-files ediff-merge-buffers ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions ediff-merge-revisions-with-ancestor) string-match "prefer" 0 "" t] 4]) (put 'ediff-merge-region-is-non-clash 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-merge-region-is-non-clash-to-skip #[(n) "\205! \n\304>\203 \305\306\203 H\307H\206 \310\"\202 \311)\207" [ediff-show-clashes-only n ediff-job-name ediff-state-of-merge (ediff-merge-files ediff-merge-buffers ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions ediff-merge-revisions-with-ancestor) string-match "prefer" 0 "" t] 4]) (put 'ediff-merge-region-is-non-clash-to-skip 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-skip-merge-region-if-changed-from-default-p #[(n) "\205 \302 \303\"\207" [ediff-skip-merge-regions-that-differ-from-default n ediff-merge-changed-from-default-p prefers-too] 3]) (put 'ediff-skip-merge-region-if-changed-from-default-p 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-get-combined-region #[(n) "\306\307\310\211\211G\311W\203 \312!\210 G\313V\203? @ A@\n;\203. \314>\2042 \312!\210\310\315\316\217\210 AA\211\202 @\211;\204K \312!\210\f\n\317Q\211-\207" [ediff-combination-pattern region-spec region-delim err-msg combo-region pattern-list "" "ediff-combination-pattern: Invalid format. Please consult the documentation" nil 5 error 2 (A B Ancestor) (byte-code " \305\306\n\f#R\306\207" [combo-region region-delim n region-spec ediff-control-buffer "\n" ediff-get-region-contents] 7) ((error)) "\n"] 6]) (defalias 'ediff-set-state-of-all-diffs-in-all-buffers #[(ctl-buf) "\303\211 W\205 \304\n\"\210T\211\202 )\207" [n ediff-number-of-differences ctl-buf 0 ediff-set-state-of-diff-in-all-buffers] 4]) (put 'ediff-set-state-of-all-diffs-in-all-buffers 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-set-state-of-diff-in-all-buffers #[(n ctl-buf) "\306\307 #\306\310 #\306\311 #\211\230\203_ \f\n\230\203_ \307 \312\"A*JH\313\314I\210\310 \312\"A*JH\313\315I\210\311 \312\"A*JH\313\316I\202\273\f\230\203\246 \307 \312\"A*JH\313\314I\210\310 \312\"A*JH\313\316I\210\311 \312\"A*JH\313\317I\202\273\f\n\230\203\355 \307 \312\"A*JH\313\315I\210\311 \312\"A*JH\313\316I\210\310 \312\"A*JH\313\317I\202\273\n\230\2034\311 \312\"A*JH\313\314I\210\310 \312\"A*JH\313\315I\210\307 \312\"A*JH\313\317I\202\273\n\320!\230\203}\307 \312\"A*JH\313\317I\210\310 \312\"A*JH\313\317I\210\311 \312\"A*JH\313\321I\202\273\307 \312\"A*JH\313\317I\210\310 \312\"A*JH\313\317I\210\311 \312\"A*JH\313\317I+\207" [n ctl-buf regC regB regA ediff-difference-vector-alist ediff-get-region-contents A B C assoc 3 "=diff(B)" "=diff(C)" "=diff(A)" nil ediff-get-combined-region "=diff(A+B)" alist buf-type] 7]) (defalias 'ediff-set-merge-mode #[nil "\300\301!\210\302\303\304\"\207" [normal-mode t remove-hook local-write-file-hooks ediff-set-merge-mode] 3]) (defalias 'ediff-do-merge #[(diff-num &optional remerging) "\306W\203 \306\307\211\211\fW\203\241 \307\310\311\"\306U\203. \312\313 \203) \314\202* \315\f$\210\2059 H\306H \203i \316!\204K \317\320 \"\203M \321\317\322 \"\203i \n\204i \203i H\306\323\324\"I\210\205t H\306H\n\204\232 \325\230\203\210 \326T\327\"\210\202\232 \330\317\331 \"\203\225 \332\202\226 \333\334\327$\210T\211\202 \312\335!+\207" [diff-num state-of-merge do-not-copy n ediff-number-of-differences remerging 0 nil mod 10 message "%s buffers A & B into C ... region %d of %d" "Re-merging" "Merging" ediff-merge-changed-from-default-p string-match "prefer" t "\\(default\\|combined\\)" format "%S" "combined" ediff-combine-diffs batch ediff-copy-diff "-A" A B C "Merging buffers A & B into C ... Done" ediff-state-of-merge ediff-default-variant] 6]) #@86 Remerge unmodified diff regions using a new default. Start with the current region. (defalias 'ediff-re-merge #[nil "\304\305\306E\307\310 !C\"\311\312\313\314 \"\n\315\316$!\317\320\"\210\321 *\207" [default-variant-alist ediff-default-variant actual-alist ediff-current-difference ("default-A") ("default-B") ("combined") delete symbol-name intern completing-read format "Current merge default is `%S'. New default: " nil must-match ediff-do-merge remerge ediff-recenter] 6 (#$ . 7172) nil]) #@124 Shrink window C to just one line. With a prefix argument, returns window C to its normal size. Used only for merging jobs. (defalias 'ediff-shrink-window-C #[(arg) "\204 \306\307!\210 \310=\203 \311\202 \247\204 \312 \2043 \313\n!\314W\203* \202+ \315\316\317\320!)\207 \315W\203K \313\n!\321V\203K \322_\316\317\320!\207 \315V\205b \313 !\321V\205b \323_\316\317\320!\207" [ediff-merge-job arg ediff-window-C ediff-merge-window-share ediff-window-config-saved ediff-window-A error "ediff-shrink-window-C can be used only for merging jobs" - -1 nil window-height 3 0 "" ediff-recenter no-rehighlight 2 0.9 1.1] 2 (#$ . 7680) "P"]) #@241 Combine Nth diff regions of buffers A and B and place the combination in C. N is a prefix argument. If nil, combine the current difference regions. Combining is done according to the specifications in variable `ediff-combination-pattern'. (defalias 'ediff-combine-diffs #[(n &optional batch-invocation) "\247\203\n S\202 \304\305!\306\304\307\n%\210)\206# \310T!\207" [n ediff-current-difference reg-combined batch-invocation nil ediff-get-combined-region ediff-copy-diff C ediff-jump-to-difference] 6 (#$ . 8335) "P"]) (defalias 'ediff-looks-like-combined-merge #[(region-num) "\205\307 \306\307 \203* \310 !\203* \311\310 !!\203* \312\n\313\f\"A*J H\314H\206+ \315\"\316\312\317 #\316\312\320 #\321\211\211\211 \211!\203\301 \203\265 \310 !\203\265 \311\310 !!\203\265 r q\210\203\261 b\210@\322\323#\210\324\224\324\225\203\230 \203\230 BBG\325V\203\252 AA\211\202h \321\211\204k )\202\301 \"\326=\204\301 \327#!\210\330!.\207" [ediff-merge-job ediff-buffer-C ediff-difference-vector-alist alist buf-type region-num string-match "(A\\+B)" get-buffer buffer-name C assoc 3 "" ediff-get-diff-posn beg end nil search-forward noerror 0 1 ediff-quit error reverse ediff-combination-pattern delim-regs-list reg-end reg-beg delim pattern-list mrgreg-end mrgreg-beg combined this-command ediff-KILLED-VITAL-BUFFER] 9]) (defalias 'ediff-merge-changed-from-default-p #[(diff-num &optional prefers-too) "\306\307 #\306\310 #\306\311 # \205 H\312H\211\313\230\203* \f\n\230?\206k \314\230\2038 \n\230?\206k \315\230\203H \316!\n\230?\206k \203[ \317\230\203[ \f\n\230?\206k \205k \320\230\205k \n\230?+\207" [diff-num ediff-control-buffer reg-C reg-B reg-A ediff-state-of-merge ediff-get-region-contents A B C 0 "default-A" "default-B" "combined" ediff-get-combined-region "prefer-A" "prefer-B" state-of-merge prefers-too] 7]) (provide 'ediff-merg)
Close