* emacs-lisp/smie.el (comment-string-strip): Declare function.

  (smie-precs-precedence-table): Fix typo in docstring.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16791f19c87094ab592755ce85cba953a715ddd9..29937de2bfe20ff17089b104404a722fcf59ba82 100644 (file)
--- 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 687a43df9660f31d84a2a72e5d580e4c4c27cae1..fb1e4737d39c0650723b6dc2e065237a08b6c862 100644 (file)
--- 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)