view etc/images/search-replace.xpm @ 111350:8027e412df98

Backport VC improvements from trunk. * vc/log-edit.el (log-edit-rewrite-fixes): New var. (log-edit-author): New dynamic var. (log-edit-changelog-ours-p, log-edit-insert-changelog-entries): Use it to return the author if different from committer. (log-edit-insert-changelog): Use them to add Author: and Fixes headers. * vc/vc-hooks.el (vc-default-mode-line-string): Doc fix. * vc/vc.el (vc-deduce-backend): New fun. Handle diff buffers. (vc-root-diff, vc-print-root-log, vc-log-incoming) (vc-log-outgoing): Use it. (vc-diff-internal): Set diff-vc-backend. * vc/diff-mode.el (diff-vc-backend): New var. * vc/vc.el (vc-diff-internal): Set `revert-buffer-function' buffer-locally to lambda that re-runs the vc diff command. (Bug#6447) * vc/log-view.el (log-view-mode-map): Bind revert-buffer. Make 'g' (AKA revert-buffer) rerun VC log, log-incoming and log-outgoing commands. * vc/vc.el (vc-log-internal-common): Add a new argument and use it to create a buffer local revert-buffer-function variable. (vc-print-log-internal, vc-log-incoming, vc-log-outgoing): Pass a revert-buffer-function lambda. Improve VC create/retrieve tag/branch. * vc.el (vc-create-tag): Do not read the directory name for VCs with repository revision granularity. Adjust the tag/branch prompt. Reset VC properties. (vc-retrieve-tag): Do not read the directory name for VCs with repository revision granularity. Reset VC properties. Add optional support for resetting VC properties. * vc-dispatcher.el (vc-resynch-window): Add new optional argument, call vc-file-clearprops when true. (vc-resynch-buffer): Add new optional argument, pass it down. (vc-resynch-buffers-in-directory): Likewise. Improve support for special markup in the VC commit message. * vc-mtn.el (vc-mtn-checkin): Support Author: and Date: markup. * vc-hg.el (vc-hg-checkin): Add support for Date:. * vc-git.el (vc-git-checkin): * vc-bzr.el (vc-bzr-checkin): Likewise. Add support for vc-log-incoming, improve vc-log-outgoing for Git. * vc-git.el (vc-git-log-view-mode): Fix font lock for incoming/outgoing logs. (vc-git-log-outgoing, vc-git-log-incoming): New functions. * vc-git.el (vc-git-log-outgoing): Use the same format as the short log. (vc-git-log-incoming): Likewise. Run "git fetch" before the log command Add bindings for vc-log-incoming and vc-log-outgoing. * vc-hooks.el (vc-prefix-map): Add bindings for vc-log-incoming and vc-log-outgoing. * vc-dir.el (vc-dir-menu-map): Add menu bindings for vc-log-incoming and vc-log-outgoing. Improve state updating for VC tag commands. * vc.el (vc-create-tag, vc-retrieve-tag): Call vc-resynch-buffer to update the state of all buffers in the directory. * vc-dir.el (vc-dir): Don't pop-up-windows. (Bug#6204) * vc.el (vc-checkin, vc-modify-change-comment): Adjust to new vc-start/finish-logentry. (vc-find-conflicted-file): New command. (vc-transfer-file): Adjust to new vc-checkin. (vc-next-action): Improve scoping. * vc-git.el (vc-git-checkin): Use log-edit-extract-headers. (vc-git-commits-coding-system): Rename from git-commits-coding-system. * vc-dispatcher.el (vc-log-edit): Shorten names for log-edit-show-files. * vc-bzr.el (vc-bzr-checkin): Use log-edit-extract-headers. (vc-bzr-conflicted-files): New function. * log-edit.el (log-edit-summary, log-edit-header) (log-edit-unknown-header): New faces. (log-edit-headers-alist): New var. (log-edit-header-contents-regexp): New const. (log-edit-match-to-eoh): New function. (log-edit-font-lock-keywords): Use them. (log-edit): Insert a "Summary:" header as default. (log-edit-mode): Mark font-lock rules as case-insensitive. (log-edit-done): Cleanup headers. (log-edit-extract-headers): New function to replace it. * vc-dispatcher.el (vc-finish-logentry): Don't mess so badly with the windows/frames. * vc-bzr.el (vc-bzr-shelve-apply): Don't use *vc-bzr-shelve*. * vc-dir.el (vc-dir-kill-line): New command. (vc-dir-mode-map): Bind it to C-k. (vc-dir-headers): Abbreviate the working dir. * vc-git.el (vc-git-revision-table): Include remote branches. New VC methods: vc-log-incoming and vc-log-outgoing. * vc.el (vc-print-log-setup-buttons, vc-log-internal-common) (vc-incoming-outgoing-internal, vc-log-incoming, vc-log-outgoing): New functions. (vc-print-log-internal): Just call vc-log-internal-common. (vc-log-view-type): New permanent local variable. * vc-hooks.el (vc-menu-map): Bind vc-log-incoming and vc-log-outgoing. * vc-bzr.el (vc-bzr-log-view-mode): Use vc-log-view-type instead of the dynamic bound vc-short-log. (vc-bzr-log-incoming, vc-bzr-log-outgoing): New functions. * vc-git.el (vc-git-log-outgoing): New function. (vc-git-log-view-mode): Use vc-log-view-type instead of the dynamic bound vc-short-log. * vc-hg.el (vc-hg-log-view-mode): Use vc-log-view-type instead of the dynamic bound vc-short-log. Highlight the tag. (vc-hg-log-incoming, vc-hg-log-outgoing): New functions. (vc-hg-outgoing, vc-hg-incoming, vc-hg-outgoing-mode): (vc-hg-incoming-mode): Remove. (vc-hg-extra-menu-map): Do not bind vc-hg-incoming and vc-hg-outgoing. Fix default-directory for vc-root-diff. * vc.el (vc-root-diff): Bind default-directory to the root directory for the diff command. * vc-hg.el (vc-hg-push, vc-hg-pull): Use `apply' when calling `vc-hg-command' with a list of flags. * vc-bzr.el (vc-bzr-log-edit-mode): Add --fixes support to log-edit-before-checkin-process. * vc.el (vc-modify-change-comment): Pass MODE to vc-start-logentry. * vc-bzr.el, vc-hg.el (log-edit-mode): Declare. * vc-dispatcher.el (vc-start-logentry): Doc fix. (log-view-process-buffer, log-edit-extra-flags): Declare. Add special markup processing for commit logs. * log-edit.el (log-edit): Add new argument MODE. Use that mode when non-nil instead of the log-view-mode. * vc.el (vc-default-log-edit-mode): New function. * vc-dispatcher.el (vc-log-edit): Add a mode argument, pass it to log-edit. Support for shelving snapshots and for showing shelves. * vc-bzr.el (vc-bzr-shelve-show, vc-bzr-shelve-show-at-point) (vc-bzr-shelve-apply-and-keep-at-point, vc-bzr-shelve-snapshot): New functions. (vc-bzr-shelve-map, vc-bzr-shelve-menu-map) (vc-bzr-extra-menu-map): Map them.

/* XPM */
static char * search_replace_xpm[] = {
"24 24 243 2",
"  	c None",
". 	c #000000",
"+ 	c #D3D3D3",
"@ 	c #F6F6F6",
"# 	c #FFFFFF",
"$ 	c #F9F9F9",
"% 	c #DADADA",
"& 	c #585858",
"* 	c #C7C7C7",
"= 	c #D1D1D1",
"- 	c #D6D6D6",
"; 	c #BBBBBB",
"> 	c #4B4B43",
", 	c #0A0A09",
"' 	c #47473F",
") 	c #B9B9B9",
"! 	c #FDFDFD",
"~ 	c #C0C0C0",
"{ 	c #E1E1E1",
"] 	c #F0F0F0",
"^ 	c #9B9B9B",
"/ 	c #353530",
"( 	c #8D8D7F",
"_ 	c #C4C4AF",
": 	c #CFCFB9",
"< 	c #9D9D8D",
"[ 	c #34342E",
"} 	c #A3A3A2",
"| 	c #F8F8F8",
"1 	c #AFAFAE",
"2 	c #E9E9E9",
"3 	c #DFDFDF",
"4 	c #8F8F8F",
"5 	c #4C4C44",
"6 	c #828274",
"7 	c #B2B29F",
"8 	c #C0C0AC",
"9 	c #EDEDE7",
"0 	c #E2E2D0",
"a 	c #9C9C8C",
"b 	c #46463F",
"c 	c #EAEAE9",
"d 	c #A2A2A1",
"e 	c #F4F4F4",
"f 	c #CFCFCF",
"g 	c #A2A2A2",
"h 	c #080807",
"i 	c #9C9C8F",
"j 	c #A6A695",
"k 	c #B5B5A2",
"l 	c #C3C3AE",
"m 	c #FBFBFA",
"n 	c #D5D5BF",
"o 	c #090908",
"p 	c #D5D5D4",
"q 	c #979797",
"r 	c #FAFAF9",
"s 	c #AEAEA3",
"t 	c #9B9B8B",
"u 	c #AAAA98",
"v 	c #B7B7A4",
"w 	c #DDDDD0",
"x 	c #CACAB5",
"y 	c #090909",
"z 	c #C1C1C0",
"A 	c #E1E0DF",
"B 	c #DCDBDA",
"C 	c #D3D2D0",
"D 	c #B7B7B5",
"E 	c #9E9D9C",
"F 	c #FBE73B",
"G 	c #F2B64D",
"H 	c #F7F7F6",
"I 	c #4C4C45",
"J 	c #CFCFCB",
"K 	c #ACACA1",
"L 	c #9F9F8E",
"M 	c #ADAD9B",
"N 	c #BABAA7",
"O 	c #929283",
"P 	c #474740",
"Q 	c #B9B8B8",
"R 	c #DCDCDA",
"S 	c #E1E1DF",
"T 	c #DAD9D7",
"U 	c #D7D7D5",
"V 	c #FCEB3D",
"W 	c #F7B544",
"X 	c #5D502C",
"Y 	c #F5F5F4",
"Z 	c #010101",
"` 	c #C3C3BE",
" .	c #AEAEA2",
"..	c #A0A090",
"+.	c #878779",
"@.	c #34342F",
"#.	c #6D6D6D",
"$.	c #B8B8B6",
"%.	c #D9D9D7",
"&.	c #EBEAE8",
"*.	c #ECEBE9",
"=.	c #FCE93B",
"-.	c #F7B545",
";.	c #6C5F34",
">.	c #CACACA",
",.	c #868585",
"'.	c #414141",
").	c #757574",
"!.	c #A7A7A5",
"~.	c #BDBDBB",
"{.	c #DCDBD9",
"].	c #E9E8E6",
"^.	c #FAE43A",
"/.	c #F4B244",
"(.	c #605737",
"_.	c #B5B5B3",
":.	c #A9A9A8",
"<.	c #A4A4A2",
"[.	c #A2A1A0",
"}.	c #A1A19F",
"|.	c #A7A6A5",
"1.	c #B5B4B3",
"2.	c #CECDCB",
"3.	c #E0DFDD",
"4.	c #F9DF39",
"5.	c #F3AF42",
"6.	c #625637",
"7.	c #66635C",
"8.	c #787878",
"9.	c #BCBCBA",
"0.	c #B9B9B8",
"a.	c #B7B6B5",
"b.	c #B6B5B4",
"c.	c #CFCECC",
"d.	c #DFDFDD",
"e.	c #F9DC38",
"f.	c #EFB44D",
"g.	c #665A32",
"h.	c #9B9997",
"i.	c #7C786F",
"j.	c #6F6F6F",
"k.	c #ACACAB",
"l.	c #BABAB8",
"m.	c #D2D2D0",
"n.	c #D9D8D6",
"o.	c #D7D6D4",
"p.	c #DBDAD8",
"q.	c #E1E0DE",
"r.	c #F8D837",
"s.	c #F0A93F",
"t.	c #655930",
"u.	c #9B9A97",
"v.	c #ADACA9",
"w.	c #8D897E",
"x.	c #AAAAA8",
"y.	c #B3B2B1",
"z.	c #C9C8C7",
"A.	c #E8E7E5",
"B.	c #E6E5E2",
"C.	c #F6D236",
"D.	c #EDA43E",
"E.	c #5C5130",
"F.	c #989794",
"G.	c #AAA9A6",
"H.	c #C3C2BE",
"I.	c #9A948A",
"J.	c #BABABA",
"K.	c #B1B1AF",
"L.	c #C5C4C2",
"M.	c #E4E3E1",
"N.	c #E8E7E4",
"O.	c #E0DFDC",
"P.	c #D7AE74",
"Q.	c #61562F",
"R.	c #989895",
"S.	c #A9A9A5",
"T.	c #C2C1BD",
"U.	c #D3D2CE",
"V.	c #9F998E",
"W.	c #CCCCCC",
"X.	c #C7C6C3",
"Y.	c #D7D6D3",
"Z.	c #E2E1DE",
"`.	c #E5E4E1",
" +	c #E6E4E1",
".+	c #E2E1DD",
"++	c #4F4115",
"@+	c #C1C0BC",
"#+	c #D2D0CC",
"$+	c #D7D5D1",
"%+	c #9F998D",
"&+	c #E7E7E7",
"*+	c #DAD9D6",
"=+	c #E3E2DE",
"-+	c #E4E2DF",
";+	c #E4E3DF",
">+	c #E1E0DC",
",+	c #DADAD6",
"'+	c #969592",
")+	c #9A9996",
"!+	c #C2C0BC",
"~+	c #D3D1CD",
"{+	c #D8D6D2",
"]+	c #9E988D",
"^+	c #EBEBEB",
"/+	c #E1DFDC",
"(+	c #E0DFDB",
"_+	c #DEDDD9",
":+	c #D1D0CC",
"<+	c #B2B1AE",
"[+	c #A09F9D",
"}+	c #A1A19E",
"|+	c #AFAEAA",
"1+	c #C3C1BD",
"2+	c #D8D6D1",
"3+	c #9D978B",
"4+	c #E1DFDB",
"5+	c #E0DEDA",
"6+	c #DFDEDA",
"7+	c #DCDBD7",
"8+	c #D1CFCB",
"9+	c #B6B6B2",
"0+	c #B2B0AD",
"a+	c #BFBDBA",
"b+	c #CBC9C6",
"c+	c #D5D3CF",
"d+	c #DBD9D5",
"e+	c #D7D6D1",
"f+	c #D5D3CE",
"g+	c #9B958A",
"h+	c #999891",
"i+	c #A39E92",
"j+	c #A49E93",
"k+	c #A39D92",
"l+	c #A39D91",
"m+	c #A09B8F",
"n+	c #9D978C",
"o+	c #969186",
"p+	c #969085",
"q+	c #9B9589",
"r+	c #9E988C",
"s+	c #9B968A",
"t+	c #676359",
"                                                ",
"      . . . . . . . . . . . . .                 ",
"    . + @ # # # # # # # # $ % & .               ",
"    . @ # # # # # # # # # # * = - .             ",
"    . # # # ; > , , ' ) ! ! ~ { ] ^ .           ",
"    . # # ; / ( _ : < [ } | 1 2 # 3 4 .         ",
"    . # # 5 6 7 8 9 0 a b c d ] # e f g .       ",
"    . # ! h i j k l m n o p q . . . . . . .     ",
"    . # r , s t u v w x y z A B C D E . F G .   ",
"    . # H I J K L M N O P Q R S T U . V W X .   ",
"    . # Y Z Z `  ...+.@.#.$.%.&.*.. =.-.;..     ",
"    . >.Z Z ,.'., , > ).!.~.{.].. ^./.(.. .     ",
"    . Z Z Z _.:.<.[.}.|.1.2.3.. 4.5.6.. 7..     ",
"    Z Z . 8._.9.0.a.b.~.c.d.. e.f.g.. h.i..     ",
"  Z Z Z j.k.l.m.n.o.o.p.q.. r.s.t.. u.v.w..     ",
"  Z Z 4 x.y.z.d.A.A.B.A.. C.D.E.. F.G.H.I..     ",
"    . J.K.L.T M.N.N.B.O.. P.Q.. R.S.T.U.V..     ",
"    . W.X.Y.Z.B.`. +.+. ++. . R.S.@+#+$+%+.     ",
"    . &+*+O.=+-+;+>+,+. . '+)+S.!+~+$+{+]+.     ",
"    . ^+O./+>+(+.+_+:+<+[+}+|+1+~+$+2+$+3+.     ",
"    . = 4+5+6+_+(+7+8+9+0+a+b+c+d+{+e+f+g+.     ",
"    . h+i+j+k+l+k+m+n+o+p+q+V.r+%+n+n+s+t+.     ",
"      . . . . . . . . . . . . . . . . . .       ",
"                                                "};