Merged from miles@gnu.org--gnu-2005 (patch 133-141, 596-609)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-596
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-597
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-598
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-599
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-600
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-601
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-602
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-603
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-604
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-605
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-606
   Remove lisp/toolbar directory

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-607
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-608
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-609
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-133
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-134
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-135
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-136
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-137
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-138
   Update from CVS: texi/gnus.texi (RSS): Fix key description.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-139
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-140
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-141
   Update from CVS: texi/gnus.texi (Document Server Internals): Addition.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-426

177 files changed, 1365 insertions, 5028 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 00c71e23aeb..da7c1765255 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,331 @@
+2005-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/conf-mode.el: Don't use font-lock-defaults-alist.
+        Various docstring and line-width fixups.
+        (conf-mode): Use cond.
+        Set font-lock-defaults.  Don't set comment-use-syntax.
+
+2005-10-18  David Ponce  <david@dponce.com>
+
+        * tree-widget.el (tree-widget-button-click): New function.
+        (tree-widget-button-keymap): Use it.
+
+2005-10-18  Romain Francoise  <romain@orebokech.com>
+
+        * bookmark.el (bookmark-insert-location, bookmark-bmenu-list)
+        (bookmark-bmenu-hide-filenames): Add follow-link property.
+        Improve help-echo text.
+
+        * ffap.el (find-file-at-point): Doc fix.
+
+2005-10-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * mouse.el (mouse-set-region): Don't do sit-for on a mac frame.
+
+2005-10-18  Masatake YAMATO  <jet@gyve.org>
+
+        Install to the CVS repository what I forgot to install in my
+        2005-10-16 changes.
+
+        * progmodes/python.el (python-complete-symbol): Pass the common
+        prefix substring of completion to `display-completion-list'.
+
+        * textmodes/org.el (org-complete): Ditto.
+
+2005-10-18  Masatake YAMATO  <jet@gyve.org>
+
+        Fix a bug reported by Sven Joachim <sven_joachim@web.de>.
+
+        * woman.el (WoMan-xref-man-page): New button type derived
+        from `Man-abstract-xref-man-page'.
+        (woman-mode): Pass `WoMan-xref-man-page' to `Man-highlight-references'.
+
+        * man.el (Man-abstract-xref-man-page): New button type.
+        (Man-xref-man-page): Make it derived from `Man-abstract-xref-man-page'.
+        (Man-highlight-references): Add new optional argument `xref-man-type'.
+
+2005-10-18  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gud.el (gud-menu-map): Correct condition for fringe.
+
+2005-10-17  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cus-edit.el (Custom-move-and-invoke): Delete.
+        (custom-mode-map): Bind mouse-1 to widget-move-and-invoke.
+
+        * wid-edit.el (widget-move-and-invoke): New function, from
+        Custom-move-and-invoke.
+
+2005-10-17  Bill Wohler  <wohler@newt.com>
+
+        Move all remaining images from lisp/toolbar to etc/images, move
+        lisp/toolbar/tool-bar to lisp and "delete" lisp/toolbar.  Place
+        the low resolution images in their own directory (low-color).
+
+        * toolbar/attach.*, toolbar/cancel.*, toolbar/close.*,
+        * toolbar/copy.*, toolbar/cut.*, toolbar/diropen.*, toolbar/exit.*:
+        * toolbar/help.*, toolbar/home.*, toolbar/index.*, toolbar/info.*:
+        * toolbar/mail.*, toolbar/new.*, toolbar/open.*, toolbar/paste.*:
+        * toolbar/preferences.*, toolbar/print.*, toolbar/save.*:
+        * toolbar/saveas.*, toolbar/search.*, toolbar/search-replace.*:
+        * toolbar/spell.*, toolbar/undo.*: Move to etc/images.
+
+        * toolbar/lc-copy.*: Move to etc/images/low-color/copy.*.
+        * toolbar/lc-cut.*: Move to etc/images/low-color/cut.*.
+        * toolbar/lc-help.*: Move to etc/images/low-color/help.*.
+        * toolbar/lc-home.*: Move to etc/images/low-color/home.*.
+        * toolbar/lc-index.*: Move to etc/images/low-color/index.*.
+        * toolbar/lc-new.*: Move to etc/images/low-color/new.*.
+        * toolbar/lc-open.*: Move to etc/images/low-color/open.*.
+        * toolbar/lc-paste.*: Move to etc/images/low-color/paste.*.
+        * toolbar/lc-preferences.*: Move to etc/images/low-color/preferences.*.
+        * toolbar/lc-print.*: Move to etc/images/low-color/print.*.
+        * toolbar/lc-save.*: Move to etc/images/low-color/save.*.
+        * toolbar/lc-saveas.*: Move to etc/images/low-color/saveas.*.
+        * toolbar/lc-search.*: Move to etc/images/low-color/search.*.
+        * toolbar/lc-spell.*: Move to etc/images/low-color/spell.*.
+        * toolbar/lc-undo.*: Move to etc/images/low-color/undo.*.
+
+        To conform with convention, replace the underscore (_) in the
+        following image names with dash (-) or (/) as appropriate.
+
+        * toolbar/back_arrow.*: Move to etc/images/back-arrow.*.
+        * toolbar/fld_open.*: Move to etc/images/fld-open.*.
+        * toolbar/fwd_arrow.*: Move to etc/images/fwd-arrow.*.
+        * toolbar/jump_to.*: Move to etc/images/jump-to.*.
+        * toolbar/left_arrow.*: Move to etc/images/left-arrow.*.
+        * toolbar/right_arrow.*: Move to etc/images/right-arrow.*.
+        * toolbar/up_arrow.*: Move to etc/images/up-arrow.*.
+        * toolbar/lc-back_arrow.*: Move to etc/images/low-color/back-arrow.*.
+        * toolbar/lc-fwd_arrow.*: Move to etc/images/low-color/fwd-arrow.*.
+        * toolbar/lc-jump_to.*: Move to etc/images/low-color/jump-to.*.
+        * toolbar/lc-left_arrow.*: Move to etc/images/low-color/left-arrow.*.
+        * toolbar/lc-right_arrow.*: Move to etc/images/low-color/right-arrow.*.
+        * toolbar/lc-up_arrow.*: Move to etc/images/low-color/up-arrow.*.
+        * toolbar/mail_compose.*: Move to etc/images/mail/compose.*.
+        * toolbar/mail_send.*: Move to etc/images/mail/send.*.
+
+        * info.el (info-tool-bar-map): Replace underscores in image names
+        with dashes.
+
+        * makefile.w32-in (WINS): Remove toolbar.
+
+        * menu-bar.el: Replace toolbar/tool-bar.el with tool-bar.el in comment.
+
+        * tool-bar.el: Move to lisp from toolbar.  Now that
+        toolbar is empty, it should be deleted when folks run "cvs up -P".
+
+2005-10-18  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-store (calc-store-into): Get the proper variable name
+        to display in message.
+
+2005-10-18  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-var-create-handler): Make watch
+        expressions display in speedbar for all buffers when debugging.
+        (gdb-speedbar-expand-node): Ensure node contraction is always
+        updated.
+
+        * speedbar.el (speedbar-set-mode-line-format): Indent properly.
+        (speedbar-insert-button, speedbar-make-button):
+        Use add-text-properties.
+        (speedbar-update-localized-contents)
+        (speedbar-update-directory-contents)
+        (speedbar-update-special-contents): Use dolist.
+        (speedbar-buffer-easymenu-definition): Add a menu separator.
+
+2005-10-17  Jason Rumney  <jasonr@gnu.org>
+
+        * makefile.w32-in: Use $(lisp) consistently.
+        (pre-mh-loaddefs.el-SH, pre-mh-loaddefs.el-CMD): New targets
+        for shell specific generation of mh-autoloads.
+
+2005-10-17  Richard M. Stallman  <rms@gnu.org>
+
+        * textmodes/tex-mode.el (tex-font-lock-keywords-2): Undo prev change.
+
+2005-10-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * jit-lock.el (jit-lock-fontify-now):
+        Move jit-lock-context-unfontify-pos to avoid wasted work.
+
+2005-10-17  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-completion-mode): New defvar.  Used in
+        `tramp-completion-mode' for checking if we are in completion mode.
+        (tramp-completion-handle-file-name-all-completions): Reorder code
+        in order to complete for file names only in case there are no
+        method/user/host completions.  This is necessary for cooperation
+        with ido.  Reported by Kim F. Storm <storm@cua.dk>.
+
+2005-10-16  Chong Yidong  <cyd@stupidchicken.com>
+
+        * longlines.el (longlines-search-forward)
+        (longlines-search-backward): Match any number of spaces.
+
+2005-10-16  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * diff-mode.el (diff-mode): Doc fix.
+
+2005-10-16  David Reitter <david.reitter@gmail.com>
+
+        * mail/sendmail.el (send-mail-function): Use mailclient-send-it
+        as default on darwin and windows systems.
+
+2005-10-16  Sven Joachim  <svenjoac@gmx.de>  (tiny change)
+
+        * arc-mode.el (archive-zip-extract): Doc fix.
+
+2005-10-16  Romain Francoise  <romain@orebokech.com>
+
+        * mouse.el (mouse-1-click-follows-link): Doc fix.
+
+2005-10-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * savehist.el: Don't require CL at runtime.
+        (savehist-xemacs): Remove.
+        (savehist-coding-system): Use utf-8 if present, regardless of religion.
+        (savehist-no-conversion): Use (featurep 'xemacs).
+        (savehist-load): Check existence of start-itimer rather than XEmacs.
+        Use an idle timer.
+        (savehist-process-for-saving): Replace use of CL funs `subseq' and
+        `delete-if-not'.
+
+2005-10-16  Hrvoje Niksic  <hniksic@xemacs.org>
+
+        * savehist.el: Newer version.
+        (savehist-autosave-interval, savehist-coding-system, savehist-timer)
+        (savehist-last-checksum, savehist-no-conversion): New vars.
+        (savehist-autosave, savehist-process-for-saving, savehist-printable):
+        New functions.
+        (savehist-load, savehist-save): Use them.
+        (savehist-delimit): Remove.
+
+2005-10-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/compile.el (compilation-goto-locus): Display the
+        compilation buffer first and the source buffer second, in case they're
+        in overlapping frames.  Don't raise the compilation frame if it was the
+        selected window upon entry.  Pass the `other-window' arg to
+        pop-to-buffer.
+
+        * info.el (Info-fontify-node): Use dolist.
+        Change add-text-properties to put-text-property.
+
+2005-10-16  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
+
+        * textmodes/bibtex.el (bibtex-font-lock-url): Catch when point past
+        bound of search.
+
+2005-10-16  Masatake YAMATO  <jet@gyve.org>
+
+        * dabbrev.el (dabbrev-completion): Pass the common
+        prefix substring of completion to `display-completion-list'.
+
+        * filecache.el (file-cache-minibuffer-complete)
+        (file-cache-complete): Ditto.
+
+        * tempo.el (tempo-display-completions): Ditto.
+
+        * wid-edit.el (widget-file-complete, widget-color-complete): Ditto.
+
+        * emacs-lisp/lisp.el (lisp-complete-symbol): Ditto.
+
+        * eshell/em-hist.el (eshell-list-history): Ditto.
+
+        * mail/mailabbrev.el (mail-abbrev-complete-alias): Ditto.
+
+        * mail/mailalias.el (mail-complete): Ditto.
+
+        * progmodes/etags.el (complete-tag): Ditto.
+
+        * progmodes/make-mode.el (makefile-complete): Ditto.
+
+        * progmodes/meta-mode.el (meta-complete-symbol): Ditto.
+
+        * progmodes/octave-mod.el (octave-complete-symbol): Ditto.
+
+        * progmodes/pascal.el (pascal-complete-word)
+        (pascal-show-completions): Ditto.
+
+
+        * textmodes/bibtex.el (bibtex-complete-internal): Ditto.
+
+        * simple.el (completion-common-substring): New variable.
+        (completion-setup-function): Use `completion-common-substring'
+        to put faces.
+
+2005-10-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * term/mac-win.el: Apply 2005-10-09 change for term/x-win.el.
+        (x-get-selection, mac-select-convert-to-string): Convert from/to
+        UTF-16 clipboard data as in native byte order, no BOM.
+
+2005-10-16  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gud.el (gud-tool-bar-map): Rename the images
+        appropriately (gud/next, gud/nexti, gud/step, gud/stepi).
+        (gud-sentinel): Use speedbar-frame to check for speedbar.
+
+2005-10-15  Richard M. Stallman  <rms@gnu.org>
+
+        * savehist.el: New file.
+
+2005-10-14  Karl Chen  <quarl@cs.berkeley.edu>
+
+        * textmodes/tex-mode.el (tex-font-lock-keywords-2):
+        Fix bug in \bf fontification.
+
+2005-10-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcvs.el (cvs-edit-log-files): New var.
+        (cvs-mode-edit-log): New arg `file'.
+        (cvs-edit-log-minor-wrap): Don't set the ignore-marks property.
+        Instead force the use of the original file and nothing else.
+        (cvs-edit-log-filelist): Don't use the cvs-mode-* function unless
+        the cvs-minor-wrap-function is set.
+        (cvs-do-edit-log): Obey the vars set in cvs-edit-log-minor-wrap.
+
+2005-10-14  Bill Wohler  <wohler@newt.com>
+
+        * toolbar/gud-break.*: Moved to etc/images/gud/break.*.
+        * toolbar/gud-cont.*: Moved to etc/images/gud/cont.*.
+        * toolbar/gud-down.*: Moved to etc/images/gud/down.*.
+        * toolbar/gud-finish.*: Moved to etc/images/gud/finish.*.
+        * toolbar/gud-ni.*: Moved to etc/images/gud/ni.*.
+        * toolbar/gud-n.*: Moved to etc/images/gud/n.*.
+        * toolbar/gud-print.*: Moved to etc/images/gud/print.*.
+        * toolbar/gud-pstar.*: Moved to etc/images/gud/pstar.*.
+        * toolbar/gud-remove.*: Moved to etc/images/gud/remove.*.
+        * toolbar/gud-run.*: Moved to etc/images/gud/run.*.
+        * toolbar/gud-si.*: Moved to etc/images/gud/si.*.
+        * toolbar/gud-s.*: Moved to etc/images/gud/s.*.
+        * toolbar/gud-until.*: Moved to etc/images/gud/until.*.
+        * toolbar/gud-up.*: Moved to etc/images/gud/up.*.
+        * toolbar/gud-watch.*: Moved to etc/images/gud/watch.*.
+
+        * progmodes/gud.el (gud-tool-bar-map): Rename the images
+        appropriately (for example, gud-break to gud/break).
+
+2005-10-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * longlines.el (longlinges-search-function)
+        (longlines-search-forward, longlines-search-backward): New functions.
+        (longlines-mode): Set isearch-search-fun-function to
+        longlinges-search-function.
+
+        * mouse.el (mouse-drag-region-1): Handle the case where a
+        double-click event is bound to an arbitrary function.
+
+2005-10-14  David Ponce  <david@dponce.com>
+
+        * recentf.el (recentf-track-opened-file)
+        (recentf-track-closed-file, recentf-update-menu)
+        (recentf-used-hooks, recentf-enabled-p): Move before dialog stuff.
+        (recentf-dialog-mode-map): Map follow-link to RET, so dialogs obey
+        mouse-1-click-follows-link.
+
 2005-10-13  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * toolbar/diropen.xpm, toolbar/diropen.pbm: New versions made from
@@ -26,6 +354,11 @@
         Handle the case that ucs-mule-to-mule-unicode translates a character to
         ASCII (usually for IPA characters).
 
+2005-10-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * info.el (Info-fontify-node): Don't be fooled by a lone "...".
+        Don't hide the underline of titles if font-lock-mode is disabled.
+
 2005-10-12  Bill Wohler  <wohler@newt.com>
 
         * makefile.w32-in (MH-E-SRC): New. Used by mh-autoloads.
@@ -10071,8 +10404,8 @@
         minibuffer-with-setup-hook (which breaks turning on/off
         file-name-shadow-mode while in the prompt).
 
-        * complete.el (PC-read-include-file-name-internal): Use
-        test-completion.
+        * complete.el (PC-read-include-file-name-internal):
+        Use test-completion.
 
 2005-03-28  Luc Teirlinck  <teirllm@auburn.edu>
 
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index a29ec10d400..ae5ff9a4dbc 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -225,8 +225,7 @@ Archive and member name will be added."
     '("unzip" "-qq" "-c"))
   "*Program and its options to run in order to extract a zip file member.
 Extraction should happen to standard output.  Archive and member name will
-be added.  If `archive-zip-use-pkzip' is non-nil then this program is
-expected to extract to a file junking the directory part of the name."
+be added."
   :type '(list (string :tag "Program")
                 (repeat :tag "Options"
                         :inline t
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 8014915a72e..75228288fff 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1175,12 +1175,14 @@ minibuffer history list `bookmark-history'."
     (prog1
         (insert (bookmark-location bookmark)) ; *Return this line*
       (if (and (display-color-p) (display-mouse-p))
-          (add-text-properties start
-                               (save-excursion (re-search-backward
-                                                "[^ \t]")
+          (add-text-properties
+           start
+           (save-excursion (re-search-backward
+                            "[^ \t]")
                                                (1+ (point)))
-                               '(mouse-face highlight
-                                 help-echo "mouse-2: go to this bookmark"))))))
+           '(mouse-face highlight
+             follow-link t
+             help-echo "mouse-2: go to this bookmark in other window"))))))
 
 ;;;###autoload
 (defalias 'bookmark-locate 'bookmark-insert-location)
@@ -1566,12 +1568,14 @@ deletion, or > if it is flagged for displaying."
          (let ((start (point)))
            (insert (bookmark-name-from-full-record full-record))
            (if (and (display-color-p) (display-mouse-p))
-               (add-text-properties start
-                                    (save-excursion (re-search-backward
-                                                     "[^ \t]")
-                                                    (1+ (point)))
-                                    '(mouse-face highlight
-                                      help-echo "mouse-2: go to this bookmark")))
+               (add-text-properties
+                start
+                (save-excursion (re-search-backward
+                                 "[^ \t]")
+                                (1+ (point)))
+                '(mouse-face highlight
+                  follow-link t
+                  help-echo "mouse-2: go to this bookmark in other window")))
            (insert "\n")
            )))
      bookmark-alist))
@@ -1695,13 +1699,15 @@ Optional argument SHOW means show them unconditionally."
                 (let ((start (point)))
                   (insert (car bookmark-bmenu-hidden-bookmarks))
                   (if (and (display-color-p) (display-mouse-p))
-                      (add-text-properties start
-                                           (save-excursion (re-search-backward
-                                                            "[^ \t]")
-                                                           (1+ (point)))
-                                           '(mouse-face highlight
-                                             help-echo
-                                             "mouse-2: go to this bookmark"))))
+                      (add-text-properties
+                       start
+                       (save-excursion (re-search-backward
+                                        "[^ \t]")
+                                       (1+ (point)))
+                       '(mouse-face highlight
+                         follow-link t
+                         help-echo
+                         "mouse-2: go to this bookmark in other window"))))
                 (setq bookmark-bmenu-hidden-bookmarks
                       (cdr bookmark-bmenu-hidden-bookmarks))
                 (forward-line 1))))))))
diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el
index 82c7077ba91..d6a37644cc7 100644
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -71,7 +71,7 @@
                                       (if (not (cdr var)) "")
                                       (if (not (cdr var)) 1))))
                (message (concat "Stored to variable \"%s\"" msg)
-                        (calc-var-name var)))
+                        (calc-var-name (car (car var)))))
              (setq var (cdr var))))))))
 
 (defun calc-store-plus (&optional var)
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 8f88e4d049c..696fd66543a 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4245,20 +4245,10 @@ The format is suitable for use with `easy-menu-define'."
     (define-key map "u" 'Custom-goto-parent)
     (define-key map "n" 'widget-forward)
     (define-key map "p" 'widget-backward)
-    (define-key map [mouse-1] 'Custom-move-and-invoke)
+    (define-key map [mouse-1] 'widget-move-and-invoke)
     map)
   "Keymap for `custom-mode'.")
 
-(defun Custom-move-and-invoke (event)
-  "Move to where you click, and if it is an active field, invoke it."
-  (interactive "e")
-  (mouse-set-point event)
-  (if (widget-event-point event)
-      (let* ((pos (widget-event-point event))
-             (button (get-char-property pos 'button)))
-        (if button
-            (widget-button-click event)))))
-
 (easy-menu-define Custom-mode-menu
     custom-mode-map
   "Menu used in customization buffers."
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 2139e7c5761..b330f2b10d7 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -461,7 +461,8 @@ if there is a suitable one already."
       ;; * String is a common substring completion already.  Make list.
       (message "Making completion list...")
       (with-output-to-temp-buffer "*Completions*"
-        (display-completion-list (all-completions init my-obarray)))
+        (display-completion-list (all-completions init my-obarray)
+                                 init))
       (message "Making completion list...done")))
     (and (window-minibuffer-p (selected-window))
          (message nil))))
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 09c3b6a8939..8f018185c98 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -967,7 +967,7 @@ If you edit the buffer manually, diff-mode will try to update the hunk
 headers for you on-the-fly.
 
 You can also switch between context diff and unified diff with \\[diff-context->unified],
-or vice versa with \\[diff-unified->context] and you can also revert the direction of
+or vice versa with \\[diff-unified->context] and you can also reverse the direction of
 a diff with \\[diff-reverse-direction]."
   (set (make-local-variable 'font-lock-defaults) diff-font-lock-defaults)
   (set (make-local-variable 'outline-regexp) diff-outline-regexp)
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index d248882d882..4b799ebfedf 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -586,7 +586,7 @@ considered."
                          (setq list (cdr list)))
                        (setq list (nreverse new))))
                  (with-output-to-temp-buffer "*Completions*"
-                   (display-completion-list list)))
+                   (display-completion-list list pattern)))
                (message "Making completion list...%s" "done")))))))
 
 ;;; arch-tag: aa7fa8a4-2e6f-4e9b-9cd9-fef06340e67e
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index fd887e5fa86..e7844028542 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -507,7 +507,7 @@ See also `eshell-read-history'."
         ;; Change "completion" to "history reference"
         ;; to make the display accurate.
         (with-output-to-temp-buffer history-buffer
-          (display-completion-list history)
+          (display-completion-list history prefix)
           (set-buffer history-buffer)
           (forward-line 3)
           (while (search-backward "completion" nil 'move)
diff --git a/lisp/ffap.el b/lisp/ffap.el
index d408918558a..6eb598d434d 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1380,9 +1380,7 @@ If `ffap-url-regexp' is not nil, the FILENAME may also be an URL.
 With a prefix, this command behaves exactly like `ffap-file-finder'.
 If `ffap-require-prefix' is set, the prefix meaning is reversed.
 See also the variables `ffap-dired-wildcards', `ffap-newfile-prompt',
-and the functions `ffap-file-at-point' and `ffap-url-at-point'.
-
-See <ftp://ftp.mathcs.emory.edu/pub/mic/emacs/> for latest version."
+and the functions `ffap-file-at-point' and `ffap-url-at-point'."
   (interactive)
   (if (and (interactive-p)
            (if ffap-require-prefix (not current-prefix-arg)
diff --git a/lisp/filecache.el b/lisp/filecache.el
index bb45bb392f3..442f729dd15 100644
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -607,7 +607,7 @@ the name is considered already unique; only the second substitution
                             completion-setup-hook)))
                     )
                 (with-output-to-temp-buffer file-cache-completions-buffer
-                  (display-completion-list completion-list))
+                  (display-completion-list completion-list string))
                 )
               )
           (setq file-cache-string (file-cache-file-name completion-string))
@@ -700,7 +700,7 @@ the name is considered already unique; only the second substitution
            )
           (t
            (with-output-to-temp-buffer "*Completions*"
-             (display-completion-list all))
+             (display-completion-list all pattern))
            ))
     ))
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 23e5564770f..04213b9fa45 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,19 @@
+2005-10-17  Chong Yidong  <cyd@stupidchicken.com>
+
+        * gnus-cus.el (gnus-custom-map): New variable.  Bind mouse-1 to
+        widget-move-and-invoke.
+        (gnus-custom-mode): Use gnus-custom-map.
+
+2005-10-15  Bill Wohler  <wohler@newt.com>
+
+        * message.el (message-tool-bar-map): Renamed image file from
+        mail_send to mail/send.
+
+2005-10-16  Masatake YAMATO  <jet@gyve.org>
+
+        * message.el (message-expand-group): Pass the common
+        prefix substring of completion to `display-completion-list'.
+
 2005-10-09  Daniel Brockman <daniel@brockman.se>
 
         * format-spec.el (format-spec): Propagate text properties of % spec.
@@ -21,6 +37,11 @@
         * pgg-def.el (top-level): Don't require custom, it is
         autoloaded.  (To sync with No Gnus.)
 
+2005-10-04  David Hansen  <david.hansen@gmx.net>
+
+        * nnrss.el (nnrss-request-article): Add support for the comments tag.
+        (nnrss-check-group): Ditto.
+
 2005-10-04  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * mm-url.el (mm-url-predefined-programs): Add switches for curl.
diff --git a/lisp/gnus/gnus-cus.el b/lisp/gnus/gnus-cus.el
index f523af22750..df10c769315 100644
--- a/lisp/gnus/gnus-cus.el
+++ b/lisp/gnus/gnus-cus.el
@@ -36,6 +36,14 @@
 
 ;;; Widgets:
 
+(defvar gnus-custom-map
+  (let ((map (make-keymap)))
+    (set-keymap-parent map widget-keymap)
+    (suppress-keymap map)
+    (define-key map [mouse-1] 'widget-move-and-invoke)
+    map)
+  "Keymap for editing Gnus customization buffers.")
+
 (defun gnus-custom-mode ()
   "Major mode for editing Gnus customization buffers.
 
@@ -51,7 +59,7 @@ if that value is non-nil."
   (kill-all-local-variables)
   (setq major-mode 'gnus-custom-mode
         mode-name "Gnus Customize")
-  (use-local-map widget-keymap)
+  (use-local-map gnus-custom-map)
   ;; Emacs 21 stuff:
   (when (and (facep 'custom-button-face)
              (facep 'custom-button-pressed-face))
@@ -479,7 +487,7 @@ form, but who cares?"
             (widget-create 'sexp
                            :tag "Method"
                            :value (gnus-info-method info))))
-    (use-local-map widget-keymap)
+    (use-local-map gnus-custom-map)
     (widget-setup)
     (buffer-enable-undo)
     (goto-char (point-min))))
@@ -873,7 +881,7 @@ articles in the thread.
                          '(repeat :inline t
                                   :tag "Unknown entries"
                                   sexp)))
-    (use-local-map widget-keymap)
+    (use-local-map gnus-custom-map)
     (widget-setup)))
 
 (defun gnus-score-customize-done (&rest ignore)
@@ -1050,7 +1058,7 @@ articles in the thread.
 
       (gnus-agent-cat-prepare-category-field agent-enable-undownloaded-faces)
 
-      (use-local-map widget-keymap)
+      (use-local-map gnus-custom-map)
       (widget-setup)
       (buffer-enable-undo))))
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index d64d8dbd2bf..8ac3bb8cf18 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6586,7 +6586,7 @@ which specify the range to operate on."
                                            write-file dired open-file))
                  (define-key tool-bar-map (vector key) nil))
                (message-tool-bar-local-item-from-menu
-                'message-send-and-exit "mail_send" tool-bar-map message-mode-map)
+                'message-send-and-exit "mail/send" tool-bar-map message-mode-map)
                (message-tool-bar-local-item-from-menu
                 'message-kill-buffer "close" tool-bar-map message-mode-map)
                (message-tool-bar-local-item-from-menu
@@ -6691,7 +6691,7 @@ those headers."
           (let ((buffer-read-only nil))
             (erase-buffer)
             (let ((standard-output (current-buffer)))
-              (display-completion-list (sort completions 'string<)))
+              (display-completion-list (sort completions 'string<) string))
             (goto-char (point-min))
             (delete-region (point) (progn (forward-line 3) (point))))))))))
 
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el
index 5018701ee42..adef035c830 100644
--- a/lisp/gnus/nnrss.el
+++ b/lisp/gnus/nnrss.el
@@ -197,6 +197,7 @@ for decoding when the cdr that the data specify is not available.")
                                    " ")))
               (link (nth 2 e))
               (enclosure (nth 7 e))
+              (comments (nth 8 e))
               ;; Enable encoding of Newsgroups header in XEmacs.
               (default-enable-multibyte-characters t)
               (rfc2047-header-encoding-alist
@@ -205,7 +206,7 @@ for decoding when the cdr that the data specify is not available.")
                          rfc2047-header-encoding-alist)
                  rfc2047-header-encoding-alist))
               rfc2047-encode-encoded-words body)
-          (when (or text link enclosure)
+          (when (or text link enclosure comments)
             (insert "\n")
             (insert "<#multipart type=alternative>\n"
                     "<#part type=\"text/plain\">\n")
@@ -220,6 +221,8 @@ for decoding when the cdr that the data specify is not available.")
               (insert (car enclosure) " "
                       (nth 2 enclosure) " "
                       (nth 3 enclosure) "\n"))
+            (when comments
+              (insert comments "\n"))
             (setq body (buffer-substring body (point)))
             (insert "<#/part>\n"
                     "<#part type=\"text/html\">\n"
@@ -232,6 +235,8 @@ for decoding when the cdr that the data specify is not available.")
               (insert "<p><a href=\"" (car enclosure) "\">"
                       (cadr enclosure) "</a> " (nth 2 enclosure)
                       " " (nth 3 enclosure) "</p>\n"))
+            (when comments
+              (insert "<p><a href=\"" comments "\">comments</a></p>\n"))
             (insert "</body></html>\n"
                     "<#/part>\n"
                     "<#/multipart>\n"))
@@ -528,7 +533,7 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s"
 
 (defun nnrss-check-group (group server)
   (let (file xml subject url extra changed author date
-             enclosure rss-ns rdf-ns content-ns dc-ns)
+             enclosure comments rss-ns rdf-ns content-ns dc-ns)
     (if (and nnrss-use-local
              (file-exists-p (setq file (expand-file-name
                                         (nnrss-translate-file-chars
@@ -576,6 +581,7 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s"
         (setq date (or (nnrss-node-text dc-ns 'date item)
                        (nnrss-node-text rss-ns 'pubDate item)
                        (message-make-date)))
+        (setq comments (nnrss-node-text rss-ns 'comments item))
         (when (setq enclosure (cadr (assq (intern (concat rss-ns "enclosure")) item)))
           (let ((url (cdr (assq 'url enclosure)))
                 (len (cdr (assq 'length enclosure)))
@@ -606,7 +612,8 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s"
           (and author (nnrss-mime-encode-string author))
           date
           (and extra (nnrss-decode-entities-string extra))
-          enclosure)
+          enclosure
+          comments)
          nnrss-group-data)
         (gnus-sethash (or url extra) t nnrss-group-hashtb)
         (setq changed t))
diff --git a/lisp/info.el b/lisp/info.el
index 5d86d0cb46e..6594d76fa03 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3161,14 +3161,14 @@ if point is in a menu item description, follow that menu item."
   (if (display-graphic-p)
       (let ((map (make-sparse-keymap)))
         (tool-bar-local-item-from-menu 'Info-exit "close" map Info-mode-map)
-        (tool-bar-local-item-from-menu 'Info-prev "left_arrow" map Info-mode-map)
-        (tool-bar-local-item-from-menu 'Info-next "right_arrow" map Info-mode-map)
-        (tool-bar-local-item-from-menu 'Info-up "up_arrow" map Info-mode-map)
-        (tool-bar-local-item-from-menu 'Info-history-back "back_arrow" map Info-mode-map)
-        (tool-bar-local-item-from-menu 'Info-history-forward "fwd_arrow" map Info-mode-map)
+        (tool-bar-local-item-from-menu 'Info-prev "left-arrow" map Info-mode-map)
+        (tool-bar-local-item-from-menu 'Info-next "right-arrow" map Info-mode-map)
+        (tool-bar-local-item-from-menu 'Info-up "up-arrow" map Info-mode-map)
+        (tool-bar-local-item-from-menu 'Info-history-back "back-arrow" map Info-mode-map)
+        (tool-bar-local-item-from-menu 'Info-history-forward "fwd-arrow" map Info-mode-map)
         (tool-bar-local-item-from-menu 'Info-top-node "home" map Info-mode-map)
         (tool-bar-local-item-from-menu 'Info-index "index" map Info-mode-map)
-        (tool-bar-local-item-from-menu 'Info-goto-node "jump_to" map Info-mode-map)
+        (tool-bar-local-item-from-menu 'Info-goto-node "jump-to" map Info-mode-map)
         (tool-bar-local-item-from-menu 'Info-search "search" map Info-mode-map)
         map)))
 
@@ -3847,17 +3847,15 @@ the variable `Info-file-list-for-emacs'."
               (paragraph-separate ".*\\.[ \t]*\n[ \t]\\|[ \t]*[-*]\\|[ \t\f]*$")
               (adaptive-fill-mode nil))
           (goto-char (point-max))
-          (while paragraph-markers
-            (let ((m (car paragraph-markers)))
-              (setq paragraph-markers (cdr paragraph-markers))
-              (when (< m (point))
-                (goto-char m)
-                (beginning-of-line)
-                (let ((beg (point)))
-                  (when (zerop (forward-paragraph))
-                    (fill-individual-paragraphs beg (point) nil nil)
-                    (goto-char beg))))
-              (set-marker m nil)))))
+          (dolist (m paragraph-markers)
+            (when (< m (point))
+              (goto-char m)
+              (beginning-of-line)
+              (let ((beg (point)))
+                (when (zerop (forward-paragraph))
+                  (fill-individual-paragraphs beg (point) nil nil)
+                  (goto-char beg))))
+            (set-marker m nil))))
 
       ;; Fontify menu items
       (goto-char (point-min))
@@ -3889,33 +3887,32 @@ the variable `Info-file-list-for-emacs'."
                                "mouse-2: go to this node")
                   'mouse-face 'highlight)))
               (when (or not-fontified-p fontify-visited-p)
-                (add-text-properties
+                (put-text-property
                  (match-beginning 1) (match-end 1)
-                 (list
-                  'font-lock-face
-                  ;; Display visited menu items in a different face
-                  (if (and Info-fontify-visited-nodes
-                           (save-match-data
-                             (let ((node (if (equal (match-string 3) "")
-                                             (match-string 1)
-                                           (match-string 3)))
-                                   (file (file-name-nondirectory Info-current-file))
-                                   (hl Info-history-list)
-                                   res)
-                               (if (string-match "(\\([^)]+\\))\\([^)]*\\)" node)
-                                   (setq file (file-name-nondirectory
-                                               (match-string 1 node))
-                                         node (if (equal (match-string 2 node) "")
-                                                  "Top"
-                                                (match-string 2 node))))
-                               (while hl
-                                 (if (and (string-equal node (nth 1 (car hl)))
-                                          (string-equal file
-                                                        (file-name-nondirectory
-                                                         (nth 0 (car hl)))))
-                                     (setq res (car hl) hl nil)
-                                   (setq hl (cdr hl))))
-                               res))) 'info-xref-visited 'info-xref))))
+                 'font-lock-face
+                 ;; Display visited menu items in a different face
+                 (if (and Info-fontify-visited-nodes
+                          (save-match-data
+                            (let ((node (if (equal (match-string 3) "")
+                                            (match-string 1)
+                                          (match-string 3)))
+                                  (file (file-name-nondirectory Info-current-file))
+                                  (hl Info-history-list)
+                                  res)
+                              (if (string-match "(\\([^)]+\\))\\([^)]*\\)" node)
+                                  (setq file (file-name-nondirectory
+                                              (match-string 1 node))
+                                        node (if (equal (match-string 2 node) "")
+                                                 "Top"
+                                               (match-string 2 node))))
+                              (while hl
+                                (if (and (string-equal node (nth 1 (car hl)))
+                                         (string-equal file
+                                                       (file-name-nondirectory
+                                                        (nth 0 (car hl)))))
+                                    (setq res (car hl) hl nil)
+                                  (setq hl (cdr hl))))
+                              res))) 'info-xref-visited 'info-xref)))
               (when (and not-fontified-p (memq Info-hide-note-references '(t hide)))
                 (put-text-property (match-beginning 2) (1- (match-end 6))
                                    'invisible t)
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 2f8fcba91d1..b76c675cba4 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -349,6 +349,13 @@ Defaults to the whole buffer.  END can be out of bounds."
            (goto-char next)  (setq next (line-beginning-position 2))
            (goto-char start) (setq start (line-beginning-position))
 
+           ;; Make sure the contextual refontification doesn't re-refontify
+           ;; what's already been refontified.
+           (when (and jit-lock-context-unfontify-pos
+                      (< jit-lock-context-unfontify-pos next)
+                      (>= jit-lock-context-unfontify-pos start))
+             (setq jit-lock-context-unfontify-pos next))
+
            ;; Fontify the chunk, and mark it as fontified.
            ;; We mark it first, to make sure that we don't indefinitely
            ;; re-execute this fontification if an error occurs.
@@ -566,9 +573,14 @@ will take place when text is fontified stealthily."
       ;; Mark the change for deferred contextual refontification.
       (when jit-lock-context-unfontify-pos
         (setq jit-lock-context-unfontify-pos
+              ;; Here we use `start' because nothing guarantees that the
+              ;; text between start and end will be otherwise refontified:
+              ;; usually it will be refontified by virtue of being
+              ;; displayed, but if it's outside of any displayed area in the
+              ;; buffer, only jit-lock-context-* will re-fontify it.
               (min jit-lock-context-unfontify-pos start))))))
 
 (provide 'jit-lock)
 
-;;; arch-tag: 56b5de6e-f581-453b-bb97-49c39372ff9e
+;; arch-tag: 56b5de6e-f581-453b-bb97-49c39372ff9e
 ;;; jit-lock.el ends here
diff --git a/lisp/longlines.el b/lisp/longlines.el
index 6ce5dfaebc4..00a2782d0a3 100644
--- a/lisp/longlines.el
+++ b/lisp/longlines.el
@@ -109,6 +109,8 @@ are indicated with a symbol."
         (add-to-list 'buffer-file-format 'longlines)
         (add-hook 'change-major-mode-hook 'longlines-mode-off nil t)
         (make-local-variable 'buffer-substring-filters)
+        (set (make-local-variable 'isearch-search-fun-function)
+             'longlinges-search-function)
         (add-to-list 'buffer-substring-filters 'longlines-encode-string)
         (when longlines-wrap-follows-window-size
           (set (make-local-variable 'fill-column)
@@ -148,6 +150,7 @@ are indicated with a symbol."
                  'longlines-window-change-function t)
     (when longlines-wrap-follows-window-size
       (kill-local-variable 'fill-column))
+    (kill-local-variable 'isearch-search-fun-function)
     (kill-local-variable 'require-final-newline)
     (kill-local-variable 'buffer-substring-filters)
     (kill-local-variable 'use-hard-newlines)))
@@ -381,6 +384,27 @@ This is called by `window-size-change-functions'."
       (longlines-wrap-region (point-min) (point-max))
       (set-buffer-modified-p mod))))
 
+;; Isearch
+
+(defun longlinges-search-function ()
+  (cond
+   (isearch-word
+    (if isearch-forward 'word-search-forward 'word-search-backward))
+   (isearch-regexp
+    (if isearch-forward 're-search-forward 're-search-backward))
+   (t
+    (if isearch-forward
+        'longlines-search-forward
+      'longlines-search-backward))))
+
+(defun longlines-search-forward (string &optional bound noerror count)
+  (let ((search-spaces-regexp "[ \n]+"))
+    (re-search-forward (regexp-quote string) bound noerror count)))
+
+(defun longlines-search-backward (string &optional bound noerror count)
+  (let ((search-spaces-regexp "[ \n]+"))
+    (re-search-backward (regexp-quote string) bound noerror count)))
+
 ;; Loading and saving
 
 (add-to-list
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index 06af543b4da..587b7d0187e 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -587,7 +587,8 @@ of a mail alias.  The value is set up, buffer-local, when first needed.")
                 (prog2
                     (message "Making completion list...")
                     (all-completions alias mail-abbrevs)
-                  (message "Making completion list...done"))))))))
+                  (message "Making completion list...done"))
+                alias))))))
 
 (defun mail-abbrev-next-line (&optional arg)
   "Expand any mail abbrev, then move cursor vertically down ARG lines.
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index f7c62026d80..81afe688c10 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -120,7 +120,10 @@ nil means let mailer mail back a message to report errors."
 
 ;; Useful to set in site-init.el
 ;;;###autoload
-(defcustom send-mail-function 'sendmail-send-it
+(defcustom send-mail-function 
+  (if (and window-system (memq system-type '(darwin windows-nt)))
+      'mailclient-send-it
+    'sendmail-send-it)
   "Function to call to send the current buffer as mail.
 The headers should be delimited by a line which is
 not a valid RFC822 header or continuation line,
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index df92500a006..d909c909b10 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -91,14 +91,13 @@ WINS=\
         progmodes \
         term \
         textmodes \
-        toolbar \
         url
 
 doit:
 
-cus-load.el:
+$(lisp)/cus-load.el:
         touch $@
-custom-deps: cus-load.el doit
+custom-deps: $(lisp)/cus-load.el doit
         @echo Directories: $(WINS)
         -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS)
 
@@ -106,7 +105,7 @@ finder-data: doit
         @echo Directories: $(WINS)
         $(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS)
 
-loaddefs.el:
+$(lisp)/loaddefs.el:
         $(MAKE) $(MFLAGS) loaddefs.el-$(SHELLTYPE)
         cp loaddefs.el-$(SHELLTYPE) $@
         rm loaddefs.el-$(SHELLTYPE)
@@ -139,7 +138,7 @@ loaddefs.el-CMD:
         echo (autoload 'define-derived-mode "derived")>> $@
         echo (autoload 'encoded-kbd-mode "encoded-kb")>> $@
         echo (defvar cvs-global-menu nil)>> $@
-        echo ;;; >> $@
+        echo.>> $@
         echo ;;; Local Variables:>> $@
         echo ;;; version-control: never>> $@
         echo ;;; no-byte-compile: t>> $@
@@ -147,7 +146,7 @@ loaddefs.el-CMD:
         echo ;;; End:>> $@
         echo ;;; loaddefs.el ends here>> $@
 
-autoloads: loaddefs.el doit
+autoloads: $(lisp)/loaddefs.el doit
         @echo Directories: $(WINS)
         $(emacs) -l autoload \
                 --eval $(ARGQUOTE)(setq find-file-hook nil \
@@ -156,19 +155,19 @@ autoloads: loaddefs.el doit
                           $(DQUOTE)$(lisp)/loaddefs.el$(DQUOTE))$(ARGQUOTE) \
                 -f batch-update-autoloads $(lisp) $(WINS)
 
-subdirs.el:
+$(lisp)/subdirs.el:
         $(MAKE) $(MFLAGS) update-subdirs
 
 # Need separate version for sh and native cmd.exe
 update-subdirs: update-subdirs-$(SHELLTYPE)
 
 update-subdirs-CMD: doit
-        echo ;; -*- no-byte-compile: t -*->subdirs.el
-        echo ;; In load-path, after this directory should come>> subdirs.el
-        echo ;; certain of its subdirectories.  Here we specify them.>> subdirs.el
-        echo (normal-top-level-add-to-load-path $(SQUOTE)(>> subdirs.el
-        @for %%d in ($(WINS)) do if not (%%d)==(term) echo "%%d">> subdirs.el
-        echo ))>> subdirs.el
+        echo ;; -*- no-byte-compile: t -*-> $(lisp)/subdirs.el
+        echo ;; In load-path, after this directory should come>> $(lisp)/subdirs.el
+        echo ;; certain of its subdirectories.  Here we specify them.>> $(lisp)/subdirs.el
+        echo (normal-top-level-add-to-load-path $(SQUOTE)(>> $(lisp)/subdirs.el
+        @for %%d in ($(WINS)) do if not (%%d)==(term) echo "%%d">> $(lisp)/subdirs.el
+        echo ))>> $(lisp)/subdirs.el
 
 update-subdirs-SH: doit
         $(srcdir)/update-subdirs $(lisp); \
@@ -207,7 +206,7 @@ TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2)
 # compiled find the right files.
 
 # Need separate version for sh and native cmd.exe
-compile: subdirs.el mh-autoloads compile-$(SHELLTYPE) doit
+compile: $(lisp)/subdirs.el mh-autoloads compile-$(SHELLTYPE) doit
 
 compile-CMD:
 #       -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r %%g
@@ -236,7 +235,7 @@ compile-SH:
 # unconditionally.  Some files don't actually get compiled because they
 # set the local variable no-byte-compile.
 
-compile-always: subdirs.el compile-always-$(SHELLTYPE) doit
+compile-always: $(lisp)/subdirs.el compile-always-$(SHELLTYPE) doit
 
 compile-always-CMD:
 #       -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r %%g
@@ -300,6 +299,17 @@ MH_E_SRC = $(lisp)/mh-e/mh-acros.el $(lisp)/mh-e/mh-alias.el	\
 
 mh-autoloads: $(lisp)/mh-e/mh-loaddefs.el
 $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
+        $(MAKE) $(MFLAGS) pre-mh-loaddefs.el-$(SHELLTYPE)
+        cp pre-mh-loaddefs.el-$(SHELLTYPE) $@
+        rm pre-mh-loaddefs.el-$(SHELLTYPE)
+        $(EMACS) $(EMACSOPT) \
+           -l autoload \
+           --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
+           --eval "(setq generated-autoload-file \"$(lisp)/mh-e/mh-loaddefs.el\")" \
+           --eval "(setq make-backup-files nil)" \
+           -f batch-update-autoloads $(lisp)/mh-e
+
+pre-mh-loaddefs.el-SH:
         echo ";;; mh-loaddefs.el --- automatically extracted autoloads" > $@
         echo ";;" >> $@
         echo ";;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc." >> $@
@@ -308,12 +318,6 @@ $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
         echo ";;; Commentary:" >> $@
         echo ";;; Change Log:" >> $@
         echo ";;; Code:" >> $@
-        $(EMACS) $(EMACSOPT) \
-           -l autoload \
-           --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
-           --eval "(setq generated-autoload-file \"$(lisp)/mh-e/mh-loaddefs.el\")" \
-           --eval "(setq make-backup-files nil)" \
-           -f batch-update-autoloads $(lisp)/mh-e
         echo "" >> $@
         echo "(provide 'mh-loaddefs)" >> $@
         echo ";;; Local Variables:" >> $@
@@ -323,6 +327,24 @@ $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
         echo ";;; End:" >> $@
         echo ";;; mh-loaddefs.el ends here" >> $@
 
+pre-mh-loaddefs.el-CMD:
+        echo ;;; mh-loaddefs.el --- automatically extracted autoloads> $@
+        echo ;;>> $@
+        echo ;;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.>> $@
+        echo ;;; Author: Bill Wohler (wohler@newt.com)>> $@
+        echo ;;; Keywords: mail>> $@
+        echo ;;; Commentary:>> $@
+        echo ;;; Change Log:>> $@
+        echo ;;; Code:>> $@
+        echo.>> $@
+        echo (provide 'mh-loaddefs)>> $@
+        echo ;;; Local Variables:>> $@
+        echo ;;; version-control: never>> $@
+        echo ;;; no-byte-compile: t>> $@
+        echo ;;; no-update-autoloads: t>> $@
+        echo ;;; End:>> $@
+        echo ;;; mh-loaddefs.el ends here>> $@
+
 # Prepare a bootstrap in the lisp subdirectory.
 #
 # Build loaddefs.el to make sure it's up-to-date.  If it's not, that
@@ -337,7 +359,7 @@ $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
 # sources only.
 
 # Need separate version for sh and native cmd.exe
-bootstrap-clean: bootstrap-clean-$(SHELLTYPE) loaddefs.el
+bootstrap-clean: bootstrap-clean-$(SHELLTYPE) $(lisp)/loaddefs.el
 
 bootstrap-clean-CMD:
 #       if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads
diff --git a/lisp/man.el b/lisp/man.el
index 6c8a5a18b44..c54a00d3663 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -415,10 +415,18 @@ Otherwise, the value is whatever the function
   (define-key Man-mode-map "?"    'describe-mode))
 
 ;; buttons
-(define-button-type 'Man-xref-man-page
-  'action (lambda (button) (man-follow (button-label button)))
+(define-button-type 'Man-abstract-xref-man-page
   'follow-link t
-  'help-echo "mouse-2, RET: display this man page")
+  'help-echo "mouse-2, RET: display this man page"
+  'func nil
+  'action (lambda (button) (funcall 
+                            (button-get button 'func)
+                            (button-label button))))
+
+(define-button-type 'Man-xref-man-page 
+  :supertype 'Man-abstract-xref-man-page
+  'func 'man-follow)
+
 
 (define-button-type 'Man-xref-header-file
     'action (lambda (button)
@@ -903,14 +911,17 @@ Same for the ANSI bold and normal escape sequences."
                          'face Man-overstrike-face)))
   (message "%s man page formatted" Man-arguments))
 
-(defun Man-highlight-references ()
+(defun Man-highlight-references (&optional xref-man-type)
   "Highlight the references on mouse-over.
 References include items in the SEE ALSO section,
-header file (#include <foo.h>) and files in FILES."
+header file (#include <foo.h>) and files in FILES.
+If XREF-MAN-TYPE is used as the button type for items
+in SEE ALSO section. If it is nil, default type, 
+`Man-xref-man-page' is used."
   (let ((dummy 0))
     (Man-highlight-references0
      Man-see-also-regexp Man-reference-regexp 1 dummy
-     'Man-xref-man-page)
+     (or xref-man-type 'Man-xref-man-page))
     (Man-highlight-references0
      Man-synopsis-regexp Man-header-regexp 0 2
      'Man-xref-header-file)
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 401513c3583..7a28a00edc8 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1733,7 +1733,7 @@ Buffers menu is regenerated."
           :help "Terminate input and exit minibuffer")))
 
 ;;;###autoload
-;; This comment is taken from toolbar/tool-bar.el near
+;; This comment is taken from tool-bar.el near
 ;; (put 'tool-bar-mode ...)
 ;; We want to pretend the menu bar by standard is on, as this will make
 ;; customize consider disabling the menu bar a customization, and save
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index ac4e9242729..1f37898af76 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,81 @@
+2005-10-17  Peter S Galbraith  <psg@debian.org>
+
+        * mh-identity.el (mh-identity-field-handler): Use
+        `assoc-ignore-case' to compare against header field for mixed-case
+        "From:".
+
+2005-10-17  Bill Wohler  <wohler@newt.com>
+
+        * mh-customize.el (mh-folder-tool-bar-map): Renamed image file
+        left_arrow to left-arrow, right_arrow to right-arrow, mail_compose
+        to mail/compose, fld_open to fld-open.
+        (mh-letter-tool-bar-map): Renamed image file mail_send to
+        mail/send.
+
+2005-10-16  Bill Wohler  <wohler@newt.com>
+
+        * mh-comp.el (mh-display-completion-list-compat): New macro which
+        calls `display-completion-list' correctly in older environments.
+        Versions of Emacs prior to version 22 lacked a COMMON-SUBSTRING
+        argument.
+        (mh-complete-word): Use it.
+
+        * mh-init.el (mh-image-load-path): Use locate-library to find
+        MH-E. This simplified the code a lot. Flattened out nested
+        statements even more.
+
+2005-10-16  Satyaki Das  <satyaki@theforce.stanford.edu>
+
+        * mh-init.el (mh-image-load-path): Remove use of pushnew since it
+        causes a compiler warning.
+
+        * mh-utils.el (mh-display-msg): Do MIME cleanup before inserting
+        the message to be viewed (closes SF #1306141).
+
+2005-10-16  Masatake YAMATO  <jet@gyve.org>
+
+        * mh-comp.el (mh-complete-word): Pass the common
+        prefix substring of completion to `display-completion-list'.
+
+2005-10-15  Satyaki Das  <satyaki@theforce.stanford.edu>
+
+        * mh-init.el (mh-image-load-path-called-flag): New variable which
+        is used by mh-image-load-path so that it runs only once.
+        (mh-image-load-path): Modified so that it gets run only once. Also
+        flatten out heavily nested if statements to make it clearer.
+
+        * mh-e.el (mh-folder-mode): Call mh-image-load-path to allow Emacs
+        to find images used in the toolbar.
+
+        * mh-customize.el (:folder): Remove call to mh-image-load-path.
+
+2005-10-14  Bill Wohler  <wohler@newt.com>
+
+        * mh-e.el (Version, mh-version): Added +cvs to version.
+
+2005-10-14  Bill Wohler  <wohler@newt.com>
+
+        Released MH-E version 7.85.
+          
+        * mh-e.el (Version, mh-version): Updated for release 7.85.
+        
+2005-10-14  Bill Wohler  <wohler@newt.com>
+
+        * mh-e.el, mh-funcs.el, mh-init.el, mh-mime.el, mh-pick.el:
+        * mh-seq.el, mh-utils.el: Ran mh-unit. Continued copyright lines
+        need to be indented. 
+        
+        * mh-e.el: mh-folder-tick-face had been renamed to mh-folder-tick
+        but the code that invoked the face had not been updated. Tick
+        highlighting working again.
+
+        * mh-seq.el (mh-non-seq-mode-line-annotation): Moved
+        make-variable-buffer-local call to top level to avoid warnings in
+        CVS Emacs.
+
+        * mh-comp.el (mh-insert-letter): Replaced deprecated read-input
+        with read-string.
+
 2005-10-09  Bill Wohler  <wohler@newt.com>
 
         * mh-init.el (mh-image-load-path): New function that adds the path
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index a7af192ec40..753f4ad50aa 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -1430,10 +1430,10 @@ not indent and do not delete headers.  Leaves the mark before the letter
 and point after it."
   (interactive
    (list (mh-prompt-for-folder "Message from" mh-sent-from-folder nil)
-         (read-input (concat "Message number"
-                             (if (numberp mh-sent-from-msg)
-                                 (format " (default %d): " mh-sent-from-msg)
-                               ": ")))
+         (read-string (concat "Message number"
+                              (if (numberp mh-sent-from-msg)
+                                  (format " (default %d): " mh-sent-from-msg)
+                                ": ")))
          current-prefix-arg))
   (save-restriction
     (narrow-to-region (point) (point))
@@ -1633,6 +1633,16 @@ This is useful in breaking up paragraphs in replies."
 
 (mh-do-in-xemacs (defvar mail-abbrevs))
 
+(defmacro mh-display-completion-list-compat (word choices)
+  "Completes WORD from CHOICES using `display-completion-list'.
+Calls `display-completion-list' correctly in older environments.
+Versions of Emacs prior to version 22 lacked a COMMON-SUBSTRING argument
+which is used to highlight the next possible character you can enter
+in the current list of completions."
+  (if (>= emacs-major-version 22)
+      `(display-completion-list (all-completions ,word ,choices) ,word)
+    `(display-completion-list (all-completions ,word ,choices))))
+
 ;;;###mh-autoload
 (defun mh-complete-word (word choices begin end)
   "Complete WORD at from CHOICES.
@@ -1650,7 +1660,7 @@ Any match found replaces the text from BEGIN to END."
           ((stringp completion)
            (if (equal word completion)
                (with-output-to-temp-buffer completions-buffer
-                 (display-completion-list (all-completions word choices)))
+                 (mh-display-completion-list-compat word choices))
              (ignore-errors
                (kill-buffer completions-buffer))
              (delete-region begin end)
diff --git a/lisp/mh-e/mh-customize.el b/lisp/mh-e/mh-customize.el
index 4dcf0ad1be8..d26819d6f63 100644
--- a/lisp/mh-e/mh-customize.el
+++ b/lisp/mh-e/mh-customize.el
@@ -1897,7 +1897,6 @@ where,
                             for y in letter-docs
                             collect `(const :tag ,y ,x)))))))
 
-(mh-image-load-path)
 (mh-tool-bar-define
     ((:folder mh-inc-folder mh-mime-save-parts mh-previous-undeleted-msg
               mh-page-msg  mh-next-undeleted-msg mh-delete-msg mh-refile-msg
@@ -1917,12 +1916,12 @@ new mail into your Inbox folder.")
     "Save MIME parts from this message
 This button runs `mh-mime-save-parts' which saves a message's
 different parts into separate files.")
-  (mh-previous-undeleted-msg (folder) "left_arrow"
+  (mh-previous-undeleted-msg (folder) "left-arrow"
     "Go to the previous undeleted message
 This button runs `mh-previous-undeleted-msg'")
   (mh-page-msg (folder) "page-down"
     "Page the current message forwards\nThis button runs `mh-page-msg'")
-  (mh-next-undeleted-msg (folder) "right_arrow"
+  (mh-next-undeleted-msg (folder) "right-arrow"
     "Go to the next undeleted message\nThe button runs `mh-next-undeleted-msg'")
   (mh-delete-msg (folder) "close"
     "Mark this message for deletion\nThis button runs `mh-delete-msg'")
@@ -1945,7 +1944,7 @@ This button runs `mh-previous-undeleted-msg'")
   (mh-alias-grab-from-field (folder) "mail/alias"
     "Grab From alias\nThis button runs `mh-alias-grab-from-field'"
     (and (mh-extract-from-header-value) (not (mh-alias-for-from-p))))
-  (mh-send (folder) "mail_compose"
+  (mh-send (folder) "mail/compose"
     "Compose new message\nThis button runs `mh-send'")
   (mh-rescan-folder (folder) "refresh"
     "Rescan this folder\nThis button runs `mh-rescan-folder'")
@@ -1953,10 +1952,10 @@ This button runs `mh-previous-undeleted-msg'")
     "Repack this folder\nThis button runs `mh-pack-folder'")
   (mh-tool-bar-search (folder) "search"
     "Search\nThis button runs `mh-tool-bar-search-function'")
-  (mh-visit-folder (folder) "fld_open"
+  (mh-visit-folder (folder) "fld-open"
     "Visit other folder\nThis button runs `mh-visit-folder'")
   ;; Letter buffer buttons
-  (mh-send-letter (letter) "mail_send" "Send this letter")
+  (mh-send-letter (letter) "mail/send" "Send this letter")
   (mh-compose-insertion (letter) "attach" "Insert attachment")
   (ispell-message (letter) "spell" "Check spelling")
   (save-buffer (letter) "save" "Save current buffer to its file"
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index ad1093101e1..c0b57ee56ca 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -6,7 +6,7 @@
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
-;; Version: 7.84+cvs
+;; Version: 7.85+cvs
 ;; Keywords: mail
 
 ;; This file is part of GNU Emacs.
@@ -98,7 +98,7 @@
 (defvar font-lock-auto-fontify)
 (defvar font-lock-defaults)
 
-(defconst mh-version "7.84+cvs" "Version number of MH-E.")
+(defconst mh-version "7.85+cvs" "Version number of MH-E.")
 
 (defvar mh-partial-folder-mode-line-annotation "select"
   "Annotation when displaying part of a folder.
@@ -408,7 +408,7 @@ is done highlighting.")
                      (list (list ',func (list 1 '',face 'prepend t))))))))
 
 (mh-generate-sequence-font-lock mh-unseen-seq unseen bold)
-(mh-generate-sequence-font-lock mh-tick-seq tick mh-folder-tick-face)
+(mh-generate-sequence-font-lock mh-tick-seq tick mh-folder-tick)
 
 
 
@@ -778,7 +778,7 @@ bottom of the current message."
         (if (mh-in-show-buffer (mh-show-buffer)
               (pos-visible-in-window-p (point-max)))
             (progn
-              (message 
+              (message
                "End of message (Type %s to read %s undeleted message)"
                (single-key-description last-input-event)
                (if (equal mh-next-direction 'backward)
@@ -1561,6 +1561,7 @@ messages in that region.
 
 \\{mh-folder-mode-map}"
 
+  (mh-image-load-path)
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults '(mh-folder-font-lock-keywords t))
   (make-local-variable 'desktop-save-buffer)
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index 717d0b27aef..6ce1da8fe90 100644
--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@@ -1,7 +1,7 @@
 ;;; mh-funcs.el --- MH-E functions not everyone will use right away
 
 ;; Copyright (C) 1993, 1995,
-;; 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+;;  2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el
index 1d848344897..c3f34ae75b2 100644
--- a/lisp/mh-e/mh-identity.el
+++ b/lisp/mh-e/mh-identity.el
@@ -124,7 +124,7 @@ The field name is downcased. If the FIELD begins with the character
 `:', then it must have a special handler defined in
 `mh-identity-handlers', else return an error since it is not a valid
 header field."
-  (or (cdr (assoc (downcase field) mh-identity-handlers))
+  (or (cdr (assoc-ignore-case field mh-identity-handlers))
       (and (eq (aref field 0) ?:)
            (error "Field %s - unknown mh-identity-handler" field))
       (cdr (assoc ":default" mh-identity-handlers))
diff --git a/lisp/mh-e/mh-init.el b/lisp/mh-e/mh-init.el
index 06ca97f9cd6..dcc9af84e41 100644
--- a/lisp/mh-e/mh-init.el
+++ b/lisp/mh-e/mh-init.el
@@ -300,50 +300,30 @@ by the variable `mh-variants'."
                     (add-to-list 'mh-variants variant)))))
       mh-variants)))
 
-;;; XXX The two calls to message in this function should really be calls to
-;;; error. However, when this function is compiled via the top-level call in
-;;; mh-customize.el, it is actually called, and in a compile environment, the
-;;; errors are triggered which botches the compile. As a workaround, the calls
-;;; to error have been changed to calls to message, and code following was
-;;; inserted as an else clause. This is not robust, so if you can fix this,
-;;; please do!
+(defvar mh-image-load-path-called-flag nil)
+
 ;;;###mh-autoload
 (defun mh-image-load-path ()
   "Ensure that the MH-E images are accessible by `find-image'.
 Images for MH-E are found in ../../etc/images relative to the files in
-lisp/mh-e. If `image-load-path' exists (since Emacs 22), then the images
+`lisp/mh-e'. If `image-load-path' exists (since Emacs 22), then the images
 directory is added to it if isn't already there. Otherwise, the images
 directory is added to the `load-path' if it isn't already there."
-  (let (mh-load-path mh-image-load-path)
-    ;; First, find mh-e in the load-path.
-    (let ((path load-path))
-      (while path
-        (let* ((directory (directory-file-name (car path))))
-          (setq mh-load-path
-                (if (and (equal (file-name-nondirectory directory) "mh-e")
-                         (file-exists-p directory))
-                    directory
-                  nil))
-          (setq path (if mh-load-path nil (cdr path)))))
-      (if (not mh-load-path)
-          ;; This message be error; there shouldn't be an else. Blame compiler.
-          (message "Can not find mh-e in load-path (OK when compiling)")
-        ;; Create the image path associated with this mh-e directory.
-        (setq mh-image-load-path (expand-file-name
-                                  (concat (file-name-directory mh-load-path)
-                                          "../etc/images")))))
-    (if (or (not mh-image-load-path)
-            (not (file-exists-p mh-image-load-path)))
-        ;; This message be error; there shouldn't be an else. Blame compiler.
-        (message "Can not find image directory %s (OK when compiling)"
-                 mh-image-load-path)
-      ;; If image-load-path exists, and the image path isn't there add it.
+  (unless mh-image-load-path-called-flag
+    (let (mh-library-name mh-image-load-path)
+      ;; First, find mh-e in the load-path.
+      (setq mh-library-name (locate-library "mh-e"))
+      (if (not mh-library-name)
+        (error "Can not find MH-E in load-path"))
+      (setq mh-image-load-path
+            (expand-file-name (concat (file-name-directory mh-library-name)
+                                      "../../etc/images")))
+      (if (not (file-exists-p mh-image-load-path))
+          (error "Can not find image directory %s" mh-image-load-path))
       (if (boundp 'image-load-path)
-          (if (not (member mh-image-load-path image-load-path))
-              (push mh-image-load-path image-load-path))
-        ;; Otherwise, if the image path isn't in the load-path, add it there.
-        (if (not (member mh-image-load-path load-path))
-            (push mh-image-load-path load-path))))))
+          (add-to-list 'image-load-path mh-image-load-path)
+        (add-to-list 'load-path mh-image-load-path)))
+    (setq mh-image-load-path-called-flag t)))
 
 (provide 'mh-init)
 
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index 4f72fe06487..fb7bace7ead 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -1,7 +1,7 @@
 ;;; mh-mime.el --- MH-E support for composing MIME messages
 
 ;; Copyright (C) 1993, 1995,
-;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-pick.el b/lisp/mh-e/mh-pick.el
index c0b9360cfae..eb825fe462f 100644
--- a/lisp/mh-e/mh-pick.el
+++ b/lisp/mh-e/mh-pick.el
@@ -1,7 +1,7 @@
 ;;; mh-pick.el --- make a search pattern and search for a message in MH-E
 
 ;; Copyright (C) 1993, 1995,
-;; 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2001, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el
index 51847c2d59d..efbfe0d221f 100644
--- a/lisp/mh-e/mh-seq.el
+++ b/lisp/mh-e/mh-seq.el
@@ -1,7 +1,7 @@
 ;;; mh-seq.el --- MH-E sequences support
 
 ;; Copyright (C) 1993, 1995,
-;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -224,6 +224,8 @@ appears."
 ;; Avoid compiler warning
 (defvar tool-bar-map)
 
+(make-variable-buffer-local 'mh-non-seq-mode-line-annotation)
+
 ;;;###mh-autoload
 (defun mh-narrow-to-seq (sequence)
   "Restrict display of this folder to just messages in SEQUENCE.
@@ -243,7 +245,6 @@ Use \\<mh-folder-mode-map>\\[mh-widen] to undo this command."
              (mh-notate-deleted-and-refiled)
              (mh-notate-cur)
              (when msg-at-cursor (mh-goto-msg msg-at-cursor t t))
-             (make-variable-buffer-local 'mh-non-seq-mode-line-annotation)
              (setq mh-non-seq-mode-line-annotation mh-mode-line-annotation)
              (setq mh-mode-line-annotation (symbol-name sequence))
              (mh-make-folder-mode-line)
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 0e608e52062..2dbd313b1d2 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -1,7 +1,7 @@
 ;;; mh-utils.el --- MH-E code needed for both sending and reading
 
 ;; Copyright (C) 1993, 1995, 1997,
-;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -1718,6 +1718,8 @@ Sets the current buffer to the show buffer."
       (cond ((not (equal msg-filename buffer-file-name))
              (mh-unvisit-file)
              (setq buffer-read-only nil)
+             ;; Cleanup old mime handles
+             (mh-mime-cleanup)
              (erase-buffer)
              ;; Changing contents, so this hook needs to be reinitialized.
              ;; pgp.el uses this.
@@ -1729,8 +1731,6 @@ Sets the current buffer to the show buffer."
                                              (list "-form" formfile))
                                          msg-filename)
                (insert-file-contents-literally msg-filename))
-             ;; Cleanup old mime handles
-             (mh-mime-cleanup)
              ;; Use mm to display buffer
              (when (and mh-decode-mime-flag (not formfile))
                (mh-add-missing-mime-version-header)
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 90f2b3ba879..d71d80bd41f 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -54,7 +54,7 @@
 
 With the default setting, an ordinary Mouse-1 click on a link
 performs the same action as Mouse-2 on that link, while a longer
-Mouse-1 click \(hold down the Mouse-1 button for more than 350
+Mouse-1 click \(hold down the Mouse-1 button for more than 450
 milliseconds) performs the original Mouse-1 binding \(which
 typically sets point where you click the mouse).
 
@@ -78,7 +78,7 @@ packages.  See `mouse-on-link-p' for details."
   :version "22.1"
   :type '(choice (const :tag "Disabled" nil)
                  (const :tag "Double click" double)
-                 (number :tag "Single click time limit" :value 350)
+                 (number :tag "Single click time limit" :value 450)
                  (other :tag "Single click" t))
   :group 'mouse)
 
@@ -663,7 +663,7 @@ This should be bound to a mouse drag event."
     ;; If mark is highlighted, no need to bounce the cursor.
     ;; On X, we highlight while dragging, thus once again no need to bounce.
     (or transient-mark-mode
-        (memq (framep (selected-frame)) '(x pc w32))
+        (memq (framep (selected-frame)) '(x pc w32 mac))
         (sit-for 1))
     (push-mark)
     (set-mark (point))
@@ -958,12 +958,14 @@ at the same position."
         (mouse-move-drag-overlay mouse-drag-overlay start-point end-point click-count))
 
       (if (consp event)
-          (let ((fun (key-binding (vector (car event)))))
+          (let* ((fun (key-binding (vector (car event))))
+                 (do-multi-click   (and (> (event-click-count event) 0)
+                                        (functionp fun)
+                                        (not (eq fun 'mouse-set-point)))))
             ;; Run the binding of the terminating up-event, if possible.
-            ;; In the case of a multiple click, it gives the wrong results,
-            ;; because it would fail to set up a region.
-            (if (not (= (overlay-start mouse-drag-overlay)
-                        (overlay-end mouse-drag-overlay)))
+            (if (and (not (= (overlay-start mouse-drag-overlay)
+                             (overlay-end mouse-drag-overlay)))
+                     (not do-multi-click))
                 (let* ((stop-point
                         (if (numberp (posn-point (event-end event)))
                             (posn-point (event-end event))
@@ -996,8 +998,12 @@ at the same position."
                     (and (mark t) mark-active
                          (eq buffer (current-buffer))
                          (mouse-set-region-1))))
-              (delete-overlay mouse-drag-overlay)
               ;; Run the binding of the terminating up-event.
+              ;; If a multiple click is not bound to mouse-set-point,
+              ;; cancel the effects of mouse-move-drag-overlay to
+              ;; avoid producing wrong results.
+              (if do-multi-click (goto-char start-point))
+              (delete-overlay mouse-drag-overlay)
               (when (and (functionp fun)
                          (= start-hscroll (window-hscroll start-window))
                          ;; Don't run the up-event handler if the
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 6df8a5dab42..cc662770dcf 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4384,6 +4384,7 @@ necessary anymore."
 (defun tramp-completion-mode (file)
   "Checks whether method / user name / host name completion is active."
   (cond
+   (tramp-completion-mode t)
    ((not tramp-unified-filenames) t)
    ((string-match "^/.*:.*:$" file) nil)
    ((string-match
@@ -4434,70 +4435,83 @@ necessary anymore."
   (substring
    file (length (tramp-completion-handle-file-name-directory file))))
 
+(defvar tramp-completion-mode nil
+  "If non-nil, we are in file name completion mode.")
+
 ;; Method, host name and user name completion.
 ;; `tramp-completion-dissect-file-name' returns a list of
 ;; tramp-file-name structures. For all of them we return possible completions.
 (defun tramp-completion-handle-file-name-all-completions (filename directory)
   "Like `file-name-all-completions' for partial tramp files."
 
-  (let*
-      ((fullname (concat directory filename))
-       ;; local files
-       (result
-        (if (tramp-completion-mode fullname)
-            (tramp-run-real-handler
-             'file-name-all-completions (list filename directory))
-          (tramp-completion-run-real-handler
-           'file-name-all-completions (list filename directory))))
-       ;; possible completion structures
-       (v (tramp-completion-dissect-file-name fullname)))
-
-    (while v
-      (let* ((car (car v))
-             (multi-method (tramp-file-name-multi-method car))
-             (method (tramp-file-name-method car))
-             (user (tramp-file-name-user car))
-             (host (tramp-file-name-host car))
-             (localname (tramp-file-name-localname car))
-             (m (tramp-find-method multi-method method user host))
-             (tramp-current-user user) ; see `tramp-parse-passwd'
-             all-user-hosts)
-
-        (unless (or multi-method ;; Not handled (yet).
-                    localname)        ;; Nothing to complete
-
-          (if (or user host)
-
-            ;; Method dependent user / host combinations
-            (progn
-              (mapcar
-               (lambda (x)
-                 (setq all-user-hosts
-                       (append all-user-hosts
-                               (funcall (nth 0 x) (nth 1 x)))))
-               (tramp-get-completion-function m))
-
-              (setq result (append result
-                (mapcar
-                 (lambda (x)
-                   (tramp-get-completion-user-host
-                    method user host (nth 0 x) (nth 1 x)))
-                 (delq nil all-user-hosts)))))
-
-            ;; Possible methods
-            (setq result
-                  (append result (tramp-get-completion-methods m)))))
-
-      (setq v (delq car v))))
-
-    ;;; unify list, remove nil elements
-    (let (result1)
-      (while result
-        (let ((car (car result)))
-          (when car (add-to-list 'result1 car))
-          (setq result (delq car result))))
-
-      result1)))
+  (unwind-protect
+      ;; We need to reset `tramp-completion-mode'.
+      (progn
+        (setq tramp-completion-mode t)
+        (let*
+            ((fullname (concat directory filename))
+             ;; possible completion structures
+             (v (tramp-completion-dissect-file-name fullname))
+             result result1)
+
+          (while v
+            (let* ((car (car v))
+                   (multi-method (tramp-file-name-multi-method car))
+                   (method (tramp-file-name-method car))
+                   (user (tramp-file-name-user car))
+                   (host (tramp-file-name-host car))
+                   (localname (tramp-file-name-localname car))
+                   (m (tramp-find-method multi-method method user host))
+                   (tramp-current-user user) ; see `tramp-parse-passwd'
+                   all-user-hosts)
+
+              (unless (or multi-method ;; Not handled (yet).
+                          localname)   ;; Nothing to complete
+
+                (if (or user host)
+
+                    ;; Method dependent user / host combinations
+                    (progn
+                      (mapcar
+                       (lambda (x)
+                         (setq all-user-hosts
+                               (append all-user-hosts
+                                       (funcall (nth 0 x) (nth 1 x)))))
+                       (tramp-get-completion-function m))
+
+                      (setq result (append result
+                        (mapcar
+                         (lambda (x)
+                           (tramp-get-completion-user-host
+                            method user host (nth 0 x) (nth 1 x)))
+                         (delq nil all-user-hosts)))))
+
+                  ;; Possible methods
+                  (setq result
+                        (append result (tramp-get-completion-methods m)))))
+
+              (setq v (cdr v))))
+
+          ;; unify list, remove nil elements
+          (while result
+            (let ((car (car result)))
+              (when car (add-to-list 'result1 car))
+              (setq result (cdr result))))
+
+          ;; Complete local parts
+          (append
+           result1
+           (condition-case nil
+               (if result1
+                   ;; "/ssh:" does not need to be expanded as hostname.
+                   (tramp-run-real-handler
+                    'file-name-all-completions (list filename directory))
+                 ;; No method/user/host found to be expanded.
+                 (tramp-completion-run-real-handler
+                  'file-name-all-completions (list filename directory)))
+             (error nil)))))
+    ;; unwindform
+    (setq tramp-completion-mode nil)))
 
 ;; Method, host name and user name completion for a file.
 (defun tramp-completion-handle-file-name-completion (filename directory)
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index f86e4c95625..1e9f1bce7ce 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -1482,11 +1482,16 @@ The POSTPROC specified there (typically `log-edit') is then called,
          (point))))))
 
 (defvar cvs-edit-log-revision)
-(defun cvs-mode-edit-log (rev &optional text)
+(defvar cvs-edit-log-files) (put 'cvs-edit-log-files 'permanent-local t)
+(defun cvs-mode-edit-log (file rev &optional text)
   "Edit the log message at point.
 This is best called from a `log-view-mode' buffer."
   (interactive
    (list
+    (or (cvs-mode! (lambda ()
+                     (car (cvs-mode-files nil nil
+                                          :read-only t :file t :noquery t))))
+        (read-string "File name: "))
     (or (cvs-mode! (lambda () (cvs-prefix-get 'cvs-branch-prefix)))
         (read-string "Revision to edit: "))
     (cvs-edit-log-text-at-point)))
@@ -1498,26 +1503,38 @@ This is best called from a `log-view-mode' buffer."
   (let ((buf (cvs-temp-buffer "message" 'normal 'nosetup))
         (setupfun (or (nth 2 (cdr (assoc "message" cvs-buffer-name-alist)))
                       'log-edit)))
+    (with-current-buffer buf
+      ;; Set the filename before, so log-edit can correctly setup its
+      ;; log-edit-initial-files variable.
+      (set (make-local-variable 'cvs-edit-log-files) (list file)))
     (funcall setupfun 'cvs-do-edit-log nil 'cvs-edit-log-filelist buf)
     (when text (erase-buffer) (insert text))
     (set (make-local-variable 'cvs-edit-log-revision) rev)
-    (set (make-local-variable 'cvs-minor-wrap-function) 'cvs-edit-log-minor-wrap)
+    (set (make-local-variable 'cvs-minor-wrap-function)
+         'cvs-edit-log-minor-wrap)
     ;; (run-hooks 'cvs-mode-commit-hook)
     ))
 
 (defun cvs-edit-log-minor-wrap (buf f)
-  (let ((cvs-ignore-marks-modif (cvs-mode-mark-get-modif "commit")))
+  (let ((cvs-branch-prefix (with-current-buffer buf cvs-edit-log-revision))
+        (cvs-minor-current-files
+         (with-current-buffer buf cvs-edit-log-files))
+        ;; FIXME:  I need to force because the fileinfos are UNKNOWN
+        (cvs-force-command "/F"))
     (funcall f)))
 
 (defun cvs-edit-log-filelist ()
-  (cvs-mode-files nil nil :read-only t :file t :noquery t))
+  (if cvs-minor-wrap-function
+      (cvs-mode-files nil nil :read-only t :file t :noquery t)
+    cvs-edit-log-files))
 
 (defun cvs-do-edit-log (rev)
   "Do the actual commit, using the current buffer as the log message."
   (interactive (list cvs-edit-log-revision))
   (let ((msg (buffer-substring-no-properties (point-min) (point-max))))
-    (cvs-mode!)
-    (cvs-mode-do "admin" (list (concat "-m" rev ":" msg)) nil)))
+    (cvs-mode!
+     (lambda ()
+       (cvs-mode-do "admin" (list (concat "-m" rev ":" msg)) nil)))))
 
 
 ;;;;
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 269fbeaf137..d041fa366c8 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1678,37 +1678,20 @@ displays at the top of the window; there is no arrow."
   "Jump to an error corresponding to MSG at MK.
 All arguments are markers.  If END-MK is non-nil, mark is set there
 and overlay is highlighted between MK and END-MK."
-  (if (eq (window-buffer (selected-window))
-          (marker-buffer msg))
-      ;; If the compilation buffer window is selected,
-      ;; keep the compilation buffer in this window;
-      ;; display the source in another window.
-      (let ((pop-up-windows t))
-        (pop-to-buffer (marker-buffer mk)))
-    (if (window-dedicated-p (selected-window))
-        (pop-to-buffer (marker-buffer mk))
-      (switch-to-buffer (marker-buffer mk))))
-  ;; If narrowing gets in the way of going to the right place, widen.
-  (unless (eq (goto-char mk) (point))
-    (widen)
-    (goto-char mk))
-  (if end-mk
-      (push-mark end-mk t)
-    (if mark-active (setq mark-active)))
-  ;; If hideshow got in the way of
-  ;; seeing the right place, open permanently.
-  (dolist (ov (overlays-at (point)))
-    (when (eq 'hs (overlay-get ov 'invisible))
-      (delete-overlay ov)
-      (goto-char mk)))
-
   ;; Show compilation buffer in other window, scrolled to this error.
-  (let* ((pop-up-windows t)
-         ;; Use an existing window if it is in a visible frame.
+  (let* ((from-compilation-buffer (eq (window-buffer (selected-window))
+                                      (marker-buffer msg)))
+         ;; Use an existing window if it is in a visible frame.
          (pre-existing (get-buffer-window (marker-buffer msg) 0))
-         (w (let ((display-buffer-reuse-frames t))
-              ;; Pop up a window.
-              (display-buffer (marker-buffer msg))))
+         (w (if (and from-compilation-buffer pre-existing)
+                ;; Calling display-buffer here may end up (partly) hiding
+                ;; the error location if the two buffers are in two
+                ;; different frames.  So don't do it if it's not necessary.
+                pre-existing
+              (let ((display-buffer-reuse-frames t)
+                    (pop-up-windows t))
+                ;; Pop up a window.
+                (display-buffer (marker-buffer msg)))))
          (highlight-regexp (with-current-buffer (marker-buffer msg)
                              ;; also do this while we change buffer
                              (compilation-set-window w msg)
@@ -1718,6 +1701,29 @@ and overlay is highlighted between MK and END-MK."
     ;; creating a new window.
     (unless pre-existing (compilation-set-window-height w))
 
+    (if from-compilation-buffer
+        ;; If the compilation buffer window was selected,
+        ;; keep the compilation buffer in this window;
+        ;; display the source in another window.
+        (let ((pop-up-windows t))
+          (pop-to-buffer (marker-buffer mk) 'other-window))
+      (if (window-dedicated-p (selected-window))
+          (pop-to-buffer (marker-buffer mk))
+        (switch-to-buffer (marker-buffer mk))))
+    ;; If narrowing gets in the way of going to the right place, widen.
+    (unless (eq (goto-char mk) (point))
+      (widen)
+      (goto-char mk))
+    (if end-mk
+        (push-mark end-mk t)
+      (if mark-active (setq mark-active)))
+    ;; If hideshow got in the way of
+    ;; seeing the right place, open permanently.
+    (dolist (ov (overlays-at (point)))
+      (when (eq 'hs (overlay-get ov 'invisible))
+        (delete-overlay ov)
+        (goto-char mk)))
+
     (when highlight-regexp
       (if (timerp next-error-highlight-timer)
           (cancel-timer next-error-highlight-timer))
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index f6e8697543f..ac2cc23048a 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -2015,7 +2015,8 @@ for \\[find-tag] (which see)."
            (message "Making completion list...")
            (with-output-to-temp-buffer "*Completions*"
              (display-completion-list
-              (all-completions pattern 'tags-complete-tag nil)))
+              (all-completions pattern 'tags-complete-tag nil)
+              pattern))
            (message "Making completion list...%s" "done")))))
 
 (dolist (x '("^No tags table in use; use .* to select one$"
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 852cd8deb88..bf09669083d 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -437,6 +437,9 @@ Also display the main routine in the disassembly buffer if present."
                          nil nil)))
           (push var gdb-var-list)
           (speedbar 1)
+          (unless (string-equal
+                   speedbar-initial-expansion-list-name "GUD")
+            (speedbar-change-initial-expansion-list "GUD"))
           (if (equal (nth 2 var) "0")
               (gdb-enqueue-input
                (list
@@ -600,7 +603,9 @@ INDENT is the current indentation depth."
          (dolist (var gdb-var-list)
            (if (string-match (concat token "\\.") (nth 1 var))
                (setq gdb-var-list (delq var gdb-var-list))))
-         (setq gdb-var-changed t))))
+         (setq gdb-var-changed t)
+         (with-current-buffer gud-comint-buffer
+           (speedbar-timer-fn)))))
 
 (defun gdb-get-target-string ()
   (with-current-buffer gud-comint-buffer
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index d38697a2152..8f962381d24 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -5,7 +5,7 @@
 ;; Keywords: unix, tools
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;;  2004, 2005 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -139,13 +139,13 @@ Used to grey out relevant togolbar icons.")
     ([remove]   menu-item "Remove Breakpoint" gud-remove
                   :enable (not gud-running)
                   :visible (not (and (memq gud-minor-mode '(gdbmi gdba))
-                                     (window-fringes))))
+                                     (> (car (window-fringes)) 0))))
     ([tbreak]   menu-item "Temporary Breakpoint" gud-tbreak
                   :enable (memq gud-minor-mode '(gdbmi gdba gdb sdb xdb bashdb)))
     ([break]    menu-item "Set Breakpoint" gud-break
                   :enable (not gud-running)
                   :visible (not (and (memq gud-minor-mode '(gdbmi gdba))
-                                     (window-fringes))))
+                                     (> (car (window-fringes)) 0))))
     ([up]       menu-item "Up Stack" gud-up
                   :enable (and (not gud-running)
                                (memq gud-minor-mode
@@ -197,24 +197,24 @@ Used to grey out relevant togolbar icons.")
 (defvar gud-tool-bar-map
   (if (display-graphic-p)
       (let ((map (make-sparse-keymap)))
-        (dolist (x '((gud-break . "gud-break")
-                     (gud-remove . "gud-remove")
-                     (gud-print . "gud-print")
-                     (gud-pstar . "gud-pstar")
-                     (gud-watch . "gud-watch")
-                     (gud-cont . "gud-cont")
-                     (gud-until . "gud-until")
-                     (gud-finish . "gud-finish")
-                     (gud-run . "gud-run")
+        (dolist (x '((gud-break . "gud/break")
+                     (gud-remove . "gud/remove")
+                     (gud-print . "gud/print")
+                     (gud-pstar . "gud/pstar")
+                     (gud-watch . "gud/watch")
+                     (gud-cont . "gud/cont")
+                     (gud-until . "gud/until")
+                     (gud-finish . "gud/finish")
+                     (gud-run . "gud/run")
                      ;; gud-s, gud-si etc. instead of gud-step,
                      ;; gud-stepi, to avoid file-name clashes on DOS
                      ;; 8+3 filesystems.
-                     (gud-next . "gud-n")
-                     (gud-step . "gud-s")
-                     (gud-nexti . "gud-ni")
-                     (gud-stepi . "gud-si")
-                     (gud-up . "gud-up")
-                     (gud-down . "gud-down")
+                     (gud-next . "gud/next")
+                     (gud-step . "gud/step")
+                     (gud-nexti . "gud/nexti")
+                     (gud-stepi . "gud/stepi")
+                     (gud-up . "gud/up")
+                     (gud-down . "gud/down")
                      (gud-goto-info . "info"))
                    map)
           (tool-bar-local-item-from-menu
@@ -2575,7 +2575,8 @@ It is saved for when this flag is not set.")
          ;; Stop displaying an arrow in a source file.
          (setq gud-overlay-arrow-position nil)
          (set-process-buffer proc nil)
-         (if (featurep 'speedbar)
+         (if (and (boundp 'speedbar-frame)
+                  (string-equal speedbar-initial-expansion-list-name "GUD"))
              (speedbar-change-initial-expansion-list
               speedbar-previously-used-expansion-list-name))
          (if (memq gud-minor-mode-type '(gdbmi gdba))
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 11ae1c66aa7..3a55129c899 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1176,7 +1176,7 @@ The context determines which are considered."
         (message "Making completion list...")
         (let ((list (all-completions try table)))
           (with-output-to-temp-buffer "*Completions*"
-            (display-completion-list list)))
+            (display-completion-list list try)))
         (message "Making completion list...done"))))))
 
 
diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el
index 9ae3e5a5935..f5bbb4d68db 100644
--- a/lisp/progmodes/meta-mode.el
+++ b/lisp/progmodes/meta-mode.el
@@ -509,7 +509,7 @@ If the list was changed, sort the list and remove duplicates first."
                  (message "Making completion list...")
                  (let ((list (all-completions symbol list nil)))
                    (with-output-to-temp-buffer "*Completions*"
-                     (display-completion-list list)))
+                     (display-completion-list list symbol)))
                  (message "Making completion list... done"))))
       (funcall (nth 1 entry)))))
 
diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el
index e37f3b14a15..b65ad9eac1a 100644
--- a/lisp/progmodes/octave-mod.el
+++ b/lisp/progmodes/octave-mod.el
@@ -1252,7 +1252,7 @@ variables."
              ;; Taken from comint.el
              (message "Making completion list...")
              (with-output-to-temp-buffer "*Completions*"
-               (display-completion-list list))
+               (display-completion-list list string))
              (message "Hit space to flush")
              (let (key first)
                (if (save-excursion
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index 3cd243580e2..801096b9b0f 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -1378,7 +1378,7 @@ indent of the current line in parameterlist."
             ((and (not (null (cdr allcomp))) (= (length pascal-str)
                                                 (length match)))
              (with-output-to-temp-buffer "*Completions*"
-               (display-completion-list allcomp))
+               (display-completion-list allcomp pascal-str))
              ;; Wait for a keypress. Then delete *Completion*  window
              (momentary-string-display "" (point))
              (delete-window (get-buffer-window (get-buffer "*Completions*")))
@@ -1398,7 +1398,7 @@ indent of the current line in parameterlist."
                     (all-completions pascal-str 'pascal-completion))))
     ;; Show possible completions in a temporary buffer.
     (with-output-to-temp-buffer "*Completions*"
-      (display-completion-list allcomp))
+      (display-completion-list allcomp pascal-str))
     ;; Wait for a keypress. Then delete *Completion*  window
     (momentary-string-display "" (point))
     (delete-window (get-buffer-window (get-buffer "*Completions*")))))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index f7788404350..6ed2e39e4e8 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1652,7 +1652,7 @@ Repeating the command scrolls the completion window."
                 (t
                  (message "Making completion list...")
                  (with-output-to-temp-buffer "*Completions*"
-                   (display-completion-list completions))
+                   (display-completion-list completions symbol))
                  (message "Making completion list...%s" "done"))))))))
 
 (eval-when-compile (require 'hippie-exp))
diff --git a/lisp/recentf.el b/lisp/recentf.el
index dee7a8d438d..b14997d604f 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -985,6 +985,54 @@ unchanged."
                             t)))))
     l))
 
+;;; Hooks
+;;
+(defun recentf-track-opened-file ()
+  "Insert the name of the file just opened or written into the recent list."
+  (and buffer-file-name
+       (recentf-add-file buffer-file-name))
+  ;; Must return nil because it is run from `write-file-functions'.
+  nil)
+
+(defun recentf-track-closed-file ()
+  "Update the recent list when a buffer is killed.
+That is, remove a non kept file from the recent list."
+  (and buffer-file-name
+       (recentf-remove-if-non-kept buffer-file-name)))
+
+(defun recentf-update-menu ()
+  "Update the recentf menu from the current recent list."
+  (let ((cache (cons default-directory recentf-list)))
+    ;; Does nothing, if nothing has changed.
+    (unless (equal recentf-data-cache cache)
+      (setq recentf-data-cache cache)
+      (condition-case err
+          (easy-menu-add-item
+           (recentf-menu-bar) recentf-menu-path
+           (easy-menu-create-menu recentf-menu-title
+                                  (recentf-make-menu-items))
+           recentf-menu-before)
+        (error
+         (message "recentf update menu failed: %s"
+                  (error-message-string err)))))))
+
+(defconst recentf-used-hooks
+  '(
+    (find-file-hook       recentf-track-opened-file)
+    (write-file-functions recentf-track-opened-file)
+    (kill-buffer-hook     recentf-track-closed-file)
+    (menu-bar-update-hook recentf-update-menu)
+    (kill-emacs-hook      recentf-save-list)
+    )
+  "Hooks used by recentf.")
+
+(defsubst recentf-enabled-p ()
+  "Return non-nil if recentf mode is currently enabled."
+  (memq 'recentf-update-menu menu-bar-update-hook))
+
+;;; Commands
+;;
+
 ;;; Common dialog stuff
 ;;
 (defun recentf-cancel-dialog (&rest ignore)
@@ -1011,7 +1059,7 @@ Go to the beginning of buffer if not found."
   (let ((km (copy-keymap recentf--shortcuts-keymap)))
     (set-keymap-parent km widget-keymap)
     (define-key km "q" 'recentf-cancel-dialog)
-    (define-key km [down-mouse-1] 'widget-button-click)
+    (define-key km [follow-link] "\C-m")
     km)
   "Keymap used in recentf dialogs.")
 
@@ -1038,54 +1086,6 @@ Go to the beginning of buffer if not found."
     (widget-setup)
     (switch-to-buffer (current-buffer))))
 
-;;; Hooks
-;;
-(defun recentf-track-opened-file ()
-  "Insert the name of the file just opened or written into the recent list."
-  (and buffer-file-name
-       (recentf-add-file buffer-file-name))
-  ;; Must return nil because it is run from `write-file-functions'.
-  nil)
-
-(defun recentf-track-closed-file ()
-  "Update the recent list when a buffer is killed.
-That is, remove a non kept file from the recent list."
-  (and buffer-file-name
-       (recentf-remove-if-non-kept buffer-file-name)))
-
-(defun recentf-update-menu ()
-  "Update the recentf menu from the current recent list."
-  (let ((cache (cons default-directory recentf-list)))
-    ;; Does nothing, if nothing has changed.
-    (unless (equal recentf-data-cache cache)
-      (setq recentf-data-cache cache)
-      (condition-case err
-          (easy-menu-add-item
-           (recentf-menu-bar) recentf-menu-path
-           (easy-menu-create-menu recentf-menu-title
-                                  (recentf-make-menu-items))
-           recentf-menu-before)
-        (error
-         (message "recentf update menu failed: %s"
-                  (error-message-string err)))))))
-
-(defconst recentf-used-hooks
-  '(
-    (find-file-hook       recentf-track-opened-file)
-    (write-file-functions recentf-track-opened-file)
-    (kill-buffer-hook     recentf-track-closed-file)
-    (menu-bar-update-hook recentf-update-menu)
-    (kill-emacs-hook      recentf-save-list)
-    )
-  "Hooks used by recentf.")
-
-(defsubst recentf-enabled-p ()
-  "Return non-nil if recentf mode is currently enabled."
-  (memq 'recentf-update-menu menu-bar-update-hook))
-
-;;; Commands
-;;
-
 ;;; Edit list dialog
 ;;
 (defvar recentf-edit-list nil)
@@ -1140,7 +1140,7 @@ Click on Cancel or type `q' to cancel.\n")
      :notify 'recentf-cancel-dialog
      "Cancel")
     (recentf-dialog-goto-first 'checkbox)))
-
+
 ;;; Open file dialog
 ;;
 (defun recentf-open-files-action (widget &rest ignore)
@@ -1252,7 +1252,7 @@ Optional argument N must be a valid digit number.  It defaults to 1.
     (when recentf--files-with-key
       (kill-buffer (current-buffer)))
     (funcall recentf-menu-action file)))
-
+
 ;;; Save/load/cleanup the recent list
 ;;
 (defconst recentf-save-file-header
@@ -1316,7 +1316,9 @@ That is, remove duplicates, non-kept, and excluded files."
         (message "File %s removed from the recentf list" f)))
     (message "Cleaning up the recentf list...done (%d removed)" n)
     (setq recentf-list (nreverse newlist))))
-
+
+;;; The minor mode
+;;
 (defvar recentf-mode-map (make-sparse-keymap)
   "Keymap to use in recentf mode.")
 
diff --git a/lisp/savehist.el b/lisp/savehist.el
new file mode 100644
index 00000000000..de0f1504ff8
--- /dev/null
+++ b/lisp/savehist.el
@@ -0,0 +1,270 @@
+;;; savehist.el --- Save minibuffer history.
+
+;; Copyright (C) 1997, 2005 Free Software Foundation
+
+;; Author: Hrvoje Niksic <hniksic@xemacs.org>
+;; Keywords: minibuffer
+;; Version: 7
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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, or (at your option)
+;; any later version.
+
+;; GNU Emacs 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 GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; Many editors (e.g. Vim) have the feature of saving minibuffer
+;; history to an external file after exit.  This package provides the
+;; same feature in Emacs.  When Emacs is about the exit,
+;; `savehist-save' will dump the contents of various minibuffer
+;; histories (as determined by `savehist-history-variables') to a save
+;; file (`~/.emacs-history' by default).  Although the package was
+;; designed for saving the minibuffer histories, any variables can be
+;; saved that way.
+
+;; To use savehist, put the following to `~/.emacs':
+;;
+;; (require 'savehist)
+;; (savehist-load)
+
+;; Be sure to have `savehist.el' in a directory that is in your
+;; load-path, and byte-compile it.
+
+;;; Code:
+
+(require 'custom)
+
+;; User variables
+
+(defgroup savehist nil
+  "Save minibuffer history."
+  :group 'minibuffer)
+
+(defcustom savehist-history-variables
+  '(
+    ;; Catch-all minibuffer history
+    minibuffer-history
+    ;; File-oriented commands
+    file-name-history
+    ;; Regexp-related reads
+    regexp-history
+    ;; Searches in minibuffer (via `M-r' and such)
+    minibuffer-history-search-history
+    ;; Query replace
+    query-replace-history
+    ;; eval-expression (`M-:')
+    read-expression-history
+    ;; shell-command (`M-!')
+    shell-command-history
+    ;; compile
+    compile-history
+    ;; find-tag (`M-.')
+    find-tag-history
+    ;; grep
+    grep-history
+    ;; Viper stuff
+    vip-ex-history vip-search-history
+    vip-replace1-history vip-replace2-history
+    vip-shell-history vip-search-history
+
+    ;; XEmacs-specific:
+    ;; Buffer-related commands
+    buffer-history
+    ;; Reads of variables and functions
+    variable-history function-history
+    ;; Extended commands
+    read-command-history
+
+    ;; Info, lookup, and bookmark historys
+    Info-minibuffer-history
+    Info-search-history
+    Manual-page-minibuffer-history
+
+    ;; Emacs-specific:
+    ;; Extended commands
+    extended-command-history)
+  "*List of symbols to be saved.
+Every symbol should refer to a variable.  The variable will be saved
+only if it is bound and has a non-nil value.  Thus it is safe to
+specify a superset of the variables a user is expected to want to
+save.
+
+Default value contains minibuffer history variables used by Emacs, XEmacs,
+and Viper (uh-oh).  Note that, if you customize this variable, you
+can lose the benefit of future versions of Emacs adding new values to
+the list.  Because of that it might be more useful to add values using
+`add-to-list'."
+  :type '(repeat (symbol :tag "Variable"))
+  :group 'savehist)
+
+(defcustom savehist-file "~/.emacs-history"
+  "*File name to save minibuffer history to.
+The minibuffer history is a series of Lisp expressions, which should be
+loaded using `savehist-load' from your .emacs.  See `savehist-load' for
+more details."
+  :type 'file
+  :group 'savehist)
+
+(defcustom savehist-length 100
+  "*Maximum length of a minibuffer list.
+If set to nil, the length is unlimited."
+  :type '(choice integer
+                 (const :tag "Unlimited" nil))
+  :group 'savehist)
+
+(defcustom savehist-modes #o600
+  "*Default permissions of the history file.
+This is decimal, not octal.  The default is 384 (0600 in octal).
+Set to nil to use the default permissions that Emacs uses, typically
+mandated by umask.  The default is a bit more restrictive to protect
+the user's privacy."
+  :type 'integer
+  :group 'savehist)
+
+(defcustom savehist-autosave-interval (* 5 60)
+  "*The interval during which savehist should autosave the history buffer."
+  :type 'integer
+  :group 'savehist)
+
+(defvar savehist-coding-system (if (coding-system-p 'utf-8) 'utf-8 'iso-2022-8)
+  "The coding system savehist uses for saving the minibuffer history.
+Changing this value while Emacs is running is supported, but considered
+unwise, unless you know what you are doing.")
+
+;; Internal variables.
+
+(defvar savehist-timer nil)
+
+(defvar savehist-last-checksum nil)
+
+(defconst savehist-no-conversion (if (featurep 'xemacs) 'binary 'no-conversion)
+  ;; FIXME: Why not use savehist-coding-system?
+  "Coding system without conversion, only used for calculating checksums.")
+
+;; Functions
+
+;;;###autoload
+(defun savehist-load (&optional no-hook)
+  "Load the minibuffer histories from `savehist-file'.
+Unless NO-HOOK is specified, the function will also add the save function
+to `kill-emacs-hook' and on a timer, ensuring that the minibuffer contents
+will be saved before leaving Emacs.
+
+This function should be normally used from your Emacs init file.  Since it
+removes your current minibuffer histories, it is unwise to call it at any
+other time."
+  (interactive "P")
+  (unless no-hook
+    (add-hook 'kill-emacs-hook 'savehist-autosave)
+    ;; Install an invocation of savehist-autosave on a timer.  This
+    ;; should not cause a noticeable delay -- savehist-autosave
+    ;; executes in under 5 ms on my system.
+    (unless savehist-timer
+      (setq savehist-timer
+            (if (featurep 'xemacs)
+                (start-itimer
+                 "savehist" 'savehist-autosave savehist-autosave-interval
+                 savehist-autosave-interval)
+              (run-with-idle-timer savehist-autosave-interval savehist-autosave-interval
+                                   'savehist-autosave)))))
+  ;; Don't set coding-system-for-read here.  We rely on autodetection
+  ;; and the coding cookie to convey that information.  That way, if
+  ;; the user changes the value of savehist-coding-system, we can
+  ;; still correctly load the old file.
+  (load savehist-file t (not (interactive-p))))
+
+;;;###autoload
+(defun savehist-save (&optional auto-save)
+  "Save the histories from `savehist-history-variables' to `savehist-file'.
+Unbound symbols referenced in `savehist-history-variables' are ignored.
+If AUTO-SAVE is non-nil, compare the saved contents to the one last saved,
+ and don't save the buffer if they are the same."
+  (interactive)
+  (with-temp-buffer
+    (insert
+     (format ";; -*- mode: emacs-lisp; coding: %s -*-\n" savehist-coding-system)
+     ";; Minibuffer history file, automatically generated by `savehist'.\n\n")
+    (let ((print-length nil)
+          (print-string-length nil)
+          (print-level nil)
+          (print-readably t)
+          (print-quoted t))
+      (dolist (sym savehist-history-variables)
+        (when (boundp sym)
+          (let ((value (savehist-process-for-saving (symbol-value sym))))
+            (prin1 `(setq ,sym ',value) (current-buffer))
+            (insert ?\n)))))
+    ;; If autosaving, avoid writing if nothing has changed since the
+    ;; last write.
+    (let ((checksum (md5 (current-buffer) nil nil savehist-no-conversion)))
+      (unless (and auto-save (equal checksum savehist-last-checksum))
+        ;; Set file-precious-flag when saving the buffer because we
+        ;; don't want a half-finished write ruining the entire
+        ;; history.  (Remember that this is run from a timer and from
+        ;; kill-emacs-hook.)
+        (let ((file-precious-flag t)
+              (coding-system-for-write savehist-coding-system))
+          (write-region (point-min) (point-max) savehist-file nil
+                        (unless (interactive-p) 'quiet)))
+        (when savehist-modes
+          (set-file-modes savehist-file savehist-modes))
+        (setq savehist-last-checksum checksum)))))
+
+(defun savehist-autosave ()
+  "Save the minibuffer history if it has been modified since the last save."
+  (savehist-save t))
+
+(defun savehist-process-for-saving (value)
+  ;; Process VALUE for saving to file.  If it is a list, retain only
+  ;; the first `savehist-length' values and prune non-printable ones.
+  ;; If VALUE is not a list, return it as-is if it is printable and
+  ;; nil otherwise.
+  (cond
+   ((listp value)
+    (when (and savehist-length (> (length value) savehist-length))
+      ;; This should be: (setq value (subseq value 0 savehist-length))
+      (setq value (copy-sequence value))
+      (setcdr (nthcdr savehist-length value) nil))
+    ;; And this should be (remove-if-not #'savehist-printable value)
+    (delq nil (mapcar (lambda (x) (if (savehist-printable x) x)) value)))
+   ((savehist-printable value) value)
+   (t nil)))
+
+(defun savehist-printable (value)
+  "Return non-nil if VALUE is printable."
+  ;; Quick response for oft-encountered types known to be printable.
+  (cond
+   ((stringp value))
+   ((numberp value))
+   ((symbolp value))
+   (t
+    ;; For others, check explicitly.
+    (condition-case nil
+        (let ((print-readably t)
+              (print-level nil)
+              (chars ()))
+          ;; Print the value into a string...
+          (prin1 value (lambda (char) (push char chars)))
+          ;; ...and attempt to read it.
+          (read (apply #'string (nreverse chars)))
+          ;; The attempt worked: the object is printable.
+          t)
+      ;; The attempt failed: the object is not printable.
+      (error nil)))))
+
+(provide 'savehist)
+
+;; arch-tag: b3ce47f4-c5ad-4ebc-ad02-73aba705cf9f
+;;; savehist.el ends here
diff --git a/lisp/simple.el b/lisp/simple.el
index d52f1a20094..301b4cc996a 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4848,10 +4848,13 @@ Called from `temp-buffer-show-hook'."
   "Normal hook run at the end of setting up a completion list buffer.
 When this hook is run, the current buffer is the one in which the
 command to display the completion list buffer was run.
-The completion list buffer is available as the value of `standard-output'.")
+The completion list buffer is available as the value of `standard-output'.
+The common prefix substring for completion may be available as the 
+value of `completion-common-substring'. See also `display-completion-list'.")
+
+
+;; Variables and faces used in `completion-setup-function'.
 
-;; This function goes in completion-setup-hook, so that it is called
-;; after the text of the completion list buffer is written.
 (defface completions-first-difference
   '((t (:inherit bold)))
   "Face put on the first uncommon character in completions in *Completions* buffer."
@@ -4871,6 +4874,17 @@ of the differing parts is, by contrast, slightly highlighted."
 (defvar completion-root-regexp "^/"
   "Regexp to use in `completion-setup-function' to find the root directory.")
 
+(defvar completion-common-substring nil
+  "Common prefix substring to use in `completion-setup-function' to put faces.
+The value is set by `display-completion-list' during running `completion-setup-hook'.
+
+To put faces, `completions-first-difference' and `completions-common-part' 
+into \"*Completions*\* buffer, the common prefix substring in completions is
+needed as a hint. (Minibuffer is a special case. The content of minibuffer itself 
+is the substring.)")
+
+;; This function goes in completion-setup-hook, so that it is called
+;; after the text of the completion list buffer is written.
 (defun completion-setup-function ()
   (let ((mainbuf (current-buffer))
         (mbuf-contents (minibuffer-contents)))
@@ -4909,9 +4923,11 @@ of the differing parts is, by contrast, slightly highlighted."
                       (funcall (get minibuffer-completion-table 'completion-base-size-function)))
               (setq completion-base-size 0))))
       ;; Put faces on first uncommon characters and common parts.
-      (when completion-base-size
+      (when (or completion-base-size completion-common-substring)
         (let* ((common-string-length
-                (- (length mbuf-contents) completion-base-size))
+                (if completion-base-size
+                    (- (length mbuf-contents) completion-base-size)
+                  (length completion-common-substring)))
                (element-start (next-single-property-change
                                (point-min)
                                'mouse-face))
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index bb813808ed9..e09c0d734cc 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -1106,7 +1106,8 @@ frame and window to be the currently active frame and window."
            (or (not dframe-xemacsp)
                (with-no-warnings
                  (specifier-instance has-modeline-p)))
-           speedbar-buffer)      (save-excursion
+           speedbar-buffer)
+      (save-excursion
         (set-buffer speedbar-buffer)
         (let* ((w (or (speedbar-frame-width) 20))
                (p1 "<<")
@@ -1677,9 +1678,8 @@ specialized speedbar displays."
     (speedbar-make-button start (point) face mouse function token))
   (let ((start (point)))
     (insert "\n")
-    (put-text-property start (point) 'face nil)
-    (put-text-property start (point) 'invisible nil)
-    (put-text-property start (point) 'mouse-face nil)))
+    (add-text-properties
+     start (point) '(face nil invisible nil mouse-face nil))))
 
 (defun speedbar-insert-separator (text)
   "Insert a separation label of TEXT.
@@ -1698,13 +1698,11 @@ Separators are not active, have no labels, depth, or actions."
   "Create a button from START to END, with FACE as the display face.
 MOUSE is the mouse face.  When this button is clicked on FUNCTION
 will be run with the TOKEN parameter (any Lisp object)"
-  (put-text-property start end 'face face)
-  (put-text-property start end 'mouse-face mouse)
+  (add-text-properties
+   start end `(face ,face mouse-face ,mouse invisible nil
+               speedbar-text ,(buffer-substring-no-properties start end)))
   (if speedbar-use-tool-tips-flag
       (put-text-property start end 'help-echo #'dframe-help-echo))
-  (put-text-property start end 'invisible nil)
-  (put-text-property start end 'speedbar-text
-                     (buffer-substring-no-properties start end))
   (if function (put-text-property start end 'speedbar-function function))
   (if token (put-text-property start end 'speedbar-token token))
   ;; So far the only text we have is less that 3 chars.
@@ -2455,10 +2453,9 @@ name will have the function FIND-FUN and not token."
         (set-buffer speedbar-buffer)
         (speedbar-with-writable
           (erase-buffer)
-          (while funclst
+          (dolist (func funclst)
             (setq default-directory cbd)
-            (funcall (car funclst) cbd 0)
-            (setq funclst (cdr funclst)))
+            (funcall func cbd 0))
         (speedbar-reconfigure-keymaps)
         (goto-char (point-min)))
         ))))
@@ -2535,10 +2532,9 @@ name will have the function FIND-FUN and not token."
                             speedbar-shown-directories))
                  (insert (cdr cache)))
                 (t
-                 (while funclst
-                   (setq default-directory cbd)
-                   (funcall (car funclst) cbd 0)
-                   (setq funclst (cdr funclst))))))
+          (dolist (func funclst)
+            (setq default-directory cbd)
+            (funcall func cbd 0)))))
         (goto-char (point-min)))))
   (speedbar-reconfigure-keymaps))
 
@@ -2561,11 +2557,10 @@ This should only be used by modes classified as special."
               speedbar-shown-directories nil))
       ;; Now fill in the buffer with our newly found specialized list.
       (speedbar-with-writable
-        (while funclst
-          ;; We do not erase the buffer because these functions may
-          ;; decide NOT to update themselves.
-          (funcall (car funclst) specialbuff)
-          (setq funclst (cdr funclst))))
+          (dolist (func funclst)
+            ;; We do not erase the buffer because these functions may
+            ;; decide NOT to update themselves.
+            (funcall func specialbuff)))
 
       (goto-char (point-min))))
   (speedbar-reconfigure-keymaps))
@@ -3822,6 +3817,7 @@ regular expression EXPR."
     ["Contract File Tags" speedbar-contract-line
      (save-excursion (beginning-of-line)
                      (looking-at "[0-9]+: *.-. "))]
+    "----"
     ["Kill Buffer" speedbar-buffer-kill-buffer
      (save-excursion (beginning-of-line)
                      (looking-at "[0-9]+: *.[-+?]. "))]
diff --git a/lisp/tempo.el b/lisp/tempo.el
index 4939715a31c..62ba3c9acae 100644
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -717,11 +717,13 @@ non-nil, a buffer containing possible completions is displayed."
   (if tempo-leave-completion-buffer
       (with-output-to-temp-buffer "*Completions*"
         (display-completion-list
-         (all-completions string tag-list)))
+         (all-completions string tag-list)
+         string))
     (save-window-excursion
       (with-output-to-temp-buffer "*Completions*"
         (display-completion-list
-         (all-completions string tag-list)))
+         (all-completions string tag-list)
+         string))
       (sit-for 32767))))
 
 ;;;
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 5e09d6391ce..f7782433fdc 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -54,8 +54,6 @@
 ;; -font                *font
 ;; -foreground          *foreground
 ;; -geometry            .geometry
-;; -i                   .iconType
-;; -itype               .iconType
 ;; -iconic              .iconic
 ;; -name                .name
 ;; -reverse             *reverseVideo
@@ -1199,15 +1197,21 @@ in `selection-converter-alist', which see."
     (when (and (stringp data)
                (setq data-type (get-text-property 0 'foreign-selection data)))
       (cond ((eq data-type 'public.utf16-plain-text)
-             (let ((encoded (and (fboundp 'mac-code-convert-string)
-                                 (mac-code-convert-string data
-                                                          'utf-16 coding))))
-               (if encoded
-                   (let ((coding-save last-coding-system-used))
-                     (setq data (decode-coding-string encoded coding))
-                     (setq last-coding-system-used coding-save))
-                 (setq data
-                       (decode-coding-string data 'utf-16)))))
+             (if (fboundp 'mac-code-convert-string)
+                 (let ((s (mac-code-convert-string data nil coding)))
+                   (if s
+                       (setq data (decode-coding-string s coding))
+                     (setq data
+                           ;; (decode-coding-string data 'utf-16) is
+                           ;; not correct because
+                           ;; public.utf16-plain-text is defined as
+                           ;; native byte order, no BOM.
+                           (decode-coding-string
+                            (mac-code-convert-string data nil 'utf-8)
+                            'utf-8))))
+               ;; No `mac-code-convert-string' means non-Carbon, which
+               ;; implies big endian.
+               (setq data (decode-coding-string data 'utf-16be))))
             ((eq data-type 'com.apple.traditional-mac-plain-text)
              (setq data (decode-coding-string data coding)))
             ((eq data-type 'public.file-url)
@@ -1324,14 +1328,25 @@ in `selection-converter-alist', which see."
           (remove-text-properties 0 (length str) '(composition nil) str)
           (cond
            ((eq type 'public.utf16-plain-text)
-            (let (s)
-              (when (and (fboundp 'mac-code-convert-string)
-                         (memq coding (find-coding-systems-string str)))
-                (setq coding (coding-system-change-eol-conversion coding 'mac))
-                (setq s (mac-code-convert-string
-                         (encode-coding-string str coding)
-                         coding 'utf-16)))
-              (setq str (or s (encode-coding-string str 'utf-16-mac)))))
+            (if (fboundp 'mac-code-convert-string)
+                (let (s)
+                  (when (memq coding (find-coding-systems-string str))
+                    (setq coding
+                          (coding-system-change-eol-conversion coding 'mac))
+                    (setq s (mac-code-convert-string
+                             (encode-coding-string str coding)
+                             coding nil)))
+                  (setq str (or s
+                                ;; (encode-coding-string str
+                                ;; 'utf-16-mac) is not correct because
+                                ;; public.utf16-plain-text is defined
+                                ;; as native byte order, no BOM.
+                                (mac-code-convert-string
+                                 (encode-coding-string str 'utf-8-mac)
+                                 'utf-8 nil))))
+              ;; No `mac-code-convert-string' means non-Carbon, which
+              ;; implies big endian.
+              (setq str (encode-coding-string str 'utf-16be-mac))))
            ((eq type 'com.apple.traditional-mac-plain-text)
             (let ((encodables (find-coding-systems-string str))
                   (rest mac-script-code-coding-systems))
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 2177f72fd0d..7b736708268 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -2522,7 +2522,8 @@ of a word, all strings are listed.  Return completion."
            (message "Making completion list...")
            (with-output-to-temp-buffer "*Completions*"
              (display-completion-list (all-completions part-of-word
-                                                       completions)))
+                                                       completions)
+                                      part-of-word))
            (message "Making completion list...done")
            ;; return value is handled by choose-completion-string-functions
            nil))))
@@ -2661,6 +2662,7 @@ begins at the beginning of a line.  We use this function for font-locking."
         field bounds start end found)
     (bibtex-beginning-of-field)
     (while (and (not found)
+                (<= (point) bound)
                 (prog1 (re-search-forward bibtex-font-lock-url-regexp bound t)
                   (setq field (match-string-no-properties 1)))
                 (setq bounds (bibtex-parse-field-text))
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index 8c009921d09..2c895eb517e 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -86,7 +86,7 @@ not align (only setting space according to `conf-assignment-space')."
     (define-key map "\C-c'" 'conf-quote-normal)
     (define-key map "\C-c\C-a" 'conf-align-assignments)
     map)
-  "Local keymap for conf-mode buffers.")
+  "Local keymap for `conf-mode' buffers.")
 
 (defvar conf-mode-syntax-table
   (let ((table (make-syntax-table)))
@@ -99,7 +99,7 @@ not align (only setting space according to `conf-assignment-space')."
     (modify-syntax-entry ?\n ">" table)
     (modify-syntax-entry ?\r ">" table)
     table)
-  "Syntax table in use in Windows style conf-mode buffers.")
+  "Syntax table in use in Windows style `conf-mode' buffers.")
 
 (defvar conf-unix-mode-syntax-table
   (let ((table (make-syntax-table conf-mode-syntax-table)))
@@ -107,7 +107,7 @@ not align (only setting space according to `conf-assignment-space')."
     ;; override
     (modify-syntax-entry ?\; "." table)
     table)
-  "Syntax table in use in Unix style conf-mode buffers.")
+  "Syntax table in use in Unix style `conf-mode' buffers.")
 
 (defvar conf-javaprop-mode-syntax-table
   (let ((table (make-syntax-table conf-unix-mode-syntax-table)))
@@ -124,7 +124,7 @@ not align (only setting space according to `conf-assignment-space')."
     (modify-syntax-entry ?\' "." table)
     (modify-syntax-entry ?\; "." table)
     table)
-  "Syntax table in use in PPD conf-mode buffers.")
+  "Syntax table in use in PPD `conf-mode' buffers.")
 
 (defvar conf-xdefaults-mode-syntax-table
   (let ((table (make-syntax-table conf-mode-syntax-table)))
@@ -132,7 +132,7 @@ not align (only setting space according to `conf-assignment-space')."
     ;; override
     (modify-syntax-entry ?\; "." table)
     table)
-  "Syntax table in use in Xdefaults style conf-mode buffers.")
+  "Syntax table in use in Xdefaults style `conf-mode' buffers.")
 
 
 (defvar conf-font-lock-keywords
@@ -144,7 +144,7 @@ not align (only setting space according to `conf-assignment-space')."
      (2 'font-lock-constant-face nil t))
     ;; section { ... } (do this last because some assign ...{...)
     ("^[ \t]*\\([^=:\n]+?\\)[ \t\n]*{[^{}]*?$" 1 'font-lock-type-face prepend))
-  "Keywords to hilight in Conf mode")
+  "Keywords to hilight in Conf mode.")
 
 (defvar conf-javaprop-font-lock-keywords
   '(;; var=val
@@ -156,7 +156,7 @@ not align (only setting space according to `conf-assignment-space')."
      (5 'font-lock-variable-name-face nil t)
      (6 'font-lock-constant-face nil t)
      (7 'font-lock-variable-name-face nil t)))
-  "Keywords to hilight in Conf Java Properties mode")
+  "Keywords to hilight in Conf Java Properties mode.")
 
 (defvar conf-space-keywords-alist
   '(("\\`/etc/gpm/" . "key\\|name\\|foreground\\|background\\|border\\|head")
@@ -188,7 +188,7 @@ This variable is best set in the file local variables, or through
                 '(1 'font-lock-keyword-face)
                 '(2 'font-lock-variable-name-face))
           '("^[ \t]*\\([^\000- ]+\\)" 1 'font-lock-variable-name-face)))
-  "Keywords to hilight in Conf Space mode")
+  "Keywords to hilight in Conf Space mode.")
 
 (defvar conf-colon-font-lock-keywords
   `(;; [section] (do this first because it may look like a parameter)
@@ -198,7 +198,7 @@ This variable is best set in the file local variables, or through
      (1 'font-lock-variable-name-face))
     ;; section { ... } (do this last because some assign ...{...)
     ("^[ \t]*\\([^:\n]+\\)[ \t\n]*{[^{}]*?$" 1 'font-lock-type-face prepend))
-  "Keywords to hilight in Conf Colon mode")
+  "Keywords to hilight in Conf Colon mode.")
 
 (defvar conf-assignment-sign ?=
   "What sign is used for assignments.")
@@ -231,12 +231,15 @@ whitespace.")
             (if (>= arg 0)
                 (progn
                   (indent-to-column arg)
-                  (or (not conf-assignment-space) (memq (char-before (point)) '(?\s ?\t)) (insert ?\s))
-                  (insert conf-assignment-sign (if (and conf-assignment-space (not (eolp))) ?\s "")))
+                  (or (not conf-assignment-space)
+                      (memq (char-before (point)) '(?\s ?\t)) (insert ?\s))
+                  (insert conf-assignment-sign
+                          (if (and conf-assignment-space (not (eolp))) ?\s "")))
               (insert (if conf-assignment-space ?\s "") conf-assignment-sign)
               (unless (eolp)
                 (indent-to-column (- arg))
-                (or (not conf-assignment-space) (memq (char-before (point)) '(?\s ?\t)) (insert ?\s))))
+                (or (not conf-assignment-space)
+                    (memq (char-before (point)) '(?\s ?\t)) (insert ?\s))))
           (unless (eolp)
             (if (>= (current-column) (abs arg))
                 (insert ?\s)
@@ -255,8 +258,10 @@ both, i.e. quotes delimit strings, except when they are
 unbalanced, but hey...)"
   (interactive "P")
   (let ((table (copy-syntax-table (syntax-table))))
-    (if (or (not arg) (= (prefix-numeric-value arg) 1)) (modify-syntax-entry ?\' "." table))
-    (if (or (not arg) (= (prefix-numeric-value arg) 2)) (modify-syntax-entry ?\" "." table))
+    (if (or (not arg) (= (prefix-numeric-value arg) 1))
+        (modify-syntax-entry ?\' "." table))
+    (if (or (not arg) (= (prefix-numeric-value arg) 2))
+        (modify-syntax-entry ?\" "." table))
     (set-syntax-table table)
     (and (boundp 'font-lock-mode)
          font-lock-mode
@@ -326,25 +331,25 @@ See also `conf-space-mode', `conf-colon-mode', `conf-javaprop-mode',
                   ((looking-at ".*{"))          ; nop
                   ((setq space (1+ space))))
             (forward-line)))
-        (if (> jp (max unix win 3))
-            (conf-javaprop-mode)
-          (if (> colon (max equal space))
-              (conf-colon-mode)
-            (if (> space (max equal colon))
-                (conf-space-mode)
-              (if (or (> win unix)
-                      (and (= win unix) (eq system-type 'windows-nt)))
-                  (conf-windows-mode)
-                (conf-unix-mode))))))
+        (cond
+         ((> jp (max unix win 3)) (conf-javaprop-mode))
+         ((> colon (max equal space)) (conf-colon-mode))
+         ((> space (max equal colon)) (conf-space-mode))
+         ((or (> win unix) (and (= win unix) (eq system-type 'windows-nt)))
+          (conf-windows-mode))
+         (t (conf-unix-mode))))
     (kill-all-local-variables)
     (use-local-map conf-mode-map)
 
     (setq major-mode 'conf-mode
           mode-name name)
+    (set (make-local-variable 'font-lock-defaults)
+         '(conf-font-lock-keywords nil t nil nil))
     (set (make-local-variable 'comment-start) comment)
     (set (make-local-variable 'comment-start-skip)
          (concat (regexp-quote comment-start) "+\\s *"))
-    (set (make-local-variable 'comment-use-syntax) t)
+    ;; Let newcomment.el decide this for himself.
+    ;; (set (make-local-variable 'comment-use-syntax) t)
     (set (make-local-variable 'parse-sexp-ignore-comments) t)
     (set (make-local-variable 'outline-regexp)
          "[ \t]*\\(?:\\[\\|.+[ \t\n]*{\\)")
@@ -368,7 +373,7 @@ See also `conf-space-mode', `conf-colon-mode', `conf-javaprop-mode',
 Comments start with `#'.
 For details see `conf-mode'.  Example:
 
-# Conf mode font-locks this right on Unix and with C-c C-u
+# Conf mode font-locks this right on Unix and with \\[conf-unix-mode]
 
 \[Desktop Entry]
          Encoding=UTF-8
@@ -384,7 +389,7 @@ For details see `conf-mode'.  Example:
 Comments start with `;'.
 For details see `conf-mode'.  Example:
 
-; Conf mode font-locks this right on Windows and with C-c C-w
+; Conf mode font-locks this right on Windows and with \\[conf-windows-mode]
 
 \[ExtShellFolderViews]
 Default={5984FFE0-28D4-11CF-AE66-08002B2E1262}
@@ -407,7 +412,7 @@ Comments start with `#' but are also recognized with `//' or
 between `/*' and `*/'.
 For details see `conf-mode'.  Example:
 
-# Conf mode font-locks this right with C-c C-j (Java properties)
+# Conf mode font-locks this right with \\[conf-javaprop-mode] (Java properties)
 // another kind of comment
 /* yet another */
 
@@ -441,7 +446,7 @@ KEYWORDS, or any non-nil non-string for no keywords.
 
 For details see `conf-mode'.  Example:
 
-# Conf mode font-locks this right with C-c C-s (space separated)
+# Conf mode font-locks this right with \\[conf-space-mode] (space separated)
 
 image/jpeg                      jpeg jpg jpe
 image/png                       png
@@ -495,7 +500,7 @@ add /dev/mixer		desktop"
 \"Assignments\" are with `:'.
 For details see `conf-mode'.  Example:
 
-# Conf mode font-locks this right with C-c C-c (colon)
+# Conf mode font-locks this right with \\[conf-colon-mode] (colon)
 
 <Multi_key> <exclam> <exclam>           : \"\\241\"     exclamdown
 <Multi_key> <c> <slash>                 : \"\\242\"     cent"
@@ -524,7 +529,7 @@ For details see `conf-mode'.  Example:
 Comments start with `*%' and \"assignments\" are with `:'.
 For details see `conf-mode'.  Example:
 
-*% Conf mode font-locks this right with C-c C-p (PPD)
+*% Conf mode font-locks this right with \\[conf-ppd-mode] (PPD)
 
 *DefaultTransfer: Null
 *Transfer Null.Inverse: \"{ 1 exch sub }\""
@@ -539,22 +544,13 @@ For details see `conf-mode'.  Example:
 Comments start with `!' and \"assignments\" are with `:'.
 For details see `conf-mode'.  Example:
 
-! Conf mode font-locks this right with C-c C-x (.Xdefaults)
+! Conf mode font-locks this right with \\[conf-xdefaults-mode] (.Xdefaults)
 
 *background:                    gray99
 *foreground:                    black"
   (interactive)
   (conf-colon-mode "!" conf-xdefaults-mode-syntax-table "Conf[Xdefaults]"))
 
-
-;; font lock support
-(if (boundp 'font-lock-defaults-alist)
-    (add-to-list
-     'font-lock-defaults-alist
-     (cons 'conf-mode
-           (list 'conf-font-lock-keywords nil t nil nil))))
-
-
 (provide 'conf-mode)
 
 ;; arch-tag: 0a3805b2-0371-4d3a-8498-8897116b2356
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index b9542c9fce7..7f0d257e5f6 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -2844,7 +2844,7 @@ At all other locations, this simply calls `ispell-complete-word'."
              (message "Making completion list...")
              (let ((list (sort (all-completions pattern table) 'string<)))
                (with-output-to-temp-buffer "*Completions*"
-                 (display-completion-list list)))
+                 (display-completion-list list pattern)))
              (message "Making completion list...%s" "done"))))))
 
 ;;; Comments, TODO and DEADLINE
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 3623c788882..bdd4e659a0e 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -576,7 +576,7 @@ An alternative value is \" . \", if you use a font with a narrow period."
               2 '(tex-font-lock-append-prop 'italic) 'append)
         ;; This is separate from the previous one because of cases like
         ;; {\em foo {\bf bar} bla} where both match.
-        (list (concat "\\\\\\(bf\\(series\\)?\\)\\>" args)
+        (list (concat "\\\\\\(bf\\(series\\)?\\)\\>" args)
               3 '(tex-font-lock-append-prop 'bold) 'append)))))
    "Gaudy expressions to highlight in TeX modes.")
 
diff --git a/lisp/toolbar/tool-bar.el b/lisp/tool-bar.el
index 487255a0272..984dac92b12 100644
--- a/lisp/toolbar/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -97,7 +97,7 @@ PROPS are additional items to add to the menu item specification.  See
 Info node `(elisp)Tool Bar'.  Items are added from left to right.
 
 ICON is the base name of a file containing the image to use.  The
-function will first try to use lc-ICON.xpm if display-color-cells
+function will first try to use low-color/ICON.xpm if display-color-cells
 is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally
 ICON.xbm, using `find-image'.
 
@@ -114,7 +114,7 @@ PROPS are additional items to add to the menu item specification.  See
 Info node `(elisp)Tool Bar'.  Items are added from left to right.
 
 ICON is the base name of a file containing the image to use.  The
-function will first try to use lc-ICON.xpm if display-color-cells
+function will first try to use low-color/ICON.xpm if display-color-cells
 is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally
 ICON.xbm, using `find-image'."
   (let* ((fg (face-attribute 'tool-bar :foreground))
@@ -124,9 +124,12 @@ ICON.xbm, using `find-image'."
          (xpm-spec (list :type 'xpm :file (concat icon ".xpm")))
          (xpm-lo-spec (if (> (display-color-cells) 256)
                           nil
-                        (list :type 'xpm :file (concat "lc-" icon ".xpm"))))
-         (pbm-spec (append (list :type 'pbm :file (concat icon ".pbm")) colors))
-         (xbm-spec (append (list :type 'xbm :file (concat icon ".xbm")) colors))
+                        (list :type 'xpm :file
+                              (concat "low-color/" icon ".xpm"))))
+         (pbm-spec (append (list :type 'pbm :file
+                                 (concat icon ".pbm")) colors))
+         (xbm-spec (append (list :type 'xbm :file
+                                 (concat icon ".xbm")) colors))
          (image (find-image
                 (if (display-color-p)
                     (list xpm-lo-spec xpm-spec pbm-spec xbm-spec)
@@ -175,9 +178,12 @@ MAP must contain appropriate binding for `[menu-bar]' which holds a keymap."
          (xpm-spec (list :type 'xpm :file (concat icon ".xpm")))
          (xpm-lo-spec (if (> (display-color-cells) 256)
                           nil
-                        (list :type 'xpm :file (concat "lc-" icon ".xpm"))))
-         (pbm-spec (append (list :type 'pbm :file (concat icon ".pbm")) colors))
-         (xbm-spec (append (list :type 'xbm :file (concat icon ".xbm")) colors))
+                        (list :type 'xpm :file
+                              (concat "low-color/" icon ".xpm"))))
+         (pbm-spec (append (list :type 'pbm :file
+                                 (concat icon ".pbm")) colors))
+         (xbm-spec (append (list :type 'xbm :file
+                                 (concat icon ".xbm")) colors))
          (spec (if (display-color-p)
                    (list xpm-lo-spec xpm-spec pbm-spec xbm-spec)
                  (list pbm-spec xbm-spec xpm-lo-spec xpm-spec)))
@@ -255,7 +261,7 @@ MAP must contain appropriate binding for `[menu-bar]' which holds a keymap."
 
   ;; There's no icon appropriate for News and we need a command rather
   ;; than a lambda for Read Mail.
-  ;;(tool-bar-add-item-from-menu 'compose-mail "mail_compose")
+  ;;(tool-bar-add-item-from-menu 'compose-mail "mail/compose")
 
   (tool-bar-add-item-from-menu 'print-buffer "print")
   (tool-bar-add-item "preferences" 'customize 'customize
diff --git a/lisp/toolbar/README b/lisp/toolbar/README
deleted file mode 100644
index 81df0c874bd..00000000000
--- a/lisp/toolbar/README
+++ /dev/null
@@ -1,12 +0,0 @@
-The following icons are from GTK+ 2.x:
-
-    close.xpm copy.xpm cut.xpm help.xpm home.xpm
-    index.xpm jump_to.xpm left_arrow.xpm new.xpm open.xpm
-    paste.xpm preferences.xpm print.xpm right_arrow.xpm save.xpm
-    saveas.xpm search.xpm spell.xpm undo.xpm up_arrow.xpm
-
-    back_arrow.xpm and fwd_arrow.xpm are slightly modified undo and redo.
-
-    diropen.xpm is file-manager.png from Gnome hicolor theme.
-
-They are not part of Emacs, but distributed and used by Emacs.
diff --git a/lisp/toolbar/attach.pbm b/lisp/toolbar/attach.pbm
deleted file mode 100644
index e8fcd988f0c..00000000000
--- a/lisp/toolbar/attach.pbm
+++ /dev/null
diff --git a/lisp/toolbar/back_arrow.pbm b/lisp/toolbar/back_arrow.pbm
deleted file mode 100644
index 7f9b8975d2f..00000000000
--- a/lisp/toolbar/back_arrow.pbm
+++ /dev/null
diff --git a/lisp/toolbar/back_arrow.xpm b/lisp/toolbar/back_arrow.xpm
deleted file mode 100644
index b9b13613d81..00000000000
--- a/lisp/toolbar/back_arrow.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char *back_arrow_xpm[] = {
-"24 24 30 1",
-"  c #000000",
-". c #53692A",
-"X c #59702D",
-"o c #657255",
-"O c #6D7A5B",
-"+ c #6D8839",
-"@ c #7C9B40",
-"# c #748261",
-"$ c #7F8E6B",
-"% c #818F71",
-"& c #879772",
-"* c #8C9A7F",
-"= c #85A24D",
-"- c #8BA859",
-"; c #92AD62",
-": c #95A77E",
-"> c #98AF74",
-", c #9BB572",
-"< c #9BAA87",
-"1 c #9CAF84",
-"2 c #A4B690",
-"3 c #A8BCA6",
-"4 c #ADBDA0",
-"5 c #AFC394",
-"6 c #BAD09D",
-"7 c #B5C3A9",
-"8 c #BED2A3",
-"9 c #D5E1C6",
-"0 c #FFFFFF",
-"q c None",
-"qqqqqqqqqqqqqqqqqqqqqqqq",
-"qqqqqqqqqqqqqqqqqqqqqqqq",
-"qqqqqqqqqqqqqqqqqqqqqqqq",
-"qqqqqqqqqq qqqqqqqqqqqqq",
-"qqqqqqqqq  qqqqqqqqqqqqq",
-"qqqqqqqq 9 qqqqqqqqqqqqq",
-"qqqqqqq 96    qqqqqqqqqq",
-"qqqqqq 968664% qqqqqqqqq",
-"qqqqq 966666663 qqqqqqqq",
-"qqqq <666666666* qqqqqqq",
-"qqqqq X@@@@@@;67  qqqqqq",
-"qqqqqq .@@@@@@=6$ qqqqqq",
-"qqqqqqq .@   X@,2 qqqqqq",
-"qqqqqqqq X q  +-6 qqqqqq",
-"qqqqqqqqq  qq  @6 qqqqqq",
-"qqqqqqqqqq qqq -: qqqqqq",
-"qqqqqqqqqqqqqq >o qqqqqq",
-"qqqqqqqqqqqqqq 5 qqqqqqq",
-"qqqqqqqqqqqqq 1O qqqqqqq",
-"qqqqqqqqqqqq &# qqqqqqqq",
-"qqqqqqqqqqqqq  qqqqqqqqq",
-"qqqqqqqqqqqqqqqqqqqqqqqq",
-"qqqqqqqqqqqqqqqqqqqqqqqq",
-"qqqqqqqqqqqqqqqqqqqqqqqq"};
diff --git a/lisp/toolbar/cancel.pbm b/lisp/toolbar/cancel.pbm
deleted file mode 100644
index bd85b764c27..00000000000
--- a/lisp/toolbar/cancel.pbm
+++ /dev/null
diff --git a/lisp/toolbar/cancel.xpm b/lisp/toolbar/cancel.xpm
deleted file mode 100644
index 1a9c80ac744..00000000000
--- a/lisp/toolbar/cancel.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char *magick[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 5 1",
-"  c #01c601c601c6",
-". c Gray40",
-"X c #a527a527a527",
-"o c #da22da22da22",
-"O c None",
-/* pixels */
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOO       OOOOOOOOO",
-"OOOOOO  XXooXX.  OOOOOOO",
-"OOOOO XooooooooX. OOOOOO",
-"OOOOO oooooooooo. OOOOOO",
-"OOOO Xooo ooo XoX. OOOOO",
-"OOOO Xoo   o   XXX OOOOO",
-"OOOO oooo     XoXX OOOOO",
-"OOOO Xoooo   ooXXX OOOOO",
-"OOOO Xooo     OXX. OOOOO",
-"OOOO Xoo   o   XX. OOOOO",
-"OOOO .Xoo ooX XX.. OOOOO",
-"OOOOO XXOoXoXXX.. OOOOOO",
-"OOOOO XXXXXXXXX.. OOOOOO",
-"OOOOOO  XXXX...  OOOOOOO",
-"OOOOOOOO       OOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO"
-};
diff --git a/lisp/toolbar/close.pbm b/lisp/toolbar/close.pbm
deleted file mode 100644
index 5229be27525..00000000000
--- a/lisp/toolbar/close.pbm
+++ /dev/null
diff --git a/lisp/toolbar/close.xpm b/lisp/toolbar/close.xpm
deleted file mode 100644
index 498843be6e2..00000000000
--- a/lisp/toolbar/close.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * close_xpm[] = {
-"24 24 2 1",
-"       c None",
-".      c #000000",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"       .      .         ",
-"        .    ...        ",
-"        ..  ....        ",
-"         .. ...         ",
-"         .....          ",
-"          ...           ",
-"         .....          ",
-"        .......         ",
-"       ...  ....        ",
-"      ...    ....       ",
-"     ...      ..        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/copy.pbm b/lisp/toolbar/copy.pbm
deleted file mode 100644
index abfd22f93b3..00000000000
--- a/lisp/toolbar/copy.pbm
+++ /dev/null
diff --git a/lisp/toolbar/copy.xpm b/lisp/toolbar/copy.xpm
deleted file mode 100644
index 6262a95bc39..00000000000
--- a/lisp/toolbar/copy.xpm
+++ /dev/null
@@ -1,53 +0,0 @@
-/* XPM */
-static char * copy_xpm[] = {
-"24 24 26 1",
-"       c None",
-".      c #000000",
-"+      c #B4B4B4",
-"@      c #F8F8F8",
-"#      c #F6F6F6",
-"$      c #C3C3C3",
-"%      c #E9E9E9",
-"&      c #989898",
-"*      c #828282",
-"=      c #8A8A8A",
-"-      c #E8E8E8",
-";      c #636363",
-">      c #5A5A5A",
-",      c #6B6B6B",
-"'      c #B3B3B3",
-")      c #FFFFFF",
-"!      c #D6D6D6",
-"~      c #818181",
-"{      c #A7A7A7",
-"]      c #8F8F8F",
-"^      c #C6C6C6",
-"/      c #808080",
-"(      c #E7E7E7",
-"_      c #6D6D6D",
-":      c #767676",
-"<      c #F5F5F5",
-"                        ",
-" .............          ",
-" .+@@@@@@@@@#$.         ",
-" .@%%%%%%%%%%%.         ",
-" .@&**=%+*%*+%.         ",
-" .@%%%%%%%%---.         ",
-" .@;>%,*+-............  ",
-" .@%%%%%%.'))))))))))!. ",
-" .@&**%*~.)))))))))))). ",
-" .@%%%%%-.){]]&)^])]^). ",
-" .@;>>%,/.)))))))))))). ",
-" .@%%%%%(.)_;):]^)^])). ",
-" .@&**%*~.)))))))))))). ",
-" .<%%%%%-.){]])]]^)&]). ",
-" .$%%%%%-.)))))))))))). ",
-"  ........)_;;):]^)^]). ",
-"         .)))))))))))). ",
-"         .){]])]]^)&]). ",
-"         .)))))))))))). ",
-"         .!))))))))))!. ",
-"         .............. ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/cut.pbm b/lisp/toolbar/cut.pbm
deleted file mode 100644
index 29bf1abc073..00000000000
--- a/lisp/toolbar/cut.pbm
+++ /dev/null
diff --git a/lisp/toolbar/cut.xpm b/lisp/toolbar/cut.xpm
deleted file mode 100644
index 3f8e71d22ce..00000000000
--- a/lisp/toolbar/cut.xpm
+++ /dev/null
@@ -1,67 +0,0 @@
-/* XPM */
-static char * cut_xpm[] = {
-"24 24 40 1",
-"       c None",
-".      c #000000",
-"+      c #C9C7C2",
-"@      c #E6E4E0",
-"#      c #EFEEED",
-"$      c #494946",
-"%      c #73726E",
-"&      c #F0EEED",
-"*      c #7F7D75",
-"=      c #F2F1EF",
-"-      c #D2CFC8",
-";      c #E7E7E4",
-">      c #BAB5AB",
-",      c #565653",
-"'      c #EDECE9",
-")      c #A4A097",
-"!      c #817F7E",
-"~      c #4E4C48",
-"{      c #F6F5F4",
-"]      c #474541",
-"^      c #EFEEEC",
-"/      c #8C8B8A",
-"(      c #F3F2F0",
-"_      c #77746D",
-":      c #323232",
-"<      c #EBEBEA",
-"[      c #605D58",
-"}      c #F5F4F3",
-"|      c #CECCC7",
-"1      c #363634",
-"2      c #6F6E6D",
-"3      c #BEBDBB",
-"4      c #EAE7E4",
-"5      c #B8B5B1",
-"6      c #474747",
-"7      c #DAD8D4",
-"8      c #9B9996",
-"9      c #161615",
-"0      c #6D6B6A",
-"a      c #3A3837",
-"                        ",
-"                        ",
-"      .        .        ",
-"      .        .        ",
-"     .+.      .@.       ",
-"     .#$      %@.       ",
-"     .&*.    .=-.       ",
-"     .;>,    %').       ",
-"      !#*.  .=-~        ",
-"      .{>]  ~^>.        ",
-"       /(_.:<-[         ",
-"       .}|123>.         ",
-"        .456>.          ",
-"         .78..          ",
-"         .90a.          ",
-"     .............      ",
-"     . ...  ... ...     ",
-"    ..  ..   ..  ..     ",
-"    .    .   .    .     ",
-"    ..  ..   ..  ..     ",
-"     ....     .. .      ",
-"     ....     ....      ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/diropen.pbm b/lisp/toolbar/diropen.pbm
deleted file mode 100644
index 61adc3b2a23..00000000000
--- a/lisp/toolbar/diropen.pbm
+++ /dev/null
diff --git a/lisp/toolbar/diropen.xpm b/lisp/toolbar/diropen.xpm
deleted file mode 100644
index 6937b99a44d..00000000000
--- a/lisp/toolbar/diropen.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char * diropen_xpm[] = {
-"19 24 17 1",
-"       c None",
-".      c #000100",
-"+      c #C6C9A6",
-"@      c #D0D3AF",
-"#      c #93997C",
-"$      c #E6E7D0",
-"%      c #BEC19E",
-"&      c #B4B895",
-"*      c #A7AA88",
-"=      c #6B6D59",
-"-      c #4A4E40",
-";      c #7C8166",
-">      c #898E72",
-",      c #3C4032",
-"'      c #575845",
-")      c #34332C",
-"!      c #24231D",
-"  ...............  ",
-" .+@@@@@@@@@@@@@#. ",
-".$@@@@@@@@@@@@@@@#.",
-".++++%%%%%%%%%&&&*.",
-".&&&&&&&&&&******#.",
-".*%+++%%%%%%%%%&=#.",
-".*+***********##-#.",
-".*+****;===;####-#.",
-".*+****=*****###-#.",
-".*+****;*****###-#.",
-".*+****########>-#.",
-".*&######>>>>>>>,>.",
-".*#-------------'>)",
-".*&&&&&&&&&&&&&*#>)",
-".*&************#'>)",
-".*&***********##,>)",
-".*&****====;###>,>)",
-".#&****=**#**##>,;)",
-".#&****>****###>,;)",
-".#&****########>,;)",
-".##''''''''''''',;)",
-".#>==============;)",
-".''''''''''''''''-!",
-" ................. "};
diff --git a/lisp/toolbar/exit.pbm b/lisp/toolbar/exit.pbm
deleted file mode 100644
index a6dd11e7769..00000000000
--- a/lisp/toolbar/exit.pbm
+++ /dev/null
diff --git a/lisp/toolbar/exit.xpm b/lisp/toolbar/exit.xpm
deleted file mode 100644
index 291dd0dd170..00000000000
--- a/lisp/toolbar/exit.xpm
+++ /dev/null
@@ -1,36 +0,0 @@
-/* XPM */
-static char *magick[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 6 1",
-"  c Gray0",
-". c #ae6e66e76a0a",
-"X c #c6c67d7d8181",
-"o c #cdcd86868989",
-"O c #e4e4e4e4dcdc",
-"+ c None",
-/* pixels */
-"++++++++++++++++++++++++",
-"++++++++++++++++++++++++",
-"++++++++++++++++++++++++",
-"++++++++++++++++++++++++",
-"++++++++++++++++++++++++",
-"++++++++++         +++++",
-"++++++++++ OOOOOO  +++++",
-"++++++++++ OOOOOO  +++++",
-"++++++++   OOOOOO  +++++",
-"++++++++ . OOOOOO  +++++",
-"+++      .X OO  O  +++++",
-"+++ ......Xo O  O  +++++",
-"+++ ......Xo OOOO  +++++",
-"+++      .X OOOOO  +++++",
-"++++++++ . OOOOOO  +++++",
-"++++++++   OOOOOO  +++++",
-"++++++++++ OOOO    +++++",
-"++++++++++ OO      +++++",
-"++++++++++         +++++",
-"++++++++++++++++++++++++",
-"++++++++++++++++++++++++",
-"++++++++++++++++++++++++",
-"++++++++++++++++++++++++",
-"++++++++++++++++++++++++"
-};
diff --git a/lisp/toolbar/fld_open.pbm b/lisp/toolbar/fld_open.pbm
deleted file mode 100644
index 3d2be258a67..00000000000
--- a/lisp/toolbar/fld_open.pbm
+++ /dev/null
diff --git a/lisp/toolbar/fld_open.xpm b/lisp/toolbar/fld_open.xpm
deleted file mode 100644
index 220410003fd..00000000000
--- a/lisp/toolbar/fld_open.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char *magick[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 4 1",
-"  c Gray0",
-". c #909090909090",
-"X c #fefefefefefe",
-"o c None",
-/* pixels */
-"oooooooooooooooooooooooo",
-"oooooooooooooooooooooooo",
-"oooooooooooooooooooooooo",
-"oooooooooooooooooooooooo",
-"oooooooooooooooooooooooo",
-"oooooooooooooo  oooooooo",
-"ooooooooooo   .. ooooooo",
-"oooo  oo   ....XXo   ooo",
-"ooo ..  ....XXXX  .. ooo",
-"ooo .....XXXXX  .... ooo",
-"oooo ..XXXXX  ...... ooo",
-"oooo ..XXX  ........ ooo",
-"ooooo .XX .......... ooo",
-"ooooo ..X .......... ooo",
-"oooooo .X .......... ooo",
-"oooooo .. ........  oooo",
-"ooooooo . ......  oooooo",
-"ooooooo . ..... oooooooo",
-"oooooooo  ...  ooooooooo",
-"oooooooo  .  ooooooooooo",
-"ooooooooo  ooooooooooooo",
-"oooooooooooooooooooooooo",
-"oooooooooooooooooooooooo",
-"oooooooooooooooooooooooo"
-};
diff --git a/lisp/toolbar/fwd_arrow.pbm b/lisp/toolbar/fwd_arrow.pbm
deleted file mode 100644
index e08e6fa35db..00000000000
--- a/lisp/toolbar/fwd_arrow.pbm
+++ /dev/null
diff --git a/lisp/toolbar/fwd_arrow.xpm b/lisp/toolbar/fwd_arrow.xpm
deleted file mode 100644
index 5e7c5602ea1..00000000000
--- a/lisp/toolbar/fwd_arrow.xpm
+++ /dev/null
@@ -1,70 +0,0 @@
-/* XPM */
-static char *fwd_arrow_xpm[] = {
-"24 24 43 1",
-"  c #000000",
-". c #53692A",
-"X c #59702D",
-"o c #657255",
-"O c #6D7A5B",
-"+ c #6D8839",
-"@ c #7C9B40",
-"# c #748261",
-"$ c #7F8E6B",
-"% c #818F71",
-"& c #879772",
-"* c #8C9A7F",
-"= c #85A24D",
-"- c #8BA859",
-"; c #92AD62",
-": c #95A77E",
-"> c #98AF74",
-", c #9BB572",
-"< c #919889",
-"1 c #92998C",
-"2 c #939A8D",
-"3 c #99A28F",
-"4 c #9BAA87",
-"5 c #9CAF84",
-"6 c #A4B690",
-"7 c #A8BCA6",
-"8 c #ADBDA0",
-"9 c #AFC394",
-"0 c #BAD09D",
-"q c #B5C3A9",
-"w c #BED2A3",
-"e c #BFD3A6",
-"r c #C2D5AA",
-"t c #C5D7AE",
-"y c #C8D9B2",
-"u c #CDDCBC",
-"i c #D1DFBE",
-"p c #D2E0BF",
-"a c #D3E0C1",
-"s c #D4E0C5",
-"d c #D5E1C6",
-"f c #FFFFFF",
-"g c None",
-"gggggggggggggggggggggggg",
-"gggggggggggggggggggggggg",
-"gggggggggggggggggggggggg",
-"ggggggggggggg gggggggggg",
-"ggggggggggggg  ggggggggg",
-"ggggggggggggg 2 gggggggg",
-"gggggggggg    02 ggggggg",
-"ggggggggg &6riw03 gggggg",
-"gggggggg 7suat000< ggggg",
-"ggggggg *saie000004 gggg",
-"gggggg  qs;@@@@@@X ggggg",
-"gggggg $y=@@@@@@. gggggg",
-"gggggg 6,@X   @. ggggggg",
-"gggggg 0@+  g X gggggggg",
-"gggggg 0@  gg  ggggggggg",
-"gggggg :- ggg gggggggggg",
-"gggggg o> gggggggggggggg",
-"ggggggg 9 gggggggggggggg",
-"ggggggg O5 ggggggggggggg",
-"gggggggg #& gggggggggggg",
-"ggggggggg  ggggggggggggg",
-"gggggggggggggggggggggggg",
-"gggggggggggggggggggggggg",
-"gggggggggggggggggggggggg"};
diff --git a/lisp/toolbar/gud-break.pbm b/lisp/toolbar/gud-break.pbm
deleted file mode 100644
index ff28ff8649f..00000000000
--- a/lisp/toolbar/gud-break.pbm
+++ /dev/null
diff --git a/lisp/toolbar/gud-break.xpm b/lisp/toolbar/gud-break.xpm
deleted file mode 100644
index 2ffc2748271..00000000000
--- a/lisp/toolbar/gud-break.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * stop_xpm[] = {
-"24 24 3 1",
-"       c None",
-".      c #F8F810104040",
-"X      c #F8F8FCFCF8F8",
-"                        ",
-"                        ",
-"       ..........       ",
-"      ............      ",
-"     ..............     ",
-"    ................    ",
-"   ..................   ",
-"  ..XX..XXX..XX..XXX..  ",
-"  .X..X..X..X..X.X..X.  ",
-"  .X.....X..X..X.X..X.  ",
-"  .X.....X..X..X.X..X.  ",
-"  ..X....X..X..X.X..X.  ",
-"  ...X...X..X..X.XXX..  ",
-"  ....X..X..X..X.X....  ",
-"  ....X..X..X..X.X....  ",
-"  .X..X..X..X..X.X....  ",
-"  ..XX...X...XX..X....  ",
-"   ..................   ",
-"    ................    ",
-"     ..............     ",
-"      ............      ",
-"       ..........       ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/gud-cont.pbm b/lisp/toolbar/gud-cont.pbm
deleted file mode 100644
index bc6dbead648..00000000000
--- a/lisp/toolbar/gud-cont.pbm
+++ /dev/null
diff --git a/lisp/toolbar/gud-cont.xpm b/lisp/toolbar/gud-cont.xpm
deleted file mode 100644
index 9da91af994f..00000000000
--- a/lisp/toolbar/gud-cont.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * continue_xpm[] = {
-"24 24 6 1",
-"       c None",
-".      c #cc0033",
-"X      c #d99faa",
-"o      c #616161",
-"O      c #2a1f55",
-"+      c #aa9faa",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"     .X                 ",
-"     X..X               ",
-"   .......  oO  Oo      ",
-"     X..X  oO+  +Oo     ",
-"     .X    OO    OO     ",
-"           OO    OO     ",
-"           OO    OO     ",
-"           Oo    oO     ",
-"          OO      OO    ",
-"           Oo    oO     ",
-"           OO    OO     ",
-"           OO    OO     ",
-"           OO    OO     ",
-"           oO+  +Oo     ",
-"            oO  Oo      ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/gud-down.pbm b/lisp/toolbar/gud-down.pbm
deleted file mode 100644
index c76dad2e04f..00000000000
--- a/lisp/toolbar/gud-down.pbm
+++ /dev/null
diff --git a/lisp/toolbar/gud-down.xpm b/lisp/toolbar/gud-down.xpm
deleted file mode 100644
index 30f3af89cce..00000000000
--- a/lisp/toolbar/gud-down.xpm
+++ /dev/null
@@ -1,41 +0,0 @@
-/* XPM */
-static char * down_xpm[] = {
-"24 24 14 1",
-"       c None",
-".      c #000000000000",
-"X      c #7F7F7F7F7F7F",
-"o      c #2D2D2D2D2D2D",
-"O      c #616161616161",
-"+      c #FFFFCCCC6666",
-"@      c #929255550000",
-"#      c #696969696969",
-"$      c #6D6DAAAAFFFF",
-"%      c #49495555AAAA",
-"&      c #333333339999",
-"*      c #434343434343",
-"=      c #6666FFFF6666",
-"-      c #4949AAAA5555",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                 .      ",
-"                 .      ",
-"                 .      ",
-"               . . .    ",
-"               X...X    ",
-"                ...     ",
-"     oooooooooooX.X     ",
-"     O+++++++++O .      ",
-"     .@@@@@@@@@.        ",
-"    ...............     ",
-"    #$%$$$$$$$$$%$#     ",
-"    o%&%%%%%%%%%&%o     ",
-"    ...............     ",
-"     *===========*      ",
-"     o-----------.      ",
-"     o............      ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/gud-finish.pbm b/lisp/toolbar/gud-finish.pbm
deleted file mode 100644
index 324245235c9..00000000000
--- a/lisp/toolbar/gud-finish.pbm
+++ /dev/null
diff --git a/lisp/toolbar/gud-finish.xpm b/lisp/toolbar/gud-finish.xpm
deleted file mode 100644
index 0310f07e8da..00000000000
--- a/lisp/toolbar/gud-finish.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * finish_xpm[] = {
-"24 24 7 1",
-"       c None",
-".      c #cc0033",
-"X      c #616161",
-"o      c #2a1f55",
-"O      c #adadad",
-"+      c #d40000",
-"@      c #cc9999",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"           .....        ",
-"          .     .       ",
-"         .       .      ",
-"      Xo . oX    .      ",
-"     XoO . OoX   .      ",
-"     oo  .  oo +@.@+    ",
-"     oo     oo @...@    ",
-"     oo     oo  ...     ",
-"     oX     Xo  @.@     ",
-"    oo       oo  .      ",
-"     oX     Xo          ",
-"     oo     oo          ",
-"     oo     oo          ",
-"     oo     oo          ",
-"     XoO   OoX          ",
-"      Xo   oX           ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/gud-n.pbm b/lisp/toolbar/gud-n.pbm
deleted file mode 100644
index dc2a15323e3..00000000000
--- a/lisp/toolbar/gud-n.pbm
+++ /dev/null
diff --git a/lisp/toolbar/gud-n.xpm b/lisp/toolbar/gud-n.xpm
deleted file mode 100644
index f0257da5cf0..00000000000
--- a/lisp/toolbar/gud-n.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * next_xpm[] = {
-"24 24 7 1",
-"       c None",
-".      c #cc0033",
-"X      c #616161",
-"o      c #2a1f55",
-"O      c #adadad",
-"+      c #d40000",
-"@      c #cc9999",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"      ..........        ",
-"     .          .       ",
-"    .            .      ",
-"    .  Xo  oX    .      ",
-"    . XoO  OoX   .      ",
-"    . oo    oo +@.@+    ",
-"      oo    oo @...@    ",
-"      oo    oo  ...     ",
-"      oX    Xo  @.@     ",
-"     oo      oo  .      ",
-"      oX    Xo          ",
-"      oo    oo          ",
-"      oo    oo          ",
-"      oo    oo          ",
-"      XoO  OoX          ",
-"       Xo  oX           ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/gud-ni.pbm b/lisp/toolbar/gud-ni.pbm
deleted file mode 100644
index ecad2965b0d..00000000000
--- a/lisp/toolbar/gud-ni.pbm
+++ /dev/null
diff --git a/lisp/toolbar/gud-ni.xpm b/lisp/toolbar/gud-ni.xpm
deleted file mode 100644
index bd4f02db12e..00000000000
--- a/lisp/toolbar/gud-ni.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * gud_nexti_xpm[] = {
-"24 24 6 1",
-"       c None",
-".      c #CCCC00003333",
-"X      c #616161616161",
-"o      c #D4D400000000",
-"O      c #CCCC99999999",
-"+      c #2A2A1F1F5555",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"      ..........        ",
-"     .          .       ",
-"    .            .      ",
-"    .            .      ",
-"    .            .      ",
-"    .   X  X   oO.Oo    ",
-"       X+  +X  O...O    ",
-"      X+    +X  ...     ",
-"     X+      +X O.O     ",
-"    X+        +X .      ",
-"    +X        X+        ",
-"     +X      X+         ",
-"      +X    X+          ",
-"       +X  X+           ",
-"        +  +            ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/gud-print.pbm b/lisp/toolbar/gud-print.pbm
deleted file mode 100644
index d6ab68f39ad..00000000000
--- a/lisp/toolbar/gud-print.pbm
+++ /dev/null
diff --git a/lisp/toolbar/gud-print.xpm b/lisp/toolbar/gud-print.xpm
deleted file mode 100644
index e1e7c623355..00000000000
--- a/lisp/toolbar/gud-print.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * print_xpm[] = {
-"24 24 2 1",
-"       c None",
-".      c #000000000000",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"         ... ...        ",
-"          ... ...       ",
-"          ..   ..       ",
-"          ..   ..       ",
-"          ..   ..       ",
-"          ..   ..       ",
-"          ..   ..       ",
-"          ... ..        ",
-"          .. ..         ",
-"          ..            ",
-"          ..            ",
-"          ..            ",
-"         ....           ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/gud-pstar.pbm b/lisp/toolbar/gud-pstar.pbm
deleted file mode 100644
index 1f5967107a0..00000000000
--- a/lisp/toolbar/gud-pstar.pbm
+++ /dev/null
diff --git a/lisp/toolbar/gud-pstar.xpm b/lisp/toolbar/gud-pstar.xpm
deleted file mode 100644
index 6edc603db14..00000000000
--- a/lisp/toolbar/gud-pstar.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * gud_pstar_xpm[] = {
-"24 24 2 1",
-"       c #BDBDBEBEBDBD",
-".      c #000000000000",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"         ... ...        ",
-"          ... ...       ",
-"          ..   ..   .   ",
-"          ..   .. . . . ",
-"          ..   ..  ...  ",
-"          ..   .. . . . ",
-"          ..   ..   .   ",
-"          ... ..        ",
-"          .. ..         ",
-"          ..            ",
-"          ..            ",
-"          ..            ",
-"         ....           ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/gud-remove.pbm b/lisp/toolbar/gud-remove.pbm
deleted file mode 100644
index 516bec1f785..00000000000
--- a/lisp/toolbar/gud-remove.pbm
+++ /dev/null
diff --git a/lisp/toolbar/gud-remove.xpm b/lisp/toolbar/gud-remove.xpm
deleted file mode 100644
index 5f38bd416ed..00000000000
--- a/lisp/toolbar/gud-remove.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * go_xpm[] = {
-"24 24 4 1",
-"       c None",
-".      c #000080800000",
-"X      c #FFFFFFFFFFFF",
-"o      c #F8F8FCFCF8F8",
-"                        ",
-"                        ",
-"       ..........       ",
-"      ............      ",
-"     ..............     ",
-"    ................    ",
-"   ..................   ",
-"  ......XX...oo.......  ",
-"  .....X..X.o..o......  ",
-"  .....X....o..o......  ",
-"  .....X....o..o......  ",
-"  .....X....o..o......  ",
-"  .....X.XX.o..o......  ",
-"  .....X..X.o..o......  ",
-"  .....X..X.o..o......  ",
-"  .....X..X.o..o......  ",
-"  ......XX...oo.......  ",
-"   ..................   ",
-"    ................    ",
-"     ..............     ",
-"      ............      ",
-"       ..........       ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/gud-run.pbm b/lisp/toolbar/gud-run.pbm
deleted file mode 100644
index 8bde32c3391..00000000000
--- a/lisp/toolbar/gud-run.pbm
+++ /dev/null
diff --git a/lisp/toolbar/gud-run.xpm b/lisp/toolbar/gud-run.xpm
deleted file mode 100644
index ef29662ed24..00000000000
--- a/lisp/toolbar/gud-run.xpm
+++ /dev/null
@@ -1,36 +0,0 @@
-/* XPM */
-static char * run_xpm[] = {
-"24 24 9 1",
-"       c None",
-".      c #000080",
-"X      c #aa9faa",
-"o      c #b5b9b5",
-"O      c #808080",
-"+      c #7f7f7f",
-"@      c #5a60a5",
-"#      c #9a999a",
-"$      c #616161",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"              ..        ",
-"             X..        ",
-"     oO+++++...@        ",
-"         @.....         ",
-"    oO+++......         ",
-"         .@.....        ",
-"     oO++@@......       ",
-"          ....@ ..      ",
-"      ..  .....@ @      ",
-"     @...@..@...        ",
-"     .#..... @..        ",
-"        @..  #..        ",
-"             ..@        ",
-"            +.@         ",
-"            ..$+        ",
-"            ....        ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/gud-s.pbm b/lisp/toolbar/gud-s.pbm
deleted file mode 100644
index de7caa50ed5..00000000000
--- a/lisp/toolbar/gud-s.pbm
+++ /dev/null
diff --git a/lisp/toolbar/gud-s.xpm b/lisp/toolbar/gud-s.xpm
deleted file mode 100644
index 4ee3eccaee2..00000000000
--- a/lisp/toolbar/gud-s.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * step_xpm[] = {
-"24 24 6 1",
-"       c None",
-".      c #d40000",
-"X      c #616161",
-"o      c #2a1f55",
-"O      c #adadad",
-"+      c #cc9999",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"      .....             ",
-"     .     .            ",
-"    .       .           ",
-"    .  Xo   .   oX      ",
-"    . XoO   .   OoX     ",
-"    . oo  .+.+.  oo     ",
-"      oo  +...+  oo     ",
-"      oo   ...   oo     ",
-"      oX   +.+   Xo     ",
-"     oo     .     oo    ",
-"      oX         Xo     ",
-"      oo         oo     ",
-"      oo         oo     ",
-"      oo         oo     ",
-"      XoO       OoX     ",
-"       Xo       oX      ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/gud-si.pbm b/lisp/toolbar/gud-si.pbm
deleted file mode 100644
index eed55cc4a33..00000000000
--- a/lisp/toolbar/gud-si.pbm
+++ /dev/null
diff --git a/lisp/toolbar/gud-si.xpm b/lisp/toolbar/gud-si.xpm
deleted file mode 100644
index b20eb6243f7..00000000000
--- a/lisp/toolbar/gud-si.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * gud_stepi_xpm[] = {
-"24 24 5 1",
-"       c None",
-".      c #D4D400000000",
-"X      c #616161616161",
-"o      c #2A2A1F1F5555",
-"O      c #CCCC99999999",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"      .....             ",
-"     .     .            ",
-"    .       .           ",
-"    .       .           ",
-"    .   X   .   X       ",
-"    .  Xo .O.O. oX      ",
-"      Xo  O...O  oX     ",
-"     Xo    ...    oX    ",
-"    Xo     O.O     oX   ",
-"    oX      .      Xo   ",
-"     oX           Xo    ",
-"      oX         Xo     ",
-"       oX       Xo      ",
-"        o       o       ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/gud-until.pbm b/lisp/toolbar/gud-until.pbm
deleted file mode 100644
index 096cacc6c17..00000000000
--- a/lisp/toolbar/gud-until.pbm
+++ /dev/null
diff --git a/lisp/toolbar/gud-until.xpm b/lisp/toolbar/gud-until.xpm
deleted file mode 100644
index f82da6700b2..00000000000
--- a/lisp/toolbar/gud-until.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * goto_xpm[] = {
-"24 24 6 1",
-"       c None",
-".      c #ff0000",
-"X      c #616161",
-"o      c #2a1f55",
-"O      c #adadad",
-"+      c #cc9999",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-" .                      ",
-" .                      ",
-" .          Xo   oX     ",
-" .         XoO   OoX    ",
-" .         oo     oo    ",
-" .         oo     oo    ",
-" .  .+     oo     oo    ",
-"  . +..+   oX     Xo    ",
-"   ...... oo       oo   ",
-"    +..+   oX     Xo    ",
-"    .+     oo     oo    ",
-"           oo     oo    ",
-"           oo     oo    ",
-"           XoO   OoX    ",
-"            Xo   oX     ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/gud-up.pbm b/lisp/toolbar/gud-up.pbm
deleted file mode 100644
index 585f488bac7..00000000000
--- a/lisp/toolbar/gud-up.pbm
+++ /dev/null
diff --git a/lisp/toolbar/gud-up.xpm b/lisp/toolbar/gud-up.xpm
deleted file mode 100644
index c2e4c9f8ff4..00000000000
--- a/lisp/toolbar/gud-up.xpm
+++ /dev/null
@@ -1,41 +0,0 @@
-/* XPM */
-static char * up_xpm[] = {
-"24 24 14 1",
-"       c None",
-".      c #000000000000",
-"X      c #7F7F7F7F7F7F",
-"o      c #2D2D2D2D2D2D",
-"O      c #616161616161",
-"+      c #FFFFCCCC6666",
-"@      c #929255550000",
-"#      c #696969696969",
-"$      c #6D6DAAAAFFFF",
-"%      c #49495555AAAA",
-"&      c #333333339999",
-"*      c #434343434343",
-"=      c #6666FFFF6666",
-"-      c #4949AAAA5555",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                 .      ",
-"                X.X     ",
-"                ...     ",
-"               X...X    ",
-"               . . .    ",
-"                 .      ",
-"     oooooooooo. .      ",
-"     O+++++++++O .      ",
-"     .@@@@@@@@@.        ",
-"    ...............     ",
-"    #$%$$$$$$$$$%$#     ",
-"    o%&%%%%%%%%%&%o     ",
-"    ...............     ",
-"     *===========*      ",
-"     o-----------.      ",
-"     o............      ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/gud-watch.pbm b/lisp/toolbar/gud-watch.pbm
deleted file mode 100644
index 223d4ebf8c7..00000000000
--- a/lisp/toolbar/gud-watch.pbm
+++ /dev/null
diff --git a/lisp/toolbar/gud-watch.xpm b/lisp/toolbar/gud-watch.xpm
deleted file mode 100644
index 52052212390..00000000000
--- a/lisp/toolbar/gud-watch.xpm
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * watch_xpm[] = {
-"24 24 11 1",
-"       c None",
-".      c #808080808080",
-"X      c #000000000000",
-"o      c #A5A59F9FA3A3",
-"O      c #B5B5B9B9B5B5",
-"+      c #070707070707",
-"@      c #616161616161",
-"#      c #2D2D30302D2D",
-"$      c #020202020202",
-"%      c #9A9A99999A9A",
-"&      c #2F2F1A1A0202",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"          .XX           ",
-"         oX. X Xo       ",
-"        O+@   X@#       ",
-"        #    X O$o      ",
-"       ##       @#      ",
-"      @+O       O$o     ",
-"     %XX&%   %&X&##     ",
-"    %#O O#%X%#O O#X     ",
-"    &O   O& &O   O&     ",
-"    X     X X     X     ",
-"    &O   O& &O   O&     ",
-"    %#O O#% %#O O#%     ",
-"     %&X&%   %&X&%      ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/help.pbm b/lisp/toolbar/help.pbm
deleted file mode 100644
index 2575f6f2613..00000000000
--- a/lisp/toolbar/help.pbm
+++ /dev/null
diff --git a/lisp/toolbar/help.xpm b/lisp/toolbar/help.xpm
deleted file mode 100644
index 1d65ce03b53..00000000000
--- a/lisp/toolbar/help.xpm
+++ /dev/null
@@ -1,271 +0,0 @@
-/* XPM */
-static char * help_xpm[] = {
-"24 24 244 2",
-"       c None",
-".      c #000000",
-"+      c #454442",
-"@      c #1D1D1C",
-"#      c #040404",
-"$      c #1B1B1B",
-"%      c #3D3C3A",
-"&      c #4D4C4B",
-"*      c #2F2F2D",
-"=      c #C1BFBB",
-"-      c #ECEAE7",
-";      c #F5F3F0",
-">      c #F2F0EC",
-",      c #E1DFDC",
-"'      c #AFADAA",
-")      c #272726",
-"!      c #020202",
-"~      c #3F3E3E",
-"{      c #36302D",
-"]      c #181818",
-"^      c #FBF8F5",
-"/      c #FEFCF8",
-"(      c #FAF8F5",
-"_      c #F5F4F1",
-":      c #F2F1ED",
-"<      c #F1EFEB",
-"[      c #F1EEEB",
-"}      c #EAE9E6",
-"|      c #DAD8D4",
-"1      c #100E0E",
-"2      c #1F100E",
-"3      c #AF3A1E",
-"4      c #FBAB93",
-"5      c #FAE9E3",
-"6      c #F0EFEB",
-"7      c #E9E8E5",
-"8      c #EAE8E6",
-"9      c #ECEAE8",
-"0      c #EDEBE9",
-"a      c #EDEBE8",
-"b      c #EACFC6",
-"c      c #D5340A",
-"d      c #751904",
-"e      c #100806",
-"f      c #34160D",
-"g      c #AF3C20",
-"h      c #FCCCBD",
-"i      c #F7BEAD",
-"j      c #E67554",
-"k      c #DFDDDB",
-"l      c #DBD9D6",
-"m      c #D8D7D3",
-"n      c #DBDAD6",
-"o      c #E3E2DE",
-"p      c #ECEBE8",
-"q      c #E5572D",
-"r      c #E33A0B",
-"s      c #D4340A",
-"t      c #691504",
-"u      c #100504",
-"v      c #582C22",
-"w      c #0F0F0F",
-"x      c #FDD4C8",
-"y      c #F7BFAF",
-"z      c #E87554",
-"A      c #D5512B",
-"B      c #C68270",
-"C      c #BEBDBA",
-"D      c #A5A3A0",
-"E      c #9C9A95",
-"F      c #B9B7B2",
-"G      c #D7D6D2",
-"H      c #E7E5E2",
-"I      c #E79A85",
-"J      c #E53C0B",
-"K      c #E43C0B",
-"L      c #E23A0B",
-"M      c #C93009",
-"N      c #010000",
-"O      c #040100",
-"P      c #FAB19C",
-"Q      c #FACCBE",
-"R      c #EB8264",
-"S      c #D8532D",
-"T      c #C0340F",
-"U      c #932006",
-"V      c #141412",
-"W      c #857974",
-"X      c #DA370B",
-"Y      c #EC7C5B",
-"Z      c #E95B32",
-"`      c #DE380B",
-" .     c #9D2306",
-"..     c #626261",
-"+.     c #FEF1ED",
-"@.     c #F09479",
-"#.     c #DC532B",
-"$.     c #C0350F",
-"%.     c #942006",
-"&.     c #621404",
-"*.     c #E2522B",
-"=.     c #F2A690",
-"-.     c #E74E21",
-";.     c #E23B0B",
-">.     c #C99181",
-",.     c #454342",
-"'.     c #E5E4E2",
-").     c #FCFBFA",
-"!.     c #E2D8D3",
-"~.     c #C34C2A",
-"{.     c #B02B07",
-"].     c #9E2D12",
-"^.     c #EF8D71",
-"/.     c #F09B83",
-"(.     c #EADDD7",
-"_.     c #272724",
-":.     c #F0EEEC",
-"<.     c #F3F2EF",
-"[.     c #D7D6D3",
-"}.     c #BFBEBB",
-"|.     c #9E6153",
-"1.     c #3F0D02",
-"2.     c #F0B9A9",
-"3.     c #F6F5F4",
-"4.     c #E8E7E4",
-"5.     c #DAD8D5",
-"6.     c #585652",
-"7.     c #F6F4F0",
-"8.     c #DAD8D6",
-"9.     c #C2C1BE",
-"0.     c #989691",
-"a.     c #0A0A08",
-"b.     c #F6F4F2",
-"c.     c #F4F3F1",
-"d.     c #E4E3E0",
-"e.     c #D3D2CE",
-"f.     c #63625D",
-"g.     c #DCDAD8",
-"h.     c #C7C6C2",
-"i.     c #ABAAA5",
-"j.     c #0A0A0A",
-"k.     c #FAF8F6",
-"l.     c #EFEDEA",
-"m.     c #DDDCD8",
-"n.     c #C6C4C2",
-"o.     c #3E3E39",
-"p.     c #1B1B19",
-"q.     c #F0EEEA",
-"r.     c #E0DFDD",
-"s.     c #CCCBC9",
-"t.     c #C0BFBB",
-"u.     c #131311",
-"v.     c #676663",
-"w.     c #FCFAF8",
-"x.     c #D6D4D2",
-"y.     c #BCBAB7",
-"z.     c #3C3C3A",
-"A.     c #DEDCD9",
-"B.     c #7E4B3E",
-"C.     c #232323",
-"D.     c #CC9385",
-"E.     c #FAFAF7",
-"F.     c #E6E6E2",
-"G.     c #CDCCCA",
-"H.     c #B0B0AC",
-"I.     c #EDE3DF",
-"J.     c #E78468",
-"K.     c #DF5D3A",
-"L.     c #631909",
-"M.     c #282828",
-"N.     c #B46E5E",
-"O.     c #FCC3B2",
-"P.     c #F1A691",
-"Q.     c #DCD2CC",
-"R.     c #C8C6C3",
-"S.     c #7E7C78",
-"T.     c #E8AD9C",
-"U.     c #E96139",
-"V.     c #EB7452",
-"W.     c #EF8E72",
-"X.     c #EA8063",
-"Y.     c #9E2E13",
-"Z.     c #3F1811",
-"`.     c #121212",
-" +     c #6B433B",
-".+     c #E0A191",
-"++     c #FDD3C7",
-"@+     c #F4AD98",
-"#+     c #DE532B",
-"$+     c #C83409",
-"%+     c #B48274",
-"&+     c #383534",
-"*+     c #D6340A",
-"=+     c #E43D0F",
-"-+     c #E8582E",
-";+     c #ED7957",
-">+     c #F4B6A4",
-",+     c #F4B09D",
-"'+     c #F0E5E0",
-")+     c #F4F3EF",
-"!+     c #FDF8F6",
-"~+     c #FBCEC1",
-"{+     c #F28B6E",
-"]+     c #E44E23",
-"^+     c #D3370A",
-"/+     c #BF2F09",
-"(+     c #260800",
-"_+     c #190F0B",
-":+     c #D5350A",
-"<+     c #E43D0C",
-"[+     c #E74C1F",
-"}+     c #EFBBAB",
-"|+     c #F5F4F3",
-"1+     c #F5F3F1",
-"2+     c #EAB1A0",
-"3+     c #DE4316",
-"4+     c #C5310A",
-"5+     c #591202",
-"6+     c #0E0504",
-"7+     c #C83009",
-"8+     c #E0532B",
-"9+     c #E7E6E3",
-"0+     c #E7E6E2",
-"a+     c #DDDCD9",
-"b+     c #CFCECA",
-"c+     c #C14724",
-"d+     c #AE2907",
-"e+     c #290800",
-"f+     c #0F0705",
-"g+     c #9B2205",
-"h+     c #C1A89F",
-"i+     c #D1D0CC",
-"j+     c #CFCDCA",
-"k+     c #C7C6C3",
-"l+     c #BBBAB7",
-"m+     c #B5B4B1",
-"n+     c #A7A6A2",
-"o+     c #66564F",
-"p+     c #0B0908",
-"q+     c #010100",
-"r+     c #222221",
-"s+     c #51504B",
-"t+     c #5D5C57",
-"u+     c #3B3B37",
-"    . .         + @ # # $ %                     ",
-"  . . . . & # * = - ; > , ' ) ! ~ . . . .       ",
-". .     { ] ^ / ( _ : > < [ } | . 1     . .     ",
-"  .   2 3 4 5 6 - 7 8 9 0 0 a b c d e     .     ",
-"  . f g h i j k l m n o } p a q r s t u . .     ",
-"  v w x y z A B C D E F G H I J K L M . N       ",
-"  O P Q R S T U . . . . V W X Y Z K `  ..       ",
-"  ..+.@.#.$.%.. .         . &.*.=.-.;.>.! .     ",
-",.'.).!.~.{.. .             . ].^./.(.n _..     ",
-"@ :.<.[.}.|..                 1.2.3.4.5.6..     ",
-"# 7.6 8.9.0..                 a.b.c.d.e.f..     ",
-"# > < g.h.i..                 j.k.l.m.n.o..     ",
-"p., q.r.s.t.u.                v.w.9 x.y.. .     ",
-"z.' [ 7 A.[.B..             C.D.E.F.G.H.. .     ",
-"  ) } 0 I.J.K.L..         M.N.O.P.Q.R.S.. .     ",
-"  ! | T.U.V.W.X.Y.Z.a.`. +.+++@+#+$+%+. .       ",
-"  &+. *+=+-+;+>+,+'+)+k.!+~+{+]+^+/+(+. .       ",
-"  . _+d :+L <+[+}+|+l.1+|+2+3+^+4+5+. . .       ",
-"  .   6+t 7+` 8+9+0+o a+[.b+c+d+e+. .   .       ",
-"  .     f+. g+h+i+j+k+l+m+n+o+. . .     .       ",
-"    . . . p+. q+r+s+t+u+. . . . .     . .       ",
-"              . . . . . . . .   . . . .         ",
-"                                                ",
-"                                                "};
diff --git a/lisp/toolbar/home.pbm b/lisp/toolbar/home.pbm
deleted file mode 100644
index 5be84460652..00000000000
--- a/lisp/toolbar/home.pbm
+++ /dev/null
diff --git a/lisp/toolbar/home.xpm b/lisp/toolbar/home.xpm
deleted file mode 100644
index 57e8f9cc25a..00000000000
--- a/lisp/toolbar/home.xpm
+++ /dev/null
@@ -1,128 +0,0 @@
-/* XPM */
-static char * home_xpm[] = {
-"24 24 101 2",
-"       c None",
-".      c #000000",
-"+      c #212121",
-"@      c #2C2C2C",
-"#      c #C1665A",
-"$      c #924B37",
-"%      c #2A2A2A",
-"&      c #333333",
-"*      c #343434",
-"=      c #242424",
-"-      c #944D3A",
-";      c #A05443",
-">      c #181818",
-",      c #474747",
-"'      c #555555",
-")      c #8D8D8D",
-"!      c #383838",
-"~      c #191919",
-"{      c #974F3C",
-"]      c #222222",
-"^      c #313131",
-"/      c #A1A1A1",
-"(      c #676767",
-"_      c #ACACAC",
-":      c #BCBCBC",
-"<      c #585858",
-"[      c #141414",
-"}      c #1C1C1C",
-"|      c #464646",
-"1      c #666666",
-"2      c #BABABA",
-"3      c #7E7E7E",
-"4      c #D2D2D2",
-"5      c #FFFFFF",
-"6      c #4F4F4F",
-"7      c #262626",
-"8      c #232323",
-"9      c #505050",
-"0      c #B2B2B2",
-"a      c #909090",
-"b      c #9A9A9A",
-"c      c #838383",
-"d      c #171717",
-"e      c #202020",
-"f      c #717171",
-"g      c #A6A6A6",
-"h      c #616161",
-"i      c #1D1D1D",
-"j      c #1F1F1F",
-"k      c #C4C4C4",
-"l      c #CACACA",
-"m      c #AEAEAE",
-"n      c #D1D1D1",
-"o      c #7C7C7C",
-"p      c #BFBFBF",
-"q      c #6C6C6C",
-"r      c #EEEEEE",
-"s      c #949494",
-"t      c #C7C7C7",
-"u      c #EBEBEB",
-"v      c #7D7D7D",
-"w      c #6E6E6E",
-"x      c #A9A9A9",
-"y      c #E99E8F",
-"z      c #DD806D",
-"A      c #9B5343",
-"B      c #CECECE",
-"C      c #626262",
-"D      c #858585",
-"E      c #ECA292",
-"F      c #D0533A",
-"G      c #934F3E",
-"H      c #6D6D6D",
-"I      c #ECA291",
-"J      c #CF543C",
-"K      c #371D16",
-"L      c #5D5D5D",
-"M      c #868686",
-"N      c #787878",
-"O      c #ECA696",
-"P      c #C95C49",
-"Q      c #E17C66",
-"R      c #924E3D",
-"S      c #888888",
-"T      c #A0A0A0",
-"U      c #3D1208",
-"V      c #D15137",
-"W      c #919191",
-"X      c #879981",
-"Y      c #82947C",
-"Z      c #8A9B85",
-"`      c #6E8467",
-" .     c #5D7555",
-"..     c #4C6042",
-"+.     c #3F4F37",
-"@.     c #303D2A",
-"#.     c #7F8F7A",
-"$.     c #64785E",
-"%.     c #44563E",
-"&.     c #657460",
-"*.     c #40503A",
-"                                                ",
-"                      . .                       ",
-"          . . . .   . + @ .                     ",
-"          . # $ . . % & * = .                   ",
-"          . - ; . > , ' ) ! ~ .                 ",
-"          . { . ] ^ / ( _ : < [ .               ",
-"          . . } | 1 2 3 4 : 5 6 7 .             ",
-"          . 8 9 0 a 4 b 5 : 5 : c d .           ",
-"        . e f g 4 b 5 : 5 : 5 : 5 h i .         ",
-"      . j k k l 5 m 5 2 5 2 5 : 5 n o } .       ",
-"    . 8 m p p p p p p p p . . . . . a q = .     ",
-"  . . . . r 5 5 5 5 5 5 5 . s t u . v . . . .   ",
-"        . 4 5 . . . . . 5 . : 5 5 . w .         ",
-"        . x 5 . y z A . 5 . B 5 5 . C .         ",
-"        . D 5 . E F G . 5 . . . . . H .         ",
-"        . . 5 . I J K . k s L L M N . .         ",
-"        . . r . O P G . 5 5 5 5 5 2 .           ",
-"          . 2 . Q # R . : : : : : S .           ",
-"          . T U V # A . 5 5 5 5 5 W .           ",
-"  . . . . . . . . . . . . . . . . . . . .   .   ",
-"        } X Y Z X `  ...+.@.. Y #.$.%.&.*..     ",
-"    . .   . . . . . . . . .   . . . . . .       ",
-"                . . .                           ",
-"                                                "};
diff --git a/lisp/toolbar/index.pbm b/lisp/toolbar/index.pbm
deleted file mode 100644
index d8aa08a7e53..00000000000
--- a/lisp/toolbar/index.pbm
+++ /dev/null
diff --git a/lisp/toolbar/index.xpm b/lisp/toolbar/index.xpm
deleted file mode 100644
index 7e1de12121b..00000000000
--- a/lisp/toolbar/index.xpm
+++ /dev/null
@@ -1,201 +0,0 @@
-/* XPM */
-static char * index_xpm[] = {
-"24 24 174 2",
-"       c None",
-".      c #000000",
-"+      c #FDFDFD",
-"@      c #F5F5F5",
-"#      c #F6F6F6",
-"$      c #D0D0D0",
-"%      c #C1C1C1",
-"&      c #C3C3C3",
-"*      c #C6C6C6",
-"=      c #C8C8C8",
-"-      c #8D8D8D",
-";      c #CACACA",
-">      c #919191",
-",      c #EFEFEF",
-"'      c #878787",
-")      c #8A8A8A",
-"!      c #5C5C5C",
-"~      c #F8F8F8",
-"{      c #EAEAEA",
-"]      c #CCCCCC",
-"^      c #CECECE",
-"/      c #979797",
-"(      c #CDCDCD",
-"_      c #A1A1A1",
-":      c #090600",
-"<      c #A3A3A3",
-"[      c #C5C5C5",
-"}      c #C4C4C4",
-"|      c #D1D1D1",
-"1      c #D2D2D1",
-"2      c #D2D2D2",
-"3      c #9A9A9A",
-"4      c #E8E8E8",
-"5      c #949494",
-"6      c #939393",
-"7      c #574F4F",
-"8      c #FDFDFC",
-"9      c #777777",
-"0      c #7E7E7E",
-"a      c #9D9D9D",
-"b      c #6B6B6B",
-"c      c #F1F1F1",
-"d      c #ECECEC",
-"e      c #CFCFCF",
-"f      c #575050",
-"g      c #FDFAF8",
-"h      c #A5A5A5",
-"i      c #B9B9B9",
-"j      c #EEEEEE",
-"k      c #EDEDED",
-"l      c #D5D5D5",
-"m      c #BABABA",
-"n      c #6D6767",
-"o      c #F9F1EA",
-"p      c #9E9E9E",
-"q      c #B5B5B5",
-"r      c #D9D9D9",
-"s      c #D7D7D7",
-"t      c #BCBCBC",
-"u      c #625C5B",
-"v      c #F9EEE4",
-"w      c #4F4D4A",
-"x      c #646464",
-"y      c #747474",
-"z      c #D6D6D5",
-"A      c #DFDFDF",
-"B      c #A0A0A0",
-"C      c #615C5B",
-"D      c #F9F0E4",
-"E      c #746C67",
-"F      c #FEFDFC",
-"G      c #FFFEFD",
-"H      c #131210",
-"I      c #636363",
-"J      c #7C7C7C",
-"K      c #F3F2F2",
-"L      c #98948F",
-"M      c #F9EFE3",
-"N      c #A09489",
-"O      c #FEFDFD",
-"P      c #766D68",
-"Q      c #736961",
-"R      c #A3A3A2",
-"S      c #A6A6A6",
-"T      c #DBDBDB",
-"U      c #C7C7C7",
-"V      c #E8E5E2",
-"W      c #97938E",
-"X      c #F6E9D8",
-"Y      c #84817A",
-"Z      c #FBF3EA",
-"`      c #908C86",
-" .     c #F1EDE7",
-"..     c #7B7975",
-"+.     c #878786",
-"@.     c #070000",
-"#.     c #FAFAFA",
-"$.     c #DDDDDD",
-"%.     c #E2DFDC",
-"&.     c #A8A199",
-"*.     c #F0E0CE",
-"=.     c #C8BFB4",
-"-.     c #D5CCBF",
-";.     c #DFD7CD",
-">.     c #DAD3C9",
-",.     c #DDCFC4",
-"'.     c #928C84",
-").     c #A8A8A8",
-"!.     c #959595",
-"~.     c #040000",
-"{.     c #D9D5D2",
-"].     c #D9CABB",
-"^.     c #D7C8B8",
-"/.     c #DECFBF",
-"(.     c #D8C9B9",
-"_.     c #E3D3C2",
-":.     c #C9BBAC",
-"<.     c #D9CEC2",
-"[.     c #7F766D",
-"}.     c #909090",
-"|.     c #D3D3D3",
-"1.     c #060100",
-"2.     c #C0BDBA",
-"3.     c #8C8782",
-"4.     c #C2B5A7",
-"5.     c #BFB4A6",
-"6.     c #B8AB9D",
-"7.     c #BAAD9E",
-"8.     c #BEB0A2",
-"9.     c #948A7F",
-"0.     c #716860",
-"a.     c #E2E2E2",
-"b.     c #A9A9A8",
-"c.     c #332C2B",
-"d.     c #5D5954",
-"e.     c #79736C",
-"f.     c #958C80",
-"g.     c #8D8379",
-"h.     c #988D82",
-"i.     c #706760",
-"j.     c #787878",
-"k.     c #E4E4E4",
-"l.     c #C2C2C2",
-"m.     c #201A1A",
-"n.     c #57514F",
-"o.     c #625C59",
-"p.     c #625A53",
-"q.     c #6B625A",
-"r.     c #585251",
-"s.     c #696764",
-"t.     c #080000",
-"u.     c #989898",
-"v.     c #B0B0B0",
-"w.     c #AFAFAF",
-"x.     c #999999",
-"y.     c #9D9897",
-"z.     c #050000",
-"A.     c #0C0303",
-"B.     c #080100",
-"C.     c #030000",
-"D.     c #282523",
-"E.     c #5A5A5A",
-"F.     c #868686",
-"G.     c #ECE4E2",
-"H.     c #DED7D5",
-"I.     c #D8D1D0",
-"J.     c #E0DBD7",
-"K.     c #E9E6E3",
-"L.     c #FCFBFA",
-"M.     c #030500",
-"N.     c #0B0505",
-"O.     c #14100F",
-"P.     c #090806",
-"Q.     c #000100",
-"                                                ",
-"    . . . . . . . . . . . . . . . . . . . .     ",
-"    . + @ @ @ @ @ @ @ # # # # # # # # # $ .     ",
-"    . @ % % % & & & & * * * * * = = = = - .     ",
-"    . # & & & * * * * = = = = = ; ; ; ; > .     ",
-"    . , ' ' ' ) ) ) ) - - - - - > > > > ! .     ",
-"    . ~ { { { { { { { { { { { { { { { { ; .     ",
-"    . # ; ; ; ] ] ] ] ] ^ ^ ^ ^ $ $ $ $ / .     ",
-"    . # ] ] ] ( ^ ^ ^ _ : < [ } | 1 | 2 3 .     ",
-"    . 4 5 5 5 / / / 6 7 8 . 9 0 - a a a b .     ",
-"    . ~ c d d d d d e f g . h i $ j j k * .     ",
-"    . ~ 2 2 2 2 l l m n o . > p q r r r < .     ",
-"    . ~ l l l l s s t u v w . x . y p z < .     ",
-"    . A B B B B < 9 . C D E F . G H . I J .     ",
-"    . ~ @ , , , j . K L M N O P F Q R . S .     ",
-"    . ~ T T T T U . V W X Y Z `  ...+.@.< .     ",
-"    . #.$.$.$.$.& . %.&.*.=.-.;.>.,.'.@.p .     ",
-"    . { ).).).).!.~.{.].^./.(._.:.<.[.@.}..     ",
-"    . #.@ c c c |.1.2.3.4.5.6.7.8.9.0.@.] .     ",
-"    . #.a.a.a.a.l b.c.d.e.f.g.9.h.i.. j.q .     ",
-"    . #.a.a.a.a.k.l.j.m.n.o.p.q.r.s.t.u.q .     ",
-"    . a.v.v.v.v.v.w.x.y.z.A.t.B.C.D.E.F.m .     ",
-"    . . . . . . . . . ~.G.H.I.J.K.L.M.. . .     ",
-"                      ~.N.z.O.C.P.. Q.          "};
diff --git a/lisp/toolbar/info.pbm b/lisp/toolbar/info.pbm
deleted file mode 100644
index 68bae42965b..00000000000
--- a/lisp/toolbar/info.pbm
+++ /dev/null
diff --git a/lisp/toolbar/info.xpm b/lisp/toolbar/info.xpm
deleted file mode 100644
index bca0bf8e4fc..00000000000
--- a/lisp/toolbar/info.xpm
+++ /dev/null
@@ -1,36 +0,0 @@
-/* XPM */
-static char *magick[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 6 1",
-"  c Gray0",
-". c #65658b8b5e5e",
-"X c #934ab2448dfb",
-"o c #b35dc8c8afaf",
-"O c #e0b2e944df83",
-"+ c None",
-/* pixels */
-"++++++++++++++++++++++++",
-"++++++++++++++++++++++++",
-"++++++++++++++++++++++++",
-"++++++++++++++++++++++++",
-"+++++++++     ++++++++++",
-"++++++++ oOOOO +++++++++",
-"+++++++ OOOOOOO ++++++++",
-"++++++ oOo   oOo +++++++",
-"+++++++ O +++ OO +++++++",
-"+++++++O ++++ Oo +++++++",
-"++++++++++++ OO. +++++++",
-"+++++++++++ OOX ++++++++",
-"++++++++++ OOX +++++++++",
-"+++++++++ XOX ++++++++++",
-"+++++++++ OX +++++++++++",
-"+++++++++    +++++++++++",
-"++++++++++++++++++++++++",
-"++++++++++  ++++++++++++",
-"+++++++++ Oo +++++++++++",
-"+++++++++ oX +++++++++++",
-"++++++++++  ++++++++++++",
-"++++++++++++++++++++++++",
-"++++++++++++++++++++++++",
-"++++++++++++++++++++++++"
-};
diff --git a/lisp/toolbar/jump_to.pbm b/lisp/toolbar/jump_to.pbm
deleted file mode 100644
index 5f5921baf57..00000000000
--- a/lisp/toolbar/jump_to.pbm
+++ /dev/null
diff --git a/lisp/toolbar/jump_to.xpm b/lisp/toolbar/jump_to.xpm
deleted file mode 100644
index 8f9897974ab..00000000000
--- a/lisp/toolbar/jump_to.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * jump_to_xpm[] = {
-"24 24 144 2",
-"       c None",
-".      c #000000",
-"+      c #9ABC82",
-"@      c #C1E3AA",
-"#      c #A0C487",
-"$      c #8F6508",
-"%      c #AD671D",
-"&      c #D6AF41",
-"*      c #E1B744",
-"=      c #B86F20",
-"-      c #7E5907",
-";      c #D8E7CD",
-">      c #D9E7CF",
-",      c #DDEAD2",
-"'      c #E4EFDA",
-")      c #EBF6DF",
-"!      c #C8EBB0",
-"~      c #A2C688",
-"{      c #986F26",
-"]      c #E2B946",
-"^      c #EFCD64",
-"/      c #F4D268",
-"(      c #F6D469",
-"_      c #E7C24A",
-":      c #D5B044",
-"<      c #BC8C31",
-"[      c #1A0700",
-"}      c #D7E6CD",
-"|      c #B2D29C",
-"1      c #B6D69F",
-"2      c #BDDEA5",
-"3      c #C4E7AC",
-"4      c #CAEEB1",
-"5      c #A1C387",
-"6      c #CBB86E",
-"7      c #EDD97E",
-"8      c #FEE882",
-"9      c #FEE77E",
-"0      c #FDDF60",
-"a      c #FBD14F",
-"b      c #E4BF49",
-"c      c #BB8C31",
-"d      c #CFE2C3",
-"e      c #B2D19C",
-"f      c #B5D59F",
-"g      c #BBDBA4",
-"h      c #C1E3A9",
-"i      c #C6E9AE",
-"j      c #C3E6AB",
-"k      c #A9CE8D",
-"l      c #DCBA5C",
-"m      c #FBE46B",
-"n      c #FFEB64",
-"o      c #FFE054",
-"p      c #FED952",
-"q      c #F8CF4E",
-"r      c #C4A13E",
-"s      c #8BA27B",
-"t      c #618249",
-"u      c #628349",
-"v      c #64864B",
-"w      c #66894D",
-"x      c #688B4E",
-"y      c #678B4D",
-"z      c #6B9251",
-"A      c #719755",
-"B      c #55833A",
-"C      c #ECC75E",
-"D      c #FFED59",
-"E      c #FFE757",
-"F      c #FFDF54",
-"G      c #FBD44F",
-"H      c #E1BD48",
-"I      c #B36C1F",
-"J      c #608148",
-"K      c #628449",
-"L      c #63854A",
-"M      c #65894C",
-"N      c #6C9151",
-"O      c #527E39",
-"P      c #B39237",
-"Q      c #F0C248",
-"R      c #FFF25B",
-"S      c #FFEB58",
-"T      c #FFE155",
-"U      c #FBD450",
-"V      c #E3BD49",
-"W      c #BC983B",
-"X      c #618349",
-"Y      c #628549",
-"Z      c #65884B",
-"`      c #4D7735",
-" .     c #907934",
-"..     c #DCB444",
-"+.     c #FCDB52",
-"@.     c #FFEF5A",
-"#.     c #FFE957",
-"$.     c #FEDF54",
-"%.     c #F9D24F",
-"&.     c #E0BA48",
-"*.     c #B08F37",
-"=.     c #52743B",
-"-.     c #456A2F",
-";.     c #608248",
-">.     c #628448",
-",.     c #476F31",
-"'.     c #7F6B32",
-").     c #D0AF4B",
-"!.     c #F5CF4E",
-"~.     c #FFE255",
-"{.     c #FEDA52",
-"].     c #EAC54B",
-"^.     c #D0AC42",
-"/.     c #9C5D1A",
-"(.     c #5A7B42",
-"_.     c #456C2F",
-":.     c #6F5C23",
-"<.     c #A78833",
-"[.     c #F0C54A",
-"}.     c #FFDA52",
-"|.     c #FFDE53",
-"1.     c #C39032",
-"2.     c #886423",
-"3.     c #BC9D3B",
-"4.     c #F0C84E",
-"5.     c #FFD551",
-"6.     c #FED751",
-"7.     c #FDD550",
-"8.     c #EDC74C",
-"9.     c #E5BF49",
-"0.     c #CCA941",
-"a.     c #AB7727",
-"b.     c #B1822D",
-"c.     c #DCB746",
-"d.     c #DFBA47",
-"e.     c #EDC64C",
-"f.     c #E9C34B",
-"g.     c #D6B144",
-"h.     c #C19D3D",
-"i.     c #AB7C2B",
-"j.     c #BC7222",
-"k.     c #BB983B",
-"l.     c #B09638",
-"m.     c #A2621B",
-"                                                ",
-"                                                ",
-"            .                                   ",
-"            . .                                 ",
-"            . + .       . . . . . .             ",
-"  . . . . . . @ # .   . $ % & * = - . .         ",
-"  . ; > , ' ) ! ! ~ . { ] ^ / ( _ : < [ .       ",
-"  . } | 1 2 3 4 4 3 5 . 6 7 8 9 0 a b c .       ",
-"  . d e f g h i i h j k . l m n o p q r - .     ",
-"  . s t u v w x x y z A B . C D E F G H I .     ",
-"  . s J t K L v v M N O . P Q R S T U V W .     ",
-"  . s J J t X u Y Z ` .  ...+.@.#.$.%.&.*..     ",
-"  . =.-.-.-.-.;.>.,.. '.).!.E E ~.{.].^./..     ",
-"  . . . . . . (._.. :.<.[.}.|.|.{.%.V 1.$ .     ",
-"            . -.. . 2.3.4.5.6.7.8.9.0.a..       ",
-"            . .   . . b.c.d.e.f.g.h.i.. .       ",
-"            .         . $ j.k.l.m.$ . .         ",
-"                        . . . . . .             ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "};
diff --git a/lisp/toolbar/lc-back_arrow.xpm b/lisp/toolbar/lc-back_arrow.xpm
deleted file mode 100644
index 05a797c7a65..00000000000
--- a/lisp/toolbar/lc-back_arrow.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char *back_arrow_xpm[] = {
-"24 24 6 1",
-"  c #000000",
-". c #000100",
-"X c #6B6B66",
-"o c #87AF85",
-"O c #FFFFFF",
-"+ c None",
-"++++++++++++++++++++++++",
-"++++++++++++++++++++++++",
-"++++++++++++++++++++++++",
-"++++++++++ +++++++++++++",
-"+++++++++ .+++++++++++++",
-"++++++++ O.+++++++++++++",
-"+++++++ Oo .  ++++++++++",
-"++++++ Ooooooo +++++++++",
-"+++++ Ooooooooo ++++++++",
-"++++ ooooooooooo.+++++++",
-"+++++ oooooooooo..++++++",
-"++++++.oooooooooo.++++++",
-"+++++++.oo.. oooo.++++++",
-"++++++++.o.+  ooo.++++++",
-"+++++++++..++..oo.++++++",
-"++++++++++.+++.oo.++++++",
-"++++++++++++++.oo.++++++",
-"++++++++++++++.o.+++++++",
-"+++++++++++++.oX.+++++++",
-"++++++++++++.oo.++++++++",
-"+++++++++++++..+++++++++",
-"++++++++++++++++++++++++",
-"++++++++++++++++++++++++",
-"++++++++++++++++++++++++"};
diff --git a/lisp/toolbar/lc-copy.xpm b/lisp/toolbar/lc-copy.xpm
deleted file mode 100644
index f50fb51baf5..00000000000
--- a/lisp/toolbar/lc-copy.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * copy2_xpm[] = {
-"24 24 6 1",
-"       c None",
-".      c #FFFFFF",
-"+      c #000100",
-"@      c #6B6B66",
-"#      c #BBBDBA",
-"$      c #504D46",
-"                        ",
-" +++++++++++++          ",
-" +#..........#+         ",
-" +............+         ",
-" +.#@@@.#@.@#.+         ",
-" +............+         ",
-" +.@$.@@#.++++++++++++  ",
-" +.......+#..........#+ ",
-" +.#@@.@@+............+ ",
-" +.......+.#@@#.#@.@#.+ ",
-" +.@$$.@@+............+ ",
-" +.......+.@@.@@#.#@..+ ",
-" +.#@@.@@+............+ ",
-" +.......+.#@@.@@#.#@.+ ",
-" +#......+............+ ",
-"  ++++++++.@@@.@@#.#@.+ ",
-"         +............+ ",
-"         +.#@@.@@#.#@.+ ",
-"         +............+ ",
-"         +#..........#+ ",
-"         ++++++++++++++ ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/lc-cut.xpm b/lisp/toolbar/lc-cut.xpm
deleted file mode 100644
index 750ec729f60..00000000000
--- a/lisp/toolbar/lc-cut.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * cut2_xpm[] = {
-"24 24 7 1",
-"       c None",
-".      c #000100",
-"+      c #BBBDBA",
-"@      c #FFFFFF",
-"#      c #6B6B66",
-"$      c #504D46",
-"%      c #3E4850",
-"                        ",
-"                        ",
-"      .        .        ",
-"      .        .        ",
-"     .+.      .@.       ",
-"     .@$      #@.       ",
-"     .@#.    .@+.       ",
-"     .@+$    #@+.       ",
-"      #@#.  .@+$        ",
-"      .@+$  $@+.        ",
-"       #@#.%@+#         ",
-"       .@+$#++.         ",
-"        .@+$+.          ",
-"         .++..          ",
-"         ..#$.          ",
-"     .............      ",
-"     . ...  ... ...     ",
-"    ..  ..   ..  ..     ",
-"    .    .   .    .     ",
-"    ..  ..   ..  ..     ",
-"     ....     .. .      ",
-"     ....     ....      ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/lc-fwd_arrow.xpm b/lisp/toolbar/lc-fwd_arrow.xpm
deleted file mode 100644
index 284b8c9bee7..00000000000
--- a/lisp/toolbar/lc-fwd_arrow.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char *fwd_arrow_xpm[] = {
-"24 24 5 1",
-"  c #000000",
-". c #000100",
-"X c #87AF85",
-"o c #FFFFFF",
-"O c None",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOO OOOOOOOOOO",
-"OOOOOOOOOOOOO  OOOOOOOOO",
-"OOOOOOOOOOOOO X OOOOOOOO",
-"OOOOOOOOOO  . XX.OOOOOOO",
-"OOOOOOOOO oXXXXXX.OOOOOO",
-"OOOOOOOO.oXXXXXXXX.OOOOO",
-"OOOOOOO.oXXXXXXXXXX.OOOO",
-"OOOOOO..XXXXXXXXXX.OOOOO",
-"OOOOOO.XXXXXXXXXX.OOOOOO",
-"OOOOOO.XXXX.  XX.OOOOOOO",
-"OOOOOO.XXX..O X OOOOOOOO",
-"OOOOOO.XX..OO. OOOOOOOOO",
-"OOOOOO.XX.OOO.OOOOOOOOOO",
-"OOOOOO.XX.OOOOOOOOOOOOOO",
-"OOOOOOO.X.OOOOOOOOOOOOOO",
-"OOOOOOO.XX.OOOOOOOOOOOOO",
-"OOOOOOOO.XX.OOOOOOOOOOOO",
-"OOOOOOOOO..OOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO"};
diff --git a/lisp/toolbar/lc-help.xpm b/lisp/toolbar/lc-help.xpm
deleted file mode 100644
index 663460c3a06..00000000000
--- a/lisp/toolbar/lc-help.xpm
+++ /dev/null
@@ -1,39 +0,0 @@
-/* XPM */
-static char * help2_xpm[] = {
-"24 24 12 1",
-"       c None",
-".      c #000100",
-"+      c #FFFFFF",
-"@      c #BBBDBA",
-"#      c #C43107",
-"$      c #EBA291",
-"%      c #D15237",
-"&      c #504D46",
-"*      c #751805",
-"=      c #6B6B66",
-"-      c #974F3D",
-";      c #3E4850",
-"  ..    &....&          ",
-" ....&.;@++++@..&....   ",
-"..  &.+++++++++@..  ..  ",
-" . .%$+++++++++@#*.  .  ",
-" ..%$$%+@@@++++###*...  ",
-" -.$$%%$@@@@@+$####..   ",
-" .$$$%#*.....=#%####.   ",
-" =+$%#*..    .*#$##$..  ",
-"&++@%#..      .*$$+@..  ",
-".++@@-.        *$++@&.  ",
-".++@@@.        .+++@=.  ",
-".++@@@.        .++@@&.  ",
-".+++@@.        =++@@..  ",
-"&@++@@-.      .$++@@..  ",
-" .+++$%*.    .-$$@@=..  ",
-" .@$%%$%*...&$$$%#$..   ",
-" &.###%$$++++$$###...   ",
-" ..*####$++++$###*...   ",
-" . .*###+++@@@%#... .   ",
-" .  ..#@@@@@@@&...  .   ",
-"  .......&&&.....  ..   ",
-"       ........ ....    ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/lc-home.xpm b/lisp/toolbar/lc-home.xpm
deleted file mode 100644
index c7a7ecfb634..00000000000
--- a/lisp/toolbar/lc-home.xpm
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * home2_xpm[] = {
-"24 24 11 1",
-"       c None",
-".      c #000100",
-"+      c #BBBDBA",
-"@      c #FFFFFF",
-"#      c #6B6B66",
-"$      c #504D46",
-"%      c #974F3D",
-"&      c #EBA291",
-"*      c #87AF85",
-"=      c #3E4850",
-"-      c #D15237",
-"                        ",
-"           ..           ",
-"     .... ..=.          ",
-"     .%%..===..         ",
-"     .%%..$$#$..        ",
-"     .%..=+#++$..       ",
-"     ...$#+#++@$..      ",
-"     ..$+#++@+@+#..     ",
-"    ..#+++@+@+@+@#..    ",
-"   ..+++@+@+@+@+@+#..   ",
-"  ..+++++++++.....##..  ",
-" ....@@@@@@@@.++@.#.... ",
-"    .+@.....@.+@@.#.    ",
-"    .+@.&&%.@.+@@.#.    ",
-"    .#@.&-%.@.....#.    ",
-"    ..@.&-..++####..    ",
-"    ..@.&-%.@@@@@+.     ",
-"     .+.&%%.+++++#.     ",
-"     .+.-%%.@@@@@#.     ",
-" .................... . ",
-"    .****##$$$.**#$#$.  ",
-"  .. ......... ......   ",
-"        ...             ",
-"                        "};
diff --git a/lisp/toolbar/lc-index.xpm b/lisp/toolbar/lc-index.xpm
deleted file mode 100644
index 7a2464f032b..00000000000
--- a/lisp/toolbar/lc-index.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * index2_xpm[] = {
-"24 24 7 1",
-"       c None",
-".      c #BBBDBA",
-"+      c #000100",
-"@      c #FFFFFF",
-"#      c #6B6B66",
-"$      c #504D46",
-"%      c #3E4850",
-"                        ",
-"  ++++++++++++++++++++  ",
-"  +@@@@@@@@@@@@@@@@@.+  ",
-"  +@................#+  ",
-"  +@................#+  ",
-"  +@#################+  ",
-"  +@@@@@@@@@@@@@@@@@.+  ",
-"  +@.................+  ",
-"  +@........+........+  ",
-"  +@.......$@+###...#+  ",
-"  +@@@@@@@.$@+...@@@.+  ",
-"  +@.......#@+#......+  ",
-"  +@.......#@$+#+#...+  ",
-"  +@.....#+#@#@+@++##+  ",
-"  +@@@@@@+@.@.@#@#.+.+  ",
-"  +@.....+@.@#@#@##+.+  ",
-"  +@.....+@.@.....#+.+  ",
-"  +@.....+........#+#+  ",
-"  +@@@@@.+.#.....##+.+  ",
-"  +@@@@@..%$######+#.+  ",
-"  +@@@@@@.#+$#$#$#+..+  ",
-"  +@........++++++$#.+  ",
-"  ++++++++++@...@@++++  ",
-"           ++++++++     "};
diff --git a/lisp/toolbar/lc-jump_to.xpm b/lisp/toolbar/lc-jump_to.xpm
deleted file mode 100644
index cd7499396c7..00000000000
--- a/lisp/toolbar/lc-jump_to.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char * jump_to2_xpm[] = {
-"24 24 8 1",
-"       c None",
-".      c #D3B354",
-"+      c #000100",
-"@      c #87AF85",
-"#      c #974F3D",
-"$      c #FFFFFF",
-"%      c #D15237",
-"&      c #BBBDBA",
-"                        ",
-"                        ",
-"      +                 ",
-"      ++                ",
-"      +@+   ++++++      ",
-" ++++++@@+ +.#..%#++    ",
-" +$$$$$@@@+........++   ",
-" +&@@@@@@@@+........+   ",
-" +&@@@@@@@@@+.......#+  ",
-" +@@@@@@@@@@@+......%+  ",
-" +@@@@@@@@@@+........+  ",
-" +@@@@@@@@@+.........+  ",
-" +@@@@@@@@+#........#+  ",
-" ++++++@@+#..........+  ",
-"      +@++#.........+   ",
-"      ++ ++........++   ",
-"      +    +.%..#.++    ",
-"            ++++++      ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/lc-left_arrow.xpm b/lisp/toolbar/lc-left_arrow.xpm
deleted file mode 100644
index 61dded3a5aa..00000000000
--- a/lisp/toolbar/lc-left_arrow.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * left_arrow2_xpm[] = {
-"24 24 7 1",
-"       c None",
-".      c #87AF85",
-"+      c #000100",
-"@      c #BBBDBA",
-"#      c #504D46",
-"$      c #6B6B66",
-"%      c #3E4850",
-"                        ",
-"                        ",
-"                        ",
-"            +           ",
-"           ++           ",
-"          +@+           ",
-"         +@@+           ",
-"        +@@@++++++++    ",
-"       +@@@@@@@@@@.+    ",
-"      +@.@@@@...@.$+    ",
-"     %@.@@@..@@@@..+    ",
-"    +@............$+    ",
-"     +#...........#+    ",
-"      +#..........#+    ",
-"       +#..########+    ",
-"        +#.#++++++++    ",
-"         +##+           ",
-"          +#+           ",
-"           ++           ",
-"            +           ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/lc-new.xpm b/lisp/toolbar/lc-new.xpm
deleted file mode 100644
index e2984bffd4f..00000000000
--- a/lisp/toolbar/lc-new.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * new2_xpm[] = {
-"24 24 6 1",
-"       c None",
-".      c #FFFFFF",
-"+      c #BBBDBA",
-"@      c #000100",
-"#      c #6B6B66",
-"$      c #504D46",
-"                        ",
-"   @@@@@@@@@@@@@        ",
-"  @+..........+$@       ",
-"  @...........+++@      ",
-"  @...........+..+@     ",
-"  @...........+...#@    ",
-"  @...........+...++@   ",
-"  @...........+@@@@@@@  ",
-"  @............++++##@  ",
-"  @.............++++#@  ",
-"  @...............++#@  ",
-"  @................+#@  ",
-"  @.................#@  ",
-"  @.................+@  ",
-"  @.................+@  ",
-"  @...............+++@  ",
-"  @..............++++@  ",
-"  @.............+++++@  ",
-"  @............++++++@  ",
-"  @............++++++@  ",
-"  @+...+.+.+.++++++++@  ",
-"  @+++++++++++++++++#@  ",
-"   @@@@@@@@@@@@@@@@@@   ",
-"                        "};
diff --git a/lisp/toolbar/lc-open.xpm b/lisp/toolbar/lc-open.xpm
deleted file mode 100644
index 0e074830bb6..00000000000
--- a/lisp/toolbar/lc-open.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char * open2_xpm[] = {
-"24 24 8 1",
-"       c None",
-".      c #BBBDBA",
-"+      c #000100",
-"@      c #87AF85",
-"#      c #FFFFFF",
-"$      c #6B6B66",
-"%      c #504D46",
-"&      c #3E4850",
-"                        ",
-"                        ",
-"                        ",
-"  +++++++               ",
-" +.#####$%              ",
-" +#.....@%              ",
-"+.#......%+             ",
-"+..@@@...$%++++++++     ",
-"+.@@@@@..@@........+    ",
-"+.@@@@@@@@@@@@@@@@$+    ",
-"+.$$++++++++++++++++++  ",
-"+.$%################..& ",
-"+.$+#.................+ ",
-"+.%.#...............@$+ ",
-"+.+#...............@@%+ ",
-"+.$#............@@.@$+  ",
-"+....@@@@@.....@@@@$%+  ",
-"+.#..@@@@@@@@@@@@$$$+   ",
-"+#.@@@@$$$$$$$$$$$$%+   ",
-" +++++++++++++++++++    ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/lc-paste.xpm b/lisp/toolbar/lc-paste.xpm
deleted file mode 100644
index c728f0f038c..00000000000
--- a/lisp/toolbar/lc-paste.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char * paste2_xpm[] = {
-"24 24 8 1",
-"       c None",
-".      c #FFFFFF",
-"+      c #BBBDBA",
-"@      c #000100",
-"#      c #6B6B66",
-"$      c #504D46",
-"%      c #D3B354",
-"&      c #974F3D",
-"       @@@@             ",
-" @@@@@@+..#@@@@@@       ",
-"@.....$.++#$+...+@      ",
-"@.++++$.##+$#+++%@      ",
-"@.+++$..+++#$#++%@      ",
-"@.++$++++++#$$++%@      ",
-"@.++#$$$$$$$$#++%@      ",
-"@.+++########+++%@      ",
-"@.+++++#$@@@@@$$@@@@@   ",
-"@.+++++$+...........+@  ",
-"@.+++++$.............@  ",
-"@.+++++@.+##+..+#.#+.@  ",
-"@.+++++@.............@  ",
-"@.+++++$.##.###+.+#..@  ",
-"@.+++++$.............@  ",
-"@.+++++$.+##.###+.+#.@  ",
-"@.+++++@.............@  ",
-"@.+++++@.##.###+.+#..@  ",
-"@.+++++$.............@  ",
-"@.+++++$.+##.###+.+#.@  ",
-"@+%%%%&@.............@  ",
-" @@@@@@@+...........+@  ",
-"        @@@@@@@@@@@@@   ",
-"                        "};
diff --git a/lisp/toolbar/lc-preferences.xpm b/lisp/toolbar/lc-preferences.xpm
deleted file mode 100644
index cebac821d6e..00000000000
--- a/lisp/toolbar/lc-preferences.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * preferences2_xpm[] = {
-"24 24 10 1",
-"       c None",
-".      c #000100",
-"+      c #BBBDBA",
-"@      c #FFFFFF",
-"#      c #7A98B0",
-"$      c #6B6B66",
-"%      c #4D687C",
-"&      c #B0CCE2",
-"*      c #504D46",
-"=      c #3E4850",
-"       ..               ",
-"      .++$.             ",
-"       .+++.        ..  ",
-"        .@+.       .@$. ",
-"    ..  =@+.      .@++. ",
-"   .+ ..+@+$.     .++.  ",
-"   .+++@@+++.    .@..   ",
-"    .+++++++$.  .@.     ",
-"     .....@@+$..+.      ",
-"          .@@+.+.       ",
-"           .@.+..       ",
-"            .+.$*.      ",
-"        ....+.$$$$.     ",
-"       .#&#.. .+++$.    ",
-"      .#&+&%.  .@@+$.   ",
-"     .#@#%&%.   .@@+$.  ",
-"    .#@#%&#%.    .@@+$..",
-"   .&@#%&#%.      .+$*+.",
-"  .#@#%&#%.        .+++.",
-"  .&@#&#%..         ... ",
-"  .#&&#%..              ",
-"   .##%..               ",
-"    ...                 ",
-"                        "};
diff --git a/lisp/toolbar/lc-print.xpm b/lisp/toolbar/lc-print.xpm
deleted file mode 100644
index 8c67bb632f0..00000000000
--- a/lisp/toolbar/lc-print.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * print2_xpm[] = {
-"24 24 6 1",
-"       c None",
-".      c #FFFFFF",
-"+      c #000100",
-"@      c #BBBDBA",
-"#      c #6B6B66",
-"$      c #504D46",
-"                        ",
-"      ++++++++++++      ",
-"     +@..........@+     ",
-"     +.........@@@+     ",
-"     +.###.#@@...@+     ",
-"     +...........@+     ",
-"     +.##@.#@.@#.@+     ",
-"     +...........@+     ",
-"     +.@@.@.@@@..@+     ",
-"     +....@......@+     ",
-"    ++.###@##@#@@@++    ",
-"   +.+@@@@@@@@@@@@+#+   ",
-"  +..#$++++++++++##@@+  ",
-" +....................+ ",
-" +@#...............@@@+ ",
-" +@#.@@@@@@@@@@@@@@#@#+ ",
-" +@#...............$##+ ",
-" +@#$$$$$$$$$$$$$$$$##+ ",
-" +@@###$#$$$$$$$$$$###+ ",
-" +#@@#########$#######+ ",
-"  ++++++++++++++++++++  ",
-"  +#@@@@@@@@@@@@@@@##+  ",
-"   ++++++++++++++++++   ",
-"                        "};
diff --git a/lisp/toolbar/lc-right_arrow.xpm b/lisp/toolbar/lc-right_arrow.xpm
deleted file mode 100644
index a74b70c74b3..00000000000
--- a/lisp/toolbar/lc-right_arrow.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * right_arrow2_xpm[] = {
-"24 24 6 1",
-"       c None",
-".      c #87AF85",
-"+      c #000100",
-"@      c #BBBDBA",
-"#      c #6B6B66",
-"$      c #504D46",
-"                        ",
-"                        ",
-"                        ",
-"           +            ",
-"           ++           ",
-"           +.+          ",
-"           +..+         ",
-"    ++++++++@..+        ",
-"    +@@@@@@@@@..+       ",
-"    +@@..........+      ",
-"    +..........@..+     ",
-"    +.............$+    ",
-"    +............$+     ",
-"    +...........$+      ",
-"    +.######...$+       ",
-"    ++++++++#.$+        ",
-"           +#$+         ",
-"           +$+          ",
-"           ++           ",
-"           +            ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/lc-save.xpm b/lisp/toolbar/lc-save.xpm
deleted file mode 100644
index fd3156abfbf..00000000000
--- a/lisp/toolbar/lc-save.xpm
+++ /dev/null
@@ -1,39 +0,0 @@
-/* XPM */
-static char * save2_xpm[] = {
-"24 24 12 1",
-"       c None",
-".      c #FFFFFF",
-"+      c #000100",
-"@      c #BBBDBA",
-"#      c #7A98B0",
-"$      c #6B6B66",
-"%      c #EBA291",
-"&      c #3E4850",
-"*      c #B0CCE2",
-"=      c #4D687C",
-"-      c #504D46",
-";      c #974F3D",
-"                        ",
-"  +++++++++++++++++++   ",
-" +**$%%%%%%%%%%%%@$**+  ",
-" +*#$%%%%%%%%;;%;;$#=+  ",
-" +*#$%%%%%%;%;%;;;$#=+  ",
-" +*#$.............$#=+  ",
-" +*#$.............$#=+  ",
-" +*#$@@@@@@@@@@@@@$#=+  ",
-" +*#$.............$#=+  ",
-" +*#$.............$#=+  ",
-" +*#$@@@@@@@@@@@@@$#$+  ",
-" +*#$.............$#&+  ",
-" +*##$$$$$$$$$$$$$$#&+  ",
-" +*#################&+  ",
-" +*###&&&==$$$$&&&#*&+  ",
-" +*##&@@....@@@@$==*&+  ",
-" +*##&@.$--@@@@@&==*&+  ",
-" +*##&..$--@@@@@&==*&+  ",
-" +*##&..---@@@..&==*&+  ",
-" +###&@@---@@...&==*&+  ",
-"  +==&@@@@@@..@@&==*&+  ",
-"   ++++++++++++++++&+   ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/lc-saveas.xpm b/lisp/toolbar/lc-saveas.xpm
deleted file mode 100644
index 11cc684c22d..00000000000
--- a/lisp/toolbar/lc-saveas.xpm
+++ /dev/null
@@ -1,40 +0,0 @@
-/* XPM */
-static char * saveas2_xpm[] = {
-"24 24 13 1",
-"       c None",
-".      c #000100",
-"+      c #BBBDBA",
-"@      c #7A98B0",
-"#      c #FFFFFF",
-"$      c #6B6B66",
-"%      c #3E4850",
-"&      c #B0CCE2",
-"*      c #4D687C",
-"=      c #EBA291",
-"-      c #504D46",
-";      c #D3B354",
-">      c #974F3D",
-"                ..      ",
-"               .;;.     ",
-"  .............;;-...   ",
-" .&&$========.;;-.%@@.  ",
-" .&@$=======.;;-.>-@*.  ",
-" .&@$======.;;-.>>%@*.  ",
-" .&@$#####.;;-.++#$@*.  ",
-" .&@$####.;;-.++##$@*.  ",
-" .&@$+++.;;-.+++++$@*.  ",
-" .&@$###.;-.++####$@*.  ",
-" .&@$##.-..++#####$@*.  ",
-" .&@$++..+++++++++$@$.  ",
-" .&@$###++########$@%.  ",
-" .&@@$$$$$$$$$$$$$$@%.  ",
-" .&@@@@@@@@@@@@@@@@@%.  ",
-" .&@@@%%%**$$$$%%%@&%.  ",
-" .&@@%++####++++$**&%.  ",
-" .&@@%+#$--+++++%**&%.  ",
-" .&@@%##$--+++++%**&%.  ",
-" .&@@%##---+++##%**&%.  ",
-" .@@@%++---++###%**&%.  ",
-"  .**%++++++##++%**&%.  ",
-"   ................%.   ",
-"                        "};
diff --git a/lisp/toolbar/lc-search.xpm b/lisp/toolbar/lc-search.xpm
deleted file mode 100644
index 478b63ff648..00000000000
--- a/lisp/toolbar/lc-search.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * search2_xpm[] = {
-"24 24 6 1",
-"       c None",
-".      c #FFFFFF",
-"+      c #BBBDBA",
-"@      c #000100",
-"#      c #6B6B66",
-"$      c #504D46",
-"                        ",
-"   @@@@@@@@@@@@@        ",
-"  @+..........+$@       ",
-"  @...........+++@      ",
-"  @...........+..+@     ",
-"  @...........+...#@    ",
-"  @...........+...++@   ",
-"  @....+$@@$+.+@@@@@@@  ",
-"  @...+$+++#$+.++++##@  ",
-"  @...$+..++#$..++++#@  ",
-"  @...@+.++++@+...++#@  ",
-"  @...@++++++@++...+#@  ",
-"  @...$#+++++$++....#@  ",
-"  @...+$#+++@@++....+@  ",
-"  @...+#$@@$#@@+....+@  ",
-"  @....++++++@@@+++++@  ",
-"  @....++++++#@@@++++@  ",
-"  @.....++++++#@@@+++@  ",
-"  @..........++#@@+++@  ",
-"  @..........++++++++@  ",
-"  @+...+.+.+.++++++++@  ",
-"  @+++++++++++++#####@  ",
-"   @@@@@@@@@@@@@@@@@@   ",
-"                        "};
diff --git a/lisp/toolbar/lc-spell.xpm b/lisp/toolbar/lc-spell.xpm
deleted file mode 100644
index ec952467cc5..00000000000
--- a/lisp/toolbar/lc-spell.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char * spell2_xpm[] = {
-"24 24 8 1",
-"       c None",
-".      c #000100",
-"+      c #87AF85",
-"@      c #504D46",
-"#      c #BBBDBA",
-"$      c #6B6B66",
-"%      c #3E4850",
-"&      c #FFFFFF",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"  ...  ....   ...       ",
-" ..  . ..  . ..  .      ",
-" ..  . ....  ..         ",
-" ..... ..  . ..         ",
-" ..  . ..  . ..  .   .  ",
-" ..  . ....   ...   ... ",
-"                   .+.  ",
-"         ..       .+@   ",
-"         .+.     .++.   ",
-"          @+.   %#+.    ",
-"          .++. .#+$.    ",
-"           .++.&++.     ",
-"           .+++++$.     ",
-"            .++++.      ",
-"            .+++@.      ",
-"             .++.       ",
-"             .+@.       ",
-"              ..        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/lc-undo.xpm b/lisp/toolbar/lc-undo.xpm
deleted file mode 100644
index 8172fb2c951..00000000000
--- a/lisp/toolbar/lc-undo.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * undo2_xpm[] = {
-"24 24 5 1",
-"       c None",
-".      c #D3B354",
-"+      c #000100",
-"@      c #FFFFFF",
-"#      c #6B6B66",
-"                        ",
-"                        ",
-"                        ",
-"          +             ",
-"         ++             ",
-"        +@+             ",
-"       +@.++++          ",
-"      +@......+         ",
-"     +@........+        ",
-"    +...........+       ",
-"     +..........++      ",
-"      +..........+      ",
-"       +..+++....+      ",
-"        +.+ ++...+      ",
-"         ++  ++..+      ",
-"          +   +..+      ",
-"              +..+      ",
-"              +.+       ",
-"             +.#+       ",
-"            +..+        ",
-"             ++         ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/lc-up_arrow.xpm b/lisp/toolbar/lc-up_arrow.xpm
deleted file mode 100644
index ed4b7526015..00000000000
--- a/lisp/toolbar/lc-up_arrow.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char * up_arrow2_xpm[] = {
-"24 24 8 1",
-"       c None",
-".      c #87AF85",
-"+      c #000100",
-"@      c #504D46",
-"#      c #6B6B66",
-"$      c #BBBDBA",
-"%      c #FFFFFF",
-"&      c #3E4850",
-"                        ",
-"                        ",
-"           +            ",
-"          &$+           ",
-"         +%.@+          ",
-"        +%...@+         ",
-"       +%.....@+        ",
-"      +%......#@+       ",
-"     +%.......##@+      ",
-"    +%$$.....#@@@@+     ",
-"   +++++$.....@+++++    ",
-"       +$....#@+        ",
-"       +$....#@+        ",
-"       +$...##@+        ",
-"       +$...##@+        ",
-"       +$...##@+        ",
-"       +...#@@@+        ",
-"       +++++++++        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/left_arrow.pbm b/lisp/toolbar/left_arrow.pbm
deleted file mode 100644
index 56005e71c3f..00000000000
--- a/lisp/toolbar/left_arrow.pbm
+++ /dev/null
diff --git a/lisp/toolbar/left_arrow.xpm b/lisp/toolbar/left_arrow.xpm
deleted file mode 100644
index 586fe4489c0..00000000000
--- a/lisp/toolbar/left_arrow.xpm
+++ /dev/null
@@ -1,70 +0,0 @@
-/* XPM */
-static char * left_arrow_xpm[] = {
-"24 24 43 1",
-"       c None",
-".      c #000000",
-"+      c #B9D0B9",
-"@      c #CDDECB",
-"#      c #B6C7B6",
-"$      c #B1C9B0",
-"%      c #B3C4B3",
-"&      c #B4CBB2",
-"*      c #B5CEB5",
-"=      c #B7CCB5",
-"-      c #B9CEB7",
-";      c #BAD1BA",
-">      c #BBCFBA",
-",      c #BBD0B9",
-"'      c #B2C9B0",
-")      c #7EAB78",
-"!      c #AAC7A8",
-"~      c #B3CAB1",
-"{      c #B0C9B0",
-"]      c #B0C9AE",
-"^      c #AEC7AC",
-"/      c #AAC5A8",
-"(      c #A9C4A7",
-"_      c #698267",
-":      c #2D2D2D",
-"<      c #CFDFCC",
-"[      c #ADC8AB",
-"}      c #B0C7AE",
-"|      c #ADC6AB",
-"1      c #678C63",
-"2      c #9BAD9A",
-"3      c #85AE81",
-"4      c #87AF84",
-"5      c #87B083",
-"6      c #88AF84",
-"7      c #88B085",
-"8      c #86AF82",
-"9      c #547150",
-"0      c #3C5235",
-"a      c #5B7950",
-"b      c #4A6342",
-"c      c #3B5035",
-"d      c #415639",
-"                        ",
-"                        ",
-"                        ",
-"            .           ",
-"           ..           ",
-"          .+.           ",
-"         .@#.           ",
-"        .@$%........    ",
-"       .@&*=-;->,').    ",
-"      .@!~{]^///^(_.    ",
-"     :<[}||[!^^}^[1.    ",
-"    .23444445645789.    ",
-"     .0aaaaaaaaaaab.    ",
-"      .0aaaaaaaaaab.    ",
-"       .0aabccccccd.    ",
-"        .0ab........    ",
-"         .0b.           ",
-"          .b.           ",
-"           ..           ",
-"            .           ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/mail.pbm b/lisp/toolbar/mail.pbm
deleted file mode 100644
index 744f38609e8..00000000000
--- a/lisp/toolbar/mail.pbm
+++ /dev/null
diff --git a/lisp/toolbar/mail.xpm b/lisp/toolbar/mail.xpm
deleted file mode 100644
index fc87e3a654a..00000000000
--- a/lisp/toolbar/mail.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char *magick[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 5 1",
-"  c Gray0",
-". c #673e666663d4",
-"X c #a852a7bea3d2",
-"o c #eb46ea1de471",
-"O c None",
-/* pixels */
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOO    OOOOOO",
-"OOOOOOOOO     .ooX OOOOO",
-"OOOO     .XooooooX OOOOO",
-"OOO .Xoooooooooo.XX OOOO",
-"OOO o..ooooooooX.Xo OOOO",
-"OOO XoX..oooooo.Xoo OOOO",
-"OOOO oooXX.Xoo...ooX OOO",
-"OOOO oooooXX..XoX.Xo OOO",
-"OOOO Xoooo.ooooooo.X OOO",
-"OOOOO oooXXoooooooo.X OO",
-"OOOOO ooo.oooooooooX  OO",
-"OOOOO XoXXooooooX   OOOO",
-"OOOOOO o.ooooX   OOOOOOO",
-"OOOOOO .XoX   OOOOOOOOOO",
-"OOOOOO ..  OOOOOOOOOOOOO",
-"OOOOOOO  OOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO"
-};
diff --git a/lisp/toolbar/mail_compose.pbm b/lisp/toolbar/mail_compose.pbm
deleted file mode 100644
index ca6328d27a5..00000000000
--- a/lisp/toolbar/mail_compose.pbm
+++ /dev/null
diff --git a/lisp/toolbar/mail_compose.xpm b/lisp/toolbar/mail_compose.xpm
deleted file mode 100644
index 9fa4fa93706..00000000000
--- a/lisp/toolbar/mail_compose.xpm
+++ /dev/null
@@ -1,39 +0,0 @@
-/* XPM */
-static char *magick[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 9 1",
-"  c Gray0",
-". c #757560602020",
-"X c #6711662663d9",
-"o c #8e8e7d7d4545",
-"O c #adad8e8e3030",
-"+ c #d8d8bebe6a6a",
-"@ c #a8fba84da483",
-"# c #eb79ea70e4f4",
-"$ c None",
-/* pixels */
-"$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$    $$$$$$$",
-"$$$$$$$$     X##@ $$$$$$",
-"$$$     X@######@ $$$$$$",
-"$$ X@##########X@@ $$$$$",
-"$$ #XX########@X@# $$$$$",
-"$$ @#@XX######X@## $$$$$",
-"$$$ ###@@X@##XXX##@ $ $$",
-"$$$ #####@@XX@#@X@#  + $",
-"$$$ @####X#######X@ +o $",
-"$$$$ ###@@######## +o $$",
-"$$$$ ###X######## +o $$$",
-"$$$$ @#@@######@ +o $$$$",
-"$$$$$ #X####@   +o $$$$$",
-"$$$$$ X@#@   $ +o $$$$$$",
-"$$$$$ XX  $$$ +o $$$$$$$",
-"$$$$$$  $$$$ +o $$$$$$$$",
-"$$$$$$$$$$$O.  $$$$$$$$$",
-"$$$$$$$$$$$  $$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$"
-};
diff --git a/lisp/toolbar/mail_send.pbm b/lisp/toolbar/mail_send.pbm
deleted file mode 100644
index 36b60b7dbdd..00000000000
--- a/lisp/toolbar/mail_send.pbm
+++ /dev/null
diff --git a/lisp/toolbar/mail_send.xpm b/lisp/toolbar/mail_send.xpm
deleted file mode 100644
index f1d2282ec8a..00000000000
--- a/lisp/toolbar/mail_send.xpm
+++ /dev/null
@@ -1,39 +0,0 @@
-/* XPM */
-static char *magick[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 9 1",
-"  c Gray0",
-". c #675e6580613e",
-"X c #8c8c7c7c6969",
-"o c #9b458d377822",
-"O c #a941a6459f3e",
-"+ c #c8c8b2b29898",
-"@ c #dadac2c2a5a5",
-"# c #eb4dea2fe4ad",
-"$ c None",
-/* pixels */
-"$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$    $$$$$$$",
-"$$$$$$$$     .@#+ $$$$$$",
-"$$$     .+#####@O $$$$$$",
-"$$ .+##########.+O $$$$$",
-"$$ @..########O.+# $$$$$",
-"$$ O@O..@#####.+## $$$$$",
-"$$$ ###+O.O##...##O $$$$",
-"$$$ @####@+..O#O.+# $$$$",
-"$$$ O####.#######.O $$$$",
-"$$$$ ###+O########.O $$$",
-"$$$$ ###.########@O  $$$",
-"$$$$ +#+O#####@O   $$$$$",
-"$$$$$ #.###@O     $$$$$$",
-"$$$$$ .O@O   $$ .. $$$$$",
-"$$$$$ ..  $$$$ .oo. $$$$",
-"$$$$$$  $$$$$   oo   $$$",
-"$$$$$$$$$$$$$$$ Oo $$$$$",
-"$$$$$$$$$$$$$$ oOOX $$$$",
-"$$$$$$$$$$$$$$ ++++ $$$$",
-"$$$$$$$$$$$$$ O@@@@O $$$",
-"$$$$$$$$$$$$$        $$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$"
-};
diff --git a/lisp/toolbar/new.pbm b/lisp/toolbar/new.pbm
deleted file mode 100644
index 1fae8c09eec..00000000000
--- a/lisp/toolbar/new.pbm
+++ /dev/null
diff --git a/lisp/toolbar/new.xpm b/lisp/toolbar/new.xpm
deleted file mode 100644
index 2d4690edd3c..00000000000
--- a/lisp/toolbar/new.xpm
+++ /dev/null
@@ -1,154 +0,0 @@
-/* XPM */
-static char * new_xpm[] = {
-"24 24 127 2",
-"       c None",
-".      c #000000",
-"+      c #D3D3D3",
-"@      c #F6F6F6",
-"#      c #FFFFFF",
-"$      c #F9F9F9",
-"%      c #DADADA",
-"&      c #585858",
-"*      c #C7C7C7",
-"=      c #D1D1D1",
-"-      c #D6D6D6",
-";      c #FEFEFE",
-">      c #FDFDFD",
-",      c #C0C0C0",
-"'      c #E1E1E1",
-")      c #F0F0F0",
-"!      c #9B9B9B",
-"~      c #FCFCFB",
-"{      c #FBFBFB",
-"]      c #AFAFAE",
-"^      c #E9E9E9",
-"/      c #DFDFDF",
-"(      c #8F8F8F",
-"_      c #FAFAF9",
-":      c #F9F9F8",
-"<      c #A4A4A3",
-"[      c #F4F4F4",
-"}      c #CFCFCF",
-"|      c #A2A2A2",
-"1      c #F8F8F7",
-"2      c #F8F7F6",
-"3      c #9E9E9E",
-"4      c #F7F6F5",
-"5      c #F6F6F4",
-"6      c #F4F3F2",
-"7      c #DEDDDC",
-"8      c #D3D2D0",
-"9      c #B7B7B5",
-"0      c #9F9E9D",
-"a      c #706F6F",
-"b      c #65625A",
-"c      c #F5F4F3",
-"d      c #F2F2F0",
-"e      c #E4E4E2",
-"f      c #DAD9D7",
-"g      c #D8D8D6",
-"h      c #CDCCCA",
-"i      c #AFAEAC",
-"j      c #88847B",
-"k      c #F3F3F1",
-"l      c #EFEFED",
-"m      c #EEEDEB",
-"n      c #EDECEA",
-"o      c #E9E8E6",
-"p      c #D5D4D3",
-"q      c #C4C3C2",
-"r      c #8F8A81",
-"s      c #F6F5F4",
-"t      c #F5F5F3",
-"u      c #F1F1EF",
-"v      c #F1F0EE",
-"w      c #ECEBE9",
-"x      c #EAE9E7",
-"y      c #E5E4E2",
-"z      c #E4E3E0",
-"A      c #D2D1CE",
-"B      c #8D887E",
-"C      c #F3F2F1",
-"D      c #F0F0EE",
-"E      c #F0EFED",
-"F      c #EFEEEC",
-"G      c #E8E7E5",
-"H      c #E5E4E1",
-"I      c #E2E1DE",
-"J      c #E1DFDC",
-"K      c #979288",
-"L      c #A49E93",
-"M      c #E8E7E4",
-"N      c #E7E6E3",
-"O      c #E3E2DF",
-"P      c #E2E0DD",
-"Q      c #E1E0DC",
-"R      c #E0DFDB",
-"S      c #A19C90",
-"T      c #EDEDEB",
-"U      c #EBEAE8",
-"V      c #E9E8E5",
-"W      c #E6E4E1",
-"X      c #E3E2DE",
-"Y      c #DFDEDA",
-"Z      c #DEDDD9",
-"`      c #DDDCD8",
-" .     c #A19B90",
-"..     c #E7E5E2",
-"+.     c #E4E3DF",
-"@.     c #DCDBD7",
-"#.     c #E6E5E2",
-"$.     c #E5E4E0",
-"%.     c #E2E1DD",
-"&.     c #DBD9D5",
-"*.     c #D9D7D3",
-"=.     c #9F998D",
-"-.     c #E4E2DF",
-";.     c #DDDBD7",
-">.     c #DCDAD6",
-",.     c #D8D6D2",
-"'.     c #9E988D",
-").     c #EDEDED",
-"!.     c #E1E0DD",
-"~.     c #E0DEDA",
-"{.     c #D8D6D1",
-"].     c #D7D5D1",
-"^.     c #9D978B",
-"/.     c #E1DFDB",
-"(.     c #DEDCD8",
-"_.     c #D7D6D1",
-":.     c #D5D3CE",
-"<.     c #9B958A",
-"[.     c #999891",
-"}.     c #A39E92",
-"|.     c #A39D92",
-"1.     c #A39D91",
-"2.     c #A29C90",
-"3.     c #A19B8F",
-"4.     c #9D978C",
-"5.     c #9B968A",
-"6.     c #676359",
-"                                                ",
-"      . . . . . . . . . . . . .                 ",
-"    . + @ # # # # # # # # $ % & .               ",
-"    . @ # # # # # # # # # # * = - .             ",
-"    . # # # # # # # ; # ; > , ' ) ! .           ",
-"    . # # # # # ; > ~ > ~ { ] ^ # / ( .         ",
-"    . # # # ; > ~ { _ { _ : < ) # [ } | .       ",
-"    . # ; > ~ { _ : 1 : 1 2 3 . . . . . . .     ",
-"    . # ~ { _ : 1 2 4 2 4 5 6 7 8 9 0 a b .     ",
-"    . # _ : 1 2 4 5 c 5 c 6 d e f g h i j .     ",
-"    . # 1 2 4 5 c 6 k 6 k d l m n o p q r .     ",
-"    . # s t 6 6 k d u d u v m w x y z A B .     ",
-"    . # 6 C d D l v E v E F w G H z I J K .     ",
-"    . # 6 C d D l v E v E F w G H z I J L .     ",
-"    . # D l l F m n n n n w M N O P Q R S .     ",
-"    . # T n w w w U V U V V H W X Y Z `  ..     ",
-"    . # U o o G M M N M N ..+.X R Z ` @. ..     ",
-"    . # N #.#.#.H W $.W $.+.%.R Z @.&.*.=..     ",
-"    . $ z O X -.+.%.X %.X Q Q Z ;.>.*.,.'..     ",
-"    . ).!.J Q R %.R Q R Q Y ~.;.>.*.{.].^..     ",
-"    . = /.~.Y Z R Z ~.Z ~.(.(.>.>.,._.:.<..     ",
-"    . [.}.L |.1.|.S 2.S 2.3. .=.=.4.4.5.6..     ",
-"      . . . . . . . . . . . . . . . . . .       ",
-"                                                "};
diff --git a/lisp/toolbar/open.pbm b/lisp/toolbar/open.pbm
deleted file mode 100644
index 9c614e43f31..00000000000
--- a/lisp/toolbar/open.pbm
+++ /dev/null
diff --git a/lisp/toolbar/open.xpm b/lisp/toolbar/open.xpm
deleted file mode 100644
index 6b95c7e476d..00000000000
--- a/lisp/toolbar/open.xpm
+++ /dev/null
@@ -1,200 +0,0 @@
-/* XPM */
-static char * open_xpm[] = {
-"24 24 173 2",
-"       c None",
-".      c #000000",
-"+      c #010100",
-"@      c #B5B8A5",
-"#      c #E4E7D2",
-"$      c #878A76",
-"%      c #33342B",
-"&      c #0B0B0B",
-"*      c #E2E5CF",
-"=      c #CFD4AF",
-"-      c #CED3AE",
-";      c #B2B696",
-">      c #2D2D25",
-",      c #23241D",
-"'      c #9D9F90",
-")      c #C6CAA6",
-"!      c #C4C9A5",
-"~      c #C6CBA7",
-"{      c #C7CCA8",
-"]      c #C9CEA9",
-"^      c #555847",
-"/      c #1A1B15",
-"(      c #20201A",
-"_      c #D4D6C2",
-":      c #BEC2A0",
-"<      c #B3B896",
-"[      c #B0B595",
-"}      c #B3B797",
-"|      c #B6BB99",
-"1      c #BBC09E",
-"2      c #BCC19F",
-"3      c #81856C",
-"4      c #3E3F32",
-"5      c #010101",
-"6      c #DADDC8",
-"7      c #AFB494",
-"8      c #AAAF8F",
-"9      c #A3A789",
-"0      c #A6AA8B",
-"a      c #A9AD8E",
-"b      c #A7AB8D",
-"c      c #A4A88A",
-"d      c #A1A588",
-"e      c #AAAD96",
-"f      c #B3B5A5",
-"g      c #B8BBAA",
-"h      c #BABCAB",
-"i      c #C1C3B2",
-"j      c #C7CAB7",
-"k      c #CACDBB",
-"l      c #BABDA8",
-"m      c #0C0C09",
-"n      c #DDDFCB",
-"o      c #969B7E",
-"p      c #9DA286",
-"q      c #95987C",
-"r      c #96997E",
-"s      c #9A9D81",
-"t      c #999D80",
-"u      c #9DA184",
-"v      c #A5AA8B",
-"w      c #A4A98A",
-"x      c #A3A889",
-"y      c #A2A588",
-"z      c #A2A587",
-"A      c #9FA386",
-"B      c #9B9E83",
-"C      c #898D74",
-"D      c #D8DBC9",
-"E      c #84866E",
-"F      c #7D8169",
-"G      c #151612",
-"H      c #D7DAC9",
-"I      c #797D67",
-"J      c #3D3F34",
-"K      c #E0E0D9",
-"L      c #EBEDDD",
-"M      c #E8EBD9",
-"N      c #E7EAD8",
-"O      c #E3E6D4",
-"P      c #DEE1D0",
-"Q      c #DADCCC",
-"R      c #DADCD1",
-"S      c #2B2C28",
-"T      c #D7DAC6",
-"U      c #6F735E",
-"V      c #0D0D0D",
-"W      c #F4F4EC",
-"X      c #CACFAB",
-"Y      c #C6CBA8",
-"Z      c #C2C6A4",
-"`      c #ABB091",
-" .     c #23251E",
-"..     c #494B3D",
-"+.     c #DCDCD4",
-"@.     c #EAECDD",
-"#.     c #CDD2AD",
-"$.     c #CCD1AC",
-"%.     c #CACFAA",
-"&.     c #BABF9D",
-"*.     c #B5B999",
-"=.     c #81836C",
-"-.     c #070806",
-";.     c #D5D8C4",
-">.     c #161616",
-",.     c #F2F2EA",
-"'.     c #C9CEAA",
-").     c #C8CDA9",
-"!.     c #C4C9A6",
-"~.     c #C1C5A3",
-"{.     c #BCC09F",
-"].     c #B6BB9A",
-"^.     c #B0B494",
-"/.     c #9DA185",
-"(.     c #535445",
-"_.     c #B6B8A7",
-":.     c #747470",
-"<.     c #ECECE2",
-"[.     c #C3C8A5",
-"}.     c #C2C7A4",
-"|.     c #C0C5A2",
-"1.     c #BFC4A1",
-"2.     c #BDC2A0",
-"3.     c #B9BD9C",
-"4.     c #B9BE9D",
-"5.     c #A9AD8F",
-"6.     c #A3A78A",
-"7.     c #80836D",
-"8.     c #020201",
-"9.     c #A6A998",
-"0.     c #B8BC9B",
-"a.     c #AFB394",
-"b.     c #ACB091",
-"c.     c #A8AC8E",
-"d.     c #A6AA8C",
-"e.     c #9FA286",
-"f.     c #9B9F83",
-"g.     c #9A9D82",
-"h.     c #8A8D75",
-"i.     c #4F5243",
-"j.     c #070705",
-"k.     c #9E9F91",
-"l.     c #E5E6DA",
-"m.     c #ADB192",
-"n.     c #A5A98C",
-"o.     c #9FA387",
-"p.     c #999D81",
-"q.     c #95987E",
-"r.     c #92957B",
-"s.     c #8C8F76",
-"t.     c #8A8D74",
-"u.     c #71735F",
-"v.     c #080908",
-"w.     c #E3E5D9",
-"x.     c #C0C3AF",
-"y.     c #94987C",
-"z.     c #8F9379",
-"A.     c #8B8F75",
-"B.     c #8A8E74",
-"C.     c #888C73",
-"D.     c #858970",
-"E.     c #868971",
-"F.     c #82866E",
-"G.     c #80836C",
-"H.     c #7D8069",
-"I.     c #797C66",
-"J.     c #727560",
-"K.     c #717460",
-"L.     c #71745F",
-"M.     c #6A6D59",
-"N.     c #434538",
-"O.     c #080907",
-"P.     c #050504",
-"                                                ",
-"                                                ",
-"                                                ",
-"    . . . . . . .                               ",
-"  + @ # # # # # $ %                             ",
-"  & * = = = - - ; >                             ",
-", ' * ) ! ~ { ] ] ^ /                           ",
-"( _ : < [ } | 1 2 3 4 5 . . . . . . .           ",
-", 6 7 8 9 0 8 a b c d e f g h i j k l .         ",
-"m n o p q r s t r u v w x y 9 z A B C .         ",
-". D E F G . . . . . . . . . . . . . . . 5 5     ",
-". H I J K L M M M M M M M M M M M N O P Q R S   ",
-". T U V W = = = = = = = = = - - - X Y Z 1 `  .  ",
-". T ..+.@.#.- - #.- #.#.#.#.#.$.%.Y Z &.*.=.-.  ",
-". ;.>.,.X %.X %.'.%.'.{ ).).Y !.~.{.].^./.(.m   ",
-". _.:.<.[.}.}.Z |.Z 1.2.|.2.3.4.} [ 5.6.7.8.    ",
-". 9.+.0.0.*.} } [ [ a.a.a.b.c.d.e.f.g.h.i.j.    ",
-". k.l.m.5.d.n.6.6.d o.e.f.p.q.r.s.t.t.u.v.      ",
-". w.x.y.z.A.B.C.C.D.E.F.G.H.I.J.K.L.M.N.O.      ",
-"  . . . . . . . . . . . . . . . . . . P.        ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "};
diff --git a/lisp/toolbar/paste.pbm b/lisp/toolbar/paste.pbm
deleted file mode 100644
index 17e3a82c0c6..00000000000
--- a/lisp/toolbar/paste.pbm
+++ /dev/null
diff --git a/lisp/toolbar/paste.xpm b/lisp/toolbar/paste.xpm
deleted file mode 100644
index cdd86366d66..00000000000
--- a/lisp/toolbar/paste.xpm
+++ /dev/null
@@ -1,116 +0,0 @@
-/* XPM */
-static char * paste_xpm[] = {
-"24 24 89 1",
-"       c None",
-".      c #000000",
-"+      c #B9B9B9",
-"@      c #FEFEFE",
-"#      c #F9F9F9",
-"$      c #757575",
-"%      c #F5F5E8",
-"&      c #565651",
-"*      c #FFFFFF",
-"=      c #A0A0A0",
-"-      c #939393",
-";      c #7C7C7C",
-">      c #C5C5BB",
-",      c #CFC6A0",
-"'      c #D7CEAA",
-")      c #ADA689",
-"!      c #4B483C",
-"~      c #6D6D6D",
-"{      c #6C6C6C",
-"]      c #A9A9A9",
-"^      c #3D3A30",
-"/      c #979178",
-"(      c #C1B898",
-"_      c #8A793D",
-":      c #C3BB9A",
-"<      c #AFA78A",
-"[      c #444236",
-"}      c #FAFAFA",
-"|      c #EFEFEF",
-"1      c #C7C7C7",
-"2      c #D8D8D8",
-"3      c #D2D2D2",
-"4      c #7B7B7B",
-"5      c #302E26",
-"6      c #89846C",
-"7      c #C4BC9A",
-"8      c #847235",
-"9      c #C5C5C5",
-"0      c #A7A7A7",
-"a      c #ADADAD",
-"b      c #9A9A9A",
-"c      c #9B9B9B",
-"d      c #868686",
-"e      c #424242",
-"f      c #847033",
-"g      c #C9C09E",
-"h      c #464337",
-"i      c #35332A",
-"j      c #2D2B23",
-"k      c #C6BE9D",
-"l      c #826F33",
-"m      c #7F7964",
-"n      c #4C493C",
-"o      c #171612",
-"p      c #13120F",
-"q      c #3E3B31",
-"r      c #282210",
-"s      c #474438",
-"t      c #B3B3B3",
-"u      c #D6D6D6",
-"v      c #B7AE90",
-"w      c #B1AA8C",
-"x      c #37352B",
-"y      c #151410",
-"z      c #8F8F8F",
-"A      c #989898",
-"B      c #C6C6C6",
-"C      c #B9B293",
-"D      c #11100D",
-"E      c #434035",
-"F      c #636363",
-"G      c #767676",
-"H      c #AAA48B",
-"I      c #A5A086",
-"J      c #A19A7F",
-"K      c #312F26",
-"L      c #AFA88C",
-"M      c #050403",
-"N      c #12110E",
-"O      c #A9A489",
-"P      c #A39E85",
-"Q      c #EBE7D0",
-"R      c #D2C9A5",
-"S      c #A29053",
-"T      c #8E7C3D",
-"U      c #88793B",
-"V      c #806C2F",
-"W      c #78652B",
-"X      c #251F0C",
-"       ....             ",
-" ......+@#$......       ",
-".%%%%%&*=-;&>%%%,.      ",
-".%''')!*~{]^/(''_.      ",
-".%::<[}|123456<78.      ",
-".%''!900abcde!)'f.      ",
-".%g:6hijjjjj56<kl.      ",
-".%'''////////(''l.      ",
-".%g::::mnopppp^qr....   ",
-".%'''''st***********u.  ",
-".%vwwwwx*************.  ",
-".%'''''y*0zzA**Bz*zB*.  ",
-".%CwwwwD*************.  ",
-".%'''''E*~F*GzzB*Bz**.  ",
-".%HIJJJK*************.  ",
-".%'''''E*0zz*zzzB*Az*.  ",
-".%LIJJJM*************.  ",
-".%'''''N*~F*GzzB*Bz**.  ",
-".%OPJJJK*************.  ",
-".Q'''''E*0zz*zzzB*Az*.  ",
-".RSTUVWX*************.  ",
-" .......u***********u.  ",
-"        .............   ",
-"                        "};
diff --git a/lisp/toolbar/preferences.pbm b/lisp/toolbar/preferences.pbm
deleted file mode 100644
index 00c7da36cdf..00000000000
--- a/lisp/toolbar/preferences.pbm
+++ /dev/null
diff --git a/lisp/toolbar/preferences.xpm b/lisp/toolbar/preferences.xpm
deleted file mode 100644
index 3cdc884dd4d..00000000000
--- a/lisp/toolbar/preferences.xpm
+++ /dev/null
@@ -1,114 +0,0 @@
-/* XPM */
-static char * preferences_xpm[] = {
-"24 24 87 1",
-"       c None",
-".      c #000000",
-"+      c #BAB5AB",
-"@      c #D0CDC6",
-"#      c #88857D",
-"$      c #C9C6BE",
-"%      c #CCC8C1",
-"&      c #E5E3E0",
-"*      c #FFFFFF",
-"=      c #757575",
-"-      c #2E2E2E",
-";      c #F6F5F5",
-">      c #CCCCCC",
-",      c #AFAFAF",
-"'      c #D3D1CB",
-")      c #C1C0BF",
-"!      c #F0EFED",
-"~      c #797772",
-"{      c #DCDCDC",
-"]      c #A5A19C",
-"^      c #EAE9E5",
-"/      c #F3F1F0",
-"(      c #EDEDED",
-"_      c #A19D96",
-":      c #C1BDB4",
-"<      c #DBD8D3",
-"[      c #D9D6D1",
-"}      c #89857E",
-"|      c #FCFCFC",
-"1      c #EAE9E6",
-"2      c #F5F4F3",
-"3      c #C6C2BA",
-"4      c #F0EFEE",
-"5      c #F4F4F3",
-"6      c #CBC7C0",
-"7      c #ECECEB",
-"8      c #676560",
-"9      c #54524D",
-"0      c #777676",
-"a      c #797978",
-"b      c #85827E",
-"c      c #79756F",
-"d      c #7590AE",
-"e      c #A4BAD0",
-"f      c #90A6BE",
-"g      c #9F9F9E",
-"h      c #BEBDBC",
-"i      c #B8B4AD",
-"j      c #87837C",
-"k      c #D3DFEA",
-"l      c #A2AEBC",
-"m      c #9DB6CE",
-"n      c #637B95",
-"o      c #E2E2E2",
-"p      c #EEEEED",
-"q      c #849CB6",
-"r      c #D7E2ED",
-"s      c #8D98A5",
-"t      c #9DB8D2",
-"u      c #607791",
-"v      c #EDEDEC",
-"w      c #99ADC3",
-"x      c #DFE7F0",
-"y      c #8193A9",
-"z      c #586D84",
-"A      c #5B7189",
-"B      c #F1F1F1",
-"C      c #EEEDEB",
-"D      c #A7A6A5",
-"E      c #726F6A",
-"F      c #A1B4C8",
-"G      c #EEF3F6",
-"H      c #60768F",
-"I      c #DEDDDC",
-"J      c #787776",
-"K      c #4E4E4D",
-"L      c #91A6BE",
-"M      c #F0F4F7",
-"N      c #97A5B6",
-"O      c #BFBEBD",
-"P      c #AAAAA9",
-"Q      c #ACACAB",
-"R      c #B0C6DB",
-"S      c #EDF2F6",
-"T      c #818A95",
-"U      c #6C85A1",
-"V      c #C0D1E2",
-"       ..               ",
-"      .+@#.             ",
-"       .$%+.        ..  ",
-"        .&$.       .*=. ",
-"    ..  -;$.      .*>,. ",
-"   .' ..)!+~.     .{,.  ",
-"   .]%%^/+++.    .(..   ",
-"    ._:%$<[+}.  .|.     ",
-"     .....123}..>.      ",
-"          .456.,.       ",
-"           .7.,..       ",
-"            .,.89.      ",
-"        ....,.0abc.     ",
-"       .def.. .ghij.    ",
-"      .dklmn.  .op6}.   ",
-"     .qrsntu.   .v/$}.  ",
-"    .wxyztdA.    .BCDE..",
-"   .FGyHtdA.      .IJK,.",
-"  .LMNHtdA.        .OPQ.",
-"  .RSTtdA..         ... ",
-"  .UtVLA..              ",
-"   .UUn..               ",
-"    ...                 ",
-"                        "};
diff --git a/lisp/toolbar/print.pbm b/lisp/toolbar/print.pbm
deleted file mode 100644
index a4ab55c2cd8..00000000000
--- a/lisp/toolbar/print.pbm
+++ /dev/null
diff --git a/lisp/toolbar/print.xpm b/lisp/toolbar/print.xpm
deleted file mode 100644
index 95f2f400800..00000000000
--- a/lisp/toolbar/print.xpm
+++ /dev/null
@@ -1,202 +0,0 @@
-/* XPM */
-static char * print_xpm[] = {
-"24 24 175 2",
-"       c None",
-".      c #000000",
-"+      c #C7C7C7",
-"@      c #FAFAFA",
-"#      c #FCFCFC",
-"$      c #FBFBFB",
-"%      c #F8F8F8",
-"&      c #AFAFAF",
-"*      c #F9F9F9",
-"=      c #E5E5E5",
-"-      c #E3E3E3",
-";      c #E2E2E2",
-">      c #E0E0E0",
-",      c #DFDFDF",
-"'      c #DCDCDC",
-")      c #DBDBDB",
-"!      c #B6B6B6",
-"~      c #6B6B6B",
-"{      c #676767",
-"]      c #818181",
-"^      c #E7E7E7",
-"/      c #606060",
-"(      c #A0A0A0",
-"_      c #DADADA",
-":      c #E1E1E1",
-"<      c #B7B7B7",
-"[      c #FDFDFD",
-"}      c #EFEFEF",
-"|      c #EEEEEE",
-"1      c #EDEDED",
-"2      c #ECECEC",
-"3      c #EBEBEB",
-"4      c #E9E9E9",
-"5      c #E8E8E8",
-"6      c #BFBFBF",
-"7      c #8A8A8A",
-"8      c #6A6A6A",
-"9      c #9E9E9E",
-"0      c #F6F6F6",
-"a      c #909090",
-"b      c #A2A2A2",
-"c      c #AAAAAA",
-"d      c #F4F4F4",
-"e      c #CECECE",
-"f      c #ADADAD",
-"g      c #AEAEAE",
-"h      c #BEBEBE",
-"i      c #A6A6A6",
-"j      c #CDCDCD",
-"k      c #F5F5F5",
-"l      c #DEDEDE",
-"m      c #DDDDDD",
-"n      c #C9C9C9",
-"o      c #878787",
-"p      c #888888",
-"q      c #D0D0D0",
-"r      c #6E6E6E",
-"s      c #797979",
-"t      c #D1D1D1",
-"u      c #A1A1A1",
-"v      c #B3B3B3",
-"w      c #FFFFFF",
-"x      c #CACACA",
-"y      c #A7A7A7",
-"z      c #A5A5A5",
-"A      c #A4A4A4",
-"B      c #A3A3A3",
-"C      c #87847C",
-"D      c #EAE8E3",
-"E      c #8D8982",
-"F      c #53524C",
-"G      c #807D74",
-"H      c #AAA9A5",
-"I      c #BAB5AB",
-"J      c #F3F3F3",
-"K      c #C3C1BD",
-"L      c #8B8B89",
-"M      c #E6E5E1",
-"N      c #F9F9F8",
-"O      c #FAFAF9",
-"P      c #F9F9F7",
-"Q      c #F7F6F5",
-"R      c #F7F7F4",
-"S      c #F6F5F4",
-"T      c #F2F1EE",
-"U      c #F0EFEC",
-"V      c #E5E5E4",
-"W      c #9F9F9F",
-"X      c #DFDED9",
-"Y      c #A4A3A1",
-"Z      c #6C6B6A",
-"`      c #F5F4F3",
-" .     c #D5D5D5",
-"..     c #D3D3D3",
-"+.     c #D4D4D3",
-"@.     c #D4D4D4",
-"#.     c #A9A9A9",
-"$.     c #B5B5B5",
-"%.     c #CDCDCB",
-"&.     c #B5B5B4",
-"*.     c #DCDAD3",
-"=.     c #6B6B6A",
-"-.     c #999896",
-";.     c #918F87",
-">.     c #999895",
-",.     c #E6E4E1",
-"'.     c #F0EEEC",
-").     c #FAF9F9",
-"!.     c #F9F8F7",
-"~.     c #F8F7F6",
-"{.     c #F8F8F7",
-"].     c #F4F3F1",
-"^.     c #F2F1EF",
-"/.     c #565655",
-"(.     c #858482",
-"_.     c #9C9B99",
-":.     c #6B6A68",
-"<.     c #585858",
-"[.     c #5E5C57",
-"}.     c #524F4B",
-"|.     c #4A4845",
-"1.     c #4B4A46",
-"2.     c #4B4946",
-"3.     c #4A4844",
-"4.     c #494743",
-"5.     c #484642",
-"6.     c #474541",
-"7.     c #464440",
-"8.     c #514F4B",
-"9.     c #53514E",
-"0.     c #7B7A77",
-"a.     c #797771",
-"b.     c #949391",
-"c.     c #989694",
-"d.     c #868480",
-"e.     c #6E6C66",
-"f.     c #706D67",
-"g.     c #5C5955",
-"h.     c #67645F",
-"i.     c #5B5954",
-"j.     c #585651",
-"k.     c #5D5B56",
-"l.     c #595652",
-"m.     c #53504C",
-"n.     c #575450",
-"o.     c #595752",
-"p.     c #5C5956",
-"q.     c #5B5956",
-"r.     c #61615E",
-"s.     c #696861",
-"t.     c #77756F",
-"u.     c #7E7B77",
-"v.     c #979690",
-"w.     c #96938D",
-"x.     c #807E77",
-"y.     c #7D7A74",
-"z.     c #787770",
-"A.     c #716F6A",
-"B.     c #6E6C67",
-"C.     c #595753",
-"D.     c #63615C",
-"E.     c #686661",
-"F.     c #6F6E68",
-"G.     c #6D6C66",
-"H.     c #72716B",
-"I.     c #76746F",
-"J.     c #6A6963",
-"K.     c #8B8880",
-"L.     c #B2AFA8",
-"M.     c #B6B3AD",
-"N.     c #BFBDB6",
-"O.     c #BDBBB4",
-"P.     c #B0AEA6",
-"Q.     c #ABA8A2",
-"R.     c #9C9991",
-"                                                ",
-"            . . . . . . . . . . . .             ",
-"          . + @ # # # # # # # $ % & .           ",
-"          . * = - - - ; > , , ' ) ! .           ",
-"          . # ~ { ] ^ / ( _ : > > < .           ",
-"          . [ } | 1 1 | 2 2 3 4 5 6 .           ",
-"          . [ 7 8 9 0 a b 4 c a d + .           ",
-"          . [ # # # # $ $ # # $ $ e .           ",
-"          . [ f g = h % h i j 3 # j .           ",
-"          . k l l l m l l , l 5 : n .           ",
-"        . . @ o ~ p q r s t p u q v . .         ",
-"      . w . x y z A z z i B b u u 9 . C .       ",
-"    . w D E F . . . . . . . . . . G C H I .     ",
-"  . w w J w w w w w w w w w w w w w w w w D .   ",
-"  . K L M N O N P Q R O O S T T U V D W X I .   ",
-"  . Y Z ` h  .! ..! +.< @.#...$.%.&.*.=.-.;..   ",
-"  . >.=.,.'.Q N @ ).N !.~.{.{.].].].^./.(.;..   ",
-"  . _.:.<.[.}.|.1.2.2.2.3.4.5.6.4.7.8.9.0.a..   ",
-"  . b.c.d.e.f.g.h.i.j.i.k.l.m.n.o.p.q.r.s.t..   ",
-"  . u.v.w.;.x.y.z.t.A.t.A.B.C.D.E.F.G.H.I.J..   ",
-"    . . . . . . . . . . . . . . . . . . . .     ",
-"    . K.L.M.N.N.N.N.N.O.P.L.Q.P.R.R.R.G G .     ",
-"      . . . . . . . . . . . . . . . . . .       ",
-"                                                "};
diff --git a/lisp/toolbar/right_arrow.pbm b/lisp/toolbar/right_arrow.pbm
deleted file mode 100644
index cd32579c6bd..00000000000
--- a/lisp/toolbar/right_arrow.pbm
+++ /dev/null
diff --git a/lisp/toolbar/right_arrow.xpm b/lisp/toolbar/right_arrow.xpm
deleted file mode 100644
index da8156879d6..00000000000
--- a/lisp/toolbar/right_arrow.xpm
+++ /dev/null
@@ -1,68 +0,0 @@
-/* XPM */
-static char * right_arrow_xpm[] = {
-"24 24 41 1",
-"       c None",
-".      c #000000",
-"+      c #8CA782",
-"@      c #B1CDAE",
-"#      c #77A16E",
-"$      c #B4CEB1",
-"%      c #ACC8A9",
-"&      c #709867",
-"*      c #C1D6BD",
-"=      c #BDD3B8",
-"-      c #BFD4BB",
-";      c #C2D7BE",
-">      c #B0CAAD",
-",      c #B2CBB0",
-"'      c #AAC7A8",
-")      c #0F1308",
-"!      c #AEC5A8",
-"~      c #AEC8AD",
-"{      c #ABC7A8",
-"]      c #AAC6A7",
-"^      c #A8C6A5",
-"/      c #ADC8AD",
-"(      c #A8C7A8",
-"_      c #A5C4A3",
-":      c #7F9F76",
-"<      c #A6BFA0",
-"[      c #ABC7AA",
-"}      c #A7C5A4",
-"|      c #A9C7A6",
-"1      c #AFC8AD",
-"2      c #A4C3A2",
-"3      c #6B9060",
-"4      c #778E6F",
-"5      c #698D60",
-"6      c #6B9063",
-"7      c #445B2C",
-"8      c #6B8661",
-"9      c #5B7950",
-"0      c #6C8562",
-"a      c #65815C",
-"b      c #506B46",
-"                        ",
-"                        ",
-"                        ",
-"           .            ",
-"           ..           ",
-"           .+.          ",
-"           .@#.         ",
-"    ........$%&.        ",
-"    .*=-;;;;>,'&)       ",
-"    .!~{{{]^'/(_:.      ",
-"    .<[^}^|{%'{123.     ",
-"    .45666666666657.    ",
-"    .8999999999997.     ",
-"    .099999999997.      ",
-"    .abbbbbb9997.       ",
-"    ........b97.        ",
-"           .b7.         ",
-"           .7.          ",
-"           ..           ",
-"           .            ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/save.pbm b/lisp/toolbar/save.pbm
deleted file mode 100644
index b69576096bf..00000000000
--- a/lisp/toolbar/save.pbm
+++ /dev/null
diff --git a/lisp/toolbar/save.xpm b/lisp/toolbar/save.xpm
deleted file mode 100644
index cfa651dfaf3..00000000000
--- a/lisp/toolbar/save.xpm
+++ /dev/null
@@ -1,247 +0,0 @@
-/* XPM */
-static char * save_xpm[] = {
-"24 24 220 2",
-"       c None",
-".      c #000000",
-"+      c #C3D7F4",
-"@      c #A9CDE5",
-"#      c #75757A",
-"$      c #EFC5BB",
-"%      c #F1C8BE",
-"&      c #F0C6BC",
-"*      c #EEBCB2",
-"=      c #EEBEB5",
-"-      c #EEC1B8",
-";      c #EDBFB6",
-">      c #E9B7AD",
-",      c #E9B8AF",
-"'      c #E9B9B1",
-")      c #E5BFBA",
-"!      c #737277",
-"~      c #B3CDE3",
-"{      c #A1BED6",
-"]      c #BBD6E8",
-"^      c #8AAAC5",
-"/      c #605F68",
-"(      c #E08D7E",
-"_      c #E0826E",
-":      c #E0806E",
-"<      c #DC7A68",
-"[      c #DC8171",
-"}      c #DA7868",
-"|      c #D48173",
-"1      c #D47D6E",
-"2      c #CE7265",
-"3      c #CF7264",
-"4      c #CE7567",
-"5      c #C4675B",
-"6      c #C36558",
-"7      c #626169",
-"8      c #87A3B7",
-"9      c #567187",
-"0      c #BAD5E9",
-"a      c #88A7C3",
-"b      c #686670",
-"c      c #C8817B",
-"d      c #CB7C74",
-"e      c #CB7A73",
-"f      c #CB7B73",
-"g      c #CC7C72",
-"h      c #CB7D73",
-"i      c #BF6B64",
-"j      c #CC7A70",
-"k      c #C16A62",
-"l      c #CC7C73",
-"m      c #C2655B",
-"n      c #C36459",
-"o      c #BA6C6A",
-"p      c #819EB6",
-"q      c #547086",
-"r      c #B6D3E7",
-"s      c #87ABC1",
-"t      c #737373",
-"u      c #FFFFFF",
-"v      c #83A0B8",
-"w      c #526C80",
-"x      c #B9D3E7",
-"y      c #85A4BF",
-"z      c #4F697C",
-"A      c #B9D3E6",
-"B      c #84A3BF",
-"C      c #CECECE",
-"D      c #CDCDCD",
-"E      c #BFBFBF",
-"F      c #88A4BB",
-"G      c #486276",
-"H      c #B7D2E7",
-"I      c #82A0BB",
-"J      c #636363",
-"K      c #465E70",
-"L      c #B5CAE5",
-"M      c #7FA2B9",
-"N      c #87A3BA",
-"O      c #455C6D",
-"P      c #AECCE5",
-"Q      c #7DA0B6",
-"R      c #C5C5C5",
-"S      c #546069",
-"T      c #B0D1E4",
-"U      c #83A1B6",
-"V      c #735B5B",
-"W      c #515C64",
-"X      c #AACEE3",
-"Y      c #7B9BB2",
-"Z      c #7A8E9A",
-"`      c #7A7A7A",
-" .     c #6B6F72",
-"..     c #6F6F6F",
-"+.     c #696969",
-"@.     c #6F777E",
-"#.     c #86A2B9",
-"$.     c #3A515D",
-"%.     c #A9C9E2",
-"&.     c #7494AF",
-"*.     c #829FB7",
-"=.     c #7F9DB6",
-"-.     c #7E9CB5",
-";.     c #7998B2",
-">.     c #85A1B8",
-",.     c #8CA7BD",
-"'.     c #8AA5BB",
-").     c #364A59",
-"!.     c #ABC4E2",
-"~.     c #7294AD",
-"{.     c #6F90AC",
-"].     c #7192AE",
-"^.     c #414A4E",
-"/.     c #424A51",
-"(.     c #525B63",
-"_.     c #626F79",
-":.     c #5F6C76",
-"<.     c #5C6971",
-"[.     c #5A666F",
-"}.     c #58636B",
-"|.     c #57636A",
-"1.     c #3B5360",
-"2.     c #39424B",
-"3.     c #7897B3",
-"4.     c #A4B9CB",
-"5.     c #364853",
-"6.     c #AAC9E2",
-"7.     c #7091AA",
-"8.     c #6F8FA7",
-"9.     c #4A5359",
-"0.     c #97938C",
-"a.     c #DFDDDA",
-"b.     c #E3E1DE",
-"c.     c #EBEAE8",
-"d.     c #EAE9E7",
-"e.     c #CFCEC9",
-"f.     c #C9C6C0",
-"g.     c #9B968E",
-"h.     c #566168",
-"i.     c #4B657A",
-"j.     c #54738C",
-"k.     c #AAC6DD",
-"l.     c #34464E",
-"m.     c #AAC9E1",
-"n.     c #6C8EA6",
-"o.     c #6C8CA4",
-"p.     c #40474D",
-"q.     c #DAD8D3",
-"r.     c #E7E6E2",
-"s.     c #67655E",
-"t.     c #524F47",
-"u.     c #D9D7D4",
-"v.     c #C7C5BF",
-"w.     c #C0BCB5",
-"x.     c #B8B3AB",
-"y.     c #434C54",
-"z.     c #4D697F",
-"A.     c #4F6F84",
-"B.     c #B3CADC",
-"C.     c #313E49",
-"D.     c #A8C8E1",
-"E.     c #6B8DA6",
-"F.     c #728FA4",
-"G.     c #E2E1DD",
-"H.     c #F0EFEC",
-"I.     c #CDCAC6",
-"J.     c #C2BFB9",
-"K.     c #CAC6C0",
-"L.     c #DCDAD7",
-"M.     c #4B555D",
-"N.     c #4E697F",
-"O.     c #BACCDC",
-"P.     c #A4C4DE",
-"Q.     c #698BA3",
-"R.     c #708AA1",
-"S.     c #383E43",
-"T.     c #E0DEDA",
-"U.     c #514E46",
-"V.     c #4F4C44",
-"W.     c #C7C4BE",
-"X.     c #CBC8C2",
-"Y.     c #E1E0DC",
-"Z.     c #E9E8E6",
-"`.     c #475158",
-" +     c #4E6879",
-".+     c #4D6C80",
-"++     c #A3C3DB",
-"@+     c #383F43",
-"#+     c #778999",
-"$+     c #6E899E",
-"%+     c #65859C",
-"&+     c #33383C",
-"*+     c #D7D4D0",
-"=+     c #D6D4D0",
-"-+     c #4E4A43",
-";+     c #4D4942",
-">+     c #D1CEC9",
-",+     c #E6E5E2",
-"'+     c #EDECEA",
-")+     c #454F55",
-"!+     c #486173",
-"~+     c #4D6678",
-"{+     c #A1C1DA",
-"]+     c #373C40",
-"^+     c #0C0D0F",
-"/+     c #4E5E6A",
-"(+     c #5B6E7C",
-"_+     c #4F5B62",
-":+     c #A4A099",
-"<+     c #CCC9C3",
-"[+     c #D7D5D1",
-"}+     c #E4E2E0",
-"|+     c #DDDBD7",
-"1+     c #B8B5B0",
-"2+     c #3E474D",
-"3+     c #4A6176",
-"4+     c #4A6070",
-"5+     c #9BC3D8",
-"6+     c #363C41",
-"7+     c #28323E",
-"                                                ",
-"    . . . . . . . . . . . . . . . . . . .       ",
-"  . + @ # $ % & * = - ; > , > , ' ) ! ~ { .     ",
-"  . ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 9 .     ",
-"  . 0 a b c d e f g h i j k l m n o b p q .     ",
-"  . r s t u u u u u u u u u u u u u t v w .     ",
-"  . x y t u u u u u u u u u u u u u t v z .     ",
-"  . A B t C D D D D D D D D D D D E t F G .     ",
-"  . H I J u u u u u u u u u u u u u t F K .     ",
-"  . L M t u u u u u u u u u u u u u t N O .     ",
-"  . P Q t C D D D D D D D D D D D R t N S .     ",
-"  . T U V u u u u u u u u u u u u u t v W .     ",
-"  . X Y Z ` t t t t t  ...t t t t +.@.#.$..     ",
-"  . %.&.p v #.*.=.-.*.;.#.>.>.N *.,.v '.)..     ",
-"  . !.~.{.].^./.(._.:.<.[.}.|.(.1.2.3.4.5..     ",
-"  . 6.7.8.9.0.a.b.c.c.d.a.e.f.g.h.i.j.k.l..     ",
-"  . m.n.o.p.q.r.s.t.t.u.v.w.x.e.y.z.A.B.C..     ",
-"  . D.E.F.p.G.H.s.t.t.I.J.w.K.L.M.N.A.O.C..     ",
-"  . P.Q.R.S.T.c.U.V.V.W.w.X.Y.Z.`. +.+++@+.     ",
-"  . #+$+%+&+*+=+-+;+;+w.>+,+'+,+)+!+~+{+]+.     ",
-"    ^+/+(+_+:+w.x.<+<+[+}+d.|+1+2+3+4+5+6+.     ",
-"      . . . . . . . . . . . . . . . . 7+.       ",
-"                                                ",
-"                                                "};
diff --git a/lisp/toolbar/saveas.pbm b/lisp/toolbar/saveas.pbm
deleted file mode 100644
index 6bf6b8f25eb..00000000000
--- a/lisp/toolbar/saveas.pbm
+++ /dev/null
diff --git a/lisp/toolbar/saveas.xpm b/lisp/toolbar/saveas.xpm
deleted file mode 100644
index 2830b06c928..00000000000
--- a/lisp/toolbar/saveas.xpm
+++ /dev/null
@@ -1,289 +0,0 @@
-/* XPM */
-static char * saveas_xpm[] = {
-"24 24 262 2",
-"       c None",
-".      c #000000",
-"+      c #FBE73B",
-"@      c #F2B64D",
-"#      c #FCEB3D",
-"$      c #F7B544",
-"%      c #5D502C",
-"&      c #C3D7F4",
-"*      c #A9CDE5",
-"=      c #75757A",
-"-      c #EFC5BB",
-";      c #F1C8BE",
-">      c #F0C6BC",
-",      c #EEBCB2",
-"'      c #EEBEB5",
-")      c #EEC1B8",
-"!      c #EDBFB6",
-"~      c #E8B6AC",
-"{      c #FCE93B",
-"]      c #F7B545",
-"^      c #6C5F34",
-"/      c #434345",
-"(      c #92A7B9",
-"_      c #96B1C7",
-":      c #BBD6E8",
-"<      c #8AAAC5",
-"[      c #605F68",
-"}      c #E08D7E",
-"|      c #E0826E",
-"1      c #E0806E",
-"2      c #DC7A68",
-"3      c #DC8171",
-"4      c #DA7868",
-"5      c #D38072",
-"6      c #FAE43A",
-"7      c #F4B244",
-"8      c #615030",
-"9      c #783E35",
-"0      c #4D4C52",
-"a      c #7790A2",
-"b      c #526D82",
-"c      c #BAD5E9",
-"d      c #88A7C3",
-"e      c #686670",
-"f      c #C8817B",
-"g      c #CB7C74",
-"h      c #CB7A73",
-"i      c #CB7B73",
-"j      c #CC7C72",
-"k      c #CA7C72",
-"l      c #F9DF39",
-"m      c #F3AF42",
-"n      c #614F2F",
-"o      c #8F4941",
-"p      c #945554",
-"q      c #5B5A62",
-"r      c #7B97AE",
-"s      c #536F84",
-"t      c #B6D3E7",
-"u      c #87ABC1",
-"v      c #737373",
-"w      c #FFFFFF",
-"x      c #FEFEFE",
-"y      c #F9DC38",
-"z      c #EFB44D",
-"A      c #665A32",
-"B      c #BBBBBB",
-"C      c #CDCDCD",
-"D      c #E4E4E4",
-"E      c #6E6E6E",
-"F      c #819EB6",
-"G      c #526C80",
-"H      c #B9D3E7",
-"I      c #85A4BF",
-"J      c #F8D837",
-"K      c #F0A93F",
-"L      c #655930",
-"M      c #BABABA",
-"N      c #CCCCCC",
-"O      c #E5E5E5",
-"P      c #F7F7F7",
-"Q      c #727272",
-"R      c #83A0B8",
-"S      c #4F697C",
-"T      c #B9D3E6",
-"U      c #84A3BF",
-"V      c #CECECE",
-"W      c #F6D236",
-"X      c #EDA43E",
-"Y      c #5C5130",
-"Z      c #949494",
-"`      c #A3A3A3",
-" .     c #B7B7B7",
-"..     c #C6C6C6",
-"+.     c #BDBDBD",
-"@.     c #88A4BB",
-"#.     c #486276",
-"$.     c #B7D2E7",
-"%.     c #82A0BB",
-"&.     c #636363",
-"*.     c #FDFDFD",
-"=.     c #D7AE74",
-"-.     c #61562F",
-";.     c #465E70",
-">.     c #B5CAE5",
-",.     c #7FA2B9",
-"'.     c #4F4115",
-").     c #87A3BA",
-"!.     c #455C6D",
-"~.     c #AECCE5",
-"{.     c #7DA0B6",
-"].     c #CBCBCB",
-"^.     c #9B9B9B",
-"/.     c #9C9C9C",
-"(.     c #A7A7A7",
-"_.     c #B8B8B8",
-":.     c #C5C5C5",
-"<.     c #546069",
-"[.     c #B0D1E4",
-"}.     c #83A1B6",
-"|.     c #735B5B",
-"1.     c #F0F0F0",
-"2.     c #D9D9D9",
-"3.     c #D3D3D3",
-"4.     c #E1E1E1",
-"5.     c #EDEDED",
-"6.     c #F8F8F8",
-"7.     c #515C64",
-"8.     c #AACEE3",
-"9.     c #7B9BB2",
-"0.     c #7A8E9A",
-"a.     c #7A7A7A",
-"b.     c #707070",
-"c.     c #6C6C6C",
-"d.     c #6F6F6F",
-"e.     c #6A6E71",
-"f.     c #696969",
-"g.     c #6F777E",
-"h.     c #86A2B9",
-"i.     c #3A515D",
-"j.     c #A9C9E2",
-"k.     c #7494AF",
-"l.     c #7E9BB4",
-"m.     c #7D9AB3",
-"n.     c #7998B2",
-"o.     c #85A1B8",
-"p.     c #829FB7",
-"q.     c #8CA7BD",
-"r.     c #8AA5BB",
-"s.     c #364A59",
-"t.     c #ABC4E2",
-"u.     c #7294AD",
-"v.     c #6F90AC",
-"w.     c #7192AE",
-"x.     c #414A4E",
-"y.     c #424A51",
-"z.     c #525B63",
-"A.     c #626F79",
-"B.     c #5F6C76",
-"C.     c #5C6971",
-"D.     c #5A666F",
-"E.     c #58636B",
-"F.     c #57636A",
-"G.     c #3B5360",
-"H.     c #39424B",
-"I.     c #7897B3",
-"J.     c #A4B9CB",
-"K.     c #364853",
-"L.     c #AAC9E2",
-"M.     c #7091AA",
-"N.     c #6F8FA7",
-"O.     c #4A5359",
-"P.     c #97938C",
-"Q.     c #DFDDDA",
-"R.     c #E3E1DE",
-"S.     c #EBEAE8",
-"T.     c #EAE9E7",
-"U.     c #CFCEC9",
-"V.     c #C9C6C0",
-"W.     c #9B968E",
-"X.     c #566168",
-"Y.     c #4B657A",
-"Z.     c #54738C",
-"`.     c #AAC6DD",
-" +     c #34464E",
-".+     c #AAC9E1",
-"++     c #6C8EA6",
-"@+     c #6C8CA4",
-"#+     c #40474D",
-"$+     c #DAD8D3",
-"%+     c #E7E6E2",
-"&+     c #67655E",
-"*+     c #524F47",
-"=+     c #D9D7D4",
-"-+     c #C7C5BF",
-";+     c #C0BCB5",
-">+     c #B8B3AB",
-",+     c #434C54",
-"'+     c #4D697F",
-")+     c #4F6F84",
-"!+     c #B3CADC",
-"~+     c #313E49",
-"{+     c #A8C8E1",
-"]+     c #6B8DA6",
-"^+     c #728FA4",
-"/+     c #E2E1DD",
-"(+     c #F0EFEC",
-"_+     c #CDCAC6",
-":+     c #C2BFB9",
-"<+     c #CAC6C0",
-"[+     c #DCDAD7",
-"}+     c #4B555D",
-"|+     c #4E697F",
-"1+     c #BACCDC",
-"2+     c #A4C4DE",
-"3+     c #698BA3",
-"4+     c #708AA1",
-"5+     c #383E43",
-"6+     c #E0DEDA",
-"7+     c #514E46",
-"8+     c #4F4C44",
-"9+     c #C7C4BE",
-"0+     c #CBC8C2",
-"a+     c #E1E0DC",
-"b+     c #E9E8E6",
-"c+     c #475158",
-"d+     c #4E6879",
-"e+     c #4D6C80",
-"f+     c #A3C3DB",
-"g+     c #383F43",
-"h+     c #778999",
-"i+     c #6E899E",
-"j+     c #65859C",
-"k+     c #33383C",
-"l+     c #D7D4D0",
-"m+     c #D6D4D0",
-"n+     c #4E4A43",
-"o+     c #4D4942",
-"p+     c #D1CEC9",
-"q+     c #E6E5E2",
-"r+     c #EDECEA",
-"s+     c #454F55",
-"t+     c #486173",
-"u+     c #4D6678",
-"v+     c #A1C1DA",
-"w+     c #373C40",
-"x+     c #0C0D0F",
-"y+     c #4E5E6A",
-"z+     c #5B6E7C",
-"A+     c #4F5B62",
-"B+     c #A4A099",
-"C+     c #CCC9C3",
-"D+     c #D7D5D1",
-"E+     c #E4E2E0",
-"F+     c #DDDBD7",
-"G+     c #B8B5B0",
-"H+     c #3E474D",
-"I+     c #4A6176",
-"J+     c #4A6070",
-"K+     c #9BC3D8",
-"L+     c #363C41",
-"M+     c #28323E",
-"                                . .             ",
-"                              . + @ .           ",
-"    . . . . . . . . . . . . . # $ % . . .       ",
-"  . & * = - ; > , ' ) ! ~ . { ] ^ . / ( _ .     ",
-"  . : < [ } | 1 2 3 4 5 . 6 7 8 . 9 0 a b .     ",
-"  . c d e f g h i j k . l m n . o p q r s .     ",
-"  . t u v w w w w x . y z A . B C D E F G .     ",
-"  . H I v w w w x . J K L . M N O P Q R S .     ",
-"  . T U v V C N . W X Y . Z `  ...+.v @.#..     ",
-"  . $.%.&.w w *.. =.-.. M N D P *.w v @.;..     ",
-"  . >.,.v w x . '.. . M N D P *.w w v ).!..     ",
-"  . ~.{.v V ].. . ^./.(._...].C C :.v ).<..     ",
-"  . [.}.|.w *.1.2.3.4.5.6.x w w w w v R 7..     ",
-"  . 8.9.0.a.Q b.c.c.d.e.E v v v v f.g.h.i..     ",
-"  . j.k.F R h.F l.m.F n.h.o.o.).p.q.R r.s..     ",
-"  . t.u.v.w.x.y.z.A.B.C.D.E.F.z.G.H.I.J.K..     ",
-"  . L.M.N.O.P.Q.R.S.S.T.Q.U.V.W.X.Y.Z.`. +.     ",
-"  . .+++@+#+$+%+&+*+*+=+-+;+>+U.,+'+)+!+~+.     ",
-"  . {+]+^+#+/+(+&+*+*+_+:+;+<+[+}+|+)+1+~+.     ",
-"  . 2+3+4+5+6+S.7+8+8+9+;+0+a+b+c+d+e+f+g+.     ",
-"  . h+i+j+k+l+m+n+o+o+;+p+q+r+q+s+t+u+v+w+.     ",
-"    x+y+z+A+B+;+>+C+C+D+E+T.F+G+H+I+J+K+L+.     ",
-"      . . . . . . . . . . . . . . . . M+.       ",
-"                                                "};
diff --git a/lisp/toolbar/search-replace.pbm b/lisp/toolbar/search-replace.pbm
deleted file mode 100644
index 3e444cf7bb6..00000000000
--- a/lisp/toolbar/search-replace.pbm
+++ /dev/null
diff --git a/lisp/toolbar/search-replace.xpm b/lisp/toolbar/search-replace.xpm
deleted file mode 100644
index 597337f047a..00000000000
--- a/lisp/toolbar/search-replace.xpm
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char *magick[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 8 1",
-"  c #01260126010f",
-". c #56004ef93434",
-"X c #5c9c5c9c57c7",
-"o c #8e8e7d7d4545",
-"O c #a72aa72a95e6",
-"+ c #d015d015b9c5",
-"@ c #e90de90dd2e3",
-"# c None",
-/* pixels */
-"########################",
-"################  ######",
-"###############  o #####",
-"########### ##  o ######",
-"#########  O   o #######",
-"#######  O@@  o ########",
-"#####  O+++  o #########",
-"###  O++++  o  #########",
-"## XX++++ .  @.#########",
-"## @.O+++  @@@@ ########",
-"## @@.++++@@@@@O #######",
-"## @@.O+O.  .O@@ #######",
-"## @XO+O.O++O.+@@ ######",
-"##  O++.O@@+OX.@@O #####",
-"## X+++ +#+OOO @@@+ ####",
-"## O++@ +@OOOO @@@O ####",
-"### +@@.OOOOOX.@@  #####",
-"### +@@O.OOOX  + #######",
-"####X@@@O.  .X  ########",
-"#### @@@@@@@+    #######",
-"##### @@@@@O ##   ######",
-"##### O@@+. ####   #####",
-"###### @O #######  #####",
-"#######  ###############"
-};
diff --git a/lisp/toolbar/search.pbm b/lisp/toolbar/search.pbm
deleted file mode 100644
index 0e8a15e6a2e..00000000000
--- a/lisp/toolbar/search.pbm
+++ /dev/null
diff --git a/lisp/toolbar/search.xpm b/lisp/toolbar/search.xpm
deleted file mode 100644
index ad6300528e9..00000000000
--- a/lisp/toolbar/search.xpm
+++ /dev/null
@@ -1,234 +0,0 @@
-/* XPM */
-static char * search_xpm[] = {
-"24 24 207 2",
-"       c None",
-".      c #000000",
-"+      c #D3D3D3",
-"@      c #F6F6F6",
-"#      c #FFFFFF",
-"$      c #F9F9F9",
-"%      c #DADADA",
-"&      c #585858",
-"*      c #C7C7C7",
-"=      c #D1D1D1",
-"-      c #D6D6D6",
-";      c #FEFEFE",
-">      c #FDFDFD",
-",      c #C0C0C0",
-"'      c #E1E1E1",
-")      c #F0F0F0",
-"!      c #9B9B9B",
-"~      c #FCFCFB",
-"{      c #FBFBFB",
-"]      c #AFAFAE",
-"^      c #E9E9E9",
-"/      c #DFDFDF",
-"(      c #8F8F8F",
-"_      c #FAFAF9",
-":      c #F9F9F8",
-"<      c #A4A4A3",
-"[      c #F4F4F4",
-"}      c #CFCFCF",
-"|      c #A2A2A2",
-"1      c #B8B8B8",
-"2      c #47473F",
-"3      c #0A0A09",
-"4      c #4B4B43",
-"5      c #B4B4B3",
-"6      c #F7F6F5",
-"7      c #9E9E9E",
-"8      c #A9A9A8",
-"9      c #34342E",
-"0      c #9D9D8D",
-"a      c #CFCFB9",
-"b      c #C4C4AF",
-"c      c #8D8D7F",
-"d      c #353530",
-"e      c #ACACAA",
-"f      c #F1F0EF",
-"g      c #DEDDDC",
-"h      c #D3D2D0",
-"i      c #B7B7B5",
-"j      c #9F9E9D",
-"k      c #706F6F",
-"l      c #65625A",
-"m      c #46463F",
-"n      c #9C9C8C",
-"o      c #E2E2D0",
-"p      c #EDEDE7",
-"q      c #C0C0AC",
-"r      c #B2B29F",
-"s      c #828274",
-"t      c #4C4C44",
-"u      c #E4E4E2",
-"v      c #E1E1DF",
-"w      c #DAD9D7",
-"x      c #D8D8D6",
-"y      c #CDCCCA",
-"z      c #AFAEAC",
-"A      c #88847B",
-"B      c #F8F8F7",
-"C      c #090908",
-"D      c #D5D5BF",
-"E      c #FBFBFA",
-"F      c #C3C3AE",
-"G      c #B5B5A2",
-"H      c #A6A695",
-"I      c #9C9C8F",
-"J      c #080807",
-"K      c #CFCFCD",
-"L      c #E3E2E0",
-"M      c #ECEBE9",
-"N      c #E9E8E6",
-"O      c #D5D4D3",
-"P      c #C4C3C2",
-"Q      c #8F8A81",
-"R      c #F6F5F4",
-"S      c #F3F3F1",
-"T      c #090909",
-"U      c #CACAB5",
-"V      c #DDDDD0",
-"W      c #B7B7A4",
-"X      c #AAAA98",
-"Y      c #9B9B8B",
-"Z      c #AEAEA3",
-"`      c #BBBAB9",
-" .     c #E8E7E5",
-"..     c #E5E4E2",
-"+.     c #E4E3E0",
-"@.     c #D2D1CE",
-"#.     c #8D887E",
-"$.     c #F4F3F2",
-"%.     c #F0EFEE",
-"&.     c #474740",
-"*.     c #929283",
-"=.     c #BABAA7",
-"-.     c #ADAD9B",
-";.     c #9F9F8E",
-">.     c #ACACA1",
-",.     c #CFCFCB",
-"'.     c #4C4C45",
-").     c #B3B2B1",
-"!.     c #E2E1DE",
-"~.     c #E1DFDC",
-"{.     c #979288",
-"].     c #949493",
-"^.     c #34342F",
-"/.     c #878779",
-"(.     c #A0A090",
-"_.     c #AEAEA2",
-":.     c #C3C3BE",
-"<.     c #010101",
-"[.     c #B1B0AF",
-"}.     c #D2D1CF",
-"|.     c #A49E93",
-"1.     c #F0F0EE",
-"2.     c #EDEDEB",
-"3.     c #DDDDDB",
-"4.     c #898988",
-"5.     c #414141",
-"6.     c #737271",
-"7.     c #A4A3A1",
-"8.     c #DFDEDB",
-"9.     c #E2E0DD",
-"0.     c #E1E0DC",
-"a.     c #E0DFDB",
-"b.     c #A19C90",
-"c.     c #E1E0DE",
-"d.     c #CBCAC9",
-"e.     c #B2B1B0",
-"f.     c #A3A2A1",
-"g.     c #9D9C9A",
-"h.     c #9E9D9C",
-"i.     c #9F9F9D",
-"j.     c #ABAAA7",
-"k.     c #DCDBD7",
-"l.     c #DEDDD9",
-"m.     c #DDDCD8",
-"n.     c #A19B90",
-"o.     c #EBEAE8",
-"p.     c #E6E5E3",
-"q.     c #C8C7C4",
-"r.     c #B6B6B3",
-"s.     c #B0AFAD",
-"t.     c #B3B2B0",
-"u.     c #747371",
-"v.     c #9D9C99",
-"w.     c #DAD9D5",
-"x.     c #E7E6E3",
-"y.     c #E6E5E2",
-"z.     c #E3E2DF",
-"A.     c #DBDAD7",
-"B.     c #D4D3D0",
-"C.     c #D0CFCB",
-"D.     c #D1CFCC",
-"E.     c #D1D0CC",
-"F.     c #C9C8C4",
-"G.     c #6B6B69",
-"H.     c #CECDC9",
-"I.     c #D6D4D0",
-"J.     c #9F998D",
-"K.     c #E3E2DE",
-"L.     c #E4E2DF",
-"M.     c #DFDEDA",
-"N.     c #D5D4D0",
-"O.     c #C0BFBC",
-"P.     c #7B7A78",
-"Q.     c #BCBAB6",
-"R.     c #CECCC8",
-"S.     c #9D978C",
-"T.     c #EDEDED",
-"U.     c #E1E0DD",
-"V.     c #E2E1DD",
-"W.     c #DBDAD6",
-"X.     c #BBB9B6",
-"Y.     c #A6A4A1",
-"Z.     c #9E9C99",
-"`.     c #ACABA7",
-" +     c #C7C5C2",
-".+     c #9B9589",
-"++     c #E1DFDB",
-"@+     c #E0DEDA",
-"#+     c #DEDCD8",
-"$+     c #DAD8D4",
-"%+     c #BDBCB8",
-"&+     c #ACABA8",
-"*+     c #B2B1AD",
-"=+     c #C6C4C0",
-"-+     c #999388",
-";+     c #999891",
-">+     c #A39E92",
-",+     c #A39D92",
-"'+     c #A39D91",
-")+     c #A29C90",
-"!+     c #A19B8F",
-"~+     c #9D978B",
-"{+     c #989286",
-"]+     c #918C82",
-"^+     c #938D83",
-"/+     c #979286",
-"(+     c #666258",
-"                                                ",
-"      . . . . . . . . . . . . .                 ",
-"    . + @ # # # # # # # # $ % & .               ",
-"    . @ # # # # # # # # # # * = - .             ",
-"    . # # # # # # # ; # ; > , ' ) ! .           ",
-"    . # # # # # ; > ~ > ~ { ] ^ # / ( .         ",
-"    . # # # ; > ~ { _ { _ : < ) # [ } | .       ",
-"    . # ; > ~ 1 2 3 3 4 5 6 7 . . . . . . .     ",
-"    . # ~ { 8 9 0 a b c d e f g h i j k l .     ",
-"    . # _ : m n o p q r s t u v w x y z A .     ",
-"    . # B 6 C D E F G H I J K L M N O P Q .     ",
-"    . # R S T U V W X Y Z 3 ` w  ...+.@.#..     ",
-"    . # $.%.&.*.=.-.;.>.,.'.).h !.+.!.~.{..     ",
-"    . # $.%.].^./.(._.:.<.<.[.}.!.+.!.~.|..     ",
-"    . # 1.2.3.4.4 3 3 5.6.<.<.7.8.9.0.a.b..     ",
-"    . # 2.M c.d.e.f.g.h.i.<.<.<.j.k.l.m.n..     ",
-"    . # o.N p.w q.r.z s.t.u.. <.<.v.w.k.n..     ",
-"    . # x.y.y.z.A.B.C.D.E.F.G.<.<.<.H.I.J..     ",
-"    . $ +.z.K.L.K.a.a.M.M.N.O.P.<.<.Q.R.S..     ",
-"    . T.U.~.0.a.V.a.0.a.0.W.E.X.Y.Z.`. +.+.     ",
-"    . = ++@+M.l.a.l.@+l.@+#+$+R.%+&+*+=+-+.     ",
-"    . ;+>+|.,+'+,+b.)+b.)+!+n.~+{+]+^+/+(+.     ",
-"      . . . . . . . . . . . . . . . . . .       ",
-"                                                "};
diff --git a/lisp/toolbar/spell.pbm b/lisp/toolbar/spell.pbm
deleted file mode 100644
index 39a00c8946a..00000000000
--- a/lisp/toolbar/spell.pbm
+++ /dev/null
diff --git a/lisp/toolbar/spell.xpm b/lisp/toolbar/spell.xpm
deleted file mode 100644
index b53f4510602..00000000000
--- a/lisp/toolbar/spell.xpm
+++ /dev/null
@@ -1,64 +0,0 @@
-/* XPM */
-static char * spell_xpm[] = {
-"24 24 37 1",
-"       c None",
-".      c #000000",
-"+      c #8BBB8C",
-"@      c #ABD0AC",
-"#      c #1A3B1A",
-"$      c #8ABA88",
-"%      c #B4D5B4",
-"&      c #70A770",
-"*      c #132C13",
-"=      c #77A676",
-"-      c #2D2D2D",
-";      c #CBDFCB",
-">      c #6FAE6E",
-",      c #A8CBA6",
-"'      c #6D9D6C",
-")      c #D0E4D0",
-"!      c #6FAF6F",
-"~      c #587055",
-"{      c #B8D6B8",
-"]      c #5B9159",
-"^      c #D4E4D4",
-"/      c #67AF67",
-"(      c #5D905B",
-"_      c #9FC59D",
-":      c #93BE92",
-"<      c #B5D1B5",
-"[      c #67AF68",
-"}      c #63A261",
-"|      c #BBD6BA",
-"1      c #82B881",
-"2      c #75AF74",
-"3      c #6B8868",
-"4      c #9DC39D",
-"5      c #7DB17B",
-"6      c #6BA368",
-"7      c #485C46",
-"8      c #89BA88",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"  ...  ....   ...       ",
-" ..  . ..  . ..  .      ",
-" ..  . ....  ..         ",
-" ..... ..  . ..         ",
-" ..  . ..  . ..  .   .  ",
-" ..  . ....   ...   ... ",
-"                   .+.  ",
-"         ..       .@#   ",
-"         .$.     .%&.   ",
-"          *=.   -;>.    ",
-"          .,'. .)!~.    ",
-"           .{].^/(.     ",
-"           ._:<[}~.     ",
-"            .|123.      ",
-"            .4567.      ",
-"             .83.       ",
-"             .37.       ",
-"              ..        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/undo.pbm b/lisp/toolbar/undo.pbm
deleted file mode 100644
index 7f9b8975d2f..00000000000
--- a/lisp/toolbar/undo.pbm
+++ /dev/null
diff --git a/lisp/toolbar/undo.xpm b/lisp/toolbar/undo.xpm
deleted file mode 100644
index ca5bd760937..00000000000
--- a/lisp/toolbar/undo.xpm
+++ /dev/null
@@ -1,58 +0,0 @@
-/* XPM */
-static char * undo_xpm[] = {
-"24 24 31 1",
-"       c None",
-".      c #000000",
-"+      c #EFE5BA",
-"@      c #EFE7C1",
-"#      c #EED680",
-"$      c #EFE4B6",
-"%      c #D5B75D",
-"&      c #B29544",
-"*      c #D1B051",
-"=      c #C0AF73",
-"-      c #C0A048",
-";      c #986B07",
-">      c #D1940C",
-",      c #E0B74C",
-"'      c #D9C374",
-")      c #8F6406",
-"!      c #D59D1C",
-"~      c #B1933F",
-"{      c #DFB74A",
-"]      c #CCB76D",
-"^      c #B8820A",
-"/      c #D9A72E",
-"(      c #D7A62C",
-"_      c #C7B26A",
-":      c #D4B150",
-"<      c #A39256",
-"[      c #E2CB79",
-"}      c #C9B46B",
-"|      c #8D7E4A",
-"1      c #AE9C5C",
-"2      c #96864F",
-"                        ",
-"                        ",
-"                        ",
-"          .             ",
-"         ..             ",
-"        .+.             ",
-"       .@#....          ",
-"      .$####%&.         ",
-"     .+#######*.        ",
-"    .=#########-.       ",
-"     .;>>>>>>,#'..      ",
-"      .)>>>>>>!#~.      ",
-"       .)>...;>{].      ",
-"        .;. ..^/#.      ",
-"         ..  ..>#.      ",
-"          .   .(_.      ",
-"              .:<.      ",
-"              .[.       ",
-"             .}|.       ",
-"            .12.        ",
-"             ..         ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/toolbar/up_arrow.pbm b/lisp/toolbar/up_arrow.pbm
deleted file mode 100644
index 7c792bef796..00000000000
--- a/lisp/toolbar/up_arrow.pbm
+++ /dev/null
diff --git a/lisp/toolbar/up_arrow.xpm b/lisp/toolbar/up_arrow.xpm
deleted file mode 100644
index 09963557d1b..00000000000
--- a/lisp/toolbar/up_arrow.xpm
+++ /dev/null
@@ -1,94 +0,0 @@
-/* XPM */
-static char * up_arrow_xpm[] = {
-"24 24 67 1",
-"       c None",
-".      c #000000",
-"+      c #2F2F2F",
-"@      c #A5B4A4",
-"#      c #E8F4E6",
-"$      c #96B892",
-"%      c #41533C",
-"&      c #F1FFF0",
-"*      c #B8D6B7",
-"=      c #9FC49D",
-"-      c #66815E",
-";      c #B6D4B5",
-">      c #B9D7B8",
-",      c #A1C69F",
-"'      c #68835F",
-")      c #637D5B",
-"!      c #3F5239",
-"~      c #B8D7B7",
-"{      c #A2C7A0",
-"]      c #6A8561",
-"^      c #657F5C",
-"/      c #617959",
-"(      c #3E4F39",
-"_      c #F0FEEF",
-":      c #B7D5B6",
-"<      c #657E5C",
-"[      c #5D7555",
-"}      c #D6EAD6",
-"|      c #BFD4BF",
-"1      c #C0D5C0",
-"2      c #637C5B",
-"3      c #4D6246",
-"4      c #4C6046",
-"5      c #C7E1C6",
-"6      c #A1C69E",
-"7      c #67815E",
-"8      c #627B59",
-"9      c #3D4E39",
-"0      c #D0E7D0",
-"a      c #B5D3B4",
-"b      c #A0C39D",
-"c      c #607958",
-"d      c #B5D2B4",
-"e      c #9DC19B",
-"f      c #647D5B",
-"g      c #607858",
-"h      c #C6E0C5",
-"i      c #B4D2B3",
-"j      c #9CBF99",
-"k      c #C5DFC4",
-"l      c #B1CEB0",
-"m      c #99BC97",
-"n      c #617A59",
-"o      c #5E7756",
-"p      c #C0D9BF",
-"q      c #AFCCAE",
-"r      c #AECBAD",
-"s      c #93B690",
-"t      c #607857",
-"u      c #5E7656",
-"v      c #8DB389",
-"w      c #748A72",
-"x      c #71916E",
-"y      c #5A7257",
-"z      c #4D6247",
-"A      c #4D6146",
-"B      c #43543D",
-"                        ",
-"                        ",
-"           .            ",
-"          +@.           ",
-"         .#$%.          ",
-"        .&*=-%.         ",
-"       .&;>,')!.        ",
-"      .&~;>{]^/(.       ",
-"     ._~>:>,]</[(.      ",
-"    .}|1>~~,'23444.     ",
-"   .....5;;6789.....    ",
-"       .0;ab^c9.        ",
-"       .5;defg9.        ",
-"       .haij2g9.        ",
-"       .kilmno9.        ",
-"       .pqrstu9.        ",
-"       .vwxyzAB.        ",
-"       .........        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el
index 708dc294f8d..8ee1d5f9ed9 100644
--- a/lisp/tree-widget.el
+++ b/lisp/tree-widget.el
@@ -434,16 +434,25 @@ Return the image found, or nil if not found."
 
 ;;; Widgets
 ;;
+(defun tree-widget-button-click (event)
+  "Move to the position clicked on, and if it is a button, invoke it.
+EVENT is the mouse event received."
+  (interactive "e")
+  (mouse-set-point event)
+  (let ((pos (widget-event-point event)))
+    (if (get-char-property pos 'button)
+        (widget-button-click event))))
+
 (defvar tree-widget-button-keymap
   (let ((km (make-sparse-keymap)))
     (if (boundp 'widget-button-keymap)
         ;; XEmacs
         (progn
           (set-keymap-parent km widget-button-keymap)
-          (define-key km [button1] 'widget-button-click))
+          (define-key km [button1] 'tree-widget-button-click))
       ;; Emacs
       (set-keymap-parent km widget-keymap)
-      (define-key km [down-mouse-1] 'widget-button-click))
+      (define-key km [down-mouse-1] 'tree-widget-button-click))
     km)
   "Keymap used inside node buttons.
 Handle mouse button 1 click on buttons.")
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 3eb850f85f3..d7a822e105a 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-15  Richard M. Stallman  <rms@gnu.org>
+
+        * url.el: Don't try to autoload hash table functions.
+
 2005-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * url-http.el (url-http-create-request): Avoid incorrect implicit
diff --git a/lisp/url/url.el b/lisp/url/url.el
index ef101fe6f2a..4a1e157e59d 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -30,16 +30,6 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
-;; Don't require CL at runtime if we can avoid it (Emacs 21).
-;; Otherwise we need it for hashing functions.  `puthash' was never
-;; defined in the Emacs 20 cl.el for some reason.
-(if (fboundp 'puthash)
-    nil                                 ; internal or CL is loaded
-  (defalias 'puthash 'cl-puthash)
-  (autoload 'cl-puthash "cl")
-  (autoload 'gethash "cl")
-  (autoload 'maphash "cl")
-  (autoload 'make-hash-table "cl"))
 
 (eval-when-compile
   (require 'mm-decode)
@@ -236,6 +226,10 @@ no further processing).  URL is either a string or a parsed URL."
 
 (defun url-mm-url (url)
   "Retrieve URL and pass to the appropriate viewing application."
+  ;; These requires could advantageously be moved to url-mm-callback or
+  ;; turned into autoloads, but I suspect that it would introduce some bugs
+  ;; because loading those files from a process sentinel or filter may
+  ;; result in some undesirable carner cases.
   (require 'mm-decode)
   (require 'mm-view)
   (url-retrieve url 'url-mm-callback nil))
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 9dea809dc91..1d5cb3625f0 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -660,6 +660,16 @@ button is pressed or inactive, respectively.  These are currently ignored."
                             tag 'mouse-face widget-button-pressed-face)))
     (insert tag)))
 
+(defun widget-move-and-invoke (event)
+  "Move to where you click, and if it is an active field, invoke it."
+  (interactive "e")
+  (mouse-set-point event)
+  (if (widget-event-point event)
+      (let* ((pos (widget-event-point event))
+             (button (get-char-property pos 'button)))
+        (if button
+            (widget-button-click event)))))
+
 ;;; Buttons.
 
 (defgroup widget-button nil
@@ -3012,7 +3022,8 @@ It will read a file name from the minibuffer when invoked."
            (with-output-to-temp-buffer "*Completions*"
              (display-completion-list
               (sort (file-name-all-completions name-part directory)
-                    'string<)))
+                    'string<)
+              name-part))
            (message "Making completion list...%s" "done")))))
 
 (defun widget-file-prompt-value (widget prompt value unbound)
@@ -3571,7 +3582,8 @@ example:
           (t
            (message "Making completion list...")
            (with-output-to-temp-buffer "*Completions*"
-             (display-completion-list (all-completions prefix list nil)))
+             (display-completion-list (all-completions prefix list nil)
+                                      prefix))
            (message "Making completion list...done")))))
 
 (defun widget-color-sample-face-get (widget)
diff --git a/lisp/woman.el b/lisp/woman.el
index bc7ec86e4a7..5e8aff75e7f 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -424,6 +424,11 @@
 (defvar woman-version "0.551 (beta)" "WoMan version information.")
 
 (require 'man)
+(require 'button)
+(define-button-type 'WoMan-xref-man-page 
+  :supertype 'Man-abstract-xref-man-page
+  'func 'woman)
+
 (eval-when-compile                      ; to avoid compiler warnings
   (require 'dired)
   (require 'apropos))
@@ -1864,7 +1869,7 @@ See `Man-mode' for additional details."
   (setq woman-imenu-done nil)
   (if woman-imenu (woman-imenu))
   (let (buffer-read-only)
-    (Man-highlight-references))
+    (Man-highlight-references 'WoMan-xref-man-page))
   (set-buffer-modified-p nil)
   (run-mode-hooks 'woman-mode-hook))