aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2007-11-15 16:41:15 +0000
committerJuanma Barranquero2007-11-15 16:41:15 +0000
commitb414f3715399ed603c03d02c3006259fe6cd12a2 (patch)
tree987253cf134e9172e8b4a2db75c9cf62df42103a
parent10cfe02cdc0f45ff0e9c9dd162351d12c4ab5d74 (diff)
downloademacs-b414f3715399ed603c03d02c3006259fe6cd12a2.tar.gz
emacs-b414f3715399ed603c03d02c3006259fe6cd12a2.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 a019f598918..7666da75f9b 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)))
@@ -4045,7 +4045,7 @@ comment at the start of cc-engine.el for more info."
4045 ;; example, this happens to "foo" when "foo \n bar();" becomes 4045 ;; example, this happens to "foo" when "foo \n bar();" becomes
4046 ;; "foo(); \n bar();". Such stale types, if not removed, foul up 4046 ;; "foo(); \n bar();". Such stale types, if not removed, foul up
4047 ;; the fontification. 4047 ;; the fontification.
4048 ;; 4048 ;;
4049 ;; Have we, perhaps, added non-ws characters to the front/back of a found 4049 ;; Have we, perhaps, added non-ws characters to the front/back of a found
4050 ;; type? 4050 ;; type?
4051 (when (> end beg) 4051 (when (> end beg)
@@ -4064,7 +4064,7 @@ comment at the start of cc-engine.el for more info."
4064 (c-beginning-of-current-token))) 4064 (c-beginning-of-current-token)))
4065 (c-unfind-type (buffer-substring-no-properties 4065 (c-unfind-type (buffer-substring-no-properties
4066 (point) beg)))))) 4066 (point) beg))))))
4067 4067
4068 (if c-maybe-stale-found-type ; e.g. (c-decl-id-start "foo" 97 107 " (* ooka) " "o") 4068 (if c-maybe-stale-found-type ; e.g. (c-decl-id-start "foo" 97 107 " (* ooka) " "o")
4069 (cond 4069 (cond
4070 ;; Changing the amount of (already existing) whitespace - don't do anything. 4070 ;; Changing the amount of (already existing) whitespace - don't do anything.
@@ -5929,7 +5929,7 @@ comment at the start of cc-engine.el for more info."
5929 macro-start ; if we're in one. 5929 macro-start ; if we're in one.
5930 label-type) 5930 label-type)
5931 (cond 5931 (cond
5932 ;; "case" or "default" (Doesn't apply to AWK). 5932 ;; "case" or "default" (Doesn't apply to AWK).
5933 ((looking-at c-label-kwds-regexp) 5933 ((looking-at c-label-kwds-regexp)
5934 (let ((kwd-end (match-end 1))) 5934 (let ((kwd-end (match-end 1)))
5935 ;; Record only the keyword itself for fontification, since in 5935 ;; Record only the keyword itself for fontification, since in
@@ -6048,7 +6048,7 @@ comment at the start of cc-engine.el for more info."
6048 (c-forward-label nil pte start)))))))))) 6048 (c-forward-label nil pte start))))))))))
6049 6049
6050 ;; Point is still at the beginning of the possible label construct. 6050 ;; Point is still at the beginning of the possible label construct.
6051 ;; 6051 ;;
6052 ;; Check that the next nonsymbol token is ":", or that we're in one 6052 ;; Check that the next nonsymbol token is ":", or that we're in one
6053 ;; of QT's "slots" declarations. Allow '(' for the sake of macro 6053 ;; of QT's "slots" declarations. Allow '(' for the sake of macro
6054 ;; arguments. FIXME: Should build this regexp from the language 6054 ;; arguments. FIXME: Should build this regexp from the language
@@ -6074,7 +6074,7 @@ comment at the start of cc-engine.el for more info."
6074 (and (c-major-mode-is 'c++-mode) 6074 (and (c-major-mode-is 'c++-mode)
6075 (string-match 6075 (string-match
6076 "\\(p\\(r\\(ivate\\|otected\\)\\|ublic\\)\\|more\\)\\>" 6076 "\\(p\\(r\\(ivate\\|otected\\)\\|ublic\\)\\|more\\)\\>"
6077 (buffer-substring start (point))))) 6077 (buffer-substring start (point)))))
6078 (c-forward-syntactic-ws limit) 6078 (c-forward-syntactic-ws limit)
6079 (cond 6079 (cond
6080 ((looking-at ":\\([^:]\\|\\'\\)") ; A single colon. 6080 ((looking-at ":\\([^:]\\|\\'\\)") ; A single colon.
@@ -7238,7 +7238,7 @@ comment at the start of cc-engine.el for more info."
7238 ;; needed with further syntax elements of the types `substatement', 7238 ;; needed with further syntax elements of the types `substatement',
7239 ;; `inexpr-statement', `arglist-cont-nonempty', `statement-block-intro', and 7239 ;; `inexpr-statement', `arglist-cont-nonempty', `statement-block-intro', and
7240 ;; `defun-block-intro'. 7240 ;; `defun-block-intro'.
7241 ;; 7241 ;;
7242 ;; Do the generic processing to anchor the given syntax symbol on 7242 ;; Do the generic processing to anchor the given syntax symbol on
7243 ;; the preceding statement: Skip over any labels and containing 7243 ;; the preceding statement: Skip over any labels and containing
7244 ;; statements on the same line, and then search backward until we 7244 ;; statements on the same line, and then search backward until we
@@ -7424,7 +7424,7 @@ comment at the start of cc-engine.el for more info."
7424 c-other-decl-block-key-in-symbols-alist)) 7424 c-other-decl-block-key-in-symbols-alist))
7425 (max (c-point 'boi paren-pos) (point)))) 7425 (max (c-point 'boi paren-pos) (point))))
7426 (t (c-add-syntax 'defun-block-intro nil)))) 7426 (t (c-add-syntax 'defun-block-intro nil))))
7427 7427
7428 (c-add-syntax 'statement-block-intro nil))) 7428 (c-add-syntax 'statement-block-intro nil)))
7429 7429
7430 (if (= paren-pos boi) 7430 (if (= paren-pos boi)
@@ -8264,7 +8264,7 @@ comment at the start of cc-engine.el for more info."
8264 'statement-cont) 8264 'statement-cont)
8265 nil nil containing-sexp paren-state)) 8265 nil nil containing-sexp paren-state))
8266 )) 8266 ))
8267 8267
8268 ;; CASE 5F: Close of a non-class declaration level block. 8268 ;; CASE 5F: Close of a non-class declaration level block.
8269 ((and (eq char-after-ip ?}) 8269 ((and (eq char-after-ip ?})
8270 (c-keyword-member containing-decl-kwd 8270 (c-keyword-member containing-decl-kwd