---
 lisp/ps-mule.el          |    2 ++
 lisp/textmodes/ispell.el |   14 +++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

--- lisp/ps-mule.el
+++ lisp/ps-mule.el	2016-09-19 09:01:56.930605125 +0000
@@ -180,6 +180,8 @@ See also the variable `ps-font-info-data
 
 (defconst ps-mule-font-info-database-latin
   '((iso-8859-1
+     (normal nil nil))
+    (iso-8859-15
      (normal nil nil)))
   "Sample setting of `ps-mule-font-info-database' to use latin fonts.")
 
--- lisp/textmodes/ispell.el
+++ lisp/textmodes/ispell.el	2016-09-19 09:01:56.930605125 +0000
@@ -1533,10 +1533,18 @@ Protects against bogus binding of `enabl
       nil                        ;; in pipe mode. Disable extended-char-mode
     (nth 6 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
 	       (assoc ispell-current-dictionary ispell-dictionary-alist)))))
+;;
+;; Most languages in ISO-8859-15 for EURO symbols uses ISO-8859-1 chars
+;(defun ispell-get-coding-system ()
+;  (nth 7 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
+;	     (assoc ispell-current-dictionary ispell-dictionary-alist))))
 (defun ispell-get-coding-system ()
-  (nth 7 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
-	     (assoc ispell-current-dictionary ispell-dictionary-alist))))
-
+  (let ((sys (nth 7 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
+			(assoc ispell-current-dictionary ispell-dictionary-alist)))))
+	(if (and (boundp 'buffer-file-coding-system)
+		 (eq buffer-file-coding-system 'iso-latin-9)
+		 (eq sys 'iso-latin-1))
+	    'iso-latin-9 sys)))
 
 (defvar ispell-pdict-modified-p nil
   "Non-nil means personal dictionary has modifications to be saved.")