diff options
| author | Torsten Hilbrich <torsten.hilbrich@gmx.net> | 2001-12-09 21:13:00 +0100 |
|---|---|---|
| committer | Torsten Hilbrich <torsten@hilbrich.net> | 2011-08-27 20:47:38 +0200 |
| commit | 98640b323f059fd5a67b03a705917552aabd1d23 (patch) | |
| tree | 0a23c32684a2ba9cf2e346f3727e79281b01943f /dictionary.el | |
| parent | c9fc5e5846e43ecbd8fbc95bed1525382d8020c9 (diff) | |
Imported version 1.7.1 from tarball
Fixed bug in dictionary-coding-system, the detection of non-mule
Emacsen was not correct (patch submitted by Robert Pluim)
Diffstat (limited to 'dictionary.el')
| -rw-r--r-- | dictionary.el | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/dictionary.el b/dictionary.el index db9cf9c..ef1d5c7 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.30 2001/12/09 14:40:04 torsten Exp $ + ;; $Id: dictionary.el,v 1.32 2001/12/15 13:37:10 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 @@ -488,16 +488,15 @@ This function knows about the special meaning of quotes (\")" (defun dictionary-coding-system (dictionary) "Select coding system to use for that dictionary" - (unless (boundp 'dictionary-coding-systems-for-dictionaries) - nil) - (let ((coding-system - (or (cdr (assoc dictionary - dictionary-coding-systems-for-dictionaries)) - 'utf-8))) - (if (member coding-system (coding-system-list)) - coding-system - nil))) - + (when (boundp 'dictionary-coding-systems-for-dictionaries) + (let ((coding-system + (or (cdr (assoc dictionary + dictionary-coding-systems-for-dictionaries)) + 'utf-8))) + (if (member coding-system (coding-system-list)) + coding-system + nil)))) + (defun dictionary-decode-charset (text dictionary) "Convert the text from the charset defined by the dictionary given." (let ((coding-system (dictionary-coding-system dictionary))) |