1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 02:31:03 -08:00
emacs/lisp/erc
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
..
ChangeLog.1 Prefer HTTPS to HTTP for gnu.org 2017-09-29 17:48:22 -07:00
ChangeLog.2 Prefer HTTPS to HTTP for gnu.org 2017-09-29 17:48:22 -07:00
erc-autoaway.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-backend.el Reimplement inline functions in ERC with define-inline. 2017-11-18 19:10:08 +05:30
erc-button.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-capab.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-compat.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-dcc.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-desktop-notifications.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-ezbounce.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-fill.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-goodies.el Fix erc keep-place module with new defaults (Bug#29111) 2017-11-21 08:31:40 +01:00
erc-ibuffer.el Prefer HTTPS to FTP and HTTP in documentation 2017-09-13 15:54:37 -07:00
erc-identd.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-imenu.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-join.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-lang.el Prefer HTTPS to FTP and HTTP in documentation 2017-09-13 15:54:37 -07:00
erc-list.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-log.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-match.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-menu.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-netsplit.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-networks.el Prefer HTTPS to FTP and HTTP in documentation 2017-09-13 15:54:37 -07:00
erc-notify.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-page.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-pcomplete.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-replace.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-ring.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-services.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-sound.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-speedbar.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-spelling.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-stamp.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-track.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-truncate.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc-xdcc.el Put most erc autoloads in a dedicated file erc-loaddefs.el 2017-11-28 21:16:02 -05:00
erc.el Merge from origin/emacs-26 2017-12-20 21:15:43 -05:00