aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Hilbrich <torsten.hilbrich@gmx.net>2003-06-21 19:57:00 +0200
committerTorsten Hilbrich <torsten@hilbrich.net>2011-08-27 20:47:38 +0200
commit988ccf5d91893fd5624f1ca6a8805a0ed31bd090 (patch)
treea4938ccb1df949bdfe56f781d010b0380e5918d2
parent14dd2297013df9fb3c2302337e9482fad917f83d (diff)
Imported version 1.8.6 from tarball
added patch fixing the wrong display of dictionary description (provided by Sergei Pokrovsky) added dictionary-description-open-delimiter and dictionary-description-close-delimiter (suggested by Sergei Pokrovsky)
-rw-r--r--deb/changelog9
-rw-r--r--dictionary.el23
2 files changed, 29 insertions, 3 deletions
diff --git a/deb/changelog b/deb/changelog
index 2fce17a..980f9b7 100644
--- a/deb/changelog
+++ b/deb/changelog
@@ -1,3 +1,12 @@
+dictionary (1.8.6-1) unstable; urgency=low
+
+ * added patch fixing the wrong display of dictionary description
+ (provided by Sergei Pokrovsky)
+ * added dictionary-description-open-delimiter and
+ dictionary-description-close-delimiter (suggested by Sergei Pokrovsky)
+
+ -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de> Sat, 25 Sep 2004 17:05:51 +0200
+
dictionary (1.8.5-1) unstable; urgency=low
* added variable dictionary-use-single-buffer to allow selecting
diff --git a/dictionary.el b/dictionary.el
index 7386811..896b682 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.37 2003/06/21 17:38:49 torsten Exp $
+;; $Id: dictionary.el,v 1.38 2004/03/05 08:08:30 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
@@ -155,6 +155,18 @@ by the choice value:
:group 'dictionary
:type 'boolean)
+(defcustom dictionary-description-open-delimiter
+ ""
+ "The delimiter to display in front of the dictionaries description"
+ :group 'dictionary
+ :type 'string)
+
+(defcustom dictionary-description-close-delimiter
+ ""
+ "The delimiter to display after of the dictionaries description"
+ :group 'dictionary
+ :type 'string)
+
;; Define only when coding-system-list is available
(when (fboundp 'coding-system-list)
(defcustom dictionary-coding-systems-for-dictionaries
@@ -633,7 +645,7 @@ This function knows about the special meaning of quotes (\")"
(progn
(unless nomatching
(beep)
- (insert "Word not found, maybe you look "
+ (insert "Word not found, maybe you are looking "
"for one of these words\n\n")
(dictionary-do-matching word
dictionary
@@ -717,7 +729,12 @@ This function knows about the special meaning of quotes (\")"
(defun dictionary-display-word-entry (word dictionary description)
"Insert an explanation for the current definition."
(let ((start (point)))
- (insert "From " description "[" dictionary "]:\n\n")
+ (insert "From "
+ dictionary-description-open-delimiter
+ (dictionary-decode-charset description dictionary)
+ dictionary-description-close-delimiter
+ " [" (dictionary-decode-charset dictionary dictionary) "]:"
+ "\n\n")
(put-text-property start (point) 'face 'dictionary-word-entry-face)))
(defun dictionary-display-word-definition (reply word dictionary)