aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJuanma Barranquero2010-05-18 09:44:07 +0200
committerJuanma Barranquero2010-05-18 09:44:07 +0200
commit35e53abd433f7653d5e0606cb36179c93a0d43c0 (patch)
tree0083565c66533fdf1b8a8d399830dc5a8ea08a5a /lisp
parent5739cdd25a18f0057ff9334956f02ff79c46e957 (diff)
downloademacs-35e53abd433f7653d5e0606cb36179c93a0d43c0.tar.gz
emacs-35e53abd433f7653d5e0606cb36179c93a0d43c0.zip
* emacs-lisp/smie.el: Fix typos in docstrings.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/smie.el12
2 files changed, 11 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e85fa58d360..27ae2f110c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-05-18 Juanma Barranquero <lekktu@gmail.com>
2
3 * emacs-lisp/smie.el (smie-precs-precedence-table, smie-backward-sexp)
4 (smie-forward-sexp, smie-indent-calculate): Fix typos in docstrings.
5
12010-05-17 Stefan Monnier <monnier@iro.umontreal.ca> 62010-05-17 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 Provide a simple generic indentation engine and use it for Prolog. 8 Provide a simple generic indentation engine and use it for Prolog.
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 46c4222f3fe..27ddeb762af 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -86,7 +86,7 @@
86PRECS should be a list, sorted by precedence (e.g. \"+\" will 86PRECS should be a list, sorted by precedence (e.g. \"+\" will
87come before \"*\"), of elements of the form \(left OP ...) 87come before \"*\"), of elements of the form \(left OP ...)
88or (right OP ...) or (nonassoc OP ...) or (assoc OP ...). All operators in 88or (right OP ...) or (nonassoc OP ...) or (assoc OP ...). All operators in
89one of those elements shares the same precedence level and associativity." 89one of those elements share the same precedence level and associativity."
90 (let ((prec2-table (make-hash-table :test 'equal))) 90 (let ((prec2-table (make-hash-table :test 'equal)))
91 (dolist (prec precs) 91 (dolist (prec precs)
92 (dolist (op (cdr prec)) 92 (dolist (op (cdr prec))
@@ -300,7 +300,7 @@ Possible return values:
300 (LEFT-LEVEL POS TOKEN): we couldn't skip TOKEN because its right-level 300 (LEFT-LEVEL POS TOKEN): we couldn't skip TOKEN because its right-level
301 is too high. LEFT-LEVEL is the left-level of TOKEN, 301 is too high. LEFT-LEVEL is the left-level of TOKEN,
302 POS is its start position in the buffer. 302 POS is its start position in the buffer.
303 (t POS TOKEN): Same thing but for an open-paren or the beginning of buffer. 303 (t POS TOKEN): same thing but for an open-paren or the beginning of buffer.
304 (nil POS TOKEN): we skipped over a paren-like pair. 304 (nil POS TOKEN): we skipped over a paren-like pair.
305 nil: we skipped over an identifier, matched parentheses, ..." 305 nil: we skipped over an identifier, matched parentheses, ..."
306 (if (bobp) (list t (point)) 306 (if (bobp) (list t (point))
@@ -311,7 +311,7 @@ Possible return values:
311 (token (progn (forward-comment (- (point-max))) 311 (token (progn (forward-comment (- (point-max)))
312 (smie-backward-token))) 312 (smie-backward-token)))
313 (toklevels (cdr (assoc token smie-op-levels)))) 313 (toklevels (cdr (assoc token smie-op-levels))))
314 314
315 (cond 315 (cond
316 ((null toklevels) 316 ((null toklevels)
317 (if (equal token "") 317 (if (equal token "")
@@ -360,7 +360,7 @@ Possible return values:
360 (RIGHT-LEVEL POS TOKEN): we couldn't skip TOKEN because its left-level 360 (RIGHT-LEVEL POS TOKEN): we couldn't skip TOKEN because its left-level
361 is too high. RIGHT-LEVEL is the right-level of TOKEN, 361 is too high. RIGHT-LEVEL is the right-level of TOKEN,
362 POS is its end position in the buffer. 362 POS is its end position in the buffer.
363 (t POS TOKEN): Same thing but for an open-paren or the beginning of buffer. 363 (t POS TOKEN): same thing but for an open-paren or the beginning of buffer.
364 (nil POS TOKEN): we skipped over a paren-like pair. 364 (nil POS TOKEN): we skipped over a paren-like pair.
365 nil: we skipped over an identifier, matched parentheses, ..." 365 nil: we skipped over an identifier, matched parentheses, ..."
366 (if (eobp) (list t (point)) 366 (if (eobp) (list t (point))
@@ -371,7 +371,7 @@ Possible return values:
371 (token (progn (forward-comment (point-max)) 371 (token (progn (forward-comment (point-max))
372 (smie-forward-token))) 372 (smie-forward-token)))
373 (toklevels (cdr (assoc token smie-op-levels)))) 373 (toklevels (cdr (assoc token smie-op-levels))))
374 374
375 (cond 375 (cond
376 ((null toklevels) 376 ((null toklevels)
377 (if (equal token "") 377 (if (equal token "")
@@ -485,7 +485,7 @@ need to compute the column at which point should be indented
485in order to figure out the indentation of some other (further down) point. 485in order to figure out the indentation of some other (further down) point.
486VIRTUAL can take two different non-nil values: 486VIRTUAL can take two different non-nil values:
487- :bolp: means that the current indentation of point can be trusted 487- :bolp: means that the current indentation of point can be trusted
488 to be good only if if it follows a line break. 488 to be good only if it follows a line break.
489- :hanging: means that the current indentation of point can be 489- :hanging: means that the current indentation of point can be
490 trusted to be good except if the following token is hanging." 490 trusted to be good except if the following token is hanging."
491 ;; FIXME: This has accumulated a lot of rules, some of which aren't 491 ;; FIXME: This has accumulated a lot of rules, some of which aren't