From 73347f4e6674220348ec2294cde19ae25819986b Mon Sep 17 00:00:00 2001
From: Torsten Hilbrich <torsten.hilbrich@gmx.net>
Date: Sat, 2 Oct 2004 08:31:00 +0200
Subject: Imported version 1.8.7 from tarball

fixed decoding problem when selecting dictionary (problem reported by
Kuno Strassmann)
---
 GPL                |  0
 Makefile           | 22 ++++++++++++++++++++++
 README             |  0
 connection.el      |  0
 deb/README.debian  |  0
 deb/changelog      |  7 +++++++
 deb/control        |  0
 deb/copyright      |  0
 deb/dirs           |  0
 dictionary-init.el |  0
 dictionary.el      |  8 +++++---
 install-package.el |  0
 link.el            |  0
 lpath.el           |  0
 14 files changed, 34 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 GPL
 mode change 100644 => 100755 Makefile
 mode change 100644 => 100755 README
 mode change 100644 => 100755 connection.el
 mode change 100644 => 100755 deb/README.debian
 mode change 100644 => 100755 deb/changelog
 mode change 100644 => 100755 deb/control
 mode change 100644 => 100755 deb/copyright
 mode change 100644 => 100755 deb/dirs
 mode change 100644 => 100755 dictionary-init.el
 mode change 100644 => 100755 dictionary.el
 mode change 100644 => 100755 install-package.el
 mode change 100644 => 100755 link.el
 mode change 100644 => 100755 lpath.el

diff --git a/GPL b/GPL
old mode 100644
new mode 100755
diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
index c16bf84..db7ad5f
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,14 @@ XEMACS-PACKAGE=$(PACKAGE)-$(VERSION)-pkg.tar.gz
 SOURCES=dictionary.el connection.el link.el
 COMPILED=dictionary.elc connection.elc link.elc
 
+# For make dist
+LISP_FILES=connection.el dictionary.el link.el lpath.el dictionary-init.el \
+           install-package.el
+DOC_FILES=README GPL Makefile
+DEB_FILES=README.debian control copyright install.debian postinst \
+          prerm remove.debian rules changelog dirs
+DEB_DIR=deb
+
 .SUFFIXES: .elc .el
 
 .el.elc:
@@ -78,6 +86,20 @@ html: doc/dictionary
 doc/dictionary: doc/dictionary.texi
 	cd doc && makeinfo --html dictionary
 
+.PHONY: dist
+dist:
+	@[ -x debian ] || ln -s deb debian; \
+	VERSION=$$(dpkg-parsechangelog | perl -n -e '/^Version: (.*)-/ && print "$$1\n"'); \
+	DIR=$$(mktemp -d); \
+	DESTDIR="$$DIR/dictionary-$$VERSION"; \
+	install -d $$DESTDIR; \
+	install $(LISP_FILES) $(DOC_FILES) $$DESTDIR; \
+	mkdir $$DESTDIR/$(DEB_DIR); \
+	cd $(DEB_DIR) && install $(DEB_FILES) $$DESTDIR/$(DEB_DIR); \
+	tar czf $(CURDIR)/dictionary-$$VERSION.tar.gz -C $$DIR .; \
+	rm -r $$DIR; \
+	echo "dictionary-$$VERSION.tar.gz has been created"
+
 .PHONY: clean
 clean:
 	rm -f $(XEMACS-PACKAGE) $(COMPILED) build
diff --git a/README b/README
old mode 100644
new mode 100755
diff --git a/connection.el b/connection.el
old mode 100644
new mode 100755
diff --git a/deb/README.debian b/deb/README.debian
old mode 100644
new mode 100755
diff --git a/deb/changelog b/deb/changelog
old mode 100644
new mode 100755
index 980f9b7..2c6d6d2
--- a/deb/changelog
+++ b/deb/changelog
@@ -1,3 +1,10 @@
+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
diff --git a/deb/control b/deb/control
old mode 100644
new mode 100755
diff --git a/deb/copyright b/deb/copyright
old mode 100644
new mode 100755
diff --git a/deb/dirs b/deb/dirs
old mode 100644
new mode 100755
diff --git a/dictionary-init.el b/dictionary-init.el
old mode 100644
new mode 100755
diff --git a/dictionary.el b/dictionary.el
old mode 100644
new mode 100755
index 896b682..3270616
--- 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.38 2004/03/05 08:08:30 torsten Exp $
+;; $Id: dictionary.el 338 2004-10-02 06:04:54Z torsten $
 
 ;; 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
@@ -829,10 +829,12 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
   "Display a single dictionary"
   (let* ((list (dictionary-split-string string))
 	 (dictionary (car list))
-	 (description (cadr list)))
+	 (description (cadr list))
+	 (translated (dictionary-decode-charset description dictionary)))
     (if dictionary
 	(progn
-	  (link-insert-link description 'dictionary-reference-face
+	  (link-insert-link (concat dictionary ": " translated)
+			    'dictionary-reference-face
 			    'dictionary-set-dictionary 
 			    (cons dictionary description)
 			    "Mouse-2 to select this dictionary")
diff --git a/install-package.el b/install-package.el
old mode 100644
new mode 100755
diff --git a/link.el b/link.el
old mode 100644
new mode 100755
diff --git a/lpath.el b/lpath.el
old mode 100644
new mode 100755
-- 
cgit v1.2.3