diff options
| -rw-r--r-- | lisp/progmodes/peg.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/progmodes/peg.el b/lisp/progmodes/peg.el index e72c25acafc..7827990af35 100644 --- a/lisp/progmodes/peg.el +++ b/lisp/progmodes/peg.el | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | ;; Author: Helmut Eller <eller.helmut@gmail.com> | 5 | ;; Author: Helmut Eller <eller.helmut@gmail.com> |
| 6 | ;; Maintainer: Stefan Monnier <monnier@iro.umontreal.ca> | 6 | ;; Maintainer: Stefan Monnier <monnier@iro.umontreal.ca> |
| 7 | ;; Version: 1.0.1 | 7 | ;; Version: 1.0.1 |
| 8 | ;; Package-Requires: ((emacs "25")) | ||
| 8 | ;; | 9 | ;; |
| 9 | ;; This program is free software: you can redistribute it and/or modify | 10 | ;; This program is free software: you can redistribute it and/or modify |
| 10 | ;; it under the terms of the GNU General Public License as published by | 11 | ;; 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." | |||
| 934 | (cl-adjoin `(not ,x) merged :test #'equal)) | 935 | (cl-adjoin `(not ,x) merged :test #'equal)) |
| 935 | 936 | ||
| 936 | (cl-defmethod peg--merge-error (merged (_ (eql action)) _action) merged) | 937 | (cl-defmethod peg--merge-error (merged (_ (eql action)) _action) merged) |
| 937 | (cl-defmethod peg--merge-error (merged (_ (eql null))) merged) | 938 | (cl-defmethod peg--merge-error (merged (_ (eql guard)) e) |
| 939 | (if (eq e t) merged (cl-adjoin `(guard ,e) merged :test #'equal))) | ||
| 938 | 940 | ||
| 939 | (provide 'peg) | 941 | (provide 'peg) |
| 940 | (require 'peg) | 942 | (require 'peg) |