[Emacs-commit] emacs etc/ChangeLog etc/ERC-NEWS lisp/erc/Chang...

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/01/17 18:17:25

Modified files:
        etc            : ChangeLog ERC-NEWS 
        lisp/erc       : ChangeLog erc-menu.el erc-services.el 
                         erc-dcc.el erc-track.el erc.el erc-backend.el 
        man            : ChangeLog erc.texi 
Added files:
        lisp/erc       : erc-capab.el 

Log message:
        Merge from erc--main--0
        
        Highlights:
        
         - Display messages starting with "/" but are not commands correctly.
         - Add erc-capab.el file, with capab-identify module.
         - Fix various ERC menu bugs and add "Current channel" submenu.
         - Make header-line display look nicer.
         - Fix warning when auto-authenticating to bitlbee.
         - New option erc-system-name allows the hostname next to your nick to 
be
           customized.
        
        Revision: address@hidden/emacs--devo--0--patch-599
        Creator:  Michael Olson <address@hidden>

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/ChangeLog?cvsroot=emacs&r1=1.484&r2=1.485
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/ERC-NEWS?cvsroot=emacs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/erc/ChangeLog?cvsroot=emacs&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/erc/erc-menu.el?cvsroot=emacs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/erc/erc-services.el?cvsroot=emacs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/erc/erc-dcc.el?cvsroot=emacs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/erc/erc-track.el?cvsroot=emacs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/erc/erc.el?cvsroot=emacs&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/erc/erc-backend.el?cvsroot=emacs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/erc/erc-capab.el?cvsroot=emacs&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/emacs/man/ChangeLog?cvsroot=emacs&r1=1.1188&r2=1.1189
http://cvs.savannah.gnu.org/viewcvs/emacs/man/erc.texi?cvsroot=emacs&r1=1.10&r2=1.11