summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXue Fuqiao <xfq.free@gmail.com>2013-06-14 06:33:43 +0800
committerXue Fuqiao <xfq.free@gmail.com>2013-06-14 06:33:43 +0800
commitcd0527a418d94ac63d897c77e8570b4f1615e350 (patch)
tree18fa174e0ef31e68f6063aac80821b313cb323fb
parentde0503df97a507a523a192e877a8d5c7439c4846 (diff)
downloademacs-cd0527a418d94ac63d897c77e8570b4f1615e350.tar.gz
ChangeLog fix.
-rw-r--r--doc/emacs/ChangeLog10
-rw-r--r--lisp/ChangeLog10
2 files changed, 10 insertions, 10 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index f56f2f51e07..389351ec888 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,13 +1,13 @@
-2013-06-11 Glenn Morris <rgm@gnu.org>
-
- * maintaining.texi (VC Directory Commands): Copyedit.
- (Branches): Put back milder version of pre 2013-06-07 text.
-
2013-06-09 Xue Fuqiao <xfq.free@gmail.com>
* vc1-xtra.texi (Revision Tags): Add a cross reference.
(CVS Options): Fix the default value of `vc-cvs-stay-local'.
+2013-06-11 Glenn Morris <rgm@gnu.org>
+
+ * maintaining.texi (VC Directory Commands): Copyedit.
+ (Branches): Put back milder version of pre 2013-06-07 text.
+
2013-06-07 Xue Fuqiao <xfq.free@gmail.com>
* maintaining.texi (Branches): Remove text copied from other sources.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 88f218d15f3..b972384ed45 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -151,6 +151,11 @@
(cl-define-compiler-macro): Use eval-and-compile. Give a name to the
compiler-macro function instead of setting `compiler-macro-file'.
+2013-06-09 Xue Fuqiao <xfq.free@gmail.com>
+
+ * vc/vc-cvs.el (vc-cvs-stay-local): Doc fix.
+ * vc/vc-hooks.el (vc-stay-local): Doc fix.
+
2013-06-12 Stefan Monnier <monnier@iro.umontreal.ca>
Daniel Hackney <dan@haxney.org>
@@ -241,11 +246,6 @@
* epa.el (epa-read-file-name): New function. (Bug#14510)
(epa-decrypt-file): Make plain-file optional. Use epa-read-file-name.
-2013-06-09 Xue Fuqiao <xfq.free@gmail.com>
-
- * vc/vc-cvs.el (vc-cvs-stay-local): Doc fix.
- * vc/vc-hooks.el (vc-stay-local): Doc fix.
-
2013-06-09 Aidan Gauland <aidalgol@amuri.net>
* eshell/em-term.el (eshell-visual-command-p): Fix bug that caused