Imported version 1.7.2 from tarball

link.el (link-initialize-keymap): fixed keybinding bug (reported by
David A. Panariti)

3 files changed, 28 insertions, 11 deletions

diff --git a/README b/README
index 4973c85..cddcbf7 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.1) of this package
+     * Current version (1.7.2) 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.1.tar.gz | tar xf -
+gzip -dc dictionary-1.7.2.tar.gz | tar xf -
 
    or
-tar -xzf dictionary-1.7.1.tar.gz
+tar -xzf dictionary-1.7.2.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.1 has been created
+   unpacking  the  archive  a directory dictionary-1.7.2 has been created
    containing the necessary files.
 
                                  Installation
@@ -99,8 +99,8 @@ Debian
    dpkg-buildpackage) you can use the supplied debian support.
 make debian
 
-   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
+   This  will  create  a  package  named  dictionary-1.7.2-1_i386.deb  or
+   similiar  in  the  parent  directory  of dictionary-1.7.2. 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
@@ -488,6 +488,11 @@ Support for different encodings in dictionaries
 
                                   ChangeLogs
 
+Version 1.7.1 - 1.7.2
+
+     * link.el  (link-initialize-keymap):  fixed keybinding bug (reported
+       by David A. Panariti)
+
 Version 1.7 - 1.7.1
 
      * fixed  mule-detection in dictionary-coding-system (patch submitted
@@ -583,4 +588,4 @@ Version 1.0 - 1.1
      _________________________________________________________________
 
    E-Mail: dictionary@myrkr.in-berlin.de
-   Last modified: Sat Dec 15 14:34:54 CET 2001
+   Last modified: Fri Dec 21 18:51:23 CET 2001
diff --git a/debian/changelog b/debian/changelog
index 9a0948d..d9ef50a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dictionary (1.7.2-1) unstable; urgency=low
+
+  * link.el (link-initialize-keymap): fixed keybinding bug (reported by
+    David A. Panariti)
+
+ -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Fri, 21 Dec 2001 18:50:20 +0100
+
 dictionary (1.7.1-1) unstable; urgency=low
 
   * Fixed bug in dictionary-coding-system, the detection of non-mule
diff --git a/link.el b/link.el
index a076a8e..003c894 100644
--- a/link.el
+++ b/link.el
@@ -2,7 +2,7 @@
 
 ;; Author: Torsten Hilbrich <dictionary@myrkr.in-berlin.de>
 ;; Keywords: interface, hypermedia
-;; $Id: link.el,v 1.9 2001/11/24 12:18:26 torsten Exp $
+;; $Id: link.el,v 1.11 2001/12/21 17:55:49 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,8 +109,13 @@ link.  Upon clicking the `function' is called with `data' as argument."
 (defun link-initialize-keymap (keymap)
   "Defines the necessary bindings inside keymap"
 
-  (define-key keymap [mouse-2] 'link-mouse-click)
-  (define-key keymap "\r" 'link-selected)
-  (define-key keymap "\M-\r" 'link-selected-all))
+  (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 "\r" 'link-selected)
+    (define-key keymap "\M-\r" 'link-selected-all))
 
 (provide 'link)