Imported version 1.3 from tarball

Implemented an automatic detection for line ends CR/LF and LF. The
variable connection-broken-end-of-line is no longer necessary and its
value ignored.

Added utf-8 support, the native character set of the dictionary
protocol. Using ISO-8859-1 (aka latin-1) was just a necessary
work-around.

15 files changed, 49 insertions, 403 deletions

diff --git a/README b/README
index 32904eb..eb9c5d5 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ Introduction
 Recently I installed the dictd server, which can be used to access several
 dictionaries using a simple protocol as defined in RFC 2229 (Text Version).
 
-As my primary working environment is XEmacs 20.4, I decided to write an
+As my primary working environment is XEmacs 21, I decided to write an
 Emacs-Lisp package for accessing this dictionary server. The older
 webster.el didn't worked with the newer protocol. After starting the
 implementation I was pointed to an already existing implementation, but this
@@ -13,7 +13,7 @@ was basically a wrapper to the dict client program and didn't have all the
 features I wanted.
 
 If you didn't received this file from its original location you can visit it
-at http://www.in-berlin.de/User/myrkr/dictionary.html
+at http://me.in-berlin.de/~myrkr/dictionary.html
 
 Features
 
@@ -26,8 +26,8 @@ The dictionary mode provides the following features:
    * easy selection of dictionary and search strategy
    * backward moving through the visited definitions
 
-Here is a sample screenshot showing the dictionary mode in action within a
-XEmacs buffer:
+Here is a sample screenshot showing the dictionary mode in action within an
+Emacs 21 buffer:
 
 [Image]
 
@@ -43,8 +43,10 @@ Download and Requirements
 I have tested the package with a native GNU Emacs 19.34.1 and XEmacs 20.4. I
 implemented some hacks to work with the very very old custom.el file in the
 above GNU Emacs. Please update to the current version whenever possible.
+XEmacs 21 and Emacs 20 as well as Emacs 21 have been tested too.
 
-   * Current version (1.2.1) of this package
+   * Current version (1.3) of this package
+   * Version 1.2.1 of this package
    * Version 1.1 of this package
    * Version 1.0 of this package
 
@@ -54,29 +56,29 @@ You will need the custom package to use this package. For full support
 please check if your system knows the defface function, if not please
 download the current version.
 
-For best usuability I suggest using the mouse, but it provide good keyboard
+For best usability I suggest using the mouse, but it provide good keyboard
 support as well.
 
 Unpacking the archive
 
 The package is distributed as tar.gz file. You unpack it using:
 
-gunzip dictionary-1.2.1.tar.gz | tar xf -
+gunzip dictionary-1.3.tar.gz | tar xf -
 
 or
 
-tar -xzf dictionary-1.2.1.tar.gz
+tar -xzf dictionary-1.3.tar.gz
 
 (with the version number subject to change) depending on whether you are
 using GNU tar which support the z flag for compression. After unpacking the
-archive a directory dictionary-1.2.1 has been created containing the
-necessary files.
+archive a directory dictionary-1.3 has been created containing the necessary
+files.
 
 Byte compiling
 
 For faster loading and executing of the package I strongly suggest that you
-bytecompile the files. Emacs user please call make within the create
-subdirectory, XEmacs user has to specifiy there favorite tool using make
+byte-compile the files. Emacs user please call make within the create
+subdirectory, XEmacs user has to specify there favorite tool using make
 EMACS=xemacs. If your custom package is not up-to-date expect some warnings
 about free variables.
 
@@ -96,16 +98,18 @@ dictionary package whenever needed. I suggest using the following lines:
   "Ask for a word and search it in all dictionaries" t)
 (autoload 'dictionary-match-words "dictionary"
   "Ask for a word and search all matching words in the dictionaries" t)
+(autoload 'dictionary-lookup-definition "dictionary"
+  "Unconditionally lookup the word at point." t)
 (autoload 'dictionary "dictionary"
   "Create a new dictionary buffer" t)
 
-In addition, some keybindings for faster access can be useful. I use the
+In addition, some key bindings for faster access can be useful. I use the
 following ones in my installation:
 
 (global-set-key [(control c) ?s] 'dictionary-search)
 (global-set-key [(control c) ?m] 'dictionary-match-words)
 
-I will describe the user-callable functions and the keybindings within
+I will describe the user-callable functions and the key bindings within
 dictionary mode later in this document.
 
 Using the package
@@ -122,7 +126,7 @@ pattern
      as a single word but also as complex as a POSIX regular expression. The
      meaning of a pattern depends on the strategy used for matching words.
 dictionary
-     The server can handle serveral distinct dictionaries. You can select
+     The server can handle several distinct dictionaries. You can select
      specific dictionaries or ask the server to search in all dictionaries
      or until matches or definitions are found. To search in all
      dictionaries the special name * is used, the special name ! requests to
@@ -137,7 +141,7 @@ match
 strategy
      While matching in a dictionary serveral methods for comparing words can
      be used. These methods are named strategies and include exact match,
-     regualare expression match, and soundex match. The available strategies
+     regular expression match, and soundex match. The available strategies
      depends on the server, but a special name . can be used to denote a
      server-default strategy.
 
@@ -146,7 +150,7 @@ Invoking
 There are four different (documented) ways of invoking the package. By
 calling dictionary you can start a new dictionary buffer waiting for your
 commands. If you want to create multiple buffers for searching the
-dictionary, you can run this function muliple times. dictionary-search will
+dictionary, you can run this function multiple times. dictionary-search will
 ask for a word a search defaulting to the word at point and present all
 definitions found.
 
@@ -163,10 +167,6 @@ You can have multiple independent dictionary buffer. If the above functions
 are called from within dictionary mode they reuse the existing buffer.
 Otherwise they create a new buffer.
 
-If you encounter emacs blocking forever while searching an entry and you are
-using MULE you should check the value of the connection-broken-end-of-line
-variable, which can be set to t in this case.
-
 Quitting
 
 Once a dictionary buffer is created you can close it by simply typing q
@@ -178,14 +178,14 @@ reestablish it when the buffer is being closed.
 
 Using the buffer
 
-After a successful search the buffer is devided into two sections. The first
+After a successful search the buffer is divided into two sections. The first
 one is the button area at the top, the other one is the text buffer
 displaying the result. By pressing the buttons you can select some functions
 that are otherwise inaccessible with the mouse.
 
 In the text are each definition is introduced by the name of the database
 that contains it. In the default configuration this text is in italic face.
-The definition itself can contains hyperlinks that are marked using blue
+The definition itself can contains hyper links that are marked using blue
 foreground and both sensitive to clicking with the mouse and pressing return
 while being within the link.
 
@@ -195,7 +195,7 @@ the l key (dictionary-previous) to return the previous buffer contents.
 
 Pressing Meta while clicking on a link to start the search will extent the
 search to all dictionaries (dictionary-default-dictionary to be more
-precisly).
+precisely).
 
 If you prefer using the keyboard it can be very frustrating to use the
 cursor key to position the point before pressing return to visit the link is
@@ -290,8 +290,9 @@ starting from C-c a to C-c z.
 
 Thanks
 
-I want to thank Sam Steingold, Baoqiu Cui, and Bruce Ravel for their
-valuable suggestions (including patches) for improving this package.
+I want to thank Sam Steingold, Baoqiu Cui, Bruce Ravel, Pavel Janík, and
+Sergei Pokrovsky for their valuable suggestions (including patches) for
+improving this package.
 
 License
 
@@ -310,6 +311,15 @@ along with this package; see the file GPL.
 
 ChangeLogs
 
+Version 1.2.1 - 1.3
+
+   * Implemented an automatic detection for line ends CR/LF and LF. The
+     variable connection-broken-end-of-line is no longer necessary and its
+     value ignored.
+   * Added utf-8 support, the native character set of the dictionary
+     protocol. Using ISO-8859-1 (aka latin-1) was just a necessary
+     work-around.
+
 Version 1.2 - 1.2.1
 
    * Corrected dictionary command to draw the button bar.
@@ -350,4 +360,4 @@ Version 1.0 - 1.1
 
   ------------------------------------------------------------------------
 Torsten Hilbrich
-Last modified: Sun May 7 11:06:16 CEST 2000
+Last modified: Thu Apr 26 19:50:39 CEST 2001
diff --git a/connection.el b/connection.el
index c83be81..e92a9ff 100644
--- a/connection.el
+++ b/connection.el
@@ -2,7 +2,7 @@
 
 ;; Author: Torsten Hilbrich <Torsten.Hilbrich@gmx.net>
 ;; Keywords: network
-;; $Id: connection.el,v 1.6 2000/04/16 08:45:21 torsten Exp $
+;; $Id: connection.el,v 1.7 2001/04/26 16:56:21 torsten Exp $
 
 ;; This file is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -22,18 +22,6 @@
 (eval-when-compile
   (require 'cl))
 
-(defcustom connection-broken-end-of-line
-  nil
-  "Set to t (on) if you use a MULE Emacsen and have problems while connecting.
-Usually for the dict protocol, the end of line characters are \\r\\n.
-However, some users reported problems with using Emacs 20.3 and MULE
-which seems to convert the \\r\\n to \\n while inserting the text into
-the buffer.  If you encounter these problems please set the value to t
-and try again.
-"
-  :group 'dictionary
-  :type 'boolean)
-
 (defmacro connection-p (connection)
   "Returns non-nil if `connection' is a connection object"
   (list 'get connection ''connection))
@@ -143,7 +131,7 @@ nil: argument is no connection object
       (set-buffer (connection-buffer connection))
       (goto-char (connection-read-point connection))
       ;; Wait until there is enough data 
-      (while (not (search-forward delimiter nil t))
+      (while (not (search-forward-regexp delimiter nil t))
 	(accept-process-output (connection-process connection) 3)
 	(goto-char (connection-read-point connection)))
       (setq match-end (point))
@@ -155,15 +143,10 @@ nil: argument is no connection object
 
 (defun connection-read-crlf (connection)
   "Read until a line is completedx with CRLF"
-  (connection-read connection (if connection-broken-end-of-line
-				  "\n"
-				"\r\n")))
+  (connection-read connection "\015?\012"))
 
 (defun connection-read-to-point (connection)
   "Read until a line is consisting of a single point"
-  (connection-read connection (if connection-broken-end-of-line
-				  "\n.\n"
-				"\r\n.\r\n")))
-
+  (connection-read connection "\015?\012[.]\015?\012"))
 
 (provide 'connection)
\ No newline at end of file
diff --git a/deb/README.debian b/deb/README.debian
deleted file mode 100755
index d5bf0de..0000000
--- a/deb/README.debian
+++ /dev/null
@@ -1,14 +0,0 @@
-dictionary for Debian
-----------------------
-
-This is an unofficial debian package for the dictionary client found
-at http://www.myrkr.in-berlin.de/dictionary.html.
-
-A official package named 'dictionary-el' is now maintained by Aaron
-M. Ucko <ucko@debian.org>, as debian user you probably should use this
-package.
-
-Instructions on using this package can be found in the
-/usr/share/doc/dictionary/README.gz file or in the above location.
-
-Torsten Hilbrich <dictionary@myrkr.in-berlin.de>, Sun, 13 May 2001 09:55:20 +0200
diff --git a/deb/changelog b/deb/changelog
deleted file mode 100755
index 2c6d6d2..0000000
--- a/deb/changelog
+++ /dev/null
@@ -1,158 +0,0 @@
-dictionary (1.8.7-1) unstable; urgency=low
-
-  * fixed decoding problem when selecting dictionary (problem reported by
-    Kuno Strassmann)
-
- -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Sat,  2 Oct 2004 08:05:37 +0200
-
-dictionary (1.8.6-1) unstable; urgency=low
-
-  * added patch fixing the wrong display of dictionary description
-    (provided by Sergei Pokrovsky)
-  * added dictionary-description-open-delimiter and
-    dictionary-description-close-delimiter (suggested by Sergei Pokrovsky)
-
- -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Sat, 25 Sep 2004 17:05:51 +0200
-
-dictionary (1.8.5-1) unstable; urgency=low
-
-  * added variable dictionary-use-single-buffer to allow selecting
-    between single/multiple buffers for dictionary access
-  * added tooltip support for XEmacs based on balloon-help
-
- -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Sat, 21 Jun 2003 18:55:54 +0200
-
-dictionary (1.8.4-1) unstable; urgency=low
-
-  * install-pkg was missing in the last tarball
-
- -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Sat, 12 Oct 2002 11:58:32 +0200
-
-dictionary (1.8.3-1) unstable; urgency=low
-
-  * Fixed multiple defined function in dictionary.el
-
- -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Fri, 20 Sep 2002 22:19:06 +0200
-
-dictionary (1.8.2-1) unstable; urgency=low
-
-  * fixed Makefile
-
- -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Fri, 14 Jun 2002 19:31:53 +0200
-
-dictionary (1.8-1) unstable; urgency=low
-
-  * added search for similiar words when the searched word is not found.
-
- -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Wed, 20 Mar 2002 21:27:54 +0100
-
-dictionary (1.7.4-1) unstable; urgency=low
-
-  * dictionary.el (dictionary-do-matching): removed quotes around
-    dictionary name and match strategy
-	
-  * dictionary.el (dictionary-do-search): removed quotes around dictionary
-    name
-	
-  * dictionary.el (dictionary-display-more-info): removed quotes around
-    dictionary name
-
-  This problem (occurring with jdictd) was reported by E C Vijil
-
- -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Fri, 15 Mar 2002 21:19:23 +0100
-
-dictionary (1.7.3-1) unstable; urgency=low
-
-  * dictionary.el (dictionary-default-popup-strategy): added this
-    variable and changed dictionary-popup-matching-words to use
-    this as matching strategy (suggested by Renaud Pons)
-
- -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Tue, 29 Jan 2002 10:27:49 +0100
-
-dictionary (1.7.2-1) unstable; urgency=low
-
-  * link.el (link-initialize-keymap): fixed keybinding bug (reported by
-    David A. Panariti)
-
- -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Fri, 21 Dec 2001 18:50:20 +0100
-
-dictionary (1.7.1-1) unstable; urgency=low
-
-  * Fixed bug in dictionary-coding-system, the detection of non-mule
-    Emacsen was not correct
-
- -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Sat, 15 Dec 2001 14:29:29 +0100
-
-dictionary (1.7-1) unstable; urgency=low
-
-  * Added first support for dictionaries with different encodings than
-    utf-8.
-
- -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Sun,  9 Dec 2001 14:21:57 +0100
-
-dictionary (1.6-1) unstable; urgency=low
-
-  * added HTTP proxy support using the CONNECT request type
-
- -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Tue,  4 Dec 2001 20:22:03 +0100
-
-dictionary (1.5.3-1) unstable; urgency=low
-
-  * changed name of "select dictionary" button
-  * "select dictionary" and "select matching strategie" now has a better
-    feedback (by returning to the previous state)
-  * added support for non-colored display, the links are surrounded by
-    braces
-
- -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Sun, 14 Oct 2001 16:08:12 +0200
-
-dictionary (1.5.2-1) unstable; urgency=low
-
-  * popup menu now correctly records the selected window
-
- -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Sun,  2 Sep 2001 10:40:59 +0200
-
-dictionary (1.5.1-1) unstable; urgency=low
-
-  * corrected bug with dictionary-previous (found by Rui Zhu)
-  * corrected key bindings in link.el
-
- -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Tue, 17 Jul 2001 20:47:58 +0200
-
-dictionary (1.5-1) unstable; urgency=low
-
-  * added tooltip support for emacs
-
- -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Sun,  8 Jul 2001 21:01:12 +0200
-
-dictionary (1.4.1-1) unstable; urgency=low
-
-  * changed recognition of utf-8 support (suggested by Enrico Scholz)
-
- -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Fri,  6 Jul 2001 23:08:48 +0200
-
-dictionary (1.4-1) unstable; urgency=low
-
-  * support for popup menus
-
- -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Fri,  6 Jul 2001 19:54:54 +0200
-
-dictionary (1.3.3-1) unstable; urgency=low
-
-  * added support for xemacs 21 packages (no changes for debian)
-
- -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Wed, 27 Jun 2001 17:56:44 +0200
-
-dictionary (1.3.2-1) unstable; urgency=low
-
-  * removed use of set-text-properties in link.el
-
- -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Fri, 22 Jun 2001 21:39:47 +0200
-
-dictionary (1.3.1-1) unstable; urgency=low
-
-  * Initial release.
-
- -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Sun, 13 May 2001 09:55:20 +0200
-
-
diff --git a/deb/control b/deb/control
deleted file mode 100755
index fed4dd5..0000000
--- a/deb/control
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: dictionary
-Section: unofficial
-Priority: optional
-Maintainer: Torsten Hilbrich <dictionary@myrkr.in-berlin.de>
-Build-Depends: dpkg-dev, debmake
-Standards-Version: 3.2.1
-
-Package: dictionary
-Architecture: all
-Depends: emacsen
-Description: dictionary client for emacs 
- This dictionary client provides access to a dictionary server
- (as defined in RFC 2229) from within Emacs or XEmacs.
- .
- It supports utf-8 (currently available in Emacs 21) and allows
- to follow links (marked by {braces}) within the definitions.
- .
- This is an unofficial debian package.
diff --git a/deb/copyright b/deb/copyright
deleted file mode 100755
index b82cc97..0000000
--- a/deb/copyright
+++ /dev/null
@@ -1,13 +0,0 @@
-This package was debianized by Torsten Hilbrich <dictionary@myrkr.in-berlin.de> on Sun, 13 May 2001 09:55:20 +0200.
-
-It was downloaded from http://www.myrkr.in-berlin.de/dictionary.html
-
-Copyright:
-
-dictionary is licensed under the GNU General Public License version 2 or
-higher. 
-
-On Debian systems the full text of this licence can be found
-in /usr/share/common-licenses/GPL.
-
-
diff --git a/deb/dirs b/deb/dirs
deleted file mode 100755
index 9d129ef..0000000
--- a/deb/dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/emacsen-common/packages/install
-usr/lib/emacsen-common/packages/remove
-usr/share/doc/dictionary
-usr/share/emacs/site-lisp
-
diff --git a/deb/install.debian b/deb/install.debian
deleted file mode 100755
index ad76efb..0000000
--- a/deb/install.debian
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-PACKAGE=dictionary
-FLAVOUR=$1
-ELDIR=/usr/share/emacs/site-lisp/
-ELCDIR=/usr/share/$FLAVOUR/site-lisp/
-EFLAGS="-batch -q -l lpath.el -f batch-byte-compile"
-CONFFILE=${ELDIR}/${PACKAGE}-init.el
-CONFDIR=/etc/$FLAVOUR/site-start.d/
-
-SOURCES="dictionary.el connection.el link.el"
-
-case "$FLAVOUR" in
-  emacs) echo "install/$PACKAGE: Ignoring emacs";;
-      *) echo -n "install/$PACKAGE: Byte-compiling for $FLAVOUR..."
-         install -m 755 -d $ELCDIR
-         for i in $SOURCES; do cp $ELDIR/$i $ELCDIR; done
-         (cd $ELCDIR && \
-	   echo '(setq load-path (cons "." load-path))' > lpath.el
-           $FLAVOUR $EFLAGS $SOURCES 2>/dev/null
-           rm lpath.el )
-         cp ${CONFFILE} ${CONFDIR}/50${PACKAGE}.el
-         cd $ELCDIR
-         for i in $SOURCES; do rm -f $ELCDIR/*.el; done
-         echo " done."
-	 ;;
-esac
-
-
-
diff --git a/deb/postinst b/deb/postinst
deleted file mode 100755
index 2333df3..0000000
--- a/deb/postinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-PACKAGE=dictionary
-
-/usr/lib/emacsen-common/emacs-package-install $PACKAGE
-
diff --git a/deb/prerm b/deb/prerm
deleted file mode 100755
index bc7ec08..0000000
--- a/deb/prerm
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-PACKAGE=dictionary
-
-/usr/lib/emacsen-common/emacs-package-remove $PACKAGE
diff --git a/deb/remove.debian b/deb/remove.debian
deleted file mode 100755
index 991d208..0000000
--- a/deb/remove.debian
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-PACKAGE=dictionary
-FLAVOUR=$1
-ELCDIR=/usr/share/$FLAVOUR/site-lisp/
-
-SOURCE="connection.el dictionary.el link.el"
-CONFFILE=/etc/$FLAVOUR/site-start.d/50${PACKAGE}.el
-
-case "$FLAVOUR" in
-  emacs) echo "install/$PACKAGE: Ignoring emacs";;
-      *) echo -n "remove/$PACKAGE: Removing for $FLAVOUR..."
-         cd $ELCDIR
-         for i in $SOURCE; do rm -f ${i}c; done
-         rm ${CONFFILE}
-         echo " done."
-	 ;;
-esac
diff --git a/deb/rules b/deb/rules
deleted file mode 100755
index 1a67696..0000000
--- a/deb/rules
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/make -f
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
-
-package=dictionary
-
-build:
-	$(checkdir)
-	
-	touch build
-
-clean:
-	$(checkdir)
-	-rm -f build
-	-rm -f `find . -name "*~"`
-	-rm -rf debian/tmp debian/files* core debian/substvars
-
-binary-indep: checkroot build
-	$(checkdir)
-# There are no architecture-independent files to be uploaded
-# generated by this package.  If there were any they would be
-# made here.
-
-binary-arch: checkroot build
-	$(checkdir)
-	-rm -rf debian/tmp
-	install -d debian/tmp
-	cd debian/tmp && install -d `cat ../dirs`
-
-	cp dictionary.el connection.el link.el dictionary-init.el \
-		debian/tmp/usr/share/emacs/site-lisp
-	cp debian/install.debian debian/tmp/usr/lib/emacsen-common/packages/install/dictionary
-	chmod 755 debian/tmp/usr/lib/emacsen-common/packages/install/dictionary
-	cp debian/remove.debian debian/tmp/usr/lib/emacsen-common/packages/remove/dictionary
-	chmod 755 debian/tmp/usr/lib/emacsen-common/packages/remove/dictionary
-	
-	debstd README 
-	dpkg-gencontrol -isp
-	chown -R root.root debian/tmp
-	chmod -R go=rX debian/tmp
-	dpkg --build debian/tmp ..
-
-define checkdir
-	test -f debian/rules
-endef
-
-binary: binary-indep binary-arch
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
diff --git a/dictionary-init.el b/dictionary-init.el
deleted file mode 100755
index 540dfc3..0000000
--- a/dictionary-init.el
+++ /dev/null
@@ -1,24 +0,0 @@
-;; $Id: dictionary-init.el,v 1.7 2003/06/21 17:55:15 torsten Exp $
-;; This file contains the autoload definitions that are used by the
-;; debian package and can also be used in a standalone installation
-;; The XEmacs package has some other means to create the autoload
-;; information.
-
-(autoload 'dictionary-search "dictionary"
-  "Ask for a word and search it in all dictionaries" t)
-(autoload 'dictionary-match-words "dictionary"
-  "Ask for a word and search all matching words in the dictionaries" t)
-(autoload 'dictionary-lookup-definition "dictionary"
-  "Unconditionally lookup the word at point." t)
-(autoload 'dictionary "dictionary"
-  "Create a new dictionary buffer" t)
-(autoload 'dictionary-mouse-popup-matching-words "dictionary"
-  "Display entries matching the word at the cursor" t)
-(autoload 'dictionary-popup-matching-words "dictionary"
-  "Display entries matching the word at the point" t)
-(autoload 'dictionary-tooltip-mode "dictionary"
-  "Display tooltips for the current word" t)
-(unless (boundp 'running-xemacs)
-  (autoload 'global-dictionary-tooltip-mode "dictionary"
-    "Enable/disable dictionary-tooltip-mode for all buffers" t))
-
diff --git a/dictionary.el b/dictionary.el
index 7fba27e..f79f735 100644
--- a/dictionary.el
+++ b/dictionary.el
@@ -2,7 +2,7 @@
 
 ;; Author: Torsten Hilbrich <Torsten.Hilbrich@gmx.net>
 ;; Keywords: interface, dictionary
-;; $Id: dictionary.el,v 1.16 2000/05/07 08:56:50 torsten Exp $
+;; $Id: dictionary.el,v 1.17 2001/04/26 16:57:32 torsten Exp $
 
 ;; This file is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -231,8 +231,11 @@ This is a quick reference to this mode describing the default key bindings:
   "Create a new dictonary buffer and install dictionary-mode"
   (interactive)
 
-  (let ((buffer (generate-new-buffer "*Dictionary buffer*"))
-	(window-configuration (current-window-configuration)))
+  (let ((coding-system-for-read 'utf-8)
+	(coding-system-for-write 'utf-8))
+    (let ((buffer (generate-new-buffer "*Dictionary buffer*"))
+	  (window-configuration (current-window-configuration)))
+
     (switch-to-buffer-other-window buffer)
     (dictionary-mode)
     
@@ -240,7 +243,7 @@ This is a quick reference to this mode describing the default key bindings:
     (setq dictionary-window-configuration window-configuration)
     (dictionary-check-connection)
     (dictionary-pre-buffer)
-    (dictionary-post-buffer)))
+    (dictionary-post-buffer))))
 
 (unless dictionary-mode-map
   (setq dictionary-mode-map (make-sparse-keymap))
@@ -525,7 +528,7 @@ This function knows about the special meaning of quotes (\")"
   "Insert the definition for the current word"
   (let ((start (point)))
     (insert reply)
-    (let ((regexp "\\({+\\)\\([^}]+\\)\\(}+\\)"))
+    (let ((regexp "\\({+\\)\\([^ '\"][^}]*\\)\\(}+\\)"))
       (goto-char start)
       (while (< (point) (point-max))
 	(if (search-forward-regexp regexp nil t)
diff --git a/install-package.el b/install-package.el
deleted file mode 100755
index 5b0474e..0000000
--- a/install-package.el
+++ /dev/null
@@ -1,7 +0,0 @@
-(defun install-package ()
-  (interactive)
-  (let ((filename (apply 'concat command-line-args-left)))
-    (message (concat "Installing package " filename))
-    (package-admin-add-binary-package filename)
-    (set-buffer "*Package Output*")
-    (message (buffer-substring (point-min) (point-max)))))