Merged from emacs@sv.gnu.org.

Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-294 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-295 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-296 Update from CVS: admin/FOR-RELEASE: Update refcard section. * emacs@sv.gnu.org/emacs--devo--0--patch-297 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-298 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-299 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-300 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-301 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-302 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-303 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-304 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-103 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-104 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-570
2006-06-12 07:27:12 +00:00 · 2006-06-12 07:27:12 +00:00 · 476e9367ec
commit 476e9367ec
parent a13f8f50d4 6b519504c3
241 changed files with 26851 additions and 25078 deletions
--- a/789
+++ b/789
--- a/13
+++ b/13
@ -1,3 +1,7 @@
 2006-06-05  Kim F. Storm  <storm@cua.dk>
 	* AUTHORS: Regenerate.
 2006-05-18  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 	* configure.in: Add check for ALSA.
@ -11,8 +15,8 @@
 2006-04-20 Ramprasad B <ramprasad_i82@yahoo.com>
-	* Copyright (sources/emacs): updated copyright year(s)
+	* Copyright (sources/emacs): Update copyright year(s).
-	
+
 2006-04-01  Eli Zaretskii  <eliz@gnu.org>
 	* configure: Regenerated.
@ -24,9 +28,8 @@
 2006-04-01  Christoph Bauer  <Christoph.Bauer@lms-gmbh.de>  (tiny change)
-	* configure.in (hppa*-hp-hpux1[1-9]*): Add
+	* configure.in (hppa*-hp-hpux1[1-9]*): Add -D_INCLUDE__STDC_A1_SOURCE
-	-D_INCLUDE__STDC_A1_SOURCE to CFLAGS.  Update Copyright years
+	to CFLAGS.  Update Copyright years written to src/config.in.
 	written to src/config.in.
 2006-03-18  Claudio Fontana  <claudio@gnu.org>
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@ -1,3 +1,19 @@
 2006-06-08  Reiner Steib  <Reiner.Steib@gmx.de>
 	* FOR-RELEASE: Update refcard section.
 2006-06-07  Reiner Steib  <Reiner.Steib@gmx.de>
 	* FOR-RELEASE: Update refcard section.
 2006-05-25  Chong Yidong  <cyd@stupidchicken.com>
 	* FOR-RELEASE: Key sequence elisp node done.
 2006-05-24  Reiner Steib  <Reiner.Steib@gmx.de>
 	* FOR-RELEASE: Update refcard translations.  Add coding cookie.
 2006-05-21  Chong Yidong  <cyd@mit.edu>
 	* FOR-RELEASE: point-entered /point-left bug fixed.
@ -15,7 +31,7 @@
 2006-04-17 Ramprasad B <ramprasad_i82@yahoo.com>
 	* ./* (Copyright): Updated Copyright year(s)
-	
+
 2006-02-24  Reiner Steib  <Reiner.Steib@gmx.de>
 	* FOR-RELEASE (BUGS): Add URLs/MIDs.
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@ -21,6 +21,19 @@ face name prefixes should be in it for good results.
 ** Ask maintainers of refcard translations to update them.
 Requests to have been sent out on 2006-05-23 (Reiner Steib).
 LANG	Translator            Status
 cs	Pavel Janík           No response
 de	Sven Joachim          Done
 fr	Eric Jacoboni         Done        (layout might be improved)
 pl	Włodek Bzyl           Done
 pt-br	Rodrigo Real          Done
 ru	Alex Ott              Working
 sk	Miroslav Vaško        No response
 Reminders sent out on 2006-06-08.
 ** Send an email to the various distributions, including the GNOME
 and KDE projects, to use the new Emacs icons in etc/images/icons.
@ -29,8 +42,6 @@ and KDE projects, to use the new Emacs icons in etc/images/icons.
 ** We need a way a Lisp file encoded in iso-2022 can assure
 reliable decoding regardless of user options.
 ** Clean up MUSTBENEW in Fcopy_file.
 ** JD Smith's 17 Apr 2006 bug report that CVS operations
 get mysterious unreproducible failures.
@ -62,9 +73,6 @@ It seems that to fix this, w32 server sockets must use WSAAsyncSelect
 * DOCUMENTATION
 ** Add a node to the Lisp manual describing key sequences from the
 Lisp point of view.
 ** Check man/info.texi.
 ** Check the Emacs Lisp manual.
@ -141,7 +149,7 @@ SECTION                  READERS
 etc/TUTORIAL             rms
 etc/TUTORIAL.bg          Ognyan Kulev <ogi@fmi.uni-sofia.bg>
 etc/TUTORIAL.cn
-etc/TUTORIAL.cs          Pavel Janík <Pavel@Janik.cz>
+etc/TUTORIAL.cs          Pavel Janík <Pavel@Janik.cz>
 etc/TUTORIAL.de          Werner LEMBERG <wl@gnu.org>
 etc/TUTORIAL.es          Marcelo Toledo
 etc/TUTORIAL.fr          ttn
@ -153,7 +161,7 @@ etc/TUTORIAL.pl          Slawomir Nowaczyk <slawek@cs.lth.se>
 etc/TUTORIAL.pt_BR       Marcelo Toledo
 etc/TUTORIAL.ro
 etc/TUTORIAL.ru          Alex Ott <alexott@gmail.com>
-etc/TUTORIAL.sk          Pavel Janík <Pavel@Janik.cz>
+etc/TUTORIAL.sk          Pavel Janík <Pavel@Janik.cz>
 etc/TUTORIAL.sl          Primoz PETERLIN <primoz.peterlin@biofiz.mf.uni-lj.si>
 etc/TUTORIAL.sv          Mats Lidell <matsl@contactor.se>
 etc/TUTORIAL.th          Virach Sornlertlamvanich <virach@tcllab.org>
@ -162,4 +170,5 @@ etc/TUTORIAL.zh
 Local variables:
 mode: outline
 coding: utf-8
 end:
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@ -1,3 +1,88 @@
 2006-06-09  W$,1 b(Bodek Bzyl  <matwb@univ.gda.pl>
 	* pl-refcard.ps: Regenerate.
 2006-06-08  W$,1 b(Bodek Bzyl  <matwb@univ.gda.pl>
 	* pl-refcard.tex: Update for Emacs 22.
 2006-06-08  Reiner Steib  <Reiner.Steib@gmx.de>
 	* fr-refcard.tex: Fix errors in previous commit.
 2006-06-08  ,AI(Bric Jacoboni  <jaco@jacoboni.fr>
 	* fr-refcard.tex: Update for Emacs 22.
 2006-06-07  Kenichi Handa  <handa@m17n.org>
 	* NEWS: Mention how to disable character translation for a file.
 2006-06-04  Sven Joachim  <svenjoac@gmx.de>
 	* de-refcard.tex: Update for Emacs 22: Use German quotes
 	and umlauts; fix overfull /hboxes; many rewordings.
 2006-06-04  Kim F. Storm  <storm@cua.dk>
 	* NEWS: Move news for pre-22 versions into...
 	* NEWS.21, NEWS.20: ... new files for Emacs 21 and Emacs 20 news.
 	* ONEWS, ONEWS.1, ONEWS.2, ONEWS.3, ONEWS.4: Remove (rename) files ...
 	* NEWS.19, NEWS.18, NEWS.1-17: ... and organize news about older Emacs
 	versions in separte files.  Update copyright notices.
 2006-06-03  Eli Zaretskii  <eliz@gnu.org>
 	* LPF, LEDIT: Remove files.
 	* FTP, README, HELLO, MACHINES, MAILINGLISTS, MORE.STUFF, ETAGS.EBNF:
 	* MOTIVATION, ORDERS, SERVICE, TERMS, TODO:
 	* enriched.doc, ulimit.hack, ses-example.ses, ms-7bkermit, emacs.csh:
 	* Xkeymap.txt, compilation.txt, grep.txt:
 	Add copyright notice and copying permissions.
 2006-05-31  David Ponce  <david@dponce.com>
 	* tree-widget/default/close.png, tree-widget/default/close.xpm:
 	* tree-widget/default/empty.png, tree-widget/default/empty.xpm:
 	* tree-widget/default/end-guide.png, tree-widget/default/end-guide.xpm:
 	* tree-widget/default/guide.png, tree-widget/default/guide.xpm:
 	* tree-widget/default/handle.png, tree-widget/default/handle.xpm:
 	* tree-widget/default/leaf.png, tree-widget/default/leaf.xpm:
 	* tree-widget/default/no-guide.png, tree-widget/default/no-guide.xpm:
 	* tree-widget/default/no-handle.png, tree-widget/default/no-handle.xpm:
 	* tree-widget/default/open.png, tree-widget/default/open.xpm:
 	* tree-widget/folder/close.png, tree-widget/folder/close.xpm:
 	* tree-widget/folder/empty.png, tree-widget/folder/empty.xpm:
 	* tree-widget/folder/end-guide.png, tree-widget/folder/end-guide.xpm:
 	* tree-widget/folder/guide.png, tree-widget/folder/guide.xpm:
 	* tree-widget/folder/handle.png, tree-widget/folder/handle.xpm:
 	* tree-widget/folder/leaf.png, tree-widget/folder/leaf.xpm:
 	* tree-widget/folder/no-guide.png, tree-widget/folder/no-guide.xpm:
 	* tree-widget/folder/no-handle.png, tree-widget/folder/no-handle.xpm:
 	* tree-widget/folder/open.png, tree-widget/folder/open.xpm:
 	Reduce the size of images.
 2006-05-29  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 	* NEWS: Mention F10 for Gtk+/Leddtif/Lucid menus.
 2006-05-26  Eli Zaretskii  <eliz@gnu.org>
 	* ledit.l: Remove file.
 2006-05-26  Kenichi Handa  <handa@m17n.org>
 	* NEWS (find-operation-coding-system): Mention the new argument
 	format.
 2006-05-24  Carsten Dominik  <dominik@science.uva.nl>
 	* orgcard.tex: (section{Motion}): Added the item navigation
 	commands.
 	(section{Publishing}): New section.
 	(section{Links}): Documented elisp and shell links.
 2006-05-20  Rodrigo Real  <rreal@ucpel.tche.br>
 	* pt-br-refcard.tex: Update.
@ -85,8 +170,8 @@
 2006-04-18  Reiner Steib  <Reiner.Steib@gmx.de>
-	* gnus-refcard.tex: Bump version to 5.11.  Remove duplicate
+	* gnus-refcard.tex: Bump version to 5.11.  Remove duplicate \def's.
-	\def's.  Update date.
+	Update date.
 2006-04-18  Bill Wohler  <wohler@newt.com>
@ -123,8 +208,7 @@
 	* images/README: Update with following information.
 	* images/data-save.xpm, images/mail/flag-for-followup.xpm:
-	* images/zoom-in.xpm, images/zoom-out.xpm: New images from GNOME
+	* images/zoom-in.xpm, images/zoom-out.xpm: New images from GNOME 2.12.
 	2.12.
 	* images/contact.pbm, images/data-save.pbm, images/delete.pbm:
 	* images/mail/flag-for-followup.pbm, images/mail/inbox.pbm:
@ -156,8 +240,7 @@
 	* images/mail/alias.xpm, images/mail/refile.pbm:
 	* images/mail/refile.xpm, images/page-down.pbm:
 	* images/page-down.xpm, images/widen.pbm, images/widen.xpm: Remove
-	custom MH-E icons since MH-E is now using the equivalent GTK/GNOME
+	custom MH-E icons -- MH-E is now using the equivalent GTK/GNOME icons.
 	icons.
 2006-03-23  Romain Francoise  <romain@orebokech.com>
@ -188,8 +271,7 @@
 	* images/mail/save.xpm, images/mail/send.xpm:
 	* images/mail/spam.xpm, images/next-page.xpm:
 	* images/refresh.xpm, images/separator.xpm:
-	* images/sort-ascending.xpm:
+	* images/sort-ascending.xpm, images/sort-column-ascending.xpm:
 	* images/sort-column-ascending.xpm:
 	* images/sort-criteria.xpm, images/sort-descending.xpm:
 	* images/sort-row-ascending.xpm:
 	New icons, copied from Gnus trunk (originally from Gnome 2.6).
@ -678,21 +760,10 @@
 	Update FSF's address in GPL notices.
-	* INTERVIEW:
+	* INTERVIEW, calccard.tex, cs-dired-ref.tex, cs-refcard.tex:
-	* calccard.tex:
+	* dired-ref.tex, fr-drdref.tex, fr-refcard.tex, gfdl.1:
-	* cs-dired-ref.tex:
+	* pl-refcard.tex, refcard.tex, ru-refcard.tex, sk-dired-ref.tex:
-	* cs-refcard.tex:
+	* sk-refcard.tex, vipcard.tex, viperCard.tex: Update FSF's address.
 	* dired-ref.tex:
 	* fr-drdref.tex:
 	* fr-refcard.tex:
 	* gfdl.1:
 	* pl-refcard.tex:
 	* refcard.tex:
 	* ru-refcard.tex:
 	* sk-dired-ref.tex:
 	* sk-refcard.tex:
 	* vipcard.tex:
 	* viperCard.tex: Update FSF's address.
 2005-07-03  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
--- a/etc/ETAGS.EBNF
+++ b/etc/ETAGS.EBNF
@ -1,5 +1,7 @@
 -*- indented-text -*-
 See the end of this file for copyright information.
 This file contains two sections:
 1) An EBNF (Extended Backus-Naur Form) description of the format of
@ -91,3 +93,22 @@ rightmost consecutive characters in the pattern which are not one of
 those.
 ===================== end of discussion of tag names =====================
 Copyright (c) 2002, 2004, 2006
 Free software Foundation, Inc.
 COPYING PERMISSIONS:
    This document is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
--- a/etc/FTP
+++ b/etc/FTP
@ -1,2 +1,7 @@
 Please refer to <http://www.gnu.org/software/emacs/> for information
 about obtaining Emacs.
 Copyright (c) 2000, 2006  Free Software Foundation, Inc.
 Verbatim copying and distribution is permitted in any medium
 provided this notice is preserved.
--- a/etc/HELLO
+++ b/etc/HELLO
@ -67,3 +67,24 @@ Maltese (il-Malti)	Bon$,1 A(Bu, Sa$,1 G G(Ba
 ;;; Local Variables:
 ;;; tab-width: 32
 ;;; End:
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006
 Free software Foundation, Inc.
 COPYING PERMISSIONS:
    This document is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
--- a/etc/LEDIT
+++ b/etc/LEDIT
@ -1,77 +0,0 @@
 Date: 17 Apr 85 15:45:42 EST (Wed)
 From: Martin David Connor <mdc@MIT-HTVAX.ARPA>
    Date: Sat, 13 Apr 85 16:28:15 est
    From: Richard M. Stallman <rms@mit-prep>
    Can you help this person?  Also, can you give me the rest of ledit
    to distribute, plus some info on how to use it?
 I have put the files "ledit.l" and "leditcfns.c" on prep:~mdc.
 Much to my disgust ledit.l relied on some bogus little package of
 functions on HT, so I had to massage it a bit.
 To get it to work, one must:
   - Compile leditcfns.c with something like:
     cc leditcfns.c
   - Edit ledit.l, changing the line beginning "(cfasl" to
     have the right pathname for the cfns file you compiled in
     the last step.
   - Compile ledit.l with:
     liszt ledit.l
 Then put the following lines in your .lisprc file:
    ;load in functions for emacs interface
    (load "//src//mdc//ledit//ledit")   ; Location of Ledit library
    (set-proc-str "%gnumacs")		; Name of editor
 Then you can use ^E <RETURN> to get from LISP back to gnumacs.
 Here is the part of my .emacs file that pertains to ledit.
    ;;; Set up ledit mode
    (setq ledit-go-to-lisp-string "%lisp")
    (setq lisp-mode-hook 'ledit-from-lisp-mode)
    Date: Sat, 13 Apr 85 11:26:32 cst
    From: neves@wisc-ai.arpa (David Neves)
    This is a documentation question.
    I cannot figure out how to use Ledit.  I suspect I need some
    function on the Franz Lisp end of things to go to Emacs and read in
    the temporary file.  Is this true?  Is the Lisp job started within
    Emacs or outside of emacs?  I'm just plain confused.  Perhaps a couple
    of words from someone in the know would help.
    A related question.  I have been using a shell buffer when interacting
    with Lisp (ie. put a definition in the kill buffer and then yank it
    into the shell buffer to redefine it).  This is nice but tends to fill
    up the shell buffer with lots of code (I'd rather keep calls to functions
    in the shell and not the functions themselves).
    My question:  Is using the shell buffer "better" than ledit?  Am I using
    it in the best way (i.e. copying definitions from an edit buffer to the
    shell buffer)?    -Thanks, David Neves
 I have found that ledit works well for doing programming development
 when you are changing lots of little pieces of a file and don't wish
 to recompile the whole file.  Of course M-X Compile is very nice for
 calling up a liszt on a buffer and watching it in the another window.
 Of course the interface of something like NIL is even better because
 you can compile your function directly into your lisp.  But since NIL
 doesn't run under Unix, this is probably the next best thing.
 I have tried the 2 window method (shell in lower window, lisp code in
 upper), and have found it a little awkward.  It does have certain
 advantages, but most of the time, I get be fine using M-C-D to save a
 defun for lisp, and C-X Z to jump back to LISP.  C-E RETURN from lisp
 is also mnemonic for getting back to gnumacs.
 I hope this helps somewhat.
--- a/etc/LPF
+++ b/etc/LPF
@ -1,43 +0,0 @@
 	   Protect Your Freedom to Write Programs
 	   Join the League for Programming Freedom
 	       (Version of February 3, 1994)
 Ten years ago, programmers were allowed to write programs using all
 the techniques they knew, and providing whatever features they felt
 were useful.  This is no longer the case.  New monopolies, known as
 software patents and interface copyrights, have taken away our freedom
 of expression and our ability to do a good job.
 "Look and feel" lawsuits attempt to monopolize well-known command
 languages; some have succeeded.  Copyrights on command languages
 enforce gratuitous incompatibility, close opportunities for
 competition, and stifle incremental improvements.
 Software patents are even more dangerous; they make every design
 decision in the development of a program carry a risk of a lawsuit,
 with draconian pretrial seizure.  It is difficult and expensive to
 find out whether the techniques you consider using are patented; it is
 impossible to find out whether they will be patented in the future.
 The League for Programming Freedom is a grass-roots organization of
 professors, students, businessmen, programmers and users dedicated to
 bringing back the freedom to write programs.  The League is not
 opposed to the legal system that Congress expressly established for
 software--copyright on individual programs.  Our aim is to reverse the
 recent changes that prevent programmers from doing their work.
 The League works to abolish the new monopolies by publishing articles,
 talking with public officials, denouncing egregious offenders, and
 filing amicus curiae briefs, most notably against Lotus in its suit
 against Borland.  We testified twice at the recent Patent Office
 hearings on software patents.  We welcome suggestions for other
 activities, as well as help in carrying them out.
 (Added 2003) The League for Programming Freedom is inactive nowadays,
 though its web site www.programming-freedom.org is still maintained.
 It would be very useful to find a person who could take the initiative
 to get the LPF operating again.  It will be a substantial job,
 requiring persistence and working with a lawyer.  If you want to do
 it, please write to rms@gnu.org.
--- a/etc/MACHINES
+++ b/etc/MACHINES
@ -1,3 +1,9 @@
 Emacs machines list
 Copyright (c) 1989, 1990, 1992, 1993, 1998, 2001, 2003, 2006
 Free software Foundation, Inc.
 See the end of the file for copying permissions.
 This is a list of the status of GNU Emacs on various machines and systems.
 For each system and machine, we give the configuration name you should
@ -1470,5 +1476,17 @@ mode: indented-text
 fill-prefix: "  "
 End:
 COPYING PERMISSIONS:
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this file, to deal in the file without restriction, including
    without limitation the rights to use, copy, modify, merge, publish,
    distribute, sublicense, and/or sell copies of the file, and to
    permit persons to whom the file is furnished to do so, subject to
    the following condition:
    The above copyright notice and this permission notice shall be
    included in all copies or substantial portions of the file.
 arch-tag: 7d2e93c7-e982-40ec-9055-3cd064042473
--- a/etc/MAILINGLISTS
+++ b/etc/MAILINGLISTS
@ -1,8 +1,10 @@
      GNU Project Electronic Mailing Lists and gnUSENET Newsgroups
-			Last Updated 2004-10-19
+			Last Updated 2006-06-03
 	   Please report improvements to: gnu@gnu.org
  See the end of this file for copyright notice and copying conditions
 * Mailing list archives
 The GNU mailing lists are archived at http://lists.gnu.org.
@ -316,4 +318,18 @@ mode: outline
 fill-column: 72
 End:
 Copyright (c) 1999, 2003, 2004, 2006
 Free software Foundation, Inc.
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this file, to deal in the file without restriction, including
    without limitation the rights to use, copy, modify, merge, publish,
    distribute, sublicense, and/or sell copies of the file, and to
    permit persons to whom the file is furnished to do so, subject to
    the following condition:
    The above copyright notice and this permission notice shall be
    included in all copies or substantial portions of the file.
 arch-tag: 6e42bba8-7532-4a23-8486-99dbc5770a8e
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@ -1,4 +1,7 @@
 More Neat Stuff for your Emacs
 Copyright (c) 1993, 1999, 2003, 2004, 2005, 2006 
 Free software Foundation, Inc.
 See the end of the file for copying permissions.
 This file describes GNU Emacs programs and resources that are
 maintained by other people.  Some of these may become part of the
@ -276,4 +279,12 @@ mode: view
 eval: (goto-address)
 End:
 COPYING PERMISSIONS
    Permission to use, copy, modify, and distribute this
    software and its documentation for any purpose and without
    fee is hereby granted, provided that the above copyright
    notice appear in all copies and that both that copyright
    notice and this permission notice appear in supporting
    documentation.
 arch-tag: c1d4e7c8-db85-44e6-909e-659e2b20fefa
--- a/etc/MOTIVATION
+++ b/etc/MOTIVATION
@ -7,6 +7,9 @@ Special to the Boston Globe
 [reprinted with permission of the author
 from the Monday 19 January 1987 Boston Globe]
 Verbatim copying and distribution is permitted in any medium
 provided this notice is preserved.
 In the laboratory, rats get Rice Krispies.  In the classroom the top
 students get A's, and in the factory or office the best workers get
 raises.  It's an article of faith for most of us that rewards promote
--- a/etc/NEWS
+++ b/etc/NEWS
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
--- a/etc/NEWS.18
+++ b/etc/NEWS.18
@ -1,8 +1,10 @@
 GNU Emacs NEWS -- history of user-visible changes.  17-Aug-1988
-Copyright (C) 1988 Free Software Foundation, Inc.
+Copyright (C) 1988, 2006 Free Software Foundation, Inc.
 See the end for copying conditions.
-For older news, see the file ONEWS.2.
+This file is about changes in emacs version 18.
 Changes in version 18.52.
@ -111,6 +113,8 @@ The second is used with the window system: it iconifies the Emacs window.
 ** VMS: the new function `define-logical-name' allows you to create
 job-wide logical names.  The old function `define-dcl-symbol' has been
 removed.
 Changes in version 18.50.
@ -166,6 +170,8 @@ Emacs run.  End of file causes Emacs to exit.
 These variables cannot really work because the 24-bit range of an
 integer in (most ports of) GNU Emacs is not large enough to hold their
 values on many systems.
 Changes in version 18.45, since version 18.41.
@ -221,6 +227,8 @@ case.  You can use either upper or lower case indiscriminately.
 This is a new name for the function formerly called
 `define-logical-name'.
 Editing Changes in Emacs 18
@ -798,6 +806,7 @@ can put in requests at the same time.
 The client/server work only on Berkeley Unix, since they use the Berkeley
 sockets mechanism for their communication.
 Changes in Lisp programming in Emacs version 18.
@ -1586,13 +1595,13 @@ LD_SWITCH_MACHINE can be defined by the m- file to specify extra `ld' switches.
 C_DEBUG_SWITCH defines the switches to give `cc' when debugging.  Default `-g'.
 C_OPTIMIZE_SWITCH defines the switches to give `cc' to optimize.  Default `-O'.
 C_SWITCH_MACHINE can be defined by the m- file to specify extra `cc' switches.
 For older news, see the file ONEWS.2.
 ----------------------------------------------------------------------
 Copyright information:
-Copyright (C) 1988 Free Software Foundation, Inc.
+Copyright (C) 1988, 2006 Free Software Foundation, Inc.
   Permission is granted to anyone to make or distribute verbatim copies
   of this document as received, in any medium, provided that the
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@ -1,10 +1,14 @@
 GNU Emacs NEWS -- history of user-visible changes.  1992.
-Copyright (C) 1995, 2001 Free Software Foundation, Inc.
+Copyright (C) 1993, 1994, 1995, 2001, 2006 Free Software Foundation, Inc.
 See the end for copying conditions.
-For older news, see the file ONEWS.4.
+This file is about changes in emacs versions 19.
 * Emacs 19.34 is a bug-fix release with no user-visible changes.
 * Changes in Emacs 19.33.
@ -14,6 +18,8 @@ mode should do that--it is the user's choice.)
 ** The variable normal-auto-fill-function specifies the function to
 use for auto-fill-function, if and when Auto Fill is turned on.
 Major modes can set this locally to alter how Auto Fill works.
 * Editing Changes in Emacs 19.32
@ -255,6 +261,7 @@ cited text to hide is now customizable.
 The Gnus manual has been expanded.  It explains all these new features
 in greater detail.
 * Lisp Changes in Emacs 19.32
@ -279,6 +286,8 @@ name.  In such a case, you should give that alias symbol a non-nil
 menu-alias property.  That property tells the menu system to look for
 equivalent keys for the real name instead of equivalent keys for the
 alias.
 * Editing Changes in Emacs 19.31
@ -583,6 +592,7 @@ implementation of Emacs timers, see below).
 **** `M-x list-colors-display' displays all the available colors.
 **** The `TPU-EDT' package works.
 * Lisp changes in Emacs 19.31.
@ -1290,6 +1300,7 @@ new file should include all the special entries from the old one.
 This new file is under active development as part of the ncurses
 project.  If you have any questions about this file, or problems with
 an entry in it, email terminfo@ccil.org.
 * Lisp changes in Emacs 19.30.
@ -1453,6 +1464,8 @@ sequence containing the events that were used to invoke the command.
 ** The environment variable NAME, if set, now specifies the value of
 (user-full-name), when Emacs starts up.
 * User Editing Changes in Emacs 19.29
@ -2155,6 +2168,7 @@ bibtex-sort-ignore-string-entries is now t.
 used reference types are now on control-modified keys, mediocre used
 types are on unmodified keys, seldom used types are on shift-modified
 keys and almost never used types on meta-modified keys.
 * Configuration Changes in Emacs 19.29
@ -2171,6 +2185,7 @@ automatically enable X support if X is installed on your machine.)
 mail-host-address to a string in the dumped Emacs, that string becomes
 the default host address for initializing user-mail-address.
 It is used instead of the value of (system-name).
 * Lisp-Level Changes in Emacs 19.29
@ -2906,6 +2921,8 @@ three integers.)
 **** The new function encode-time converts specific items of time
 information--the second, minute, hour, day, month, year, and time
 zone--into a time value.
 * Changes in Emacs 19.27
@ -2921,6 +2938,8 @@ reach the end of a subnode, SPC moves into the next subnode, and so
 on.
 DEL more or less scrolls through the same text in reverse order.
 * User Editing Changes in Emacs 19.26
@ -2998,6 +3017,7 @@ for asking for a list of the subcommands of C-c C-v.
 setting just one variable, user-mail-address.  This currently applies
 to posting news with GNUS and to making change log entries.  It may
 apply to additional Emacs features in the future.
 * Lisp-Level Changes in Emacs 19.26:
@ -3044,6 +3064,7 @@ delete-old-versions.
 other window for C-M-v to scroll.
 ** Note that the function fceiling was mistakenly documented as fceil before.
 * Changes in cc-mode.el in Emacs 19.26:
@ -3081,11 +3102,15 @@ other window for C-M-v to scroll.
 ** new buffer-local variable c-comment-start-regexp for (potential)
  flexibility in adding new modes based on cc-mode.el
 * Changes in Emacs 19.25
 The variable x-cross-pointer-shape (which didn't really exist) has
 been renamed to x-sensitive-text-pointer-shape, and now does exist.
 * Changes in Emacs 19.24
@ -3110,6 +3135,8 @@ s-region.el		Set region by holding shift.
 skeleton.el		Templates for statement insertion.
 soundex.el		Classifying words by how they sound.
 tempo.el		Template insertion with hotspots.
 * User Editing Changes in 19.23.
@ -3407,6 +3434,7 @@ debugged.
 *** A new command, top-level-nonstop, does not even stop for unwind-protect,
 as top-level would.
 * Changes in CC mode in Emacs 19.23.
@ -3577,6 +3605,7 @@ convention of VariableNamesWithoutUnderscoresButEachWordCapitalized.
  c-label-offset
  c-continued-statement-offset
  c-continued-brace-offset
 * Lisp programming changes in Emacs 19.23.
@ -3977,6 +4006,8 @@ Now the file version.el contains only the first two version numbers.
 The third component is now determined on the basis of the names of the
 existing executable files.  This means that version.el is not altered
 by building Emacs.
 * Changes in 19.22.
@ -4039,12 +4070,16 @@ greater than what it used to be.  It is the position between the two
 characters whose properties differ, which is one greater than the
 position of the first character found (while scanning back) with
 different properties.
 * User editing changes in version 19.21.
 ** ISO Accents mode supports four additional characters:
 A-with-ring (entered as /A), AE ligature (entered as /E),
 and their lower-case equivalents.
 * User editing changes in version 19.20.
 (See following page for Lisp programming changes.)
@ -4265,6 +4300,7 @@ whether `pushd' behaves like `cd' if no argument is given
 (`shell-pushd-dextract'), and only add directories to the directory
 stack if they are not already on it (`shell-pushd-dunique').  The
 configuration you choose should match the underlying shell, of course.
 * Emacs Lisp programming changes in Emacs 19.20.
@ -4442,6 +4478,8 @@ delete-region in comint-previous-matching-input.
 The input history retrieval commands still wrap-around the input ring, unlike
 Emacs command history.
 * Changes in version 19.19.
@ -4474,6 +4512,8 @@ taken.
 ** `%' no longer allows floating point arguments, since the results were often
 inconsistent with integer `%'.
 * Changes in version 19.18.
@ -4614,6 +4654,8 @@ of the directory containing the Emacs executable that was run.
 ** The new function minibuffer-window-active-p takes one argument, a
 minibuffer window, and returns t if the window is currently active.
 * Changes in version 19.17.
@ -4801,6 +4843,7 @@ argument FRAME, which specifies which frames it should affect.
  + If FRAME is a frame, then `delete-windows-on' only deletes windows on
    the given frame; other frames are unaffected.
 * Changes in version 19.16.
@ -4927,6 +4970,7 @@ in a singleton list when it first inserts the prefix, but doesn't
 insert the prefix when processing events whose PLACE-SYMBOLs are
 already thus enclosed.
 * Changes in version 19.15.
@ -4973,6 +5017,8 @@ it works the same in Emacs 18 and Emacs 19.
 (This change actually took place earlier, but we didn't know about it
 and thus didn't document it.)
 * Changes in version 19.14.
@ -5017,6 +5063,8 @@ and END that specify which part of the file to insert.  BEG defaults to
 0 (the beginning of the file), and END defaults to the end of the file.
 If you specify BEG or END, then the argument VISIT must be nil.
 * Changes in version 19.13.
@ -5035,11 +5083,15 @@ the search a case-sensitive one.
 C-c LETTER, since those keys are reserved for users.
 Those commands have been moved to C-c M-LETTER.
 We may move them again for greater consistency with other modes.
 * Changes in version 19.12.
 ** You can now make many of the sort commands ignore case by setting
 `sort-fold-case' to a non-nil value.
 * Changes in version 19.11.
@ -5057,6 +5109,8 @@ that you write.  This is what `basic-save-buffer' does when
 it writes a file in the usual way.
 (This is not actually new, but wasn't documented before.)
 * Changes in version 19.10.
@ -5069,6 +5123,8 @@ The reason for this change is to make function keys work after C-x.
 the region is highlighted in windows other than the selected window
 (in Transient Mark mode only, of course, and currently only when
 using X).
 * Changes in version 19.8.
@ -6458,14 +6514,13 @@ distribution, using the contents of the source tree.  Object files,
 old file versions, executables, DOC files, and other
 architecture-specific or easy-to-recreate files are not included in
 the tar file.
 * For older news, see the file ONEWS.4.  For Lisp changes in (the first
 * release of) Emacs 19, see the file LNEWS.
 ----------------------------------------------------------------------
 Copyright information:
-Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
+Copyright (C) 1993, 1994, 1995, 2001, 2006 Free Software Foundation, Inc.
   Permission is granted to anyone to make or distribute verbatim copies
   of this document as received, in any medium, provided that the
--- a/etc/NEWS.20
+++ b/etc/NEWS.20
--- a/etc/NEWS.21
+++ b/etc/NEWS.21
--- a/etc/ONEWS.1
+++ b/etc/ONEWS.1
--- a/etc/ONEWS.4
+++ b/etc/ONEWS.4
--- a/etc/ORDERS
+++ b/etc/ORDERS
@ -7,3 +7,8 @@ further development of Emacs and other free software programs.  You
 can also make tax-deductable donations to the Free Software Foundation,
 a not-for-profit organization (assuming you pay US taxes) - see
 <http://www.gnu.org/help/donate.html>.
 Copyright (c) 2000, 2001, 2006 Free Software Foundation, Inc.
 Verbatim copying and distribution is permitted in any medium
 provided this notice is preserved.
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@ -1690,7 +1690,7 @@ keys can serve as Meta.
 The `xkeycaps' also shows a visual representation of the current
 keyboard settings.  It also allows to modify them.
-*** GNU/Linux: low startup on Linux-based GNU systems.
+*** GNU/Linux: slow startup on Linux-based GNU systems.
 People using systems based on the Linux kernel sometimes report that
 startup takes 10 to 15 seconds longer than `usual'.
--- a/etc/README
+++ b/etc/README
@ -11,3 +11,19 @@ without installing the modified TeX versions.
 `termcap.src' is included mainly for VMS.  It is a copy of the
 `/etc/termcap' file used on Unix.
 Copyright (c) 1992, 1995, 2001, 2006
 Free Software Foundation, Inc.
 COPYING PERMISSIONS:
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this file, to deal in the file without restriction, including
    without limitation the rights to use, copy, modify, merge, publish,
    distribute, sublicense, and/or sell copies of the file, and to
    permit persons to whom the file is furnished to do so, subject to
    the following condition:
    The above copyright notice and this permission notice shall be
    included in all copies or substantial portions of the file.
--- a/etc/SERVICE
+++ b/etc/SERVICE
@ -2,6 +2,8 @@
 GNU Service Directory
 ---------------------
 See the end of file for copyright information.
 This is a list of people who have asked to be listed as offering
 support services for GNU software, including GNU Emacs, for a fee
 or in some cases at no charge.
@ -1365,4 +1367,12 @@ A current version should be available on our web site at http://www.gnu.org.
 ** Please keep the entries in this file alphabetical **
 Copyright (c) 2000, 2004, 2005, 2006 
 Free Software Foundation
    Verbatim copying and distribution of this document are permitted
    worldwide, without royalty, in any medium, provided this notice is
    preserved.
 arch-tag: 1253ce32-1cbd-428a-ac36-70ed9e3999fc
--- a/etc/TERMS
+++ b/etc/TERMS
@ -1,3 +1,7 @@
 Copyright (c) 1999, 2003, 2006
 Free software Foundation, Inc.
 See the end of the file for copying permissions.
 This file describes what you must or might want to do to termcap entries
 to make terminals work properly and efficiently with Emacs.  Information
 on likely problems with specific types of terminals appears at the end
@ -227,3 +231,20 @@ AT386|at386|386AT|386at|at/386 console,
 AT386-UL|at386-ul|386AT-UL|386at-ul|at/386 console,
 	is2=\E[0;10;38m,
 	use=at386,
 COPYING PERMISSIONS:
    This document is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
--- a/etc/TODO
+++ b/etc/TODO
@ -1,4 +1,8 @@
-                                                                -*-outline-*-
+Emacs TODO List                                                   -*-outline-*-
 Copyright (c) 2003, 2004, 2005, 2006
 Free software Foundation, Inc.
 See the end of the file for copying permissions.
 If you are ready to start working on any of these TODO items, we
 appreciate your help; please write to emacs-devel@gnu.org so we can be
@ -9,6 +13,10 @@ to the FSF.
 * Small but important fixes needed in existing features:
 ** In C-x d, the default if you type RET should be the directory name,
 but if you type M-n you should get the visited file name of the
 current buffer.
 ** whitespace-cleanup should work only on the region if the region is active.
 ** Distribute a bar cursor of width > 1 evenly between the two glyphs
@ -486,4 +494,16 @@ not be noticed if it appears within a word.
 ** Fix unexelf.c to handle the .data.rel and .data.rel.local
   sections made by GCC 3.4 on IRIX.
 COPYING PERMISSIONS:
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this file, to deal in the file without restriction, including
    without limitation the rights to use, copy, modify, merge, publish,
    distribute, sublicense, and/or sell copies of the file, and to
    permit persons to whom the file is furnished to do so, subject to
    the following condition:
    The above copyright notice and this permission notice shall be
    included in all copies or substantial portions of the file.
 ;;; arch-tag: b0a3e40b-726a-457d-9999-ba848321b036
--- a/etc/Xkeymap.txt
+++ b/etc/Xkeymap.txt
@ -1,5 +1,10 @@
 #						-*-Mode: Fundamental-*-
 # X keymap file for rlk with some emacsified bindings
 #
 # Copyright (c) 1999, 2003, 2006
 # Free software Foundation, Inc.
 # See the end of the file for copying conditions.
 #
 # This file contains the default keyboard mapping.  The first column contains a X keyboard code; the other
 # 16 columns contain the mapping of the keycode to a character string, with various combinations
 # of the SHIFT, LOCK, META, and CONTROL keys down.  See the man page for "keycomp" for more information.
@ -96,5 +101,16 @@
 # local variables:
 # tab-width: 4
 # End:
 #
 #  COPYING CONDITIONS
 #    Permission is hereby granted, free of charge, to any person obtaining
 #    a copy of this file, to deal in the file without restriction, including
 #    without limitation the rights to use, copy, modify, merge, publish,
 #    distribute, sublicense, and/or sell copies of the file, and to
 #    permit persons to whom the file is furnished to do so, subject to
 #    the following condition:
 #
 #    The above copyright notice and this permission notice shall be
 #    included in all copies or substantial portions of the file.
 # arch-tag: cbaa71af-719b-4647-a2c1-cd4d36a4fc64
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@ -1,4 +1,4 @@
-* Introduction  -*-compilation-*-
+* Introduction  -*-compilation-*-       (Copyright information at end of file)
 This shows the different kinds of messages compile recognizes by default and
 how they are rendered.  It is intended both to help you decide which matchers
@ -401,3 +401,23 @@ Compilation killed at Wed Jul 20 12:20:10
 Compilation terminated at Wed Jul 20 12:20:10
 Compilation exited abnormally with code 1 at Wed Jul 20 12:21:12
 Compilation finished at Thu Jul 21 15:02:15
 Copyright (c) 2004, 2005, 2006
 Free software Foundation, Inc.
 COPYING PERMISSIONS:
    This document is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
--- a/etc/de-refcard.tex
+++ b/etc/de-refcard.tex
@ -1,12 +1,28 @@
-% Reference Card for GNU Emacs version 19 on Unix systems
+% Reference Card for GNU Emacs version 22 on Unix systems
 %
 % Translation into German by Sven Joachim <svenjoac@gmx.de>
 %
 %**start of header
 \newcount\columnsperpage
 \newcount\letterpaper
 % This file can be printed with 1, 2, or 3 columns per page (see below).
-% Specify how many you want here.  Nothing else needs to be changed.
+% Specify how many you want here.
-\columnsperpage=2
+\columnsperpage=3
 % Set letterpaper to 0 for A4 paper, 1 for letter (US) paper.  Useful
 % only when columnsperpage is 2 or 3.
 \letterpaper=0
 % If you don't have german.sty, you can either get it from CTAN or
 % change the \glqq and \grqq commands below.
 \input german.sty
 \mdqoff               % deactivates the "-char
 % Nothing else needs to be changed below this line.
 % Copyright (C) 1987, 1993, 1996, 2000, 2002, 2003, 2004,
 %   2005, 2006 Free Software Foundation, Inc.
@ -43,6 +59,10 @@
 %    For this you need a dvi device driver that can print sideways.
 % Which mode to use is controlled by setting \columnsperpage above.
 %
 % To compile and print this document:
 % tex de-refcard.tex
 % dvips -t landscape de-refcard.dvi
 %
 % Author:
 %  Stephen Gildea
 %  Internet: gildea@stop.mail-abuse.org
@ -52,23 +72,26 @@
 % If there were room, it would be nice to see a section on Dired.
-\def\versionnumber{2.1}
+\def\versionnumber{2.3}
 \def\year{2006}
 \def\version{March \year\ v\versionnumber}
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
  \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
-  Permissions on back.  v\versionnumber}}
+  Bedingungen auf der R\"uckseite.  v\versionnumber}}
 \def\copyrightnotice{\vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{designed by Stephen Gildea, \version}
+\centerline{v\versionnumber{} f\"ur GNU Emacs Version 22, \year}
-\centerline{for GNU Emacs version 19 on Unix systems}
+\centerline{entworfen von Stephen Gildea}
 % \centerline{deutsche \"Ubersetzung von Sven Joachim}
-Permission is granted to make and distribute copies of
+Es ist gestattet, diese Referenzkarte zu vervielf\"altigen und zu
-this card provided the copyright notice and this permission notice
+verbreiten, vorausgesetzt dass sich der Copyright-Hinweis und der
-are preserved on all copies.
+Hinweis auf diese Erlaubnis auf allen Kopien befinden.
 F\"ur Kopien des Handbuchs zu GNU Emacs schreiben Sie an die Free
 Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301 USA.
 \endgroup}
@ -104,9 +127,9 @@
  \hsize 3.2in
  \vsize 7.95in
 %  \hoffset -.75in
-  \hoffset -.82in
+  \hoffset -.49in
 %  \voffset -.745in
-  \voffset -.6in
+  \voffset -.84in
  \font\titlefont=cmbx10 \scaledmag2
  \font\headingfont=cmbx10 \scaledmag1
  \font\smallfont=cmr6
@ -174,7 +197,7 @@
 \chardef\{=`\{
 \chardef\}=`\}
-\hyphenation{mini-buf-fer}
+\hyphenation{Mini-puf-fer}
 \parindent 0pt
 \parskip 1ex plus .5ex minus .5ex
@ -190,8 +213,8 @@
 % section - new major section.  Argument is section name.
 \outer\def\section#1{\par\filbreak
-  \vskip 3ex plus 2ex minus 2ex {\headingfont #1}\mark{#1}%
+  \vskip 2ex plus 1.5ex minus 2.5ex {\headingfont #1}\mark{#1}%
-  \vskip 2ex plus 1ex minus 1.5ex}
+  \vskip 1.5ex plus 1ex minus 1.5ex}
 \newdimen\keyindent
@ -250,142 +273,146 @@
 %**end of header
-\title{GNU Emacs Referenzkarte}
+\title{Referenzkarte zu GNU Emacs}
-%\centerline{(fuer version 19)}
+\centerline{(f\"ur Version 22)}
-\section{Emacs Starten}
+\section{Emacs starten}
-Um GNU Emacs 19 zu starten, tippen Sie ein: \kbd{emacs}
+Um GNU Emacs 22 zu starten, geben Sie \kbd{emacs} ein.
-Um eine Datei fuers Editieren zu laden, lesen Sie unten weiter.
+% Um eine Datei f\"urs Editieren zu laden, lesen Sie unten weiter.
-\section{Emacs Verlassen}
+\section{Emacs verlassen}
-\key{Emacs pausieren lassen}{C-z}
+\key{Emacs unterbrechen (unter X: minimieren)}{C-z}
 \key{Emacs beenden}{C-x C-c}
 \section{Dateien}
-\key{Datei {\bf oeffnen} }{C-x C-f}
+\key{Datei {\bf \"offnen} }{C-x C-f}
-\key{Datei {\bf sichern} }{C-x C-s}
+\key{Datei {\bf speichern} }{C-x C-s}
-\key{{\bf alle} Dateien sichern}{C-x s}
+\key{{\bf alle} Dateien speichern}{C-x s}
-\key{den Inhalt einer anderen Datei {\bf einfuegen}}{C-x i}
+\key{den Inhalt einer anderen Datei {\bf einf\"ugen}}{C-x i}
 \key{diese Datei durch eine andere ersetzen}{C-x C-v}
-\key{Datei neu anlegen und speichern}{C-x C-w}
+\key{Puffer in neuer Datei speichern}{C-x C-w}
-\key{version control ein/auschecken}{C-x C-q}
+\key{Nur-Lesen-Modus des Puffers wechseln}{C-x C-q}
 \section{Hilfe}
-Das Hilfesystem ist einfach zu bedienen.  Tippen Sie \kbd{C-h} (oder \kbd{F1}). Neulinge tippen \kbd{C-h t} um ein {\bf tutorial} zu starten.
+Das Hilfesystem ist einfach zu bedienen.  Dr\"ucken Sie \kbd{C-h} (oder
 \kbd{F1}).  Neulinge dr\"ucken \kbd{C-h t}, um eine {\bf Einf\"uhrung} zu
 starten.
-\key{Hilfe Fenster entfernen}{C-x 1}
+\key{Hilfefenster entfernen}{C-x 1}
-\key{Hilfe Fenster scrollen}{C-M-v}
+\key{Hilfefenster scrollen}{C-M-v}
-\key{apropos: zeigt alle Befehle mit dem Muster}{C-h a}
+\key{Befehle zeigen, die Zeichenkette enthalten}{C-h a}
-\key{zeigt die Funktion mit dieser Tastenkomb.}{C-h c}
+\key{Tastenkombination beschreiben}{C-h k}
-\key{beschreibt die Funktion}{C-h f}
+\key{eine Funktion beschreiben}{C-h f}
-\key{modusspezifische Information}{C-h m}
+\key{modusspezifische Informationen}{C-h m}
-\section{Was tun wenn nichts mehr geht}
+\section{Fehlerbehandlung}
 \key{{\bf Abbrechen} eines Vorgangs}{C-g}
-\metax{{\bf Wiederherstellung} von Dateien}{M-x recover-file}
+\metax{{\bf Wiederherstellung} von Dateien}{M-x recover-session}
-\key{{\bf rueckgaengig} machen}{C-x u}
+\metax{{\"Anderungen \bf r\"uckg\"angig} machen}{C-x u,  C-_ {\rm oder} C-/}
 \metax{Puffer in Ursprungszustand bringen}{M-x revert-buffer}
 \key{Bildschirmanzeige in Ordnung bringen}{C-l}
 \section{Inkrementelle Suche}
-\key{Suche vorwaerts}{C-s}
+\key{Suche vorw\"arts}{C-s}
-\key{Suche rueckwaerts}{C-r}
+\key{Suche r\"uckw\"arts}{C-r}
-\key{Suche mit regulaeren Ausdruecken}{C-M-s}
+\key{Suche mit regul\"aren Ausdr\"ucken}{C-M-s}
-\key{Rueckwaertssuche mit reg. Ausdruecken}{C-M-r}
+\key{R\"uckw\"artssuche mit regul\"aren Ausdr\"ucken}{C-M-r}
-\key{letzten Suchausdruck auswaehlen}{M-p}
+
-\key{spaeteren Suchausdruck auswaehlen}{M-n}
+\key{fr\"uheren Suchausdruck ausw\"ahlen}{M-p}
 \key{sp\"ateren Suchausdruck ausw\"ahlen}{M-n}
 \key{inkrementelle Suche beenden}{RET}
-\key{ein Suchzeichen zurueckgehen}{DEL}
+\key{ein Suchzeichen zur\"uckgehen}{DEL}
 \key{Suche abbrechen}{C-g}
-Wiederholtes Druecken von \kbd{C-s} oder \kbd{C-r} sucht weitere Treffer.
+Wiederholtes Dr\"ucken von \kbd{C-s} oder \kbd{C-r} sucht weitere Treffer.
 Wenn Emacs sucht, unterbricht \kbd{C-g} nur die jeweils letzte Suche.
 \shortcopyrightnotice
-\section{Cursor Bewegung}
+\section{Cursor-Bewegung}
 \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr
-\threecol{{\bf Textteile ueberspringen}}{{\bf rueckw.}}{{\bf vorw.}}
+\threecol{{\bf Textteile \"uberspringen}}{{\bf r\"uckw.}}{{\bf vorw.}}
 \threecol{Zeichen}{C-b}{C-f}
 \threecol{Wort}{M-b}{M-f}
 \threecol{Zeile}{C-p}{C-n}
-\threecol{zum Zeilenende springen}{C-a}{C-e}
+\threecol{zum Zeilenanfang (oder -ende) springen}{C-a}{C-e}
 \threecol{Satz}{M-a}{M-e}
 \threecol{Paragraph}{M-\{}{M-\}}
 \threecol{Seite}{C-x [}{C-x ]}
 \threecol{Lisp-s-expression}{C-M-b}{C-M-f}
 \threecol{Funktion}{C-M-a}{C-M-e}
-\threecol{zum Pufferanfang (oder Ende)springen}{M-<}{M->}
+\threecol{zum Pufferanfang (oder -ende) springen}{M-<}{M->}
 }
-\key{eine Bildschirmseite runter scrollen}{C-v}
+\key{eine Bildschirmseite herunter scrollen}{C-v}
 \key{eine Bildschirmseite hoch scrollen}{M-v}
 \key{nach links scrollen}{C-x <}
 \key{nach rechts scrollen}{C-x >}
-\key{Cursorzeile in die Bildschirmmitte scrollen}{C-u C-l}
+\key{Cursor-Zeile in die Bildschirmmitte scrollen}{C-u C-l}
-\section{Loeschen}
+\section{L\"oschen und Ausschneiden}
 \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr
-\threecol{{\bf Textteile }}{{\bf rueckwaerts}}{{\bf vorwaerts}}
+\threecol{{\bf Textteile ausschneiden}}{{\bf r\"uckw.}}{{\bf vorw.}}
-\threecol{Zeichen (loeschen)}{DEL}{C-d}
+\threecol{Zeichen (l\"oschen, nicht ausschneiden)}{DEL}{C-d}
 \threecol{Wort}{M-DEL}{M-d}
 \threecol{Zeile (bis zum Ende)}{M-0 C-k}{C-k}
 \threecol{Satz}{C-x DEL}{M-k}
 \threecol{Lisp-s-expression}{M-- C-M-k}{C-M-k}
 }
-\key{{\bf Bereiche} loeschen}{C-w}
+\key{{\bf Bereich} ausschneiden}{C-w}
 \key{Bereich in die Ablage kopieren}{M-w}
-\key{Bis zum {\it Zeichen} loeschen }{M-z {\it Zeichen}}
+\key{bis zum {\it Zeichen} ausschneiden }{M-z {\it Zeichen}}
-\key{letztes geloeschtes Zeichen einsetzen}{C-y}
+\key{zuletzt ausgeschnittenen Text einf\"ugen}{C-y}
-\key{eins davor einsetzen}{M-y}
+\key{vorher ausgeschnittenen Text einf\"ugen}{M-y}
 \section{Markieren}
-\key{Marke setzen}{C-@ {\rm or} C-SPC}
+\key{Marke setzen}{C-@ {\rm oder}\thinspace\thinspace{}C-SPC} % H\"asslich, aber
-\key{zwischen Cursor und Marke wechseln}{C-x C-x}
+% Leerzeichen statt \thinspace erzeugt overfull \hbox. @#$?*&!
 \key{Cursor und Marke austauschen}{C-x C-x}
 \key{Marke {\it Argument\/} {\bf Worte} entfernt setzen}{M-@}
 \key{{\bf Paragraph} markieren}{M-h}
 \key{{\bf Seite} markieren}{C-x C-p}
 \key{{\bf Lisp-s-expression} markieren}{C-M-@}
-\key{{\bf Funktion} markiern}{C-M-h}
+\key{{\bf Funktion} markieren}{C-M-h}
 \key{den ganzen {\bf Puffer} markieren}{C-x h}
 \section{Interaktives Ersetzen}
 \key{Zeichenkette interaktiv ersetzen}{M-\%}
-\metax{mit regulaeren Ausdruecken}{M-x query-replace-regexp}
+\metax{mit regul\"aren Ausdr\"ucken}{M-x query-replace-regexp}
-Moegliche Antworten in diesem Modus:
+M\"ogliche Antworten in diesem Modus:
-\key{dies {\bf ersetzten} und zum naechsten gehen}{SPC}
+\key{dies {\bf ersetzen} und zum n\"achsten gehen}{SPC}
-\key{dies ersetzen}{,}
+\key{dies ersetzen und nicht weitergehen}{,}
-\key{dies {\bf ueberspringen}, zum naechsten gehen}{DEL}
+\key{dies {\bf \"uberspringen}, zum n\"achsten gehen}{DEL}
 \key{alle verbleibenden Treffer ersetzen}{!}
-\key{eine Ersetzung{\bf rueckgaengig} machen }{^}
+\key{zum vorherigen Treffer {\bf zur\"uckgehen} }{^}
-\key{interaktiven Modus{\bf verlassen}}{RET}
+\key{interaktives Ersetzen {\bf beenden}}{RET}
-\key{rekursiven Modus starten (\kbd{C-M-c} verlassen)}{C-r}
+\key{rekursives Editieren starten (\kbd{C-M-c} beendet)}{C-r}
 \section{Mehrere Fenster}
-Die zweite Tastenk. bezieht sich immer auf das andere Fenster:
+Wenn zwei Befehle angezeigt werden, ist der zweite ein \"ahn\-li\-cher f\"ur
-
+einen Rahmen statt eines Fensters.
 \key{alle anderen Fenster in den Hintergrund}{C-x 1}
 {\setbox0=\hbox{\kbd{0}}\advance\hsize by 0\wd0
 \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr
 \threecol{alle anderen Fenster schlie\ss{}en}{C-x 1\ \ \ \ }{C-x 5 1}
 \threecol{Fenster vertikal teilen}{C-x 2\ \ \ \ }{C-x 5 2}
-\threecol{dieses Fenster loeschen}{C-x 0\ \ \ \ }{C-x 5 0}
+\threecol{dieses Fenster schlie\ss{}en}{C-x 0\ \ \ \ }{C-x 5 0}
 }}
 \key{Fenster horizontal teilen}{C-x 3}
@ -393,252 +420,273 @@ \section{Mehrere Fenster}
 {\setbox0=\hbox{\kbd{0}}\advance\hsize by 2\wd0
 \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr
-\threecol{ins andere Fenster wechseln}{C-x o}{C-x 5 o}
+\threecol{in anderes Fenster wechseln}{C-x o}{C-x 5 o}
-\threecol{Puffer in ein anderes Fenster bringen}{C-x 4 b}{C-x 5 b}
+\threecol{Puffer in and. Fenster ausw\"ahlen}{C-x 4 b}{C-x 5 b}
-\threecol{Puffer in einem anderen Fenster darstellen}{C-x 4 C-o}{C-x 5 C-o}
+\threecol{Puffer in anderem Fenster anzeigen}{C-x 4 C-o}{C-x 5 C-o}
-\threecol{Datei in ein anderes Fenster oeffnen}{C-x 4 f}{C-x 5 f}
+\threecol{Datei in anderem Fenster \"offnen}{C-x 4 f}{C-x 5 f}
-\threecol{Datei im Ansichtmodus in anderem Fenster oeffnen}{C-x 4 r}{C-x 5 r}
+\threecol{Datei in anderem Fenster anzeigen}{C-x 4 r}{C-x 5 r}
-\threecol{Dired in einem anderen Fenster oeffnen}{C-x 4 d}{C-x 5 d}
+\threecol{Dired in anderem Fenster starten}{C-x 4 d}{C-x 5 d}
-\threecol{Tag in einem anderen Fenster finden}{C-x 4 .}{C-x 5 .}
+\threecol{Tag in anderem Fenster finden}{C-x 4 .}{C-x 5 .}
 }}
-\key{Fenster vergroessern}{C-x ^}
+\key{Fenster vergr\"o\ss{}ern}{C-x ^}
-\key{Fenster schmaler machen}{C-x \{}
+\key{Fenster verengen}{C-x \{}
-\key{Fenster breiter machen}{C-x \}}
+\key{Fenster verbreitern}{C-x \}}
-\section{Formattierung}
+\section{Formatierung}
-\key{{\bf Zeile} (modusabhaengig) einruecken}{TAB}
+\key{{\bf Zeile} (modusabh\"angig) einr\"ucken}{TAB}
-\key{{\bf Bereich} (modusabh.) einruecken}{C-M-\\}
+\key{{\bf Bereich} (modusabh\"angig) einr\"ucken}{C-M-\\}
-\key{{\bf Lisp-s-expression} (modusabh.) einruecken}{C-M-q}
+\key{{\bf Lisp-s-expression} (modusabh.) einr\"ucken}{C-M-q}
-\key{Bereich {\it Argument\/} Spalten einruecken}{C-x TAB}
+\key{Bereich {\it Argument\/} Spalten einr\"ucken}{C-x TAB}
-\key{Zeilenumbruch nach Cursor einfuegen}{C-o}
+
 \key{Zeilenumbruch nach Cursor einf\"ugen}{C-o}
 \key{Zeilenrest vertikal nach unten verschieben}{C-M-o}
-\key{Leerzeilen um Cursorposition loeschen}{C-x C-o}
+\key{Leerzeilen um Cursor-Position l\"oschen}{C-x C-o}
-\key{Zeile mit letzter verbinden (Arg. naechster)}{M-^}
+\key{Zeile mit voriger verbinden (Arg. n\"achste)}{M-^}
-\key{Leerzeichen an Cursorposition loeschen}{M-\\}
+\key{alle Leerzeichen um Cursor-Position l\"oschen}{M-\\}
-\key{ein Leerzeichen an Cursorposition setzen}{M-SPC}
+\key{genau ein Leerzeichen an Cursor-Position}{M-SPC}
 \key{Paragraph auffuellen}{M-q}
 \key{Fuell Spalte setzen}{C-x f}
 \key{Praefix setzen fuer jede Zeile}{C-x .}
 \key{Zeichendarstellung setzen}{M-g}
-\section{Gross-Kleinbuchstaben}
+\key{Paragraph auff\"ullen}{M-q}
 \key{Spalte f\"ur Umbruch setzen}{C-x f}
 \key{Pr\"afix f\"ur jede Zeile setzen}{C-x .}
-\key{Wort in Grossbuchstaben}{M-u}
+\key{Face setzen}{M-o}
 \section{Gro\ss{}- und Kleinschreibung}
 \key{Wort in Gro\ss{}buchstaben}{M-u}
 \key{Wort in Kleinbuchstaben}{M-l}
-\key{Word mit grossen Anfangsbuchstaben}{M-c}
+\key{Wort mit gro\ss{}em Anfangsbuchstaben}{M-c}
-\key{Bereich in Grossbuchstaben}{C-x C-u}
+\key{Bereich in Gro\ss{}buchstaben}{C-x C-u}
 \key{Bereich in Kleinbuchstaben}{C-x C-l}
 \section{Der Minipuffer}
-Die folgenden Tastenkombination gelten im Minipuffer:
+Die folgenden Tastenkombinationen gelten im Minipuffer:
-\key{so viel wie moeglich ergaenzen}{TAB}
+\key{so weit wie m\"oglich erg\"anzen}{TAB}
-\key{ein Wort ergaenzen}{SPC}
+\key{ein Wort erg\"anzen}{SPC}
-\key{ergaenzen und ausfuehren}{RET}
+\key{erg\"anzen und ausf\"uhren}{RET}
-\key{moegliche Ergaenzungen zeigen}{?}
+\key{m\"ogliche Erg\"anzungen zeigen}{?}
-\key{letzte Eingabe wiederanzeigen}{M-p}
+\key{letzte Eingabe zur\"uckholen}{M-p}
-\key{spaetere Eingabe wiederanzeigen}{M-n}
+\key{sp\"atere Eingabe zur\"uckholen}{M-n}
-\key{reg. Ausd. rueckwaerts in History suchen}{M-r}
+\key{reg. Ausd. r\"uckw\"arts in History suchen}{M-r}
-\key{reg. Ausd. vorwaerts in History suchen}{M-s}
+\key{reg. Ausd. vorw\"arts in History suchen}{M-s}
-\key{Vorgang unterbrechen}{C-g}
+\key{Befehl abbrechen}{C-g}
-Tippen Sie  \kbd{C-x ESC ESC} um den letzten Befehl zu editieren und zu wiederholen der im Minipuffer ausgefuehrt wurde.
+Dr\"ucken Sie \kbd{C-x ESC ESC}, um den letzten Befehl zu bearbeiten
 und zu wiederholen, der im Minipuffer aus\-gef\"uhrt wurde. Dr\"u\-cken Sie
 \kbd{F10}, um die Men\"u\-zei\-le im Minipuffer zu aktivieren.
 \newcolumn
-\title{GNU Emacs Referenzkarte}
+\title{Referenzkarte zu GNU Emacs}
 \section{Puffer}
-\key{anderen Puffer auswaehlen}{C-x b}
+\key{anderen Puffer ausw\"ahlen}{C-x b}
-\key{alle Puffer anzeigen}{C-x C-b}
+\key{Liste aller Puffer anzeigen}{C-x C-b}
-\key{Puffer loeschen}{C-x k}
+\key{einen Puffer schlie\ss{}en}{C-x k}
 \section{Vertauschen}
-\key{ {\bf Zeichen} vertauschen}{C-t}
+\key{{\bf Zeichen} vertauschen}{C-t}
-\key{ {\bf Worte} vertauschen}{M-t}
+\key{{\bf Worte} vertauschen}{M-t}
-\key{ {\bf Zeilen} vertauschen}{C-x C-t}
+\key{{\bf Zeilen} vertauschen}{C-x C-t}
-\key{ {\bf Lisp-s-expressions} vertauschen}{C-M-t}
+\key{{\bf Lisp-s-expressions} vertauschen}{C-M-t}
-\section{Rechtschreibkorrrektur}
+\section{Rechtschreibpr\"ufung}
-\key{Ueberpruefe aktuelles Wort}{M-\$}
+\key{aktuelles Wort \"uberpr\"ufen}{M-\$}
-\metax{Ueberpruefe alle Woerter in Bereich}{M-x ispell-region}
+\metax{alle W\"orter im Bereich \"uberpr\"ufen}{M-x ispell-region}
-\metax{Ueberpruefe den gesamten Bereich}{M-x ispell-buffer}
+\metax{gesamten Puffer \"uberpr\"ufen}{M-x ispell-buffer}
 \section{Tags}
 \key{Tag finden (Definition)}{M-.}
-\key{Naechstes Vorkommen von Tag finden}{C-u M-.}
+\key{n\"achstes Vorkommen von Tag finden}{C-u M-.}
-\metax{Neue Tags Datei angeben}{M-x visit-tags-table}
+\metax{neue Tagsdatei angeben}{M-x visit-tags-table}
-\metax{Regulaere Ausdruck Suche in Dateien}{M-x tags-search}
+
-\metax{Interakt. Ersetzen in allen Dateien}{M-x tags-query-replace}
+\metax{regul\"aren Ausdruck in Dateien suchen}{M-x tags-search}
-\key{Letzte Tag Suche oder Ersetzen nochmal}{M-,}
+\metax{interakt. Ersetzen in allen Dateien}{M-x tags-query-replace}
 \key{letztes Suchen oder Ersetzen fortsetzen}{M-,}
 \section{Shells}
-\key{Shell Kommando ausfuehren}{M-!}
+\key{Shellbefehl ausf\"uhren}{M-!}
-\key{Shell Kommando fuer bereich ausfuehren}{M-|}
+\key{Shellbefehl f\"ur Bereich ausf\"uhren}{M-|}
-\key{Bereich durch Shell Kommando filtern}{C-u M-|}
+\key{Bereich durch Shellbefehl filtern}{C-u M-|}
-\metax{Shell im Fenster \kbd{*shell*} starten}{M-x shell}
+\metax{eine Shell im Fenster \kbd{*shell*} starten}{M-x shell}
 \section{Rechtecke}
-\key{Kopiere Rechteck in Register}{C-x r r}
+\key{Rechteck in Register kopieren}{C-x r r}
-\key{Loesche Rechteck}{C-x r k}
+\key{Rechteck ausschneiden}{C-x r k}
-\key{Rechteck einsetzen}{C-x r y}
+\key{Rechteck einf\"ugen}{C-x r y}
-\key{Rechteck aufmachen, Text nach rechts}{C-x r o}
+\key{Rechteck \"offnen, Text nach rechts}{C-x r o}
-\key{Rechteck mit Leerzeichen ueberschreiben}{C-x r c}
+\key{Rechteck mit Leerzeichen \"uberschreiben}{C-x r c}
-\key{Praefix vor jede Zeile setzen}{C-x r t}
+\key{Pr\"afix vor jede Zeile setzen}{C-x r t}
-\section{Abkuerzungen}
+\section{Abk\"urzungen}
-\key{globale Abkuerzung hinzufuegen}{C-x a g}
+\key{globale Abk\"urzung hinzuf\"ugen}{C-x a g}
-\key{modusabhaengige Abkuerzung hinzufuegen}{C-x a l}
+\key{modusabh\"angige Abk\"urzung hinzuf\"ugen}{C-x a l}
-\key{globale Expansion fuer Abk. definieren}{C-x a i g}
+\key{globalen Ersetzungstext f\"ur Abk. definieren}{C-x a i g}
-\key{modusabhaengige Abkuerzung definieren}{C-x a i l}
+\key{modusabh. Ersetzungstext f\"ur Abk. def.}{C-x a i l}
-\key{explizites Expandieren}{C-x a e}
+\key{Abk\"urzung explizit ausschreiben}{C-x a e}
 \key{letztes Wort dynamisch expandieren}{M-/}
-\section{Regulaere Ausdruecke}
+\key{letztes Wort dynamisch ausschreiben}{M-/}
-\key{jedes Zeichen ausser Zeilenumbruch}{. {\rm(Punkt)}}
+\section{Regul\"are Ausdr\"ucke}
-\key{Null oder mehr Wiederholungen}{*}
+
-\key{Eine oder mehr Wiederholungen}{+}
+\key{jedes einzelne Zeichen au\ss{}er Zeilenumbruch}{. {\rm(Punkt)}}
-\key{Null oder eine Wiederholung}{?}
+\key{null oder mehr Wiederholungen}{*}
-\key{jedes Zeichen in der Menge}{[ {\rm$\ldots$} ]}
+\key{eine oder mehr Wiederholungen}{+}
-\key{jedes Zeichen nicht in der Menge}{[^ {\rm$\ldots$} ]}
+\key{null oder eine Wiederholung}{?}
-\key{Zeilenanfang}{^}
+\key{Spezialzeichen {\it c\/} maskieren}{\\{\it c}}
-\key{Zeilenende}{\$}
+\key{Alternative (\glqq oder\grqq )}{\\|}
 \key{spezielles Zeichen maskieren {\it c\/}}{\\{\it c}}
 \key{Alternative (``oder'')}{\\|}
 \key{Gruppe}{\\( {\rm$\ldots$} \\)}
-\key{{\it n\/}te Gruppe}{\\{\it n}}
+\key{gleicher Text wie {\it n\/}te Gruppe}{\\{\it n}}
-\key{Pufferanfang}{\\`}
+\key{Anfang oder Ende eines Wortes}{\\b}
-\key{Pufferende}{\\'}
+\key{weder Anfang noch Ende eines Wortes}{\\B}
 \key{Wortzwischenraum}{\\b}
 \key{Weder Anfang noch Ende eines Wortes}{\\B}
 \key{Wortanfang}{\\<}
 \key{Wortende}{\\>}
 \key{jedes Wort-Syntax Zeichen}{\\w}
 \key{jedes Nicht-Wort-Syntax Zeichen}{\\W}
 \key{Zeichen mit Syntax {\it c}}{\\s{\it c}}
 \key{Zeichen nicht mit Syntax {\it c}}{\\S{\it c}}
-\section{Register}
+% \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr
 % \threecol{{\bf Einheit}}{{\bf passt am Anfang}\hskip-1.5ex}{{\bf passt am Ende}}
 % \threecol{Zeile}{^}{\$}
 % \threecol{Wort}{\\<}{\\>}
 % \threecol{Puffer}{\\`}{\\'}
-\key{Region in Register speichern}{C-x r s}
+% \threecol{{\bf Zeichenklasse}}{{\bf passt auf diese}}{{\bf passt auf andere}}
-\key{Register Inhalt in Puffer einfuegen}{C-x r i}
+% \threecol{Explizite Menge}{[ {\rm$\ldots$} ]}{[^ {\rm$\ldots$} ]}
-\key{Cursorposition in Register speichern}{C-x r SPC}
+% \threecol{Wortsyntax-Zeichen\hskip-10ex}{\\w}{\\W}
-\key{Springe zur abgespeicherten Position}{C-x r j}
+% \threecol{Zeichen mit Syntax {\it c}\hskip-2.5ex}{\\s{\it c}}{\\S{\it c}}
 % }
 \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr
 \threecol{{\bf Einheit}}{{\bf passt am Anf.}}{{\bf passt am Ende}}
 \threecol{Zeile}{^}{\$}
 \threecol{Wort}{\\<}{\\>}
 \threecol{Puffer}{\\`}{\\'}
 \threecol{{\bf Zeichenklasse}}{{\bf passt auf diese}}{{\bf passt auf and.}}
 \threecol{Explizite Menge}{[ {\rm$\ldots$} ]}{[^ {\rm$\ldots$} ]}
 \threecol{Wortsyntax-Zeichen}{\\w}{\\W}
 \threecol{Zeichen mit Syntax {\it c}}{\\s{\it c}}{\\S{\it c}}
 }
 \section{Internationale Zeichens\"atze}
 \key{Hauptsprache einstellen}{C-x RET l}
 \metax{Alle Eingabemethoden anzeigen}{M-x list-input-methods}
 \key{Eingabemethode in oder au\ss{}er Kraft setzen}{C-\\}
 \key{Kodierung f\"ur n\"achsten Befehl setzen}{C-x RET c}
 \metax{Alle Kodierungen anzeigen}{M-x list-coding-systems}
 \metax{bevorzugte Kodierung ausw\"ahlen}{M-x prefer-coding-system}
 \section{Info}
-\key{Info starten}{C-h i}
+\key{Info-Betrachter starten}{C-h i}
 \key{Funktion oder Variable in Info finden}{C-h S}
 \beginindentedkeys
 Bewegung innerhalb eines Knotens:
-\key{vorwaerts scrollen}{SPC}
+\key{vorw\"arts scrollen}{SPC}
-\key{rueckwaerts scrollen}{DEL}
+\key{r\"uckw\"arts scrollen}{DEL}
-\key{zum Anfang eines Knotens}{. {\rm (dot)}}
+\key{zum Anfang eines Knotens}{. {\rm (Punkt)}}
 Bewegung zwischen Knoten:
-\key{{\bf naechster} Knoten}{n}
+\key{{\bf n\"achster} Knoten}{n}
 \key{{\bf vorheriger} Knoten}{p}
 \key{nach {\bf oben}}{u}
-\key{Menue Element ueber Namen auswaehlen}{m}
+\key{Men\"ueintrag \"uber Namen ausw\"ahlen}{m}
-\key{{\it n\/}ten Menueeintrag auswaehlen (1--9)}{{\it n}}
+\key{{\it n\/}ten Men\"ueintrag ausw\"ahlen (1--9)}{{\it n}}
-\key{Kreuzverweis folgen  (zurueck mit \kbd{l})}{f}
+\key{Querverweis folgen (zur\"uck mit \kbd{l})}{f}
-\key{zurueck zum letzten gesehenen Knoten}{l}
+\key{zur\"uck zum letzten gesehenen Knoten}{l}
-\key{zurueck zum Verzeichnisknoten}{d}
+\key{zur\"uck zum Verzeichnisknoten}{d}
-\key{Knoten ueber Namen auswaehlen}{g}
+\key{zum Anfangsknoten der aktuellen Datei}{t}
 \key{beliebigen Knoten \"uber Namen ausw\"ahlen}{g}
-Sonstige:
+Sonstiges:
-\key{Info {\bf Tutorial} starten}{h}
+\key{{\bf Einf\"uhrung} in Info starten}{h}
-\key{Begriff in den Indices suchen}{i}
+\key{Begriff in den Indizes suchen}{i}
-\key{Knoten nach reg. Ausd. durchsuchen}{s}
+\key{nach regul\"aren Ausdr\"ucken suchen}{s}
 \key{Info {\bf verlassen} }{q}
 \endindentedkeys
-\section{Tastatur Makros}
+\section{Register}
-\key{Tastatur Makro Definition {\bf starten} }{C-x (}
+\key{Region in Register speichern}{C-x r s}
-\key{Tastatur Makro Definition {\bf beenden} }{C-x )}
+\key{Registerinhalt in Puffer einf\"ugen}{C-x r i}
-\key{zuletzt definiertes Tast. Makro {\bf ausfuehren}}{C-x e}
+\key{Cursor-Position in Register speichern}{C-x r SPC}
-\key{an letztes Tastatur Makro anhaengen}{C-u C-x (}
+\key{zu abgespeicherter Position springen}{C-x r j}
 \metax{letztes Tastatur Makro benennen}{M-x name-last-kbd-macro}
 \metax{Lisp Definition in Puffer einfuegen}{M-x insert-kbd-macro}
-\section{Kommandos fuer Emacs Lisp}
+\section{Tastaturmakros}
-\key{{\bf Lisp-s-expression} vor Cursor laden}{C-x C-e}
+\key{Makrodefinition {\bf starten} }{C-x (}
 \key{Makrodefinition {\bf beenden} }{C-x )}
 \key{zuletzt definiertes Makro {\bf ausf\"uhren}}{C-x e}
 \key{an letztes Makro anh\"angen}{C-u C-x (}
 \metax{letztes Makro benennen}{M-x name-last-kbd-macro}
 \metax{Lispcode f\"ur Makro in Puffer einf\"ugen}{M-x insert-kbd-macro}
 \section{Befehle f\"ur Emacs-Lisp}
 \key{{\bf Lisp-s-expression} vor Cursor auswerten}{C-x C-e}
 \key{aktuelle {\bf Definition} auswerten}{C-M-x}
 \metax{{\bf Bereich} auswerten}{M-x eval-region}
-\metax{gesamten {\bf Puffer} auswerten}{M-x eval-current-buffer}
+\key{Lisp-Ausdruck im Minipuffer auswerten}{M-:}
-\key{Lispausdruck im Minipuffer auswerten}{M-:}
+\metax{Datei aus Standardverzeichnis laden}{M-x load-library}
 \key{letztes Minipufferkommando auswerten}{C-x ESC ESC}
 \metax{Emacs Lisp Datei lesen und auswerten}{M-x load-file}
 \metax{aus Standard Systemverzeichnis laden}{M-x load-library}
-\section{Einfaches Konfigurieren}
+\section{Einfache Anpassungen}
-% Das ist nur was fuer Leute die Lisp beherrschen
+\metax{Variablen und Faces anpassen}{M-x customize}
-Ein Beispiel dafuer, wie man Tastenkombinationen definiert:
+% Das ist nur was f\"ur Leute die Lisp beherrschen
 Tastenkombinationen definieren (Beispiele):
 \beginexample%
 (global-set-key "\\C-cg" 'goto-line)
 (global-set-key "\\C-x\\C-k" 'kill-region)
 (global-set-key "\\M-\#" 'query-replace-regexp)
 \endexample
-So weist man in Emacs Lisp einer Variablen Werte zu:
+\section{Eigene Befehle schreiben}
 \beginexample%
-(setq backup-by-copying-when-linked t)
+(defun \<Befehlsname> (\<Argumente>)
-\endexample
+  "\<Dokumentation>"
-
+  (interactive "\<Vorlage>")
-\section{Selbst Kommandos schreiben}
+  \<Rumpf>)
 \beginexample%
 (defun \<Commando-Name> (\<args>)
  "\<Documentation>"
  (interactive "\<template>")
  \<body>)
 \endexample
 Ein Beispiel:
 \beginexample%
 (defun diese-Zeile-zum-Fensteranfang (Zeile)
-  "Zeile an Cursorposition zum Fensteranfang bewegen"
+  "Zeile an Cursor-Position zum Fensteranfang bewegen.
-Mit numerischem Argument n, zur Zeile n
+Mit ARGUMENT, Cursor in Zeile ARGUMENT bewegen."
 Mit negativem Argument zum Fensterende
  (interactive "P")
  (recenter (if (null Zeile)
                0
              (prefix-numeric-value Zeile))))
 \endexample
-Das Argument fuer \kbd{interactive} ist eine Zeichenkette, die spe\-zi\-fi\-ziert, wie die
+Die Spezifikation zu \kbd{interactive} gibt an, wie die Argumente
-Ar\-gu\-men\-te be\-reit\-ge\-stellt wer\-den, wenn die Funktion inter\-aktiv auf\-ge\-ru\-fen wird.
+gelesen werden, wenn die Funktion inter\-aktiv auf\-ge\-ru\-fen
-\kbd{C-h f interactive} fuer mehr Informationen.
+wird. F\"ur n\"ahere Details geben Sie \kbd{C-h f interactive} ein.
 \copyrightnotice
 \bye
 % Local variables:
-% compile-command: "tex refcard"
+% compile-command: "tex de-refcard"
 % End:
 % arch-tag: af0a2666-f289-49f1-a9cc-cedab9783314
--- a/etc/emacs.csh
+++ b/etc/emacs.csh
@ -1,3 +1,6 @@
 # Copyright (c) 1999, 2003, 2006
 # Free software Foundation, Inc.
 #
 # This defines a csh command named `edit' which resumes an
 # existing Emacs or starts a new one if none exists.
 # One way or another, any arguments are passed to Emacs to specify files
@ -24,4 +27,17 @@ alias edit 'set emacs_command=("emacs -nw \!*" "fg %emacs" "emacs -i \!* &"\
 test -S ~/.emacs_server && emacsclient \!* \
 || echo `pwd` \!* >! ~/.emacs_args && eval $emacs_command[$whichjob]'
 #COPYING PERMISSIONS:
 #
 #    Permission is hereby granted, free of charge, to any person obtaining
 #    a copy of this file, to deal in the file without restriction, including
 #    without limitation the rights to use, copy, modify, merge, publish,
 #    distribute, sublicense, and/or sell copies of the file, and to
 #    permit persons to whom the file is furnished to do so, subject to
 #    the following condition:
 #
 #    The above copyright notice and this permission notice shall be
 #    included in all copies or substantial portions of the file.
 # arch-tag: 433d58df-15b9-446f-ad37-f0393e3a23d4
--- a/etc/enriched.doc
+++ b/etc/enriched.doc
@ -254,3 +254,24 @@ bug reports are welcome.</indent>
 </x-color><x-bg-color><param>blue</param><x-color><param>white</param>April 1995; updated August 1997</x-color></x-bg-color>
 Copyright (c) 1995, 1997, 2006
 Free software Foundation, Inc.
 COPYING PERMISSIONS:
    This document is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
--- a/etc/fr-refcard.tex
+++ b/etc/fr-refcard.tex
@ -1,13 +1,19 @@
-
+% Reference Card for GNU Emacs version 22 on Unix systems
 % Reference Card for GNU Emacs version 21 on Unix systems
 %**start of header
 \newcount\columnsperpage
 \newcount\letterpaper
 % This file can be printed with 1, 2, or 3 columns per page (see below).
-% Specify how many you want here.  Nothing else needs to be changed.
+% Specify how many you want here.
-\columnsperpage=1
+\columnsperpage=3
 % Set letterpaper to 0 for A4 paper, 1 for letter (US) paper.  Useful
 % only when columnsperpage is 2 or 3.
 \letterpaper=1
 % Nothing else needs to be changed below this line.
 % Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
 %   2005, 2006 Free Software Foundation, Inc.
@ -44,6 +50,11 @@
 %    For this you need a dvi device driver that can print sideways.
 % Which mode to use is controlled by setting \columnsperpage above.
 %
 % To compile and print this document:
 % tex fr-refcard.tex
 % dvips -t landscape fr-refcard.dvi
 %
 % Author:
 %  Stephen Gildea
 %  Internet: gildea@stop.mail-abuse.org
@ -53,7 +64,7 @@
 % If there were room, it would be nice to see a section on Dired.
-\def\versionnumber{2.2}
+\def\versionnumber{2.3}
 \def\year{2006}
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
@ -63,7 +74,7 @@
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} pour GNU Emacs version 21, Juin \year}
+\centerline{v\versionnumber{} pour GNU Emacs version 22, \year}
 \centerline{conception de Stephen Gildea}
 \centerline{traduction fran\c{c}aise d'\'Eric Jacoboni}
@ -72,7 +83,7 @@
 toutes les copies.
 Pour les copies du manuel GNU Emacs, \'ecrivez \`a la Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
 \endgroup}
@ -107,6 +118,11 @@
 \else                           %2 or 3 columns uses prereduced size
  \hsize 3.2in
  \vsize 7.95in
  \if 1\the\letterpaper
     \vsize 7.95in
  \else
     \vsize 7.65in
  \fi
  \hoffset -.75in
  \voffset -.745in
  \font\titlefont=cmbx10 \scaledmag2
@ -127,6 +143,11 @@
  \def\it{\eightit}
  \def\tt{\eighttt}
  \normalbaselineskip=.8\normalbaselineskip
  \if 1\the\letterpaper
     \normalbaselineskip=.8\normalbaselineskip
  \else
     \normalbaselineskip=.7\normalbaselineskip
  \fi
  \normallineskip=.8\normallineskip
  \normallineskiplimit=.8\normallineskiplimit
  \normalbaselines\rm           %make definitions take effect
@ -257,11 +278,11 @@
 \title{Carte de r\'ef\'erence de GNU Emacs}
-\centerline{(pour la version 21)}
+\centerline{(pour la version 22)}
 \section{Lancement d'Emacs}
-Pour lancer GNU Emacs 21, il suffit de taper son nom : \kbd{emacs}
+Pour lancer GNU Emacs 22, il suffit de taper son nom : \kbd{emacs}
 Pour charger un fichier \`a \'editer, voir Fichiers, ci-dessous.
@ -278,7 +299,7 @@ \section{Fichiers}
 \key{{\bf ins\'erer} le contenu d'un autre fichier dans ce tampon}{C-x i}
 \key{remplacer ce fichier par le fichier voulu}{C-x C-v}
 \key{\'ecrire le tampon dans un fichier donn\'e}{C-x C-w}
-\key{contr\^ole de version}{C-x C-q}
+\key{bascule du mode lecture-seule du tampon}{C-x C-q}
 \section{Obtenir de l'aide}
@ -290,15 +311,15 @@ \section{Obtenir de l'aide}
 \key{faire d\'efiler la fen\^etre d'aide}{C-M-v}
 \key{apropos : montrer les commandes contenant une certaine cha\^\i{}ne}{C-h a}
-\key{montrer la fonction lanc\'ee par une touche}{C-h c}
+\key{d\'ecrire la fonction lanc\'ee par une touche}{C-h k}
 \key{d\'ecrire une fonction}{C-h f}
 \key{obtenir des informations sp\'ecifiques au mode}{C-h m}
 \section{R\'ecup\'eration des erreurs}
 \key{{\bf avorter} une commande partiellement tap\'ee ou ex\'ecut\'ee}{C-g}
-\metax{{\bf r\'ecup\'erer} un fichier perdu par un crash du syst\`eme}{M-x recover-file}
+\metax{{\bf r\'ecup\'erer} les fichier perdus par un crash du syst\`eme}{M-x recover-session}
-\key{{\bf annuler} une modification non souhait\'ee}{C-x u {\rm ou} C-_}
+\metax{{\bf annuler} une modification non souhait\'ee}{C-x u, C-_ {\rm ou} C-/}
 \metax{restaurer un tampon avec son contenu initial}{M-x revert-buffer}
 \key{r\'eafficher un \'ecran perturb\'e}{C-l}
@ -377,6 +398,8 @@ \section{Marquer}
 \section{Remplacement interactif}
 \key{remplacer interactivement une cha\^\i{}ne de texte}{M-\%}
 % query-replace-regexp est liee a C-M-% mais on ne peut pas le
 % taper dans une console.
 \metax{en utilisant les expressions rationnelles}{M-x query-replace-regexp}
 Les r\'eponses admises dans le mode de remplacement interactif sont :
@ -391,12 +414,12 @@ \section{Remplacement interactif}
 \section{Fen\^etres multiples}
-Lorsqu'il y a deux commandes, la seconde est pour l'"autre cadre".
+Lorsqu'il y a deux commandes, la seconde est une commande identique \`a
-
+la premi\`ere pour un cadre au lieu d'une fen\^etre.
 \key{supprimer toutes les autres fen\^etres}{C-x 1}
 {\setbox0=\hbox{\kbd{0}}\advance\hsize by 0\wd0
 \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr
 \threecol{supprimer toutes les autres fen\^etres}{C-x 1\ \ \ \ }{C-x 5 1}
 \threecol{diviser la fen\^etre horizontalement}{C-x 2\ \ \ \ }{C-x 5 2}
 \threecol{supprimer cette fen\^etre}{C-x 0\ \ \ \ }{C-x 5 0}
 }}
@ -438,7 +461,7 @@ \section{Formater}
 \key{placer la marge droite}{C-x f}
 \key{d\'efinir le pr\'efixe par lequel commencera chaque ligne}{C-x .}
-\key{d\'efinir la fonte}{M-g}
+\key{d\'efinir la fonte}{M-o}
 \section{Modifier la casse}
@ -554,7 +577,7 @@ \section{Expressions rationnelles}
 \section{Jeux de caract\`eres internationaux}
-\metax{indiquer la langue principale}{M-x set-language-environment}
+\key{indiquer la langue principale}{C-x RET l}
 \metax{montrer toutes les m\'ethodes de saisie}{M-x list-input-methods}
 \key{activer ou d\'esactiver la m\'ethode de saisie}{C-\\}
 \key{choisir le syst\`eme de codage pour la commande suivante}{C-x RET c}
@ -564,7 +587,7 @@ \section{Jeux de caract\`eres internationaux}
 \section{Info}
 \key{entrer dans le visualisateur de la documentation Info}{C-h i}
-\key{chercher une fonction ou une variable pr\'ecise dans Info}{C-h C-i}
+\key{chercher une fonction ou une variable pr\'ecise dans Info}{C-h S}
 \beginindentedkeys
 Se d\'eplacer dans un n\oe{}ud :
@ -583,12 +606,13 @@ \section{Info}
 \key{suivre une r\'ef\'erence crois\'ee  (on revient avec \kbd{l})}{f}
 \key{revenir au dernier n\oe{}ud visit\'e}{l}
 \key{revenir au n\oe{}ud du r\'epertoire}{d}
 \key{aller au n\oe{}ud de plus haut niveau du fichier Info}{t}
 \key{aller sur n'importe quel n\oe{}ud par son nom}{g}
 Autres :
 \key{lancer le {\bf didacticiel} Info}{h}
-\key{chercher dans l'index}{i}
+\key{chercher un sujet dans l'index}{i}
 \key{rechercher les n\oe{}uds avec une expression rationnelle}{s}
 \key{{\bf quitter} Info}{q}
--- a/etc/grep.txt
+++ b/etc/grep.txt
@ -1,4 +1,4 @@
-* Introduction  -*-grep-*-
+* Introduction  -*-grep-*-     (See the end of file for copyright information)
 This shows the different kinds of messages grep recognizes by default and
 how they are rendered.  It is intended both to help you decide which matchers
@ -85,3 +85,25 @@ grep -nH -e "xyzxyz" ../info/*
 ;;; Local Variables:
 ;;; buffer-read-only: t
 ;;; End:
 Copyright (c) 2005, 2006
 Free software Foundation, Inc.
 COPYING PERMISSIONS:
    This document is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
--- a/etc/ledit.l
+++ b/etc/ledit.l
@ -1,152 +0,0 @@
 ;;; -*- Mode: lisp -*-
 ; load in the c functions
 (removeaddress '_signal)
 (removeaddress '_switch_to_proc)
 (removeaddress '_set_proc_str)
 (cfasl "/src/mdc/ledit/leditcfns.o" '_switch_to_proc 'emacs)
 (getaddress '_set_proc_str 'set_proc_str)
 (declare (special *ledit-infile*               ; emacs->lisp tempfile
 		  *ledit-outfile*              ; lisp->emacs tempfile
 		  *ledit-ppfile*               ; pp->emacs tempfile
                  *ledit-lisztfile*            ; compiler input
                  *ledit-objfile*              ; compiler output
 		  *ledit-initialized*)         ; flag
 	 )
 (setq *ledit-initialized* nil)
 ;;; INIT-LEDIT
 (defun init-ledit ()
  (let ((user (getenv '|USER|)))		;USER must be uppercase
       (setq
 	 *ledit-outfile* (concat "/tmp/" user ".l2") ; lisp -> emacs
 	 *ledit-infile*  (concat "/tmp/" user ".l1") ; emacs -> lisp
 	 *ledit-ppfile*  (concat "/tmp/" user ".l3") ; pp output to emacs.
 	 *ledit-lisztfile*  (concat "/tmp/" user ".l4")
 	 *ledit-objfile*  (concat "/tmp/" user ".o")
 	 *ledit-initialized* t)))
 ;;; LEDIT
 ; if 1 arg, arg is taken as a tag name to pass to emacs.
 ; if 2 args, second arg is a keyword.  If 2nd arg is pp,
 ; pp is applied to first arg, and result is sent to emacs
 ; to put in a buffer called LEDIT (which is first erased.)
 (defun ledit fexpr (args)
    (apply #'ledit* args))
 ;;; LEDIT*
 (defun ledit* n
    (if (not *ledit-initialized*) (init-ledit))
    (ledit-output (listify n))
    (syscall 10. *ledit-infile*)        ; syscall 10 is "delete"
    (syscall 10. *ledit-lisztfile*)
    (emacs)
    (ledit-input)
    (syscall 10. *ledit-outfile*)
    (syscall 10. *ledit-ppfile*)
    t)
 ;;; LEDIT-OUTPUT
 ;;; Egad, what a mess!  Doesn't work for XEMACS yet.
 ;;; Here's an example from Mocklisp:
 ;;; -> (defun bar (nothing) (bar nothing))
 ;;; bar
 ;;; -> (ledit bar)
 ;;; should produce...
 ;;; (progn) (progn tag (setq tag "bar") (&goto-tag))
 ;;; and
 ;;; -> (ledit bar pp)
 ;;; should stuff this to emacs...
 ;;; (progn) (switch-to-buffer "LEDIT") (erase-buffer)
 ;;; (insert-file "/tmp/walter.l3") (lisp-mode)
 ;;; and this...
 ;;; (def bar
 ;;;   (lambda (x)
 ;;;    (bar nothing)))
 ;;; into *LEDIT*
 (defun ledit-output (args)
  (if args
      (let ((ofile (outfile *ledit-outfile*)))
 	   (format ofile "(progn)")             ; this is necessary.
 	   (cond ((null (cdr args)) ; no keyword -> arg is a tag.
 		  (format ofile "(progn tag (setq tag \"~A\"~
 			         (&goto-tag))"
 			         (car args)))
 		 ((eq (cadr args) 'pp)       ; pp-> pp first arg to emacs
 		      (apply 'pp `((|F| ,*ledit-ppfile*) ,(car args)))
 		      (format ofile "(switch-to-buffer \"LEDIT\")~
 				     (erase-buffer)")
 		      (format ofile "(insert-file \"~A\")"
 			             *ledit-ppfile*)
 		      (format ofile "(lisp-mode)"))
 		 (t (format t "~&~A -- unknown option~%" (cdr args))))
 	   (close ofile))))
 ;;; LISZT*
 ;;; Need this guy to do compile-input.
 ;;; Liszt returns 0 if all was well.
 ;;; Note that in ordinary use the user will have to get used to looking
 ;;; at "%Warning: ... Compiler declared *foo* special" messages, since
 ;;; you don't usually want to hunt around in your file, zap in the
 ;;; declarations, then go back to what you were doing.
 ;;; Fortunately this doesn't cause the compiler to bomb.
 ;;; Some sleepless night I will think of a way to get around this.
 (defun liszt* (&rest args)
   (apply #'liszt args))
 ;;; LEDIT-INPUT
 ;;; Although there are two cases here, in practice
 ;;; it is never the case that there is both input to be
 ;;; interpreted and input to be compiled.
 (defun ledit-input ()
  (if (probef *ledit-lisztfile*)
      (cond ((getd #'liszt)
 	     (format t ";Compiling LEDIT:")
 	     (and (zerop (liszt* *ledit-lisztfile* '-o *ledit-objfile*))
 		  (load *ledit-objfile*)))
 	    (t (format t ";Can't compile LEDIT: No liszt.~%;Reading instead:")
 	       (let ((ifile (infile *ledit-lisztfile*)))
 		 (ledit-load ifile)
 		 (close ifile)))))
  (if (probef *ledit-infile*)
      (let ((ifile (infile *ledit-infile*)))
 	(format t ";Reading from LEDIT:~%")
 	(ledit-load ifile)
 	(close ifile))))
 ;;; LEDIT-LOAD
 ;;; A generally useful form of load
 (defun ledit-load (ifile)
  (let ((eof-form (list 'eof-form)))
    (do ((form (read ifile eof-form) (read ifile eof-form)))
      ((eq form eof-form))
      (format t ";  ~A~%" (eval form)))))
 (setsyntax #/ 'macro 'ledit)                  ; make ^E = (ledit)<return>
 ;; more robust version of the c function set_proc_str. Does argument checking.
 ;; set_proc_str sets the string that is stuffed to the tty after franz pauses
 ;; and the csh wakes up. It is usually "%emacs" or "%vemacs" or "%?emacs"
 (defun set-proc-str (arg)
  (if (stringp arg)
    (set_proc_str arg)
    (if (symbolp arg)
      (set_proc_str (get-pname arg))
      (error arg " is illegal argument to set-proc-str"))))
 ;;; arch-tag: 2e76c01f-8d6a-4d04-b9ab-0eaabec96aee
--- a/etc/ms-7bkermit
+++ b/etc/ms-7bkermit
@ -1,3 +1,6 @@
 ;;; Copyright (c) 1999, 2003, 2006
 ;;; Free Software Foundation, Inc.
 ;;; This file is designed for 7-bit connections.
 ;;; Use the file ms-kermit if you have an 8-bit connection.
@ -311,4 +314,20 @@ set key \2463 \kendscn
 set key \2457 \kupscn
 set key \2465 \kdnscn
 ;;; COPYING PERMISSIONS:
 ;;; 
 ;;;   This document is free software; you can redistribute it and/or modify
 ;;;   it under the terms of the GNU General Public License as published by
 ;;;   the Free Software Foundation; either version 2 of the License, or
 ;;;   (at your option) any later version.
 ;;;
 ;;;   This program is distributed in the hope that it will be useful,
 ;;;   but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;;   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;   GNU General Public License for more details.
 ;;;
 ;;;   You should have received a copy of the GNU General Public License
 ;;;   along with this program; if not, write to the Free Software
 ;;;   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ;;; arch-tag: b066a884-e956-4f46-9d9c-13502f6cf7a6
--- a/etc/orgcard.tex
+++ b/etc/orgcard.tex
@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{4.26}
+\def\orgversionnumber{4.37}
 \def\year{2006}
 %
 %**start of header
@ -269,19 +269,11 @@
 \section{Getting Started}
 %
 %Put the following in your \kbd{~/.emacs}$^1$
 \vskip -1mm
 \beginexample%
 %(autoload 'org-mode "org" "Org mode" t)
 %(autoload 'org-diary "org" "Org mode diary entries")
 %(autoload 'org-agenda "org" "Agenda from Org files" t)
 %(autoload 'org-todo-list "org" "Global TODO list" t)
 %(autoload 'org-store-link "org" "Store org link" t)
 %(autoload 'orgtbl-mode "org" "Orgtbl minor mode" t)
 %(autoload 'turn-on-orgtbl "org" "Orgtbl minor mode")
 (add-to-list 'auto-mode-alist '("\\\\.org\$" . org-mode))
-(define-key global-map "\\C-cl" 'org-store-link)$^2$
+(define-key global-map "\\C-cl" 'org-store-link)$^1$
-(define-key global-map "\\C-ca" 'org-agenda)$^2$
+(define-key global-map "\\C-ca" 'org-agenda)$^1$
 \endexample
 %
 \metax{For the many customization options try}{M-x org-customize}
@ -302,6 +294,7 @@ \section{Motion}
 \key{previous heading, same level}{C-c C-b}
 \key{backward to higher level heading}{C-c C-u}
 \key{jump to another place in document}{C-c C-j}
 \key{previous/next plain list item}{S-UP/DOWN$^3$}
 \section{Structure Editing}
@ -320,7 +313,7 @@ \section{Structure Editing}
 \key{yank subtree}{C-c C-x C-y}
 \key{archive subtree}{C-c \$}
-To set archive location for current file, add a line like$^3$:
+To set archive location for current file, add a line like$^2$:
 \vskip -1mm
 \beginexample%
 \#+ARCHIVE: archfile::* Archived Tasks
@ -330,10 +323,10 @@ \section{Filtering and Sparse Trees}
 \key{show sparse tree for all matches of a regexp}{C-c /}
 \key{view TODO's in sparse tree}{C-c C-v}
-\key{global TODO list in agenda mode}{C-c t$^2$}
+\key{global TODO list in agenda mode}{C-c t$^1$}
 \key{create sparse tree with all deadlines due}{C-c C-w}
 \key{time sorted view of current org file}{C-c C-r}
-%\key{agenda for the week}{C-c a$^2$}
+%\key{agenda for the week}{C-c a$^1$}
 %\key{agenda for date at cursor}{C-c C-o}
 \section{Tags}
@ -343,81 +336,6 @@ \section{Tags}
 \key{create sparse tree with matching tags}{C-c \\}
 \key{globally (agenda) match tags at cursor}{C-c C-o}
 \section{TODO Items}
 \key{rotate the state of the current item}{C-c C-t}
 \key{view TODO items in a sparse tree}{C-c C-v}
 \key{view 3rd TODO keyword's sparse tree}{C-3 C-c C-v}
 \key{set the priority of the current item}{C-c , [ABC]}
 \key{remove priority cookie from current item}{C-c , SPC}
 \key{raise priority of current item}{S-UP$^4$}
 \key{lower priority of current item}{S-DOWN$^4$}
 \key{\kbd{\#+SEQ_TODO: TODO TRY BLUFF DONE}}{\rm todo workflow}
 \key{\kbd{\#+TYP_TODO: Phil home work DONE}}{\rm todo types}
 \section{Timestamps}
 \key{prompt for date and insert timestamp}{C-c .}
 \key{like \kbd{C-c} . but insert date and time format}{C-u C-c .}
 \key{Like \kbd{C-c .} but make stamp inactive}{C-c !} % FIXME
 \key{insert DEADLINE timestamp}{C-c C-d}
 \key{insert SCHEDULED timestamp}{C-c C-s}
 \key{create sparse tree with all deadlines due}{C-c C-w}
 \key{the time between 2 dates in a time range}{C-c C-y}
 \key{change timestamp at cursor by $\pm 1$ day}{S-RIGHT/LEFT$^4$}
 \key{change year/month/day at cursor by $\pm 1$}{S-UP/DOWN$^4$}
 \key{access the calendar for the current date}{C-c >}
 \key{insert timestamp matching date in calendar}{C-c <}
 \key{access agenda for current date}{C-c C-o}
 \key{Select date while prompted}{mouse-1/RET}
 %\key{... select date in calendar}{mouse-1/RET}
 %\key{... scroll calendar back/forward one month}{< / >}
 %\key{... forward/backward one day}{S-LEFT/RIGHT}
 %\key{... forward/backward one week}{S-UP/DOWN}
 %\key{... forward/backward one month}{M-S-LEFT/RIGT}
 \section{Links}
 \key{globally store link to the current location}{C-c l$^2$}
 \key{insert a link (TAB completes stored links)}{C-c C-l}
 \key{insert file link with file name completion}{C-u C-c C-l}
 \key{edit (also hidden part of) link at point}{C-c C-l}
 \key{open file links in emacs (\kbd{C-u} : in emacs)}{C-c C-o}
 \key{open link at point (3: in emacs)}{mouse-2/3}
 %\key{open file links in emacs}{mouse-3}
 \key{record a position in mark ring}{C-c \%}
 \key{jump back to last followed link(s)}{C-c \&}
 {\bf Internal Links}
 \key{\kbd{<<My Target>>}}{\rm target}
 \key{\kbd{<<<My Target>>>}}{\rm radio target$^3$}
 \key{\kbd{[[*this text]]}}{\rm find headline}
 \metax{\kbd{[[this text]]}}{\rm find target or text in buffer}
 \metax{\kbd{[[this text][description]]}}{\rm optional link text}
 {\bf External Links}
 \key{\kbd{file:/home/dominik/img/mars.jpg}}{\rm file, absolute}
 \key{\kbd{file:papers/last.pdf}}{\rm file, relative}
 \key{\kbd{file:projects.org::*that text}}{\rm find headline}
 \key{\kbd{file:projects.org::find me}}{\rm find tgt/string}
 \key{\kbd{file:projects.org::/regexp/}}{\rm regexp search}
 \key{\kbd{http://www.astro.uva.nl/~dominik}}{\rm on the web}
 \key{\kbd{mailto:adent@galaxy.net}}{\rm EMail address}
 \key{\kbd{news:comp.emacs}}{\rm Usenet group}
 \key{\kbd{bbdb:Richard Stallman}}{\rm BBDB person}
 \key{\kbd{shell:ls *.org}}{\rm shell command}
 \key{\kbd{gnus:group}}{\rm GNUS group}
 \key{\kbd{gnus:group\#id}}{\rm GNUS message}
 \key{\kbd{vm|wl|mhe|rmail:folder}}{\rm Mail folder}
 \key{\kbd{vm|wl|mhe|rmail:folder\#id}}{\rm Mail message}
 \metax{\kbd{[[external link][description]]}}{\rm optional link text}
 %\key{\kbd{vm://myself@some.where.org/folder\#id}}{\rm VM remote}
 \section{Tables}
 %Org-mode has its own built-in intuitive table editor with unique
@ -479,7 +397,7 @@ \section{Tables}
 \key{display column number cursor is in}{C-c ?}
 \key{sum numbers in current column/rectangle}{C-c +}
-\key{copy down with increment}{S-RET$^4$}
+\key{copy down with increment}{S-RET$^3$}
 Formulas typed in field are executed by \kbd{TAB},
 \kbd{RET} and \kbd{C-c C-c}.  \kbd{=} introduces a column
@ -505,26 +423,113 @@ \section{Tables}
 \key{recognize existing table.el table}{C-c C-c}
 \key{convert table (Org-mode $\leftrightarrow$ table.el)}{C-c ~}
 \section{Links}
 \key{globally store link to the current location}{C-c l$^1$}
 \key{insert a link (TAB completes stored links)}{C-c C-l}
 \key{insert file link with file name completion}{C-u C-c C-l}
 \key{edit (also hidden part of) link at point}{C-c C-l}
 \key{open file links in emacs (\kbd{C-u} : in emacs)}{C-c C-o}
 \key{open link at point (3: in emacs)}{mouse-2/3}
 %\key{open file links in emacs}{mouse-3}
 %\key{record a position in mark ring}{C-c \%}
 \key{jump back to last followed link(s)}{C-c \&}
 {\bf Internal Links}
 \key{\kbd{<<My Target>>}}{\rm target}
 \key{\kbd{<<<My Target>>>}}{\rm radio target$^2$}
 \key{\kbd{[[*this text]]}}{\rm find headline}
 \metax{\kbd{[[this text]]}}{\rm find target or text in buffer}
 \metax{\kbd{[[this text][description]]}}{\rm optional link text}
 {\bf External Links}
 \key{\kbd{file:/home/dominik/img/mars.jpg}}{\rm file, absolute}
 \key{\kbd{file:papers/last.pdf}}{\rm file, relative}
 \key{\kbd{file:projects.org::*that text}}{\rm find headline}
 \key{\kbd{file:projects.org::find me}}{\rm find tgt/string}
 %\key{\kbd{file:projects.org::/regexp/}}{\rm regexp search}
 \key{\kbd{http://www.astro.uva.nl/~dominik}}{\rm on the web}
 \key{\kbd{mailto:adent@galaxy.net}}{\rm EMail address}
 \key{\kbd{news:comp.emacs}}{\rm Usenet group}
 \key{\kbd{bbdb:Richard Stallman}}{\rm BBDB person}
 \key{\kbd{gnus:group}}{\rm GNUS group}
 \key{\kbd{gnus:group\#id}}{\rm GNUS message}
 \key{\kbd{vm|wl|mhe|rmail:folder}}{\rm Mail folder}
 \key{\kbd{vm|wl|mhe|rmail:folder\#id}}{\rm Mail message}
 \key{\kbd{info:emacs:Regexps}}{\rm Info file:node}
 \key{\kbd{shell:ls *.org}}{\rm shell command}
 \key{\kbd{elisp:(calendar)}}{\rm elisp form}
 \metax{\kbd{[[external link][description]]}}{\rm optional link text}
 %\key{\kbd{vm://myself@some.where.org/folder\#id}}{\rm VM remote}
 \section{TODO Items}
 \key{rotate the state of the current item}{C-c C-t}
 \key{view TODO items in a sparse tree}{C-c C-v}
 \key{view 3rd TODO keyword's sparse tree}{C-3 C-c C-v}
 \key{set the priority of the current item}{C-c , [ABC]}
 \key{remove priority cookie from current item}{C-c , SPC}
 \key{raise priority of current item}{S-UP$^3$}
 \key{lower priority of current item}{S-DOWN$^3$}
 \key{\kbd{\#+SEQ_TODO: TODO TRY BLUFF DONE}}{\rm todo workflow}
 \key{\kbd{\#+TYP_TODO: Phil home work DONE}}{\rm todo types}
 \section{Timestamps}
 \key{prompt for date and insert timestamp}{C-c .}
 \key{like \kbd{C-c} . but insert date and time format}{C-u C-c .}
 \key{Like \kbd{C-c .} but make stamp inactive}{C-c !} % FIXME
 \key{insert DEADLINE timestamp}{C-c C-d}
 \key{insert SCHEDULED timestamp}{C-c C-s}
 \key{create sparse tree with all deadlines due}{C-c C-w}
 \key{the time between 2 dates in a time range}{C-c C-y}
 \key{change timestamp at cursor by $\pm 1$ day}{S-RIGHT/LEFT$^3$}
 \key{change year/month/day at cursor by $\pm 1$}{S-UP/DOWN$^3$}
 \key{access the calendar for the current date}{C-c >}
 \key{insert timestamp matching date in calendar}{C-c <}
 \key{access agenda for current date}{C-c C-o}
 \key{Select date while prompted}{mouse-1/RET}
 %\key{... select date in calendar}{mouse-1/RET}
 %\key{... scroll calendar back/forward one month}{< / >}
 %\key{... forward/backward one day}{S-LEFT/RIGHT}
 %\key{... forward/backward one week}{S-UP/DOWN}
 %\key{... forward/backward one month}{M-S-LEFT/RIGT}
 \newcolumn
 \title{Org-Mode Reference Card (2/2)}
 \centerline{(for version \orgversionnumber)}
 \section{Clocking Time}
 \key{start clock on current item}{C-c C-x C-i}
 \key{stop clock on current item}{C-c C-x C-o}
 \key{cancel current clock}{C-c C-x C-x}
 \key{display total subtree times}{C-c C-x C-d}
 \key{remove displayed times}{C-c C-c}
 \section{Agenda Views}
 \key{add/move current file to front of agenda}{C-c [}
 \key{remove current file from your agenda}{C-c ]}
 \key{cycle through agenda file list}{C-,}
-\key{compile agenda for the current week}{C-c a a$^2$}
+\key{compile agenda for the current week}{C-c a a$^1$}
-\key{compile global TODO list}{C-c a t$^2$}
+\key{compile global TODO list}{C-c a t$^1$}
-\key{compile TODO list for specific keyword}{C-c a T$^2$}
+\key{compile TODO list for specific keyword}{C-c a T$^1$}
-\key{match tags in agenda files}{C-c a m$^2$}
+\key{match tags in agenda files}{C-c a m$^1$}
 \key{agenda for date at cursor}{C-c C-o}
 \key{show timeline of current org file}{C-c C-r}
 \vskip 1mm
-To set categories, add lines like$^3$:
+To set categories, add lines like$^2$:
 \vskip -1mm
 \beginexample%
 \#+CATEGORY: MyCateg
@ -561,15 +566,19 @@ \section{Agenda Views}
 \key{show tags of current headline}{T}
 \key{set tags for current headline}{:}
 \key{set priority of current item}{p}
-\key{raise/lower priority of current item}{S-UP/DOWN$^4$}
+\key{raise/lower priority of current item}{S-UP/DOWN$^3$}
 %\key{lower priority of current item}{S-DOWN$^4$}
 \key{display weighted priority of current item}{P}
-\key{change timestamp to one day earlier/later}{S-LEFT/RIGHT$^4$}
+\key{schedule/set deadline for this item}{C-c C-s/d}
-%\key{change timestamp to one day earlier}{S-LEFT$^4$}
+\key{change timestamp to one day earlier/later}{S-LEFT/RIGHT$^3$}
 %\key{change timestamp to one day later}{S-RIGHT$^4$}
 \key{change timestamp to today}{>}
 \key{insert new entry into diary}{i}
 \key{Start the clock on current item (clock-in)}{I}
 \key{Stop the clock (clock-out)}{O}
 \key{Cancel current clock}{X}
 \newcolumn
 {\bf Calendar commands}
 \key{find agenda cursor date in calendar}{c}
@ -584,23 +593,16 @@ \section{Agenda Views}
 \key{quit agenda, remove agenda buffer}{q}
 \key{exit agenda, remove all agenda buffers}{x}
-\section{Exporting}
+\section{Exporting and Publishing}
 Exporting creates files with extensions {\it .txt\/} and {\it .html\/}
-in the current directory.
+in the current directory.  Publishing puts the resulting file into
 some other place.
-\key{export as ASCII file}{C-c C-x a}
+\key{export/publish dispatcher}{C-c C-e}
 \key{export visible text only (e.g. for printing)}{C-c C-x v}
 \key{export as HTML file}{C-c C-x h}
 \key{export as HTML and open in browser}{C-c C-x b}
 \key{prefix arg sets nb. of headline levels, e.g.}{C-3 C-c C-x h}
 \key{export as iCalendar file}{C-c C-x i}
 \key{export all agenda files as iCalendar files}{C-c C-x C-i}
 \key{combine all agenda files to single iCal file}{C-c C-x C-c}
 \key{export visible part only}{C-c C-e v}
 \key{insert template of export options}{C-c C-x t}
 \key{toggle fixed width for entry or region}{C-c :}
 {\bf HTML formatting}
@ -629,8 +631,6 @@ \section{Exporting}
 \key{... which can carry over multiple lines}{\#+TEXT:}
 \key{settings for the export process - see below}{\#+OPTIONS:}
 {\bf Settings for the OPTIONS line}
 \key{set number of headline levels for export}{H:2}
 \key{turn on/off section numbers}{num:t}
 \key{turn on/off table of contents}{toc:t}
@ -659,8 +659,6 @@ \section{Completion}
 \key{Complete word at point}{M-TAB}
 \newcolumn
 \section{Calendar and Diary Integration}
 To include entries from the Emacs diary in your Org-mode agenda:
@ -668,26 +666,6 @@ \section{Calendar and Diary Integration}
 (setq org-agenda-include-diary t)
 \endexample
 To include the Org-mode agenda in the normal diary, make sure you're
 using the fancy diary display
 %
 %\beginexample%
 %(add-hook 'diary-display-hook 'fancy-diary-display)
 %\endexample
 %
 and in the \kbd{~/diary} file add
 \beginexample%
 \&\%\%(org-diary)
 \endexample
 to include all the files listed in \kbd{org-agenda-files}.  For more
 selective file inclusion use a line for each file:
 \beginexample%
 \&\%\%(org-diary) ~/path/to/some/org-file.org
 \endexample
 \section{Remember-mode Integration}
 See the manual for how to make remember.el use Org-mode links and
@ -712,7 +690,7 @@ \section{CUA and pc-select compatibility}
 Configure the variable {\tt org-CUA-compatibility} to make Org-mode
 avoid the \kbd{S-<cursor>} bindings used by these modes.  When set,
 Org-mode will change the following keybindings (also in the agenda
-buffer, but not during date selection). See note mark four$^4$
+buffer, but not during date selection). See note mark four$^3$
 throughout the reference card.
 %\vskip-mm
 \beginexample
@ -722,16 +700,13 @@ \section{CUA and pc-select compatibility}
 \endexample
 \section{Notes}
-$^1$ The six autoload forms are only needed if Org-mode is not part of
+$^1$ This is only a suggestion for a binding of this command.  Choose
 Emacs, or an XEmacs package.
 $^2$ This is only a suggestion for a binding of this command.  Choose
 you own key as shown under INSTALLATION.
-$^3$ After changing a \kbd{\#+KEYWORD} or \kbd{<<<target>>>} line,
+$^2$ After changing a \kbd{\#+KEYWORD} or \kbd{<<<target>>>} line,
 press \kbd{C-c C-c} with the cursor still in the line to update.
-$^4$ Keybinding affected by {\tt org-CUA-compatibility}.
+$^3$ Keybinding affected by {\tt org-CUA-compatibility}.
 \copyrightnotice
--- a/etc/pl-refcard.ps
+++ b/etc/pl-refcard.ps
--- a/etc/pl-refcard.tex
+++ b/etc/pl-refcard.tex
@ -73,7 +73,7 @@
 % If there were room, it would be nice to see a section on Dired.
-\def\versionnumber{1.1}
+\def\versionnumber{1.2}
 \def\year{2006}
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
@ -83,8 +83,8 @@
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{Wersja \versionnumber{} dla GNU Emacsa 20.3,
+\centerline{Wersja \versionnumber{} dla GNU Emacsa 22,
-  stycze/n 1999}
+  czerwiec 2006}
 \centerline{projekt Stephen Gildea}
 \centerline{t/lumaczenie W/lodek Bzyl}
@ -311,12 +311,12 @@
 %\title{GNU Emacs Reference Card}
 \title{Przegl/ad polece/n GNU Emacsa}
-\centerline{(dla wersji 20.3)}
+\centerline{(dla wersji 22)}
 \section{Uruchamianie Emacsa}
 %To enter GNU Emacs 20, just type its name: \kbd{emacs}
-Aby uruchomi/c GNU Emacsa 20, napisz jego nazw/e: \kbd{emacs}
+Aby uruchomi/c GNU Emacsa 22, napisz jego nazw/e: \kbd{emacs}
 %To read in a file to edit, see Files, below.
 Aby wczyta/c plik do edycji, patrz rozdzia/l {\bf Pliki} poni/zej.
@ -409,7 +409,7 @@ \section{Szukanie przyrostowe}
 %Use \kbd{C-s} or \kbd{C-r} again to repeat the search in either direction.
 %If Emacs is still searching, \kbd{C-g} cancels only the part not done.
-Ponowne \kbd{C-s}//\kbd{C-r}, powtarza szukanie wprz/od//wstecz.
+Ponowne \kbd{C-s}//\kbd{C-r} powtarza szukanie wprz/od//wstecz.
 %If Emacs is still searching, \kbd{C-g} cancels only the part not done.
 % Patrz wyja/snienie powy/zej.
@ -496,7 +496,7 @@ \section{Zaznaczanie}
 %\key{mark {\bf sexp}}{C-M-@}
 %\key{mark {\bf function}}{C-M-h}
 %\key{mark entire {\bf buffer}}{C-x h}
-\key{zaznacz s/lowo}{M-@}
+\key{zaznacz s/lowo po {\it arg\/} s/l/ow}{M-@}
 \key{zaznacz akapit}{M-h}
 \key{zaznacz stron/e}{C-x C-p}
 \key{zaznacz s-wyra/zenie}{C-M-@}
@ -854,9 +854,9 @@ \section{Makropolecenia}
 \section{Info}
 %\key{enter the Info documentation reader}{C-h i}
-%\key{find specified function or variable in Info}{C-h C-i}
+%\key{find specified function or variable in Info}{C-h S}
 \key{wejd/x w tryb czytania dokumentacji Info}{C-h i}
-\key{wyszukaj podan/a funkcj/e lub zmienn/a w Info}{C-h C-i}
+\key{wyszukaj podan/a funkcj/e lub zmienn/a w Info}{C-h S}
 \beginindentedkeys
 %Moving within a node:
--- a/etc/ses-example.ses
+++ b/etc/ses-example.ses
@ -206,4 +206,24 @@ Sales summary - Acme fundraising
 ;;; symbolic-formulas: (("Eastern area") ("West-district") ("North&South") ("Other"))
 ;;; End:
 ;;; Copyright (c) 2002, 2006
 ;;; Free Software Foundation, Inc.
 ;;; COPYING PERMISSIONS:
 ;;; 
 ;;;   This document is free software; you can redistribute it and/or modify
 ;;;   it under the terms of the GNU General Public License as published by
 ;;;   the Free Software Foundation; either version 2 of the License, or
 ;;;   (at your option) any later version.
 ;;;
 ;;;   This program is distributed in the hope that it will be useful,
 ;;;   but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;;   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;   GNU General Public License for more details.
 ;;;
 ;;;   You should have received a copy of the GNU General Public License
 ;;;   along with this program; if not, write to the Free Software
 ;;;   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ;;; arch-tag: 4fcb0843-e3f9-4270-b8fb-998129190765
--- a/etc/tree-widget/default/close.png
+++ b/etc/tree-widget/default/close.png
--- a/etc/tree-widget/default/close.xpm
+++ b/etc/tree-widget/default/close.xpm
@ -1,284 +1,33 @@
 /* XPM */
-static char *close[] = {
+static char * close_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"16 21 9 1",
-"    16    21      256            2",
+" 	c None",
-/* colors */
+".	c #840000",
-"`` c #840000",
+"+	c #942929",
-"`. c #942929",
+"@	c #9C3131",
-"`# c #9c3131",
+"#	c #9C3939",
-"`a c #9c3939",
+"$	c #A54242",
-"`b c #a54242",
+"%	c #A54A4A",
-"`c c #a54a4a",
+"&	c #AD5252",
-"`d c #ad4a4a",
+"*	c #AD5A5A",
-"`e c #ad5252",
+"                ",
-"`f c #ad5a5a",
+"                ",
-"`g c None",
+"                ",
-"`h c #ffffff",
+"                ",
-"`i c #ffffff",
+"                ",
-"`j c #ffffff",
+"    ...         ",
-"`k c #ffffff",
+"   ..+..        ",
-"`l c #ffffff",
+"  ..+@#..       ",
-"`m c #ffffff",
+" ..+@##$..      ",
-"`n c #ffffff",
+"..+@##$%&..     ",
-"`o c #ffffff",
+".+@##$%&&*.     ",
-"`p c #ffffff",
+"..##$%&&*..     ",
-"`q c #ffffff",
+" ..$%&&*..      ",
-"`r c #ffffff",
+"  ..&&*..       ",
-"`s c #ffffff",
+"   ..*..        ",
-"`t c #ffffff",
+"    ...         ",
-"`u c #ffffff",
+"                ",
-"`v c #ffffff",
+"                ",
-"`w c #ffffff",
+"                ",
-"`x c #ffffff",
+"                ",
-"`y c #ffffff",
+"                "};
 "`z c #ffffff",
 "`A c #ffffff",
 "`B c #ffffff",
 "`C c #ffffff",
 "`D c #ffffff",
 "`E c #ffffff",
 "`F c #ffffff",
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g```````g`g`g`g`g`g`g`g`g",
 "`g`g`g`````.`````g`g`g`g`g`g`g`g",
 "`g`g`````.`#`a`````g`g`g`g`g`g`g",
 "`g`````.`#`a`a`b`````g`g`g`g`g`g",
 "`````.`#`a`a`b`c`e`````g`g`g`g`g",
 "```.`#`a`a`b`c`e`e`f```g`g`g`g`g",
 "`````a`a`b`c`e`e`f`````g`g`g`g`g",
 "`g`````b`c`e`e`f`````g`g`g`g`g`g",
 "`g`g`````e`e`f`````g`g`g`g`g`g`g",
 "`g`g`g`````f`````g`g`g`g`g`g`g`g",
 "`g`g`g`g```````g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g"
 };
--- a/etc/tree-widget/default/empty.png
+++ b/etc/tree-widget/default/empty.png
--- a/etc/tree-widget/default/empty.xpm
+++ b/etc/tree-widget/default/empty.xpm
@ -1,284 +1,33 @@
 /* XPM */
-static char *empty[] = {
+static char * empty_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"16 21 9 1",
-"    16    21      256            2",
+" 	c None",
-/* colors */
+".	c #848400",
-"`` c #848400",
+"+	c #949429",
-"`. c #949429",
+"@	c #9C9C31",
-"`# c #9c9c31",
+"#	c #9C9C39",
-"`a c #9c9c39",
+"$	c #A5A542",
-"`b c #a5a542",
+"%	c #A5A54A",
-"`c c #a5a54a",
+"&	c #ADAD52",
-"`d c #adad4a",
+"*	c #ADAD5A",
-"`e c #adad52",
+"                ",
-"`f c #adad5a",
+"                ",
-"`g c None",
+"                ",
-"`h c #ffffff",
+"                ",
-"`i c #ffffff",
+"                ",
-"`j c #ffffff",
+"    ...         ",
-"`k c #ffffff",
+"   ..+..        ",
-"`l c #ffffff",
+"  ..+@#..       ",
-"`m c #ffffff",
+" ..+@##$..      ",
-"`n c #ffffff",
+"..+@##$%%..     ",
-"`o c #ffffff",
+".+@##$%%&*.     ",
-"`p c #ffffff",
+"..##$%%&*..     ",
-"`q c #ffffff",
+" ..$%%&*..      ",
-"`r c #ffffff",
+"  ..%&*..       ",
-"`s c #ffffff",
+"   ..*..        ",
-"`t c #ffffff",
+"    ...         ",
-"`u c #ffffff",
+"                ",
-"`v c #ffffff",
+"                ",
-"`w c #ffffff",
+"                ",
-"`x c #ffffff",
+"                ",
-"`y c #ffffff",
+"                "};
 "`z c #ffffff",
 "`A c #ffffff",
 "`B c #ffffff",
 "`C c #ffffff",
 "`D c #ffffff",
 "`E c #ffffff",
 "`F c #ffffff",
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g```````g`g`g`g`g`g`g`g`g",
 "`g`g`g`````.`````g`g`g`g`g`g`g`g",
 "`g`g`````.`#`a`````g`g`g`g`g`g`g",
 "`g`````.`#`a`a`b`````g`g`g`g`g`g",
 "`````.`#`a`a`b`c`c`````g`g`g`g`g",
 "```.`#`a`a`b`c`c`e`f```g`g`g`g`g",
 "`````a`a`b`c`c`e`f`````g`g`g`g`g",
 "`g`````b`c`c`e`f`````g`g`g`g`g`g",
 "`g`g`````c`e`f`````g`g`g`g`g`g`g",
 "`g`g`g`````f`````g`g`g`g`g`g`g`g",
 "`g`g`g`g```````g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g"
 };
--- a/etc/tree-widget/default/end-guide.png
+++ b/etc/tree-widget/default/end-guide.png
--- a/etc/tree-widget/default/end-guide.xpm
+++ b/etc/tree-widget/default/end-guide.xpm
@ -1,284 +1,26 @@
 /* XPM */
-static char *end-guide[] = {
+static char * end_guide_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"6 21 2 1",
-"     6    21      256            2",
+" 	c None",
-/* colors */
+".	c #ADA5C6",
-"`` c #000000",
+"     .",
-"`. c #a5a5c6",
+"     .",
-"`# c #ada5c6",
+"     .",
-"`a c #cecee7",
+"     .",
-"`b c #ceceff",
+"     .",
-"`c c None",
+"     .",
-"`d c #ffffff",
+"     .",
-"`e c #ffffff",
+"     .",
-"`f c #ffffff",
+"     .",
-"`g c #ffffff",
+"     .",
-"`h c #ffffff",
+"     .",
-"`i c #ffffff",
+"      ",
-"`j c #ffffff",
+"      ",
-"`k c #ffffff",
+"      ",
-"`l c #ffffff",
+"      ",
-"`m c #ffffff",
+"      ",
-"`n c #ffffff",
+"      ",
-"`o c #ffffff",
+"      ",
-"`p c #ffffff",
+"      ",
-"`q c #ffffff",
+"      ",
-"`r c #ffffff",
+"      "};
 "`s c #ffffff",
 "`t c #ffffff",
 "`u c #ffffff",
 "`v c #ffffff",
 "`w c #ffffff",
 "`x c #ffffff",
 "`y c #ffffff",
 "`z c #ffffff",
 "`A c #ffffff",
 "`B c #ffffff",
 "`C c #ffffff",
 "`D c #808000",
 "`E c #ffffff",
 "`F c #ffffff",
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`c",
 "`c`c`c`c`c`c",
 "`c`c`c`c`c`c",
 "`c`c`c`c`c`c",
 "`c`c`c`c`c`c",
 "`c`c`c`c`c`c",
 "`c`c`c`c`c`c",
 "`c`c`c`c`c`c",
 "`c`c`c`c`c`c",
 "`c`c`c`c`c`c"
 };
--- a/etc/tree-widget/default/guide.png
+++ b/etc/tree-widget/default/guide.png
--- a/etc/tree-widget/default/guide.xpm
+++ b/etc/tree-widget/default/guide.xpm
@ -1,284 +1,26 @@
 /* XPM */
-static char *guide[] = {
+static char * guide_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"6 21 2 1",
-"     6    21      256            2",
+" 	c None",
-/* colors */
+".	c #ADA5C6",
-"`` c #000000",
+"     .",
-"`. c #a5a5c6",
+"     .",
-"`# c #ada5c6",
+"     .",
-"`a c #cecee7",
+"     .",
-"`b c #ceceff",
+"     .",
-"`c c None",
+"     .",
-"`d c #ffffff",
+"     .",
-"`e c #ffffff",
+"     .",
-"`f c #ffffff",
+"     .",
-"`g c #ffffff",
+"     .",
-"`h c #ffffff",
+"     .",
-"`i c #ffffff",
+"     .",
-"`j c #ffffff",
+"     .",
-"`k c #ffffff",
+"     .",
-"`l c #ffffff",
+"     .",
-"`m c #ffffff",
+"     .",
-"`n c #ffffff",
+"     .",
-"`o c #ffffff",
+"     .",
-"`p c #ffffff",
+"     .",
-"`q c #ffffff",
+"     .",
-"`r c #ffffff",
+"     ."};
 "`s c #ffffff",
 "`t c #ffffff",
 "`u c #ffffff",
 "`v c #ffffff",
 "`w c #ffffff",
 "`x c #ffffff",
 "`y c #ffffff",
 "`z c #ffffff",
 "`A c #ffffff",
 "`B c #ffffff",
 "`C c #ffffff",
 "`D c #808000",
 "`E c #ffffff",
 "`F c #ffffff",
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#",
 "`c`c`c`c`c`#"
 };
--- a/etc/tree-widget/default/handle.png
+++ b/etc/tree-widget/default/handle.png
--- a/etc/tree-widget/default/handle.xpm
+++ b/etc/tree-widget/default/handle.xpm
@ -1,284 +1,26 @@
 /* XPM */
-static char *handle[] = {
+static char * handle_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"10 21 2 1",
-"    10    21      256            2",
+" 	c None",
-/* colors */
+".	c #ADA5C6",
-"`` c #000000",
+"          ",
-"`. c #a5a5c6",
+"          ",
-"`# c #ada5c6",
+"          ",
-"`a c #cecee7",
+"          ",
-"`b c #ceceff",
+"          ",
-"`c c None",
+"          ",
-"`d c #ffffff",
+"          ",
-"`e c #ffffff",
+"          ",
-"`f c #ffffff",
+"          ",
-"`g c #ffffff",
+"          ",
-"`h c #ffffff",
+"..........",
-"`i c #ffffff",
+"          ",
-"`j c #ffffff",
+"          ",
-"`k c #ffffff",
+"          ",
-"`l c #ffffff",
+"          ",
-"`m c #ffffff",
+"          ",
-"`n c #ffffff",
+"          ",
-"`o c #ffffff",
+"          ",
-"`p c #ffffff",
+"          ",
-"`q c #ffffff",
+"          ",
-"`r c #ffffff",
+"          "};
 "`s c #ffffff",
 "`t c #ffffff",
 "`u c #ffffff",
 "`v c #ffffff",
 "`w c #ffffff",
 "`x c #ffffff",
 "`y c #ffffff",
 "`z c #ffffff",
 "`A c #ffffff",
 "`B c #ffffff",
 "`C c #ffffff",
 "`D c #808000",
 "`E c #ffffff",
 "`F c #ffffff",
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`#`#`#`#`#`#`#`#`#`#",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c"
 };
--- a/etc/tree-widget/default/leaf.png
+++ b/etc/tree-widget/default/leaf.png
--- a/etc/tree-widget/default/leaf.xpm
+++ b/etc/tree-widget/default/leaf.xpm
@ -1,284 +1,33 @@
 /* XPM */
-static char *leaf[] = {
+static char * leaf_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"16 21 9 1",
-"    16    21      256            2",
+" 	c None",
-/* colors */
+".	c #424242",
-"`` c #424242",
+"+	c #737373",
-"`. c #737373",
+"@	c #7B7B7B",
-"`# c #7b7b7b",
+"#	c #848484",
-"`a c #848484",
+"$	c #8C8C8C",
-"`b c #8c8c8c",
+"%	c #949494",
-"`c c #949494",
+"&	c #9C9C9C",
-"`d c #9c9c9c",
+"*	c #A5A5A5",
-"`e c #a5a5a5",
+"                ",
-"`f c None",
+"                ",
-"`g c #ffffff",
+"                ",
-"`h c #ffffff",
+"                ",
-"`i c #ffffff",
+"                ",
-"`j c #ffffff",
+"                ",
-"`k c #ffffff",
+"   .....        ",
-"`l c #ffffff",
+"  .+@@##.       ",
-"`m c #ffffff",
+" .+@@##$$.      ",
-"`n c #ffffff",
+".+@@##$$%%.     ",
-"`o c #ffffff",
+".@@##$$%%&.     ",
-"`p c #ffffff",
+".@##$$%%&*.     ",
-"`q c #ffffff",
+" .#$$%%&*.      ",
-"`r c #ffffff",
+"  .$%%&*.       ",
-"`s c #ffffff",
+"   .....        ",
-"`t c #ffffff",
+"                ",
-"`u c #ffffff",
+"                ",
-"`v c #ffffff",
+"                ",
-"`w c #ffffff",
+"                ",
-"`x c #ffffff",
+"                ",
-"`y c #ffffff",
+"                "};
 "`z c #ffffff",
 "`A c #ffffff",
 "`B c #ffffff",
 "`C c #ffffff",
 "`D c #ffffff",
 "`E c #ffffff",
 "`F c #ffffff",
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
 "`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
 "`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
 "`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
 "`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
 "`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
 "`f`f`f```````````f`f`f`f`f`f`f`f",
 "`f`f```.`#`#`a`a```f`f`f`f`f`f`f",
 "`f```.`#`#`a`a`b`b```f`f`f`f`f`f",
 "```.`#`#`a`a`b`b`c`c```f`f`f`f`f",
 "```#`#`a`a`b`b`c`c`d```f`f`f`f`f",
 "```#`a`a`b`b`c`c`d`e```f`f`f`f`f",
 "`f```a`b`b`c`c`d`e```f`f`f`f`f`f",
 "`f`f```b`c`c`d`e```f`f`f`f`f`f`f",
 "`f`f`f```````````f`f`f`f`f`f`f`f",
 "`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
 "`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
 "`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
 "`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
 "`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f",
 "`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f"
 };
--- a/etc/tree-widget/default/no-guide.png
+++ b/etc/tree-widget/default/no-guide.png
--- a/etc/tree-widget/default/no-guide.xpm
+++ b/etc/tree-widget/default/no-guide.xpm
@ -1,284 +1,25 @@
 /* XPM */
-static char *no-guide[] = {
+static char * no_guide_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"6 21 1 1",
-"     6    21      256            2",
+" 	c None",
-/* colors */
+"      ",
-"`` c #000000",
+"      ",
-"`. c #84849c",
+"      ",
-"`# c #8c8ca5",
+"      ",
-"`a c #a5a5c6",
+"      ",
-"`b c #ada5c6",
+"      ",
-"`c c #b5b5ce",
+"      ",
-"`d c #cecee7",
+"      ",
-"`e c #ceceff",
+"      ",
-"`f c #e7e7ff",
+"      ",
-"`g c None",
+"      ",
-"`h c #808000",
+"      ",
-"`i c #ffffff",
+"      ",
-"`j c #ffffff",
+"      ",
-"`k c #ffffff",
+"      ",
-"`l c #ffffff",
+"      ",
-"`m c #ffffff",
+"      ",
-"`n c #ffffff",
+"      ",
-"`o c #ffffff",
+"      ",
-"`p c #ffffff",
+"      ",
-"`q c #ffffff",
+"      "};
 "`r c #ffffff",
 "`s c #ffffff",
 "`t c #ffffff",
 "`u c #ffffff",
 "`v c #ffffff",
 "`w c #ffffff",
 "`x c #ffffff",
 "`y c #ffffff",
 "`z c #ffffff",
 "`A c #ffffff",
 "`B c #ffffff",
 "`C c #ffffff",
 "`D c #ffffff",
 "`E c #ffffff",
 "`F c #ffffff",
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g",
 "`g`g`g`g`g`g"
 };
--- a/etc/tree-widget/default/no-handle.png
+++ b/etc/tree-widget/default/no-handle.png
--- a/etc/tree-widget/default/no-handle.xpm
+++ b/etc/tree-widget/default/no-handle.xpm
@ -1,284 +1,25 @@
 /* XPM */
-static char *no-handle[] = {
+static char * no_handle_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"10 21 1 1",
-"    10    21      256            2",
+" 	c None",
-/* colors */
+"          ",
-"`` c #000000",
+"          ",
-"`. c #84849c",
+"          ",
-"`# c #8c8ca5",
+"          ",
-"`a c #a5a5c6",
+"          ",
-"`b c #ada5c6",
+"          ",
-"`c c #b5b5ce",
+"          ",
-"`d c #cecee7",
+"          ",
-"`e c #ceceff",
+"          ",
-"`f c #e7e7ff",
+"          ",
-"`g c None",
+"          ",
-"`h c #808000",
+"          ",
-"`i c #ffffff",
+"          ",
-"`j c #ffffff",
+"          ",
-"`k c #ffffff",
+"          ",
-"`l c #ffffff",
+"          ",
-"`m c #ffffff",
+"          ",
-"`n c #ffffff",
+"          ",
-"`o c #ffffff",
+"          ",
-"`p c #ffffff",
+"          ",
-"`q c #ffffff",
+"          "};
 "`r c #ffffff",
 "`s c #ffffff",
 "`t c #ffffff",
 "`u c #ffffff",
 "`v c #ffffff",
 "`w c #ffffff",
 "`x c #ffffff",
 "`y c #ffffff",
 "`z c #ffffff",
 "`A c #ffffff",
 "`B c #ffffff",
 "`C c #ffffff",
 "`D c #ffffff",
 "`E c #ffffff",
 "`F c #ffffff",
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g",
 "`g`g`g`g`g`g`g`g`g`g"
 };
--- a/etc/tree-widget/default/open.png
+++ b/etc/tree-widget/default/open.png
--- a/etc/tree-widget/default/open.xpm
+++ b/etc/tree-widget/default/open.xpm
@ -1,284 +1,35 @@
 /* XPM */
-static char *open[] = {
+static char * open_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"16 21 11 1",
-"    16    21      256            2",
+" 	c None",
-/* colors */
+".	c #004200",
-"`` c #004200",
+"+	c #296329",
-"`. c #296329",
+"@	c #316331",
-"`# c #316331",
+"#	c #396B39",
-"`a c #316b31",
+"$	c #427342",
-"`b c #396b39",
+"%	c #4A734A",
-"`c c #427342",
+"&	c #4A7B4A",
-"`d c #4a734a",
+"*	c #528452",
-"`e c #4a7b4a",
+"=	c #5A845A",
-"`f c #528452",
+"-	c #A5A5C6",
-"`g c #5a845a",
+"                ",
-"`h c #a5a5c6",
+"                ",
-"`i c None",
+"                ",
-"`j c #ffffff",
+"                ",
-"`k c #ffffff",
+"                ",
-"`l c #ffffff",
+"    ...         ",
-"`m c #ffffff",
+"   ..+..        ",
-"`n c #ffffff",
+"  ..+@#..       ",
-"`o c #ffffff",
+" ..+@##$..      ",
-"`p c #ffffff",
+"..+@##$%&..     ",
-"`q c #ffffff",
+".+@##$%&*=.     ",
-"`r c #ffffff",
+"..##$%&*=..     ",
-"`s c #ffffff",
+" ..$%&*=..      ",
-"`t c #ffffff",
+"  ..&*=..       ",
-"`u c #ffffff",
+"   ..=..        ",
-"`v c #ffffff",
+"    ...         ",
-"`w c #ffffff",
+"     -          ",
-"`x c #ffffff",
+"     -          ",
-"`y c #ffffff",
+"     -          ",
-"`z c #ffffff",
+"     -          ",
-"`A c #ffffff",
+"     -          "};
 "`B c #ffffff",
 "`C c #ffffff",
 "`D c #ffffff",
 "`E c #ffffff",
 "`F c #ffffff",
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i",
 "`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i",
 "`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i",
 "`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i",
 "`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i",
 "`i`i`i`i```````i`i`i`i`i`i`i`i`i",
 "`i`i`i`````.`````i`i`i`i`i`i`i`i",
 "`i`i`````.`#`b`````i`i`i`i`i`i`i",
 "`i`````.`#`b`b`c`````i`i`i`i`i`i",
 "`````.`#`b`b`c`d`e`````i`i`i`i`i",
 "```.`#`b`b`c`d`e`f`g```i`i`i`i`i",
 "`````b`b`c`d`e`f`g`````i`i`i`i`i",
 "`i`````c`d`e`f`g`````i`i`i`i`i`i",
 "`i`i`````e`f`g`````i`i`i`i`i`i`i",
 "`i`i`i`````g`````i`i`i`i`i`i`i`i",
 "`i`i`i`i```````i`i`i`i`i`i`i`i`i",
 "`i`i`i`i`i`h`i`i`i`i`i`i`i`i`i`i",
 "`i`i`i`i`i`h`i`i`i`i`i`i`i`i`i`i",
 "`i`i`i`i`i`h`i`i`i`i`i`i`i`i`i`i",
 "`i`i`i`i`i`h`i`i`i`i`i`i`i`i`i`i",
 "`i`i`i`i`i`h`i`i`i`i`i`i`i`i`i`i"
 };
--- a/etc/tree-widget/folder/close.png
+++ b/etc/tree-widget/folder/close.png
--- a/etc/tree-widget/folder/close.xpm
+++ b/etc/tree-widget/folder/close.xpm
@ -1,285 +1,40 @@
 /* XPM */
-static char *close[] = {
+static char * close_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"16 22 15 1",
-"    16    22      256            2",
+" 	c None",
-/* colors */
+".	c #848400",
-"`` c #848400",
+"+	c #E7E79C",
-"`. c #9c9c29",
+"@	c #E7E794",
-"`# c #a5a531",
+"#	c #DEDE8C",
-"`a c #adad39",
+"$	c #ADAD39",
-"`b c #adad42",
+"%	c #ADAD42",
-"`c c #b5b54a",
+"&	c #B5B54A",
-"`d c #b5b552",
+"*	c #B5B552",
-"`e c #bdbd52",
+"=	c #BDBD5A",
-"`f c #bdbd5a",
+"-	c #9C9C29",
-"`g c #c6c663",
+";	c #A5A531",
-"`h c #c6c66b",
+">	c #C6C663",
-"`i c #cece6b",
+",	c #C6C66B",
-"`j c #cece73",
+"'	c #CECE73",
-"`k c #dede8c",
+"                ",
-"`l c #e7e794",
+"                ",
-"`m c #e7e79c",
+"                ",
-"`n c #efef9c",
+"                ",
-"`o c None",
+"                ",
-"`p c #ffffff",
+"                ",
-"`q c #ffffff",
+" ....           ",
-"`r c #ffffff",
+".+@@#.......    ",
-"`s c #ffffff",
+".....$%%&&*=.   ",
-"`t c #ffffff",
+".-;;$%%&&*==.   ",
-"`u c #ffffff",
+".;;$%%&&*===.   ",
-"`v c #ffffff",
+".;$%%&&*===>.   ",
-"`w c #ffffff",
+".$%%&&*===>,.   ",
-"`x c #ffffff",
+".%%&&*===>,,.   ",
-"`y c #ffffff",
+".%&&*===>,,'.   ",
-"`z c #ffffff",
+".............   ",
-"`A c #ffffff",
+"                ",
-"`B c #ffffff",
+"                ",
-"`C c #ffffff",
+"                ",
-"`D c #ffffff",
+"                ",
-"`E c #ffffff",
+"                ",
-"`F c #ffffff",
+"                "};
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
 "`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
 "`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
 "`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
 "`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
 "`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
 "`o`````````o`o`o`o`o`o`o`o`o`o`o",
 "```m`l`l`k```````````````o`o`o`o",
 "```````````a`b`b`c`c`d`f```o`o`o",
 "```.`#`#`a`b`b`c`c`d`f`f```o`o`o",
 "```#`#`a`b`b`c`c`d`f`f`f```o`o`o",
 "```#`a`b`b`c`c`d`f`f`f`g```o`o`o",
 "```a`b`b`c`c`d`f`f`f`g`h```o`o`o",
 "```b`b`c`c`d`f`f`f`g`h`h```o`o`o",
 "```b`c`c`d`f`f`f`g`h`h`j```o`o`o",
 "```````````````````````````o`o`o",
 "`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
 "`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
 "`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
 "`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
 "`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o",
 "`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o"
 };
--- a/etc/tree-widget/folder/empty.png
+++ b/etc/tree-widget/folder/empty.png
--- a/etc/tree-widget/folder/empty.xpm
+++ b/etc/tree-widget/folder/empty.xpm
@ -1,285 +1,35 @@
 /* XPM */
-static char *empty[] = {
+static char * empty_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"16 22 10 1",
-"    16    22      256            2",
+" 	c None",
-/* colors */
+".	c #424242",
-"`` c #424242",
+"+	c #A5A5A5",
-"`. c #6b6b6b",
+"@	c #9C9C9C",
-"`# c #737373",
+"#	c #949494",
-"`a c #7b7b7b",
+"$	c #8C8C8C",
-"`b c #848484",
+"%	c #6B6B6B",
-"`c c #8c8c8c",
+"&	c #737373",
-"`d c #949494",
+"*	c #7B7B7B",
-"`e c #9c9c9c",
+"=	c #848484",
-"`f c #a5a5a5",
+"                ",
-"`g c #adadad",
+"                ",
-"`h c None",
+"                ",
-"`i c #ffffff",
+"                ",
-"`j c #ffffff",
+"                ",
-"`k c #ffffff",
+"                ",
-"`l c #ffffff",
+" ....           ",
-"`m c #ffffff",
+".+++@.....      ",
-"`n c #ffffff",
+".++@@@##$$.     ",
-"`o c #ffffff",
+".+@..........   ",
-"`p c #ffffff",
+".@.%%%&&&**==.  ",
-"`q c #ffffff",
+".@.%%&&&**==.   ",
-"`r c #ffffff",
+"..%%&&&**===.   ",
-"`s c #ffffff",
+"..%&&&**===.    ",
-"`t c #ffffff",
+".%&&&**===$.    ",
-"`u c #ffffff",
+"...........     ",
-"`v c #ffffff",
+"                ",
-"`w c #ffffff",
+"                ",
-"`x c #ffffff",
+"                ",
-"`y c #ffffff",
+"                ",
-"`z c #ffffff",
+"                ",
-"`A c #ffffff",
+"                "};
 "`B c #ffffff",
 "`C c #ffffff",
 "`D c #ffffff",
 "`E c #ffffff",
 "`F c #ffffff",
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`````````h`h`h`h`h`h`h`h`h`h`h",
 "```f`f`f`e```````````h`h`h`h`h`h",
 "```f`f`e`e`e`d`d`c`c```h`h`h`h`h",
 "```f`e`````````````````````h`h`h",
 "```e```.`.`.`#`#`#`a`a`b`b```h`h",
 "```e```.`.`#`#`#`a`a`b`b```h`h`h",
 "`````.`.`#`#`#`a`a`b`b`b```h`h`h",
 "`````.`#`#`#`a`a`b`b`b```h`h`h`h",
 "```.`#`#`#`a`a`b`b`b`c```h`h`h`h",
 "```````````````````````h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h"
 };
--- a/etc/tree-widget/folder/end-guide.png
+++ b/etc/tree-widget/folder/end-guide.png
--- a/etc/tree-widget/folder/end-guide.xpm
+++ b/etc/tree-widget/folder/end-guide.xpm
@ -1,285 +1,27 @@
 /* XPM */
-static char *end-guide[] = {
+static char * end_guide_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"6 22 2 1",
-"     6    22      256            2",
+" 	c None",
-/* colors */
+".	c #ADA5C6",
-"`` c #ada5c6",
+"      ",
-"`. c None",
+"     .",
-"`# c #ffffff",
+"      ",
-"`a c #ffffff",
+"     .",
-"`b c #ffffff",
+"      ",
-"`c c #ffffff",
+"     .",
-"`d c #ffffff",
+"      ",
-"`e c #ffffff",
+"     .",
-"`f c #ffffff",
+"      ",
-"`g c #ffffff",
+"     .",
-"`h c #ffffff",
+"      ",
-"`i c #ffffff",
+"     .",
-"`j c #ffffff",
+"      ",
-"`k c #ffffff",
+"      ",
-"`l c #ffffff",
+"      ",
-"`m c #ffffff",
+"      ",
-"`n c #ffffff",
+"      ",
-"`o c #ffffff",
+"      ",
-"`p c #ffffff",
+"      ",
-"`q c #ffffff",
+"      ",
-"`r c #ffffff",
+"      ",
-"`s c #ffffff",
+"      "};
 "`t c #ffffff",
 "`u c #ffffff",
 "`v c #ffffff",
 "`w c #ffffff",
 "`x c #ffffff",
 "`y c #ffffff",
 "`z c #ffffff",
 "`A c #ffffff",
 "`B c #ffffff",
 "`C c #ffffff",
 "`D c #ffffff",
 "`E c #ffffff",
 "`F c #ffffff",
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "`.`.`.`.`.`.",
 "`.`.`.`.`.``",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.``",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.``",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.``",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.``",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.``",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.`."
 };
--- a/etc/tree-widget/folder/guide.png
+++ b/etc/tree-widget/folder/guide.png
--- a/etc/tree-widget/folder/guide.xpm
+++ b/etc/tree-widget/folder/guide.xpm
@ -1,285 +1,27 @@
 /* XPM */
-static char *guide[] = {
+static char * guide_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"6 22 2 1",
-"     6    22      256            2",
+" 	c None",
-/* colors */
+".	c #ADA5C6",
-"`` c #ada5c6",
+"      ",
-"`. c None",
+"     .",
-"`# c #ffffff",
+"      ",
-"`a c #ffffff",
+"     .",
-"`b c #ffffff",
+"      ",
-"`c c #ffffff",
+"     .",
-"`d c #ffffff",
+"      ",
-"`e c #ffffff",
+"     .",
-"`f c #ffffff",
+"      ",
-"`g c #ffffff",
+"     .",
-"`h c #ffffff",
+"      ",
-"`i c #ffffff",
+"     .",
-"`j c #ffffff",
+"      ",
-"`k c #ffffff",
+"     .",
-"`l c #ffffff",
+"      ",
-"`m c #ffffff",
+"     .",
-"`n c #ffffff",
+"      ",
-"`o c #ffffff",
+"     .",
-"`p c #ffffff",
+"      ",
-"`q c #ffffff",
+"     .",
-"`r c #ffffff",
+"      ",
-"`s c #ffffff",
+"     ."};
 "`t c #ffffff",
 "`u c #ffffff",
 "`v c #ffffff",
 "`w c #ffffff",
 "`x c #ffffff",
 "`y c #ffffff",
 "`z c #ffffff",
 "`A c #ffffff",
 "`B c #ffffff",
 "`C c #ffffff",
 "`D c #ffffff",
 "`E c #ffffff",
 "`F c #ffffff",
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "`.`.`.`.`.`.",
 "`.`.`.`.`.``",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.``",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.``",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.``",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.``",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.``",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.``",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.``",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.``",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.``",
 "`.`.`.`.`.`.",
 "`.`.`.`.`.``"
 };
--- a/etc/tree-widget/folder/handle.png
+++ b/etc/tree-widget/folder/handle.png
--- a/etc/tree-widget/folder/handle.xpm
+++ b/etc/tree-widget/folder/handle.xpm
@ -1,285 +1,27 @@
 /* XPM */
-static char *handle[] = {
+static char * handle_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"10 22 2 1",
-"    10    22      256            2",
+" 	c None",
-/* colors */
+".	c #ADA5C6",
-"`` c #000000",
+"          ",
-"`. c #a5a5c6",
+"          ",
-"`# c #ada5c6",
+"          ",
-"`a c #cecee7",
+"          ",
-"`b c #ceceff",
+"          ",
-"`c c None",
+"          ",
-"`d c #ffffff",
+"          ",
-"`e c #ffffff",
+"          ",
-"`f c #ffffff",
+"          ",
-"`g c #ffffff",
+"          ",
-"`h c #ffffff",
+"          ",
-"`i c #ffffff",
+" . . . . .",
-"`j c #ffffff",
+"          ",
-"`k c #ffffff",
+"          ",
-"`l c #ffffff",
+"          ",
-"`m c #ffffff",
+"          ",
-"`n c #ffffff",
+"          ",
-"`o c #ffffff",
+"          ",
-"`p c #ffffff",
+"          ",
-"`q c #ffffff",
+"          ",
-"`r c #ffffff",
+"          ",
-"`s c #ffffff",
+"          "};
 "`t c #ffffff",
 "`u c #ffffff",
 "`v c #ffffff",
 "`w c #ffffff",
 "`x c #ffffff",
 "`y c #ffffff",
 "`z c #ffffff",
 "`A c #ffffff",
 "`B c #ffffff",
 "`C c #ffffff",
 "`D c #808000",
 "`E c #ffffff",
 "`F c #ffffff",
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`#`c`#`c`#`c`#`c`#",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c"
 };
--- a/etc/tree-widget/folder/leaf.png
+++ b/etc/tree-widget/folder/leaf.png
--- a/etc/tree-widget/folder/leaf.xpm
+++ b/etc/tree-widget/folder/leaf.xpm
@ -1,285 +1,34 @@
 /* XPM */
-static char *leaf[] = {
+static char * leaf_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"16 22 9 1",
-"    16    22      256            2",
+" 	c None",
-/* colors */
+".	c #424242",
-"`` c #000000",
+"+	c #949494",
-"`. c #424242",
+"@	c #9C9C9C",
-"`# c #848484",
+"#	c #A5A5A5",
-"`a c #949494",
+"$	c #ADADAD",
-"`b c #9c9c9c",
+"%	c #848484",
-"`c c #a5a5a5",
+"&	c #B5B5B5",
-"`d c #adadad",
+"*	c #BDBDBD",
-"`e c #b5b5b5",
+"                ",
-"`f c #bdbdbd",
+"                ",
-"`g c #c6c6c6",
+"                ",
-"`h c None",
+"                ",
-"`i c #ffffff",
+"                ",
-"`j c #ffffff",
+".......         ",
-"`k c #ffffff",
+".++@@#..        ",
-"`l c #ffffff",
+".+@@##.$.       ",
-"`m c #ffffff",
+".@@###....      ",
-"`n c #ffffff",
+".@%%%+%$&.      ",
-"`o c #ffffff",
+".###$$$&&.      ",
-"`p c #ffffff",
+".#%+%%%&*.      ",
-"`q c #ffffff",
+".#$$$&&**.      ",
-"`r c #ffffff",
+".$%%+%%**.      ",
-"`s c #ffffff",
+".$$&&****.      ",
-"`t c #ffffff",
+".$&&*****.      ",
-"`u c #ffffff",
+"..........      ",
-"`v c #ffffff",
+"                ",
-"`w c #ffffff",
+"                ",
-"`x c #ffffff",
+"                ",
-"`y c #ffffff",
+"                ",
-"`z c #ffffff",
+"                "};
 "`A c #ffffff",
 "`B c #ffffff",
 "`C c #ffffff",
 "`D c #ffffff",
 "`E c #ffffff",
 "`F c #ffffff",
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`.`.`.`.`.`.`.`h`h`h`h`h`h`h`h`h",
 "`.`a`a`b`b`c`.`.`h`h`h`h`h`h`h`h",
 "`.`a`b`b`c`c`.`d`.`h`h`h`h`h`h`h",
 "`.`b`b`c`c`c`.`.`.`.`h`h`h`h`h`h",
 "`.`b`#`#`#`a`#`d`e`.`h`h`h`h`h`h",
 "`.`c`c`c`d`d`d`e`e`.`h`h`h`h`h`h",
 "`.`c`#`a`#`#`#`e`f`.`h`h`h`h`h`h",
 "`.`c`d`d`d`e`e`f`f`.`h`h`h`h`h`h",
 "`.`d`#`#`a`#`#`f`f`.`h`h`h`h`h`h",
 "`.`d`d`e`e`f`f`f`f`.`h`h`h`h`h`h",
 "`.`d`e`e`f`f`f`f`f`.`h`h`h`h`h`h",
 "`.`.`.`.`.`.`.`.`.`.`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h",
 "`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h"
 };
--- a/etc/tree-widget/folder/no-guide.png
+++ b/etc/tree-widget/folder/no-guide.png
--- a/etc/tree-widget/folder/no-guide.xpm
+++ b/etc/tree-widget/folder/no-guide.xpm
@ -1,285 +1,26 @@
 /* XPM */
-static char *no-guide[] = {
+static char * no_guide_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"6 22 1 1",
-"     6    22      256            2",
+" 	c None",
-/* colors */
+"      ",
-"`` c None",
+"      ",
-"`. c #ffffff",
+"      ",
-"`# c #ffffff",
+"      ",
-"`a c #ffffff",
+"      ",
-"`b c #ffffff",
+"      ",
-"`c c #ffffff",
+"      ",
-"`d c #ffffff",
+"      ",
-"`e c #ffffff",
+"      ",
-"`f c #ffffff",
+"      ",
-"`g c #ffffff",
+"      ",
-"`h c #ffffff",
+"      ",
-"`i c #ffffff",
+"      ",
-"`j c #ffffff",
+"      ",
-"`k c #ffffff",
+"      ",
-"`l c #ffffff",
+"      ",
-"`m c #ffffff",
+"      ",
-"`n c #ffffff",
+"      ",
-"`o c #ffffff",
+"      ",
-"`p c #ffffff",
+"      ",
-"`q c #ffffff",
+"      ",
-"`r c #ffffff",
+"      "};
 "`s c #ffffff",
 "`t c #ffffff",
 "`u c #ffffff",
 "`v c #ffffff",
 "`w c #ffffff",
 "`x c #ffffff",
 "`y c #ffffff",
 "`z c #ffffff",
 "`A c #ffffff",
 "`B c #ffffff",
 "`C c #ffffff",
 "`D c #ffffff",
 "`E c #ffffff",
 "`F c #ffffff",
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````",
 "````````````"
 };
--- a/etc/tree-widget/folder/no-handle.png
+++ b/etc/tree-widget/folder/no-handle.png
--- a/etc/tree-widget/folder/no-handle.xpm
+++ b/etc/tree-widget/folder/no-handle.xpm
@ -1,285 +1,26 @@
 /* XPM */
-static char *no-handle[] = {
+static char * no_handle_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"10 22 1 1",
-"    10    22      256            2",
+" 	c None",
-/* colors */
+"          ",
-"`` c #000000",
+"          ",
-"`. c #a5a5c6",
+"          ",
-"`# c #ada5c6",
+"          ",
-"`a c #cecee7",
+"          ",
-"`b c #ceceff",
+"          ",
-"`c c None",
+"          ",
-"`d c #ffffff",
+"          ",
-"`e c #ffffff",
+"          ",
-"`f c #ffffff",
+"          ",
-"`g c #ffffff",
+"          ",
-"`h c #ffffff",
+"          ",
-"`i c #ffffff",
+"          ",
-"`j c #ffffff",
+"          ",
-"`k c #ffffff",
+"          ",
-"`l c #ffffff",
+"          ",
-"`m c #ffffff",
+"          ",
-"`n c #ffffff",
+"          ",
-"`o c #ffffff",
+"          ",
-"`p c #ffffff",
+"          ",
-"`q c #ffffff",
+"          ",
-"`r c #ffffff",
+"          "};
 "`s c #ffffff",
 "`t c #ffffff",
 "`u c #ffffff",
 "`v c #ffffff",
 "`w c #ffffff",
 "`x c #ffffff",
 "`y c #ffffff",
 "`z c #ffffff",
 "`A c #ffffff",
 "`B c #ffffff",
 "`C c #ffffff",
 "`D c #808000",
 "`E c #ffffff",
 "`F c #ffffff",
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c",
 "`c`c`c`c`c`c`c`c`c`c"
 };
--- a/etc/tree-widget/folder/open.png
+++ b/etc/tree-widget/folder/open.png
--- a/etc/tree-widget/folder/open.xpm
+++ b/etc/tree-widget/folder/open.xpm
@ -1,285 +1,39 @@
 /* XPM */
-static char *open[] = {
+static char * open_xpm[] = {
-/* width height num_colors chars_per_pixel */
+"16 22 14 1",
-"    16    22      256            2",
+" 	c None",
-/* colors */
+".	c #848400",
-"`` c #848400",
+"+	c #D6D67B",
-"`. c #a5a5c6",
+"@	c #CECE7B",
-"`# c #adad39",
+"#	c #CECE73",
-"`a c #adad42",
+"$	c #C6C66B",
-"`b c #b5b54a",
+"%	c #BDBD5A",
-"`c c #bdbd52",
+"&	c #BDBD52",
-"`d c #bdbd5a",
+"*	c #ADAD39",
-"`e c #c6c663",
+"=	c #ADAD42",
-"`f c #c6c66b",
+"-	c #B5B54A",
-"`g c #cece6b",
+";	c #C6C663",
-"`h c #cece73",
+">	c #CECE6B",
-"`i c #cece7b",
+",	c #A5A5C6",
-"`j c #d6d67b",
+"                ",
-"`k c None",
+"                ",
-"`l c #ffffff",
+"                ",
-"`m c #ffffff",
+"                ",
-"`n c #ffffff",
+"                ",
-"`o c #ffffff",
+"                ",
-"`p c #ffffff",
+" ....           ",
-"`q c #ffffff",
+".+@@#.....      ",
-"`r c #ffffff",
+".@@##$$%%&.     ",
-"`s c #ffffff",
+".@#..........   ",
-"`t c #ffffff",
+".#.*==--&%%;;.  ",
-"`u c #ffffff",
+".#.==--&%%;;.   ",
-"`v c #ffffff",
+"..==--&%%;;$.   ",
-"`w c #ffffff",
+"..=--&%%;;$.    ",
-"`x c #ffffff",
+".=--&%%;;$>.    ",
-"`y c #ffffff",
+"...........     ",
-"`z c #ffffff",
+"                ",
-"`A c #ffffff",
+"     ,          ",
-"`B c #ffffff",
+"                ",
-"`C c #ffffff",
+"     ,          ",
-"`D c #ffffff",
+"                ",
-"`E c #ffffff",
+"     ,          "};
 "`F c #ffffff",
 "`G c #ffffff",
 "`H c #ffffff",
 "`I c #ffffff",
 "`J c #ffffff",
 "`K c #ffffff",
 "`L c #ffffff",
 "`M c #ffffff",
 "`N c #ffffff",
 "`O c #ffffff",
 "`P c #ffffff",
 "`Q c #ffffff",
 "`R c #ffffff",
 "`S c #ffffff",
 "`T c #ffffff",
 "`U c #ffffff",
 "`V c #ffffff",
 "`W c #ffffff",
 "`X c #ffffff",
 "`Y c #ffffff",
 "`Z c #ffffff",
 "`0 c #ffffff",
 "`1 c #ffffff",
 "`2 c #ffffff",
 "`3 c #ffffff",
 "`4 c #ffffff",
 "`5 c #ffffff",
 "`6 c #ffffff",
 "`7 c #ffffff",
 "`8 c #ffffff",
 ".` c #ffffff",
 ".. c #ffffff",
 ".# c #ffffff",
 ".a c #ffffff",
 ".b c #ffffff",
 ".c c #ffffff",
 ".d c #ffffff",
 ".e c #ffffff",
 ".f c #ffffff",
 ".g c #ffffff",
 ".h c #ffffff",
 ".i c #ffffff",
 ".j c #ffffff",
 ".k c #ffffff",
 ".l c #ffffff",
 ".m c #ffffff",
 ".n c #ffffff",
 ".o c #ffffff",
 ".p c #ffffff",
 ".q c #ffffff",
 ".r c #ffffff",
 ".s c #ffffff",
 ".t c #ffffff",
 ".u c #ffffff",
 ".v c #ffffff",
 ".w c #ffffff",
 ".x c #ffffff",
 ".y c #ffffff",
 ".z c #ffffff",
 ".A c #ffffff",
 ".B c #ffffff",
 ".C c #ffffff",
 ".D c #ffffff",
 ".E c #ffffff",
 ".F c #ffffff",
 ".G c #ffffff",
 ".H c #ffffff",
 ".I c #ffffff",
 ".J c #ffffff",
 ".K c #ffffff",
 ".L c #ffffff",
 ".M c #ffffff",
 ".N c #ffffff",
 ".O c #ffffff",
 ".P c #ffffff",
 ".Q c #ffffff",
 ".R c #ffffff",
 ".S c #ffffff",
 ".T c #ffffff",
 ".U c #ffffff",
 ".V c #ffffff",
 ".W c #ffffff",
 ".X c #ffffff",
 ".Y c #ffffff",
 ".Z c #ffffff",
 ".0 c #ffffff",
 ".1 c #ffffff",
 ".2 c #ffffff",
 ".3 c #ffffff",
 ".4 c #ffffff",
 ".5 c #ffffff",
 ".6 c #ffffff",
 ".7 c #ffffff",
 ".8 c #ffffff",
 "#` c #ffffff",
 "#. c #ffffff",
 "## c #ffffff",
 "#a c #ffffff",
 "#b c #ffffff",
 "#c c #ffffff",
 "#d c #ffffff",
 "#e c #ffffff",
 "#f c #ffffff",
 "#g c #ffffff",
 "#h c #ffffff",
 "#i c #ffffff",
 "#j c #ffffff",
 "#k c #ffffff",
 "#l c #ffffff",
 "#m c #ffffff",
 "#n c #ffffff",
 "#o c #ffffff",
 "#p c #ffffff",
 "#q c #ffffff",
 "#r c #ffffff",
 "#s c #ffffff",
 "#t c #ffffff",
 "#u c #ffffff",
 "#v c #ffffff",
 "#w c #ffffff",
 "#x c #ffffff",
 "#y c #ffffff",
 "#z c #ffffff",
 "#A c #ffffff",
 "#B c #ffffff",
 "#C c #ffffff",
 "#D c #ffffff",
 "#E c #ffffff",
 "#F c #ffffff",
 "#G c #ffffff",
 "#H c #ffffff",
 "#I c #ffffff",
 "#J c #ffffff",
 "#K c #ffffff",
 "#L c #ffffff",
 "#M c #ffffff",
 "#N c #ffffff",
 "#O c #ffffff",
 "#P c #ffffff",
 "#Q c #ffffff",
 "#R c #ffffff",
 "#S c #ffffff",
 "#T c #ffffff",
 "#U c #ffffff",
 "#V c #ffffff",
 "#W c #ffffff",
 "#X c #ffffff",
 "#Y c #ffffff",
 "#Z c #ffffff",
 "#0 c #ffffff",
 "#1 c #ffffff",
 "#2 c #ffffff",
 "#3 c #ffffff",
 "#4 c #ffffff",
 "#5 c #ffffff",
 "#6 c #ffffff",
 "#7 c #ffffff",
 "#8 c #ffffff",
 "a` c #ffffff",
 "a. c #ffffff",
 "a# c #ffffff",
 "aa c #ffffff",
 "ab c #ffffff",
 "ac c #ffffff",
 "ad c #ffffff",
 "ae c #ffffff",
 "af c #ffffff",
 "ag c #ffffff",
 "ah c #ffffff",
 "ai c #ffffff",
 "aj c #ffffff",
 "ak c #ffffff",
 "al c #ffffff",
 "am c #ffffff",
 "an c #ffffff",
 "ao c #ffffff",
 "ap c #ffffff",
 "aq c #ffffff",
 "ar c #ffffff",
 "as c #ffffff",
 "at c #ffffff",
 "au c #ffffff",
 "av c #ffffff",
 "aw c #ffffff",
 "ax c #ffffff",
 "ay c #ffffff",
 "az c #ffffff",
 "aA c #ffffff",
 "aB c #ffffff",
 "aC c #ffffff",
 "aD c #ffffff",
 "aE c #ffffff",
 "aF c #ffffff",
 "aG c #ffffff",
 "aH c #ffffff",
 "aI c #ffffff",
 "aJ c #ffffff",
 "aK c #ffffff",
 "aL c #ffffff",
 "aM c #ffffff",
 "aN c #ffffff",
 "aO c #ffffff",
 "aP c #ffffff",
 "aQ c #ffffff",
 "aR c #ffffff",
 "aS c #ffffff",
 "aT c #ffffff",
 "aU c #ffffff",
 "aV c #ffffff",
 "aW c #ffffff",
 "aX c #ffffff",
 "aY c #ffffff",
 "aZ c #ffffff",
 "a0 c #ffffff",
 "a1 c #ffffff",
 "a2 c #ffffff",
 "a3 c #ffffff",
 "a4 c #ffffff",
 "a5 c #ffffff",
 "a6 c #ffffff",
 "a7 c #ffffff",
 "a8 c #ffffff",
 /* pixels */
 "`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
 "`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
 "`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
 "`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
 "`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
 "`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
 "`k`````````k`k`k`k`k`k`k`k`k`k`k",
 "```j`i`i`h```````````k`k`k`k`k`k",
 "```i`i`h`h`f`f`d`d`c```k`k`k`k`k",
 "```i`h`````````````````````k`k`k",
 "```h```#`a`a`b`b`c`d`d`e`e```k`k",
 "```h```a`a`b`b`c`d`d`e`e```k`k`k",
 "`````a`a`b`b`c`d`d`e`e`f```k`k`k",
 "`````a`b`b`c`d`d`e`e`f```k`k`k`k",
 "```a`b`b`c`d`d`e`e`f`g```k`k`k`k",
 "```````````````````````k`k`k`k`k",
 "`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
 "`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
 "`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
 "`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k",
 "`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k",
 "`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k"
 };
--- a/etc/ulimit.hack
+++ b/etc/ulimit.hack
@ -37,4 +37,23 @@ exit 0
 #
 # Upon system reboot, all processes will inherit the new large ulimit.
 # Copyright (c) 1999, 2003, 2006
 # Free Software Foundation, Inc.
 # COPYING PERMISSIONS:
 #
 #   This document is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation; either version 2 of the License, or
 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # arch-tag: 6f9a7072-9d07-4431-b0bb-e867648ad0b4
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@ -263,7 +263,7 @@
 	* quail/pypunct-b5.el ("chinese-py-punct-b5"): Change the title
 	Chinese characters from GB to Big5.
-2003-05-01  Bzyl Wlodzimierz  <matwb@julia.univ.gda.pl>  (tiny change)
+2003-05-01  Wlodzimierz Bzyl  <matwb@julia.univ.gda.pl>  (tiny change)
 	* quail/latin-pre.el ("polish-slash"): Add the rule "//"->?/.
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@ -1,3 +1,40 @@
 2006-06-09  Eli Zaretskii  <eliz@gnu.org>
 	* yow.c: Remove file.
 	* makefile.w32-in ($(BLD)/yow.$(O)): Remove target.
 	* Makefile.in (UTILITIES): Remove yow${EXEEXT}.
 	yow${EXEEXT}: Remove target.
 2006-06-04  Masatake YAMATO  <jet@gyve.org>
 	* ebrowse.c (main): Exit with EXIT_FAILURE if BROWSE file
 	doesn't exist, is not seekable, not is failed in ftall.
 2006-06-03  Eli Zaretskii  <eliz@gnu.org>
 	* makefile.w32-in (ALL): Add sorted-doc and digest-doc.
 	($(BLD)/sorted-doc.exe, $(BLD)/digest-doc.exe)
 	($(BLD)/test-distrib.exe): New targets.
 	(sorted-doc, digest-doc, test-distrib): New targets.
 	(install): Install sorted-doc.exe and digest-doc.exe.
 	($(BLD)/sorted-doc.$(O)): Update dependencies.
 	* digest-doc.c [DOS_NT] <top level>: Include fcntl.h and io.h.
 	(main) [DOS_NT]: Switch stdin to binary mode, if it is not a
 	terminal device.
 	* sorted-doc.c [DOS_NT] <top level>: Include fcntl.h and io.h.
 	[WINDOWSNT] <top level>: Don't redeclare malloc.
 	(main) [DOS_NT]: Switch stdin to binary mode, if it is not a
 	terminal device.
 	(main): Initialize bp, to avoid compiler warnings
 	* makefile.w32-in: Delete traces of leditcfns.c.
 	* leditcfns.c: Remove file.
 2006-05-23  Francesco Potort,Al(B  <pot@gnu.org>
 	* pop.c (pop_open, socket_connection, KPOP_SERVICE): Added
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@ -107,7 +107,7 @@ INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
 # Things that Emacs runs internally, or during the build process,
 #  which should not be installed in bindir.
 UTILITIES=  profile${EXEEXT} digest-doc${EXEEXT} sorted-doc${EXEEXT} movemail${EXEEXT} cvtmail${EXEEXT} fakemail${EXEEXT} \
-            yow${EXEEXT} hexl${EXEEXT} update-game-score${EXEEXT}
+            hexl${EXEEXT} update-game-score${EXEEXT}
 DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT}
@ -449,9 +449,6 @@ cvtmail${EXEEXT}: ${srcdir}/cvtmail.c
 fakemail${EXEEXT}: ${srcdir}/fakemail.c ../src/config.h
 	$(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail
 yow${EXEEXT}: ${srcdir}/yow.c ../src/epaths.h
 	$(CC) ${ALL_CFLAGS} ${srcdir}/yow.c $(LOADLIBES) -o yow
 emacsclient${EXEEXT}: ${srcdir}/emacsclient.c ../src/config.h $(GETOPTDEPS)
 	$(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c $(GETOPTOBJS)  \
 	   -DVERSION="\"${version}\"" \
--- a/lib-src/digest-doc.c
+++ b/lib-src/digest-doc.c
@ -26,12 +26,23 @@
 #include <stdio.h>
 #ifdef DOS_NT
 #include <fcntl.h>		/* for O_BINARY */
 #include <io.h>			/* for setmode */
 #endif
 int
 main ()
 {
  register int ch;
  register int notfirst = 0;
 #ifdef DOS_NT
  /* DOC is a binary file.  */
  if (!isatty (fileno (stdin)))
    setmode (fileno (stdin), O_BINARY);
 #endif
  printf (".TL\n");
  printf ("Command Summary for GNU Emacs\n");
  printf (".AU\nRichard M. Stallman\n");
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@ -3909,17 +3909,31 @@ main (argc, argv)
 	  fp = fopen (out_filename, "r");
 	  if (fp == NULL)
-	    yyerror ("file `%s' must exist for --append", out_filename);
+	    {
 	      yyerror ("file `%s' must exist for --append", out_filename);
 	      exit (EXIT_FAILURE);
 	    }
 	  rc = fseek (fp, 0, SEEK_END);
 	  if (rc == -1)
-	    yyerror ("error seeking in file `%s'", out_filename);
+	    {
 	      yyerror ("error seeking in file `%s'", out_filename);
 	      exit (EXIT_FAILURE);
 	    }
 	  rc = ftell (fp);
 	  if (rc == -1)
-	    yyerror ("error getting size of file `%s'", out_filename);
+	    {
 	      yyerror ("error getting size of file `%s'", out_filename);
 	      exit (EXIT_FAILURE);
 	    }
 	  else if (rc == 0)
-	    yyerror ("file `%s' is empty", out_filename);
+	    {
 	      yyerror ("file `%s' is empty", out_filename);
 	      /* It may be ok to use an empty file for appending.
 		 exit (EXIT_FAILURE); */
 	    }
 	  fclose (fp);
 	}
--- a/lib-src/leditcfns.c
+++ b/lib-src/leditcfns.c
@ -1,21 +0,0 @@
 #include <sgtty.h>
 #include <signal.h>
 #define STRLEN 100
 static char str[STRLEN+1] = "%?emacs"; /* extra char for the null */
 switch_to_proc(){
    char *ptr = str;
    while (*ptr) ioctl(0, TIOCSTI, ptr++);
    ioctl(0, TIOCSTI, "\n");
    kill(getpid(), SIGTSTP);
    }
 set_proc_str(ptr) char *ptr; {
    if (strlen(ptr) <= STRLEN)
 	strcpy(str, ptr);
    else
 	printf("string too long for set-proc-str: %s\n", ptr);
    }
 /* arch-tag: eb7ae804-0d6e-4077-ab42-7173821410c3
   (do not change this comment) */
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@ -20,7 +20,7 @@
 #  Boston, MA 02110-1301, USA.
 #
-ALL	      = make-docfile hexl ctags etags movemail ebrowse
+ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc
 .PHONY: $(ALL)
@ -30,15 +30,10 @@ LOCAL_FLAGS	= -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
 # don't know what (if) to do with these yet...
 #
 #		$(BLD)/sorted-doc.exe	\
 #		$(BLD)/env.exe		\
 #		$(BLD)/server.exe	\
 #		$(BLD)/emacstool.exe	\
 #		$(BLD)/leditcfns.exe	\
 #		$(BLD)/emacsclient.exe	\
 #		$(BLD)/cvtmail.exe	\
 #		$(BLD)/digest-doc.exe	\
 #		$(BLD)/test-distrib.exe	\
 LIBS	      = $(BASE_LIBS) $(ADVAPI32)
@ -48,6 +43,12 @@ $(BLD)/hexl.exe:		$(BLD)/hexl.$(O)
 		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/hexl.$(O) $(LIBS)
 $(BLD)/fakemail.exe: 		$(BLD)/fakemail.$(O) $(BLD)/ntlib.$(O)
 		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/fakemail.$(O) $(BLD)/ntlib.$(O) $(LIBS)
 $(BLD)/sorted-doc.exe: 	$(BLD)/sorted-doc.$(O)
 		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/sorted-doc.$(O) $(LIBS)
 $(BLD)/digest-doc.exe: 	$(BLD)/digest-doc.$(O)
 		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/digest-doc.$(O) $(LIBS)
 $(BLD)/test-distrib.exe: $(BLD)/test-distrib.$(O)
 		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/test-distrib.$(O) $(LIBS)
 make-docfile:	$(BLD) $(BLD)/make-docfile.exe
 ctags:		$(BLD) $(BLD)/ctags.exe
@ -56,6 +57,11 @@ ebrowse:        $(BLD) $(BLD)/ebrowse.exe
 hexl:		$(BLD) $(BLD)/hexl.exe
 movemail:	$(BLD) $(BLD)/movemail.exe
 fakemail:	$(BLD) $(BLD)/fakemail.exe
 sorted-doc:	$(BLD) $(BLD)/sorted-doc.exe
 digest-doc:	$(BLD) $(BLD)/digest-doc.exe
 test-distrib:	$(BLD) $(BLD)/test-distrib.exe
 	"$(BLD)/test-distrib.exe" "$(SRC)/testfile"
 GETOPTOBJS = $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O)
 GETOPTDEPS = $(GETOPTOBJS) getopt.h
@ -114,15 +120,10 @@ $(BLD)/ctags.$(O): ctags.c
 #
 # don't know what to do with these yet...
 #
 # $(BLD)/sorted-doc.exe: 	$(BLD)/sorted-doc.$(O)
 # $(BLD)/yow.exe: 		$(BLD)/yow.$(O)
 # $(BLD)/emacstool.exe: 	$(BLD)/emacstool.$(O)
 # $(BLD)/leditcfns.exe: 	$(BLD)/leditcfns.$(O)
 # $(BLD)/server.exe: 		$(BLD)/server.$(O)
 # $(BLD)/cvtmail.exe: 		$(BLD)/cvtmail.$(O)
 # $(BLD)/digest-doc.exe: 	$(BLD)/digest-doc.$(O)
 # $(BLD)/emacsclient.exe: 	$(BLD)/emacsclient.$(O)
 # $(BLD)/test-distrib.exe: 	$(BLD)/test-distrib.$(O)
 #
 # From ..\src\Makefile.in
@ -293,6 +294,8 @@ install:	$(INSTALL_FILES)
 		$(CP) $(BLD)/ctags.exe $(INSTALL_DIR)/bin
 		$(CP) $(BLD)/hexl.exe $(INSTALL_DIR)/bin
 		$(CP) $(BLD)/movemail.exe $(INSTALL_DIR)/bin
 		$(CP) $(BLD)/sorted-doc.exe $(INSTALL_DIR)/bin
 		$(CP) $(BLD)/digest-doc.exe $(INSTALL_DIR)/bin
 		- mkdir "$(INSTALL_DIR)/etc"
 		$(CP) $(DOC) $(INSTALL_DIR)/etc
@ -448,7 +451,10 @@ $(BLD)/qsort.$(O) : \
 	$(SRC)/qsort.c
 $(BLD)/sorted-doc.$(O) : \
-	$(SRC)/sorted-doc.c
+	$(SRC)/sorted-doc.c \
 	$(EMACS_ROOT)/src/s/ms-w32.h \
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
 $(BLD)/tcp.$(O) : \
 	$(SRC)/tcp.c
@ -461,7 +467,3 @@ $(BLD)/timer.$(O) : \
 	$(EMACS_ROOT)/src/s/ms-w32.h \
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/lib-src/../src/config.h
 $(BLD)/yow.$(O) : \
 	$(SRC)/yow.c \
 	$(EMACS_ROOT)/lib-src/../src/paths.h
--- a/lib-src/sorted-doc.c
+++ b/lib-src/sorted-doc.c
@ -29,9 +29,15 @@
 #include <stdio.h>
 #include <ctype.h>
 #ifdef DOS_NT
 #include <fcntl.h>		/* for O_BINARY */
 #include <io.h>			/* for setmode */
 #endif
 #ifndef HAVE_STDLIB_H		/* config.h includes stdlib.  */
 #ifndef WINDOWSNT		/* src/s/ms-w32.h includes stdlib.h */
 extern char *malloc ();
 #endif
 #endif
 #define NUL	'\0'
 #define MARKER '\037'
@ -134,6 +140,14 @@ main ()
  DOCSTR *docs = NULL;          /* chain of allocated DOCSTRS */
  char buf[512];		/* line buffer */
 #ifdef DOS_NT
  /* DOC is a binary file.  */
  if (!isatty (fileno (stdin)))
    setmode (fileno (stdin), O_BINARY);
 #endif
  bp = buf;
  while (1)			/* process one char at a time */
    {
      /* this char from the DOCSTR file */
--- a/lib-src/yow.c
+++ b/lib-src/yow.c
@ -1,185 +0,0 @@
 /*
 * yow.c
 *
 * Print a quotation from Zippy the Pinhead.
 * Qux <Kaufman-David@Yale> March 6, 1986
 *
 * This file is in the public domain because the author published it
 * with no copyright notice before the US signed the Bern Convention.
 *
 * With dynamic memory allocation.
 */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 #include <stdio.h>
 #include <ctype.h>
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
 #else
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #else
 #include <time.h>
 #endif
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include "epaths.h"		/* For PATH_DATA.  */
 #define BUFSIZE  80
 #define SEP      '\0'
 #ifndef YOW_FILE
 #define YOW_FILE "yow.lines"
 #endif
 #ifdef MSDOS
 #define rootrelativepath(rel) \
 ({\
    static char res[BUFSIZE], *p;\
    strcpy (res, argv[0]);\
    p = res + strlen (res);\
    while (p != res && *p != '/' && *p != '\\' && *p != ':') p--;\
    strcpy (p + 1, "../");\
    strcpy (p + 4, rel);\
    &res;})
 #endif
 void yow();
 void setup_yow();
 int
 main (argc, argv)
     int argc;
     char *argv[];
 {
  FILE *fp;
  char file[BUFSIZ];
  if (argc > 2 && !strcmp (argv[1], "-f"))
    strcpy (file, argv[2]);
  else
 #ifdef vms
    sprintf (file, "%s%s", PATH_DATA, YOW_FILE);
 #else
    sprintf (file, "%s/%s", PATH_DATA, YOW_FILE);
 #endif
  if ((fp = fopen(file, "r")) == NULL) {
    fprintf(stderr, "yow: ");
    perror(file);
    exit(EXIT_FAILURE);
  }
  /* initialize random seed */
  srand((int) (getpid() + time((time_t *) 0)));
  setup_yow(fp);
  yow(fp);
  fclose(fp);
  return EXIT_SUCCESS;
 }
 static long len = -1;
 static long header_len;
 #define AVG_LEN 40		/* average length of a quotation */
 /* Sets len and header_len */
 void
 setup_yow(fp)
     FILE *fp;
 {
  int c;
  /* Get length of file */
  /* Because the header (stuff before the first SEP) can be very long,
   * thus biasing our search in favor of the first quotation in the file,
   * we explicitly skip that. */
  while ((c = getc(fp)) != SEP) {
    if (c == EOF) {
      fprintf(stderr, "yow: file contains no separators\n");
      exit(EXIT_FAILURE);
    }
  }
  header_len = ftell(fp);
  if (header_len > AVG_LEN)
    header_len -= AVG_LEN;	/* allow the first quotation to appear */
  if (fseek(fp, 0L, 2) == -1) {
    perror("yow");
    exit(EXIT_FAILURE);
  }
  len = ftell(fp) - header_len;
 }
 /* go to a random place in the file and print the quotation there */
 void
 yow (fp)
     FILE *fp;
 {
  long offset;
  int c, i = 0;
  char *buf;
  unsigned int bufsize;
  offset = rand() % len + header_len;
  if (fseek(fp, offset, 0) == -1) {
    perror("yow");
    exit(EXIT_FAILURE);
  }
  /* Read until SEP, read next line, print it.
     (Note that we will never print anything before the first separator.)
     If we hit EOF looking for the first SEP, just recurse. */
  while ((c = getc(fp)) != SEP)
    if (c == EOF) {
      yow(fp);
      return;
    }
  /* Skip leading whitespace, then read in a quotation.
     If we hit EOF before we find a non-whitespace char, recurse. */
  while (isspace(c = getc(fp)))
    ;
  if (c == EOF) {
    yow(fp);
    return;
  }
  bufsize = BUFSIZE;
  buf = (char *) malloc(bufsize);
  if (buf == (char *)0) {
    fprintf(stderr, "yow: virtual memory exhausted\n");
    exit (EXIT_FAILURE);
  }
  buf[i++] = c;
  while ((c = getc(fp)) != SEP && c != EOF) {
    buf[i++] = c;
    if (i == bufsize-1) {
      /* Yow! Is this quotation too long yet? */
      bufsize *= 2;
      buf = (char *) realloc(buf, bufsize);
      if (buf == (char *)0) {
 	fprintf(stderr, "yow: virtual memory exhausted\n");
 	exit (EXIT_FAILURE);
      }
    }
  }
  buf[i++] = 0;
  printf("%s\n", buf);
  free (buf);
 }
 /* arch-tag: e40fc0df-bafb-4001-af24-5c883d1c685e
   (do not change this comment) */
 /* yow.c ends here */
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@ -1,3 +1,738 @@
 2006-06-11  Chong Yidong  <cyd@stupidchicken.com>
 	* server.el (server-edit): No-op if no server buffers exist.
 2006-06-11  Robert J. Chassell  <bob@rattlesnake.com>
 	* textmodes/page-ext.el (pages-directory-for-addresses): 
 	Including `pages-directory-address-mode' in the function results
 	in the message "Buffer in which pages were found is deleted".
 2006-06-10  Carsten Dominik  <dominik@science.uva.nl>
 	* textmodes/org.el: (org-agenda-mode-map): Add bindings for
 	clocking functions.
 	(org-agenda-clock-in, org-check-running-clock)
 	(org-clock-out-if-current, org-remove-clock-overlays)
 	(org-put-clock-overlay): New functions.
 	(org-clock-marker, org-clock-file-total-minutes)
 	(org-clock-overlays): New variables.
 	(org-clock-display, org-clock-sum, org-clock-cancel)
 	(org-clock-out, org-clock-in): New commands.
 	(org-export): New function.
 	(org-emph-re): New constant.
 	(org-set-emph-re, org-do-emphasis-faces): New functions.
 	(org-emphasis-regexp-components, org-emphasis-alist): New options.
 	(org-set-font-lock-defaults): Call `org-do-emphasis-faces'.
 	(org-export-html-convert-emphasize): Use the configurable emphasis.
 	(org-cleaned-string-for-export): Make multiline emphasis visible
 	to the exporter.  New optional argument PARAMETERS.
 	(org-export-as-html): Specify :emph-multiline parameter to
 	`org-cleaned-string-for-export'.
 2006-06-10  Richard Stallman  <rms@gnu.org>
 	* help.el (help-for-help-internal): Clean up help text.
 2006-06-10  Andreas Schwab  <schwab@suse.de>
 	* language/ethio-util.el (ethio-fidel-to-java-buffer): Fix quoting
 	in doc string.
 	* progmodes/cperl-mode.el (cperl-short-docs): Likewise.
 2006-06-09  Karl Chen  <quarl@cs.berkeley.edu>
 	* progmodes/make-mode.el (makefile-fill-paragraph): Don't remove
 	spaces after the comment start.
 2006-06-09  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org>
 	* play/pong.el (pong-init-buffer):
 	Fill buffer with spaces instead of ^A.
 	* textmodes/ispell.el (ispell-kill-ispell): If ispell has been
 	launched asynchronously, delete its process instead of being cool.
 	(ispell-async-processp): Check for `delete-process' existence
 	instead of `kill-process' one for consistency.
 2006-06-09  Nick Roberts  <nickrob@snap.net.nz>
 	* progmodes/gdb-ui.el (gdb-set-gud-minor-mode-existing-buffers-1)
 	(gdb-prompt, gdb-set-gud-minor-mode-existing-buffers): Show status
 	in mode line at startup.
 2006-06-08  Kim F. Storm  <storm@cua.dk>
 	* ido.el (ido-take-first-match, ido-push-dir-first): New commands.
 	(ido-init-completion-maps): Bind them to M-SPC and M-v.
 	(ido-copy-current-file-name): Repeating C-w inserts whole file name.
 	(ido-file-internal): Pass full file name to write-file.
 	(ido-read-internal): Only pop stack elements automatically if they
 	actually match an existing directory or file name.
 2006-06-07  Kenichi Handa  <handa@m17n.org>
 	* international/mule.el (find-auto-coding): Don't handle the short
 	name `char-trans'.
 	* files.el (hack-local-variables-prop-line)
 	(hack-local-variables): Cancel the previous change.
 2006-06-06  Jesper Harder  <harder@phys.au.dk>
 	* ediff-diff.el (ediff-test-utility): Protect against
 	file-error.
 2006-06-06  Chong Yidong  <cyd@stupidchicken.com>
 	* diff-mode.el (diff-mode): Set buffer-read-only to t when
 	diff-default-read-only is non-nill.
 	(diff-hunk-kill, diff-file-kill, diff-split-hunk)
 	(diff-refine-hunk): Set inhibit-read-only to t.
 	* diff.el (diff-sentinel, diff): Set inhibit-read-only to t when
 	modifying the *Diff* buffer.
 	(diff-process-filter): New filter function for diff process that
 	sets inhibit-read-only to t when modifying the *Diff* buffer.
 2006-06-06  Carsten Dominik  <dominik@science.uva.nl>
 	* textmodes/org.el: (org-archive-subtree): Use end-of-subtree as
 	insertion point and control the number of empty lines.
 	(org-paste-subtree): Limit the number of empty lines at the end of
 	the inserted tree.
 	(org-agenda): Use buffer name of current file for narrowing.
 	(org-export-as-xml): Command removed.
 	(org-export-xml-type): Option removed.
 	(org-mode-map): Call `org-export-as-xoxo' directly.
 	(org-get-indentation): New optional argument LINE.
 	(org-fix-indentation, org-remove-tabs): New functions.
 	(org-export-as-ascii, org-ascii-level-start): Determine and apply
 	correct indentation for headlines that are converted it items.
 	(org-skip-comments): Remove table lines that contain narrowing
 	cookies but no other non-empty fields.
 	(org-set-tags): Allow groups of mutually exclusive tags.
 	(org-cmp-time): Sort 24:21 before items without time.
 	(org-get-time-of-day): Fixed the interpretation of 12pm and 12am.
 	(org-open-at-point): Require double colon also for numbers.
 2006-06-06  Kim F. Storm  <storm@cua.dk>
 	* ido.el (ido-default-file-method, ido-default-buffer-method):
 	Make choice values consistent with corresponding command names.
 	(ido-visit-buffer): Update accordingly.  Default to selected-window.
 2006-06-06  Nick Roberts  <nickrob@snap.net.nz>
 	* progmodes/gud.el (gud-running): Fix doc string.
 	(gud-menu-map): Use :visible instead fo :enable for debugger test.
 	(gud-tooltip-modes): Add python-mode.
 	(gud-tooltip-print-command): Add pdb.  Remove perldb.
 2006-06-05  Eli Zaretskii  <eliz@gnu.org>
 	* makefile.w32-in (bootstrap, $(lisp)/mh-e/mh-loaddefs.el):
 	Quote $(EMACS).
 2006-06-05  Richard Stallman  <rms@gnu.org>
 	* faces.el (defined-colors): Doc fix.
 2006-06-05  Thien-Thi Nguyen  <ttn@gnu.org>
 	* vc.el (vc-process-filter): Inhibit undo info collection around
 	call to insert.
 	(vc-setup-buffer): Likewise for call to erase-buffer.
 	(vc-do-command): Likewise for call to process-file.
 2006-06-05  Nick Roberts  <nickrob@snap.net.nz>
 	* progmodes/gud.el (gud-menu-map): Use a conditional help echo
 	for gud-go.
 	(gud-common-init): Other debuggers may trigger error.
 2006-06-05  Kenichi Handa  <handa@m17n.org>
 	* international/mule.el (find-auto-coding): Handle
 	enable-character-translation in file header.
 2006-06-04  Kim F. Storm  <storm@cua.dk>
 	* emacs-lisp/authors.el (authors-aliases): Add mode aliases.
 	(authors-fixed-entries): Fix spelling.
 	(authors-canonical-file-name): Don't report error for wildcards.
 	* help.el (view-emacs-news): Rewrite to support new NEWS,
 	NEWS.major, and NEWS.1-17 file naming.  Add more intelligense,
 	e.g. version 10 matches 1.10, and don't be confused by version 1.1
 	begin a prefix of 1.12 (etc).  A numeric prefix arg also works.
 2006-06-03  Vivek Dasmohapatra  <vivek@etla.org>
 	* progmodes/sh-script.el (sh-quoted-exec): New face for quoted
 	exec constructs like `foo bar`.
 	(sh-quoted-subshell): New helper function to search for a possibly
 	nested subshell (like `` or $()) within a "" quoted string.
 	(sh-font-lock-keywords-var): Add sh-quoted-exec for Bash.
 	(sh-apply-quoted-subshell): Flag quote characters inside a
 	subshell, which is itself already in a quoted region, as
 	punctuation, since this is the closest to what they actually are.
 	(sh-font-lock-syntactic-keywords): Add sh-quoted-subshell and
 	sh-apply-quoted-subshell.
 	(sh-font-lock-syntactic-face-function): Apply the new face for
 	text inside `` instead of the old font-lock-string-face.
 2006-06-03  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 	* term/mac-win.el (mac-ts-active-input-overlay): Add defvar.
 	(mac-ae-number, mac-ae-frame, mac-ae-script-language)
 	(mac-bytes-to-text-range, mac-ae-text-range-array)
 	(mac-ts-update-active-input-buf, mac-split-string-by-property-change)
 	(mac-replace-untranslated-utf-8-chars, mac-ts-update-active-input-area)
 	(mac-ts-unicode-for-key-event): New functions.
 	(mac-handle-toolbar-switch-mode): Use mac-ae-frame.
 	(mac-handle-font-selection): Use mac-ae-number.
 	(mac-ts-active-input-buf, mac-ts-update-active-input-area-seqno):
 	New variables.
 	(mac-ts-caret-position, mac-ts-raw-text, mac-ts-selected-raw-text)
 	(mac-ts-converted-text, mac-ts-selected-converted-text)
 	(mac-ts-block-fill-text, mac-ts-outline-text)
 	(mac-ts-selected-text, mac-ts-no-hilite): New faces.
 	(mac-ts-hilite-style-faces): New constant.
 	(mac-apple-event-map): Bind text input events.
 	(mac-dispatch-apple-event): Use command-execute instead of
 	call-interactively.
 	(global-map): Don't bind mac-apple-event.
 	(special-event-map): Bind mac-apple-event.
 2006-06-02  Eli Zaretskii  <eliz@gnu.org>
 	* makefile.w32-in (EMACS): Remove quotes from the Emacs executable
 	file name.
 	(emacs): Enclose the value of $(EMACS) in quotes.
 2006-06-02  Juri Linkov  <juri@jurta.org>
 	* international/mule.el (sgml-html-meta-auto-coding-function):
 	Remove the condition `(search-forward "<html" size t)'.
 	Replace `\"' with `[\"']?' in `re-search-forward'.
 2006-06-02  Kenichi Handa  <handa@m17n.org>
 	* files.el (hack-local-variables-prop-line): Ignore `char-trans'
 	as well as `coding'.
 	(hack-local-variables): Likewise.
 	* international/mule.el (enable-character-translation): Put
 	permanent-local and safe-local-variable properties.
 	(find-auto-coding): Handle char-trans: tag.
 2006-06-02  Juri Linkov  <juri@jurta.org>
 	* international/mule.el (sgml-html-meta-auto-coding-function):
 	Limit the search by the end of the HTML header (if any).
 2006-06-01  Richard Stallman  <rms@gnu.org>
 	* subr.el (with-current-buffer): Doc fix.
 2006-06-02  Masatake YAMATO  <jet@gyve.org>
 	* progmodes/compile.el (compilation-error-regexp-alist-alist::gcov-*):
 	Almost rewrite. Underlines over all lines of gcov output are too
 	uncomfortable to read.  Suggested by Dan Nicolaescu.
 2006-06-01  Luc Teirlinck  <teirllm@auburn.edu>
 	* progmodes/inf-lisp.el (inferior-lisp-mode): Doc fixes.
 	* shell.el (shell-mode): Use shell-mode-map in docstring.
 	* comint.el (comint-send-input): Do not add help-echo and
 	mouse-face to input if `comint-use-prompt-regexp' is non-nil.
 2006-06-01  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 	* term/x-win.el: Change x-menu-bar-start to menu-bar-open.
 2006-06-01  Nick Roberts  <nickrob@snap.net.nz>
 	* progmodes/gdb-ui.el (gdb-look-up-stack): New variable.
 	(gdb-stopped, gdb-info-stack-custom): If there is no source info
 	look up the stack and pop up GUD buffer if necessary.
 	(gdb-frames-select): Remove redundant call to gud-display-frame.
 	(gdb-info-threads-custom): Keep point at start of buffer.
 	(gdb-find-file-hook): Make it work for pre-GDB 6.4.
 2006-05-31  Juri Linkov  <juri@jurta.org>
 	* replace.el (query-replace-read-from, query-replace-read-to):
 	Bind `history-add-new-input' to nil.  Call `add-to-history'.
 2006-05-31  Takaaki Ota  <Takaaki.Ota@am.sony.com>
 	* textmodes/table.el: Convert all HTML tags to lower case for
 	XHTML compatibility.
 2006-05-31  Masatake YAMATO  <jet@gyve.org>
 	* progmodes/compile.el:
 	(compilation-error-regexp-alist-alist::gcov-called-line):
 	Don't put face on `-' lines in gcov file.  Suggested by Dan Nicolaescu.
 2006-05-31  Nick Roberts  <nickrob@snap.net.nz>
 	* progmodes/gud.el (gud-query-cmdline, gud-common-init):
 	Revert inadvertant changes made with last commit.
 2006-05-30  Reiner Steib  <Reiner.Steib@gmx.de>
 	* textmodes/flyspell.el (turn-on-flyspell, turn-off-flyspell):
 	New functions.
 	* textmodes/text-mode.el (text-mode-hook): Use turn-on-flyspell.
 2006-05-30  Carsten Dominik  <dominik@science.uva.nl>
 	* textmodes/org.el: (org-agenda-highlight-todo): Make sure regexp
 	only matches in the right place.
 	(org-upcoming-deadline): New face.
 	(org-agenda-get-deadlines): Use new face `org-upcoming-deadline'.
 	(org-export-ascii-underline): Rename constant `org-ascii-underline'
 	and make it an option.
 	(org-export-ascii-bullets): New option.
 	(org-export-as-html): Many changes to emit valid XHTML.
 	(org-par-open): New variable.
 	(org-open-par, org-close-par-maybe, org-close-li-maybe): New functions.
 	(org-html-do-expand, org-section-number): Fixedcase in `replace-match'.
 	(org-timeline): Pass `org-timeline-show-empty-dates' to
 	`org-get-all-dates'. Interpret empty dates returned by `org-get-all-dates'.
 	(org-get-all-dates): New argument EMPTY.  Add dates without
 	entries to the list, mark large ranges of empty dates.
 	(org-point-in-group, org-context): New functions.
 2006-05-30  Nick Roberts  <nickrob@snap.net.nz>
 	* progmodes/gud.el (gud-stop-subjob): Make it work in all buffers.
 	* progmodes/gdb-ui.el: Move gdb-mouse-toggle-breakpoint-* to
 	C-mouse-1.  Move gdb-mouse-until to mouse-3, gdb-mouse-jump
 	to C-mouse-3 (for 2 button mice).
 	(gdb-send): Do the right thing for C-d.
 	* speedbar.el (speedbar-detach): Delete.
 	(speedbar-easymenu-definition-trailer): Remove speedbar-detach as
 	it breaks things.
 	(speedbar-reconfigure-keymaps): Always add extra items to pop up menu.
 2006-05-30  Daniel Pfeiffer  <occitan@esperanto.org>
 	* files.el (auto-mode-alist): Add makepp suffix and optional mk on
 	Makeppfile.
 	* progmodes/compile.el (compilation-error-regexp-alist-alist):
 	Add makepp diagnostic.
 2006-05-29  Richard Stallman  <rms@gnu.org>
 	* window.el (fit-window-to-buffer): Doc fix.
 	* help.el (temp-buffer-max-height): Doc fix.
 	* subr.el (with-current-buffer): Doc fix.
 2006-05-29  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 	* term/x-win.el: Bind F10 to menu-bar-start if available.
 2006-05-28  Dan Nicolaescu  <dann@ics.uci.edu>
 	* term.el (term-if-xemacs, term-ifnot-xemacs): Delete, replace
 	uses with a simple test.
 	(term-set-escape-char, term-mode, term-check-kill-echo-list)
 	(term-send-raw-string, term-send-raw, term-mouse-paste)
 	(term-char-mode, term-line-mode, term-exec, term-sentinel)
 	(term-handle-exit, term-read-input-ring)
 	(term-previous-matching-input-string)
 	(term-previous-matching-input-string-position)
 	(term-previous-matching-input-from-input)
 	(term-replace-by-expanded-history, term-send-input)
 	(term-skip-prompt, term-bol, term-send-invisible)
 	(term-kill-input, term-delchar-or-maybe-eof)
 	(term-backward-matching-input, term-check-source)
 	(term-proc-query, term-emulate-terminal)
 	(term-handle-colors-array, term-process-pager, term-pager-line)
 	(term-pager-bob, term-unwrap-line, term-word)
 	(term-dynamic-complete-filename)
 	(term-dynamic-complete-as-filename)
 	(term-dynamic-simple-complete): Replace one arm ifs with whens or
 	unlesses.
 2006-05-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 	* files.el (hack-one-local-variable-eval-safep): Don't burp if used
 	during bootstrapping.
 	* emacs-lisp/ewoc.el (ewoc--current-dll): Remove.
 	Basically undo the change of 2006-05-26: use extra arguments instead of
 	dynamic scoping.
 	(ewoc-locate): Remove unused var `footer'.
 2006-05-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 	* emacs-lisp/ewoc.el (ewoc--insert-new-node): Use ewoc--refresh-node.
 	* emacs-lisp/autoload.el (no-update-autoloads): Declare.
 	(generate-file-autoloads): Obey it.  Return whether autoloads were
 	added at point or not.
 	(update-file-autoloads): Use this new return value.
 	Remove redundant test for the presence of an autoload cookie.
 	* emacs-lisp/autoload.el (autoload-find-file): New fun.
 	This one calls hack-local-variables.
 	(generate-file-autoloads, update-file-autoloads): Use it.
 	* textmodes/bibtex.el (bibtex-autokey-name-case-convert-function)
 	(bibtex-sort-entry-class): Add safe-local-variable predicate.
 	(bibtex-sort-entry-class-alist): Don't set the global value.
 	(bibtex-init-sort-entry-class-alist): New fun.
 	(bibtex-sort-buffer, bibtex-prepare-new-entry): Call it to compute
 	bibtex-init-sort-entry-class-alist from the buffer-local value (if any)
 	of bibtex-init-sort-entry-class.
 2006-05-28  Richard Stallman  <rms@gnu.org>
 	* subr.el (load-history-regexp): If FILE is relative, insist
 	entire last name component must match it.
 	(load-history-filename-element, load-history-regexp): Doc fixes.
 2006-05-29  Kim F. Storm  <storm@cua.dk>
 	* emacs-lisp/bindat.el (bindat-idx, bindat-raw): Rename dynamic vars
 	`pos' and `raw-data' for clarity, as eval forms may access these.
 2006-05-28  Kim F. Storm  <storm@cua.dk>
 	* emacs-lisp/bindat.el (bindat--unpack-u8): Use aref also for strings.
 2006-05-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 	* progmodes/make-mode.el (makefile-browser-map)
 	(makefile-mode-syntax-table): Move initialization inside declaration.
 	(makefile-fill-paragraph): Use the default comment-filling code.
 2006-05-28  Chong Yidong  <cyd@stupidchicken.com>
 	* replace.el (query-replace-defaults): New variable.
 	(query-replace-read-from): Use `query-replace-defaults' for
 	default value, instead of history list.
 	(query-replace-read-to): Update `query-replace-defaults'.
 2006-05-27  Chong Yidong  <cyd@stupidchicken.com>
 	* msb.el (mouse-select-buffer): Minor fix to make popup menu work
 	with no X toolkit.
 2006-05-28  Nick Roberts  <nickrob@snap.net.nz>
 	* tumme.el (tumme-show-all-from-dir-max-files): Fix typo.
 	(tumme-show-all-from-dir): Add autoload.
 2006-05-27  Mathias Dahl  <mathias.dahl@gmail.com>
 	* tumme.el: Change a lot of `(if .. (progn ..)' to `(when ..)'.
 	(tumme-remove-tag): Fix bug.
 2006-05-27  Thien-Thi Nguyen  <ttn@gnu.org>
 	* emacs-lisp/ewoc.el (ewoc--create): No longer take HEADER and
 	FOOTER args.  Update unique caller.
 	(ewoc-delete): Compute last node once before looping.
 	(ewoc--node-branch): Merge into unique caller.
 	(ewoc--node): Don't define constructor make-ewoc--node for this
 	structure.
 	(ewoc): Add member `hf-pp' to this structure.
 	(ewoc--wrap): New func.
 	(ewoc-create): Take additional arg NOSEP.  If nil, wrap node and
 	header/footer pretty-printers.  Save header/footer pretty-printer.
 	(ewoc-set-hf): Use ewoc's header/footer pretty-printer.  *
 	* pcvs.el (cvs-make-cvs-buffer): Specify NOSEP to `ewoc-create'.
 2006-05-27  Mathias Dahl  <mathias.dahl@gmail.com>
 	* dired.el (dired-mode-map): Change `tumme-tag-remove' to
 	`tumme-delete-tag'.  Rename `Remove Image Tag' to `Delete Image
 	Tag'.  Change "Compare directories..." to "Change Directories...".
 	Move tumme commands to Operate, Regexp and Immediate menus.
 	Change "Add Comment" to "Add Image Comment".  Change "Add Image
 	Tag" to "Add Image Tags".
 	* tumme.el (tumme-delete-tag): Rename from `tumme-tag-remove'.
 	(tumme-setup-dired-keybindings): Change `tumme-add-remove' to
 	`tumme-delete-tag'.
 2006-05-26  Luc Teirlinck  <teirllm@auburn.edu>
 	* shell.el (shell-mode): Call shell-dirtrack-mode after
 	list-buffers-directory is made a local variable, to avoid setting
 	the default value.
 2006-05-26  Kevin Ryde  <user42@zip.com.au>
 	* info.el (Info-index-next): Use where-is-internal to report
 	actual binding of Info-index-next, rather than hard-coded `,'.
 2006-05-26  Eli Zaretskii  <eliz@gnu.org>
 	* menu-bar.el (menu-bar-apropos-menu): Move "Find Key in Manual"
 	and "Find Command in Manual" to here.
 	* buff-menu.el (list-buffers-noselect): For Info buffers, use
 	Info-current-file as the file name.
 2006-05-26  Jonathan Yavner  <jyavner@member.fsf.org>
 	* ses.el (defadvice undo-more): Delete this defadvice.  The undo
 	overrides will now be done a different way.
 	(ses-set-parameter): Reapply this function for undo.
 	(ses-set-header-row): Reconstruct header row during undo.
 	(ses-widen): New function.
 	(ses-goto-data, ses-reconstruct-all): Use new function.
 	(ses-command-hook): Widen buffer during undo, before unupdating
 	the cells.
 	(ses-insert-row, ses-delete-row): Widen buffer during undo.
 	(ses-load, ses-header-row): Permit empty (zero-row) spreadsheets.
 	(ses-read-cell): Avoid stupid warning for RET RET on a cell whose
 	formula hasn't been executed yet.
 2006-05-26  Reiner Steib  <Reiner.Steib@gmx.de>
 	* comint.el (comint-kill-whole-line): Rename arg to count.
 	Fix doc string.
 2006-05-26  Chong Yidong  <cyd@stupidchicken.com>
 	* files.el (backup-buffer-copy): Remove deleted MUSTBENEW argument
 	to copy-file.
 2006-05-26  Reiner Steib  <Reiner.Steib@gmx.de>
 	* simple.el (toggle-truncate-lines): Make arg optional for
 	backward compatibility.
 2006-05-26  Thien-Thi Nguyen  <ttn@gnu.org>
 	* emacs-lisp/ewoc.el (ewoc--current-dll): New var.
 	(ewoc--node-next, ewoc--node-prev, ewoc--node-nth): Don't take
 	DLL arg.  Instead, use ewoc--current-dll.  Update all callers.
 	(ewoc--set-buffer-bind-dll-let*): Bind ewoc--current-dll, not `dll'.
 	(ewoc--adjust): Use ewoc--current-dll.
 	(ewoc-next, ewoc-prev, ewoc-nth): Bind ewoc--current-dll.
 2006-05-26  Carsten Dominik  <dominik@science.uva.nl>
 	* textmodes/org.el: (org-next-item, org-previous-item): Emit more
 	compact error message.
 	(org-tags-view): Refresh category table in each file.
 	(org-table-justify-field-maybe): Remove superfluous arguments to
 	`format'.
 	(org-export-as-html): Insert "<p>" before postamble.
 	(org-paste-subtree, org-kill-is-subtree-p): Check for empty kill ring.
 2006-05-26  Kenichi Handa  <handa@m17n.org>
 	* textmodes/po.el (po-find-charset): Pay attention to the case
 	FILENAME is a cons (NAME . BUFFER).
 	(po-find-file-coding-system-guts): Likewise.
 	* arc-mode.el (archive-set-buffer-as-visiting-file):
 	Call find-operation-coding-system with (FILENAME . BUFFER).
 	* tar-mode.el (tar-extract): Call find-operation-coding-system
 	with (FILENAME . BUFFER).
 	* international/mule.el (decode-coding-inserted-region):
 	Call find-operation-coding-system with (FILENAME . BUFFER).
 2006-05-25  Chong Yidong  <cyd@stupidchicken.com>
 	* image-mode.el (image-toggle-display): Use buffer contents to
 	generate image for a remote file.
 2006-05-25  Juri Linkov  <juri@jurta.org>
 	* replace.el (query-replace-read-from, query-replace-read-to):
 	Remove 8th arg KEEP-ALL in read-from-minibuffer.
 2006-05-25  Rajesh Vaidheeswarran  <rv@gnu.org>
 	* whitespace.el (whitespace-cleanup): Change to cleanup
 	region if one is active.
 	* whitespace.el (whitespace-cleanup-internal): New internal method.
 2006-05-25  Mathias Dahl  <mathias.dahl@gmail.com>
 	* dired.el (dired-mode-map): Add help-echo strings to tumme
 	commands.  Bind `tumme-dired-display-image' to C-t i.
 	* tumme.el (tumme-display-image): Change documentation string slightly.
 	(tumme-dired-display-image): Add call to `display-buffer'.
 2006-05-25  Thien-Thi Nguyen  <ttn@gnu.org>
 	* emacs-lisp/bindat.el (bindat-unpack, bindat-pack):
 	Signal error if RAW-DATA is a multibyte string.
 2006-05-24  Richard Stallman  <rms@gnu.org>
 	* subr.el (with-local-quit): When handling `quit' signal,
 	make a chance for quit-flag to cause a quit.
 	* emacs-lisp/advice.el (ad-enable-advice, ad-activate)
 	(ad-disable-advice): Add autoloads.
 	* subr.el (read-passwd): Copy PROMPT before changing its properties.
 2006-05-25  Mathias Dahl  <mathias.dahl@gmail.com>
 	* dired.el (dired-mode-map): Change menu items for tumme as per
 	suggestions in emacs-devel.
 2006-05-25  Nick Roberts  <nickrob@snap.net.nz>
 	* dired.el (dired-mode-map): Fix breakage.
 2006-05-25  Mathias Dahl  <mathias.dahl@gmail.com>
 	* tumme.el (tumme-display-dired-image): Rename to...
 	(tumme-dired-display-image): ...this.
 	(tumme-track-movement): Change default value to t.
 	(tumme-display-thumbs): Add new optional parameter DO-NOT-POP,
 	used from `tumme-next-line-and-display' and similar commands.
 	* dired.el (dired-mode-map): Add Thumbnail submenu under the
 	Immediate menu.  Add some tumme commands there.
 2006-05-24  Luc Teirlinck  <teirllm@auburn.edu>
 	* loadup.el ("jka-cmpr-hook"): Load it before it is needed.
 2006-05-24  Chong Yidong  <cyd@mit.edu>
 	* menu-bar.el, international/mule-cmds.el: Remove tooltips for
 	menu entries that open submenus.
 2006-05-24  Alan Mackenzie  <acm@muc.de>
 	* startup.el (command-line): For names of preloaded files, don't
 	append ".elc" (now done in Fload), and call file-truename on the
 	lisp directory.
 	* subr.el (eval-after-load): Fix the doc-string.  Allow FILE to
 	match ANY loaded file with the right name, not just those in
 	load-path.  Put a regexp matching the file name into
 	after-load-alist, rather than the name itself.
 	* subr.el: New functions load-history-regexp,
 	load-history-filename-element, do-after-load-evaluation.
 	* international/mule.el (load-with-code-conversion): Do the
 	eval-after-load stuff by calling do-after-load-evaluation.
 2006-05-25  Nick Roberts  <nickrob@snap.net.nz>
 	* progmodes/gud.el (gud-sentinel): Condition on GUD buffer if it
 	has not been killed.
 2006-05-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 	* term/mac-win.el: Set idle timer to clean up expired Apple events.
 	(mac-ae-get-url): Redispatch Apple event on unknown scheme.
 	(mac-dispatch-apple-event): Resume Apple event if it is suspended.
 	Optionally set error message in reply.
 2006-05-24  Carsten Dominik  <dominik@science.uva.nl>
 	* textmodes/org.el: (org-open-at-point): Use renamed variable
 	`org-confirm-shell-link-function'.
 	(org-confirm-shell-link-function): Rename from
 	`org-confirm-shell-links'.
 	(org-export-directory): New function.
 	(org-export-as-ascii, org-export-as-html, org-export-as-xoxo)
 	(org-export-icalendar): Use `org-export-directory'.
 	(org-indent-item): Keep cursor position.
 	(org-link-file-path-type): New option.
 	(org-export-as-html): Fix bug with plain lists starting in
 	column 0.
 	(org-export-as-html): Remove deadline formatting, this happens
 	now already in `org-html-handle-time-stamps'.
 	(org-export-html-style): Deadline class removed.
 	(org-insert-labeled-timestamps-at-point): New option.
 	(org-cycle, org-occur, org-scan-tags): Use `org-overview' instead
 	of `hide-sublevels 1', in case the first headline is not level 1.
 	(org-overview, org-content): New fuction.
 	(org-cycle-global-status, org-cycle-subtree-status): Make these
 	variables buffer-local.
 	(org-global-cycle): New command.
 	(org-shifttab): Use `org-global-cycle'.
 	(org-insert-heading, org-insert-item): Go to end of new
 	headline/item after creating it.
 	(org-export-visible): Rename from `org-export-copy-visible'.
 	Now creates a temporary org-file and applies an exporting command
 	to it.
 	(org-table-eval-formula): Support for lisp forms.
 	(org-agenda-todo-ignore-scheduled): New option.
 	(org-agenda-get-todos): Use new option
 	`org-agenda-todo-ignore-scheduled'.
 	(org-export-html-inline-images): New value `maybe'.
 	(org-export-as-html): Inlining of images dependent on link description.
 	(org-archive-subtree): Check for end-of-buffer before trying
 	`kill-line'.
 	(org-agenda-follow-mode): New option.
 	(org-export-with-tags, org-export-with-timestamps): New options.
 	(org-html-handle-time-stamps): New function.
 	(org-keyword-time-regexp): New variable.
 	(org-agenda-get-todos): Use `org-agenda-todo-list-sublevels'.
 	(org-agenda-todo-list-sublevels): New option.
 	(org-html-level-start): When TITLE is nil, just close all levels.
 	(org-parse-key-lines, org-parse-export-options): Remove functions,
 	replaced by `org-infile-export-plist'.
 	(org-combine-plists, org-infile-export-plist)
 	(org-default-export-plist): New functions.
 	(org-export-html-preamble, org-export-html-postamble)
 	(org-export-html-auto-preamble, org-export-html-auto-postamble):
 	New variables.
 	(org-export-publishing-directory): New option.
 	(org-export-as-html, org-export-as-ascii): Use the new property
 	lists for settings.
 	(org-export-copy-visible, org-export-as-xoxo):
 	Respect `org-export-publishing-directory'.
 	(org-link-search, org-store-link, org-file-apps): Support for
 	links to BibTeX database entries..
 	(org-get-current-options, org-set-regexps-and-options):
 	Implement logging as a startup option.
 	(org-store-link): Make sure context string is never empty
 	(org-insert-link): Use relative path when possible.
 	(org-at-item-checklet-p): New function.
 	(org-shifttab, org-shiftmetaleft, org-shiftmetaright)
 	(org-shiftmetaup, org-shiftmetadown, org-metaleft)
 	(org-metaright, org-metaup, org-metadown, org-shiftup)
 	(org-shiftdown, org-shiftright, org-shiftleft)
 	(org-ctrl-c-ctrl-c, org-cycle, org-return, org-meta-return):
 	Dispatch using `call-interactively'.
 	(org-call-with-arg): New defsubst.
 	(org-tag-alist, org-use-fast-tag-selection): New options.
 	(org-complete): Use `org-tag-alist'.
 	(org-fast-tag-insert, org-fast-tag-selection): New functions.
 	(org-next-item, org-previous-item): New commands.
 	(org-beginning-of-item, org-end-of-item): Add (interactive) to
 	make command.
 	(org-shiftup, org-shiftdown): Accommodate the item-navigation commands.
 2006-05-23  Thien-Thi Nguyen  <ttn@gnu.org>
 	* emacs-lisp/ewoc.el (ewoc-delete): New function.
@ -94,7 +829,7 @@
 	have non-nil values.  Speed up by using add-to-list instead of
 	manual consing.
-2006-05-20  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org>  (tiny change)
+2006-05-20  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org>
 	* progmodes/make-mode.el (makefile-mode): Doc fix.
@ -391,8 +1126,7 @@
 	Move `safe-local-variable' declarations to the respective files.
 	* help-fns.el (describe-variable): Don't print safe-var if it is
-	byte-code.  Improve wording as suggested by Luc Teirlinck
+	byte-code.  Improve wording as suggested by Luc Teirlinck.
 	<teirllm@auburn.edu>.
 2006-05-11  Nick Roberts  <nickrob@snap.net.nz>
@ -659,7 +1393,7 @@
 	reference to the Lisp manual to the warning about pure space
 	overflow.
-2006-05-05  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org>  (tiny change)
+2006-05-05  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org>
 	* textmodes/ispell.el (ispell-buffer-local-dict): Add a `no-reload'
 	argument to avoid the call to `ispell-internal-change-dictionary'
@ -1519,7 +2253,7 @@
 	* files.el (hack-local-variables-confirm) <offer-save>:
 	Clarify message text.  Suggested by Ralf Angeli.
-2006-04-08  Michael Cadilhac  <michael.cadilhac@lrde.org>  (tiny change)
+2006-04-08  Michael Cadilhac  <michael.cadilhac@lrde.org>
 	* rect.el (kill-rectangle): Don't barf if `kill-read-only-ok' is set.
 	(delete-extract-rectangle-line): Use `filter-buffer-substring'
@ -8347,7 +9081,7 @@
 	since the last ping.
 	(rcirc-mode): Give rcirc-topic a local binding here.
-2005-11-19  Michael Cadilhac  <michael.cadilhac@lrde.org>  (tiny change)
+2005-11-19  Michael Cadilhac  <michael.cadilhac@lrde.org>
 	* subr.el (read-passwd): Fontify the prompt as we do with other
 	prompts.
@ -9958,7 +10692,7 @@
 	* dired-x.el (dired-virtual): Don't use `dired-insert-headerline'.
-2005-10-25  Michael Cadilhac  <michael.cadilhac-@t-lrde.epita.fr>  (tiny change)
+2005-10-25  Michael Cadilhac  <michael.cadilhac-@t-lrde.epita.fr>
 	* play/blackbox.el (blackbox-redefine-key): New function.
 	(blackbox-mode-map): Use it to remap existing bindings for cursor
@ -11222,7 +11956,7 @@
 	* progmodes/gdb-ui.el (gdb-fringe-width -> gdb-buffer-fringe-width):
 	Typo.
-2005-10-06  Michael Cadilhac  <michael.cadilhac-@t-lrde.epita.fr>  (tiny change)
+2005-10-06  Michael Cadilhac  <michael.cadilhac-@t-lrde.epita.fr>
 	* play/zone.el (zone): Wrap body with save-window-excursion.
@ -12017,7 +12751,7 @@
 	* calendar/diary-lib.el (mark-diary-entries): Rearrange to wrap
 	with-current-buffer form in save-excursion.
-2005-09-18  D Goel  <deego@gnufans.org>
+2005-09-18  Deepak Goel  <deego@gnufans.org>
 	* apropos.el (apropos-command): Fix `message' call: first arg
 	should be a format spec.  In this and all other cases that appear
@ -21459,7 +22193,7 @@
 	* simple.el (goto-line): Doc fix.
-2005-03-19  Aaron Hawley  <Aaron.Hawley@uvm.edu>  (tiny change)
+2005-03-19  Aaron S. Hawley  <Aaron.Hawley@uvm.edu>
 	* files.el (save-buffer): Doc fix.
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@ -2779,7 +2779,7 @@
 	continuations, don't go to line beg;
 	perl-backward-to-start-of-continued-exp gives the right place.
-1995-03-07  Enami Tsugutomo  <enami@sys.ptg.sony.co.jp>
+1995-03-07  Tsugutomo ENAMI  <enami@sys.ptg.sony.co.jp>
 	* simple.el (indent-new-comment-line): Clean up handling
 	of \(...\) in comment-start-skip.
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@ -876,8 +876,9 @@ using `make-temp-file', and the generated name is returned."
 	       ;; extracted file existed.
 	       (let ((file-name-handler-alist
 		      '(("" . archive-file-name-handler))))
-		 (car (find-operation-coding-system 'insert-file-contents
+		 (car (find-operation-coding-system
-						    filename t))))))
+		       'insert-file-contents
 		       (cons filename (current-buffer)) t))))))
      (if (and (not coding-system-for-read)
 	       (not enable-multibyte-characters))
 	  (setq coding
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@ -116,6 +116,8 @@ This variable determines whether reverting the buffer lists only
 file buffers.  It affects both manual reverting and reverting by
 Auto Revert Mode.")
 (defvar Info-current-file) ;; from info.el
 (make-variable-buffer-local 'Buffer-menu-files-only)
 (if Buffer-menu-mode-map
@ -767,10 +769,24 @@ For more information, see the function `buffer-menu'."
 			   ?\s)))
 		(unless file
 		  ;; No visited file.  Check local value of
-		  ;; list-buffers-directory.
+		  ;; list-buffers-directory and, for Info buffers,
-		  (when (and (boundp 'list-buffers-directory)
+		  ;; Info-current-file.
-			     list-buffers-directory)
+		  (cond ((and (boundp 'list-buffers-directory)
-		    (setq file list-buffers-directory)))
+			      list-buffers-directory)
 			 (setq file list-buffers-directory))
 			((eq major-mode 'Info-mode)
 			 (setq file Info-current-file)
 			 (cond
 			  ((eq file t)
 			   (setq file "*Info Directory*"))
 			  ((eq file 'apropos)
 			   (setq file "*Info Apropos*"))
 			  ((eq file 'history)
 			   (setq file "*Info History*"))
 			  ((eq file 'toc)
 			   (setq file "*Info TOC*"))
 			  ((not (stringp file))  ;; avoid errors
 			   (setq file nil))))))
 		(push (list buffer bits name (buffer-size) mode file)
 		      list))))))
      ;; Preserve the original buffer-list ordering, just in case.
--- a/lisp/comint.el
+++ b/lisp/comint.el
@ -1047,12 +1047,12 @@ Moves relative to `comint-input-ring-index'."
 (defun comint-previous-input (arg)
  "Cycle backwards through input history, saving input."
  (interactive "*p")
-  (if (and comint-input-ring-index 
+  (if (and comint-input-ring-index
 	   (or		       ;; leaving the "end" of the ring
 	    (and (< arg 0)		; going down
 		 (eq comint-input-ring-index 0))
 	    (and (> arg 0)		; going up
-		 (eq comint-input-ring-index 
+		 (eq comint-input-ring-index
 		     (1- (ring-length comint-input-ring)))))
 	   comint-stored-incomplete-input)
      (comint-restore-input)
@ -1510,23 +1510,23 @@ Similarly for Soar, Scheme, etc."
 				(concat input "\n")))
 	  (let ((beg (marker-position pmark))
-	      (end (if no-newline (point) (1- (point))))
+		(end (if no-newline (point) (1- (point))))
-	      (inhibit-modification-hooks t))
+		(inhibit-modification-hooks t))
 	    (when (> end beg)
-	      ;; Set text-properties for the input field
+	      (add-text-properties beg end
-	      (add-text-properties
+				   '(front-sticky t
-	       beg end
+				     font-lock-face comint-highlight-input))
 	       '(front-sticky t
 		 font-lock-face comint-highlight-input
 		 mouse-face highlight
 		 help-echo "mouse-2: insert after prompt as new input"))
 	      (unless comint-use-prompt-regexp
 		;; Give old user input a field property of `input', to
 		;; distinguish it from both process output and unsent
 		;; input.  The terminating newline is put into a special
 		;; `boundary' field to make cursor movement between input
 		;; and output fields smoother.
-		(put-text-property beg end 'field 'input)))
+		(add-text-properties
 		 beg end
 		 '(mouse-face highlight
 		   help-echo "mouse-2: insert after prompt as new input"
 		   field input))))
 	    (unless (or no-newline comint-use-prompt-regexp)
 	      ;; Cover the terminating newline
 	      (add-text-properties end (1+ end)
@ -2357,19 +2357,19 @@ preceding newline is removed."
 	   (when (eq (get-text-property (1- pt) 'read-only) 'fence)
 	     (remove-list-of-text-properties (1- pt) pt '(read-only)))))))
-(defun comint-kill-whole-line (&optional arg)
+(defun comint-kill-whole-line (&optional count)
  "Kill current line, ignoring read-only and field properties.
-With prefix arg, kill that many lines starting from the current line.
+With prefix arg COUNT, kill that many lines starting from the current line.
-If arg is negative, kill backward.  Also kill the preceding newline,
+If COUNT is negative, kill backward.  Also kill the preceding newline,
 instead of the trailing one.  \(This is meant to make \\[repeat] work well
 with negative arguments.)
-If arg is zero, kill current line but exclude the trailing newline.
+If COUNT is zero, kill current line but exclude the trailing newline.
 The read-only status of newlines is updated with `comint-update-fence',
 if necessary."
  (interactive "p")
  (let ((inhibit-read-only t) (inhibit-field-text-motion t))
-    (kill-whole-line arg)
+    (kill-whole-line count)
-    (when (>= arg 0) (comint-update-fence))))
+    (when (>= count 0) (comint-update-fence))))
 (defun comint-kill-region (beg end &optional yank-handler)
  "Like `kill-region', but ignores read-only properties, if safe.
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@ -438,7 +438,8 @@ If the prefix ARG is given, restrict the view to the current file instead."
 	 (firsthunk (ignore-errors
 		      (goto-char start)
 		      (diff-beginning-of-file) (diff-hunk-next) (point)))
-	 (nextfile (ignore-errors (diff-file-next) (point))))
+	 (nextfile (ignore-errors (diff-file-next) (point)))
 	 (inhibit-read-only t))
    (goto-char start)
    (if (and firsthunk (= firsthunk start)
 	     (or (null nexthunk)
@ -457,7 +458,8 @@ If the prefix ARG is given, restrict the view to the current file instead."
 		     (ignore-errors
 		       (diff-hunk-prev) (point))))
 	 (index (save-excursion
-		  (re-search-backward "^Index: " prevhunk t))))
+		  (re-search-backward "^Index: " prevhunk t)))
 	 (inhibit-read-only t))
    (when index (setq start index))
    (diff-end-of-file)
    (if (looking-at "^\n") (forward-char 1)) ;`tla' generates such diffs.
@ -497,7 +499,8 @@ If the prefix ARG is given, restrict the view to the current file instead."
    (let* ((start1 (string-to-number (match-string 1)))
 	   (start2 (string-to-number (match-string 2)))
 	   (newstart1 (+ start1 (diff-count-matches "^[- \t]" (point) pos)))
-	   (newstart2 (+ start2 (diff-count-matches "^[+ \t]" (point) pos))))
+	   (newstart2 (+ start2 (diff-count-matches "^[+ \t]" (point) pos)))
 	   (inhibit-read-only t))
      (goto-char pos)
      ;; Hopefully the after-change-function will not screw us over.
      (insert "@@ -" (number-to-string newstart1) ",1 +"
@ -993,8 +996,7 @@ a diff with \\[diff-reverse-direction]."
  ;; compile support
  (set (make-local-variable 'next-error-function) 'diff-next-error)
-  (when (and (> (point-max) (point-min)) diff-default-read-only)
+  (setq buffer-read-only diff-default-read-only)
    (toggle-read-only t))
  ;; setup change hooks
  (if (not diff-update-on-the-fly)
      (add-hook 'write-contents-functions 'diff-write-contents-hooks nil t)
@ -1355,6 +1357,7 @@ For use in `add-log-current-defun-function'."
 	 (file1 (make-temp-file "diff1"))
 	 (file2 (make-temp-file "diff2"))
 	 (coding-system-for-read buffer-file-coding-system)
 	 (inhibit-read-only t)
 	 old new)
    (unwind-protect
 	(save-excursion
--- a/lisp/diff.el
+++ b/lisp/diff.el
@ -67,9 +67,10 @@ CODE is the exit code of the process.  It should be 0 iff no diffs were found."
  (if diff-new-temp-file (delete-file diff-new-temp-file))
  (save-excursion
    (goto-char (point-max))
-    (insert (format "\nDiff finished%s.  %s\n"
+    (let ((inhibit-read-only t))
-		    (if (equal 0 code) " (no differences)" "")
+      (insert (format "\nDiff finished%s.  %s\n"
-		    (current-time-string)))))
+		      (if (equal 0 code) " (no differences)" "")
 		      (current-time-string))))))
 ;;;###autoload
 (defun diff (old new &optional switches no-async)
@ -119,7 +120,8 @@ With prefix arg, prompt for diff switches."
      (set-buffer buf)
      (setq buffer-read-only nil)
      (buffer-disable-undo (current-buffer))
-      (erase-buffer)
+      (let ((inhibit-read-only t))
 	(erase-buffer))
      (buffer-enable-undo (current-buffer))
      (diff-mode)
      (set (make-local-variable 'revert-buffer-function)
@ -128,21 +130,35 @@ With prefix arg, prompt for diff switches."
      (set (make-local-variable 'diff-old-temp-file) old-alt)
      (set (make-local-variable 'diff-new-temp-file) new-alt)
      (setq default-directory thisdir)
-      (insert command "\n")
+      (let ((inhibit-read-only t))
 	(insert command "\n"))
      (if (and (not no-async) (fboundp 'start-process))
 	  (progn
 	    (setq proc (start-process "Diff" buf shell-file-name
 				      shell-command-switch command))
 	    (set-process-filter proc 'diff-process-filter)
 	    (set-process-sentinel
 	     proc (lambda (proc msg)
 		    (with-current-buffer (process-buffer proc)
 		      (diff-sentinel (process-exit-status proc))))))
 	;; Async processes aren't available.
-	(diff-sentinel
+	(let ((inhibit-read-only t))
-	 (call-process shell-file-name nil buf nil
+	  (diff-sentinel
-		       shell-command-switch command))))
+	   (call-process shell-file-name nil buf nil
 			 shell-command-switch command)))))
    buf))
 (defun diff-process-filter (proc string)
  (with-current-buffer (process-buffer proc)
    (let ((moving (= (point) (process-mark proc))))
      (save-excursion
 	;; Insert the text, advancing the process marker.
 	(goto-char (process-mark proc))
 	(let ((inhibit-read-only t))
 	  (insert string))
 	(set-marker (process-mark proc) (point)))
      (if moving (goto-char (process-mark proc))))))
 ;;;###autoload
 (defun diff-backup (file &optional switches)
  "Diff this file with its backup file or vice versa.
--- a/lisp/dired.el
+++ b/lisp/dired.el
@ -1251,9 +1251,9 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
    ;; thumbnail manipulation (tumme)
    (define-key map "\C-td" 'tumme-display-thumbs)
    (define-key map "\C-tt" 'tumme-tag-files)
-    (define-key map "\C-tr" 'tumme-tag-remove)
+    (define-key map "\C-tr" 'tumme-delete-tag)
    (define-key map "\C-tj" 'tumme-jump-thumbnail-buffer)
-    (define-key map "\C-ti" 'tumme-display-dired-image)
+    (define-key map "\C-ti" 'tumme-dired-display-image)
    (define-key map "\C-tx" 'tumme-dired-display-external)
    (define-key map "\C-ta" 'tumme-display-thumbs-append)
    (define-key map "\C-t." 'tumme-display-thumb)
@ -1305,6 +1305,18 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
    (define-key map [menu-bar immediate]
      (cons "Immediate" (make-sparse-keymap "Immediate")))
    (define-key map
      [menu-bar immediate tumme-dired-display-external]
      '(menu-item "Display Image Externally" tumme-dired-display-external
                  :help "Display image in external viewer"))
    (define-key map
      [menu-bar immediate tumme-dired-display-image]
      '(menu-item "Display Image" tumme-dired-display-image
                  :help "Display sized image in a separate window"))
    (define-key map [menu-bar immediate dashes-4]
      '("--"))
    (define-key map [menu-bar immediate revert-buffer]
      '(menu-item "Refresh" revert-buffer
 		  :help "Update contents of shown directories"))
@ -1313,7 +1325,7 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
      '("--"))
    (define-key map [menu-bar immediate compare-directories]
-      '(menu-item "Compare directories..." dired-compare-directories
+      '(menu-item "Compare Directories..." dired-compare-directories
 		  :help "Mark files with different attributes in two dired buffers"))
    (define-key map [menu-bar immediate backup-diff]
      '(menu-item "Compare with Backup" dired-backup-diff
@ -1341,6 +1353,14 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
    (define-key map [menu-bar regexp]
      (cons "Regexp" (make-sparse-keymap "Regexp")))
    (define-key map
      [menu-bar regexp tumme-mark-tagged-files]
      '(menu-item "Mark From Image Tag..." tumme-mark-tagged-files
                  :help "Mark files whose image tags matches regexp"))    
    (define-key map [menu-bar regexp dashes-1]
      '("--"))    
    (define-key map [menu-bar regexp downcase]
      '(menu-item "Downcase" dired-downcase
 		  ;; When running on plain MS-DOS, there's only one
@ -1428,6 +1448,29 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
    (define-key map [menu-bar operate]
      (cons "Operate" (make-sparse-keymap "Operate")))
    (define-key map [menu-bar operate dashes-2]
      '("--"))
    (define-key map
      [menu-bar operate tumme-delete-tag]
      '(menu-item "Delete Image Tag..." tumme-delete-tag
                  :help "Delete image tag from current or marked files"))
    (define-key map
      [menu-bar operate tumme-tag-files]
      '(menu-item "Add Image Tags..." tumme-tag-files
                  :help "Add image tags to current or marked files"))
    (define-key map
      [menu-bar operate tumme-dired-comment-files]
      '(menu-item "Add Image Comment..." tumme-dired-comment-files
                  :help "Add image comment to current or marked files"))
    (define-key map
      [menu-bar operate tumme-display-thumbs]
      '(menu-item "Display Thumbnails" tumme-display-thumbs
                  :help "Display thumbnails for current or marked image files"))
    (define-key map [menu-bar operate dashes-3]
      '("--"))    
    (define-key map [menu-bar operate query-replace]
      '(menu-item "Query Replace in Files..." dired-do-query-replace-regexp
 		  :help "Replace regexp in marked files"))
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@ -65,8 +65,10 @@ Must produce output compatible with Unix's diff3 program."
 ;; The following functions needed for setting diff/diff3 options
 ;; test if diff supports the --binary option
 (defsubst ediff-test-utility (diff-util option &optional files)
-  (eq 0 (apply 'call-process
+  (condition-case ()
-	       (append (list diff-util nil nil nil option) files))))
+      (eq 0 (apply 'call-process
 		   (append (list diff-util nil nil nil option) files)))
    (file-error nil)))
 (defun ediff-diff-mandatory-option (diff-util)
  (let ((file (if (boundp 'null-device) null-device "/dev/null")))
@ -128,10 +130,10 @@ are `-I REGEXP', to ignore changes whose lines match the REGEXP."
 (defcustom ediff-diff-options ""
  "*Options to pass to `ediff-diff-program'.
-If Unix diff is used as `ediff-diff-program', then a useful option is
+If Unix diff is used as `ediff-diff-program',
-`-w', to ignore space, and `-i', to ignore case of letters.
+ then a useful option is `-w', to ignore space.
-Options `-c' and `-i' are not allowed. Case sensitivity can be toggled
+Options `-c' and `-i' are not allowed. Case sensitivity can be
-interactively using [ediff-toggle-ignore-case]"
+ toggled interactively using \\[ediff-toggle-ignore-case]."
  :set 'ediff-reset-diff-options
  :type 'string
  :group 'ediff-diff)
@ -399,7 +401,7 @@ one optional arguments, diff-number to refine.")
 	(c-prev-pt nil)
 	diff-list shift-A shift-B
 	)
-    
+
    ;; diff list contains word numbers, unless changed later
    (setq diff-list (cons (if word-mode 'words 'points)
 			  diff-list))
@ -411,7 +413,7 @@ one optional arguments, diff-number to refine.")
 	      shift-B
 	      (ediff-overlay-start
 	       (ediff-get-value-according-to-buffer-type 'B bounds))))
-    
+
    ;; reset point in buffers A/B/C
    (ediff-with-current-buffer A-buffer
      (goto-char (if shift-A shift-A (point-min))))
@ -1525,7 +1527,7 @@ affects only files whose names match the expression."
  (ediff-barf-if-not-control-buffer)
  (setq ediff-ignore-case (not ediff-ignore-case))
  (cond (ediff-ignore-case
-	 (setq ediff-actual-diff-options 
+	 (setq ediff-actual-diff-options
 	       (concat ediff-diff-options " " ediff-ignore-case-option)
 	       ediff-actual-diff3-options
 	       (concat ediff-diff3-options " " ediff-ignore-case-option3))
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@ -2350,6 +2350,7 @@ FUNCTION was not advised)."
 		       (ad-advice-set-enabled advice flag))))))
 	matched-advices)))
 ;;;###autoload
 (defun ad-enable-advice (function class name)
  "Enables the advice of FUNCTION with CLASS and NAME."
  (interactive (ad-read-advice-specification "Enable advice of"))
@ -2359,6 +2360,7 @@ FUNCTION was not advised)."
 		 function class name))
    (error "ad-enable-advice: `%s' is not advised" function)))
 ;;;###autoload
 (defun ad-disable-advice (function class name)
  "Disable the advice of FUNCTION with CLASS and NAME."
  (interactive (ad-read-advice-specification "Disable advice of"))
@ -3585,6 +3587,7 @@ the value of `ad-redefinition-action' and de/activate again."
 ;; @@ The top-level advice interface:
 ;; ==================================
 ;;;###autoload
 (defun ad-activate (function &optional compile)
  "Activate all the advice information of an advised FUNCTION.
 If FUNCTION has a proper original definition then an advised
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@ -42,6 +42,7 @@ files.")
 (defconst authors-aliases
  '(
    ("Andrew Csillag" "Drew Csillag")
    ("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc."
     "Barry A. Warsaw, ITB" "Barry Warsaw")
    ("Bj,Av(Brn Torkelsson" "Bjorn Torkelsson")
@ -118,6 +119,7 @@ files.")
    ("Roland B. Roberts" "Roland B Roberts" "Roland Roberts")
    ("Rui-Tao Dong" "Rui-Tao Dong ~{6-Hpln~}")
    ("Sam Steingold" "Sam Shteingold")
    ("Satyaki Das" "Indexed search by Satyaki Das")
    ("Stefan Monnier" "Stefan")
    ("Stephen A. Wood" "(saw@cebaf.gov)")
    ("Steven L. Baur" "SL Baur" "Steven L Baur")
@ -128,6 +130,7 @@ files.")
    ("Torbj,Av(Brn Einarsson" "Torbj.*rn Einarsson")
    ("Toru Tomabechi" "Toru Tomabechi,")
    ("Vincent Del Vecchio" "Vince Del Vecchio")
    ("William M. Perry" "Bill Perry")
    ("Wlodzimierz Bzyl" "W.*dek Bzyl")
    ("Yutaka NIIBE" "NIIBE Yutaka")
    )
@ -269,7 +272,7 @@ Changes to files in this list are not listed.")
    ("Morten Welinder" :wrote "dosfns.c" "[many MSDOS files]" "msdos.h")
    ("Pace Willisson" :wrote "ispell.el")
    ("Garrett Wollman" :changed "sendmail.el")
-    ("Dale Worley" :changed "mail-extr.el")
+    ("Dale R. Worley" :changed "mail-extr.el")
    ("Jamie Zawinski" :changed "bytecode.c" :wrote "disass.el" "tar-mode.el"))
  "Actions taken from the original, manually (un)maintained AUTHORS file.")
@ -355,7 +358,9 @@ the file name."
 	      (setq rules (cdr rules))))))
      (setq authors-checked-files-alist
 	    (cons (cons file valid) authors-checked-files-alist))
-      (unless valid
+      (unless (or valid
 		  (string-match "[*]" file)
 		  (string-match "^[0-9.]+$" file))
 	(setq authors-invalid-file-names
 	      (cons (format "%s:%d: unrecognized `%s' for %s"
 			    log-file
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@ -273,12 +273,30 @@ which lists the file name and which functions are in it, etc."
 	(or (eolp)
 	    (insert "\n" generate-autoload-section-continuation))))))
 (defun autoload-find-file (file)
  "Fetch file and put it in a temp buffer.  Return the buffer."
  ;; It is faster to avoid visiting the file.
  (with-current-buffer (get-buffer-create " *autoload-file*")
    (kill-all-local-variables)
    (erase-buffer)
    (setq buffer-undo-list t
          buffer-read-only nil)
    (emacs-lisp-mode)
    (insert-file-contents file nil)
    (let ((enable-local-variables :safe))
      (hack-local-variables))
    (current-buffer)))
 (defvar no-update-autoloads nil
  "File local variable to prevent scanning this file for autoload cookies.")
 (defun generate-file-autoloads (file)
  "Insert at point a loaddefs autoload section for FILE.
-autoloads are generated for defuns and defmacros in FILE
+Autoloads are generated for defuns and defmacros in FILE
 marked by `generate-autoload-cookie' (which see).
 If FILE is being visited in a buffer, the contents of the buffer
-are used."
+are used.
 Return non-nil in the case where no autoloads were added at point."
  (interactive "fGenerate autoloads for file: ")
  (let ((outbuf (current-buffer))
 	(autoloads-done '())
@ -291,7 +309,7 @@ are used."
 	(float-output-format nil)
 	(done-any nil)
 	(visited (get-file-buffer file))
-	output-end)
+        output-start)
    ;; If the autoload section we create here uses an absolute
    ;; file name for FILE in its header, and then Emacs is installed
@ -309,76 +327,70 @@ are used."
 	       (string= dir-truename (substring source-truename 0 len)))
 	  (setq file (substring source-truename len))))
-    (message "Generating autoloads for %s..." file)
+    (with-current-buffer (or visited
-    (save-excursion
+                             ;; It is faster to avoid visiting the file.
-      (unwind-protect
+                             (autoload-find-file file))
-	  (progn
+      ;; Obey the no-update-autoloads file local variable.
-	    (if visited
+      (unless no-update-autoloads
-		(set-buffer visited)
+        (message "Generating autoloads for %s..." file)
-	      ;; It is faster to avoid visiting the file.
+        (setq output-start (with-current-buffer outbuf (point)))
-	      (set-buffer (get-buffer-create " *generate-autoload-file*"))
+        (save-excursion
-	      (kill-all-local-variables)
+          (save-restriction
-	      (erase-buffer)
+            (widen)
-	      (setq buffer-undo-list t
+            (goto-char (point-min))
-		    buffer-read-only nil)
+            (while (not (eobp))
-	      (emacs-lisp-mode)
+              (skip-chars-forward " \t\n\f")
-	      (insert-file-contents file nil))
+              (cond
-	    (save-excursion
+               ((looking-at (regexp-quote generate-autoload-cookie))
-	      (save-restriction
+                (search-forward generate-autoload-cookie)
-		(widen)
+                (skip-chars-forward " \t")
-		(goto-char (point-min))
+                (setq done-any t)
-		(while (not (eobp))
+                (if (eolp)
-		  (skip-chars-forward " \t\n\f")
+                    ;; Read the next form and make an autoload.
-		  (cond
+                    (let* ((form (prog1 (read (current-buffer))
-		   ((looking-at (regexp-quote generate-autoload-cookie))
+                                   (or (bolp) (forward-line 1))))
-		    (search-forward generate-autoload-cookie)
+                           (autoload (make-autoload form load-name)))
-		    (skip-chars-forward " \t")
+                      (if autoload
-		    (setq done-any t)
+                          (push (nth 1 form) autoloads-done)
-		    (if (eolp)
+                        (setq autoload form))
-			;; Read the next form and make an autoload.
+                      (let ((autoload-print-form-outbuf outbuf))
-			(let* ((form (prog1 (read (current-buffer))
+                        (autoload-print-form autoload)))
 					       (or (bolp) (forward-line 1))))
 			       (autoload (make-autoload form load-name)))
 			  (if autoload
 			      (setq autoloads-done (cons (nth 1 form)
 							 autoloads-done))
 			    (setq autoload form))
 			  (let ((autoload-print-form-outbuf outbuf))
 			    (autoload-print-form autoload)))
-		      ;; Copy the rest of the line to the output.
+                  ;; Copy the rest of the line to the output.
-		      (princ (buffer-substring
+                  (princ (buffer-substring
-			      (progn
+                          (progn
-				;; Back up over whitespace, to preserve it.
+                            ;; Back up over whitespace, to preserve it.
-				(skip-chars-backward " \f\t")
+                            (skip-chars-backward " \f\t")
-				(if (= (char-after (1+ (point))) ? )
+                            (if (= (char-after (1+ (point))) ? )
-				    ;; Eat one space.
+                                ;; Eat one space.
-				    (forward-char 1))
+                                (forward-char 1))
-				(point))
+                            (point))
-			      (progn (forward-line 1) (point)))
+                          (progn (forward-line 1) (point)))
-			     outbuf)))
+                         outbuf)))
-		   ((looking-at ";")
+               ((looking-at ";")
-		    ;; Don't read the comment.
+                ;; Don't read the comment.
-		    (forward-line 1))
+                (forward-line 1))
-		   (t
+               (t
-		    (forward-sexp 1)
+                (forward-sexp 1)
-		    (forward-line 1)))))))
+                (forward-line 1))))))
-	(or visited
+
-	    ;; We created this buffer, so we should kill it.
+        (when done-any
-	    (kill-buffer (current-buffer)))
+          (with-current-buffer outbuf
-	(set-buffer outbuf)
+            (save-excursion
-	(setq output-end (point-marker))))
+              ;; Insert the section-header line which lists the file name
-    (if done-any
+              ;; and which functions are in it, etc.
-	(progn
+              (goto-char output-start)
-	  ;; Insert the section-header line
+              (autoload-insert-section-header
-	  ;; which lists the file name and which functions are in it, etc.
+               outbuf autoloads-done load-name file
-	  (autoload-insert-section-header outbuf autoloads-done load-name file
+               (nth 5 (file-attributes file)))
-					  (nth 5 (file-attributes file)))
+              (insert ";;; Generated autoloads from "
-	  (insert ";;; Generated autoloads from "
+                      (autoload-trim-file-name file) "\n"))
-		  (autoload-trim-file-name file) "\n")
+            (insert generate-autoload-section-trailer)))
-	  (goto-char output-end)
+        (message "Generating autoloads for %s...done" file))
-	  (insert generate-autoload-section-trailer)))
+      (or visited
-    (message "Generating autoloads for %s...done" file)))
+          ;; We created this buffer, so we should kill it.
          (kill-buffer (current-buffer))))
    (not done-any)))
 ;;;###autoload
 (defun update-file-autoloads (file &optional save-after)
@ -457,37 +469,7 @@ Autoload section for %s is up to date."
 		(goto-char (point-max))
 		(search-backward "\f" nil t)))
 	  (or (eq found 'up-to-date)
-	      (and (eq found 'new)
+	      (setq no-autoloads (generate-file-autoloads file)))))
 		   ;; Check that FILE has any cookies before generating a
 		   ;; new section for it.
 		   (save-excursion
 		     (if existing-buffer
 			 (set-buffer existing-buffer)
 		       ;; It is faster to avoid visiting the file.
 		       (set-buffer (get-buffer-create " *autoload-file*"))
 		       (kill-all-local-variables)
 		       (erase-buffer)
 		       (setq buffer-undo-list t
 			     buffer-read-only nil)
 		       (emacs-lisp-mode)
 		       (insert-file-contents file nil))
 		     (save-excursion
 		       (save-restriction
 			 (widen)
 			 (goto-char (point-min))
 			 (prog1
 			     (if (re-search-forward
 				  (concat "^" (regexp-quote
 					       generate-autoload-cookie))
 				  nil t)
 				 nil
 			       (if (interactive-p)
 				   (message "%s has no autoloads" file))
 			       (setq no-autoloads t)
 			       t)
 			   (or existing-buffer
 			       (kill-buffer (current-buffer))))))))
 	      (generate-file-autoloads file))))
      (and save-after
 	   (buffer-modified-p)
 	   (save-buffer))
--- a/lisp/emacs-lisp/bindat.el
+++ b/lisp/emacs-lisp/bindat.el
@ -188,23 +188,20 @@
 ;;  ([FIELD] eval FORM)
 ;; is interpreted by evalling FORM for its side effects only.
 ;; If FIELD is specified, the value is bound to that field.
-;; The FORM may access and update `raw-data' and `pos' (see `bindat-unpack'),
+;; The FORM may access and update `bindat-raw' and `bindat-idx' (see `bindat-unpack').
 ;; as well as the lisp data structure in `struct'.
 ;;; Code:
 ;; Helper functions for structure unpacking.
-;; Relies on dynamic binding of RAW-DATA and POS
+;; Relies on dynamic binding of BINDAT-RAW and BINDAT-IDX
-(defvar raw-data)
+(defvar bindat-raw)
-(defvar pos)
+(defvar bindat-idx)
 (defun bindat--unpack-u8 ()
  (prog1
-      (if (stringp raw-data)
+    (aref bindat-raw bindat-idx)
-	  (string-to-char (substring raw-data pos (1+ pos)))
+    (setq bindat-idx (1+ bindat-idx))))
 	(aref raw-data pos))
    (setq pos (1+ pos))))
 (defun bindat--unpack-u16 ()
  (let* ((a (bindat--unpack-u8)) (b (bindat--unpack-u8)))
@ -261,16 +258,16 @@
 		  j (lsh j -1)))))
      bits))
   ((eq type 'str)
-    (let ((s (substring raw-data pos (+ pos len))))
+    (let ((s (substring bindat-raw bindat-idx (+ bindat-idx len))))
-      (setq pos (+ pos len))
+      (setq bindat-idx (+ bindat-idx len))
      (if (stringp s) s
 	(string-make-unibyte (concat s)))))
   ((eq type 'strz)
    (let ((i 0) s)
-      (while (and (< i len) (/= (aref raw-data (+ pos i)) 0))
+      (while (and (< i len) (/= (aref bindat-raw (+ bindat-idx i)) 0))
 	(setq i (1+ i)))
-      (setq s (substring raw-data pos (+ pos i)))
+      (setq s (substring bindat-raw bindat-idx (+ bindat-idx i)))
-      (setq pos (+ pos len))
+      (setq bindat-idx (+ bindat-idx len))
      (if (stringp s) s
 	(string-make-unibyte (concat s)))))
   ((eq type 'vec)
@ -312,10 +309,10 @@
 	      (setq data (eval len))
 	    (eval len)))
 	 ((eq type 'fill)
-	  (setq pos (+ pos len)))
+	  (setq bindat-idx (+ bindat-idx len)))
 	 ((eq type 'align)
-	  (while (/= (% pos len) 0)
+	  (while (/= (% bindat-idx len) 0)
-	    (setq pos (1+ pos))))
+	    (setq bindat-idx (1+ bindat-idx))))
 	 ((eq type 'struct)
 	  (setq data (bindat--unpack-group (eval len))))
 	 ((eq type 'repeat)
@ -343,11 +340,13 @@
 	      (setq struct (append data struct))))))
    struct))
-(defun bindat-unpack (spec raw-data &optional pos)
+(defun bindat-unpack (spec bindat-raw &optional bindat-idx)
-  "Return structured data according to SPEC for binary data in RAW-DATA.
+  "Return structured data according to SPEC for binary data in BINDAT-RAW.
-RAW-DATA is a string or vector.  Optional third arg POS specifies the
+BINDAT-RAW is a unibyte string or vector.  Optional third arg BINDAT-IDX specifies
-starting offset in RAW-DATA."
+the starting offset in BINDAT-RAW."
-  (unless pos (setq pos 0))
+  (when (multibyte-string-p bindat-raw)
    (error "String is multibyte"))
  (unless bindat-idx (setq bindat-idx 0))
  (bindat--unpack-group spec))
 (defun bindat-get-field (struct &rest field)
@ -366,7 +365,7 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..."
  struct)
-;; Calculate raw-data length of structured data
+;; Calculate bindat-raw length of structured data
 (defvar bindat--fixed-length-alist
  '((u8 . 1) (byte . 1)
@ -405,10 +404,10 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..."
 	      (setq struct (cons (cons field (eval len)) struct))
 	    (eval len)))
 	 ((eq type 'fill)
-	  (setq pos (+ pos len)))
+	  (setq bindat-idx (+ bindat-idx len)))
 	 ((eq type 'align)
-	  (while (/= (% pos len) 0)
+	  (while (/= (% bindat-idx len) 0)
-	    (setq pos (1+ pos))))
+	    (setq bindat-idx (1+ bindat-idx))))
 	 ((eq type 'struct)
 	  (bindat--length-group
 	   (if field (bindat-get-field struct field) struct) (eval len)))
@ -435,25 +434,25 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..."
 	      (setq len (cdr type)))
 	  (if field
 	      (setq last (bindat-get-field struct field)))
-	  (setq pos (+ pos len))))))))
+	  (setq bindat-idx (+ bindat-idx len))))))))
 (defun bindat-length (spec struct)
-  "Calculate raw-data length for STRUCT according to bindat SPEC."
+  "Calculate bindat-raw length for STRUCT according to bindat SPEC."
-  (let ((pos 0))
+  (let ((bindat-idx 0))
    (bindat--length-group struct spec)
-    pos))
+    bindat-idx))
-;; Pack structured data into raw-data
+;; Pack structured data into bindat-raw
 (defun bindat--pack-u8 (v)
-  (aset raw-data pos (logand v 255))
+  (aset bindat-raw bindat-idx (logand v 255))
-  (setq pos (1+ pos)))
+  (setq bindat-idx (1+ bindat-idx)))
 (defun bindat--pack-u16 (v)
-  (aset raw-data pos (logand (lsh v -8) 255))
+  (aset bindat-raw bindat-idx (logand (lsh v -8) 255))
-  (aset raw-data (1+ pos) (logand v 255))
+  (aset bindat-raw (1+ bindat-idx) (logand v 255))
-  (setq pos (+ pos 2)))
+  (setq bindat-idx (+ bindat-idx 2)))
 (defun bindat--pack-u24 (v)
  (bindat--pack-u8 (lsh v -16))
@ -464,9 +463,9 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..."
  (bindat--pack-u16 v))
 (defun bindat--pack-u16r (v)
-  (aset raw-data (1+ pos) (logand (lsh v -8) 255))
+  (aset bindat-raw (1+ bindat-idx) (logand (lsh v -8) 255))
-  (aset raw-data pos (logand v 255))
+  (aset bindat-raw bindat-idx (logand v 255))
-  (setq pos (+ pos 2)))
+  (setq bindat-idx (+ bindat-idx 2)))
 (defun bindat--pack-u24r (v)
  (bindat--pack-u16r v)
@ -481,7 +480,7 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..."
      (setq type 'vec len 4))
  (cond
   ((null v)
-    (setq pos (+ pos len)))
+    (setq bindat-idx (+ bindat-idx len)))
   ((memq type '(u8 byte))
    (bindat--pack-u8 v))
   ((memq type '(u16 word short))
@ -513,11 +512,11 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..."
    (let ((l (length v)) (i 0))
      (if (> l len) (setq l len))
      (while (< i l)
-	(aset raw-data (+ pos i) (aref v i))
+	(aset bindat-raw (+ bindat-idx i) (aref v i))
 	(setq i (1+ i)))
-      (setq pos (+ pos len))))
+      (setq bindat-idx (+ bindat-idx len))))
   (t
-    (setq pos (+ pos len)))))
+    (setq bindat-idx (+ bindat-idx len)))))
 (defun bindat--pack-group (struct spec)
  (let (last)
@ -549,10 +548,10 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..."
 	      (setq struct (cons (cons field (eval len)) struct))
 	    (eval len)))
 	 ((eq type 'fill)
-	  (setq pos (+ pos len)))
+	  (setq bindat-idx (+ bindat-idx len)))
 	 ((eq type 'align)
-	  (while (/= (% pos len) 0)
+	  (while (/= (% bindat-idx len) 0)
-	    (setq pos (1+ pos))))
+	    (setq bindat-idx (1+ bindat-idx))))
 	 ((eq type 'struct)
 	  (bindat--pack-group
 	   (if field (bindat-get-field struct field) struct) (eval len)))
@ -579,18 +578,19 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..."
 	  (bindat--pack-item last type len)
 	  ))))))
-(defun bindat-pack (spec struct &optional raw-data pos)
+(defun bindat-pack (spec struct &optional bindat-raw bindat-idx)
  "Return binary data packed according to SPEC for structured data STRUCT.
-Optional third arg RAW-DATA is a pre-allocated string or vector to pack into.
+Optional third arg BINDAT-RAW is a pre-allocated unibyte string or vector to
-Optional fourth arg POS is the starting offset into RAW-DATA.
+pack into.
-Note: The result is a multibyte string; use `string-make-unibyte' on it
+Optional fourth arg BINDAT-IDX is the starting offset into BINDAT-RAW."
-to make it unibyte if necessary."
+  (when (multibyte-string-p bindat-raw)
-  (let ((no-return raw-data))
+    (error "Pre-allocated string is multibyte"))
-    (unless pos (setq pos 0))
+  (let ((no-return bindat-raw))
-    (unless raw-data
+    (unless bindat-idx (setq bindat-idx 0))
-      (setq raw-data (make-vector (+ pos (bindat-length spec struct)) 0)))
+    (unless bindat-raw
      (setq bindat-raw (make-vector (+ bindat-idx (bindat-length spec struct)) 0)))
    (bindat--pack-group struct spec)
-    (if no-return nil (concat raw-data))))
+    (if no-return nil (concat bindat-raw))))
 ;; Misc. format conversions
--- a/Show more
+++ b/Show more