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 : diff-mode.elc
;ELC ;;; Compiled by mockbuild@c6b8.bsys.dev.centos.org on Thu Feb 19 13:02:48 2015 ;;; from file /builddir/build/BUILD/emacs-23.1/lisp/diff-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 "`diff-mode.el' was compiled for Emacs 19.29 or later")) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (custom-declare-group 'diff-mode nil "Major mode for viewing/editing diffs." :version "21.1" :group 'tools :group 'diff) #@61 If non-nil, `diff-mode' buffers default to being read-only. (custom-declare-variable 'diff-default-read-only 'nil '(#$ . 730) :type 'boolean :group 'diff-mode) #@89 Non-nil means `diff-goto-source' jumps to the old file. Else, it jumps to the new file. (custom-declare-variable 'diff-jump-to-old-file 'nil '(#$ . 896) :type 'boolean :group 'diff-mode) #@340 Non-nil means hunk headers are kept up-to-date on-the-fly. When editing a diff file, the line numbers in the hunk headers need to be kept consistent with the actual diff. This can either be done on the fly (but this sometimes interacts poorly with the undo mechanism) or whenever the file is written (can be slow when editing big diffs). (custom-declare-variable 'diff-update-on-the-fly 't '(#$ . 1090) :type 'boolean :group 'diff-mode) #@76 Non-nil means `diff-apply-hunk' will move to the next hunk after applying. (custom-declare-variable 'diff-advance-after-apply-hunk 't '(#$ . 1534) :type 'boolean :group 'diff-mode) #@50 Run after setting up the `diff-mode' major mode. (custom-declare-variable 'diff-mode-hook 'nil '(#$ . 1721) :type 'hook :options '(diff-delete-empty-files diff-make-unified) :group 'diff-mode) (byte-code "\301B\302\301!\204 \303\301\304\"\210\301\207" [current-load-list diff-outline-regexp default-boundp set-default "\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)"] 3) #@61 Basic keymap for `diff-mode', bound to various prefix keys. (defconst diff-mode-shared-map (byte-code "\301\302\303\304\300!\205\n \303$\207" [diff-mode-shared-map easy-mmode-define-keymap (("n" . diff-hunk-next) ("N" . diff-file-next) ("p" . diff-hunk-prev) ("P" . diff-file-prev) (" " . diff-hunk-next) ([backtab] . diff-hunk-prev) ("k" . diff-hunk-kill) ("K" . diff-file-kill) ("}" . diff-file-next) ("{" . diff-file-prev) (" " . diff-goto-source) ([mouse-2] . diff-goto-source) ("o" . diff-goto-source) ("q" . quit-window)) nil boundp] 5) (#$ . 2122)) #@59 Keymap for `diff-mode'. See also `diff-mode-shared-map'. (defconst diff-mode-map (byte-code "\302\303B\304B\305\306\301!\205 \305$\207" [diff-mode-shared-map diff-mode-map easy-mmode-define-keymap "" (("" . diff-goto-source) ("4A" . diff-add-change-log-entries-other-window) ("" . diff-apply-hunk) ("" . diff-ediff-patch) ("" . diff-restrict-view) ("" . diff-split-hunk) ("" . diff-test-hunk) ("" . diff-reverse-direction) ("" . diff-context->unified) ("" . diff-unified->context) ("" . diff-ignore-whitespace-hunk) ("" . diff-refine-hunk) ("" . next-error-follow-minor-mode)) nil boundp] 5) (#$ . 2685)) #@23 Menu for `diff-mode'. (defvar diff-mode-menu nil (#$ . 3326)) (easy-menu-do-define 'diff-mode-menu diff-mode-map "Menu for `diff-mode'." '("Diff" ["Jump to Source" diff-goto-source :help "Jump to the corresponding source line"] ["Apply hunk" diff-apply-hunk :help "Apply the current hunk to the source file and go to the next"] ["Test applying hunk" diff-test-hunk :help "See whether it's possible to apply the current hunk"] ["Apply diff with Ediff" diff-ediff-patch :help "Call `ediff-patch-file' on the current buffer"] ["Create Change Log entries" diff-add-change-log-entries-other-window :help "Create ChangeLog entries for the changes in the diff buffer"] "-----" ["Reverse direction" diff-reverse-direction :help "Reverse the direction of the diffs"] ["Context -> Unified" diff-context->unified :help "Convert context diffs to unified diffs"] ["Unified -> Context" diff-unified->context :help "Convert unified diffs to context diffs"] ["Show trailing whitespace" whitespace-mode :style toggle :selected (bound-and-true-p whitespace-mode) :help "Show trailing whitespace in modified lines"] "-----" ["Split hunk" diff-split-hunk :active (diff-splittable-p) :help "Split the current (unified diff) hunk at point into two hunks"] ["Ignore whitespace changes" diff-ignore-whitespace-hunk :help "Re-diff the current hunk, ignoring whitespace differences"] ["Highlight fine changes" diff-refine-hunk :help "Highlight changes of hunk at point at a finer granularity"] ["Kill current hunk" diff-hunk-kill :help "Kill current hunk"] ["Kill current file's hunks" diff-file-kill :help "Kill all current file's hunks"] "-----" ["Previous Hunk" diff-hunk-prev :help "Go to the previous count'th hunk"] ["Next Hunk" diff-hunk-next :help "Go to the next count'th hunk"] ["Previous File" diff-file-prev :help "Go to the previous count'th file"] ["Next File" diff-file-next :help "Go to the next count'th file"])) #@44 Prefix key for `diff-minor-mode' commands. (custom-declare-variable 'diff-minor-mode-prefix '"=" '(#$ . 5236) :type '(choice (string "") (string "C-c=") string) :group 'diff-mode) #@65 Keymap for `diff-minor-mode'. See also `diff-mode-shared-map'. (defconst diff-minor-mode-map (byte-code "\303 BC\304\305\302!\205 \n\304$\207" [diff-minor-mode-prefix diff-mode-shared-map diff-minor-mode-map easy-mmode-define-keymap nil boundp] 5) (#$ . 5424)) #@111 Non-nil if Diff-Auto-Refine mode is enabled. Use the command `diff-auto-refine-mode' to change this variable. (defvar diff-auto-refine-mode t (#$ . 5695)) (make-variable-buffer-local 'diff-auto-refine-mode) #@155 Automatically highlight changes in detail as the user visits hunks. When transitioning from disabled to enabled, try to refine the current hunk, as well. (defalias 'diff-auto-refine-mode #[(&optional arg) "\305 \306=\203 \n?\202( \203 \307 !\310V\202( \n\204\" \311\202( \312\313\302\"\210\314\211\203? \315\f\2039 \210\202> \314\316\317\217\210)\320\321\n\203I \322\202J \323\"\210\324 \203j \305 \203] \305 \232\203j \312\325\n\203g \326\202h \327\"\210)\330 \210\n\207" [#1=#:last-message arg diff-auto-refine-mode #2=#:body debug-on-error current-message toggle prefix-numeric-value 0 t message "Toggling %s off; better pass an explicit argument." nil #[nil "\300 \207" [diff-refine-hunk] 1] (funcall #2#) ((error)) run-hooks diff-auto-refine-mode-hook diff-auto-refine-mode-on-hook diff-auto-refine-mode-off-hook called-interactively-p "Diff-Auto-Refine mode %sabled" "en" "dis" force-mode-line-update] 4 (#$ . 5909) (list (or current-prefix-arg 'toggle))]) (byte-code "\301\302\303\304\305!\205 \305J#\210\306\307\310\311\312\313%\210\314\315\316\307#\210\315B\317\315!\204* \320\315\307\"\210\306\321\322\323\312\313%\210\314\324\316\321#\210\324B\317\324!\204G \320\324\321\"\210\306\325\326\327\312\313%\210\314\330\316\325#\210\330B\317\330!\204d \320\330\325\"\210\306\331\332\333\312\313%\210\314\334\316\331#\210\334B\317\334!\204\201 \320\334\331\"\210\306\335\336\337\312\313%\210\314\340\316\335#\210\340B\317\340!\204\236 \320\340\335\"\210\306\341\342\343\312\313%\210\314\344\316\341#\210\344B\317\344!\204\273 \320\344\341\"\210\306\345\346\347\312\313%\210\314\350\316\345#\210\350B\317\350!\204\330 \320\350\345\"\210\306\351\352\353\312\313\354\355&\210\356B\317\356!\204\362 \320\356\351\"\210\306\357\360\361\312\313\354\355&\210\362B\317\362!\204\f\320\362\357\"\210\306\363\364\365\312\313\354\355&\210\366B\317\366!\204&\320\366\363\"\210\306\367\370\371\312\313%\210\314\372\316\367#\210\372B\317\372!\204C\320\372\367\"\210\306\373\374\375\312\313%\210\314\376\316\373#\210\376B\317\376!\204`\320\376\373\"\210\306\377\201@ \201A \312\313%\210\314\201B \316\377#\210\201B B\317\201B !\204\211\320\201B \377\"\210\201C B\201D \201E !\207" [current-load-list add-minor-mode diff-auto-refine-mode nil boundp diff-auto-refine-mode-map custom-declare-face diff-header ((((class color) (min-colors 88) (background light)) :background "grey80") (((class color) (min-colors 88) (background dark)) :background "grey45") (((class color) (background light)) :foreground "blue1" :weight bold) (((class color) (background dark)) :foreground "green" :weight bold) (t :weight bold)) "`diff-mode' face inherited by hunk and index header faces." :group diff-mode put diff-header-face face-alias default-boundp set-default diff-file-header ((((class color) (min-colors 88) (background light)) :background "grey70" :weight bold) (((class color) (min-colors 88) (background dark)) :background "grey60" :weight bold) (((class color) (background light)) :foreground "green" :weight bold) (((class color) (background dark)) :foreground "cyan" :weight bold) (t :weight bold)) "`diff-mode' face used to highlight file header lines." diff-file-header-face diff-index ((t :inherit diff-file-header)) "`diff-mode' face used to highlight index header lines." diff-index-face diff-hunk-header ((t :inherit diff-header)) "`diff-mode' face used to highlight hunk header lines." diff-hunk-header-face diff-removed ((t :inherit diff-changed)) "`diff-mode' face used to highlight removed lines." diff-removed-face diff-added ((t :inherit diff-changed)) "`diff-mode' face used to highlight added lines." diff-added-face diff-changed ((((type tty pc) (class color) (background light)) :foreground "magenta" :weight bold :slant italic) (((type tty pc) (class color) (background dark)) :foreground "yellow" :weight bold :slant italic)) "`diff-mode' face used to highlight changed lines." diff-changed-face diff-indicator-removed ((t :inherit diff-removed)) "`diff-mode' face used to highlight indicator of removed lines (-, <)." :version "22.1" diff-indicator-removed-face diff-indicator-added ((t :inherit diff-added)) "`diff-mode' face used to highlight indicator of added lines (+, >)." diff-indicator-added-face diff-indicator-changed ((t :inherit diff-changed)) "`diff-mode' face used to highlight indicator of changed lines." diff-indicator-changed-face diff-function ((t :inherit diff-header)) "`diff-mode' face used to highlight function names produced by \"diff -p\"." diff-function-face diff-context ((((class color grayscale) (min-colors 88)) :inherit shadow)) "`diff-mode' face used to highlight context and other side-information." diff-context-face diff-nonexistent ((t :inherit diff-file-header)) "`diff-mode' face used to highlight nonexistent files in recursive diffs." diff-nonexistent-face diff-yank-handler (lambda (#1=#:defconst-tmp-var) (defconst diff-yank-handler #1#)) (diff-yank-function)] 8) (defalias 'diff-yank-function #[(text) "\304\305\306#`c\210\n\206 \307\310!?\205G \311 \210\212\312\313 \314#\2031 \315f\316=\203- \317\2022 \320\2022 \321)\212\312 \314#\205F \322\323\314\211#\210\2025 **\207" [text start mixed re next-single-property-change 0 yank-handler derived-mode-p diff-mode undo-boundary re-search-backward "^[><!][ ]" t nil 33 "^[!+- ][ ]" "^[<>][ ]" "^[ <>!+-]" replace-match ""] 4]) (byte-code "\301B\303\304!\210\302B\305\306!\210\307B\310\307!\204. \311\307\312 \313Q\314B\315\316\n\317B\320BBBB\"\210\321B\322\323!\210\324B\310\324!\204E \311\324\325\"\210\301\207" [current-load-list diff-hunk-header-re-unified diff-context-mid-hunk-header-re (lambda (#1=#:defconst-tmp-var) (defconst diff-hunk-header-re-unified #1#)) "^@@ -\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)? \\+\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)? @@" (lambda (#2=#:defconst-tmp-var) (defconst diff-context-mid-hunk-header-re #2#)) "--- \\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)? ----$" diff-font-lock-keywords default-boundp set-default "\\(" "\\)\\(.*\\)$" ((1 diff-hunk-header-face) (6 diff-function-face)) ("^\\(\\*\\{15\\}\\)\\(.*\\)$" (1 diff-hunk-header-face) (2 diff-function-face)) ("^\\*\\*\\* .+ \\*\\*\\*\\*" . diff-hunk-header-face) diff-hunk-header-face (("^[0-9,]+[acd][0-9,]+$" . diff-hunk-header-face) ("^---$" . diff-hunk-header-face) ("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\([^ \n]+?\\)\\(?: .*\\| \\(\\*\\*\\*\\*\\|----\\)\\)?\n" (0 diff-header-face) (2 (if (not (match-end 3)) diff-file-header-face) prepend)) ("^\\([-<]\\)\\(.*\n\\)" (1 diff-indicator-removed-face) (2 diff-removed-face)) ("^\\([+>]\\)\\(.*\n\\)" (1 diff-indicator-added-face) (2 diff-added-face)) ("^\\(!\\)\\(.*\n\\)" (1 diff-indicator-changed-face) (2 diff-changed-face)) ("^Index: \\(.+\\).*\n" (0 diff-header-face) (1 diff-index-face prepend)) ("^Only in .*\n" . diff-nonexistent-face) ("^\\(#\\)\\(.*\\)" (1 font-lock-comment-delimiter-face) (2 font-lock-comment-face)) ("^[^-=+*!<>#].*\n" (0 diff-context-face))) diff-font-lock-defaults (lambda (#3=#:defconst-tmp-var) (defconst diff-font-lock-defaults #3#)) (diff-font-lock-keywords t nil nil nil (font-lock-multiline)) diff-imenu-generic-expression ((nil "\\+\\+\\+\\ \\([^ \n]+\\)[ \n]" 1) (nil "^--- \\([^ \n]+\\) .*\n\\*" 1))] 7) #@269 If non-nil, empty lines are valid in unified diffs. Some versions of diff replace all-blank context lines in unified format with empty lines. This makes the format less robust, but is tolerated. See http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html (defvar diff-valid-unified-empty-line t (#$ . 13148)) (byte-code "\302B\303\304 \305Q!\210\306B\307\310\n\311\312OP!\210\313B\314\313!\204' \315\313\312\"\210\312\207" [current-load-list diff-hunk-header-re-unified diff-hunk-header-re (lambda (#1=#:defconst-tmp-var) (defconst diff-hunk-header-re #1#)) "^\\(?:" ".*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$" diff-file-header-re (lambda (#2=#:defconst-tmp-var) (defconst diff-file-header-re #2#)) "^\\(--- .+\n\\+\\+\\+ \\|\\*\\*\\* .+\n--- \\|[^-+!<>0-9@* \n]\\).+\n" 1 nil diff-narrowed-to default-boundp set-default] 5) (defalias 'diff-hunk-style #[(&optional style) "\302!\203 \303f\304\236A\305\225b\210 \207" [diff-hunk-header-re style looking-at nil ((64 . unified) (42 . context)) 0] 2]) (defalias 'diff-end-of-hunk #[(&optional style donttrustheader) "\306\307 !\203b \310\n!\311\225b\210 \204b \312\225\203b \313\314\312!\206! \315! \313\314\316!\206+ \315! \212\317 \2038 \320\2029 \321\306\322\f$\210\323\312!) !\212\317 \203O \324\202P \325\306\322 $\210\323\312!) \"!\"],\204\270 \317\n\326=\203} \203v \327\202w \330#P\202\222 \n\331=\203\207 \332\202\222 \n\333=\203\221 \334\202\222 \335\306\322#\205\232 \311\224 \203\270 \206\245 db\210`SSf\336=\203\270 \337u\210`\202\247 \206\275 db)\207" [end diff-hunk-header-re style donttrustheader nold nnew nil looking-at diff-hunk-style 0 2 string-to-number match-string "1" 4 re-search-forward "^[- \n]" "^[- ]" t line-beginning-position "^[+ \n]" "^[+ ]" unified "^[^-+# \\\n]\\|" "^[^-+# \\]\\|" context "^[^-+#! \\]" normal "^[^<>#\\]" "^[^-+#!<> \\]" 10 -1 diff-valid-unified-empty-line endold endnew diff-file-header-re] 5]) #@188 Move back to beginning of hunk. If TRY-HARDER is non-nil, try to cater to the case where we're not in a hunk but in the file header instead, in which case move forward to the first hunk. (defalias 'diff-beginning-of-hunk #[(&optional try-harder) "\301 \210\302!?\205 \303y\210\304\305\306\217\207" [diff-hunk-header-re beginning-of-line looking-at 1 nil (re-search-backward diff-hunk-header-re) ((error (byte-code "\204 \301\302!\207\303 \210\304 \207" [try-harder error "Can't find the beginning of the hunk" diff-beginning-of-file-and-junk diff-hunk-next] 2)))] 3 (#$ . 15143)]) (defalias 'diff-unified-hunk-p #[nil "\212\300\301\302\217)\207" [nil (byte-code "\300 \210\301\302!\207" [diff-beginning-of-hunk looking-at "^@@"] 2) ((error))] 3]) (defalias 'diff-beginning-of-file #[nil "\303 \210\304!?\2056 `\305\306y\210\307\305\310#\211\203/ `\nX\204+ \307\305\310#\211\203/ \2025 \nb\210\311\312!*\207" [diff-file-header-re res start beginning-of-line looking-at nil 3 re-search-backward t error "Can't find the beginning of the file"] 4]) (defalias 'diff-end-of-file #[nil "\301\302\303\304#\210\301\305P\303\306#\210\307\224\203 \307\224b\207\310 \207" [diff-file-header-re re-search-forward "^[-+#!<>0-9@* \\]" nil t "^[^-+#!<>0-9@* \\]\\|" move 1 beginning-of-line] 4]) (add-to-list 'debug-ignored-errors "^No \\(previous\\|next\\) hunk") #@31 Go to the next COUNT'th hunk. (defalias 'diff-hunk-next #[(&optional count) "\204 \306\307W\203 \310[!\207\311 !\203 TdeZ\312 W~\210\313 \314\315$\204E \311 !\203= \316 \2068 db\210\202l \317\320\321\"\210\202l \307\224b\210p\322\323 !=\203l t\203l \212\316 )\206^ d\324 \314\315#\204k \325\326!\210)\n\203s \327 \210)\f\205\211 \330 \203\204 \202\210 \314\331\332\217)\207" [count diff-hunk-header-re was-narrowed endpt diff-auto-refine-mode #1=#:body 1 0 diff-hunk-prev looking-at buffer-size re-search-forward nil t diff-end-of-hunk error "No next %s" "hunk" window-buffer selected-window pos-visible-in-window-p recenter (0) diff-restrict-view #[nil "\300 \207" [diff-refine-hunk] 1] (funcall #1#) ((error)) debug-on-error] 5 (#$ . 16511) "p"]) (put 'diff-hunk-next 'definition-name 'diff-hunk) #@34 Go to the previous COUNT'th hunk (defalias 'diff-hunk-prev #[(&optional count) "\204 \306\307W\203 \310[!\207deZ\311 W~\210\312\n\313\314$\204( \315\316\317\"\210 \203/ \320 \210) \205D \321 \203? \f \202C \313\322\323\217)\207" [count was-narrowed diff-hunk-header-re diff-auto-refine-mode #1=#:body debug-on-error 1 0 diff-hunk-next buffer-size re-search-backward nil t error "No previous %s" "hunk" diff-restrict-view #[nil "\300 \207" [diff-refine-hunk] 1] (funcall #1#) ((error))] 5 (#$ . 17332) "p"]) (byte-code "\300\301\302\303#\210\304\305\306\"\207" [put diff-hunk-prev definition-name diff-hunk add-to-list debug-ignored-errors "^No \\(previous\\|next\\) file"] 4) #@31 Go to the next COUNT'th file. (defalias 'diff-file-next #[(&optional count) "\204 \303\304W\203 \305[!\207\306 !\203 T\307 \310\311$\2046 \306 !\2031 \312 \206/ db\207\313\314\315\"\207\304\224b\210p\316\317 !=\205] t\205] \212\312 )\206O d\320\n\310\311#?\205\\ \321\322!)\207" [count diff-file-header-re endpt 1 0 diff-file-prev looking-at re-search-forward nil t diff-end-of-hunk error "No next %s" "file" window-buffer selected-window pos-visible-in-window-p recenter (0)] 5 (#$ . 18023) "p"]) (put 'diff-file-next 'definition-name 'diff-file) #@34 Go to the previous COUNT'th file (defalias 'diff-file-prev #[(&optional count) "\204 \302\303W\203 \304[!\207\305 \306\307$?\205 \310\311\312\"\207" [count diff-file-header-re 1 0 diff-file-next re-search-backward nil t error "No previous %s" "file"] 5 (#$ . 18588) "p"]) (put 'diff-file-prev 'definition-name 'diff-file) #@115 Restrict the view to the current hunk. If the prefix ARG is given, restrict the view to the current file instead. (defalias 'diff-restrict-view #[(&optional arg) "\212\203 \302 \210\202 \303\304!\210`\203 \305 \210\202 \306 \210`}\210\307\301!\210\203, \310\202- \311\211)\207" [arg diff-narrowed-to diff-beginning-of-file diff-beginning-of-hunk try-harder diff-end-of-file diff-end-of-hunk make-local-variable file hunk] 2 (#$ . 18925) "P"]) #@20 Kill current hunk. (defalias 'diff-hunk-kill #[nil "\306 \210`\307 \310\311#\205 \312\224\310\313\314\217\310\315\316\217 \311 b\210 \203< U\203< \n\2037 \f\203< \n\fV\203< \317 \202C \320 \210\321`\"-\207" [start diff-hunk-header-re nexthunk firsthunk nextfile inhibit-read-only diff-beginning-of-hunk re-search-forward nil t 0 (byte-code "b\210\301 \210\302 \210`\207" [start diff-beginning-of-file diff-hunk-next] 1) ((error)) (byte-code "\300 \210`\207" [diff-file-next] 1) ((error)) diff-file-kill diff-end-of-hunk kill-region] 4 (#$ . 19382) nil]) (byte-code "\301B\302\303!\207" [current-load-list diff-file-junk-re (lambda (#1=#:defconst-tmp-var) (defconst diff-file-junk-re #1#)) "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode"] 2) #@164 Go to the beginning of file-related diff-info. This is like `diff-beginning-of-file' except it tries to skip back over leading data such as "Index: ..." and such. (defalias 'diff-beginning-of-file-and-junk #[nil "`\306 \210\307 !\205 \310y\210\202 `\305\311\312\217\211 :\205 \f \313\314\315\217 \212\313\316\317\217) \212\310y\210\320\321\322#) \247\203U \f\247\203R \203U \fV\203U \203i \f\247\203i \fW\203i \f\247\203\214 \f X\203\214 \fb\210\212\323\324y!\205\202 \307 !)\205\225 \324y\210\202w b\210\325 @ A\".\207" [orig diff-file-junk-re _ start prevfile err beginning-of-line looking-at 1 (byte-code "\212\300 \210`)\207" [diff-beginning-of-file] 1) ((error err)) nil (byte-code "\212b\210\301 \210`)\207" [start diff-file-next] 1) ((error)) (byte-code "\247\203 b\210\301 \210`\207" [prevfile diff-hunk-prev] 1) ((error)) re-search-backward "^Index: " t zerop -1 signal nextfile prevhunk previndex] 5 (#$ . 20164)]) #@28 Kill current file's hunks. (defalias 'diff-file-kill #[nil "`\303 \210`\304\305 \210\306\307!\203 \310u\210\n`V\203 \311\312!\210\313 `\"+\207" [inhibit-read-only start orig diff-beginning-of-file-and-junk t diff-end-of-file looking-at "^\n" 1 error "Not inside a file diff" kill-region] 3 (#$ . 21128) nil]) #@28 Kill spurious empty diffs. (defalias 'diff-kill-junk #[nil "\212\302eb\210\303\304\305\306 \307\260\310\302#\205* \311\225\203 \312\224\202 \313\225\314\224|\210\315 \210\202 *\207" [inhibit-read-only diff-file-header-re t re-search-forward "^\\(Index: .*\n\\)" "\\([^-+!* <>].*\n\\)*?" "\\(\\(Index:\\) \\|" "\\)" nil 4 0 1 3 beginning-of-line] 6 (#$ . 21448) nil]) (defalias 'diff-count-matches #[(re start end) "\212\304 b\210\305\n \306#\203 T\202 *\207" [n start re end 0 re-search-forward t] 4]) (defalias 'diff-splittable-p #[nil "\212\300 \210\301\302!\205 \303y\210\301\302!\205 \304 )\207" [beginning-of-line looking-at "^[-+ ]" -1 diff-unified-hunk-p] 2]) #@64 Split the current (unified diff) hunk at point into two hunks. (defalias 'diff-split-hunk #[nil "\306 \210`\307 \210`\310\n!\204 \311\312!\210\313y\210\314\315\313!!\314\315\316!! \317\320` #\\ \f\317\321` #\\ \322 b\210\323\324 !\325\324!\326\261\210\327 \".\207" [start pos diff-hunk-header-re-unified start1 start2 newstart1 beginning-of-line diff-beginning-of-hunk looking-at error "diff-split-hunk only works on unified context diffs" 1 string-to-number match-string 3 diff-count-matches "^[- ]" "^[+ ]" t "@@ -" number-to-string ",1 +" ",1 @@\n" diff-fixup-modifs newstart2 inhibit-read-only] 5 (#$ . 22134) nil]) (byte-code "\301B\302\301!\204 \303\301\304\"\210\305B\302\305!\204 \303\305\304\"\210\304\207" [current-load-list diff-remembered-files-alist default-boundp set-default nil diff-remembered-defdir] 3) (defalias 'diff-filename-drop-dir #[(file) "\301\302\"\205\f \303\225\304O\207" [file string-match "/" 0 nil] 3]) #@355 Merge the diff between ANCESTOR and FROM into TO. Returns the merged string if successful or nil otherwise. The strings are assumed not to contain any "\n" (i.e. end of line). If ANCESTOR = FROM, returns TO. If ANCESTOR = TO, returns FROM. The heuristic is simplistic and only really works for cases like (diff-merge-strings "b/foo" "b/bar" "/a/c/foo"). (defalias 'diff-merge-strings #[(ancestor from to) "\304 \304\n\260\305\306 \"\205) \n\307\310 \"\232\205) \310\224\311\224O\307\312 \" \311\225\310\225OQ)\207" [ancestor from to str "\n" string-match "\\`\\(.*?\\)\\(.*\\)\\(.*\\)\n\\1\\(.*\\)\\3\n\\(.*\\(\\2\\).*\\)\\'" match-string 5 6 4] 5 (#$ . 23099)]) #@133 Tell Emacs where the find the source file of the current hunk. If the OLD prefix arg is passed, tell the file NAME of the old file. (defalias 'diff-tell-file-name #[(old name) "\304!\211\204\f \305\306!\210 \nB B\211)\207" [old fs name diff-remembered-files-alist diff-hunk-file-names error "No file name to look for"] 3 (#$ . 23773) (let* ((old current-prefix-arg) (fs (diff-hunk-file-names current-prefix-arg))) (unless fs (error "No file name to look for")) (list old (read-file-name (format "File for %s: " (car fs)) nil (diff-find-file-name old 'noprompt) t)))]) #@71 Give the list of file names textually mentioned for the current hunk. (defalias 'diff-hunk-file-names #[(&optional old) "\212\304!\204 \305\306\307\217\204 \310\305\311#\210\212\305\312\313\217)\304\314!\203> \203* \315\316!\202- \315\317! \2037 \315\317!\202: \315\316!D\202B \316y\210\305\320\305\321 ?\205Z \212\322\323 \311#)\205Z \315\316!C\n\322\324\305\311#\205~ \203m \315\325!\202p \315\326! \203z \315\326!\202} \315\325!D#\"+\207" [diff-file-header-re old header-files limit looking-at nil (diff-beginning-of-file) ((error)) re-search-forward t (byte-code "\300 \210`\207" [diff-hunk-prev] 1) ((error (point-min))) "[-*][-*][-*] \\(\\S-+\\)\\(\\s-.*\\)?\n[-+][-+][-+] \\(\\S-+\\)" match-string 1 3 delq append re-search-backward "^Index: \\(.+\\)" "^diff \\(-\\S-+ +\\)*\\(\\S-+\\)\\( +\\(\\S-+\\)\\)?" 2 4] 9 (#$ . 24350)]) #@216 Return the file corresponding to the current patch. Non-nil OLD means that we want the old file. Non-nil NOPROMPT means to prefer returning nil than to prompt the user. PREFIX is only used internally: don't use it. (defalias 'diff-find-file-name #[(&optional old noprompt prefix) " \232\204 \306\300!\210 \306\302!\210\307\212\310 !\204& \307\311\312\217\204& \313 \307\314#\210\315\f! $\2034 \316\317 \"\320 \n\"A\206\365 \321\322\215\206\365 %\307 &%\203\206 %\211 %@\211 &\203m \323&!\204m %A\211%@\211&\204Y &*\211&\204\206 \324\307\316\325%\"\"%\307&\202H &*\206\365 \326\327'\206\224 \330\"\203\255 '\331\211\224O &\332&!\205\251 &)\206\365 $\204\316 \333\334!\203\316 \212\335 \307\314#)\203\316 \336\f(\337\340!#\206\365 (?\205\365 \341\342\343 @\206\335 \330\"\307 @\314 @% &\306\302!\210 &B\nB&)*\207" [diff-remembered-defdir default-directory diff-remembered-files-alist diff-file-header-re old fs make-local-variable nil looking-at (diff-beginning-of-file) ((error)) re-search-forward t diff-hunk-file-names mapcar #[(f) " P\207" [prefix f] 2] assoc --cl-block-nil-- (byte-code "\306\211\203/ \n@\307 \211@@)\f@ A#\211 \203' \310 !\203' \311\312 \"\210)\nA\211\204 *\306\207" [diff-remembered-files-alist rf #1=#:--cl-dolist-temp-- x fs newfile nil diff-merge-strings file-exists-p throw --cl-block-nil--] 5) file-regular-p delq diff-filename-drop-dir string-match "\\.rej\\'" "" 0 file-exists-p boundp cvs-pcl-cvs-dirchange-re re-search-backward diff-find-file-name match-string 1 read-file-name format "Use file %s: " prefix files file buffer-file-name noprompt] 6 (#$ . 25201)]) #@48 Call `ediff-patch-file' on the current buffer. (defalias 'diff-ediff-patch #[nil "\300\301\302\217\207" [err (byte-code "\300\301p\"\207" [ediff-patch-file nil] 3) ((wrong-number-of-arguments (ediff-patch-file)))] 3 (#$ . 26840) nil]) #@147 Convert unified diffs to context diffs. START and END are either taken from the region (if a prefix arg is given) or else cover the whole buffer. (defalias 'diff-unified->context #[(start end) "\306!\204 \307\310\"\310\212\nb\210\311\312 \313Q\314\310#\205,`W\205,\315\216\310 \316\224\203> \317\320\310\211\314\321%\210\317\322\310\211\314\316%\210\202(\323\324!\323\325!\206H \326\323\327!\323\330!\206R \326 \331!\332\224\310 8 9 : ; < = >\317\333>\334\335\336\337>!\337=!\340#!\341\260!\210\214\342\316!\343\344!\210`}\210\345 ?eb\210\212\311\346\314\310#)\204\242 `d|\210\2024db\210\314\211 @ A`@\340y\332U\2033\314f\347=\203\310 \350c\210\314A\340u\210\202\253 \314f\351=\203\332 `@|\210\310A\202\253 \314f\352=\203\374 A\204\357 \353u\210\350c\210\202\366 \354\353!\210\355c\210\356u\210\202\253 \314f\357=\203\212\340y\210\314f\351U)\203\253 `@|\210\310A\202\253 \314f\360=\203-\361c\210\314A\356u\210\202\253 \314A\202\253 *db\210\212\362<\334\335\336\337<!\337;!\340#!\363?\261\210)\353y\210\212\311\364\314\310#)\204d`d|\210\202\n\314\211 B A\212\311\365\314\310#)\203w\3148m\204 \314f\347=\203\216\350c\210\314A\340u\210\202\362\314f\352=\203\236\310\211BA\202\362\314f\351=\203\300A\204\263\353u\210\350c\210\202\272\354\353!\210\355c\210\356u\210\202\362\314f\357=\203\331\212\353y\210m)\204\362\310\211BA\202\362\314f\360=\203\357\361c\210\314A\356u\210\3148\202\362\314A` @\353y\210B\203@`|\210\314B)\202w*)8\203& \310=\204&\3669Z\nd\367\nd\257:B. *\202 *\207" [end inhibit-read-only start diff-hunk-header-re-unified combine-after-change-calls buffer-undo-list markerp copy-marker t re-search-forward "^\\(\\(---\\) .+\n\\(\\+\\+\\+\\) .+\\|" ".*\\)$" nil ((combine-after-change-execute)) 2 replace-match "---" 3 "***" match-string 4 5 "1" 6 7 marker-position 0 "***************\n*** " "," number-to-string + string-to-number -1 " ****" line-beginning-position diff-end-of-hunk unified buffer-string "^-" 32 " " 43 45 1 delete-char "! " -2 92 10 " " "--- " " ----\n" "^+" "^\\+.*\n-" apply diff-context->unified reversible old-end old-undo lines2 line2 lines1 line1 hunk last-pt modif delete] 10 (#$ . 27082) (byte-code "\204\f \203 \n\203 \303 \304 D\207edD\207" [current-prefix-arg transient-mark-mode mark-active region-beginning region-end] 2)]) #@211 Convert context diffs to unified diffs. START and END are either taken from the region (when it is highlighted) or else cover the whole buffer. With a prefix argument, convert unified format to context format. (defalias 'diff-context->unified #[(start end &optional to-context) "\203 \306 \n\"\207\307\n!\204 \310\n\311\"\311\212 b\210\312\313\314\311#\205\263`\nW\205\263\315\216\311 \316\224\203D \317\320\311\211\314\321%\210\317\322\311\211\314\316%\210\202\257\323\324!\323\325!\326\224 \327\n!\311 3 4 5 6 7 8\317\330!\210\3129\314\311#\204n \331\332!\210\323\333!\323\316!\334 \210`\333y\210`|\210\335 : ; <6b\210\333y\210`:W\203:\314f\336=\203\250 \337\316!\210\340c\210\333y\210\202\215 \314f\341=\203\274 \333u\210\337\333!\210\333y\210\202\215 \314f\342=\2031\212:b\210\333y\210`) =\343:f\344\"\203\354 \345:\316\\={:=|\210\261\210\202-:f\342=\203=:Z\346\316!`ZU\204\3143:=|\210\337\333!\210\333y\210\202-:f\347=\203#\333y\210\202-\3143\337\333!\210\333y\210)\202\215 \3143\333y\210\202\215 \350\351!\203^\314f\336U\204M\333u\210\202T\337\333!\210\345c\210\337\333!\210\333y\210\202:\2126b\210\3528\353\354\355\3567!\3568!\357#!\360<\353\354\355\356;!\356<!\357#!\361\261 \210):\314\211\223\2103\203\255 \311=\204\255\3624\nZ6`\3066`\2575B. *\202 *\207" [to-context start end inhibit-read-only combine-after-change-calls buffer-undo-list diff-unified->context markerp copy-marker t re-search-forward "^\\(\\(\\*\\*\\*\\) .+\n\\(---\\) .+\\|\\*\\{15\\}.*\n\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]+\\) \\*\\*\\*\\*\\)$" nil ((combine-after-change-execute)) 2 replace-match "+++" 3 "---" match-string 4 5 0 marker-position "" error "Can't find matching `--- n1,n2 ----' line" 1 beginning-of-line point-marker 33 delete-char "-" 45 32 memql (33 43) "+" line-beginning-position 92 looking-at "[+! ] " "@@ -" "," number-to-string - string-to-number -1 " +" " @@" apply reversible old-end old-undo pt1 line1e line1s diff-context-mid-hunk-header-re pt2 line2e line2s endline2] 12 (#$ . 29438) (byte-code "\203 \203 \303 \304 \nE\207ed\nE\207" [transient-mark-mode mark-active current-prefix-arg region-beginning region-end] 3)]) #@143 Reverse the direction of the diffs. START and END are either taken from the region (if a prefix arg is given) or else cover the whole buffer. (defalias 'diff-reverse-direction #[(start end) "\306!\204 \307\310\"\310\212\nb\210\311\312\313\310#\205x`W\205x\314\216\310\315\224\2030 \316\317\313\"\210\202t\320\224\203\337 \320\224\321\320! \316\322\313\211\211\320%\210\323y\210` %\324\325!\203d \313f\326U\203^ \327\323!\210\330c\210\323y\210\202J \331%`\" &\324'!\204z &c\210\332\333!\210\315\225\206\201 \323\225 (\323\224({ )(b\210\fc\210\323\224(|\210\323y\210` *\324\334!\203\267 \313f\335U\203\261 \327\323!\210\336c\210\323y\210\202\235 \331*`\" +&\206\304 \322c\210%b\210+\206\320 \322c\210* b\210)c\210.\202t\337\224\203t\316\340\313\"\210\323y\210\313f\313\211 , - .\313f\211.\211 /\326=\203-\206 `-\327\323!\210\330c\210\310\202i/\335=\2030,\206#`,\327\323!\210\336c\210\310\202i\341/\342\"\203<\310\202i-\203V,\203V-,W\203V\331-,\"c\210\313\211-,.0\203g\343\202h\344>)\203s\323y\210\202\366 +*\202 *\207" [end inhibit-read-only start combine-after-change-calls lines1 pt-lines1 markerp copy-marker t re-search-forward "^\\(\\([-*][-*][-*] \\)\\(.+\\)\n\\([-+][-+][-+] \\)\\(.+\\)\\|\\*\\{15\\}.*\n\\*\\*\\* \\(.+\\) \\*\\*\\*\\*\\|@@ -\\([0-9,]+\\) \\+\\([0-9,]+\\) @@.*\\)$" nil ((combine-after-change-execute)) 2 replace-match "\\2\\5\n\\4\\3" 6 match-string "" 1 looking-at "[-! \\][ ]\\|#" 45 delete-char "+" delete-and-extract-region error "Can't find matching `--- n1,n2 ----' line" "[!+ \\][ ]\\|#" 43 "-" 7 "@@ -\\8 +\\7 @@" memql (92 35) (32 10) (32) half1s half1 diff-context-mid-hunk-header-re str1end str1 half2s half2 last first c #1=#:--cl-var-- diff-valid-unified-empty-line] 7 (#$ . 31634) (byte-code "\204\f \203 \n\203 \303 \304 D\207edD\207" [current-prefix-arg transient-mark-mode mark-active region-beginning region-end] 2)]) #@165 Fixup the hunk headers (in case the buffer was modified). START and END are either taken from the region (if a prefix arg is given) or else cover the whole buffer. (defalias 'diff-fixup-modifs #[(start end) "\306\212 b\210\307\310\311\"\210\312\211\211\211 \313y\312U\205_\"`X\205_\314#\315\316Q!\204r \310f\317=\2038 T\202 \310f\320=\203E T\202 \310f\321=\203R \fT\202 \310f\322=\203_ \nT\202 \323\310f\324\"\204 \312\211\312\211\202 \314#!\203\333 \325\326! $\325\327! %\330 \f\\! &\330 \\! '%\203\252 '%\230\204\264 \331'\306\211\310\327%\210\202\264 \327\225b\210\332'\261\210$\203\315 &$\230\204\327 \331&\306\211\310\326%\210\202\327 \326\225b\210\332&\261\210,\202T\314(!\203\333 \n #\312V\203T\325\334! $\325\326! %\330\333 \n \313\335$!%!\211 )%\230\204\331)\306\211\310\326%\210+\202T\314\336!\203T\333 \n\f#\312V\203T\325\334! *\337\340\330*G!\341Q\333 \n\f\313\335*!%\"\211 )*\230\204S\331)\306\211\310\326%\210*\312\211\312\211\202 .\207" [inhibit-read-only end bang space minus plus t diff-end-of-hunk nil donttrustheader 0 -1 looking-at "\\|[-*][-*][-*] [0-9,]+ [-*][-*][-*][-*]$" "\\|--- .+\n\\+\\+\\+ " 32 43 45 33 memql (92 35) match-string 2 4 number-to-string replace-match "," + 1 string-to-number "\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]*\\) \\*\\*\\*\\*$" format "%0" "d" start diff-hunk-header-re-unified old1 old2 new1 new2 diff-context-mid-hunk-header-re new old] 10 (#$ . 33564) (byte-code "\204\f \203 \n\203 \303 \304 D\207edD\207" [current-prefix-arg transient-mark-mode mark-active region-beginning region-end] 2)]) #@34 Fixup hunk headers if necessary. (defalias 'diff-write-contents-hooks #[nil "\300 \203\n \301ed\"\210\302\207" [buffer-modified-p diff-fixup-modifs nil] 3 (#$ . 35177)]) (byte-code "\301B\302\301!\204 \303\301\304\"\210\304\207" [current-load-list diff-unhandled-changes default-boundp set-default nil] 3) #@102 Remember to fixup the hunk header. See `after-change-functions' for the meaning of BEG, END and LEN. (defalias 'diff-after-change-function #[(beg end len) "?\205 ?\205 \n\203 \n@^\f\nA]B\211\207 \fB\211\207" [undo-in-progress inhibit-read-only diff-unhandled-changes beg end] 3 (#$ . 35493)]) #@34 Fixup hunk headers if necessary. (defalias 'diff-post-command-hook #[nil ":\205 \301\302\303\217\207" [diff-unhandled-changes nil (byte-code "\212@b\210n\203 o\204 \305u\210\306 \210\307\310!\205 \311\312 \311=\203& \313\202' \314! \311=\2056 \212\315 \316\317#) @\nV\203f \f\203R A\320\224W\204R @\320\225V\203f \212\321\316\322\"\210`AY)\203f \323`A\"\210,\316\211\207" [diff-unhandled-changes style start diff-context-mid-hunk-header-re mid -1 diff-beginning-of-hunk looking-at "\\*\\*\\*" context line-beginning-position 3 2 re-search-forward nil t 0 diff-end-of-hunk donttrustheader diff-fixup-modifs] 4) ((error))] 3 (#$ . 35800)]) (defalias 'diff-next-error #[(arg reset) "\302p!\210\203 eb\210\303 !\210\304 \207" [reset arg pop-to-buffer diff-hunk-next diff-goto-source] 2]) (byte-code "\302\303N\204\f \304\302\303\305#\210\306\307!\204 \304\307\310\311#\210\307B\312\307!\204( \313\307\314 \"\210\306\315!\2044 \304\315\310\311#\210\315B\312\315!\204D \313\315\316 \"\210\304\301\310\311#\210\301B\312\301!\204^ \313\301\317\301\320\"\210 \"\210\304\311\321\320#\207" [current-load-list diff-mode-abbrev-table diff-mode-hook variable-documentation put "Hook run when entering Diff mode.\nNo problems result if this variable is not bound.\n`add-hook' automatically binds it. (This is true for all hook variables.)" boundp diff-mode-map definition-name diff-mode default-boundp set-default make-sparse-keymap diff-mode-syntax-table make-syntax-table define-abbrev-table nil derived-mode-parent] 5) #@611 Major mode for viewing/editing context diffs. Supports unified and context diffs as well as (to a lesser extent) normal diffs. When the buffer is read-only, the ESC prefix is not necessary. If you edit the buffer manually, diff-mode will try to update the hunk headers for you on-the-fly. You can also switch between context diff and unified diff with \[diff-context->unified], or vice versa with \[diff-unified->context] and you can also reverse the direction of a diff with \[diff-reverse-direction]. \{diff-mode-map} This mode runs the hook `diff-mode-hook', as the final step during initialization. (defalias 'diff-mode #[nil "\306\300!\210\307\310 \210\311\312\313 !\210\314\f!\210 5\306\315!\2106 \306\316!\2107\306\317!\2108\306\320!\210\321\306\322!\210\323\306\324!\210\325\306\326!\210\327\306\330!\210\3319%:\204f \332\333\334\335\307$\210\202x \306\336!\210\332\337\340\335\307$\210\332\341\342\335\307$\210\343\344!\211 ;\345<BL\210\346\347;J\"\210\332\350\351\352\353\354\355;D\356FE\335\307$\210)\306\357!\210\360/\306\361!\210\3621)\363\364!\207" [delay-mode-hooks major-mode mode-name diff-mode-map diff-mode-syntax-table diff-mode-abbrev-table make-local-variable t kill-all-local-variables diff-mode "Diff" use-local-map set-syntax-table font-lock-defaults outline-regexp imenu-generic-expression next-error-function diff-next-error beginning-of-defun-function diff-beginning-of-file-and-junk end-of-defun-function diff-end-of-file whitespace-style (trailing) whitespace-trailing-regexp "^[-+!<>].*?\\([ ]+\\)$" add-hook write-contents-functions diff-write-contents-hooks nil diff-unhandled-changes after-change-functions diff-after-change-function post-command-hook diff-post-command-hook make-symbol "--ro-bind--" buffer-read-only add-to-list minor-mode-overriding-map-alist view-mode-hook lambda (&rest --cl-rest--) apply #[(#1=#:G7800) "\302J \"\211\207" [#1# minor-mode-overriding-map-alist delq] 3] quote --cl-rest-- add-log-current-defun-function diff-current-defun add-log-buffer-file-name-function #[nil "\300\301\302\"\207" [diff-find-file-name nil noprompt] 3] run-mode-hooks diff-mode-hook local-abbrev-table diff-font-lock-defaults diff-outline-regexp diff-imenu-generic-expression diff-default-read-only diff-update-on-the-fly #2=#:--cl-ro-bind-- diff-mode-shared-map] 9 (#$ . 37338) nil]) #@99 Non-nil if Diff minor mode is enabled. Use the command `diff-minor-mode' to change this variable. (defvar diff-minor-mode nil (#$ . 39707)) (make-variable-buffer-local 'diff-minor-mode) #@70 Minor mode for viewing/editing context diffs. \{diff-minor-mode-map} (defalias 'diff-minor-mode #[(&optional arg) "\304 \305=\203 \n?\202( \203 \306 !\307V\202( \n\204\" \310\202( \311\312\302\"\210\313 \2047 \314\315\316\313\310$\210\202I \317\320!\210\314\321\322\313\310$\210\314\323\324\313\310$\210\325\326\n\203S \327\202T \330\"\210\331 \203t \304 \203g \304 \232\203t \311\332\n\203q \333\202r \334\"\210)\335 \210\n\207" [#1=#:last-message arg diff-minor-mode diff-update-on-the-fly current-message toggle prefix-numeric-value 0 t message "Toggling %s off; better pass an explicit argument." nil add-hook write-contents-functions diff-write-contents-hooks make-local-variable diff-unhandled-changes after-change-functions diff-after-change-function post-command-hook diff-post-command-hook run-hooks diff-minor-mode-hook diff-minor-mode-on-hook diff-minor-mode-off-hook called-interactively-p "Diff minor mode %sabled" "en" "dis" force-mode-line-update] 5 (#$ . 39899) (list (or current-prefix-arg 'toggle))]) (byte-code "\300\301\302\303\304!\205 \304J#\207" [add-minor-mode diff-minor-mode " Diff" boundp diff-minor-mode-map] 5) (defalias 'diff-delete-if-empty #[nil "\205 \301\302!8\303=\205 \304!\207" [buffer-file-name 7 file-attributes 0 delete-file] 3]) #@45 Arrange for empty diff files to be removed. (defalias 'diff-delete-empty-files #[nil "\300\301\302\303\304$\207" [add-hook after-save-hook diff-delete-if-empty nil t] 5 (#$ . 41188)]) #@54 Turn context diffs into unified diffs if applicable. (defalias 'diff-make-unified #[nil "\212eb\210\302!\205 \303f\304=)\205 \305 \306\216\307ed\"*\207" [diff-hunk-header-re mod looking-at nil 42 buffer-modified-p ((restore-buffer-modified-p mod)) diff-context->unified] 3 (#$ . 41378)]) #@133 Jump to the next "complex" hunk. "Complex" is approximated by "the hunk changes the number of lines". Only works for unified diffs. (defalias 'diff-next-complex-hunk #[nil "\301\302\303#\205 \304\305!\304\306!\232\205 \202 \207" [diff-hunk-header-re-unified re-search-forward nil t match-string 2 4] 4 (#$ . 41677) nil]) (defalias 'diff-sanity-check-context-hunk-half #[(lines) "\302f\303>\203 `Tf\304>\203 S\202\201 \305 !\204# U\203' \302\202\207 \302f\306>\203N `Tf\307=\203< \310\311!\204B \312\313!\202~ \314u\210\315c\210\316y\210\202\201 \317W\203Z \312\313!\202~ \310\320!\204f \312\321!\202~ l\203s \322c\210\316y\210\202\201 \315c\210`\323Z`S|\210\324\205\207 \302y\210\202 )\207" [lines count nil (32 33 43 45) (32 9) zerop (33 43 45) 10 y-or-n-p "Try to auto-fix whitespace loss damage? " error "End of hunk ambiguously marked" 1 " " -1 0 "Try to auto-fix whitespace loss and word-wrap damage? " "Abort!" " " 2 t] 2]) (defalias 'diff-sanity-check-hunk #[nil "\306\212\307 !\204 \310\311!\202f\312f\313=\203f \307\314!\204\" \310\315!\202f\316y\210\317\316\225\203: \320\321\316!!\320\321\322!!ZT\202; \322!\210\307\n!\204I \310\323!\202f\312y\210\317\316\225\203a \320\321\316!!\320\321\322!!ZT\202b \322!\202f\312f\324=\203e\307 !\204y \310\325!\202f\320\321\316!\206\201 \326!\320\321\327!\206\212 \326! \312y\210\312f\330=\203\240 S\fS\202[\312f\331=\203\311 \307)!\203\303 \332 !\203\303 \332\f!\203\303 \212\333c\210)\312\202a S\202[\312f\334=\203\326 \fS\202[*\203\367 \312f\335=\203\367 \336V\203\367 \f\336V\203\367 S\fS\202[\332 !\203\332\f!\203\312\202a \336W\204\f\336W\203)\310\332 !\204 \332\f!\203$\337\202%\340!\202X\341\342l\2033\343\2024\344\345Q!\204@\310\346!\202Xl\203M\347c\210\350y\210\202[\347c\210`\316Z`S|\210\306\205a\312y\210\202\220 *\202f\306*\207" [inhibit-read-only diff-hunk-header-re diff-context-mid-hunk-header-re diff-hunk-header-re-unified after before t looking-at error "Not recognizable hunk header" nil 42 "\\*\\{15\\}\\(?: .*\\)?\n\\*\\*\\* \\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)? \\*\\*\\*\\*" "Unrecognized context diff first hunk header format" 2 diff-sanity-check-context-hunk-half string-to-number match-string 1 "Unrecognized context diff second hunk header format" 64 "Unrecognized unified diff hunk header format" "1" 4 32 45 zerop "\n" 43 10 0 "End of hunk ambiguously marked" "Hunk seriously messed up" y-or-n-p "Try to auto-fix " "whitespace loss" "word-wrap damage" "? " "Abort!" " " -1 diff-file-header-re diff-valid-unified-empty-line] 5]) #@222 Return the literal source text from HUNK as (TEXT . OFFSET). If DESTP is nil, TEXT is the source, otherwise the destination text. CHAR-OFFSET is a char-offset in HUNK, and OFFSET is the corresponding char-offset in TEXT. (defalias 'diff-hunk-text #[(hunk destp char-offset) "\306\307!rq\210\310\216 c\210eb\210\311\211\211\312 \313\314!\203* \315\211y\210``\202\207 \313\316!\203I \312y\210`\317 \311\320#\210\321y\210`\315y\210`\202\207 \313\322!\203W \315y\210`\202\207 \313\323!\203e \315y\210`\202\207 \313\324!\203\203 \315y\210`\317\325\311\320#\210\321y\210`\315y\210`\202\207 \326\327!\210 \203\221 \f?\202\223 ?\203\243 \203\237 \330\202*\331\202* \232\203\256 \f\202\266 \fd\232\203\266 \203\301 e \\b\210\212 \203\313 \f\202\314 ! \203\335 !V\203\335 d|\210e!|\210) \203\354 \332\202\355 \333 \"eb\210m\204\311f\"=\203`\315y\210`|\210\202\362 \334\n!\210\315y\210\202\362 *\335ed\" # \203'#`eZB\202)#).\207" [#1=#:temp-buffer hunk num-pfx-chars divider-pos dst-pos src-pos generate-new-buffer " *temp*" ((byte-code "\301!\203\n \302!\210\301\207" [#1# buffer-name kill-buffer] 2)) nil 2 looking-at "^@@" 1 "^\\*\\*" re-search-forward t 0 "^[0-9]+a[0-9,]+$" "^[0-9,]+d[0-9]+$" "^[0-9,]+c[0-9,]+$" "^---$" error "Unknown diff hunk type" (#2="" . 0) #2# 45 43 delete-char buffer-substring-no-properties diff-context-mid-hunk-header-re destp char-offset keep kill-char text] 5 (#$ . 44247)]) #@113 Return the buffer position (BEG . END) of the nearest occurrence of TEXT. If TEXT isn't found, nil is returned. (defalias 'diff-find-text #[(text) "`\304 \305\306#\205 \307\224\307\225B G\\b\205% \310 \305\306#\205% \307\224\307\225B\n\203B \203B \n@Z @ZV\203> \202G \n\202G \206G \n+\207" [orig text forw back search-forward nil t 0 search-backward] 4 (#$ . 45704)]) #@111 Return the buffer position (BEG . END) of the nearest occurrence of TEXT. Whitespace differences are ignored. (defalias 'diff-find-approx-text #[(text) "`\305\306\307\310 !\311#\312Q\313\n\314\315#\205 \316\224\316\225B G\\b\2050 \317\n\314\315#\2050 \316\224\316\225B \203M \f\203M @Z\f@ZV\203I \f\202R \202R \f\206R ,\207" [orig text re forw back "^[ \n\f]*" mapconcat regexp-quote split-string "[ \n\f]+" "[ \n\f]*\n" re-search-forward nil t 0 re-search-backward] 5 (#$ . 46089)]) (defalias 'diff-xor #[(a b) "\203 ?\205\f \207 \207" [a b] 1]) (put 'diff-xor 'byte-optimizer 'byte-compile-inline-expand) #@537 Find out (BUF LINE-OFFSET POS SRC DST SWITCHED). BUF is the buffer corresponding to the source file. LINE-OFFSET is the offset between the expected and actual positions of the text of the hunk or nil if the text was not found. POS is a pair (BEG . END) indicating the position of the text in the buffer. SRC and DST are the two variants of text as returned by `diff-hunk-text'. SRC is the variant that was found in the buffer. SWITCHED is non-nil if the patch is already applied. NOPROMPT, if non-nil, means not to prompt the user. (defalias 'diff-find-source-location #[(&optional other-file reverse noprompt) "\212 \211\203 \n?\205 \202 \n* `\306\307!\210`Z #?\205% \310 $`\212\311 \210`){ %\312%& # '\312%&? # (\313\314!\204P \315\316!\202u \f\203Z \317\320!\202u \321\225\203e \317\321!\202u \322)\323\324#\204r \315\325!\210\317\320! *\326\f#\"\206\202 \315\327! +\330+! ,\331!\332V\203\224 \fr,q\210\333\334*!!\210` -\323 .\335'@!\206\321 \324.\335(@!\206\321 \323\211.\336\337\217\206\321 \324.\323\340\341\217\206\321 \323\211. /,C/\203\350 \342-/@\"/D\202\363 \323-\211'@G\\BD\244.\203('\324E\202'(D\244.\207" [other-file diff-jump-to-old-file b a other char-offset diff-beginning-of-hunk try-harder diff-sanity-check-hunk diff-end-of-hunk diff-hunk-text looking-at "\\(?:\\*\\{15\\}.*\n\\)?[-@* ]*\\([0-9,]+\\)\\([ acd+]+\\([0-9,]+\\)\\)?" error "Can't find the hunk header" match-string 1 3 re-search-forward nil t "Can't find the hunk separator" diff-find-file-name "Can't find the file" find-file-noselect prefix-numeric-value 8 goto-line string-to-number diff-find-text (byte-code "\301@!\207" [old diff-find-approx-text] 2) ((invalid-regexp)) (byte-code "\301@!\207" [new diff-find-approx-text] 2) ((invalid-regexp)) count-lines noprompt _ hunk reverse old new diff-context-mid-hunk-header-re line file buf orig-pos switched pos] 6 (#$ . 46721)]) (defalias 'diff-hunk-status-msg #[(line-offset reversed dry-run) "\203 \203\f \304\202 \305\202 \203 \306\202 \307\310 \204# \311\2028 \312U\203- \313\2028 \314U\2037 \315\2028 \316\n #)\207" [dry-run reversed msg line-offset "already applied" "not yet applied" "undone" "applied" message "Hunk text not found" 0 "Hunk %s" 1 "Hunk %s at offset %d line" "Hunk %s at offset %d lines"] 4]) (byte-code "\301B\302\301!\204 \303\301\304\"\210\304\207" [current-load-list diff-apply-hunk-to-backup-file default-boundp set-default nil] 3) #@375 Apply the current hunk to the source file and go to the next. By default, the new source file is patched, but if the variable `diff-jump-to-old-file' is non-nil, then the old source file is patched instead (some commands, such as `diff-goto-source' can change the value of this variable when given an appropriate prefix argument). With a prefix argument, REVERSE the hunk. (defalias 'diff-apply-hunk #[(&optional reverse) "\306\307\"\211AAAA\203 \211A@\202 \310\311\307 GD\" \211A@ \211A@ \211A@ \211A@ \211A@ \203K \310\311\307\312 G\\D\"\210 \204U \313\314!\202\346 r\nq\210!\205| \315!!\205| ?\205| \316\317!\210\320\321\322\323!!\"!\211?)\203\221 \313\324\325\321\326?\205\213 \327\"!\"\202\346 \203\241 \330\213\204\241 \331\332!\202\346 r\nq\210\f@b\210\f@\fA|\210 @c\210)\333\334\n!\f@ A\\\"\210\335 \"\211 #\203\331 \"?\205\333 #\202\333 \"*\307#\210$\205\346 \336 .\207" [reverse #1=#:--cl-rest-- buf line-offset pos old diff-find-source-location nil signal wrong-number-of-arguments 6 error "Can't find the text to patch" backup-file-name-p make-local-variable diff-apply-hunk-to-backup-file yes-or-no-p format "Really apply this hunk to %s? " file-name-nondirectory "%s" substitute-command-keys "Use %s\\[diff-apply-hunk] to apply it to the other file" "\\[universal-argument] " ((byte-code "\304!\210 @\nA\\b\210\305 \203 \306\202 \307!\207" [buf pos old reverse pop-to-buffer y-or-n-p "Hunk hasn't been applied yet; apply it now? " "Hunk has already been applied; undo it? "] 2)) message "(Nothing done)" set-window-point display-buffer diff-hunk-status-msg diff-hunk-next new switched buffer-file-name b a diff-advance-after-apply-hunk] 7 (#$ . 49184) "P"]) #@103 See whether it's possible to apply the current hunk. With a prefix argument, try to REVERSE the hunk. (defalias 'diff-test-hunk #[(&optional reverse) "\306\307\"\211AAAA\203 \211A@\202 \310\311\307 GD\" \211A@ \211A@ \211A@ \211A@ \211A@ \203K \310\311\307\312 G\\D\"\210\313\314\n!\f@ A\\\"\210\315 \211 \203n ?\205p \202p *\316#.\207" [reverse #1=#:--cl-rest-- buf line-offset pos src diff-find-source-location nil signal wrong-number-of-arguments 6 set-window-point display-buffer diff-hunk-status-msg t dst switched b a] 6 (#$ . 50907) "P"]) (defalias 'diff-mouse-goto-source 'diff-goto-source) #@341 Jump to the corresponding source line. `diff-jump-to-old-file' (or its opposite if the OTHER-FILE prefix arg is given) determines whether to jump to the old or the new file. If the prefix arg is bigger than 8 (for example with \[universal-argument] \[universal-argument]) then `diff-jump-to-old-file' is also set, for the next invocations. (defalias 'diff-goto-source #[(&optional other-file event) "\203& \306\211:\203 \3078:\203 \307\202 \3108\202# \311 `\312\313F)!\210\212\314 \210\315\316!)?\317\n \"\211AAAA\203E \211A@\202L \320\321\322 GD\" \211A@ \211A@ \211A@ \211A@ \211A@ \203} \320\321\322\323 G\\D\"\210\324\f!\210@A\\b\210\325 \211 \203\242 ?\205\244 \202\244 *\326#.\207" [event rev other-file #1=#:--cl-rest-- buf line-offset posn-set-point 2 1 selected-window (0 . 0) 0 beginning-of-line looking-at "[-<]" diff-find-source-location signal wrong-number-of-arguments nil 6 pop-to-buffer diff-hunk-status-msg t pos src dst switched b a] 6 (#$ . 51545) (list current-prefix-arg last-input-event)]) #@82 Find the name of function at point. For use in `add-log-current-defun-function'. (defalias 'diff-current-defun #[nil "\306\307!\210\212\310!\203 \311y\210\312\313\314\315#\210\314\316\317\217\211\211A@ \211A@ \211A@ \211A@ \211A@ \211A@ \203M \320\321\314\322 G\\D\"\210\n\205\232 \323 \210\314f\324>\203\214 \203e \202f \325\326! r q\210\327\216 @c\210\330\331\n\" \210e A\\b\210\332 ,\206\232 r\nq\210\f@ A\\b\210\332 ).\207" [diff-hunk-header-re #1=#:--cl-rest-- buf line-offset pos src kill-local-variable change-log-default-name looking-at 1 re-search-forward "^[^ ]" nil t (byte-code "\300\301\211\302#\207" [diff-find-source-location nil noprompt] 4) ((error)) signal wrong-number-of-arguments 6 beginning-of-line (60 45) generate-new-buffer " *temp*" ((byte-code "\301!\203\n \302!\210\301\207" [#2=#:temp-buffer buffer-name kill-buffer] 2)) buffer-local-value major-mode add-log-current-defun dst switched old #2#] 6 (#$ . 52607)]) #@60 Re-diff the current hunk, ignoring whitespace differences. (defalias 'diff-ignore-whitespace-hunk #[nil "`\306\307!\210`Z\310f\311=\203 \312\202 \310f\313=\203 \314\202 \315\316\317!\204, \320\321!\2051 \322\323\324!!\325\326`\212\327 \210`)\" \330\nS\331\" \332\333! +\332\334! ,- .\310\211 / 0\335\216\212\336\f\310#/\336\f\325#0\337 /@P\310+\310\340%\210\337 0@P\310,\310\340%\210\341\342! 1r1q\210\343\216\3442\310\325\310 +,&\211 3\345=\204\314 3\324=\203\277 eb\210\3464\310\325#\203\314 e\345\224|\210\202\314 db\210n\204\311 \347c\210\fc\210\350 3\351>?\205\334 \320\3523\".\207" [char-offset opts line-nb inhibit-read-only hunk lead diff-beginning-of-hunk try-harder nil 64 "-bu" 42 "-bc" "-b" looking-at "[^0-9]+\\([0-9]+\\)" error "Can't find line number" string-to-number match-string 1 t delete-and-extract-region diff-end-of-hunk make-string 10 make-temp-file "diff1" "diff2" ((byte-code "c\210\303 !\210\303\n!\207" [hunk file1 file2 delete-file] 2)) diff-hunk-text write-region nomessage generate-new-buffer " *temp*" ((byte-code "\301!\203\n \302!\210\301\207" [#1=#:temp-buffer buffer-name kill-buffer] 2)) call-process 0 re-search-forward "\n" buffer-string (0 1) "Diff returned: %s" file1 file2 buffer-file-coding-system coding-system-for-read old new #1# diff-command status diff-hunk-header-re] 9 (#$ . 53585) nil]) (custom-declare-face 'diff-refine-change '((((class color) (min-colors 88) (background light)) :background "grey85") (((class color) (min-colors 88) (background dark)) :background "grey60") (((class color) (background light)) :background "yellow") (((class color) (background dark)) :background "green") (t :weight bold)) "Face used for char-based changes shown by `diff-refine-hunk'." :group 'diff-mode) (defalias 'diff-refine-preproc #[nil "\300\301\302\303#\205 \304`Sf\305\236A!\210\202 \207" [re-search-forward "^[+>]" nil t replace-match ((43 . "-") (62 . "<"))] 4]) #@60 Highlight changes of hunk at point at a finer granularity. (defalias 'diff-refine-hunk #[nil "\306\307!\210\212\310\311!\210\312 `\313\314 \210`\315 \316\317$\210 b\210\320=\203> \321\322 \323#\205\216 \324\325\224\326\225\326\225\325\225\n\327&\210\202% \330=\203u \212\321\331!)\211 \321\332\f\323#\205q \324\325\224\325\225\212 b\210\321\332 \"\210\325\225\325\224) \n\327&\210\202L *\202\216 `T \321\333 \323#\205\215 \324 \325\224\325\225 \n\327&)-\207" [style beg props end middle other require smerge-mode diff-beginning-of-hunk try-harder diff-hunk-style ((diff-mode . fine) (face diff-refine-change)) diff-end-of-hunk remove-overlays diff-mode fine unified re-search-forward "^\\(?:-.*\n\\)+\\(\\)\\(?:\\+.*\n\\)+" t smerge-refine-subst 0 1 diff-refine-preproc context "^---" "^\\(?:!.*\n\\)+" "^---.*\n" beg1] 8 (#$ . 55535) nil]) #@136 Iterate through the current diff and create ChangeLog entries. I.e. like `add-change-log-entry-other-window' but applied to all hunks. (defalias 'diff-add-change-log-entries-other-window #[nil "\212eb\210p\301\302\303\217*\207" [orig-buffer nil (byte-code "\300 \210\301\302\303\304#\205 \212\305\303\211\304\303\304%\210)\202 \207" [diff-hunk-next re-search-forward "\n[!+-<>]\\(-- [0-9]+\\(,[0-9]+\\)? ----\n\\( .*\n\\)*[+]\\)?" nil t add-change-log-entry] 6) ((error))] 3 (#$ . 56397) nil]) (provide 'diff-mode)
Close
