diff options
| author | Eli Zaretskii | 2017-09-12 19:29:45 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2017-09-12 19:29:45 +0300 |
| commit | c87331a1c04aa4be55be7b944680e4ec486f5b04 (patch) | |
| tree | 1e97d4c6e06ca7bfee967c251e1a5af7b57fbf7d | |
| parent | b215b3a2f389d6759569bc3dccbbb2503998f06c (diff) | |
| parent | f4859757b63a056392af410fce6b4938f7f27c00 (diff) | |
| download | emacs-c87331a1c04aa4be55be7b944680e4ec486f5b04.tar.gz emacs-c87331a1c04aa4be55be7b944680e4ec486f5b04.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 5ac4a769337..9ea0b2046a6 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el | |||
| @@ -6418,7 +6418,7 @@ comment at the start of cc-engine.el for more info." | |||
| 6418 | (not (eq (c-get-char-property (point) 'c-type) | 6418 | (not (eq (c-get-char-property (point) 'c-type) |
| 6419 | 'c-decl-arg-start))))))) | 6419 | 'c-decl-arg-start))))))) |
| 6420 | (or (c-forward-<>-arglist nil) | 6420 | (or (c-forward-<>-arglist nil) |
| 6421 | (forward-char))))) | 6421 | (c-forward-token-2))))) |
| 6422 | 6422 | ||
| 6423 | 6423 | ||
| 6424 | ;; Functions to handle C++ raw strings. | 6424 | ;; Functions to handle C++ raw strings. |