1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 02:51:31 -08:00
emacs/lisp/erc
Paul Eggert c325e19966 Merge from origin/emacs-25
927afa1 ; Update ChangeLog.2 and ldef-boot.el for Emacs 25.1 RC2
6bf83b5 * etc/AUTHORS: Update the AUTHORS file
73cbb81 ; ChangeLog spelling fixes
9b99772 Some assorted documentation clarifications
37d4723 Improve commentary in src/character.h
5ccd593 ; Fix typo in /etc/NEWS
96e3d16 * etc/NEWS: Mention the change in json-encode-string.
2e524034 ; * etc/NEWS: Mention incompatible change in url-http-create...
2e4e74e Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac...
66dea65 ; * doc/lispref/windows.texi (Window Parameters): Grammar twe...

# Conflicts:
#	ChangeLog.2
#	lisp/ldefs-boot.el
2016-08-22 14:40:35 -07:00
..
ChangeLog.1 ; ChangeLog spelling fixes 2016-08-21 04:15:44 -07:00
ChangeLog.2
erc-autoaway.el
erc-backend.el * lisp/erc/erc-backend.el: Use lexical-binding. Silence byte-compiler 2016-04-02 15:38:54 -04:00
erc-button.el Prefer 'font-lock-face to 'face in erc where appropriate 2016-04-07 14:23:18 +02:00
erc-capab.el Prefer 'font-lock-face to 'face in erc where appropriate 2016-04-07 14:23:18 +02:00
erc-compat.el Deterministic build improvements 2016-03-02 10:24:11 -08:00
erc-dcc.el Prefer 'font-lock-face to 'face in erc where appropriate 2016-04-07 14:23:18 +02:00
erc-desktop-notifications.el
erc-ezbounce.el
erc-fill.el
erc-goodies.el Prefer 'font-lock-face to 'face in erc where appropriate 2016-04-07 14:23:18 +02:00
erc-ibuffer.el
erc-identd.el
erc-imenu.el
erc-join.el
erc-lang.el
erc-list.el
erc-log.el
erc-match.el Prefer 'font-lock-face to 'face in erc where appropriate 2016-04-07 14:23:18 +02:00
erc-menu.el
erc-netsplit.el
erc-networks.el
erc-notify.el
erc-page.el
erc-pcomplete.el
erc-replace.el
erc-ring.el
erc-services.el
erc-sound.el
erc-speedbar.el
erc-spelling.el
erc-stamp.el Prefer 'font-lock-face to 'face in erc where appropriate 2016-04-07 14:23:18 +02:00
erc-track.el Prefer 'font-lock-face to 'face in erc where appropriate 2016-04-07 14:23:18 +02:00
erc-truncate.el
erc-xdcc.el
erc.el Simplify now that float-time etc. are built-in 2016-05-08 12:46:22 -07:00