diff options
| author | Martin Stjernholm <mast@lysator.liu.se> | 2004-08-11 16:22:21 +0000 |
|---|---|---|
| committer | Martin Stjernholm <mast@lysator.liu.se> | 2004-08-11 16:22:21 +0000 |
| commit | 2a15eb73df90655c012a78713ae9b33278c3206e (patch) | |
| tree | 4222cfd22e0556020b72cfbd6ab5992797e21e4f /lisp/progmodes/cc-cmds.el | |
| parent | 7c3225c3a606c9e81e98b2b1f414542aca21d36f (diff) | |
| download | emacs-2a15eb73df90655c012a78713ae9b33278c3206e.tar.gz | |
Updated CC Mode to 5.30.9.
Diffstat (limited to 'lisp/progmodes/cc-cmds.el')
| -rw-r--r-- | lisp/progmodes/cc-cmds.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index a61369004e8..806fbade693 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -479,7 +479,11 @@ This function does various newline cleanups based on the value of ;; end up before it. (setq delete-temp-newline (cons (save-excursion - (c-backward-syntactic-ws) + (end-of-line 0) + (if (eq (char-before) ?\\) + ;; Ignore a line continuation. + (backward-char)) + (skip-chars-backward " \t") (copy-marker (point) t)) (point-marker)))) (unwind-protect @@ -1971,8 +1975,7 @@ If `c-tab-always-indent' is t, always just indent the current line. If nil, indent the current line only if point is at the left margin or in the line's indentation; otherwise insert some whitespace[*]. If other than nil or t, then some whitespace[*] is inserted only within -literals (comments and strings) and inside preprocessor directives, -but the line is always reindented. +literals (comments and strings), but the line is always reindented. If `c-syntactic-indentation' is t, indentation is done according to the syntactic context. A numeric argument, regardless of its value, |