diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d0c4ba6836b..be94ed1d452 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,26 @@ +2000-10-08 Dave Love + + * info.el (Info-goto-node, Info-menu): Doc fix. + (Info-mode-menu): Bind beginning-of-buffer, Info-edit + (info-tool-bar-map): New variable. + (Info-mode): Use it. + (Info-edit-map): Define all in defvar. + (speedbar-attached-frame): Avoid compiler warning. + + * toolbar/tool-bar.el (tool-bar-map): Define it empty. + (global-map): Bind [tool-bar] to a filtered map. + (tool-bar-add-item): Remove MAP arg. Allow PBM icons. + (tool-bar-add-item-from-menu): Use tool-bar-map, not tb-map. + Allow PBM icons. + (tool-bar-setup): Adjust calls of tool-bar-add-item. + + * toolbar/index.xpm, toolbar/jump_to.xpm, toolbar/attach.xpm: + * toolbar/up_arrow.xpm, toolbar/left_arrow.xpm, toolbar/home.xpm: + * toolbar/right_arrow.xpm: New files. Renamed from tigert's + icons, except up_arrow, which is left-arrow rotated. + + * imenu.el (imenu-add-to-menubar): Fix last change. + 2000-10-08 Peter Breton * generic-x.el (rul-generic-mode): Remove eval-when-compile diff --git a/lisp/toolbar/attach.pbm b/lisp/toolbar/attach.pbm new file mode 100644 index 00000000000..bdcc5f4ef94 Binary files /dev/null and b/lisp/toolbar/attach.pbm differ diff --git a/lisp/toolbar/home.xpm b/lisp/toolbar/home.xpm new file mode 100644 index 00000000000..dc4ff70457b --- /dev/null +++ b/lisp/toolbar/home.xpm @@ -0,0 +1,54 @@ +/* XPM */ +static char * tb_home_xpm[] = { +"24 24 27 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #CFD7CF", +"# c #E0E4DD", +"$ c #839279", +"% c #C9D0C5", +"& c #D4D9D0", +"* c #B9C2B3", +"= c #7F8F74", +"- c #000100", +"; c #C7CEC3", +"> c #D2D7CE", +", c #CCD3C8", +"' c #C8CFC4", +") c #B7C0B1", +"! c #EFF1EE", +"~ c #B8C1B2", +"{ c #7A8A6F", +"] c #D3D8CF", +"^ c #6C7A63", +"/ c #A6B19E", +"( c #626F5A", +"_ c #6D7B64", +": c #6A7861", +"< c #D8DDD4", +"[ c #6B7962", +" ", +" ", +" ", +" ", +" . ... ", +" .+. .@. ", +" .+#$..%. ", +" .++&*=-;. ", +" .++>,')='. ", +" .!+>'''%~{. ", +" .++]''%'''~^. ", +" .+++%''%';;;/(. ", +" ...++'''';;;;_... ", +" .++%';;;;;;^. ", +" .++....;;;;^. ", +" .++.;;.;;;'^. ", +" .++.''.''';:. ", +" .+<.,,.'';;[. ", +" .%_.^^.^^:[^. ", +" ............. ", +" ", +" ", +" ", +" "}; diff --git a/lisp/toolbar/index.xpm b/lisp/toolbar/index.xpm new file mode 100644 index 00000000000..879edc942dd --- /dev/null +++ b/lisp/toolbar/index.xpm @@ -0,0 +1,47 @@ +/* XPM */ +static char * tb_index_xpm[] = { +"24 24 20 1", +" c None", +". c #000000", +"+ c #E0E4E0", +"@ c #949C8C", +"# c #908669", +"$ c #736B54", +"% c #CAC3AA", +"& c #D3CDB8", +"* c #A3A5A3", +"= c #7A735A", +"- c #434032", +"; c #080807", +"> c #C0B799", +", c #B4A884", +"' c #948B6D", +") c #BBB191", +"! c #C2B99C", +"~ c #998F70", +"{ c #5C5543", +"] c #494435", +" ", +" ", +" ", +" .................. ", +" .++++++++++++++++. ", +" .+++++..@++++++++. ", +" .++++.#$.@+++++++. ", +" ......%#.......... ", +" .++++.&#.@+++++++. ", +" .++++.%#...*+++++. ", +" .++++.%#.=-;..@++. ", +" ......>#.,$.'$.... ", +" .++.$.>#.,#.,#.#$. ", +" .++.#.>)#,,#,,,,#. ", +" .++.,.>!!)),,,,,$. ", +" ....,.,!!)!,,,,,$. ", +" .++.#~)!!!)!,,,,{. ", +" .+++.#,!!!!),,,#]. ", +" .+++.$,)!!)!,,,#. ", +" ......#!!!!),,#$. ", +" .$,,!!!,,#{. ", +" .#)!!),,$. ", +" .,)!!,,{. ", +" "}; diff --git a/lisp/toolbar/jump_to.xpm b/lisp/toolbar/jump_to.xpm new file mode 100644 index 00000000000..582ddaf2085 --- /dev/null +++ b/lisp/toolbar/jump_to.xpm @@ -0,0 +1,68 @@ +/* XPM */ +static char * tb_jump_to_xpm[] = { +"24 24 41 1", +" c None", +". c #212121", +"+ c #EAD4CB", +"@ c #E3C5BA", +"# c #DBB4A4", +"$ c #EEDED7", +"% c #FAF7F5", +"& c #F2E5E1", +"* c #D2AC99", +"= c #000000", +"- c #8D9E7C", +"; c #CDD9C2", +"> c #DEE6D7", +", c #DAE2D1", +"' c #9BAD89", +") c #B79382", +"! c #707D63", +"~ c #B4C6A2", +"{ c #ACC098", +"] c #636E57", +"^ c #AB8A7A", +"/ c #E4E9DD", +"( c #657158", +"_ c #C49F8D", +": c #C3D1B5", +"< c #808F70", +"[ c #4C5442", +"} c #58634E", +"| c #E6EBE0", +"1 c #D4DDC9", +"2 c #CAD7BE", +"3 c #90A17F", +"4 c #5F6A53", +"5 c #535C49", +"6 c #E9EDE4", +"7 c #616D56", +"8 c #A8BC95", +"9 c #7C8B6E", +"0 c #4C5443", +"a c #B6C2AA", +"b c #5E6953", +" ", +" ", +" ", +" ", +" ", +" ", +" ... ", +" ..+@#.. ", +" .$%&@*. ", +" =======+#**. ", +" =-;>,'=###). ", +" =!~{]=##*^. ", +" ==/;{(]=#*_. ", +" ==/;:{<[}=)).. ", +" =|12{{34=5=.. ", +" =6{{{7= == ", +" =>890= ", +" =a]= ", +" =b= ", +" = ", +" ", +" ", +" ", +" "}; diff --git a/lisp/toolbar/left_arrow.xpm b/lisp/toolbar/left_arrow.xpm new file mode 100644 index 00000000000..8e40eb5fb3b --- /dev/null +++ b/lisp/toolbar/left_arrow.xpm @@ -0,0 +1,70 @@ +/* XPM */ +static char * tb_left_arrow_xpm[] = { +"24 25 42 1", +" c None", +". c #000000", +"+ c #C6D7C3", +"@ c #E4EBE2", +"# c #FFFFFF", +"$ c #DFE8DD", +"% c #F3F7F3", +"& c #DCE6D9", +"* c #F2F6F1", +"= c #EFF3EE", +"- c #F1F5F0", +"; c #F4F7F4", +"> c #121B12", +", c #DEE7DC", +"' c #EEF3ED", +") c #EBF1EA", +"! c #B1C7AC", +"~ c #E9EFE8", +"{ c #D7E3D5", +"] c #243221", +"^ c #375930", +"/ c #548149", +"( c #729B68", +"_ c #80A776", +": c #7DA473", +"< c #81A877", +"[ c #83AA7A", +"} c #87AC7D", +"| c #67925C", +"1 c #516F4A", +"2 c #4E7C44", +"3 c #739C6A", +"4 c #84A979", +"5 c #81A878", +"6 c #709864", +"7 c #49763F", +"8 c #719A67", +"9 c #608C56", +"0 c #46703C", +"a c #6FA763", +"b c #5B8851", +"c c #36582E", +" ", +" ", +" ", +" ", +" ", +" .. ", +" ..+. ", +" ..@#+. ", +" ..$#%%+. ", +" ..&#*=-;+. ", +" .>,#'))===+. ", +" ..!#~{,@)===+] ", +" ..^/(_:<[}[}|. ", +" ..1234_5}[|. ", +" ..^26<_}|. ", +" ..728_9. ", +" ..0ab. ", +" ..c. ", +" .. ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/lisp/toolbar/right_arrow.xpm b/lisp/toolbar/right_arrow.xpm new file mode 100644 index 00000000000..6a52d97d4e9 --- /dev/null +++ b/lisp/toolbar/right_arrow.xpm @@ -0,0 +1,76 @@ +/* XPM */ +static char * tb_right_arrow_xpm[] = { +"24 24 49 1", +" c None", +". c #000000", +"+ c #E1EADF", +"@ c #FFFFFF", +"# c #F0F4EF", +"$ c #D4E0D1", +"% c #F3F7F3", +"& c #EDF2EB", +"* c #CEDCCB", +"= c #F4F7F4", +"- c #F1F5F0", +"; c #EFF3EE", +"> c #EBF1EA", +", c #C9D8C5", +"' c #E5ECE3", +") c #CBDAC7", +"! c #181818", +"~ c #2B2B2B", +"{ c #E4EBE2", +"] c #DEE7DC", +"^ c #D7E3D5", +"/ c #EEF3ED", +"( c #B1C7AC", +"_ c #9DBB90", +": c #88AC80", +"< c #83AA7C", +"[ c #85A879", +"} c #7EA476", +"| c #84A778", +"1 c #759B6C", +"2 c #59814F", +"3 c #3A5934", +"4 c #9ABB8F", +"5 c #83AA7A", +"6 c #87AC7D", +"7 c #82A87B", +"8 c #86A97C", +"9 c #759C6D", +"0 c #537C49", +"a c #445840", +"b c #80A776", +"c c #749868", +"d c #4B7040", +"e c #90B387", +"f c #749A6B", +"g c #3B5E31", +"h c #5D8554", +"i c #37592F", +"j c #3F6534", +" ", +" ", +" ", +" ", +" ", +" .. ", +" .+.. ", +" .@#$.. ", +" .@%&#*.. ", +" .@=-;>-,.. ", +" .@;;;>>'#)!. ", +" ~@;;;>{]^]/(.. ", +" ._:<:<[}|123.. ", +" .4567|890a.. ", +" .46b[c0d.. ", +" .ebf0g.. ", +" . c #739c6a", +", c #6fa763", +"< c #7da473", +"1 c #80a776", +"2 c #81a877", +"3 c #81a878", +"4 c #83aa7a", +"5 c #84a979", +"6 c #87ac7d", +"7 c None", +"8 c #b1c7ac", +"9 c #c6d7c3", +"0 c #d7e3d5", +"q c #dce6d9", +"w c #dee7dc", +"e c #dfe8dd", +"r c #e4ebe2", +"t c #e9efe8", +"y c #ebf1ea", +"u c #eef3ed", +"i c #eff3ee", +"p c #f1f5f0", +"a c #f2f6f1", +"s c #f3f7f3", +"d c #f4f7f4", +"f c Gray100", +/* pixels */ +"7777777777777777777777777", +"7777777777777777777777777", +"7777777777777777777777777", +"7777777777777777777777777", +"777777777777 77777777777", +"777777777777 77777777777", +"77777777777 O8 7777777777", +"77777777777 %f.7777777777", +"7777777777 $:tw 777777777", +"7777777777 #10f 777777777", +"777777777 O>