aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2010-06-09 13:40:50 +0200
committerJuanma Barranquero2010-06-09 13:40:50 +0200
commitee8359ba5ad86ce40c8da350fb73648df21e6cb8 (patch)
tree1f8bb85c25fbb4b4681085d9dd000c3749f678aa
parentf64ab8fb4c5fbf995d44f4c7397ce4134e2ea3a9 (diff)
downloademacs-ee8359ba5ad86ce40c8da350fb73648df21e6cb8.tar.gz
emacs-ee8359ba5ad86ce40c8da350fb73648df21e6cb8.zip
* emacs-lisp/smie.el (comment-string-strip): Declare function.
(smie-precs-precedence-table): Fix typo in docstring.
-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 @@
12010-06-09 Juanma Barranquero <lekktu@gmail.com> 12010-06-09 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * emacs-lisp/smie.el (comment-string-strip): Declare function.
4 (smie-precs-precedence-table): Fix typo in docstring.
5
3 * vc-mtn.el (log-edit-extract-headers): Declare function. 6 * vc-mtn.el (log-edit-extract-headers): Declare function.
4 7
5 * vc-hg.el (log-edit-extract-headers): Remove duplicate declaration. 8 * 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 @@
68(eval-when-compile (require 'cl)) 68(eval-when-compile (require 'cl))
69 69
70(defvar comment-continue) 70(defvar comment-continue)
71(declare-function comment-string-strip "newcomment" (str beforep afterp))
71 72
72;;; Building precedence level tables from BNF specs. 73;;; Building precedence level tables from BNF specs.
73 74
@@ -89,7 +90,7 @@
89 "Compute a 2D precedence table from a list of precedences. 90 "Compute a 2D precedence table from a list of precedences.
90PRECS should be a list, sorted by precedence (e.g. \"+\" will 91PRECS should be a list, sorted by precedence (e.g. \"+\" will
91come before \"*\"), of elements of the form \(left OP ...) 92come before \"*\"), of elements of the form \(left OP ...)
92or (right OP ...) or (nonassoc OP ...) or (assoc OP ...). All operators in 93or (right OP ...) or (nonassoc OP ...) or (assoc OP ...). All operators in
93one of those elements share the same precedence level and associativity." 94one of those elements share the same precedence level and associativity."
94 (let ((prec2-table (make-hash-table :test 'equal))) 95 (let ((prec2-table (make-hash-table :test 'equal)))
95 (dolist (prec precs) 96 (dolist (prec precs)