Merge from origin/emacs-26

98e5fb9bf3 (origin/emacs-26) Remove incorrect documentation in comint.el 8ba5b85161 An overdue update of src/emacs-icon.h 155b211133 Minor copyedit in ELisp manual
author: Glenn Morris 2018-01-15 13:53:40 -0800
committer: Glenn Morris 2018-01-15 13:53:40 -0800
commit: 400b72cb6e118b86d2e83cbfb45b829b231ec4f9 (patch)
tree: 6c4f2e559e952c273dd4a21f90e5308aa28b17d1
parent: 8491cbef1afa0e4088729bfd7476d82bc2f09bba (diff)
parent: 98e5fb9bf3b49bea82a4d3e38be20415bd7f7684 (diff)
download: emacs-400b72cb6e118b86d2e83cbfb45b829b231ec4f9.tar.gz
emacs-400b72cb6e118b86d2e83cbfb45b829b231ec4f9.zip
3 files changed, 294 insertions, 300 deletions
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 8f8e8302c45..e025d3fd10b 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1827,7 +1827,8 @@ predicate, like this:
 @noindent
 The safe value definitions specified with @code{autoload} are copied
-into the @file{loaddefs.el} file, and are known to Emacs since the
+into the package's autoloads file (@file{loaddefs.el} for most
+packages bundled with Emacs), and are known to Emacs since the
 beginning of a session.
 @defopt safe-local-variable-values
diff --git a/lisp/comint.el b/lisp/comint.el
index 719945a831f..a79e34b36c3 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -2477,9 +2477,7 @@ Sets mark to the value of point when this command is run."
    (comint-truncate-buffer)))
 (defun comint-interrupt-subjob ()
-  "Interrupt the current subjob.
+  "Interrupt the current subjob."
-This command also kills the pending input
-between the process mark and point."
  (interactive)
  (comint-skip-input)
  (interrupt-process nil comint-ptyp)
@@ -2487,25 +2485,19 @@ between the process mark and point."
  )
 (defun comint-kill-subjob ()
-  "Send kill signal to the current subjob.
+  "Send kill signal to the current subjob."
-This command also kills the pending input
-between the process mark and point."
  (interactive)
  (comint-skip-input)
  (kill-process nil comint-ptyp))
 (defun comint-quit-subjob ()
-  "Send quit signal to the current subjob.
+  "Send quit signal to the current subjob."
-This command also kills the pending input
-between the process mark and point."
  (interactive)
  (comint-skip-input)
  (quit-process nil comint-ptyp))
 (defun comint-stop-subjob ()
  "Stop the current subjob.
-This command also kills the pending input
-between the process mark and point.
 WARNING: if there is no current subjob, you can end up suspending
 the top-level process running in the buffer.  If you accidentally do
diff --git a/src/emacs-icon.h b/src/emacs-icon.h
index 89f7e45667d..b9bf73f3818 100644
--- a/src/emacs-icon.h
+++ b/src/emacs-icon.h
@@ -3,7 +3,8 @@
 Copyright (C) 2008-2018 Free Software Foundation, Inc.
-Author:  Kentaro Ohkouchi <nanasess@fsm.ne.jp>
+Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
+        Nicolas Petton <nicolas@petton.fr>
 This file is part of GNU Emacs.
@@ -27,294 +28,294 @@ static const char * gnu_xpm_bits[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 255 2",
 /* colors */
-"AA c #FFFFFFFFFFFF",
+"   c None",
-"BA c #58585454A9A9",
+".  c #3A1F54",
-"CA c #181817175757",
+"+  c #3E1F5C",
-"DA c #393937377777",
+"@  c #462060",
-"EA c #5E5E5A5AACAC",
+"#  c #41225F",
-"FA c #7E7E7E7E8C8C",
+"$  c #432165",
-"GA c #73737171B7B7",
+"%  c #442266",
-"HA c #393936368787",
+"&  c #452267",
-"IA c #EEEEEEEEF7F7",
+"*  c #3F2466",
-"JA c #010101013939",
+"=  c #462368",
-"KA c #7E7E7C7CBCBC",
+"-  c #402567",
-"LA c #78787575B9B9",
+";  c #4C226A",
-"MA c #57575252ABAB",
+">  c #472469",
-"NA c #9E9E9D9DCDCD",
+",  c #4D236B",
-"OA c #76767474B8B8",
+"'  c #48256A",
-"PA c #86868484C1C1",
+")  c #4E246C",
-"AB c #EDEDECECF6F6",
+"!  c #49266B",
-"BB c #54545151A5A5",
+"~  c #4C2572",
-"CB c #4D4D4A4A9A9A",
+"{  c #4F256D",
-"DB c #F4F4F4F4FAFA",
+"]  c #4A276C",
-"EB c #96969494C9C9",
+"^  c #4D2673",
-"FB c #222222225353",
+"/  c #4E2774",
-"GB c #8C8C8C8C9595",
+"(  c #4F2875",
-"HB c #6A6A6868B2B2",
+"_  c #552777",
-"IB c #D2D2D1D1E8E8",
+":  c #502976",
-"JB c #F0F0F0F0F7F7",
+"<  c #512A77",
-"KB c #3E3E3D3D6C6C",
+"[  c #572979",
-"LB c #CECECECEE6E6",
+"}  c #5E277B",
-"MB c #ADADABABD6D6",
+"|  c #522B78",
-"NB c #91918F8FC6C6",
+"1  c #4F2C7E",
-"OB c #5D5D5A5AACAC",
+"2  c #572C81",
-"PB c #E8E8E8E8F4F4",
+"3  c #512E80",
-"AC c #959595959999",
+"4  c #5B2C7D",
-"BC c #252526266868",
+"5  c #552E7B",
-"CC c #555555557D7D",
+"6  c #582D82",
-"DC c #5B5B5858ABAB",
+"7  c #562F7C",
-"EC c #7B7B7878BBBB",
+"8  c #592E83",
-"FC c #DDDDDDDDEEEE",
+"9  c #533082",
-"GC c #55555151ACAC",
+"0  c #5C2D8A",
-"HC c #F0F0F1F1F8F8",
+"a  c #58307E",
-"IC c #111111115252",
+"b  c #5A2F84",
-"JC c #88888686C2C2",
+"c  c #543183",
-"KC c #5A5A5858AAAA",
+"d  c #612E86",
-"LC c #60605D5DB1B1",
+"e  c #5B3085",
-"MC c #8D8D8A8AC4C4",
+"f  c #682D89",
-"NC c #7C7C7A7ABBBB",
+"g  c #5C3186",
-"OC c #E4E4E4E4F5F5",
+"h  c #5F308D",
-"PC c #9A9A9898CBCB",
+"i  c #5D3287",
-"AD c #F7F7F6F6FAFA",
+"j  c #5A338D",
-"BD c #98989696C9C9",
+"k  c #673090",
-"CD c #F3F3F2F2F9F9",
+"l  c #5B348E",
-"DD c #ECECECECF5F5",
+"m  c #5F3489",
-"ED c #CACAC9C9E3E3",
+"n  c #5C358F",
-"FD c #53534E4EA9A9",
+"o  c #5B378A",
-"GD c #8E8E8C8CC5C5",
+"p  c #62368C",
-"HD c #A2A2A1A1CFCF",
+"q  c #7A319A",
-"ID c #67676464B0B0",
+"r  c #5F3B8E",
-"JD c #64646161AEAE",
+"s  c #6E3698",
-"KD c #9D9D9B9BCCCC",
+"t  c #643B8A",
-"LD c #58585454ABAB",
+"u  c #653C8B",
-"MD c #6B6B6969B2B2",
+"v  c #673B91",
-"ND c #92929090C7C7",
+"w  c #613D90",
-"OD c #6E6E6C6CB4B4",
+"x  c #5F4293",
-"PD c #6C6C6C6C8383",
+"y  c #664295",
-"AE c #ECECEAEAF5F5",
+"z  c #624596",
-"BE c #E8E8E8E8F3F3",
+"A  c #843BB1",
-"CE c #2C2C2C2C5050",
+"B  c #71449C",
-"DE c #63636060AFAF",
+"C  c #654899",
-"EE c #7A7A7979BABA",
+"D  c #6C479C",
-"FE c #A7A7A5A5D1D1",
+"E  c #66499A",
-"GE c #60605E5EADAD",
+"F  c #8F3CB7",
-"HE c #8A8A8989C3C3",
+"G  c #923BBE",
-"IE c #B2B2B1B1D7D7",
+"H  c #694C9E",
-"JE c #69696666B5B5",
+"I  c #8144AF",
-"KE c #E8E8E7E7F3F3",
+"J  c #943DC1",
-"LE c #BCBCBBBBDCDC",
+"K  c #8B41B8",
-"ME c #DBDBDADAEDED",
+"L  c #7B47AE",
-"NE c #C0C0BFBFDFDF",
+"M  c #953EC2",
-"OE c #2C2C29297777",
+"N  c #8F41C1",
-"PE c #B4B4B3B3D8D8",
+"O  c #6D4FA2",
-"AF c #66666363B0B0",
+"P  c #9042C2",
-"BF c #73737171BABA",
+"Q  c #8E44BB",
-"CF c #83838181BFBF",
+"R  c #764DA9",
-"DF c #3E3E3C3C8585",
+"S  c #6E50A3",
-"EF c #80807E7EBDBD",
+"T  c #8F45BC",
-"FF c #616161618383",
+"U  c #8948BB",
-"GF c #70706F6FB5B5",
+"V  c #8A49BC",
-"HF c #88888787C6C6",
+"W  c #894BB7",
-"IF c #DCDCDBDBEDED",
+"X  c #854CBC",
-"JF c #62625F5FAEAE",
+"Y  c #6D56A7",
-"KF c #72726F6FB6B6",
+"Z  c #844EB6",
-"LF c #D1D1D0D0E8E8",
+"`  c #854FB8",
-"MF c #8B8B8888C4C4",
+" . c #8251B1",
-"NF c #6C6C6A6AB3B3",
+".. c #6F58A9",
-"OF c #5A5A5656ACAC",
+"+. c #8052B7",
-"PF c #C5C5C4C4E1E1",
+"@. c #8352B2",
-"AG c #A1A19F9FCFCF",
+"#. c #7E54B2",
-"BG c #85858383C0C0",
+"$. c #8751BA",
-"CG c #80807E7EBEBE",
+"%. c #8153B9",
-"DG c #BEBEBDBDDEDE",
+"&. c #8553B3",
-"EG c #61615E5EAFAF",
+"*. c #7F55B3",
-"FG c #57575353A9A9",
+"=. c #8056B4",
-"GG c #313131315C5C",
+"-. c #725BAC",
-"HG c #292928285959",
+";. c #7B59B4",
-"IG c #6E6E6B6BB5B5",
+">. c #755BB4",
-"JG c #55555050ABAB",
+",. c #9052BE",
-"KG c #E9E9E9E9F4F4",
+"'. c #7C5AB5",
-"LG c #404040406D6D",
+"). c #7D5BB6",
-"MG c #68686464B1B1",
+"!. c #6F60B0",
-"NG c #E4E4E4E4F2F2",
+"~. c #7E5CB7",
-"OG c #94949292C8C8",
+"{. c #765FB1",
-"PG c #D6D6D4D4E9E9",
+"]. c #855AB8",
-"AH c #1D1D1D1D5D5D",
+"^. c #7F5DB8",
-"BH c #D5D5D4D4E9E9",
+"/. c #805EB9",
-"CH c #50504C4CA6A6",
+"(. c #9657C4",
-"DH c #57575353AAAA",
+"_. c #815FBB",
-"EH c #71716E6EB6B6",
+":. c #7C61BB",
-"FH c #090909093F3F",
+"<. c #7864AE",
-"GH c #61615D5DAFAF",
+"[. c #7D62BC",
-"HH c #8A8A8787C3C3",
+"}. c #8760B7",
-"IH c #7F7F7D7DBDBD",
+"|. c #8262B7",
-"JH c #6C6C6868B4B4",
+"1. c #7E63BD",
-"KH c #6A6A6767B2B2",
+"2. c #8363B8",
-"LH c #69696666B2B2",
+"3. c #7D66B8",
-"MH c #5A5A5656A9A9",
+"4. c #8464B9",
-"NH c #56565151ABAB",
+"5. c #7669B3",
-"OH c #5B5B5757AAAA",
+"6. c #8B63BB",
-"PH c #5A5A5656AAAA",
+"7. c #7F68BA",
-"AI c #5D5D5A5AABAB",
+"8. c #8666BC",
-"BI c #5E5E5C5CACAC",
+"9. c #9B60C5",
-"CI c #5A5A5757AAAA",
+"0. c #8169BB",
-"DI c #5F5F5C5CACAC",
+"a. c #806BB7",
-"EI c #5F5F5C5CADAD",
+"b. c #826ABD",
-"FI c #5F5F5D5DADAD",
+"c. c #836BBE",
-"GI c #EBEBEBEBF6F6",
+"d. c #7B6EB8",
-"HI c #59595555A9A9",
+"e. c #7D6DBE",
-"II c #B3B3B2B2D8D8",
+"f. c #9666C1",
-"JI c #EAEAEAEAF4F4",
+"g. c #7E6EBF",
-"KI c #E6E6E6E6F4F4",
+"h. c #856CC0",
-"LI c #F1F1F1F1F8F8",
+"i. c #7F6FC0",
-"MI c #5F5F5D5DAEAE",
+"j. c #8070C1",
-"NI c #E7E7E7E7F3F3",
+"k. c #8570BC",
-"OI c #57575454A9A9",
+"l. c #7F72BC",
-"PI c #F4F4F4F4F9F9",
+"m. c #A068C6",
-"AJ c #5C5C5757ADAD",
+"n. c #8671BD",
-"BJ c #75757373B8B8",
+"o. c #8073BD",
-"CJ c #70706C6CB5B5",
+"p. c #8772BF",
-"DJ c #9B9B9A9ACBCB",
+"q. c #8274BE",
-"EJ c #FAFAFAFAFCFC",
+"r. c #8375C0",
-"FJ c #E7E7E6E6F3F3",
+"s. c #9570C1",
-"GJ c #81817F7FBEBE",
+"t. c #8476C1",
-"HJ c #EBEBEAEAF4F4",
+"u. c #9073C2",
-"IJ c #EBEBEAEAF5F5",
+"v. c #8577C2",
-"JJ c #E6E6E6E6F2F2",
+"w. c #7F79C2",
-"KJ c #EEEEEDEDF6F6",
+"x. c #8678C3",
-"LJ c #E2E2E2E2F1F1",
+"y. c #807AC3",
-"MJ c #EEEEEEEEF4F4",
+"z. c #817BC4",
-"NJ c #E2E2E2E2EFEF",
+"A. c #827CC5",
-"OJ c #4C4C4B4B8989",
+"B. c #837DC6",
-"PJ c #E5E5E4E4F2F2",
+"C. c #8A7CC7",
-"AK c #484848487474",
+"D. c #7D80C7",
-"BK c #C2C2C1C1DFDF",
+"E. c #847EC7",
-"CK c #7A7A7777BBBB",
+"F. c #8E7CC2",
-"DK c #3F3F3E3E7D7D",
+"G. c #7F81C8",
-"EK c #EDEDEEEEF6F6",
+"H. c #9D78CA",
-"FK c #68686666B1B1",
+"I. c #897FC3",
-"GK c #65656262AFAF",
+"J. c #8381C3",
-"HK c #69696565B3B3",
+"K. c #907EC4",
-"IK c #E3E3E2E2F1F1",
+"L. c #A47AC7",
-"JK c #E3E3E3E3F1F1",
+"M. c #9E7DC7",
-"KK c #D4D4D2D2E8E8",
+"N. c #8D83C7",
-"LK c #9B9B9A9AB7B7",
+"O. c #9A80C8",
-"MK c #404040407878",
+"P. c #9C82CA",
-"NK c #D8D8D8D8EBEB",
+"Q. c #A182C6",
-"OK c #DFDFDEDEEFEF",
+"R. c #998AC9",
-"PK c #63636060B2B2",
+"S. c #A089CA",
-"AL c #F4F4F3F3FAFA",
+"T. c #9B8CCB",
-"BL c #5A5A5858A5A5",
+"U. c #9D8ECD",
-"CL c #66666464B5B5",
+"V. c #AC8DD1",
-"DL c #8F8F8D8DC8C8",
+"W. c #AD91CE",
-"EL c #F7F7F5F5FAFA",
+"X. c #A195CE",
-"FL c #5C5C5959ACAC",
+"Y. c #A995D0",
-"GL c #5C5C5757B1B1",
+"Z. c #A699D3",
-"HL c #B8B8B7B7DADA",
+"`. c #A79BD4",
-"IL c #5E5E5B5BACAC",
+" + c #A29DD5",
-"JL c #41413F3F8C8C",
+".+ c #A89CD5",
-"KL c #8B8B8A8AC3C3",
+"++ c #AE9ED2",
-"LL c #7F7F7E7EB9B9",
+"@+ c #BD9AD9",
-"ML c #A0A0A0A0A1A1",
+"#+ c #B1A0D5",
-"NL c #6B6B6A6A8C8C",
+"$+ c #ACA3D6",
-"OL c #626261619C9C",
+"%+ c #B3A3D7",
-"PL c #71716F6FB5B5",
+"&+ c #B5A5D9",
-"AM c #55555252A7A7",
+"*+ c #AFA7D9",
-"BM c #C8C8C7C7E3E3",
+"=+ c #C1A5D7",
-"CM c #3E3E3E3E5A5A",
+"-+ c #B8ABD9",
-"DM c #81817F7FC2C2",
+";+ c #C7A7E0",
-"EM c #52524F4F9797",
+">+ c #BFABDA",
-"FM c #93939191C8C8",
+",+ c #CBA8DB",
-"GM c #5B5B58589F9F",
+"'+ c #C5AADB",
-"HM c #85858484BCBC",
+")+ c #BBAFDC",
-"IM c #D1D1CFCFE7E7",
+"!+ c #BCB0DD",
-"JM c #515150508484",
+"~+ c #B6B2DD",
-"KM c #F8F8F7F7FBFB",
+"{+ c #BFB3E0",
-"LM c #70706D6DB6B6",
+"]+ c #BDB5DA",
-"MM c #50504F4F7878",
+"^+ c #C0B8DE",
-"NM c #9B9B9999CCCC",
+"/+ c #C3BBE1",
-"OM c #5E5E5B5BB0B0",
+"(+ c #C5BCE2",
-"PM c #62625F5FADAD",
+"_+ c #CCBBE3",
-"AN c #B7B7B7B7DADA",
+":+ c #C6C2E1",
-"BN c #31312F2F7A7A",
+"<+ c #CEC2E3",
-"CN c #484848487A7A",
+"[+ c #D5C1E4",
-"DN c #67676565B1B1",
+"}+ c #CBC6E5",
-"EN c #FCFCFCFCFDFD",
+"|+ c #CCC7E6",
-"FN c #FDFDFCFCFFFF",
+"1+ c #CDC8E7",
-"GN c #BBBBBABADCDC",
+"2+ c #CEC9E8",
-"HN c #656566667F7F",
+"3+ c #D4C8E9",
-"IN c #5A5A5656ABAB",
+"4+ c #DCCDE8",
-"JN c #A8A8A7A7D4D4",
+"5+ c #D9D1EA",
-"KN c #F8F8F8F8FBFB",
+"6+ c #D6D6EE",
-"LN c #95959292C8C8",
+"7+ c #E3D7EB",
-"MN c #D9D9D7D7EBEB",
+"8+ c #DDD9EB",
-"NN c #303030305454",
+"9+ c #E4D8EC",
-"ON c #CBCBCACADADA",
+"0+ c #E5D9ED",
-"PN c #363637376363",
+"a+ c #E6DBEF",
-"AO c #3B3B3B3B6868",
+"b+ c #E8DDF1",
-"BO c #444442428181",
+"c+ c #E2DFF0",
-"CO c #434340408D8D",
+"d+ c #E3E0F2",
-"DO c #ABABA9A9D4D4",
+"e+ c #EADFF3",
-"EO c #AEAEADADD5D5",
+"f+ c #E6E2F4",
-"FO c #5E5E5E5E8484",
+"g+ c #E7E3F5",
-"GO c #7E7E7B7BC1C1",
+"h+ c #EBE4F0",
-"HO c #9C9C9A9ACCCC",
+"i+ c #EEE7F3",
-"IO c #D6D6D5D5EAEA",
+"j+ c #E8E9F3",
-"JO c #87878484C1C1",
+"k+ c #EFE8F5",
-"KO c #5C5C5858AEAE",
+"l+ c #F0E9F6",
-"LO c #89898787C2C2",
+"m+ c #F2EAF7",
-"MO c #EAEAEAEAF5F5",
+"n+ c #ECECF7",
-"NO c #C2C2C1C1E0E0",
+"o+ c #EEEFF9",
-"OO c #A3A3A3A3D0D0",
+"p+ c #F5EEFA",
-"PO c #A5A5A3A3D0D0",
+"q+ c #EFF0FA",
-"AP c #70706E6EB9B9",
+"r+ c #F6EFFB",
-"BP c #64646161B1B1",
+"s+ c #F1F2FC",
-"CP c #6F6F6C6CB8B8",
+"t+ c #F4F2F6",
-"DP c #64646161B4B4",
+"u+ c #F5F3F7",
-"EP c #D7D7D6D6EBEB",
+"v+ c #F6F4F8",
-"FP c #4D4D4848A7A7",
+"w+ c #F8F5FA",
-"GP c #ECECEBEBF5F5",
+"x+ c #FAF7FC",
-"HP c #E6E6E5E5F2F2",
+"y+ c #FBF8FD",
-"IP c #F8F8F8F8FDFD",
+"z+ c #FDFBFF",
-"JP c #F9F9FAFAFCFC",
+"A+ c #FEFCFF",
-"KP c #FAFAF9F9FCFC",
+"B+ c #F8FEFF",
-"LP c #99999898CBCB",
+"C+ c #FFFDFF",
-"MP c #EAEAE9E9F6F6",
+"D+ c #F9FFFF",
-"NP c #5C5C5959ABAB",
+"E+ c #FCFFFB",
-"OP s bg c None",
+"F+ c #FEFFFC",
 /* pixels */
-"OPOPOPOPOPOPOPOPOPOPOPOPNHNHGCGCGCJGGCGCOPOPOPOPOPOPOPOPOPOPOPOP",
+"                                                                ",
-"OPOPOPOPOPOPOPOPOPMAMANHMADHOFAJKOAJOFDHJGJGGCOPOPOPOPOPOPOPOPOP",
+"                        g d l p p i b c                         ",
-"OPOPOPOPOPOPOPMAMAMAMAHIILAFJHCJEHLMIGHKGHLDFDFDNHOPOPOPOPOPOPOP",
+"                  8 n S d.G.J.G.E.B.z.<.C b |                   ",
-"OPOPOPOPOPOPDHFGOIHIILIDCJOAECKAGJHHMCMCMFJOCKGHFPFDOPOPOPOPOPOP",
+"              3 m !.J.J.J.J.G.B.A.z.y.v.t.o.O 4                 ",
-"OPOPOPOPOPDHFGBAOHJFMDKFLAIHBGJCGDFELELFJKPIELFJMBAJFDOPOPOPOPOP",
+"            8 E B.J.J.J.J.E.B.A.z.y.v.t.r.o.n.a.o :             ",
-"OPOPOPOPBAHIHIDCDEJHLANDHOPCLNNBGDMFLOHHGDAGMNKMAADGFDNHOPOPOPOP",
+"          0 ..J.J.J.J.G.E.B.A.A.X.]+6+g+|+N.j.i.e.x <           ",
-"OPOPOPBABAHIDCJFKHKAIMKJKJDDKEFCKKBMDGPEDOHDEDCDLIDBCKCHMAOPOPOP",
+"        b Y J.J.J.J.G.B.A.A. +:+1+1+8+A+F+t+x.e.0.0.u ^         ",
-"OPOPBAHIHIOHEILHCJNBGPIJMOABJBADEJEJKPJPKMADDBIAJBDBKACHDHMAOPOP",
+"      1 C J.J.J.J.E.B.A.z.y.v.r.r.x.`.s+F+F+++0.0.0.3.a         ",
-"OPOPHIHIPHDCJFCJCKCFIBIAMPDDKGNKIBIBPGMELJJILIDBDBNEEIFGFGMAOPOP",
+"      h A.J.J.G.E.I. +~+(+}+6+h+w+F+F+F+F+F+U.0.0.4.2.>.(       ",
-"OPHIHIPHPHAIAFKFKAGJAGKGKJIALEBDHOPCBDEBLNEBNAPONDAFDCMHBAGLCBOP",
+"    9 -.J.J.J.B.E.j+F+F+F+F+F+F+A+u+k+c+5+Z.0.4.2.|.1.:.t -     ",
-"OPHIPHCICIILDNGAKAJOJCEOJIJBIONALPKDBDNDKLCFCKIGJDDIOBINOMHAMMAC",
+"    j D.J.E.B.A.I.x+F+F+F+h+-+U.p.g.e.0.0.0.4.2.|.[.:._.;./     ",
-"HIPHCIOHDCILAFKFNCBGKLMCMBNIPIIFFENBNDGDJCEFOANFGKGEILLCOEGGMLKB",
+"    H G.E.B.A.y.w.$+B+F+F+T.j.i.g.0.0.0.0.4.2.1.[._._.~.).7     ",
-"PHCIOHDCDCOBDEIGLAIHBGLOJCKDEPALKGIIPACFIHBJNFMGJDEGPKOEHGACAOHA",
+"  b 5.B.A.z.y.v.t.r..+v+F+q+#+g.0.0.0.4.2.|.1.:._.~.~.).'.y *   ",
-"PHOHDCNPNPOBOBMIMDNCMCBDDJEBLNGNLJGINENCIGODHBIDGKCLBNHGGBGGOEOM",
+"  e z.A.z.y.v.r.r.o.k.C.<+z+F+i+#+0.4.2.1.[._._.~.).).=.=.R )   ",
-"PHOHDCNPNPAMMDKDPFIFPJKIKIHPOKLBLBOKKGLBCFGKKHDNJEHAGGFANNAHOMHI",
+"  e z.y.v.t.r.q.n.k.i.i.e.F.(+o+F+n+&+8.:._.~.~.).'.=.*.#. .]   ",
-"CIDCNPNPFGFMNGDBLIGIPBFJKGDDABIAGIKEJJAEIKPCDNJEJLGGFACEICINAJBA",
+"  i y.v.t.r.o.n.j.i.K.*+|+f+f+n+B+F+F+l+P.~.).).=.=.*.#.+.Z !   ",
-"OHDCNPAMJCALDBEKGPJIDDLIPJEDIIFEHDNALPNDNBKLCPGMAOPDCEFHBBOMHIHI",
+"  i t.r.q.o.k.j.R.5+A+F+F+F+F+z+7+)+Q.}.~.).'.=.*.#.@.+.Z Z !   ",
-"OHNPAIBBPELIBEABIAJBIAIIIHODNFNFNFNFHBKHAFJEBLCNFACMJACBLCCIPHHI",
+"  b r.q.n.k.i.!+A+F+F+F+F+i+%+h.:._.~.~.).'.=.*.#.+.+.Z W W '   ",
-"DCDCAIAMPCDDJKKIDDLIDJGEHBPLBJOALALABJKFKFJDMKPDNNFBEMLCDCOHPHHI",
+"  6 l.n.j.i.++F+F+F+F+F+{+8.[.:._.~.).).=.=.*.#.+.Z Z W X I >   ",
-"DCNPNPDCPMPFIJLJJJHJCGJDKFLAECEENCNCEEECBFDKNLPNJACODPNPDCOHPHOP",
+"  3 {.j.i.g.2+F+F+F+F+<+1.[._._.~.).'.=.*.#.@.+.Z Z W V V s #   ",
-"OPNPAIILPHDNNENIIKPBIOHEKFGANCGJGJGJGJDMBOFFAKJADFCLOBNPDCOHPHOP",
+"    z i.e.0.%+F+F+F+F+(+:._.~.~.).'.=.*.#.+.+.Z W X V V T _     ",
-"OPNPAIEADIKCEINMMEBEGIKEEDOOLOKAKAIHHFOJCCCCJADKAPJFAINPDCOHPHOP",
+"    2 0.0.0.0.^+F+F+F+F+f+>+S.u.6.=.*.&.+.Z Z W X V U T K =     ",
-"OPOPNPILILFIILOIKFIIOKKJHCLIKELFHLMBOLLGFOJADAGOEHIDILNPDCOHOPOP",
+"    < S 0.0.4.2.O.3+z+F+F+F+F+F+F+F+F+y+v+p+9+,+,.T T N f +     ",
-"OPOPNPOBILDIFIGEJFMDGDLEIFHJCDKNAAONLGCCFHAKJCGAPLLHEANPDCOHOPOP",
+"      5 |.2.|.1.:._.8.Y._+0+i+m+h+0+0+b+F+F+F+r+9.Q P F &       ",
-"OPOPOPOBILDIEIGEMDLAKABGNBHDIENOPGCCAOFHMMIPMPPELAGENPNPDCOPOPOP",
+"      ^ w |.[.:._.~.).).=.=.#.@.%.H.'+i+F+m+;+(.Q N G _         ",
-"OPOPOPAIOBBIDIGEEHBGNBBDNANAHDJNJMHNFBLGMJFNENAANMAMNPDCOPOPOPOP",
+"        ( D _._.~.).'.=.].M.=+4+t+e+[+@+m.T T P P G f @         ",
-"OPOPOPOPOBILBIILNFLOHDANPFLBOCLKFBFHFFNJKIBHBKOGJFDCNPOPOPOPOPOP",
+"          ( D ).).=.=.s.W.V.L.f.$.X V V T Q P P G k %           ",
-"OPOPOPOPOPILILBIILGEHBOAGJMCHMHGFHAHLLDLKAPLBIAMNPNPOPOPOPOPOPOP",
+"            ^ r =.*.#.@.+.Z Z W X V T Q Q N G G } $             ",
-"OPOPOPOPOPOPOPILBIBIFIDEFKBFDAJAAHGFBFIDJFOBFLOBAIOPOPOPOPOPOPOP",
+"              ! ( B @.+.Z W X V V T T P N G q = +               ",
-"OPOPOPOPOPOPOPOPILILBIILPKCBJAAHJFBPILILOBOBAIOPOPOPOPOPOPOPOPOP",
+"                  ) : v L X V V T Q N A k ; $                   ",
-"OPOPOPOPOPOPOPOPOPOPILMIGECABCPKGHAIILOBOBOPOPOPOPOPOPOPOPOPOPOP",
+"                      # ' , ( [ | { = = .                       ",
-"OPOPOPOPOPOPOPOPOPOPOPOPOPCAOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOP"};
+"                                                                "};
 #endif /* (defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)) || defined (USE_GTK) */
 #define gnu_xbm_width 50
author	Glenn Morris	2018-01-15 13:53:40 -0800
committer	Glenn Morris	2018-01-15 13:53:40 -0800
commit	400b72cb6e118b86d2e83cbfb45b829b231ec4f9 (patch)
tree	6c4f2e559e952c273dd4a21f90e5308aa28b17d1
parent	8491cbef1afa0e4088729bfd7476d82bc2f09bba (diff)
parent	98e5fb9bf3b49bea82a4d3e38be20415bd7f7684 (diff)
download	emacs-400b72cb6e118b86d2e83cbfb45b829b231ec4f9.tar.gz emacs-400b72cb6e118b86d2e83cbfb45b829b231ec4f9.zip

diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 8f8e8302c45..e025d3fd10b 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi
@@ -1827,7 +1827,8 @@ predicate, like this:
1827		1827
1828	@noindent	1828	@noindent
1829	The safe value definitions specified with @code{autoload} are copied	1829	The safe value definitions specified with @code{autoload} are copied
1830	into the @file{loaddefs.el} file, and are known to Emacs since the	1830	into the package's autoloads file (@file{loaddefs.el} for most
		1831	packages bundled with Emacs), and are known to Emacs since the
1831	beginning of a session.	1832	beginning of a session.
1832		1833
1833	@defopt safe-local-variable-values	1834	@defopt safe-local-variable-values


diff --git a/lisp/comint.el b/lisp/comint.el index 719945a831f..a79e34b36c3 100644 --- a/lisp/comint.el +++ b/lisp/comint.el
@@ -2477,9 +2477,7 @@ Sets mark to the value of point when this command is run."
2477	(comint-truncate-buffer)))	2477	(comint-truncate-buffer)))
2478		2478
2479	(defun comint-interrupt-subjob ()	2479	(defun comint-interrupt-subjob ()
2480	"Interrupt the current subjob.	2480	"Interrupt the current subjob."
2481	This command also kills the pending input
2482	between the process mark and point."
2483	(interactive)	2481	(interactive)
2484	(comint-skip-input)	2482	(comint-skip-input)
2485	(interrupt-process nil comint-ptyp)	2483	(interrupt-process nil comint-ptyp)
@@ -2487,25 +2485,19 @@ between the process mark and point."
2487	)	2485	)
2488		2486
2489	(defun comint-kill-subjob ()	2487	(defun comint-kill-subjob ()
2490	"Send kill signal to the current subjob.	2488	"Send kill signal to the current subjob."
2491	This command also kills the pending input
2492	between the process mark and point."
2493	(interactive)	2489	(interactive)
2494	(comint-skip-input)	2490	(comint-skip-input)
2495	(kill-process nil comint-ptyp))	2491	(kill-process nil comint-ptyp))
2496		2492
2497	(defun comint-quit-subjob ()	2493	(defun comint-quit-subjob ()
2498	"Send quit signal to the current subjob.	2494	"Send quit signal to the current subjob."
2499	This command also kills the pending input
2500	between the process mark and point."
2501	(interactive)	2495	(interactive)
2502	(comint-skip-input)	2496	(comint-skip-input)
2503	(quit-process nil comint-ptyp))	2497	(quit-process nil comint-ptyp))
2504		2498
2505	(defun comint-stop-subjob ()	2499	(defun comint-stop-subjob ()
2506	"Stop the current subjob.	2500	"Stop the current subjob.
2507	This command also kills the pending input
2508	between the process mark and point.
2509		2501
2510	WARNING: if there is no current subjob, you can end up suspending	2502	WARNING: if there is no current subjob, you can end up suspending
2511	the top-level process running in the buffer. If you accidentally do	2503	the top-level process running in the buffer. If you accidentally do


diff --git a/src/emacs-icon.h b/src/emacs-icon.h index 89f7e45667d..b9bf73f3818 100644 --- a/src/emacs-icon.h +++ b/src/emacs-icon.h
@@ -3,7 +3,8 @@
3		3
4	Copyright (C) 2008-2018 Free Software Foundation, Inc.	4	Copyright (C) 2008-2018 Free Software Foundation, Inc.
5		5
6	Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>	6	Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
		7	Nicolas Petton <nicolas@petton.fr>
7		8
8	This file is part of GNU Emacs.	9	This file is part of GNU Emacs.
9		10
@@ -27,294 +28,294 @@ static const char * gnu_xpm_bits[] = {
27	/* width height ncolors chars_per_pixel */	28	/* width height ncolors chars_per_pixel */
28	"32 32 255 2",	29	"32 32 255 2",
29	/* colors */	30	/* colors */
30	"AA c #FFFFFFFFFFFF",	31	" c None",
31	"BA c #58585454A9A9",	32	". c #3A1F54",
32	"CA c #181817175757",	33	"+ c #3E1F5C",
33	"DA c #393937377777",	34	"@ c #462060",
34	"EA c #5E5E5A5AACAC",	35	"# c #41225F",
35	"FA c #7E7E7E7E8C8C",	36	"$ c #432165",
36	"GA c #73737171B7B7",	37	"% c #442266",
37	"HA c #393936368787",	38	"& c #452267",
38	"IA c #EEEEEEEEF7F7",	39	"* c #3F2466",
39	"JA c #010101013939",	40	"= c #462368",
40	"KA c #7E7E7C7CBCBC",	41	"- c #402567",
41	"LA c #78787575B9B9",	42	"; c #4C226A",
42	"MA c #57575252ABAB",	43	"> c #472469",
43	"NA c #9E9E9D9DCDCD",	44	", c #4D236B",
44	"OA c #76767474B8B8",	45	"' c #48256A",
45	"PA c #86868484C1C1",	46	") c #4E246C",
46	"AB c #EDEDECECF6F6",	47	"! c #49266B",
47	"BB c #54545151A5A5",	48	"~ c #4C2572",
48	"CB c #4D4D4A4A9A9A",	49	"{ c #4F256D",
49	"DB c #F4F4F4F4FAFA",	50	"] c #4A276C",
50	"EB c #96969494C9C9",	51	"^ c #4D2673",
51	"FB c #222222225353",	52	"/ c #4E2774",
52	"GB c #8C8C8C8C9595",	53	"( c #4F2875",
53	"HB c #6A6A6868B2B2",	54	"_ c #552777",
54	"IB c #D2D2D1D1E8E8",	55	": c #502976",
55	"JB c #F0F0F0F0F7F7",	56	"< c #512A77",
56	"KB c #3E3E3D3D6C6C",	57	"[ c #572979",
57	"LB c #CECECECEE6E6",	58	"} c #5E277B",
58	"MB c #ADADABABD6D6",	59	"\| c #522B78",
59	"NB c #91918F8FC6C6",	60	"1 c #4F2C7E",
60	"OB c #5D5D5A5AACAC",	61	"2 c #572C81",
61	"PB c #E8E8E8E8F4F4",	62	"3 c #512E80",
62	"AC c #959595959999",	63	"4 c #5B2C7D",
63	"BC c #252526266868",	64	"5 c #552E7B",
64	"CC c #555555557D7D",	65	"6 c #582D82",
65	"DC c #5B5B5858ABAB",	66	"7 c #562F7C",
66	"EC c #7B7B7878BBBB",	67	"8 c #592E83",
67	"FC c #DDDDDDDDEEEE",	68	"9 c #533082",
68	"GC c #55555151ACAC",	69	"0 c #5C2D8A",
69	"HC c #F0F0F1F1F8F8",	70	"a c #58307E",
70	"IC c #111111115252",	71	"b c #5A2F84",
71	"JC c #88888686C2C2",	72	"c c #543183",
72	"KC c #5A5A5858AAAA",	73	"d c #612E86",
73	"LC c #60605D5DB1B1",	74	"e c #5B3085",
74	"MC c #8D8D8A8AC4C4",	75	"f c #682D89",
75	"NC c #7C7C7A7ABBBB",	76	"g c #5C3186",
76	"OC c #E4E4E4E4F5F5",	77	"h c #5F308D",
77	"PC c #9A9A9898CBCB",	78	"i c #5D3287",
78	"AD c #F7F7F6F6FAFA",	79	"j c #5A338D",
79	"BD c #98989696C9C9",	80	"k c #673090",
80	"CD c #F3F3F2F2F9F9",	81	"l c #5B348E",
81	"DD c #ECECECECF5F5",	82	"m c #5F3489",
82	"ED c #CACAC9C9E3E3",	83	"n c #5C358F",
83	"FD c #53534E4EA9A9",	84	"o c #5B378A",
84	"GD c #8E8E8C8CC5C5",	85	"p c #62368C",
85	"HD c #A2A2A1A1CFCF",	86	"q c #7A319A",
86	"ID c #67676464B0B0",	87	"r c #5F3B8E",
87	"JD c #64646161AEAE",	88	"s c #6E3698",
88	"KD c #9D9D9B9BCCCC",	89	"t c #643B8A",
89	"LD c #58585454ABAB",	90	"u c #653C8B",
90	"MD c #6B6B6969B2B2",	91	"v c #673B91",
91	"ND c #92929090C7C7",	92	"w c #613D90",
92	"OD c #6E6E6C6CB4B4",	93	"x c #5F4293",
93	"PD c #6C6C6C6C8383",	94	"y c #664295",
94	"AE c #ECECEAEAF5F5",	95	"z c #624596",
95	"BE c #E8E8E8E8F3F3",	96	"A c #843BB1",
96	"CE c #2C2C2C2C5050",	97	"B c #71449C",
97	"DE c #63636060AFAF",	98	"C c #654899",
98	"EE c #7A7A7979BABA",	99	"D c #6C479C",
99	"FE c #A7A7A5A5D1D1",	100	"E c #66499A",
100	"GE c #60605E5EADAD",	101	"F c #8F3CB7",
101	"HE c #8A8A8989C3C3",	102	"G c #923BBE",
102	"IE c #B2B2B1B1D7D7",	103	"H c #694C9E",
103	"JE c #69696666B5B5",	104	"I c #8144AF",
104	"KE c #E8E8E7E7F3F3",	105	"J c #943DC1",
105	"LE c #BCBCBBBBDCDC",	106	"K c #8B41B8",
106	"ME c #DBDBDADAEDED",	107	"L c #7B47AE",
107	"NE c #C0C0BFBFDFDF",	108	"M c #953EC2",
108	"OE c #2C2C29297777",	109	"N c #8F41C1",
109	"PE c #B4B4B3B3D8D8",	110	"O c #6D4FA2",
110	"AF c #66666363B0B0",	111	"P c #9042C2",
111	"BF c #73737171BABA",	112	"Q c #8E44BB",
112	"CF c #83838181BFBF",	113	"R c #764DA9",
113	"DF c #3E3E3C3C8585",	114	"S c #6E50A3",
114	"EF c #80807E7EBDBD",	115	"T c #8F45BC",
115	"FF c #616161618383",	116	"U c #8948BB",
116	"GF c #70706F6FB5B5",	117	"V c #8A49BC",
117	"HF c #88888787C6C6",	118	"W c #894BB7",
118	"IF c #DCDCDBDBEDED",	119	"X c #854CBC",
119	"JF c #62625F5FAEAE",	120	"Y c #6D56A7",
120	"KF c #72726F6FB6B6",	121	"Z c #844EB6",
121	"LF c #D1D1D0D0E8E8",	122	"` c #854FB8",
122	"MF c #8B8B8888C4C4",	123	" . c #8251B1",
123	"NF c #6C6C6A6AB3B3",	124	".. c #6F58A9",
124	"OF c #5A5A5656ACAC",	125	"+. c #8052B7",
125	"PF c #C5C5C4C4E1E1",	126	"@. c #8352B2",
126	"AG c #A1A19F9FCFCF",	127	"#. c #7E54B2",
127	"BG c #85858383C0C0",	128	"$. c #8751BA",
128	"CG c #80807E7EBEBE",	129	"%. c #8153B9",
129	"DG c #BEBEBDBDDEDE",	130	"&. c #8553B3",
130	"EG c #61615E5EAFAF",	131	"*. c #7F55B3",
131	"FG c #57575353A9A9",	132	"=. c #8056B4",
132	"GG c #313131315C5C",	133	"-. c #725BAC",
133	"HG c #292928285959",	134	";. c #7B59B4",
134	"IG c #6E6E6B6BB5B5",	135	">. c #755BB4",
135	"JG c #55555050ABAB",	136	",. c #9052BE",
136	"KG c #E9E9E9E9F4F4",	137	"'. c #7C5AB5",
137	"LG c #404040406D6D",	138	"). c #7D5BB6",
138	"MG c #68686464B1B1",	139	"!. c #6F60B0",
139	"NG c #E4E4E4E4F2F2",	140	"~. c #7E5CB7",
140	"OG c #94949292C8C8",	141	"{. c #765FB1",
141	"PG c #D6D6D4D4E9E9",	142	"]. c #855AB8",
142	"AH c #1D1D1D1D5D5D",	143	"^. c #7F5DB8",
143	"BH c #D5D5D4D4E9E9",	144	"/. c #805EB9",
144	"CH c #50504C4CA6A6",	145	"(. c #9657C4",
145	"DH c #57575353AAAA",	146	"_. c #815FBB",
146	"EH c #71716E6EB6B6",	147	":. c #7C61BB",
147	"FH c #090909093F3F",	148	"<. c #7864AE",
148	"GH c #61615D5DAFAF",	149	"[. c #7D62BC",
149	"HH c #8A8A8787C3C3",	150	"}. c #8760B7",
150	"IH c #7F7F7D7DBDBD",	151	"\|. c #8262B7",
151	"JH c #6C6C6868B4B4",	152	"1. c #7E63BD",
152	"KH c #6A6A6767B2B2",	153	"2. c #8363B8",
153	"LH c #69696666B2B2",	154	"3. c #7D66B8",
154	"MH c #5A5A5656A9A9",	155	"4. c #8464B9",
155	"NH c #56565151ABAB",	156	"5. c #7669B3",
156	"OH c #5B5B5757AAAA",	157	"6. c #8B63BB",
157	"PH c #5A5A5656AAAA",	158	"7. c #7F68BA",
158	"AI c #5D5D5A5AABAB",	159	"8. c #8666BC",
159	"BI c #5E5E5C5CACAC",	160	"9. c #9B60C5",
160	"CI c #5A5A5757AAAA",	161	"0. c #8169BB",
161	"DI c #5F5F5C5CACAC",	162	"a. c #806BB7",
162	"EI c #5F5F5C5CADAD",	163	"b. c #826ABD",
163	"FI c #5F5F5D5DADAD",	164	"c. c #836BBE",
164	"GI c #EBEBEBEBF6F6",	165	"d. c #7B6EB8",
165	"HI c #59595555A9A9",	166	"e. c #7D6DBE",
166	"II c #B3B3B2B2D8D8",	167	"f. c #9666C1",
167	"JI c #EAEAEAEAF4F4",	168	"g. c #7E6EBF",
168	"KI c #E6E6E6E6F4F4",	169	"h. c #856CC0",
169	"LI c #F1F1F1F1F8F8",	170	"i. c #7F6FC0",
170	"MI c #5F5F5D5DAEAE",	171	"j. c #8070C1",
171	"NI c #E7E7E7E7F3F3",	172	"k. c #8570BC",
172	"OI c #57575454A9A9",	173	"l. c #7F72BC",
173	"PI c #F4F4F4F4F9F9",	174	"m. c #A068C6",
174	"AJ c #5C5C5757ADAD",	175	"n. c #8671BD",
175	"BJ c #75757373B8B8",	176	"o. c #8073BD",
176	"CJ c #70706C6CB5B5",	177	"p. c #8772BF",
177	"DJ c #9B9B9A9ACBCB",	178	"q. c #8274BE",
178	"EJ c #FAFAFAFAFCFC",	179	"r. c #8375C0",
179	"FJ c #E7E7E6E6F3F3",	180	"s. c #9570C1",
180	"GJ c #81817F7FBEBE",	181	"t. c #8476C1",
181	"HJ c #EBEBEAEAF4F4",	182	"u. c #9073C2",
182	"IJ c #EBEBEAEAF5F5",	183	"v. c #8577C2",
183	"JJ c #E6E6E6E6F2F2",	184	"w. c #7F79C2",
184	"KJ c #EEEEEDEDF6F6",	185	"x. c #8678C3",
185	"LJ c #E2E2E2E2F1F1",	186	"y. c #807AC3",
186	"MJ c #EEEEEEEEF4F4",	187	"z. c #817BC4",
187	"NJ c #E2E2E2E2EFEF",	188	"A. c #827CC5",
188	"OJ c #4C4C4B4B8989",	189	"B. c #837DC6",
189	"PJ c #E5E5E4E4F2F2",	190	"C. c #8A7CC7",
190	"AK c #484848487474",	191	"D. c #7D80C7",
191	"BK c #C2C2C1C1DFDF",	192	"E. c #847EC7",
192	"CK c #7A7A7777BBBB",	193	"F. c #8E7CC2",
193	"DK c #3F3F3E3E7D7D",	194	"G. c #7F81C8",
194	"EK c #EDEDEEEEF6F6",	195	"H. c #9D78CA",
195	"FK c #68686666B1B1",	196	"I. c #897FC3",
196	"GK c #65656262AFAF",	197	"J. c #8381C3",
197	"HK c #69696565B3B3",	198	"K. c #907EC4",
198	"IK c #E3E3E2E2F1F1",	199	"L. c #A47AC7",
199	"JK c #E3E3E3E3F1F1",	200	"M. c #9E7DC7",
200	"KK c #D4D4D2D2E8E8",	201	"N. c #8D83C7",
201	"LK c #9B9B9A9AB7B7",	202	"O. c #9A80C8",
202	"MK c #404040407878",	203	"P. c #9C82CA",
203	"NK c #D8D8D8D8EBEB",	204	"Q. c #A182C6",
204	"OK c #DFDFDEDEEFEF",	205	"R. c #998AC9",
205	"PK c #63636060B2B2",	206	"S. c #A089CA",
206	"AL c #F4F4F3F3FAFA",	207	"T. c #9B8CCB",
207	"BL c #5A5A5858A5A5",	208	"U. c #9D8ECD",
208	"CL c #66666464B5B5",	209	"V. c #AC8DD1",
209	"DL c #8F8F8D8DC8C8",	210	"W. c #AD91CE",
210	"EL c #F7F7F5F5FAFA",	211	"X. c #A195CE",
211	"FL c #5C5C5959ACAC",	212	"Y. c #A995D0",
212	"GL c #5C5C5757B1B1",	213	"Z. c #A699D3",
213	"HL c #B8B8B7B7DADA",	214	"`. c #A79BD4",
214	"IL c #5E5E5B5BACAC",	215	" + c #A29DD5",
215	"JL c #41413F3F8C8C",	216	".+ c #A89CD5",
216	"KL c #8B8B8A8AC3C3",	217	"++ c #AE9ED2",
217	"LL c #7F7F7E7EB9B9",	218	"@+ c #BD9AD9",
218	"ML c #A0A0A0A0A1A1",	219	"#+ c #B1A0D5",
219	"NL c #6B6B6A6A8C8C",	220	"$+ c #ACA3D6",
220	"OL c #626261619C9C",	221	"%+ c #B3A3D7",
221	"PL c #71716F6FB5B5",	222	"&+ c #B5A5D9",
222	"AM c #55555252A7A7",	223	"*+ c #AFA7D9",
223	"BM c #C8C8C7C7E3E3",	224	"=+ c #C1A5D7",
224	"CM c #3E3E3E3E5A5A",	225	"-+ c #B8ABD9",
225	"DM c #81817F7FC2C2",	226	";+ c #C7A7E0",
226	"EM c #52524F4F9797",	227	">+ c #BFABDA",
227	"FM c #93939191C8C8",	228	",+ c #CBA8DB",
228	"GM c #5B5B58589F9F",	229	"'+ c #C5AADB",
229	"HM c #85858484BCBC",	230	")+ c #BBAFDC",
230	"IM c #D1D1CFCFE7E7",	231	"!+ c #BCB0DD",
231	"JM c #515150508484",	232	"~+ c #B6B2DD",
232	"KM c #F8F8F7F7FBFB",	233	"{+ c #BFB3E0",
233	"LM c #70706D6DB6B6",	234	"]+ c #BDB5DA",
234	"MM c #50504F4F7878",	235	"^+ c #C0B8DE",
235	"NM c #9B9B9999CCCC",	236	"/+ c #C3BBE1",
236	"OM c #5E5E5B5BB0B0",	237	"(+ c #C5BCE2",
237	"PM c #62625F5FADAD",	238	"_+ c #CCBBE3",
238	"AN c #B7B7B7B7DADA",	239	":+ c #C6C2E1",
239	"BN c #31312F2F7A7A",	240	"<+ c #CEC2E3",
240	"CN c #484848487A7A",	241	"[+ c #D5C1E4",
241	"DN c #67676565B1B1",	242	"}+ c #CBC6E5",
242	"EN c #FCFCFCFCFDFD",	243	"\|+ c #CCC7E6",
243	"FN c #FDFDFCFCFFFF",	244	"1+ c #CDC8E7",
244	"GN c #BBBBBABADCDC",	245	"2+ c #CEC9E8",
245	"HN c #656566667F7F",	246	"3+ c #D4C8E9",
246	"IN c #5A5A5656ABAB",	247	"4+ c #DCCDE8",
247	"JN c #A8A8A7A7D4D4",	248	"5+ c #D9D1EA",
248	"KN c #F8F8F8F8FBFB",	249	"6+ c #D6D6EE",
249	"LN c #95959292C8C8",	250	"7+ c #E3D7EB",
250	"MN c #D9D9D7D7EBEB",	251	"8+ c #DDD9EB",
251	"NN c #303030305454",	252	"9+ c #E4D8EC",
252	"ON c #CBCBCACADADA",	253	"0+ c #E5D9ED",
253	"PN c #363637376363",	254	"a+ c #E6DBEF",
254	"AO c #3B3B3B3B6868",	255	"b+ c #E8DDF1",
255	"BO c #444442428181",	256	"c+ c #E2DFF0",
256	"CO c #434340408D8D",	257	"d+ c #E3E0F2",
257	"DO c #ABABA9A9D4D4",	258	"e+ c #EADFF3",
258	"EO c #AEAEADADD5D5",	259	"f+ c #E6E2F4",
259	"FO c #5E5E5E5E8484",	260	"g+ c #E7E3F5",
260	"GO c #7E7E7B7BC1C1",	261	"h+ c #EBE4F0",
261	"HO c #9C9C9A9ACCCC",	262	"i+ c #EEE7F3",
262	"IO c #D6D6D5D5EAEA",	263	"j+ c #E8E9F3",
263	"JO c #87878484C1C1",	264	"k+ c #EFE8F5",
264	"KO c #5C5C5858AEAE",	265	"l+ c #F0E9F6",
265	"LO c #89898787C2C2",	266	"m+ c #F2EAF7",
266	"MO c #EAEAEAEAF5F5",	267	"n+ c #ECECF7",
267	"NO c #C2C2C1C1E0E0",	268	"o+ c #EEEFF9",
268	"OO c #A3A3A3A3D0D0",	269	"p+ c #F5EEFA",
269	"PO c #A5A5A3A3D0D0",	270	"q+ c #EFF0FA",
270	"AP c #70706E6EB9B9",	271	"r+ c #F6EFFB",
271	"BP c #64646161B1B1",	272	"s+ c #F1F2FC",
272	"CP c #6F6F6C6CB8B8",	273	"t+ c #F4F2F6",
273	"DP c #64646161B4B4",	274	"u+ c #F5F3F7",
274	"EP c #D7D7D6D6EBEB",	275	"v+ c #F6F4F8",
275	"FP c #4D4D4848A7A7",	276	"w+ c #F8F5FA",
276	"GP c #ECECEBEBF5F5",	277	"x+ c #FAF7FC",
277	"HP c #E6E6E5E5F2F2",	278	"y+ c #FBF8FD",
278	"IP c #F8F8F8F8FDFD",	279	"z+ c #FDFBFF",
279	"JP c #F9F9FAFAFCFC",	280	"A+ c #FEFCFF",
280	"KP c #FAFAF9F9FCFC",	281	"B+ c #F8FEFF",
281	"LP c #99999898CBCB",	282	"C+ c #FFFDFF",
282	"MP c #EAEAE9E9F6F6",	283	"D+ c #F9FFFF",
283	"NP c #5C5C5959ABAB",	284	"E+ c #FCFFFB",
284	"OP s bg c None",	285	"F+ c #FEFFFC",
285	/* pixels */	286	/* pixels */
286	"OPOPOPOPOPOPOPOPOPOPOPOPNHNHGCGCGCJGGCGCOPOPOPOPOPOPOPOPOPOPOPOP",	287	" ",
287	"OPOPOPOPOPOPOPOPOPMAMANHMADHOFAJKOAJOFDHJGJGGCOPOPOPOPOPOPOPOPOP",	288	" g d l p p i b c ",
288	"OPOPOPOPOPOPOPMAMAMAMAHIILAFJHCJEHLMIGHKGHLDFDFDNHOPOPOPOPOPOPOP",	289	" 8 n S d.G.J.G.E.B.z.<.C b \| ",
289	"OPOPOPOPOPOPDHFGOIHIILIDCJOAECKAGJHHMCMCMFJOCKGHFPFDOPOPOPOPOPOP",	290	" 3 m !.J.J.J.J.G.B.A.z.y.v.t.o.O 4 ",
290	"OPOPOPOPOPDHFGBAOHJFMDKFLAIHBGJCGDFELELFJKPIELFJMBAJFDOPOPOPOPOP",	291	" 8 E B.J.J.J.J.E.B.A.z.y.v.t.r.o.n.a.o : ",
291	"OPOPOPOPBAHIHIDCDEJHLANDHOPCLNNBGDMFLOHHGDAGMNKMAADGFDNHOPOPOPOP",	292	" 0 ..J.J.J.J.G.E.B.A.A.X.]+6+g+\|+N.j.i.e.x < ",
292	"OPOPOPBABAHIDCJFKHKAIMKJKJDDKEFCKKBMDGPEDOHDEDCDLIDBCKCHMAOPOPOP",	293	" b Y J.J.J.J.G.B.A.A. +:+1+1+8+A+F+t+x.e.0.0.u ^ ",
293	"OPOPBAHIHIOHEILHCJNBGPIJMOABJBADEJEJKPJPKMADDBIAJBDBKACHDHMAOPOP",	294	" 1 C J.J.J.J.E.B.A.z.y.v.r.r.x.`.s+F+F+++0.0.0.3.a ",
294	"OPOPHIHIPHDCJFCJCKCFIBIAMPDDKGNKIBIBPGMELJJILIDBDBNEEIFGFGMAOPOP",	295	" h A.J.J.G.E.I. +~+(+}+6+h+w+F+F+F+F+F+U.0.0.4.2.>.( ",
295	"OPHIHIPHPHAIAFKFKAGJAGKGKJIALEBDHOPCBDEBLNEBNAPONDAFDCMHBAGLCBOP",	296	" 9 -.J.J.J.B.E.j+F+F+F+F+F+F+A+u+k+c+5+Z.0.4.2.\|.1.:.t - ",
296	"OPHIPHCICIILDNGAKAJOJCEOJIJBIONALPKDBDNDKLCFCKIGJDDIOBINOMHAMMAC",	297	" j D.J.E.B.A.I.x+F+F+F+h+-+U.p.g.e.0.0.0.4.2.\|.[.:._.;./ ",
297	"HIPHCIOHDCILAFKFNCBGKLMCMBNIPIIFFENBNDGDJCEFOANFGKGEILLCOEGGMLKB",	298	" H G.E.B.A.y.w.$+B+F+F+T.j.i.g.0.0.0.0.4.2.1.[._._.~.).7 ",
298	"PHCIOHDCDCOBDEIGLAIHBGLOJCKDEPALKGIIPACFIHBJNFMGJDEGPKOEHGACAOHA",	299	" b 5.B.A.z.y.v.t.r..+v+F+q+#+g.0.0.0.4.2.\|.1.:._.~.~.).'.y * ",
299	"PHOHDCNPNPOBOBMIMDNCMCBDDJEBLNGNLJGINENCIGODHBIDGKCLBNHGGBGGOEOM",	300	" e z.A.z.y.v.r.r.o.k.C.<+z+F+i+#+0.4.2.1.[._._.~.).).=.=.R ) ",
300	"PHOHDCNPNPAMMDKDPFIFPJKIKIHPOKLBLBOKKGLBCFGKKHDNJEHAGGFANNAHOMHI",	301	" e z.y.v.t.r.q.n.k.i.i.e.F.(+o+F+n+&+8.:._.~.~.).'.=.*.#. .] ",
301	"CIDCNPNPFGFMNGDBLIGIPBFJKGDDABIAGIKEJJAEIKPCDNJEJLGGFACEICINAJBA",	302	" i y.v.t.r.o.n.j.i.K.+\|+f+f+n+B+F+F+l+P.~.).).=.=..#.+.Z ! ",
302	"OHDCNPAMJCALDBEKGPJIDDLIPJEDIIFEHDNALPNDNBKLCPGMAOPDCEFHBBOMHIHI",	303	" i t.r.q.o.k.j.R.5+A+F+F+F+F+z+7+)+Q.}.~.).'.=.*.#.@.+.Z Z ! ",
303	"OHNPAIBBPELIBEABIAJBIAIIIHODNFNFNFNFHBKHAFJEBLCNFACMJACBLCCIPHHI",	304	" b r.q.n.k.i.!+A+F+F+F+F+i+%+h.:._.~.~.).'.=.*.#.+.+.Z W W ' ",
304	"DCDCAIAMPCDDJKKIDDLIDJGEHBPLBJOALALABJKFKFJDMKPDNNFBEMLCDCOHPHHI",	305	" 6 l.n.j.i.++F+F+F+F+F+{+8.[.:._.~.).).=.=.*.#.+.Z Z W X I > ",
305	"DCNPNPDCPMPFIJLJJJHJCGJDKFLAECEENCNCEEECBFDKNLPNJACODPNPDCOHPHOP",	306	" 3 {.j.i.g.2+F+F+F+F+<+1.[._._.~.).'.=.*.#.@.+.Z Z W V V s # ",
306	"OPNPAIILPHDNNENIIKPBIOHEKFGANCGJGJGJGJDMBOFFAKJADFCLOBNPDCOHPHOP",	307	" z i.e.0.%+F+F+F+F+(+:._.~.~.).'.=.*.#.+.+.Z W X V V T _ ",
307	"OPNPAIEADIKCEINMMEBEGIKEEDOOLOKAKAIHHFOJCCCCJADKAPJFAINPDCOHPHOP",	308	" 2 0.0.0.0.^+F+F+F+F+f+>+S.u.6.=.*.&.+.Z Z W X V U T K = ",
308	"OPOPNPILILFIILOIKFIIOKKJHCLIKELFHLMBOLLGFOJADAGOEHIDILNPDCOHOPOP",	309	" < S 0.0.4.2.O.3+z+F+F+F+F+F+F+F+F+y+v+p+9+,+,.T T N f + ",
309	"OPOPNPOBILDIFIGEJFMDGDLEIFHJCDKNAAONLGCCFHAKJCGAPLLHEANPDCOHOPOP",	310	" 5 \|.2.\|.1.:._.8.Y._+0+i+m+h+0+0+b+F+F+F+r+9.Q P F & ",
310	"OPOPOPOBILDIEIGEMDLAKABGNBHDIENOPGCCAOFHMMIPMPPELAGENPNPDCOPOPOP",	311	" ^ w \|.[.:._.~.).).=.=.#.@.%.H.'+i+F+m+;+(.Q N G _ ",
311	"OPOPOPAIOBBIDIGEEHBGNBBDNANAHDJNJMHNFBLGMJFNENAANMAMNPDCOPOPOPOP",	312	" ( D _._.~.).'.=.].M.=+4+t+e+[+@+m.T T P P G f @ ",
312	"OPOPOPOPOBILBIILNFLOHDANPFLBOCLKFBFHFFNJKIBHBKOGJFDCNPOPOPOPOPOP",	313	" ( D ).).=.=.s.W.V.L.f.$.X V V T Q P P G k % ",
313	"OPOPOPOPOPILILBIILGEHBOAGJMCHMHGFHAHLLDLKAPLBIAMNPNPOPOPOPOPOPOP",	314	" ^ r =.*.#.@.+.Z Z W X V T Q Q N G G } $ ",
314	"OPOPOPOPOPOPOPILBIBIFIDEFKBFDAJAAHGFBFIDJFOBFLOBAIOPOPOPOPOPOPOP",	315	" ! ( B @.+.Z W X V V T T P N G q = + ",
315	"OPOPOPOPOPOPOPOPILILBIILPKCBJAAHJFBPILILOBOBAIOPOPOPOPOPOPOPOPOP",	316	" ) : v L X V V T Q N A k ; $ ",
316	"OPOPOPOPOPOPOPOPOPOPILMIGECABCPKGHAIILOBOBOPOPOPOPOPOPOPOPOPOPOP",	317	" # ' , ( [ \| { = = . ",
317	"OPOPOPOPOPOPOPOPOPOPOPOPOPCAOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOP"};	318	" "};
318	#endif /* (defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)) \|\| defined (USE_GTK) */	319	#endif /* (defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)) \|\| defined (USE_GTK) */
319		320
320	#define gnu_xbm_width 50	321	#define gnu_xbm_width 50