Imported version 1.7.1 from tarball

Fixed bug in dictionary-coding-system, the detection of non-mule
Emacsen was not correct (patch submitted by Robert Pluim)

3 files changed, 36 insertions, 26 deletions

diff --git a/README b/README
index 08d762d..4973c85 100644
--- a/README
+++ b/README
@@ -59,7 +59,7 @@
    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.7) of this package
+     * Current version (1.7.1) of this package
      * Version 1.5.1 of this package
      * Version 1.4.1 of this package
      * Version 1.3.3 of this package
@@ -80,14 +80,14 @@
                              Unpacking the archive
 
    The package is distributed as tar.gz file. You unpack it using:
-gzip -dc dictionary-1.7.tar.gz | tar xf -
+gzip -dc dictionary-1.7.1.tar.gz | tar xf -
 
    or
-tar -xzf dictionary-1.7.tar.gz
+tar -xzf dictionary-1.7.1.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.7 has been created
+   unpacking  the  archive  a directory dictionary-1.7.1 has been created
    containing the necessary files.
 
                                  Installation
@@ -99,12 +99,12 @@ Debian
    dpkg-buildpackage) you can use the supplied debian support.
 make debian
 
-   This will create a package named dictionary-1.7-1_i386.deb or similiar
-   in  the  parent  directory of dictionary-1.7. You can now install this
-   package  as  root,  it  will automatically byte-compile itself for all
-   installed  emacs  versions  and provide a startup-file which autoloads
-   this  package.  In  the configuration example given below you can omit
-   the autoload lines.
+   This  will  create  a  package  named  dictionary-1.7.1-1_i386.deb  or
+   similiar  in  the  parent  directory  of dictionary-1.7.1. You can now
+   install  this  package  as  root,  it  will automatically byte-compile
+   itself  for  all  installed  emacs versions and provide a startup-file
+   which autoloads this package. In the configuration example given below
+   you can omit the autoload lines.
 
    If you no longer want to use this package, you can remove it using:
 dpkg -r dictionary
@@ -468,8 +468,8 @@ Support for different encodings in dictionaries
 
    I  want  to thank Sam Steingold, Baoqiu Cui, Bruce Ravel, Pavel Janík,
    Sergei  Pokrovsky,  Jeff  Mincy,  Serge  Boiko,  Enrico Scholz, Reuben
-   Thomas,  Rui  Zhu,  and  Eugene Morozov for their valuable suggestions
-   (including patches) for improving this package.
+   Thomas,  Rui  Zhu, Eugene Morozov, and Robert Pluim for their valuable
+   suggestions (including patches) for improving this package.
 
                                     License
 
@@ -488,6 +488,11 @@ Support for different encodings in dictionaries
 
                                   ChangeLogs
 
+Version 1.7 - 1.7.1
+
+     * fixed  mule-detection in dictionary-coding-system (patch submitted
+       by Robert Pluim)
+
 Version 1.5.1 - 1.7
 
      * added HTTP proxy support (using the CONNECT method)
@@ -578,5 +583,4 @@ Version 1.0 - 1.1
      _________________________________________________________________
 
    E-Mail: dictionary@myrkr.in-berlin.de
-   Last modified: Sun Dec 9 21:07:51 CET 2001
-
+   Last modified: Sat Dec 15 14:34:54 CET 2001
diff --git a/debian/changelog b/debian/changelog
index 490c1df..9a0948d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
+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 <email@myrkr.in-berlin.de>  Sun,  9 Dec 2001 14:21:57 +0100
+ -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Sun,  9 Dec 2001 14:21:57 +0100
 
 dictionary (1.6-1) unstable; urgency=low
 
diff --git a/dictionary.el b/dictionary.el
index db9cf9c..ef1d5c7 100644
--- a/dictionary.el
+++ b/dictionary.el
@@ -2,7 +2,7 @@
 
  ;; Author: Torsten Hilbrich <dictionary@myrkr.in-berlin.de>
  ;; Keywords: interface, dictionary
- ;; $Id: dictionary.el,v 1.30 2001/12/09 14:40:04 torsten Exp $
+ ;; $Id: dictionary.el,v 1.32 2001/12/15 13:37:10 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
@@ -488,16 +488,15 @@ This function knows about the special meaning of quotes (\")"
 
 (defun dictionary-coding-system (dictionary)
   "Select coding system to use for that dictionary"
-  (unless (boundp 'dictionary-coding-systems-for-dictionaries)
-    nil)
-  (let ((coding-system
-	 (or (cdr (assoc dictionary
-			 dictionary-coding-systems-for-dictionaries))
-	     'utf-8)))
-    (if (member coding-system (coding-system-list))
-	coding-system
-      nil)))
-    
+  (when (boundp 'dictionary-coding-systems-for-dictionaries)
+    (let ((coding-system
+           (or (cdr (assoc dictionary
+                           dictionary-coding-systems-for-dictionaries))
+               'utf-8)))
+      (if (member coding-system (coding-system-list))
+          coding-system
+        nil))))
+
 (defun dictionary-decode-charset (text dictionary)
   "Convert the text from the charset defined by the dictionary given."
   (let ((coding-system (dictionary-coding-system dictionary)))