procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix up recent merge ChangeLog duplication

Browse source 
Perhaps the merge was done without using bzrmerge.el
This commit is contained in:
Glenn Morris 2014-03-23 10:56:34 -07:00
parent 577b2ffd2d
commit 74b1f21db3
2 changed files with 7 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lisp/ChangeLog
View file

@ -26,18 +26,6 @@
(Bug#3647) --- unfortunately, only for freshly-compiled code.
Please make bootstrap.
2014-03-23 Richard Stallman <rms@gnu.org>
* battery.el (battery-linux-sysfs): Search for each field
from the beginning of the buffer.
2014-03-23 Daniel Colascione <dancol@dancol.org>
* emacs-lisp/cl-macs.el (cl--do-arglist): Use a little `cl-loop'
list to look for keyword arguments instead of `memq', fixing
(Bug#3647) --- unfortunately, only for freshly-compiled code.
Please make bootstrap.
2014-03-22 Glenn Morris <rgm@gnu.org>
* dired.el (dired-read-regexp): Make obsolete.

21
test/ChangeLog
View file

@ -1,17 +1,15 @@
2014-03-23 Daniel Colascione <dancol@dancol.org>
* automated/subword-tests.el (subword-tests2): More subword tests.
2014-03-23 Daniel Colascione <dancol@dancol.org>
* automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
test: correct parsing of keyword arguments.
2014-03-23 Dmitry Gutov <dgutov@yandex.ru>
* automated/package-test.el (package-test-describe-package):
Fix test failure in non-graphical mode.
2014-03-23 Daniel Colascione <dancol@dancol.org>
* automated/subword-tests.el (subword-tests2): More subword tests.
* automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
test: correct parsing of keyword arguments.
2014-03-22 Dmitry Gutov <dgutov@yandex.ru>
* automated/package-test.el (package-test-describe-package):
@ -30,11 +28,6 @@
* automated/data/package/archive-contents:
Add info about the new package.
2014-03-23 Daniel Colascione <dancol@dancol.org>
* automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
test: correct parsing of keyword arguments.
2014-03-07 Michael Albinus <michael.albinus@gmx.de>
* automated/tramp-tests.el (tramp-copy-size-limit): Declare.