Merge from origin/emacs-25

[gnu-emacs] / lisp / emacs-lisp / syntax.el

diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index ae682ecf73a95335e859798990613fe0c49c88ab..31fc67ec8156fe1c44ab9a8b93a446ea540df24f 100644 (file)
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -274,7 +274,7 @@ Note: back-references in REGEXPs do not work."
 (defun syntax-propertize-via-font-lock (keywords)
   "Propertize for syntax using font-lock syntax.
 KEYWORDS obeys the format used in `font-lock-syntactic-keywords'.
-The return value is a function (with two paremeters, START and
+The return value is a function (with two parameters, START and
 END) suitable for `syntax-propertize-function'."
   (lambda (start end)
     (with-no-warnings