summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2010-06-09 13:40:50 +0200
committerJuanma Barranquero <lekktu@gmail.com>2010-06-09 13:40:50 +0200
commitee8359ba5ad86ce40c8da350fb73648df21e6cb8 (patch)
tree1f8bb85c25fbb4b4681085d9dd000c3749f678aa /lisp
parentf64ab8fb4c5fbf995d44f4c7397ce4134e2ea3a9 (diff)
downloademacs-ee8359ba5ad86ce40c8da350fb73648df21e6cb8.tar.gz
* emacs-lisp/smie.el (comment-string-strip): Declare function.
(smie-precs-precedence-table): Fix typo in docstring.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/emacs-lisp/smie.el3
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16791f19c87..29937de2bfe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2010-06-09 Juanma Barranquero <lekktu@gmail.com>
+ * emacs-lisp/smie.el (comment-string-strip): Declare function.
+ (smie-precs-precedence-table): Fix typo in docstring.
+
* vc-mtn.el (log-edit-extract-headers): Declare function.
* vc-hg.el (log-edit-extract-headers): Remove duplicate declaration.
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 687a43df966..fb1e4737d39 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -68,6 +68,7 @@
(eval-when-compile (require 'cl))
(defvar comment-continue)
+(declare-function comment-string-strip "newcomment" (str beforep afterp))
;;; Building precedence level tables from BNF specs.
@@ -89,7 +90,7 @@
"Compute a 2D precedence table from a list of precedences.
PRECS should be a list, sorted by precedence (e.g. \"+\" will
come before \"*\"), of elements of the form \(left OP ...)
-or (right OP ...) or (nonassoc OP ...) or (assoc OP ...). All operators in
+or (right OP ...) or (nonassoc OP ...) or (assoc OP ...). All operators in
one of those elements share the same precedence level and associativity."
(let ((prec2-table (make-hash-table :test 'equal)))
(dolist (prec precs)