view etc/images/saveas.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 * saveas_xpm[] = {
"24 24 262 2",
"  	c None",
". 	c #000000",
"+ 	c #FBE73B",
"@ 	c #F2B64D",
"# 	c #FCEB3D",
"$ 	c #F7B544",
"% 	c #5D502C",
"& 	c #C3D7F4",
"* 	c #A9CDE5",
"= 	c #75757A",
"- 	c #EFC5BB",
"; 	c #F1C8BE",
"> 	c #F0C6BC",
", 	c #EEBCB2",
"' 	c #EEBEB5",
") 	c #EEC1B8",
"! 	c #EDBFB6",
"~ 	c #E8B6AC",
"{ 	c #FCE93B",
"] 	c #F7B545",
"^ 	c #6C5F34",
"/ 	c #434345",
"( 	c #92A7B9",
"_ 	c #96B1C7",
": 	c #BBD6E8",
"< 	c #8AAAC5",
"[ 	c #605F68",
"} 	c #E08D7E",
"| 	c #E0826E",
"1 	c #E0806E",
"2 	c #DC7A68",
"3 	c #DC8171",
"4 	c #DA7868",
"5 	c #D38072",
"6 	c #FAE43A",
"7 	c #F4B244",
"8 	c #615030",
"9 	c #783E35",
"0 	c #4D4C52",
"a 	c #7790A2",
"b 	c #526D82",
"c 	c #BAD5E9",
"d 	c #88A7C3",
"e 	c #686670",
"f 	c #C8817B",
"g 	c #CB7C74",
"h 	c #CB7A73",
"i 	c #CB7B73",
"j 	c #CC7C72",
"k 	c #CA7C72",
"l 	c #F9DF39",
"m 	c #F3AF42",
"n 	c #614F2F",
"o 	c #8F4941",
"p 	c #945554",
"q 	c #5B5A62",
"r 	c #7B97AE",
"s 	c #536F84",
"t 	c #B6D3E7",
"u 	c #87ABC1",
"v 	c #737373",
"w 	c #FFFFFF",
"x 	c #FEFEFE",
"y 	c #F9DC38",
"z 	c #EFB44D",
"A 	c #665A32",
"B 	c #BBBBBB",
"C 	c #CDCDCD",
"D 	c #E4E4E4",
"E 	c #6E6E6E",
"F 	c #819EB6",
"G 	c #526C80",
"H 	c #B9D3E7",
"I 	c #85A4BF",
"J 	c #F8D837",
"K 	c #F0A93F",
"L 	c #655930",
"M 	c #BABABA",
"N 	c #CCCCCC",
"O 	c #E5E5E5",
"P 	c #F7F7F7",
"Q 	c #727272",
"R 	c #83A0B8",
"S 	c #4F697C",
"T 	c #B9D3E6",
"U 	c #84A3BF",
"V 	c #CECECE",
"W 	c #F6D236",
"X 	c #EDA43E",
"Y 	c #5C5130",
"Z 	c #949494",
"` 	c #A3A3A3",
" .	c #B7B7B7",
"..	c #C6C6C6",
"+.	c #BDBDBD",
"@.	c #88A4BB",
"#.	c #486276",
"$.	c #B7D2E7",
"%.	c #82A0BB",
"&.	c #636363",
"*.	c #FDFDFD",
"=.	c #D7AE74",
"-.	c #61562F",
";.	c #465E70",
">.	c #B5CAE5",
",.	c #7FA2B9",
"'.	c #4F4115",
").	c #87A3BA",
"!.	c #455C6D",
"~.	c #AECCE5",
"{.	c #7DA0B6",
"].	c #CBCBCB",
"^.	c #9B9B9B",
"/.	c #9C9C9C",
"(.	c #A7A7A7",
"_.	c #B8B8B8",
":.	c #C5C5C5",
"<.	c #546069",
"[.	c #B0D1E4",
"}.	c #83A1B6",
"|.	c #735B5B",
"1.	c #F0F0F0",
"2.	c #D9D9D9",
"3.	c #D3D3D3",
"4.	c #E1E1E1",
"5.	c #EDEDED",
"6.	c #F8F8F8",
"7.	c #515C64",
"8.	c #AACEE3",
"9.	c #7B9BB2",
"0.	c #7A8E9A",
"a.	c #7A7A7A",
"b.	c #707070",
"c.	c #6C6C6C",
"d.	c #6F6F6F",
"e.	c #6A6E71",
"f.	c #696969",
"g.	c #6F777E",
"h.	c #86A2B9",
"i.	c #3A515D",
"j.	c #A9C9E2",
"k.	c #7494AF",
"l.	c #7E9BB4",
"m.	c #7D9AB3",
"n.	c #7998B2",
"o.	c #85A1B8",
"p.	c #829FB7",
"q.	c #8CA7BD",
"r.	c #8AA5BB",
"s.	c #364A59",
"t.	c #ABC4E2",
"u.	c #7294AD",
"v.	c #6F90AC",
"w.	c #7192AE",
"x.	c #414A4E",
"y.	c #424A51",
"z.	c #525B63",
"A.	c #626F79",
"B.	c #5F6C76",
"C.	c #5C6971",
"D.	c #5A666F",
"E.	c #58636B",
"F.	c #57636A",
"G.	c #3B5360",
"H.	c #39424B",
"I.	c #7897B3",
"J.	c #A4B9CB",
"K.	c #364853",
"L.	c #AAC9E2",
"M.	c #7091AA",
"N.	c #6F8FA7",
"O.	c #4A5359",
"P.	c #97938C",
"Q.	c #DFDDDA",
"R.	c #E3E1DE",
"S.	c #EBEAE8",
"T.	c #EAE9E7",
"U.	c #CFCEC9",
"V.	c #C9C6C0",
"W.	c #9B968E",
"X.	c #566168",
"Y.	c #4B657A",
"Z.	c #54738C",
"`.	c #AAC6DD",
" +	c #34464E",
".+	c #AAC9E1",
"++	c #6C8EA6",
"@+	c #6C8CA4",
"#+	c #40474D",
"$+	c #DAD8D3",
"%+	c #E7E6E2",
"&+	c #67655E",
"*+	c #524F47",
"=+	c #D9D7D4",
"-+	c #C7C5BF",
";+	c #C0BCB5",
">+	c #B8B3AB",
",+	c #434C54",
"'+	c #4D697F",
")+	c #4F6F84",
"!+	c #B3CADC",
"~+	c #313E49",
"{+	c #A8C8E1",
"]+	c #6B8DA6",
"^+	c #728FA4",
"/+	c #E2E1DD",
"(+	c #F0EFEC",
"_+	c #CDCAC6",
":+	c #C2BFB9",
"<+	c #CAC6C0",
"[+	c #DCDAD7",
"}+	c #4B555D",
"|+	c #4E697F",
"1+	c #BACCDC",
"2+	c #A4C4DE",
"3+	c #698BA3",
"4+	c #708AA1",
"5+	c #383E43",
"6+	c #E0DEDA",
"7+	c #514E46",
"8+	c #4F4C44",
"9+	c #C7C4BE",
"0+	c #CBC8C2",
"a+	c #E1E0DC",
"b+	c #E9E8E6",
"c+	c #475158",
"d+	c #4E6879",
"e+	c #4D6C80",
"f+	c #A3C3DB",
"g+	c #383F43",
"h+	c #778999",
"i+	c #6E899E",
"j+	c #65859C",
"k+	c #33383C",
"l+	c #D7D4D0",
"m+	c #D6D4D0",
"n+	c #4E4A43",
"o+	c #4D4942",
"p+	c #D1CEC9",
"q+	c #E6E5E2",
"r+	c #EDECEA",
"s+	c #454F55",
"t+	c #486173",
"u+	c #4D6678",
"v+	c #A1C1DA",
"w+	c #373C40",
"x+	c #0C0D0F",
"y+	c #4E5E6A",
"z+	c #5B6E7C",
"A+	c #4F5B62",
"B+	c #A4A099",
"C+	c #CCC9C3",
"D+	c #D7D5D1",
"E+	c #E4E2E0",
"F+	c #DDDBD7",
"G+	c #B8B5B0",
"H+	c #3E474D",
"I+	c #4A6176",
"J+	c #4A6070",
"K+	c #9BC3D8",
"L+	c #363C41",
"M+	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 p q r s .     ",
"  . t u v w w w w x . y z A . B C D E F G .     ",
"  . H I v w w w x . J K L . M N O P Q R S .     ",
"  . T U v V C N . W X Y . Z `  ...+.v @.#..     ",
"  . $.%.&.w w *.. =.-.. M N D P *.w v @.;..     ",
"  . >.,.v w x . '.. . M N D P *.w w v ).!..     ",
"  . ~.{.v V ].. . ^./.(._...].C C :.v ).<..     ",
"  . [.}.|.w *.1.2.3.4.5.6.x w w w w v R 7..     ",
"  . 8.9.0.a.Q b.c.c.d.e.E v v v v f.g.h.i..     ",
"  . j.k.F R h.F l.m.F n.h.o.o.).p.q.R r.s..     ",
"  . t.u.v.w.x.y.z.A.B.C.D.E.F.z.G.H.I.J.K..     ",
"  . L.M.N.O.P.Q.R.S.S.T.Q.U.V.W.X.Y.Z.`. +.     ",
"  . .+++@+#+$+%+&+*+*+=+-+;+>+U.,+'+)+!+~+.     ",
"  . {+]+^+#+/+(+&+*+*+_+:+;+<+[+}+|+)+1+~+.     ",
"  . 2+3+4+5+6+S.7+8+8+9+;+0+a+b+c+d+e+f+g+.     ",
"  . h+i+j+k+l+m+n+o+o+;+p+q+r+q+s+t+u+v+w+.     ",
"    x+y+z+A+B+;+>+C+C+D+E+T.F+G+H+I+J+K+L+.     ",
"      . . . . . . . . . . . . . . . . M+.       ",
"                                                "};