From: Stefan Kangas <stefankangas@gmail.com>
Date: Sat, 16 May 2020 15:02:18 +0000 (+0200)
Subject: Remove Emacs 22 compat code from abbrev.el
X-Git-Tag: emacs-28.0.90~7345
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d1545e2a038651e7a5203026202189351540b7f5;p=emacs.git

Remove Emacs 22 compat code from abbrev.el

* lisp/abbrev.el (write-abbrev-file): Remove Emacs 22
compatibility code.
---

diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 190b3504fa7..2d61a96010e 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -255,11 +255,7 @@ have been saved."
 	(if (abbrev--table-symbols table)
             (insert-abbrev-table-description table nil)))
       (when (unencodable-char-position (point-min) (point-max) 'utf-8)
-	(setq coding-system-for-write
-	      (if (> emacs-major-version 24)
-		  'utf-8-emacs
-		;; For compatibility with Emacs 22 (See Bug#8308)
-		'emacs-mule)))
+	(setq coding-system-for-write 'utf-8-emacs))
       (goto-char (point-min))
       (insert (format ";;-*-coding: %s;-*-\n" coding-system-for-write))
       (write-region nil nil file nil (and (not verbose) 0)))))