(peg--merge-error) <guard>: Add missing method

Also clarify that the package requires at least Emacs-25.

* lisp/progmodes/peg.el (peg--merge-error) <guard>: Add missing method.

(cherry picked from commit df86d10316e0e67c4c49161980b54907ed518f32)

diff --git a/lisp/progmodes/peg.el b/lisp/progmodes/peg.el
index e55148b51c779573ed1964e653eea417662b51f9..d8dbf72987936992d0b2f7cf25aae6fdfc7d6644 100644 (file)
--- a/lisp/progmodes/peg.el
+++ b/lisp/progmodes/peg.el
@@ -5,6 +5,7 @@
 ;; Author: Helmut Eller <eller.helmut@gmail.com>
 ;; Maintainer: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Version: 1.0.1
+;; Package-Requires: ((emacs "25"))
 ;;
 ;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -934,7 +935,8 @@ input.  PATH is the list of rules that we have visited so far."
   (cl-adjoin `(not ,x) merged :test #'equal))
 
 (cl-defmethod peg--merge-error (merged (_ (eql action)) _action) merged)
-(cl-defmethod peg--merge-error (merged (_ (eql null))) merged)
+(cl-defmethod peg--merge-error (merged (_ (eql guard)) e)
+  (if (eq e t) merged (cl-adjoin `(guard ,e) merged :test #'equal)))
 
 (provide 'peg)
 (require 'peg)