procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Dont't check coding-system-list for existence

Browse source 
* lisp/net/dictionary.el (dictionary-coding-systems-for-dictionaries):
Don't check for coding-system-list before using it. It check no longer
be necessary.
This commit is contained in:
Torsten Hilbrich 2020-10-08 19:33:33 +02:00
parent 5dc17d73b0
commit 49c250b388
1 changed files with 23 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

51
lisp/net/dictionary.el
View file

@ -200,24 +200,21 @@ by the choice value:
:version "28.1") :version "28.1")
;; Define only when coding-system-list is available ;; Define only when coding-system-list is available
(when (fboundp 'coding-system-list) (defcustom dictionary-coding-systems-for-dictionaries
(defcustom dictionary-coding-systems-for-dictionaries '( ("mueller" . koi8-r))
'( ("mueller" . koi8-r)) "Mapping of dictionaries to coding systems.
"Mapping of dictionaries to coding systems. Each entry in this list defines the coding system to be used for that
Each entry in this list defines the coding system to be used for that dictionary. The default coding system for all other dictionaries
dictionary. The default coding system for all other dictionaries is utf-8"
is utf-8" :group 'dictionary
:group 'dictionary :type `(repeat (cons :tag "Association"
:type `(repeat (cons :tag "Association" (string :tag "Dictionary name")
(string :tag "Dictionary name") (choice :tag "Coding system"
(choice :tag "Coding system" :value 'utf-8
:value 'utf-8 ,@(mapcar (lambda (x) (list 'const x))
,@(mapcar (lambda (x) (list 'const x)) (coding-system-list))
(coding-system-list)) )))
))) :version "28.1")
:version "28.1")
)
(if (fboundp 'defface) (if (fboundp 'defface)
(progn (progn
@ -459,8 +456,7 @@ by the choice value:
(eq (dictionary-connection-status dictionary-connection) 'up))) (eq (dictionary-connection-status dictionary-connection) 'up)))
(let ((wanted 'raw-text) (let ((wanted 'raw-text)
(coding-system nil)) (coding-system nil))
(if (and (fboundp 'coding-system-list) (if (member wanted (coding-system-list))
(member wanted (coding-system-list)))
(setq coding-system wanted)) (setq coding-system wanted))
(let ((coding-system-for-read coding-system) (let ((coding-system-for-read coding-system)
(coding-system-for-write coding-system)) (coding-system-for-write coding-system))
@ -597,14 +593,13 @@ This function knows about the special meaning of quotes (\")"
(defun dictionary-coding-system (dictionary) (defun dictionary-coding-system (dictionary)
"Select coding system to use for that dictionary" "Select coding system to use for that dictionary"
(when (boundp 'dictionary-coding-systems-for-dictionaries) (let ((coding-system
(let ((coding-system (or (cdr (assoc dictionary
(or (cdr (assoc dictionary dictionary-coding-systems-for-dictionaries))
dictionary-coding-systems-for-dictionaries)) 'utf-8)))
'utf-8))) (if (member coding-system (coding-system-list))
(if (member coding-system (coding-system-list)) coding-system
coding-system nil)))
nil))))
(defun dictionary-decode-charset (text dictionary) (defun dictionary-decode-charset (text dictionary)
"Convert the text from the charset defined by the dictionary given." "Convert the text from the charset defined by the dictionary given."