diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-10 07:39:05 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-10 07:39:05 -0700 |
| commit | 46b83c0f08f936eb1a0ae761db557169fe295cc7 (patch) | |
| tree | bdb663d86a908a83b7c953316d04714664b32a0c /doc/misc/cc-mode.texi | |
| parent | be589ea0dc71063d26595378df303a2a1c25ee4e (diff) | |
| parent | 4f406e9813e073b675bb45613bf1dd111eec2368 (diff) | |
| download | emacs-46b83c0f08f936eb1a0ae761db557169fe295cc7.tar.gz emacs-46b83c0f08f936eb1a0ae761db557169fe295cc7.tar.bz2 emacs-46b83c0f08f936eb1a0ae761db557169fe295cc7.zip | |
Merge from origin/emacs-25
4f406e9 CC Mode manual: remove reference to former Emacs variable las...
44e402e Allow to disable compaction of font caches
4ff4b66 Allow selection of font for symbols as in Emacs 24.x
c03d44b ; Fix last commit
d4be4f3 ; Fix indexing in lispref manual
ed399f2 ; Minor improvement in documentation of generators
197a6bc Fix horizontal scrolling during Isearch
3566644 Fix infloop in redisplay due to truncated lines and invisible...
# Conflicts:
# etc/NEWS
Diffstat (limited to 'doc/misc/cc-mode.texi')
| -rw-r--r-- | doc/misc/cc-mode.texi | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index 691616917b7..4f7711184d0 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -3544,10 +3544,11 @@ use, add this function to the front of the @example (defun c-semi&comma-no-newlines-before-nonblanks () (save-excursion - (if (and (eq last-command-char ?\;) - (zerop (forward-line 1)) - (not (looking-at "^[ \t]*$"))) - 'stop + (if (and (= (c-last-command-char) ?\;) + (zerop (forward-line 1)) + (bolp) ; forward-line has funny behavior at eob. + (not (looking-at "^[ \t]*$"))) + 'stop nil))) @end example @end defun |