diff options
| -rw-r--r-- | lisp/progmodes/cc-cmds.el | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 8b2f5e57f83..b876930f34a 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el | |||
| @@ -271,7 +271,7 @@ With universal argument, inserts the analysis as a comment on that line." | |||
| 271 | ;; fmt)) | 271 | ;; fmt)) |
| 272 | (setq mode-name | 272 | (setq mode-name |
| 273 | (if (> (length fmt) 1) | 273 | (if (> (length fmt) 1) |
| 274 | (concat bare-mode-name fmt) | 274 | (concat bare-mode-name fmt) |
| 275 | bare-mode-name)) | 275 | bare-mode-name)) |
| 276 | (force-mode-line-update))) | 276 | (force-mode-line-update))) |
| 277 | 277 | ||
| @@ -536,7 +536,7 @@ inside a literal or a macro, nothing special happens." | |||
| 536 | ;; shut this up too | 536 | ;; shut this up too |
| 537 | (c-echo-syntactic-information-p nil) | 537 | (c-echo-syntactic-information-p nil) |
| 538 | symb-newlines) ; e.g. (substatement-open . (after)) | 538 | symb-newlines) ; e.g. (substatement-open . (after)) |
| 539 | 539 | ||
| 540 | (setq symb-newlines | 540 | (setq symb-newlines |
| 541 | ;; Do not try to insert newlines around a special | 541 | ;; Do not try to insert newlines around a special |
| 542 | ;; (Pike-style) brace list. | 542 | ;; (Pike-style) brace list. |
| @@ -1661,12 +1661,12 @@ function does not require the declaration to contain a brace block." | |||
| 1661 | (defun c-narrow-to-comment-innards (range) | 1661 | (defun c-narrow-to-comment-innards (range) |
| 1662 | ;; Narrow to the "inside" of the comment (block) defined by range, as | 1662 | ;; Narrow to the "inside" of the comment (block) defined by range, as |
| 1663 | ;; follows: | 1663 | ;; follows: |
| 1664 | ;; | 1664 | ;; |
| 1665 | ;; A c-style block comment has its opening "/*" and its closing "*/" (if | 1665 | ;; A c-style block comment has its opening "/*" and its closing "*/" (if |
| 1666 | ;; present) removed. A c++-style line comment retains its opening "//" but | 1666 | ;; present) removed. A c++-style line comment retains its opening "//" but |
| 1667 | ;; has any final NL removed. If POINT is currently outwith these innards, | 1667 | ;; has any final NL removed. If POINT is currently outwith these innards, |
| 1668 | ;; move it to the appropriate boundary. | 1668 | ;; move it to the appropriate boundary. |
| 1669 | ;; | 1669 | ;; |
| 1670 | ;; This narrowing simplifies the sentence movement functions, since it | 1670 | ;; This narrowing simplifies the sentence movement functions, since it |
| 1671 | ;; eliminates awkward things at the boundaries of the comment (block). | 1671 | ;; eliminates awkward things at the boundaries of the comment (block). |
| 1672 | ;; | 1672 | ;; |
| @@ -1694,7 +1694,7 @@ function does not require the declaration to contain a brace block." | |||
| 1694 | ;; of the comment and return T. | 1694 | ;; of the comment and return T. |
| 1695 | ;; | 1695 | ;; |
| 1696 | ;; The BOS is either text which follows a regexp match of sentence-end, | 1696 | ;; The BOS is either text which follows a regexp match of sentence-end, |
| 1697 | ;; or text which is a beginning of "paragraph". | 1697 | ;; or text which is a beginning of "paragraph". |
| 1698 | ;; Comment-prefixes are treated like WS when calculating BOSes or BOPs. | 1698 | ;; Comment-prefixes are treated like WS when calculating BOSes or BOPs. |
| 1699 | ;; | 1699 | ;; |
| 1700 | ;; This code was adapted from GNU Emacs's forward-sentence in paragraphs.el. | 1700 | ;; This code was adapted from GNU Emacs's forward-sentence in paragraphs.el. |
| @@ -2104,7 +2104,7 @@ function does not require the declaration to contain a brace block." | |||
| 2104 | ((looking-at c-string-limit-regexp) ; Just gone back over a string terminator? | 2104 | ((looking-at c-string-limit-regexp) ; Just gone back over a string terminator? |
| 2105 | (goto-char last) | 2105 | (goto-char last) |
| 2106 | (throw 'done '(t . literal))) | 2106 | (throw 'done '(t . literal))) |
| 2107 | 2107 | ||
| 2108 | ;; Nothing special: go back word characters. | 2108 | ;; Nothing special: go back word characters. |
| 2109 | (t (skip-syntax-backward "w_")) ; Speedup only. | 2109 | (t (skip-syntax-backward "w_")) ; Speedup only. |
| 2110 | )))))) | 2110 | )))))) |
| @@ -2136,7 +2136,7 @@ function does not require the declaration to contain a brace block." | |||
| 2136 | ;; As a clarification of "after the end-of-statement", if a comment or | 2136 | ;; As a clarification of "after the end-of-statement", if a comment or |
| 2137 | ;; whitespace follows a completed AWK statement, that statement is treated | 2137 | ;; whitespace follows a completed AWK statement, that statement is treated |
| 2138 | ;; as ending just after the last non-ws character before the comment. | 2138 | ;; as ending just after the last non-ws character before the comment. |
| 2139 | ;; | 2139 | ;; |
| 2140 | ;; Note that this function moves within either preprocessor commands | 2140 | ;; Note that this function moves within either preprocessor commands |
| 2141 | ;; (macros) or normal code, but not both within the same invocation. | 2141 | ;; (macros) or normal code, but not both within the same invocation. |
| 2142 | ;; | 2142 | ;; |
| @@ -2427,7 +2427,7 @@ sentence motion in or near comments and multiline strings." | |||
| 2427 | 2427 | ||
| 2428 | (if (/= count 0) (setq count (1- count)))) | 2428 | (if (/= count 0) (setq count (1- count)))) |
| 2429 | (c-keep-region-active)))) | 2429 | (c-keep-region-active)))) |
| 2430 | 2430 | ||
| 2431 | 2431 | ||
| 2432 | 2432 | ||
| 2433 | ;; set up electric character functions to work with pending-del, | 2433 | ;; set up electric character functions to work with pending-del, |
| @@ -2560,7 +2560,7 @@ forward." | |||
| 2560 | (interactive "p") | 2560 | (interactive "p") |
| 2561 | (c-forward-conditional (- count) -1) | 2561 | (c-forward-conditional (- count) -1) |
| 2562 | (c-keep-region-active)) | 2562 | (c-keep-region-active)) |
| 2563 | 2563 | ||
| 2564 | (defun c-up-conditional-with-else (count) | 2564 | (defun c-up-conditional-with-else (count) |
| 2565 | "Move back to the containing preprocessor conditional, including \"#else\". | 2565 | "Move back to the containing preprocessor conditional, including \"#else\". |
| 2566 | Just like `c-up-conditional', except it also stops at \"#else\" | 2566 | Just like `c-up-conditional', except it also stops at \"#else\" |
| @@ -2782,7 +2782,7 @@ prefix argument is equivalent to -1. | |||
| 2782 | 2782 | ||
| 2783 | (defun c-indent-exp (&optional shutup-p) | 2783 | (defun c-indent-exp (&optional shutup-p) |
| 2784 | "Indent each line in the balanced expression following point syntactically. | 2784 | "Indent each line in the balanced expression following point syntactically. |
| 2785 | If optional SHUTUP-P is non-nil, no errors are signalled if no | 2785 | If optional SHUTUP-P is non-nil, no errors are signaled if no |
| 2786 | balanced expression is found." | 2786 | balanced expression is found." |
| 2787 | (interactive "*P") | 2787 | (interactive "*P") |
| 2788 | (let ((here (point-marker)) | 2788 | (let ((here (point-marker)) |
| @@ -3611,7 +3611,7 @@ command to conveniently insert and align the necessary backslashes." | |||
| 3611 | hang-ender-stuck | 3611 | hang-ender-stuck |
| 3612 | ;; auto-fill-spaces is the exact sequence of whitespace between a | 3612 | ;; auto-fill-spaces is the exact sequence of whitespace between a |
| 3613 | ;; comment's last word and the comment ender, temporarily replaced | 3613 | ;; comment's last word and the comment ender, temporarily replaced |
| 3614 | ;; with 'x's before calling FUN when FILL-PARAGRAPH is nil. | 3614 | ;; with 'x's before calling FUN when FILL-PARAGRAPH is nil. |
| 3615 | auto-fill-spaces | 3615 | auto-fill-spaces |
| 3616 | (here (point)) | 3616 | (here (point)) |
| 3617 | (c-lit-limits c-lit-limits) | 3617 | (c-lit-limits c-lit-limits) |