diff options
author | Glenn Morris <rgm@gnu.org> | 2019-06-01 12:04:41 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2019-06-01 12:04:41 -0700 |
commit | 17a1dae4af751c82e78991350559481e9fa42959 (patch) | |
tree | 9d913268de49269e6116a8d368910dd6883ddb03 /doc/misc/cc-mode.texi | |
parent | 1860b6d57bb51cff082d4cf596bdd054f493c4cd (diff) | |
parent | 2168165ec05aa663d41998adb518e778899a8edd (diff) | |
download | emacs-17a1dae4af751c82e78991350559481e9fa42959.tar.gz |
Merge from origin/emacs-26
2168165 ; * doc/lispref/nonascii.texi (Explicit Encoding): Fix typo.
8f18d12 Improve documentation of decoding into a unibyte buffer
7681a57 Remove redundants "See" before @xref or @pxref (Bug#35793)
9bee762 ; * src/coding.c: Improve commentary. (Bug#34765)
e61349c Fix customization type of recentf-max-saved-items
# Conflicts:
# src/coding.c
Diffstat (limited to 'doc/misc/cc-mode.texi')
-rw-r--r-- | doc/misc/cc-mode.texi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index 6db2c96f2dc..df6709e38c2 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -1060,7 +1060,7 @@ there's a piece of normal text without having to think much about it. and so on. You can configure the exact way comments get filled and broken, and -where Emacs does auto-filling (see @pxref{Custom Filling and +where Emacs does auto-filling (@pxref{Custom Filling and Breaking}). Typically, the style system (@pxref{Styles}) will have set this up for you, so you probably won't have to bother. @@ -1478,7 +1478,7 @@ normal, with no @kbd{C-u} prefix). @end itemize You can configure the precise circumstances in which newlines get -inserted (see @pxref{Custom Auto-newlines}). Typically, the style +inserted (@pxref{Custom Auto-newlines}). Typically, the style system (@pxref{Styles}) will have set this up for you, so you probably won't have to bother. @@ -6853,7 +6853,7 @@ custom line-up function associated with it. @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! To configure macros which you invoke without a terminating @samp{;}, -see @xref{Macros with ;}. +@pxref{Macros with ;}. Here are the remaining odds and ends regarding indentation: |