view etc/images/data-save.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 * data_save_xpm[] = {
"24 24 211 2",
"  	c None",
". 	c #000000",
"+ 	c #C3D7F4",
"@ 	c #A9CDE5",
"# 	c #75757A",
"$ 	c #EFC5BB",
"% 	c #F1C8BE",
"& 	c #F0C6BC",
"* 	c #EEBCB2",
"= 	c #EEBEB5",
"- 	c #EEC1B8",
"; 	c #EDBFB6",
"> 	c #E9B7AD",
", 	c #E9B8AF",
"' 	c #E9B9B1",
") 	c #E5BFBA",
"! 	c #737277",
"~ 	c #B3CDE3",
"{ 	c #A1BED6",
"] 	c #BBD6E8",
"^ 	c #8AAAC5",
"/ 	c #605F68",
"( 	c #E08D7E",
"_ 	c #E0826E",
": 	c #E0806E",
"< 	c #DC7A68",
"[ 	c #DC8171",
"} 	c #DA7868",
"| 	c #D48173",
"1 	c #D47D6E",
"2 	c #CE7265",
"3 	c #CF7264",
"4 	c #CE7567",
"5 	c #C4675B",
"6 	c #C36558",
"7 	c #626169",
"8 	c #87A3B7",
"9 	c #567187",
"0 	c #BAD5E9",
"a 	c #88A7C3",
"b 	c #686670",
"c 	c #C8817B",
"d 	c #CB7C74",
"e 	c #CB7A73",
"f 	c #CB7B73",
"g 	c #CC7C72",
"h 	c #CB7D73",
"i 	c #BF6B64",
"j 	c #CC7A70",
"k 	c #C16A62",
"l 	c #CC7C73",
"m 	c #C2655B",
"n 	c #C36459",
"o 	c #BA6C6A",
"p 	c #819EB6",
"q 	c #547086",
"r 	c #B6D3E7",
"s 	c #87ABC1",
"t 	c #737373",
"u 	c #FFFFFF",
"v 	c #83A0B8",
"w 	c #526C80",
"x 	c #B9D3E7",
"y 	c #585858",
"z 	c #4F697C",
"A 	c #B9D3E6",
"B 	c #9E9E9E",
"C 	c #CDCDCD",
"D 	c #BFBFBF",
"E 	c #88A4BB",
"F 	c #486276",
"G 	c #B7D2E7",
"H 	c #C4C4C4",
"I 	c #465E70",
"J 	c #B5CAE5",
"K 	c #87A3BA",
"L 	c #455C6D",
"M 	c #AECCE5",
"N 	c #ACACAC",
"O 	c #C5C5C5",
"P 	c #546069",
"Q 	c #B0D1E4",
"R 	c #515C64",
"S 	c #AACEE3",
"T 	c #6B6F72",
"U 	c #6F6F6F",
"V 	c #696969",
"W 	c #6F777E",
"X 	c #86A2B9",
"Y 	c #3A515D",
"Z 	c #A9C9E2",
"` 	c #647A8D",
" .	c #829FB7",
"..	c #7F9DB6",
"+.	c #7E9CB5",
"@.	c #7998B2",
"#.	c #85A1B8",
"$.	c #8CA7BD",
"%.	c #8AA5BB",
"&.	c #364A59",
"*.	c #ABC4E2",
"=.	c #556E84",
"-.	c #7192AE",
";.	c #414A4E",
">.	c #424A51",
",.	c #525B63",
"'.	c #626F79",
").	c #5F6C76",
"!.	c #5C6971",
"~.	c #5A666F",
"{.	c #58636B",
"].	c #57636A",
"^.	c #3B5360",
"/.	c #39424B",
"(.	c #7897B3",
"_.	c #A4B9CB",
":.	c #364853",
"<.	c #AAC9E2",
"[.	c #7091AA",
"}.	c #6F8FA7",
"|.	c #4A5359",
"1.	c #97938C",
"2.	c #DFDDDA",
"3.	c #E3E1DE",
"4.	c #EBEAE8",
"5.	c #EAE9E7",
"6.	c #CFCEC9",
"7.	c #C9C6C0",
"8.	c #9B968E",
"9.	c #566168",
"0.	c #4B657A",
"a.	c #54738C",
"b.	c #AAC6DD",
"c.	c #34464E",
"d.	c #AAC9E1",
"e.	c #6C8EA6",
"f.	c #6C8CA4",
"g.	c #40474D",
"h.	c #DAD8D3",
"i.	c #E7E6E2",
"j.	c #67655E",
"k.	c #524F47",
"l.	c #D9D7D4",
"m.	c #C7C5BF",
"n.	c #C0BCB5",
"o.	c #B8B3AB",
"p.	c #434C54",
"q.	c #4D697F",
"r.	c #4F6F84",
"s.	c #B3CADC",
"t.	c #313E49",
"u.	c #A8C8E1",
"v.	c #6B8DA6",
"w.	c #728FA4",
"x.	c #E2E1DD",
"y.	c #F0EFEC",
"z.	c #CDCAC6",
"A.	c #C2BFB9",
"B.	c #CAC6C0",
"C.	c #DCDAD7",
"D.	c #4B555D",
"E.	c #4E697F",
"F.	c #BACCDC",
"G.	c #A4C4DE",
"H.	c #698BA3",
"I.	c #708AA1",
"J.	c #383E43",
"K.	c #E0DEDA",
"L.	c #514E46",
"M.	c #4F4C44",
"N.	c #C7C4BE",
"O.	c #CBC8C2",
"P.	c #E1E0DC",
"Q.	c #E9E8E6",
"R.	c #475158",
"S.	c #4E6879",
"T.	c #4D6C80",
"U.	c #A3C3DB",
"V.	c #383F43",
"W.	c #778999",
"X.	c #6E899E",
"Y.	c #65859C",
"Z.	c #33383C",
"`.	c #D7D4D0",
" +	c #D6D4D0",
".+	c #4E4A43",
"++	c #4D4942",
"@+	c #D1CEC9",
"#+	c #E6E5E2",
"$+	c #EDECEA",
"%+	c #454F55",
"&+	c #486173",
"*+	c #4D6678",
"=+	c #A1C1DA",
"-+	c #373C40",
";+	c #0C0D0F",
">+	c #4E5E6A",
",+	c #5B6E7C",
"'+	c #4F5B62",
")+	c #A4A099",
"!+	c #CCC9C3",
"~+	c #D7D5D1",
"{+	c #E4E2E0",
"]+	c #DDDBD7",
"^+	c #B8B5B0",
"/+	c #3E474D",
"(+	c #4A6176",
"_+	c #4A6070",
":+	c #9BC3D8",
"<+	c #363C41",
"[+	c #28323E",
"                                                ",
"    . . . . . . . . . . . . . . . . . . .       ",
"  . + @ # $ % & * = - ; > , > , ' ) ! ~ { .     ",
"  . ] ^ / ( _ : < [ } | 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 b p q .     ",
"  . r s t u u u u u u u u u u u u u t v w .     ",
"  . x . y u u u u u u u u u u u u u t v z .     ",
"  . A . . B C C C C C C C C C C C D t E F .     ",
"  . G . . . H u u u u u u u u u u u t E I .     ",
"  . J . . . . H u u u u u u u u u u t K L .     ",
"  . M . . . . . N C C C C C C C C O t K P .     ",
"  . Q . . . . H u u u u u u u u u u t v R .     ",
"  . S . . . y t t t t T U t t t t V W X Y .     ",
"  . Z . . ` X  ...+. .@.X #.#.K  .$.v %.&..     ",
"  . *.. =.-.;.>.,.'.).!.~.{.].,.^./.(._.:..     ",
"  . <.[.}.|.1.2.3.4.4.5.2.6.7.8.9.0.a.b.c..     ",
"  . d.e.f.g.h.i.j.k.k.l.m.n.o.6.p.q.r.s.t..     ",
"  . u.v.w.g.x.y.j.k.k.z.A.n.B.C.D.E.r.F.t..     ",
"  . G.H.I.J.K.4.L.M.M.N.n.O.P.Q.R.S.T.U.V..     ",
"  . W.X.Y.Z.`. +.+++++n.@+#+$+#+%+&+*+=+-+.     ",
"    ;+>+,+'+)+n.o.!+!+~+{+5.]+^+/+(+_+:+<+.     ",
"      . . . . . . . . . . . . . . . . [+.       ",
"                                                ",
"                                                "};