mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-24

Browse source 
f160106 Avoid assertion violations in Rmail due to newline cache
1b0ebbd browse-url-firefox: update for firefox 36's removal of -remote
1817892 Avoid erratic behavior of menu-bar tooltips on w32  (Bug#19925)
0260932 Bump python.el version
b0adfc7 Spelling fixes
35f047c * src/fileio.c (Fmake_temp_name): Doc tweaks.
6f2971a * lisp/comint.el (comint-line-beginning-position): Revert searching
65d8ac7 Mention in admin/notes/repo how to mark commits not to be merged.
86fe750 # Remove NEWS temporary markup
4fa778b erc.el: Add old version header for package.el compatibilty
9366f05 Tramp: Disable paging with PAGER=cat

Conflicts:
	admin/notes/repo
	etc/NEWS
	lisp/ChangeLog
	lisp/erc/ChangeLog
	src/ChangeLog
This commit is contained in:
Paul Eggert 2015-03-03 14:41:30 -08:00
commit 37ad855a38
15 changed files with 155 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/erc/ChangeLog
View file

@ -1,3 +1,9 @@
2015-03-03 Kelvin White <kwhite@gnu.org>
* erc.el: Add old version string back to file header for
package.el compatibility
2015-03-03 Glenn Morris <rgm@gnu.org>
2015-03-03 Glenn Morris <rgm@gnu.org>
* erc.el (erc-rename-buffers): Doc fix. Add :version.

2
lisp/erc/erc.el
View file

@ -12,7 +12,7 @@
;; Kelvin White (kwhite@gnu.org)
;; Maintainer: emacs-devel@gnu.org
;; Keywords: IRC, chat, client, Internet
;; Version: 5.3
;; This file is part of GNU Emacs.