Glenn Morris b1cf262a79 Merge from origin/emacs-26 ... b3f4a3a (origin/emacs-26) Special-case %DUMBFW for GnuTLS between 3.2... c2ae057 Work around GnuTLS version issues with %DUMBFW (tiny change) 2f9d9ef ; Remove the mention of "plain C code" in the docstring as well aca827b Merge branch 'widen-less' into emacs-26 87548f5 ; Rephrase NEWS entry a bit da0d773 (emacs-26) ; * lisp/erc/erc.el: Update URL. 3a60515 * lisp/erc/erc.el (erc-shorten-server-name): Silence compiler... 471b6c1 ; Replace non-ascii quote characters in doc strings etc 7af7f5e Fix some more aliases to user options 79fb4b5 Fix some flymake aliases b9fbc03 (origin/widen-less) Widen in indent-for-tab-command in the no... 446faf3 Replace the mention of c-indent-defun with js-indent-line 7e9eef0 Consolidate 'widen' calls # Conflicts: # etc/NEWS # lisp/progmodes/flymake-proc.el		2017-12-20 21:15:43 -05:00
..
emacs	Merge from origin/emacs-26	2017-12-16 12:18:45 -08:00
lispintro	; Typo fixes, mostly repeated words	2017-10-09 22:55:06 -07:00
lispref	Merge from origin/emacs-26	2017-12-20 21:15:43 -05:00
man	Prefer HTTPS to HTTP for gnu.org	2017-09-29 17:48:22 -07:00
misc	* doc/misc/auth.texi: Fix use of {} and wrapping in previous change.	2017-12-19 15:10:34 -05:00