From fc06744f59c8787c54ab6ac8270a57f30b7ed0c9 Mon Sep 17 00:00:00 2001
From: Vasilij Schneidermann <v.schneidermann@gmail.com>
Date: Mon, 24 Oct 2016 21:39:22 +0200
Subject: [PATCH] Emacs 25.1 fixes

---
 elisp/reader.el           | 5 +++++
 elisp/tests/stepA_mal.mal | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/elisp/reader.el b/elisp/reader.el
index 26d83611..e63b1aac 100644
--- a/elisp/reader.el
+++ b/elisp/reader.el
@@ -1,3 +1,8 @@
+;; HACK: `text-quoting-style' prettifies quotes in error messages on
+;; Emacs 25.1, but no longer does from 25.2 upwards...
+(when (and (= emacs-major-version 25) (= emacs-minor-version 1))
+  (setq text-quoting-style 'grave))
+
 (defvar tokens nil)
 
 (defun peek ()
diff --git a/elisp/tests/stepA_mal.mal b/elisp/tests/stepA_mal.mal
index a6c9bca1..8f6e9a3b 100644
--- a/elisp/tests/stepA_mal.mal
+++ b/elisp/tests/stepA_mal.mal
@@ -16,6 +16,6 @@
 ; Hello World!
 ;=>nil
 
-(elisp-eval "(setq emacs-version-re (rx \"24.\" digit \".\" digit))")
+(elisp-eval "(setq emacs-version-re (rx (+ digit) \".\" digit \".\" digit))")
 (elisp-eval "(and (string-match-p emacs-version-re emacs-version) t)")
 ;=>true