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 : smerge-mode.elc
;ELC ;;; Compiled by mockbuild@c6b8.bsys.dev.centos.org on Thu Feb 19 13:05:15 2015 ;;; from file /builddir/build/BUILD/emacs-23.1/lisp/smerge-mode.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 "`smerge-mode.el' was compiled for Emacs 19.29 or later")) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (byte-code "\300\301!\210\302\303\304\305\306\307\310\311&\207" [require diff-mode custom-declare-group smerge nil "Minor mode to highlight and resolve diff3 conflicts." :group tools :prefix "smerge-"] 8) #@42 Buffer name to use for displaying diffs. (custom-declare-variable 'smerge-diff-buffer-name '"*vc-diff*" '(#$ . 819) :group 'smerge :type '(choice (const "*vc-diff*") (const "*cvs-diff*") (const "*smerge-diff*") string)) #@116 A list of strings specifying switches to be passed to diff. Used in `smerge-diff-base-mine' and related functions. (custom-declare-variable 'smerge-diff-switches '(append '("-d" "-b") (if (listp diff-switches) diff-switches (list diff-switches))) '(#$ . 1046) :group 'smerge :type '(repeat string)) #@74 Non-nil means to leave `smerge-mode' when the last conflict is resolved. (custom-declare-variable 'smerge-auto-leave 't '(#$ . 1351) :group 'smerge :type 'boolean) (byte-code "\301\302\303\304\305\306%\210\307\310\311\302#\210\310B\312\310!\204 \313\310\302\"\210\301\314\315\316\305\306%\210\307\317\311\314#\210\317B\312\317!\204: \313\317\314\"\210\301\320\321\322\305\306%\210\307\323\311\320#\210\323B\312\323!\204W \313\323\320\"\210\301\324\325\326\305\306%\210\307\327\311\324#\210\327B\312\327!\204t \313\327\324\"\210\301\330\331\332\305\306%\207" [current-load-list custom-declare-face smerge-mine ((((min-colors 88) (background light)) (:foreground "blue1")) (((background light)) (:foreground "blue")) (((min-colors 88) (background dark)) (:foreground "cyan1")) (((background dark)) (:foreground "cyan"))) "Face for your code." :group smerge put smerge-mine-face face-alias default-boundp set-default smerge-other ((((background light)) (:foreground "darkgreen")) (((background dark)) (:foreground "lightgreen"))) "Face for the other code." smerge-other-face smerge-base ((((min-colors 88) (background light)) (:foreground "red1")) (((background light)) (:foreground "red")) (((background dark)) (:foreground "orange"))) "Face for the base code." smerge-base-face smerge-markers ((((background light)) (:background "grey85")) (((background dark)) (:background "grey30"))) "Face for the conflict markers." smerge-markers-face smerge-refined-change ((t :background "yellow")) "Face used for char-based changes shown by `smerge-refine'."] 6) #@36 The base keymap for `smerge-mode'. (defconst smerge-basic-map (byte-code "\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317!B\320BBBBBBBBBBBB\321\322\300!\205& \321$\207" [smerge-basic-map easy-mmode-define-keymap ("n" . smerge-next) ("p" . smerge-prev) ("r" . smerge-resolve) ("a" . smerge-keep-all) ("b" . smerge-keep-base) ("o" . smerge-keep-other) ("m" . smerge-keep-mine) ("E" . smerge-ediff) ("C" . smerge-combine-with-next) ("R" . smerge-refine) (" " . smerge-keep-current) "=" make-sparse-keymap "Diff" (("=<" "base-mine" . smerge-diff-base-mine) ("=>" "base-other" . smerge-diff-base-other) ("==" "mine-other" . smerge-diff-mine-other)) nil boundp] 15) (#$ . 2918)) #@36 Prefix for `smerge-mode' commands. (custom-declare-variable 'smerge-command-prefix '"^" '(#$ . 3611) :group 'smerge :type '(choice (const :tag "ESC" "") (const :tag "C-c ^" "^") (const :tag "none" "") string)) #@27 Keymap for `smerge-mode'. (defconst smerge-mode-map (byte-code "\303 BC\304\305\302!\205 \n\304$\207" [smerge-command-prefix smerge-basic-map smerge-mode-map easy-mmode-define-keymap nil boundp] 5) (#$ . 3830)) (byte-code "\301B\302\301!\204 \303\301\304\"\210\305\301!\207" [current-load-list smerge-check-cache default-boundp set-default nil make-variable-buffer-local] 3) (defalias 'smerge-check #[(n) "\300\301\302\217\207" [nil (byte-code "`\303 B A\232\204 \304 \210\305 B\n\306_ @8)\207" [state smerge-check-cache n buffer-modified-tick smerge-match-conflict match-data 2] 2) ((error))] 3]) #@25 Menu for `smerge-mode'. (defvar smerge-mode-menu nil (#$ . 4444)) (easy-menu-do-define 'smerge-mode-menu smerge-mode-map "Menu for `smerge-mode'." '("SMerge" ["Next" smerge-next :help "Go to next conflict"] ["Previous" smerge-prev :help "Go to previous conflict"] "--" ["Keep All" smerge-keep-all :help "Keep all three versions" :active (smerge-check 1)] ["Keep Current" smerge-keep-current :help "Use current (at point) version" :active (and (smerge-check 1) (> (smerge-get-current) 0))] "--" ["Revert to Base" smerge-keep-base :help "Revert to base version" :active (smerge-check 2)] ["Keep Other" smerge-keep-other :help "Keep `other' version" :active (smerge-check 3)] ["Keep Yours" smerge-keep-mine :help "Keep your version" :active (smerge-check 1)] "--" ["Diff Base/Mine" smerge-diff-base-mine :help "Diff `base' and `mine' for current conflict" :active (smerge-check 2)] ["Diff Base/Other" smerge-diff-base-other :help "Diff `base' and `other' for current conflict" :active (smerge-check 2)] ["Diff Mine/Other" smerge-diff-mine-other :help "Diff `mine' and `other' for current conflict" :active (smerge-check 1)] "--" ["Invoke Ediff" smerge-ediff :help "Use Ediff to resolve the conflicts" :active (smerge-check 1)] ["Auto Resolve" smerge-resolve :help "Try auto-resolution heuristics" :active (smerge-check 1)] ["Combine" smerge-combine-with-next :help "Combine current conflict with next" :active (smerge-check 1)])) #@46 Context menu for mine area in `smerge-mode'. (defvar smerge-context-menu nil (#$ . 5877)) (easy-menu-do-define 'smerge-context-menu nil "Context menu for mine area in `smerge-mode'." '(nil ["Keep Current" smerge-keep-current :help "Use current (at point) version"] ["Kill Current" smerge-kill-current :help "Remove current (at point) version"] ["Keep All" smerge-keep-all :help "Keep all three versions"] "---" ["More..." (popup-menu smerge-mode-menu) :help "Show full SMerge mode menu"])) #@39 Font lock patterns for `smerge-mode'. (defconst smerge-font-lock-keywords '((smerge-find-conflict (1 smerge-mine-face prepend t) (2 smerge-base-face prepend t) (3 smerge-other-face prepend t) (0 smerge-markers-face keep) (4 nil t t) (5 nil t t))) (#$ . 6373)) (byte-code "\301B\302\303!\210\304B\305\306!\210\307B\310\311!\210\312B\313\314!\207" [current-load-list smerge-begin-re (lambda (#1=#:defconst-tmp-var) (defconst smerge-begin-re #1#)) "^<<<<<<< \\(.*\\)\n" smerge-end-re (lambda (#2=#:defconst-tmp-var) (defconst smerge-end-re #2#)) "^>>>>>>> .*\n" smerge-base-re (lambda (#3=#:defconst-tmp-var) (defconst smerge-base-re #3#)) "^||||||| .*\n" smerge-other-re (lambda (#4=#:defconst-tmp-var) (defconst smerge-other-re #4#)) "^=======\n"] 2) #@121 Keep track of which style of conflict is in use. Can be nil if the style is undecided, or else: - `diff3-E' - `diff3-A' (defvar smerge-conflict-style nil (#$ . 7138)) (add-to-list 'debug-ignored-errors "^No \\(previous\\|next\\) conflict") #@35 Go to the next COUNT'th conflict. (defalias 'smerge-next #[(&optional count) "\204 \304\305W\203 \306[!\207\307 !\203 T\310 \311\312$\2047 \307 !\203/ db\210\202b \313\314\315\"\210\202b \305\224b\210p\316\317 !=\203b t\203b \212\310 \311\312\320$)\206T d\321\n\311\312#\204a \322\323!\210) \205j \311\324\325\217\207" [count smerge-begin-re endpt diff-auto-refine-mode 1 0 smerge-prev looking-at re-search-forward nil t error "No next %s" "conflict" window-buffer selected-window 2 pos-visible-in-window-p recenter (0) (smerge-refine) ((error))] 5 (#$ . 7384) "p"]) (put 'smerge-next 'definition-name 'smerge) #@38 Go to the previous COUNT'th conflict (defalias 'smerge-prev #[(&optional count) "\204 \303\304W\203 \305[!\207\306 \307\310$\204 \311\312\313\"\210\n\205' \307\314\315\217\207" [count smerge-begin-re diff-auto-refine-mode 1 0 smerge-next re-search-backward nil t error "No previous %s" "conflict" (smerge-refine) ((error))] 5 (#$ . 8012) "p"]) (byte-code "\301\302\303\304#\210\305B\306\307!\207" [current-load-list put smerge-prev definition-name smerge smerge-match-names (lambda (#1=#:defconst-tmp-var) (defconst smerge-match-names #1#)) ["conflict" "mine" "base" "other"]] 4) (defalias 'smerge-ensure-match #[(n) "\225?\205\f \302\303 H\"\207" [n smerge-match-names error "No `%s'"] 4]) (defalias 'smerge-auto-leave #[nil "\205% \212eb\210\304 \305\306#)?\205% \n<\203\" \203\" \307\303\310E\nB\303\311!\207" [smerge-auto-leave smerge-begin-re buffer-undo-list smerge-mode re-search-forward nil t apply 1 -1] 4]) #@27 Concatenate all versions. (defalias 'smerge-keep-all #[nil "\302 \210\303\224\206 d\303\225\206 e\304\225\305\225|\210\306\225]\304\224|\210\303\225\2032 \306\225\304\225U\2042 \306\225\303\224|\210\305\224\306\224 ^|\210\307 *\207" [me2 mb2 smerge-match-conflict 2 3 0 1 smerge-auto-leave] 3 (#$ . 8950) nil]) (defalias 'smerge-keep-n #[(n) "\301\302\224\302\225\"\210\225\302\225|\210\302\224\224|\207" [n smerge-remove-props 0] 3]) #@49 Combine the current conflict with the next one. (defalias 'smerge-combine-with-next #[nil "\306 \210\307\310\307\211\203$ \n@\211\225\205 \311 \225\312\"B\nA\211\204 *\313\314\"\211\315Hb\210\316 \307\312#\204= \317\320!\202\332 \306 \210\321\322\304 \" \323\307\211 \203l @ H\203e Hb\210\324p\315H\f@#\210 A\211\204N *\315H\f@|\210\325\307\211 \203\246 @\326\f!\210 H\203\235 \225\203\235 Hb\210\324p \224 \225#\210A\211\204} *\f@\f\211 A@)|\210\f\307 \211 \203\324 @\211\203\313 \307\211\223\210 A\211 \204\274 *\327\330\"))\207" [ends i #1=#:--cl-dolist-temp-- smerge-begin-re match-data #2=#:--cl-dolist-temp-- smerge-match-conflict nil (3 2 1 0) copy-marker t apply vector 0 re-search-forward error "No next conflict" mapcar #[(m) "\205 \301!\207" [m copy-marker] 2] (1 2 3) insert-buffer-substring (1 2 3) set-match-data mapc #[(m) "\205 \301\211\223\207" [m nil] 3] #3=#:--cl-dolist-temp-- x m #4=#:--cl-dolist-temp--] 6 (#$ . 9398) nil]) #@64 Max number of lines between conflicts that should be combined. (defvar smerge-auto-combine-max-separation 2 (#$ . 10401)) #@59 Automatically combine conflicts that are near each other. (defalias 'smerge-auto-combine #[nil "\212eb\210\301 \205! \212\301\302\303\\!!)\203 \304y\210\305 \210\306y\210\202 )\207" [smerge-auto-combine-max-separation smerge-find-conflict line-beginning-position 2 -1 smerge-combine-with-next 1] 4 (#$ . 10529) nil]) #@217 Mode-specific merge function. The function is called with zero or one argument (non-nil if the resolution function should only apply safe heuristics) and with the match data set according to `smerge-match-conflict'. (defvar smerge-resolve-function #[nil "\300\301!\207" [error "Don't know how to resolve"] 2] (#$ . 10856)) (byte-code "\301\302\303\"\210\304B\305\304!\204 \306\304\307\"\210\301\207" [current-load-list add-to-list debug-ignored-errors "Don't know how to resolve" smerge-text-properties default-boundp set-default (help-echo "merge conflict: mouse-3 shows a menu" keymap (keymap (down-mouse-3 . smerge-popup-context-menu)))] 3) (defalias 'smerge-remove-props #[(beg end) "\303 \304\305$\210\303 \304\306$\210\307 \310 \311#\210\312\n!)\207" [beg end modified remove-overlays smerge refine conflict buffer-modified-p remove-text-properties (fontified nil) restore-buffer-modified-p] 5]) #@50 Pop up the Smerge mode context menu under mouse. (defalias 'smerge-popup-context-menu #[(event) "\203} \212\306 \211:\203 \307 8:\203 \307\202 \310 8\202$ \311 `\312\313F)!\210\314\310!)\203} \306 \211:\203G \307 8:\203A \307\202B \310 8\202M \311 `\312\313F)!\210\315 \210\316 \317\211\313X\203d \320\f!\202{ \321 \224 \225\"\322\216\323\n\324\325#\210\326\313!\210\320 !)*\207\212\327\317\330#\331 \317\330# \332 \206\225 e \206\233 d\"\210 B\211 +\207" [smerge-mode event o i smerge-mode-menu smerge-context-menu posn-set-point 2 1 selected-window (0 . 0) 0 smerge-check smerge-match-conflict smerge-get-current nil popup-menu make-overlay ((delete-overlay o)) overlay-put face highlight sit-for re-search-backward t re-search-forward smerge-remove-props smerge-end-re smerge-begin-re end beg unread-command-events] 6 (#$ . 11771) "e"]) #@107 Replace the conflict with a bunch of subconflicts. BUF contains a plain diff between match-1 and match-3. (defalias 'smerge-apply-resolution-patch #[(buf m0b m0e m3b m3e &optional m2b) "\306pb\210`\307\\\310 { \205 b\210\311y\210`\307\\\310 {\nb\210\311y\210`\307\\\310 { \" #\312\n\"\210$\n|\210%|\210%$%ZZ$%b\210r&q\210eb\210m?\205F\313\314!\204k \315\316`\310 {\"\210\202U \317\224f '\320\321\306!!'\322=\203\200 \306\202\201 \323\\ ('\322=\203\220 (\202\240 \324\225\203\235 \320\321\324!!\202\237 (T\211 )(Z *'\325=\203\263 \326\202\311 \327\225\204\274 \306\202\311 \330\320\321\327!!\320\321\331!!\311# +\326 ,\306y\210*y\210'\332=\203\337 \306y\210+\204\350 \333\202` -+\323 . /./W\203\n\334\324!\210\306y\210.T\211.\202\364 *-`{),r\"q\210(#Zy\210\335 \336,\f\203.\337\f\336Q\202/\333\340\261\210*y\210\341 \336\261\210)#.\202U .\207" [m0b m2b m0e name3 name2 name1 1 8 line-end-position -1 smerge-remove-props looking-at "\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)?\\([acd]\\)\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)?$" error "Unexpected patch hunk header: %s" 3 string-to-number match-string 97 0 2 100 nil 5 - 4 99 "" delete-char "<<<<<<< " "\n" "||||||| " "=======\n" ">>>>>>> " textbuf line m3e m3b buf op startline endline lines otherlines othertext pos i #1=#:--cl-dotimes-temp--] 8 (#$ . 12638)]) #@181 Resolve the conflict at point intelligently. This relies on mode-specific knowledge and thus only works in some major modes. Uses `smerge-resolve-function' to do the actual work. (defalias 'smerge-resolve #[(&optional safe) "\306 \210\307\310\224\310\225\"\210\311 \310\224\312\224\313\224\314\224\310\225\312\225\313\225\314\225\315\316!\317\211\211 1 2 3 4 5 6 7\320\216\312\225\314\225=\203O \312\224\314\224=\203O \321\314!\210\202\277\317\322\323\217\204\2771\f=\203q 53=\203q \3247!\210\321\314!\210\202\277\3253\f\" 8\326\327!\33051\n\317\331%\210\326\332!\3303\f\317\331%\21051=\206\320 3\f=\206\320 \333\3349\317 \317\335\n&!\204\277 4\203\277 4 =?\206\320 r q\210eb\210\336\337\3408!\341Q!))\204\345 \342 623\f4&\210\202\277 \203\326\343!\3304 \317\331%\210r q\210\344 \210)\333\3349\317 \317\345 \n&!\203\3247!\210\321\314!\210\202\277:\204` \203` \203`4 =\204`r q\210\333\346ed\347\350\317\211\351\352\353\354& !)\203`\21462}\210\30762\"\210\355\317\211\211\350%\210)\202\277:\204\273 \203\273 \203\2734 =\204\273\3303\f\317\331%\210\3349\317 \317\345 &\210r q\210\333\346ed\347\350\317\211\351\352\353\354\n& !)\203\273\21462}\210\30762\"\210\355\n\317\211\211\350%\210)\202\277\356\357!\210.\360 \207" [o b m buf m3e m2e smerge-match-conflict smerge-remove-props 0 match-data 1 2 3 generate-new-buffer " *smerge*" nil ((byte-code "\304!\203\n \305!\210 \203 \306 !\210\n\203 \306\n!\210 \203\" \306 !\210\304\207" [buf m b o buffer-name kill-buffer delete-file] 2)) smerge-keep-n (byte-code "\306 \307\211\307 \310\216\311 !\210 \203 \f !\210\202# \f \210\312\211.\207" [most-positive-fixnum #1=#:--change-group-success-- undo-strong-limit undo-limit undo-outer-limit #2=#:--change-group-handle-- prepare-change-group nil ((byte-code "\203 \302 !\210\202 \303 !\210\302\207" [#1# #2# accept-change-group cancel-change-group] 2)) activate-change-group t safe smerge-resolve-function] 5) ((error)) set-match-data count-lines make-temp-file "smm" write-region silent "smo" zerop call-process "-b" looking-at "1," number-to-string "c" smerge-apply-resolution-patch "smb" erase-buffer "-bc" call-process-region "patch" t "-r" "/dev/null" "--no-backup-if-mismatch" "-fl" insert-file-contents error "Don't know how to resolve" smerge-auto-leave m1e m0e m3b m2b m1b m0b md lines diff-command safe] 13 (#$ . 13993) nil]) #@48 Perform automatic resolution on all conflicts. (defalias 'smerge-resolve-all #[nil "\212eb\210\301\302\303#\205 \302\304\305\217\210\202 )\207" [smerge-begin-re re-search-forward nil t (byte-code "\300 \210\301\302!\207" [smerge-match-conflict smerge-resolve safe] 2) ((error))] 4 (#$ . 16423) nil]) (defalias 'smerge-batch-resolve #[nil "\204 \303\304!\210 \205? \211A@\305\306\n\"\203 \n\307\211\224O\310\311\n\"\210\312\n!\203; r\313\n!q\210\314 \210\315 \210\316p!\210))\202 \207" [noninteractive command-line-args-left file error "`smerge-batch-resolve' is to be used only with -batch" string-match "\\.rej\\'" 0 message "Resolving conflicts in %s..." file-readable-p find-file-noselect smerge-resolve-all save-buffer kill-buffer] 3]) #@29 Revert to the base version. (defalias 'smerge-keep-base #[nil "\300 \210\301\302!\210\303\302!\210\304 \207" [smerge-match-conflict smerge-ensure-match 2 smerge-keep-n smerge-auto-leave] 2 (#$ . 17180) nil]) #@22 Use "other" version. (defalias 'smerge-keep-other #[nil "\300 \210\301\302!\210\303 \207" [smerge-match-conflict smerge-keep-n 3 smerge-auto-leave] 2 (#$ . 17394) nil]) #@20 Keep your version. (defalias 'smerge-keep-mine #[nil "\300 \210\301\302!\210\303 \207" [smerge-match-conflict smerge-keep-n 1 smerge-auto-leave] 2 (#$ . 17569) nil]) (defalias 'smerge-get-current #[nil "\301\211\225\203 `\224W\204 `\225Y\203 S\211\202 )\207" [i 3] 3]) #@45 Use the current (under the cursor) version. (defalias 'smerge-keep-current #[nil "\301 \210\302 \211\303X\203 \304\305!\202 \306!\210\307 )\207" [i smerge-match-conflict smerge-get-current 0 error "Not inside a version" smerge-keep-n smerge-auto-leave] 3 (#$ . 17854) nil]) #@48 Remove the current (under the cursor) version. (defalias 'smerge-kill-current #[nil "\305 \210\306 \211\307X\203 \310\311!\202X \312\313\312\211\2037 @\211\225\2030 \n\225\225U\2040 \n B A\211\204 * A\203P @\225 \211 A@)\225U\204P \314 \202W \315 @!\210\316 ))\207" [i left n #1=#:--cl-dolist-temp-- x smerge-match-conflict smerge-get-current 0 error "Not inside a version" nil (3 2 1) ding smerge-keep-n smerge-auto-leave] 4 (#$ . 18138) nil]) #@60 Diff 'base' and 'mine' version in current conflict region. (defalias 'smerge-diff-base-mine #[nil "\300\301\302\"\207" [smerge-diff 2 1] 3 (#$ . 18601) nil]) #@61 Diff 'base' and 'other' version in current conflict region. (defalias 'smerge-diff-base-other #[nil "\300\301\302\"\207" [smerge-diff 2 3] 3 (#$ . 18765) nil]) #@61 Diff 'mine' and 'other' version in current conflict region. (defalias 'smerge-diff-mine-other #[nil "\300\301\302\"\207" [smerge-diff 1 3] 3 (#$ . 18931) nil]) #@213 Get info about the conflict. Puts the info in the `match-data'. The submatches contain: 0: the whole conflict. 1: your code. 2: the base code. 3: other code. An error is raised if not inside a conflict. (defalias 'smerge-match-conflict #[nil "\212\300\301\302\217)\207" [nil (byte-code "`\306y\307\n!\310\224\310\225 \311\306!\206 \312 \313 !\310\225W\204) \314\315\316C\"\210\317\310\224 \310\225 \307 \"\310\224 \310\225 !\317\211 \" #\212\fb\210\313\n \320#)\203\\ \321\322!\210\202\271 \307$ \320#\203{ \323\324!\210\325 #\310\224 \310\225\"\202\271 \326%\206\203 \312!\230\203\222 \323\324!\210\327\202\271 \"\204\271 \325=\204\253 \330\232\204\253 \331\332 \"\203\271 \f\" #! \333 \f \"#! \"\205\320 \"S\"!S!\257\f!\210.\320\207" [orig-point _ smerge-begin-re start mine-start filename 1 re-search-backward 0 match-string "" re-search-forward signal cl-assertion-failed (< orig-point (match-end 0)) nil t error "There is a nested conflict" make-local-variable smerge-conflict-style diff3-A file-name-nondirectory diff3-E "ANCESTOR" string-match "\\`[.0-9]+\\'" store-match-data smerge-end-re other-end end smerge-other-re mine-end other-start base-start base-end smerge-base-re buffer-file-name] 14) ((search-failed (error "Point not in conflict region")))] 3 (#$ . 19098)]) (add-to-list 'debug-ignored-errors "Point not in conflict region") #@44 Return the conflict overlay at POS if any. (defalias 'smerge-conflict-overlay #[(pos) "\305!\306\211\306\211 \203+ \f@\307 \310\"\301=\203$ \311 !V\203$ \fA\211\204 * *\207" [pos conflict ols ol #1=#:--cl-dolist-temp-- overlays-at nil overlay-get smerge overlay-end] 5 (#$ . 20513)]) #@232 Find and match a conflict region. Intended as a font-lock MATCHER. The submatches are the same as in `smerge-match-conflict'. Returns non-nil if a match is found between point and LIMIT. Point is moved to the end of the conflict. (defalias 'smerge-find-conflict #[(&optional limit) "\305`\305\n\204 \306 !\211\203 \305\307\310\217\210\202 \n\204. \311 \f\312#\203. \305\313\314\217\210\202 \n+\207" [conflict pos found smerge-begin-re limit nil smerge-conflict-overlay (byte-code "\303!b\210\304 \210\305\225b\210` X\203 \306\307!\210\202 \310\303\207" [conflict pos found overlay-start smerge-match-conflict 0 error "Matching backward!" t] 2) ((error (byte-code "\302\303!\304!\"\210 b\207" [conflict pos smerge-remove-props overlay-start overlay-end] 4))) re-search-forward t (byte-code "\304 \210\305\225b\210\306`S!\211\203 \307\305\224\305\225#\210\202I \310\305\224\305\225\311\312\311%\313\314\315#\210\313\316\300#\210 \n\203H \313\n\211A@\n\211A@#\210\2023 ))\315\311\207" [conflict smerge-text-properties props found smerge-match-conflict 0 smerge-conflict-overlay move-overlay make-overlay nil front-advance overlay-put evaporate t smerge] 7) ((error))] 4 (#$ . 20814)]) #@479 Function used to determine an "atomic" element. You can set it to `forward-char' to get char-level granularity. Its behavior has mainly two restrictions: - if this function encounters a newline, it's important that it stops right after the newline. This only matters if `smerge-refine-ignore-whitespace' is nil. - it needs to be unaffected by changes performed by the `preproc' argument to `smerge-refine-subst'. This only matters if `smerge-refine-weight-hack' is nil. (defvar smerge-refine-forward-function 'smerge-refine-forward (#$ . 22029)) #@83 If non-nil,Indicate that smerge-refine should try to ignore change in whitespace. (defvar smerge-refine-ignore-whitespace t (#$ . 22589)) #@836 If non-nil, pass to diff as many lines as there are chars in the region. I.e. each atomic element (e.g. word) will be copied as many times (on different lines) as it has chars. This has 2 advantages: - if `diff' tries to minimize the number *lines* (rather than chars) added/removed, this adjust the weights so that adding/removing long symbols is considered correspondingly more costly. - `smerge-refine-forward-function' only needs to be called when chopping up the regions, and `forward-char' can be used afterwards. It has the following disadvantages: - cannot use `diff -w' because the weighting causes added spaces in a line to be represented as added copies of some line, so `diff -w' can't do the right thing any more. - may in degenerate cases take a 1KB input region and turn it into a 1MB file to pass to diff. (defvar smerge-refine-weight-hack t (#$ . 22734)) (defalias 'smerge-refine-forward #[(n) "\306\307\n\203 \204 \310\311Q\f\312 W\2032 \313!\204' \314\315!\210\312\225b\210 T\211\202 ,\306\207" [re case-fold-search smerge-refine-ignore-whitespace smerge-refine-weight-hack n i nil "[[:upper:]]?[[:lower:]]+\\|[[:upper:]]+\\|[[:digit:]]+\\|.\\|\n" "[ ]*\\(?:" "\\)" 0 looking-at error "Smerge refine internal error" #1=#:--cl-dotimes-temp--] 3]) #@283 Chopup the region into small elements, one per line. Save the result into FILE. If non-nil, PREPROC is called with no argument in a buffer that contains a copy of the text, just before chopping it up. It can be used to replace chars to try and eliminate some spurious differences. (defalias 'smerge-refine-chopup-region #[(beg end file &optional preproc) "p\306\307!r q\210\310\216\311\n #\210\f\203 eb\210\f \210 \203' \312ed\313\314$\210eb\210m\204y \315!\210\316u\210n\315u\210?\205B \317 `{ `Sf\313=\204O \313c\210\203u GS\320 W\203t \321\261\210T\211\202_ *)\202* n\204\201 \322\323!\210\324 \325ed \326\327%-\207" [buf #1=#:temp-buffer beg end preproc smerge-refine-ignore-whitespace generate-new-buffer " *temp*" ((byte-code "\301!\203\n \302!\210\301\207" [#1# buffer-name kill-buffer] 2)) insert-buffer-substring subst-char-in-region 10 32 1 -1 line-beginning-position 0 "\n" error "Smerge refine internal error" emacs-mule write-region nil nomessage smerge-refine-forward-function s smerge-refine-weight-hack i #2=#:--cl-dotimes-temp-- coding-system-for-write file] 6 (#$ . 24035)]) (defalias 'smerge-refine-highlight-change #[(buf beg match-num1 match-num2 props) "rq\210 b\210\306\n!S\f\203 \307\202 !\210`\f\203\" \307\202# \2031 \306! Z\2022 \310!\210` \203M \311 x\210` b\210\311w\210` V\205\215 \312 \313\314\313% \315\316\317#\210\313 \211 \203\211 @\315@A#\210A\211\204p *),\207" [buf beg match-num1 startline smerge-refine-weight-hack smerge-refine-forward-function string-to-number forward-char 1 " \n" make-overlay nil front-advance overlay-put evaporate t match-num2 end smerge-refine-ignore-whitespace ol props x #1=#:--cl-dolist-temp--] 6]) #@353 Show fine differences in the two regions BEG1..END1 and BEG2..END2. PROPS is an alist of properties to put (via overlays) on the changes. If non-nil, PREPROC is called with no argument in a buffer that contains a copy of a region, just before preparing it to for `diff'. It can be used to replace chars to try and eliminate some spurious differences. (defalias 'smerge-refine-subst #[(beg1 end1 beg2 end2 props &optional preproc) "p`\306\307!\306\310!\311\f \n)$\210\311*+ )$\210\312\216\313\314! ,r,q\210\315\216\316 -\317.\320\321\320/\203C 0\204C \322\202D \323\n &\210)eb\210\320\211 1 2m\204\267 \324\325!\204e \326\327`\330 {\"\210\331\224f\332\333!\332\334!\332\335!\332\336! 3 4 5 6\211 7\337>\203\220 \340\f658%27\341>\203\244 \340*438%1-\333y\210\342\343\320\344#\203S \345\224b\210\202S 0?\205\356 2\203\325 \3462! V\203\325 \3472\3502! #\2101\205\356 \3461!+V\205\356 \3471\3501!+#.\n\207" [buf pos file1 file2 beg1 end1 make-temp-file "diff1" "diff2" smerge-refine-chopup-region ((byte-code "b\210\303 !\210\303\n!\207" [pos file1 file2 delete-file] 2)) generate-new-buffer " *temp*" ((byte-code "\301!\203\n \302!\210\301\207" [#1=#:temp-buffer buffer-name kill-buffer] 2)) emacs-mule call-process nil t "-awd" "-ad" looking-at "\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)?\\([acd]\\)\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)?$" error "Unexpected patch hunk header: %s" line-end-position 3 match-string 1 2 4 5 (100 99) smerge-refine-highlight-change (97 99) re-search-forward "^[0-9]" move 0 overlay-end move-overlay overlay-start preproc beg2 end2 #1# coding-system-for-read diff-command smerge-refine-ignore-whitespace smerge-refine-weight-hack last2 last1 m5 m4 m2 m1 op props] 9 (#$ . 25785)]) #@226 Highlight the words of the conflict that are different. For 3-way conflicts, highlights only 2 of the 3 parts. A numeric argument PART can be used to specify which 2 parts; repeating the command will highlight other 2 parts. (defalias 'smerge-refine #[(&optional part) "\250\203 \303W\204 \304V\203 \305\306\"\210\307 \210\310\311\224\311\225\312\313$\210\314\225\204+ \314\202A \303\225\304\225=\2037 \303\202A \250\203@ \202A \314\211\303=\203L \314\202M \303\304=\203W \314\202X \304\315\n!\210\315 !\210\316\311\224\311\224T\317\320 B$\210\321\n\224\n\225 \224 \225\322%*\207" [part n2 n1 1 3 error "No conflict part nb %s" smerge-match-conflict remove-overlays 0 smerge refine 2 smerge-ensure-match put-text-property smerge-refine-part buffer-chars-modified-tick smerge-refine-subst ((smerge . refine) (face . smerge-refined-change))] 7 (#$ . 27527) (byte-code "\250\203 C\207\303 \210\304\305\224\306\"\211:\205 \307 @=\205 A\211\250\205+ \310\n\311\"T*C\207" [current-prefix-arg prop part smerge-match-conflict get-text-property 0 smerge-refine-part buffer-chars-modified-tick mod 3] 4)]) (defalias 'smerge-diff #[(n1 n2) "\306 \210\307!\210\307 !\210\nH\n H\224\225 \224 \225\310\311!\310\312! \f\205' \313\f! ! \" # $ % &\314$# \315\316%\210\314\"! \315\316%\210\317\216r\320'!q\210 \321 (\322 \210\323\324)\315\321\315\325*\326&\327 Q\326%\327 Q \257\"&\211 +\330=\203\222 \331c\210*eb\210\332 \210\333p\321\". \207" [n1 n2 smerge-match-names default-directory buffer-file-name buffer-file-coding-system smerge-match-conflict smerge-ensure-match make-temp-file "smerge1" "smerge2" file-relative-name write-region nil nomessage ((byte-code "\302!\210\302 !\207" [file1 file2 delete-file] 2)) get-buffer-create t erase-buffer apply call-process append "-L" "/" 0 "No differences found.\n" diff-mode display-buffer coding-system-for-read file dir file2 file1 end2 beg2 end1 beg1 name2 name1 smerge-diff-buffer-name inhibit-read-only diff-command smerge-diff-switches status] 15]) #@121 Invoke ediff to resolve the conflicts. NAME-MINE, NAME-OTHER, and NAME-BASE, if non-nil, are used for the buffer names. (defalias 'smerge-ediff #[(&optional name-mine name-other name-base) "p \306 \307\f! \310\"\206 \311 \312Q! #\310$\206\" \311 \313Q! %\314 &r#q\210\315 \210\316!\210eb\210\317 \203K \320\224\203D \321&\322\323!\210\2027 \324 \210\325\314!\210\n \210)r%q\210\315 \210\316!\210eb\210\317 \203q \322\326!\210\202e \324 \210\325\314!\210\n \210)&\203\302 \310'\206\213 \311 \327Q!&r&q\210\315 \210\316!\210eb\210\317 \203\267 \320\225\203\256 \322\320!\210\202\235 \330\224\330\225|\210\202\235 \324 \210\325\314!\210\n \210)&\203\322 \331#%&#\202\330 \332#%\"q\210\333\334!\210 \333\335!\210 \333\336!\210\337 \340\341!.\207" [buf major-mode mode config buffer-file-name filename current-window-configuration file-name-nondirectory generate-new-buffer "*" " MINE*" " OTHER*" nil buffer-disable-undo insert-buffer-substring smerge-find-conflict 2 t smerge-keep-n 1 buffer-enable-undo set-buffer-modified-p 3 " BASE*" 0 ediff-merge-buffers-with-ancestor ediff-merge-buffers make-local-variable smerge-ediff-windows smerge-ediff-buf ediff-quit-hook #[nil " \n \f \306 \210rq\210\307 \210\310!\210\311!\210\311!\210\311!\210\312!\203= \311!\210\313!\210\314\315!.\207" [ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer smerge-ediff-buf smerge-ediff-windows ediff-cleanup-mess erase-buffer insert-buffer-substring kill-buffer bufferp set-window-configuration message "Conflict resolution finished; you may save the buffer" windows buf buffer-Ancestor buffer-C buffer-B buffer-A] 6] message "Please resolve conflicts now; exit ediff when done" name-mine mine name-other other base name-base] 4 (#$ . 29580) nil]) #@240 Insert diff3 markers to make a new conflict. Uses point and mark for 2 of the relevant positions and previous marks for the other ones. By default, makes up a 2-way conflict, with a \[universal-argument] prefix, makes up a 3-way conflict. (defalias 'smerge-makeup-conflict #[(pt1 pt2 pt3 &optional pt4) "\306 \n \205\n CBBB\307\"\211 AA\203 \f\211A@\202% \310\311\312\fGD\"\f\211A@\f\211A@\f\211A@\f\203F \310\311\312\313\fG\\D\"\210b\210\314 \210\315c\210 b\210\314 \210\316c\210\nb\210\314 \210 \203k \317c\210 b\210\314 \210\320c\210- \204w \305\321!\210\322 \207" [pt1 pt2 pt3 pt4 #1=#:--cl-rest-- smerge-mode sort >= signal wrong-number-of-arguments nil 4 beginning-of-line ">>>>>>> OTHER\n" "=======\n" "||||||| BASE\n" "<<<<<<< MINE\n" 1 smerge-refine] 6 (#$ . 31387) (list (point) (mark) (progn (pop-mark) (mark)) (when current-prefix-arg (pop-mark) (mark)))]) (byte-code "\305B\306 \307\n\307 \307\f\307\260!\207" [current-load-list smerge-begin-re smerge-end-re smerge-base-re smerge-other-re smerge-parsep-re (lambda (#1=#:defconst-tmp-var) (defconst smerge-parsep-re #1#)) "\\|"] 9) #@91 Non-nil if Smerge mode is enabled. Use the command `smerge-mode' to change this variable. (defvar smerge-mode nil (#$ . 32503)) (make-variable-buffer-local 'smerge-mode) #@82 Minor mode to simplify editing output from the diff3 program. \{smerge-mode-map} (defalias 'smerge-mode #[(&optional arg) "\306 \307=\203 \n?\202( \203 \310 !\311V\202( \n\204\" \312\202( \313\314\302\"\210\315\316\303!\203\\ \203\\ \212\n\203A \317\315\f\320#\210\202F \321\315\f\"\210eb\210\322 \203[ \212\323\311\224\311\225\315#\210)\202I )\324\325 !\"\203z \n\204\210 \326\327!\210\330\331\312\211$\202\210 \n\203\210 \326\327!\210 P\n\204\221 \332ed\"\210\333\334\n\203\233 \335\202\234 \336\"\210\337 \203\274 \306 \203\257 \306 \232\203\274 \313\340\n\203\271 \341\202\272 \342\"\210)\343 \210\n\207" [#1=#:last-message arg smerge-mode font-lock-mode smerge-font-lock-keywords smerge-parsep-re current-message toggle prefix-numeric-value 0 t message "Toggling %s off; better pass an explicit argument." nil boundp font-lock-add-keywords append font-lock-remove-keywords smerge-find-conflict font-lock-fontify-region string-match regexp-quote make-local-variable paragraph-separate replace-match "" smerge-remove-props run-hooks smerge-mode-hook smerge-mode-on-hook smerge-mode-off-hook called-interactively-p "Smerge mode %sabled" "en" "dis" force-mode-line-update] 5 (#$ . 32679) (list (or current-prefix-arg 'toggle))]) (byte-code "\300\301\302\303\304!\205 \304J#\207" [add-minor-mode smerge-mode " SMerge" boundp smerge-mode-map] 5) #@119 Turn on `smerge-mode' and move point to first conflict marker. If no conflict maker is found, turn off `smerge-mode'. (defalias 'smerge-start-session #[nil "\300\301!\210\302\303\304\217\207" [smerge-mode 1 nil (byte-code "\301!?\205 \302 \207" [smerge-begin-re looking-at smerge-next] 2) ((error (smerge-auto-leave)))] 3 (#$ . 34050) nil]) (provide 'smerge-mode)
Close
