summaryrefslogtreecommitdiff
path: root/lisp/progmodes/ebnf2ps.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2017-11-29 17:12:56 -0800
committerGlenn Morris <rgm@gnu.org>2017-11-29 17:12:56 -0800
commitf069ea4f84a94bfbbd444073729f81fdd27c9445 (patch)
tree6adf14a7d71264bb20c87a426df6e18e0edba9a3 /lisp/progmodes/ebnf2ps.el
parent03e1012be4028e653bd88c93846b17172b5c0faa (diff)
parent408862f02a874dcd9cfc2599adb35dec522b3ef4 (diff)
downloademacs-f069ea4f84a94bfbbd444073729f81fdd27c9445.tar.gz
Merge from origin/emacs-26
408862f02a (origin/emacs-26) ; * lisp/emacs-lisp/bytecomp.el: Tweak m... 9964db4c34 Restore obsolete method of changing byte-compile-dest-file 3dd25aeecb Some minor Tramp corrections d670a15f25 * doc/misc/url.texi (http/https): Fix typo 99d07e8d5e Remove some bogus definition-prefixes from loaddefs 6067f0c702 Shell-quote wildcards when invoking 'vc-git-grep' 0540df10e6 Update documentation of '.dir-locals-2.el' f2441ab320 ; Fix some tiny doc and comment typos 22ff46e6d8 ; Fix some comment typos # Conflicts: # etc/NEWS
Diffstat (limited to 'lisp/progmodes/ebnf2ps.el')
-rw-r--r--lisp/progmodes/ebnf2ps.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index 5c9a106d41a..e40104353ac 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -1135,7 +1135,7 @@ Please send all bug fixes and enhancements to
;; Thanks to Drew Adams <drew.adams@oracle.com> for suggestions:
;; - `ebnf-arrow-extra-width', `ebnf-arrow-scale',
;; `ebnf-production-name-p', `ebnf-stop-on-error',
-;; `ebnf-file-suffix-regexp'and `ebnf-special-show-delimiter' variables.
+;; `ebnf-file-suffix-regexp' and `ebnf-special-show-delimiter' variables.
;; - `ebnf-delete-style', `ebnf-eps-file' and `ebnf-eps-directory'
;; commands.
;; - some docs fix.