diff options
Diffstat (limited to 'lisp/format.el')
| -rw-r--r-- | lisp/format.el | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lisp/format.el b/lisp/format.el index afe2b47fb65..34bd30e83a5 100644 --- a/lisp/format.el +++ b/lisp/format.el @@ -87,11 +87,16 @@ rot13-region rot13-region t nil) (duden ,(purecopy "Duden Ersatzdarstellung") nil - ,(purecopy "diac") iso-iso2duden t nil) + ;; FROM-FN used to call the "diac" command which is not widely + ;; available and apparently not under a free software license: + ;; https://nm.wu-wien.ac.at/nm/download/file/diac4.tar.gz + ;; Reliable round-trip conversion is not possible anyway + ;; and would be by heuristic method, so use nil for now. + nil iso-iso2duden t nil) (de646 ,(purecopy "German ASCII (ISO 646)") nil - ,(purecopy "recode -f iso646-ge:latin1") - ,(purecopy "recode -f latin1:iso646-ge") t nil) + ,(purecopy "iconv -f iso646-de -t utf-8") + ,(purecopy "iconv -f utf-8 -t iso646-de") t nil) (denet ,(purecopy "net German") nil iso-german iso-cvt-read-only t nil) @@ -290,7 +295,7 @@ For most purposes, consider using `format-decode-region' instead." (setq try format-alist)) (setq try (cdr try)))))) ;; Deal with given format(s) - (or (listp format) (setq format (list format))) + (setq format (ensure-list format)) (let ((do format) f) (while do (or (setq f (assq (car do) format-alist)) |