aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README37
-rw-r--r--debian/changelog10
-rw-r--r--debian/files1
-rw-r--r--dictionary.el13
-rw-r--r--link.el3
5 files changed, 43 insertions, 21 deletions
diff --git a/README b/README
index c24bdc8..b3e04fb 100644
--- a/README
+++ b/README
@@ -13,7 +13,7 @@ was basically a wrapper to the dict client program and didn't have all the
features I wanted.
If you didn't received this file from its original location you can visit it
-at http://me.in-berlin.de/~myrkr/dictionary.html
+at http://www.myrkr.in-berlin.de/dictionary.html
Features
@@ -45,8 +45,7 @@ implemented some hacks to work with the very very old 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.3.1) of this package
- * Previous version (1.3) of this package
+ * Current version (1.3.2) of this package
* Version 1.2.1 of this package
* Version 1.1 of this package
* Version 1.0 of this package
@@ -64,15 +63,15 @@ Unpacking the archive
The package is distributed as tar.gz file. You unpack it using:
-gunzip dictionary-1.3.1.tar.gz | tar xf -
+gunzip dictionary-1.3.2.tar.gz | tar xf -
or
-tar -xzf dictionary-1.3.1.tar.gz
+tar -xzf dictionary-1.3.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.3.1 has been created containing the
+archive a directory dictionary-1.3.2 has been created containing the
necessary files.
Byte compiling
@@ -95,12 +94,12 @@ Debian
If you are using a current Debian distribution (one that support the emacsen
package system) you can use the supplied debian support.
-gunzip dictionary-1.3.1.tar.gz | tar xf -
-cd dictionary-1.3.1
+gunzip dictionary-1.3.2.tar.gz | tar xf -
+cd dictionary-1.3.2
dpkg-buildpackage -us -uc -rfakeroot
-This will create a package named dictionary-1.3.1-1_i386.deb or similiar in
-the parent directory of dictionary-1.3.1. You can now install this package
+This will create a package named dictionary-1.3.2-1_i386.deb or similiar in
+the parent directory of dictionary-1.3.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 you can omit the autoload lines.
@@ -221,7 +220,11 @@ If you prefer using the keyboard it can be very frustrating to use the
cursor key to position the point before pressing return to visit the link is
possible. Therefore, I defined the Tab and the n keys to jump to the next
link (dictionary-next-link) and the Shift-Tab and p keys to jump to the
-previous one (dictionary-prev-link).
+previous one (dictionary-prev-link). Please note that the Shift-Tab key may
+be the same as the Tab key when running Emacs within a tty (in contrast to a
+windowing system like X11). There is no way for a application to differ
+Shift-Tab from Tab in this case, please use the p key to visit the previous
+link if you run into this problem.
Searching
@@ -311,8 +314,8 @@ starting from C-c a to C-c z.
Thanks
I want to thank Sam Steingold, Baoqiu Cui, Bruce Ravel, Pavel Janík, Sergei
-Pokrovsky, and Jeff Mincy for their valuable suggestions (including patches)
-for improving this package.
+Pokrovsky, Jeff Mincy, and Serge Boiko for their valuable suggestions
+(including patches) for improving this package.
License
@@ -331,6 +334,12 @@ along with this package; see the file GPL.
ChangeLogs
+Version 1.3.1 - 1.3.2
+
+ * replaced set-text-properties by remove-text-properties and
+ add-text-properties because this function is not recommended within
+ XEmacs (reported by Serge Boiko)
+
Version 1.3 - 1.3.1
* small fix in dictionary function to check for availability of the utf-8
@@ -387,4 +396,4 @@ Version 1.0 - 1.1
------------------------------------------------------------------------
Torsten Hilbrich
-Last modified: Sun May 13 10:29:09 CEST 2001
+Last modified: Fri Jun 22 22:20:52 CEST 2001
diff --git a/debian/changelog b/debian/changelog
index 430971e..29b41f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
+dictionary (1.3.2-1) unstable; urgency=low
+
+ * removed use of set-text-properties in link.el
+
+ -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net> Fri, 22 Jun 2001 21:39:47 +0200
+
dictionary (1.3.1-1) unstable; urgency=low
* Initial release.
-- Torsten Hilbrich <Torsten.Hilbrich@gmx.net> Sun, 13 May 2001 09:55:20 +0200
-Local variables:
-mode: debian-changelog
-End:
+
diff --git a/debian/files b/debian/files
new file mode 100644
index 0000000..0e200b8
--- /dev/null
+++ b/debian/files
@@ -0,0 +1 @@
+dictionary_1.3.2-1_i386.deb unknown optional
diff --git a/dictionary.el b/dictionary.el
index 38d2310..149efc2 100644
--- a/dictionary.el
+++ b/dictionary.el
@@ -117,7 +117,7 @@ one dictionary yields matches."
(((type tty)
(class color)
(background dark))
- (:foreground "brightyellow"))
+ (:foreground "cyan"))
(((class color)
(background light))
(:foreground "blue"))
@@ -261,9 +261,16 @@ This is a quick reference to this mode describing the default key bindings:
(define-key dictionary-mode-map "m" 'dictionary-match-words)
(define-key dictionary-mode-map "l" 'dictionary-previous)
- (define-key dictionary-mode-map [tab] 'dictionary-next-link)
- (define-key dictionary-mode-map "n" 'dictionary-next-link)
+ (if (and (string-match "GNU" (emacs-version))
+ (not window-system))
+ (define-key dictionary-mode-map [9] 'dictionary-next-link)
+ (define-key dictionary-mode-map [tab] 'dictionary-next-link))
+
+ ;; shift-tabs normally is supported on window systems only, but
+ ;; I do not enforce it
(define-key dictionary-mode-map [(shift tab)] 'dictionary-prev-link)
+
+ (define-key dictionary-mode-map "n" 'dictionary-next-link)
(define-key dictionary-mode-map "p" 'dictionary-prev-link)
(define-key dictionary-mode-map " " 'scroll-up)
diff --git a/link.el b/link.el
index c0eb092..ec55766 100644
--- a/link.el
+++ b/link.el
@@ -42,7 +42,8 @@ link. Upon clicking the `function' is called with `data' as argument."
link-data ,data
help-echo ,help
link-function ,function)))
- (set-text-properties start end properties)))
+ (remove-text-properties start end properties)
+ (add-text-properties start end properties)))
(defun link-insert-link (text face function &optional data help)
"Insert the `text' at point to be formatted as link.