aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2007-11-15 18:27:06 +0000
committerJuanma Barranquero2007-11-15 18:27:06 +0000
commit1fc0c6247c2b8c0102028d1ba95d9bcc03d3f1e4 (patch)
tree6ac68803d9a9e1b820c689901636dfce119a64b6
parent6e096c718f185c5a600321b67a03f02be521de59 (diff)
downloademacs-1fc0c6247c2b8c0102028d1ba95d9bcc03d3f1e4.tar.gz
emacs-1fc0c6247c2b8c0102028d1ba95d9bcc03d3f1e4.zip
(c-crosses-statement-barrier-p): Fix typo in docstring.
-rw-r--r--lisp/progmodes/cc-engine.el26
1 files changed, 13 insertions, 13 deletions
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index d1a27d567fd..fa41d247c59 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -604,7 +604,7 @@ comment at the start of cc-engine.el for more info."
604 ;; (e.g. if). 604 ;; (e.g. if).
605 ;; 605 ;;
606 ;; 606 ;;
607 ;; The following diagram briefly outlines the PDA. 607 ;; The following diagram briefly outlines the PDA.
608 ;; 608 ;;
609 ;; Common state: 609 ;; Common state:
610 ;; "else": Push state, goto state `else'. 610 ;; "else": Push state, goto state `else'.
@@ -1079,7 +1079,7 @@ single `?' is found, then `c-maybe-labelp' is cleared.
1079 1079
1080For AWK, a statement which is terminated by an EOL (not a \; or a }) is 1080For AWK, a statement which is terminated by an EOL (not a \; or a }) is
1081regarded as having a \"virtual semicolon\" immediately after the last token on 1081regarded as having a \"virtual semicolon\" immediately after the last token on
1082the line. If this virtual semicolon is _at_ from, the function recognises it. 1082the line. If this virtual semicolon is _at_ from, the function recognizes it.
1083 1083
1084Note that this function might do hidden buffer changes. See the 1084Note that this function might do hidden buffer changes. See the
1085comment at the start of cc-engine.el for more info." 1085comment at the start of cc-engine.el for more info."
@@ -1916,7 +1916,7 @@ comment at the start of cc-engine.el for more info."
1916(defun c-partial-ws-p (beg end) 1916(defun c-partial-ws-p (beg end)
1917 ;; Is the region (beg end) WS, and is there WS (or BOB/EOB) next to the 1917 ;; Is the region (beg end) WS, and is there WS (or BOB/EOB) next to the
1918 ;; region? This is a "heuristic" function. ..... 1918 ;; region? This is a "heuristic" function. .....
1919 ;; 1919 ;;
1920 ;; The motivation for the second bit is to check whether removing this 1920 ;; The motivation for the second bit is to check whether removing this
1921 ;; region would coalesce two symbols. 1921 ;; region would coalesce two symbols.
1922 ;; 1922 ;;
@@ -3291,7 +3291,7 @@ comment at the start of cc-engine.el for more info."
3291;; The workaround for this is for the AWK Mode initialisation to switch the 3291;; The workaround for this is for the AWK Mode initialisation to switch the
3292;; defalias for c-in-literal to c-slow-in-literal. This will slow down other 3292;; defalias for c-in-literal to c-slow-in-literal. This will slow down other
3293;; cc-modes in Xemacs whenever an awk-buffer has been initialised. 3293;; cc-modes in Xemacs whenever an awk-buffer has been initialised.
3294;; 3294;;
3295;; (Alan Mackenzie, 2003/4/30). 3295;; (Alan Mackenzie, 2003/4/30).
3296 3296
3297(defun c-fast-in-literal (&optional lim detect-cpp) 3297(defun c-fast-in-literal (&optional lim detect-cpp)
@@ -3406,7 +3406,7 @@ comment at the start of cc-engine.el for more info."
3406 (if (and (consp range) (progn 3406 (if (and (consp range) (progn
3407 (goto-char (car range)) 3407 (goto-char (car range))
3408 (looking-at c-line-comment-starter))) 3408 (looking-at c-line-comment-starter)))
3409 (let ((col (current-column)) 3409 (let ((col (current-column))
3410 (beg (point)) 3410 (beg (point))
3411 (bopl (c-point 'bopl)) 3411 (bopl (c-point 'bopl))
3412 (end (cdr range))) 3412 (end (cdr range)))
@@ -4042,7 +4042,7 @@ comment at the start of cc-engine.el for more info."
4042 ;; example, this happens to "foo" when "foo \n bar();" becomes 4042 ;; example, this happens to "foo" when "foo \n bar();" becomes
4043 ;; "foo(); \n bar();". Such stale types, if not removed, foul up 4043 ;; "foo(); \n bar();". Such stale types, if not removed, foul up
4044 ;; the fontification. 4044 ;; the fontification.
4045 ;; 4045 ;;
4046 ;; Have we, perhaps, added non-ws characters to the front/back of a found 4046 ;; Have we, perhaps, added non-ws characters to the front/back of a found
4047 ;; type? 4047 ;; type?
4048 (when (> end beg) 4048 (when (> end beg)
@@ -4061,7 +4061,7 @@ comment at the start of cc-engine.el for more info."
4061 (c-beginning-of-current-token))) 4061 (c-beginning-of-current-token)))
4062 (c-unfind-type (buffer-substring-no-properties 4062 (c-unfind-type (buffer-substring-no-properties
4063 (point) beg)))))) 4063 (point) beg))))))
4064 4064
4065 (if c-maybe-stale-found-type ; e.g. (c-decl-id-start "foo" 97 107 " (* ooka) " "o") 4065 (if c-maybe-stale-found-type ; e.g. (c-decl-id-start "foo" 97 107 " (* ooka) " "o")
4066 (cond 4066 (cond
4067 ;; Changing the amount of (already existing) whitespace - don't do anything. 4067 ;; Changing the amount of (already existing) whitespace - don't do anything.
@@ -5926,7 +5926,7 @@ comment at the start of cc-engine.el for more info."
5926 macro-start ; if we're in one. 5926 macro-start ; if we're in one.
5927 label-type) 5927 label-type)
5928 (cond 5928 (cond
5929 ;; "case" or "default" (Doesn't apply to AWK). 5929 ;; "case" or "default" (Doesn't apply to AWK).
5930 ((looking-at c-label-kwds-regexp) 5930 ((looking-at c-label-kwds-regexp)
5931 (let ((kwd-end (match-end 1))) 5931 (let ((kwd-end (match-end 1)))
5932 ;; Record only the keyword itself for fontification, since in 5932 ;; Record only the keyword itself for fontification, since in
@@ -6045,7 +6045,7 @@ comment at the start of cc-engine.el for more info."
6045 (c-forward-label nil pte start)))))))))) 6045 (c-forward-label nil pte start))))))))))
6046 6046
6047 ;; Point is still at the beginning of the possible label construct. 6047 ;; Point is still at the beginning of the possible label construct.
6048 ;; 6048 ;;
6049 ;; Check that the next nonsymbol token is ":", or that we're in one 6049 ;; Check that the next nonsymbol token is ":", or that we're in one
6050 ;; of QT's "slots" declarations. Allow '(' for the sake of macro 6050 ;; of QT's "slots" declarations. Allow '(' for the sake of macro
6051 ;; arguments. FIXME: Should build this regexp from the language 6051 ;; arguments. FIXME: Should build this regexp from the language
@@ -6071,7 +6071,7 @@ comment at the start of cc-engine.el for more info."
6071 (and (c-major-mode-is 'c++-mode) 6071 (and (c-major-mode-is 'c++-mode)
6072 (string-match 6072 (string-match
6073 "\\(p\\(r\\(ivate\\|otected\\)\\|ublic\\)\\|more\\)\\>" 6073 "\\(p\\(r\\(ivate\\|otected\\)\\|ublic\\)\\|more\\)\\>"
6074 (buffer-substring start (point))))) 6074 (buffer-substring start (point)))))
6075 (c-forward-syntactic-ws limit) 6075 (c-forward-syntactic-ws limit)
6076 (cond 6076 (cond
6077 ((looking-at ":\\([^:]\\|\\'\\)") ; A single colon. 6077 ((looking-at ":\\([^:]\\|\\'\\)") ; A single colon.
@@ -7235,7 +7235,7 @@ comment at the start of cc-engine.el for more info."
7235 ;; needed with further syntax elements of the types `substatement', 7235 ;; needed with further syntax elements of the types `substatement',
7236 ;; `inexpr-statement', `arglist-cont-nonempty', `statement-block-intro', and 7236 ;; `inexpr-statement', `arglist-cont-nonempty', `statement-block-intro', and
7237 ;; `defun-block-intro'. 7237 ;; `defun-block-intro'.
7238 ;; 7238 ;;
7239 ;; Do the generic processing to anchor the given syntax symbol on 7239 ;; Do the generic processing to anchor the given syntax symbol on
7240 ;; the preceding statement: Skip over any labels and containing 7240 ;; the preceding statement: Skip over any labels and containing
7241 ;; statements on the same line, and then search backward until we 7241 ;; statements on the same line, and then search backward until we
@@ -7421,7 +7421,7 @@ comment at the start of cc-engine.el for more info."
7421 c-other-decl-block-key-in-symbols-alist)) 7421 c-other-decl-block-key-in-symbols-alist))
7422 (max (c-point 'boi paren-pos) (point)))) 7422 (max (c-point 'boi paren-pos) (point))))
7423 (t (c-add-syntax 'defun-block-intro nil)))) 7423 (t (c-add-syntax 'defun-block-intro nil))))
7424 7424
7425 (c-add-syntax 'statement-block-intro nil))) 7425 (c-add-syntax 'statement-block-intro nil)))
7426 7426
7427 (if (= paren-pos boi) 7427 (if (= paren-pos boi)
@@ -8261,7 +8261,7 @@ comment at the start of cc-engine.el for more info."
8261 'statement-cont) 8261 'statement-cont)
8262 nil nil containing-sexp paren-state)) 8262 nil nil containing-sexp paren-state))
8263 )) 8263 ))
8264 8264
8265 ;; CASE 5F: Close of a non-class declaration level block. 8265 ;; CASE 5F: Close of a non-class declaration level block.
8266 ((and (eq char-after-ip ?}) 8266 ((and (eq char-after-ip ?})
8267 (c-keyword-member containing-decl-kwd 8267 (c-keyword-member containing-decl-kwd