diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-03-20 13:47:07 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-03-20 13:47:07 -0700 |
| commit | 1fc6afbdf1ce0f8b23780bd4d2630ed49f365013 (patch) | |
| tree | 515068805cee7b3c5c7fff7e924c2594b2572764 /doc/misc/cc-mode.texi | |
| parent | 99b3d64e54bb896e7b35567ac7022f9d3fb16bbb (diff) | |
| parent | 24b6e6edcfe034f76de475657cb3997821cfd1f0 (diff) | |
| download | emacs-1fc6afbdf1ce0f8b23780bd4d2630ed49f365013.tar.gz | |
Merge from origin/emacs-26
24b6e6e (origin/emacs-26) * etc/AUTHORS: Update.
2f22a17 * ; ChangeLog.3 update
0f523de Improve indexing of the user manual
bd5795e Fix url-copy-file arglist
eaa188a ; * admin/notes/bugtracker: Minor additions and updates.
5ed05fb Fix downloading updates for packages with non-ASCII descriptions
e9f2d1f * etc/NEWS: Remove temporary markers.
24fc133 * doc/misc/cc-mode.texi (Config Basics): in @itemize, @asis -...
0f325d1 Don't clobber 'comint-input-autoexpand' in 'read-shell-command'
bc75589 Document restrictions when setting window margins, fringes or...
cc4cebf More improvements for 'read-buffer's doc string
d026d9a * lisp/progmodes/cc-defs.el: Update c-version to 5.33.2 for E...
5dbf08b * src/minibuf.c (Fread_buffer): Minor doc fixes. (Bug#34749)
# Conflicts:
# etc/NEWS
# lisp/url/url-handlers.el
Diffstat (limited to 'doc/misc/cc-mode.texi')
| -rw-r--r-- | doc/misc/cc-mode.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index 170149eb550..f73a7fb57cb 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -2307,7 +2307,7 @@ that takes precedence is the one that appears latest in this list: @end ifclear @c Version of list for Texinfo >= 5.x @ifset txicommandconditionals -@itemize @asis +@itemize @w{} @item Style @item File Style@footnote{In earlier versions of @ccmode{}, a File Style setting took precedence over any other setting apart from a File Local Variable setting.} @item Top-level command or ``customization interface'' |