Imported version 1.5.1 from tarball

fixed bug with dictionary-previous (found by Rui Zhu)

fixed key bindings in link.el

5 files changed, 57 insertions, 36 deletions

diff --git a/README b/README
index 0fcc426..9434461 100644
--- a/README
+++ b/README
@@ -56,7 +56,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.
-     * [5]Current version (1.5) of this package
+     * [5]Current version (1.5.1) of this package
      * [6]Version 1.4.1 of this package
      * [7]Version 1.3.3 of this package
      * [8]Version 1.2.1 of this package
@@ -76,14 +76,14 @@
                              Unpacking the archive
                                        
    The package is distributed as tar.gz file. You unpack it using:
-gzip -dc dictionary-1.5.tar.gz | tar xf -
+gzip -dc dictionary-1.5.1.tar.gz | tar xf -
 
    or
-tar -xzf dictionary-1.5.tar.gz
+tar -xzf dictionary-1.5.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.5 has been created
+   unpacking the archive a directory dictionary-1.5.1 has been created
    containing the necessary files.
    
                                  Installation
@@ -95,12 +95,12 @@ Debian
    dpkg-buildpackage) you can use the supplied debian support.
 make debian
 
-   This will create a package named dictionary-1.5-1_i386.deb or similiar
-   in the parent directory of dictionary-1.5. 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.5.1-1_i386.deb or
+   similiar in the parent directory of dictionary-1.5.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
@@ -164,8 +164,8 @@ Manually
    In addition, some key bindings for faster access can be useful. I use
    the following ones in my installation:
 ;; key bindings
-(global-set-key [(control c) ?s] 'dictionary-search)
-(global-set-key [(control c) ?m] 'dictionary-match-words)
+(global-set-key "\C-cs" 'dictionary-search)
+(global-set-key "\C-cm" 'dictionary-match-words)
 
    I will describe the user-callable functions and the key bindings
    within dictionary mode later in this document.
@@ -403,8 +403,8 @@ Getting Help
    user-reserved keys starting from C-c a to C-c z. It also shows how to
    invoke popup menus (using the right button in GNU Emacs or ctrl+right
    button in XEmacs) and installs the global tooltip-mode.
-(global-set-key [(control c) ?s] 'dictionary-search)
-(global-set-key [(control c) ?m] 'dictionary-match-words)
+(global-set-key "\C-cs" 'dictionary-search)
+(global-set-key "\C-cm" 'dictionary-match-words)
 (setq dictionary-server "localhost")
 
 ;; Popup menu for GNU Emacs 21, and XEmacs 21
@@ -419,9 +419,9 @@ Getting Help
                                     Thanks
                                        
    I want to thank Sam Steingold, Baoqiu Cui, Bruce Ravel, Pavel Janík,
-   Sergei Pokrovsky, Jeff Mincy, Serge Boiko, Enrico Scholz, and Reuben
-   Thomas for their valuable suggestions (including patches) for
-   improving this package.
+   Sergei Pokrovsky, Jeff Mincy, Serge Boiko, Enrico Scholz, Reuben
+   Thomas, and Rui Zhu for their valuable suggestions (including patches)
+   for improving this package.
    
                                     License
                                        
@@ -440,6 +440,11 @@ Getting Help
    
                                   ChangeLogs
                                        
+Version 1.5 - 1.5.1
+
+     * fixed bug with non-working dictionary-previous (found by Rui Zhu)
+     * fixed key bindings in link.el
+       
 Version 1.4.1 - 1.5
 
      * tool-tip support for GNU Emacs 21
@@ -521,7 +526,7 @@ Version 1.0 - 1.1
    
     [14]Torsten Hilbrich
     
-   Last modified: Sun Jul 8 21:53:36 CEST 2001
+   Last modified: Tue Jul 17 21:22:58 CEST 2001
 
 References
 
@@ -530,7 +535,7 @@ References
    2. http://www.dict.org/rfc2229.txt
    3. http://www.xemacs.org/
    4. http://www.myrkr.in-berlin.de/dictionary.html
-   5. http://localhost/~torsten/dictionary-1.5.tar.gz
+   5. http://localhost/~torsten/dictionary-1.5.1.tar.gz
    6. http://localhost/~torsten/dictionary-1.4.1.tar.gz
    7. http://localhost/~torsten/dictionary-1.3.3.tar.gz
    8. http://localhost/~torsten/dictionary-1.2.1.tar.gz
diff --git a/debian/changelog b/debian/changelog
index 0fcc2bd..df123a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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
diff --git a/debian/files b/debian/files
index b41abdd..7fd7c78 100644
--- a/debian/files
+++ b/debian/files
@@ -1 +1 @@
-dictionary_1.5-1_i386.deb unknown optional
+dictionary_1.5.1-1_i386.deb unknown optional
diff --git a/dictionary.el b/dictionary.el
index 942ecb7..31959dd 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.24 2001/07/08 19:06:50 torsten Exp $
+;; $Id: dictionary.el,v 1.26 2001/07/17 19:08:23 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
@@ -144,6 +144,10 @@ one dictionary yields matches."
   nil
   "The window configuration to be restored upon closing the buffer")
 
+(defvar dictionary-selected-window
+  nil
+  "The currently selected window")
+
 (defvar dictionary-position-stack
   nil
   "The history buffer for point and window position")
@@ -240,13 +244,16 @@ This is a quick reference to this mode describing the default key bindings:
     (let ((coding-system-for-read coding-system)
           (coding-system-for-write coding-system))
       (let ((buffer (generate-new-buffer "*Dictionary buffer*"))
-            (window-configuration (current-window-configuration)))
+            (window-configuration (current-window-configuration))
+	    (selected-window (frame-selected-window)))
 	
         (switch-to-buffer-other-window buffer)
         (dictionary-mode)
 	
         (make-local-variable 'dictionary-window-configuration)
+        (make-local-variable 'dictionary-selected-window)
         (setq dictionary-window-configuration window-configuration)
+	(setq dictionary-selected-window selected-window)
         (dictionary-check-connection)
         (dictionary-pre-buffer)
         (dictionary-post-buffer)))))
@@ -325,9 +332,11 @@ This is a quick reference to this mode describing the default key bindings:
 	(setq major-mode nil)
 	(if (<= (decf dictionary-instances) 0)
 	    (connection-close dictionary-connection))
-	(let ((configuration dictionary-window-configuration))
+	(let ((configuration dictionary-window-configuration)
+	      (selected-window dictionary-selected-window))
 	  (kill-buffer (current-buffer))
-	  (set-window-configuration configuration)))))
+	  (set-window-configuration configuration)
+	  (select-window selected-window)))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Helpful functions
@@ -457,9 +466,14 @@ This function knows about the special meaning of quotes (\")"
     (if all
 	(setq dictionary dictionary-default-dictionary))
     (dictionary-ensure-buffer)
-    (dictionary-pre-buffer)
-    (dictionary-do-search word dictionary 'dictionary-display-search-result)
-    (dictionary-store-state 'dictionary-do-search (list word dictionary))))
+    (dictionary-new-search-internal word dictionary 'dictionary-display-search-result)
+    (dictionary-store-state 'dictionary-new-search-internal 
+			    (list word dictionary 'dictionary-display-search-result))))
+
+(defun dictionary-new-search-internal (word dictionary function)
+  "Starts a new search after preparing the buffer"
+  (dictionary-pre-buffer)
+  (dictionary-do-search word dictionary function))
 
 (defun dictionary-do-search (word dictionary function)
   "The workhorse for doing the search"
diff --git a/link.el b/link.el
index ec55766..8053cde 100644
--- a/link.el
+++ b/link.el
@@ -2,7 +2,7 @@
 
 ;; Author: Torsten Hilbrich <Torsten.Hilbrich@gmx.net>
 ;; Keywords: interface, hypermedia
-;; $Id: link.el,v 1.5 1999/01/08 18:36:50 torsten Exp torsten $
+;; $Id: link.el,v 1.8 2001/07/17 19:23:55 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
@@ -109,13 +109,8 @@ link.  Upon clicking the `function' is called with `data' as argument."
 (defun link-initialize-keymap (keymap)
   "Defines the necessary bindings inside keymap"
 
-  (if (and (boundp 'running-xemacs) running-xemacs)
-      (progn
-	(define-key keymap [button2] 'link-mouse-click)
-	(define-key keymap [(meta button2)] 'link-mouse-click-all))
-    (define-key keymap [mouse-2] 'link-mouse-click)
-    (define-key keymap [M-mouse-2] 'link-mouse-click-all))
-  (define-key keymap [return] 'link-selected)
-  (define-key keymap [(meta return)] 'link-selected-all))
+  (define-key keymap [mouse-2] 'link-mouse-click)
+  (define-key keymap "\r" 'link-selected)
+  (define-key keymap "\M-\r" 'link-selected-all))
 
 (provide 'link)