view etc/images/help.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 * help_xpm[] = {
"24 24 244 2",
"  	c None",
". 	c #000000",
"+ 	c #454442",
"@ 	c #1D1D1C",
"# 	c #040404",
"$ 	c #1B1B1B",
"% 	c #3D3C3A",
"& 	c #4D4C4B",
"* 	c #2F2F2D",
"= 	c #C1BFBB",
"- 	c #ECEAE7",
"; 	c #F5F3F0",
"> 	c #F2F0EC",
", 	c #E1DFDC",
"' 	c #AFADAA",
") 	c #272726",
"! 	c #020202",
"~ 	c #3F3E3E",
"{ 	c #36302D",
"] 	c #181818",
"^ 	c #FBF8F5",
"/ 	c #FEFCF8",
"( 	c #FAF8F5",
"_ 	c #F5F4F1",
": 	c #F2F1ED",
"< 	c #F1EFEB",
"[ 	c #F1EEEB",
"} 	c #EAE9E6",
"| 	c #DAD8D4",
"1 	c #100E0E",
"2 	c #1F100E",
"3 	c #AF3A1E",
"4 	c #FBAB93",
"5 	c #FAE9E3",
"6 	c #F0EFEB",
"7 	c #E9E8E5",
"8 	c #EAE8E6",
"9 	c #ECEAE8",
"0 	c #EDEBE9",
"a 	c #EDEBE8",
"b 	c #EACFC6",
"c 	c #D5340A",
"d 	c #751904",
"e 	c #100806",
"f 	c #34160D",
"g 	c #AF3C20",
"h 	c #FCCCBD",
"i 	c #F7BEAD",
"j 	c #E67554",
"k 	c #DFDDDB",
"l 	c #DBD9D6",
"m 	c #D8D7D3",
"n 	c #DBDAD6",
"o 	c #E3E2DE",
"p 	c #ECEBE8",
"q 	c #E5572D",
"r 	c #E33A0B",
"s 	c #D4340A",
"t 	c #691504",
"u 	c #100504",
"v 	c #582C22",
"w 	c #0F0F0F",
"x 	c #FDD4C8",
"y 	c #F7BFAF",
"z 	c #E87554",
"A 	c #D5512B",
"B 	c #C68270",
"C 	c #BEBDBA",
"D 	c #A5A3A0",
"E 	c #9C9A95",
"F 	c #B9B7B2",
"G 	c #D7D6D2",
"H 	c #E7E5E2",
"I 	c #E79A85",
"J 	c #E53C0B",
"K 	c #E43C0B",
"L 	c #E23A0B",
"M 	c #C93009",
"N 	c #010000",
"O 	c #040100",
"P 	c #FAB19C",
"Q 	c #FACCBE",
"R 	c #EB8264",
"S 	c #D8532D",
"T 	c #C0340F",
"U 	c #932006",
"V 	c #141412",
"W 	c #857974",
"X 	c #DA370B",
"Y 	c #EC7C5B",
"Z 	c #E95B32",
"` 	c #DE380B",
" .	c #9D2306",
"..	c #626261",
"+.	c #FEF1ED",
"@.	c #F09479",
"#.	c #DC532B",
"$.	c #C0350F",
"%.	c #942006",
"&.	c #621404",
"*.	c #E2522B",
"=.	c #F2A690",
"-.	c #E74E21",
";.	c #E23B0B",
">.	c #C99181",
",.	c #454342",
"'.	c #E5E4E2",
").	c #FCFBFA",
"!.	c #E2D8D3",
"~.	c #C34C2A",
"{.	c #B02B07",
"].	c #9E2D12",
"^.	c #EF8D71",
"/.	c #F09B83",
"(.	c #EADDD7",
"_.	c #272724",
":.	c #F0EEEC",
"<.	c #F3F2EF",
"[.	c #D7D6D3",
"}.	c #BFBEBB",
"|.	c #9E6153",
"1.	c #3F0D02",
"2.	c #F0B9A9",
"3.	c #F6F5F4",
"4.	c #E8E7E4",
"5.	c #DAD8D5",
"6.	c #585652",
"7.	c #F6F4F0",
"8.	c #DAD8D6",
"9.	c #C2C1BE",
"0.	c #989691",
"a.	c #0A0A08",
"b.	c #F6F4F2",
"c.	c #F4F3F1",
"d.	c #E4E3E0",
"e.	c #D3D2CE",
"f.	c #63625D",
"g.	c #DCDAD8",
"h.	c #C7C6C2",
"i.	c #ABAAA5",
"j.	c #0A0A0A",
"k.	c #FAF8F6",
"l.	c #EFEDEA",
"m.	c #DDDCD8",
"n.	c #C6C4C2",
"o.	c #3E3E39",
"p.	c #1B1B19",
"q.	c #F0EEEA",
"r.	c #E0DFDD",
"s.	c #CCCBC9",
"t.	c #C0BFBB",
"u.	c #131311",
"v.	c #676663",
"w.	c #FCFAF8",
"x.	c #D6D4D2",
"y.	c #BCBAB7",
"z.	c #3C3C3A",
"A.	c #DEDCD9",
"B.	c #7E4B3E",
"C.	c #232323",
"D.	c #CC9385",
"E.	c #FAFAF7",
"F.	c #E6E6E2",
"G.	c #CDCCCA",
"H.	c #B0B0AC",
"I.	c #EDE3DF",
"J.	c #E78468",
"K.	c #DF5D3A",
"L.	c #631909",
"M.	c #282828",
"N.	c #B46E5E",
"O.	c #FCC3B2",
"P.	c #F1A691",
"Q.	c #DCD2CC",
"R.	c #C8C6C3",
"S.	c #7E7C78",
"T.	c #E8AD9C",
"U.	c #E96139",
"V.	c #EB7452",
"W.	c #EF8E72",
"X.	c #EA8063",
"Y.	c #9E2E13",
"Z.	c #3F1811",
"`.	c #121212",
" +	c #6B433B",
".+	c #E0A191",
"++	c #FDD3C7",
"@+	c #F4AD98",
"#+	c #DE532B",
"$+	c #C83409",
"%+	c #B48274",
"&+	c #383534",
"*+	c #D6340A",
"=+	c #E43D0F",
"-+	c #E8582E",
";+	c #ED7957",
">+	c #F4B6A4",
",+	c #F4B09D",
"'+	c #F0E5E0",
")+	c #F4F3EF",
"!+	c #FDF8F6",
"~+	c #FBCEC1",
"{+	c #F28B6E",
"]+	c #E44E23",
"^+	c #D3370A",
"/+	c #BF2F09",
"(+	c #260800",
"_+	c #190F0B",
":+	c #D5350A",
"<+	c #E43D0C",
"[+	c #E74C1F",
"}+	c #EFBBAB",
"|+	c #F5F4F3",
"1+	c #F5F3F1",
"2+	c #EAB1A0",
"3+	c #DE4316",
"4+	c #C5310A",
"5+	c #591202",
"6+	c #0E0504",
"7+	c #C83009",
"8+	c #E0532B",
"9+	c #E7E6E3",
"0+	c #E7E6E2",
"a+	c #DDDCD9",
"b+	c #CFCECA",
"c+	c #C14724",
"d+	c #AE2907",
"e+	c #290800",
"f+	c #0F0705",
"g+	c #9B2205",
"h+	c #C1A89F",
"i+	c #D1D0CC",
"j+	c #CFCDCA",
"k+	c #C7C6C3",
"l+	c #BBBAB7",
"m+	c #B5B4B1",
"n+	c #A7A6A2",
"o+	c #66564F",
"p+	c #0B0908",
"q+	c #010100",
"r+	c #222221",
"s+	c #51504B",
"t+	c #5D5C57",
"u+	c #3B3B37",
"    . .         + @ # # $ %                     ",
"  . . . . & # * = - ; > , ' ) ! ~ . . . .       ",
". .     { ] ^ / ( _ : > < [ } | . 1     . .     ",
"  .   2 3 4 5 6 - 7 8 9 0 0 a b c d e     .     ",
"  . f g h i j k l m n o } p a 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 K `  ..       ",
"  ..+.@.#.$.%.. .         . &.*.=.-.;.>.! .     ",
",.'.).!.~.{.. .             . ].^./.(.n _..     ",
"@ :.<.[.}.|..                 1.2.3.4.5.6..     ",
"# 7.6 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.9 x.y.. .     ",
"z.' [ 7 A.[.B..             C.D.E.F.G.H.. .     ",
"  ) } 0 I.J.K.L..         M.N.O.P.Q.R.S.. .     ",
"  ! | T.U.V.W.X.Y.Z.a.`. +.+++@+#+$+%+. .       ",
"  &+. *+=+-+;+>+,+'+)+k.!+~+{+]+^+/+(+. .       ",
"  . _+d :+L <+[+}+|+l.1+|+2+3+^+4+5+. . .       ",
"  .   6+t 7+` 8+9+0+o a+[.b+c+d+e+. .   .       ",
"  .     f+. g+h+i+j+k+l+m+n+o+. . .     .       ",
"    . . . p+. q+r+s+t+u+. . . . .     . .       ",
"              . . . . . . . .   . . . .         ",
"                                                ",
"                                                "};