From 05047f3e2b114acbe76355cdbc67209e21f9e809 Mon Sep 17 00:00:00 2001
From: Torsten Hilbrich <torsten.hilbrich@gmx.net>
Date: Fri, 20 Sep 2002 22:22:00 +0200
Subject: Imported version 1.8.3 from tarball

Fixed multiple defined function in dictionary.el
---
 deb/changelog   |  8 +++++++-
 deb/changelog~  |  6 ++++++
 dictionary.el   |  6 ------
 package-info.in | 19 -------------------
 4 files changed, 13 insertions(+), 26 deletions(-)
 delete mode 100644 package-info.in

diff --git a/deb/changelog b/deb/changelog
index 425d785..767c8e5 100644
--- a/deb/changelog
+++ b/deb/changelog
@@ -1,4 +1,10 @@
-dictionary (1.8-2) unstable; urgency=low
+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
 
diff --git a/deb/changelog~ b/deb/changelog~
index 86c3080..425d785 100644
--- a/deb/changelog~
+++ b/deb/changelog~
@@ -1,3 +1,9 @@
+dictionary (1.8-2) 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.
diff --git a/dictionary.el b/dictionary.el
index af98a88..7a0b580 100644
--- a/dictionary.el
+++ b/dictionary.el
@@ -938,12 +938,6 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
       (error "Unknown server answer: %s" (dictionary-reply reply)))
     (funcall function reply)))
 
-(defun dictionary-display-match-result (reply)
-  "Display the results from the current matches."
-  (dictionary-pre-buffer)
-  (dictionary-display-only-match-result reply)
-  (dictionary-post-buffer))
-
 (defun dictionary-display-only-match-result (reply)
   "Display the results from the current matches without the headers."
 
diff --git a/package-info.in b/package-info.in
deleted file mode 100644
index a16dfcc..0000000
--- a/package-info.in
+++ /dev/null
@@ -1,19 +0,0 @@
-(dictionary
-  (standards-version 1.1
-   version VERSION
-   author-version AUTHOR_VERSION
-   date DATE
-   build-date BUILD_DATE
-   maintainer MAINTAINER
-   distribution xemacs
-   priority low
-   category CATEGORY
-   dump nil
-   description "Interface to RFC2229 dictionary servers."
-   filename FILENAME
-   md5sum MD5SUM
-   size SIZE
-   provides (dictionary connection link)
-   requires (REQUIRES)
-   type regular
-))
-- 
cgit v1.2.3