From 76c44814cb62ce43b6debfb4a36b8001a9d738b3 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 20 Jun 2025 19:59:54 -0400 Subject: [PATCH] (peg--merge-error) : Add missing method Also clarify that the package requires at least Emacs-25. * lisp/progmodes/peg.el (peg--merge-error) : Add missing method. (cherry picked from commit df86d10316e0e67c4c49161980b54907ed518f32) --- lisp/progmodes/peg.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/progmodes/peg.el b/lisp/progmodes/peg.el index e55148b51c7..d8dbf729879 100644 --- a/lisp/progmodes/peg.el +++ b/lisp/progmodes/peg.el @@ -5,6 +5,7 @@ ;; Author: Helmut Eller ;; Maintainer: Stefan Monnier ;; 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) -- 2.39.5