Imported version 1.8.1 from tarball

5 files changed, 75 insertions, 87 deletions

diff --git a/ChangeLog b/ChangeLog
index 2478bec..bc88166 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,35 @@
+2002-04-30  Steve Youngs  <youngs@xemacs.org>
+
+	* Makefile (VERSION): XEmacs package 1.10 released.
+
+2002-04-29  Torsten Hilbrich  <dictionary@myrkr.in-berlin.de>
+
+	* dictionary.el (dictinary-display-tooltip): added support for
+	  binding tooltip function to any mouse event (wished by Samir
+	  Saidani)
+	
+	* dictionary.el (dictionary-do-search): no longer output matching
+	words when using tooltips (found by Samir Saidani)
+
+	* debian/control: added build-depends line
+
+2002-04-24  youngs  <youngs@myrkr>
+
+	* Makefile, ChangeLog: Increment Makefile $VERSION
+
+2002-04-24  Steve Youngs  <youngs@xemacs.org>
+
+	* Makefile (VERSION): XEmacs package 1.09 released.
+
 2002-03-20  Torsten Hilbrich <dictionary@myrkr.in-berlin.de>
 	
 	* dictionary.el (dictionary-do-search): if the word is not found,
 	  lookup similiar words using the match function 
+	  BTW: I had to resolve a conflict here
+
+2002-03-25  Steve Youngs  <youngs@xemacs.org>
+
+	* Makefile (VERSION): 1.08 released.
 
 2002-03-15  Torsten Hilbrich <dictionary@myrkr.in-berlin.de>
 	
diff --git a/Makefile b/Makefile
index 15908c7..b562a0a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,83 +1,42 @@
-# -*- Makefile -*- $Id: Makefile.upstream,v 1.3 2002/03/16 10:50:57 torsten Exp $
+# Makefile for dictionary code
 
-EMACS=emacs
+# This file is part of XEmacs.
 
-VERSION=1.8
-PACKAGE=dictionary
-TYPE=comm
-XEMACS-PACKAGE=$(PACKAGE)-$(VERSION)-pkg.tar.gz
+# XEmacs 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.
 
-SOURCES=dictionary.el connection.el link.el
-COMPILED=dictionary.elc connection.elc link.elc
+# XEmacs 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.
 
-.SUFFIXES: .elc .el
+# You should have received a copy of the GNU General Public License
+# along with XEmacs; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
-.el.elc:
-	$(EMACS) -q -no-site-file -no-init-file -batch -l lpath.el \
-	-f batch-byte-compile $<
+VERSION = 1.10
+AUTHOR_VERSION = 1.8
+MAINTAINER = Torsten Hilbrich <dictionary@myrkr.in-berlin.de>
+PACKAGE = dictionary
+PKG_TYPE = regular
+REQUIRES = xemacs-base
+CATEGORY = standard
 
-.PHONY: all
-all: $(COMPILED)
+ELCS = dictionary.elc connection.elc link.elc
 
-.PHONY: debian
-debian:
-	@if [ -x /usr/bin/fakeroot ]; then \
-	  dpkg-buildpackage -us -uc -rfakeroot; \
-	elif [ `id -u` -ne 0 ]; then \
-	  echo "You are not root and fakeroot is not installed, aborting"; \
-	  exit 1; \
-	else \
-	  dpkg-buildpackage -us -uc; \
-	fi
-	@echo "You can now install the debian package, the previous output tells"
-	@echo "you its location (probably stored in ..)"
-	@echo
-	@echo "Please note, this debian package is unofficial, report bugs"
-	@echo "to me only, not to the Debian Bugtracking System."
+EXTRA_SOURCES = README GPL
 
-.PHONY: package
-package: $(XEMACS-PACKAGE) 
+GENERATED += custom-load.elc
 
-$(XEMACS-PACKAGE): $(COMPILED)
-	@case $(EMACS) in emacs*) printf "\aNote, packages work with XEmacs 21 only, hope you know what you are doing\n\n";; esac
-	@mkdir -p lisp/$(PACKAGE)
-	@mkdir -p pkginfo
-	@printf ";;;###autoload\n(package-provide '$(PACKAGE)\n:version $(VERSION)\n:type '$(TYPE))\n" > lisp/$(PACKAGE)/_pkg.el
-	@rm -f lisp/$(PACKAGE)/auto-autoloads.el lisp/$(PACKAGE)/custom-load.el
-	@cp $(SOURCES) $(COMPILED) lisp/$(PACKAGE)
-	@cd lisp &&  \
-	$(EMACS) -vanilla -batch -l autoload -f batch-update-directory $(PACKAGE) && \
-	$(EMACS) -vanilla -batch -l cus-dep -f Custom-make-dependencies $(PACKAGE) && \
-	$(EMACS) -vanilla -batch -f batch-byte-compile $(PACKAGE)/auto-autoloads.el $(PACKAGE)/custom-load.el
-	@touch pkginfo/MANIFEST.$(PACKAGE)
-	@find lisp pkginfo -type f > pkginfo/MANIFEST.$(PACKAGE)
-	@tar cf - pkginfo lisp | gzip -c > $(XEMACS-PACKAGE)
+include ../../XEmacs.rules
 
-.PHONY: package-install
-package-install: package
-	@if [ `id -u` -ne 0 ]; then printf "\aWarning, you are not root; the installation might fail\n\n"; fi
-	@$(EMACS) -vanilla -batch -l install-package.el -f install-package `pwd`/$(XEMACS-PACKAGE)
+all:: $(ELCS) auto-autoloads.elc custom-load.elc
 
-.PHONY: view-info
-view-info: info
-	info doc/dictionary.info
+srckit: srckit-std
 
-.PHONY: doc
-doc: info html
+binkit: binkit-common
 
-.PHONY: info
-info: doc/dictionary.info
 
-doc/dictionary.info: doc/dictionary.texi
-	cd doc && makeinfo --output dictionary.info dictionary
-
-.PHONY: html
-html: doc/dictionary
-
-doc/dictionary: doc/dictionary.texi
-	cd doc && makeinfo --html dictionary
-
-.PHONY: clean
-clean:
-	rm -f $(XEMACS-PACKAGE) $(COMPILED) build
-	rm -rf debian/tmp lisp pkginfo
diff --git a/debian/README.debian b/debian/README.debian
index b13392f..524ea98 100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@ -7,4 +7,4 @@ at http://www.myrkr.in-berlin.de/dictionary.html.
 Instructions on using this package can be found in the
 /usr/share/doc/dictionary/README.gz file or in the above location.
 
-Torsten Hilbrich <Torsten.Hilbrich@gmx.net>, Sun, 13 May 2001 09:55:20 +0200
+Torsten Hilbrich <dictionary@myrkr.in-berlin.de>, Sun, 13 May 2001 09:55:20 +0200
diff --git a/debian/copyright b/debian/copyright
index cf89f1d..b82cc97 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,4 @@
-This package was debianized by Torsten Hilbrich Torsten.Hilbrich@gmx.net on
-Sun, 13 May 2001 09:55:20 +0200.
+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
 
diff --git a/dictionary.el b/dictionary.el
index cea1d29..af98a88 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.36 2002/03/18 18:13:59 torsten Exp $
+ ;; $Id: dictionary.el,v 1.38 2002/04/29 18:38:03 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
@@ -611,7 +611,7 @@ This function knows about the special meaning of quotes (\")"
   (dictionary-pre-buffer)
   (dictionary-do-search word dictionary function))
 
-(defun dictionary-do-search (word dictionary function)
+(defun dictionary-do-search (word dictionary function &optional nomatching)
   "The workhorse for doing the search"
 
   (message "Searching for %s in %s" word dictionary)
@@ -623,13 +623,15 @@ This function knows about the special meaning of quotes (\")"
   (let ((reply (dictionary-read-reply-and-split)))
     (if (dictionary-check-reply reply 552)
 	(progn
-	  (beep)
-	  (insert "Word not found, maybe you look for one of these words\n\n")
-	  (dictionary-do-matching word
-				  dictionary
-				  "."
-				  'dictionary-display-only-match-result)
-	  (dictionary-post-buffer))
+	  (unless nomatching
+	    (beep)
+	    (insert "Word not found, maybe you look "
+		    "for one of these words\n\n")
+	    (dictionary-do-matching word
+				    dictionary
+				    "."
+				    'dictionary-display-only-match-result)
+	    (dictionary-post-buffer)))
       (if (dictionary-check-reply reply 550)
 	  (error "Dictionary \"%s\" is unknown, please select an existing one."
 		 dictionary)
@@ -1125,7 +1127,7 @@ It presents the word at point as default input and allows editing it."
   (interactive)
   (unwind-protect
       (let ((dictionary (or dictionary dictionary-default-dictionary)))
-	(dictionary-do-search word dictionary 'dictionary-read-definition))
+	(dictionary-do-search word dictionary 'dictionary-read-definition t))
     nil))
   
 (defun dictionary-read-definition (reply)
@@ -1140,18 +1142,18 @@ It presents the word at point as default input and allows editing it."
 
 (defun dictionary-display-tooltip (event)
   "Search the current word in the `dictionary-tooltip-dictionary'."
+  (interactive "e")
   (if dictionary-tooltip-dictionary
       (let ((word (save-window-excursion
 		    (save-excursion
 		      (mouse-set-point event)
 		      (current-word)))))
 	(let ((definition 
-		(dictionary-decode-charset 
-		 (dictionary-definition word 
-					dictionary-tooltip-dictionary)
-		 dictionary-tooltip-dictionary)))
+		(dictionary-definition word dictionary-tooltip-dictionary)))
 	  (if definition 
-	      (tooltip-show definition))
+	      (tooltip-show 
+	       (dictionary-decode-charset definition 
+					  dictionary-tooltip-dictionary)))
 	  t))
     nil))