aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2013-06-14 06:33:43 +0800
committerXue Fuqiao2013-06-14 06:33:43 +0800
commitcd0527a418d94ac63d897c77e8570b4f1615e350 (patch)
tree18fa174e0ef31e68f6063aac80821b313cb323fb
parentde0503df97a507a523a192e877a8d5c7439c4846 (diff)
downloademacs-cd0527a418d94ac63d897c77e8570b4f1615e350.tar.gz
emacs-cd0527a418d94ac63d897c77e8570b4f1615e350.zip
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 @@
12013-06-11 Glenn Morris <rgm@gnu.org>
2
3 * maintaining.texi (VC Directory Commands): Copyedit.
4 (Branches): Put back milder version of pre 2013-06-07 text.
5
62013-06-09 Xue Fuqiao <xfq.free@gmail.com> 12013-06-09 Xue Fuqiao <xfq.free@gmail.com>
7 2
8 * vc1-xtra.texi (Revision Tags): Add a cross reference. 3 * vc1-xtra.texi (Revision Tags): Add a cross reference.
9 (CVS Options): Fix the default value of `vc-cvs-stay-local'. 4 (CVS Options): Fix the default value of `vc-cvs-stay-local'.
10 5
62013-06-11 Glenn Morris <rgm@gnu.org>
7
8 * maintaining.texi (VC Directory Commands): Copyedit.
9 (Branches): Put back milder version of pre 2013-06-07 text.
10
112013-06-07 Xue Fuqiao <xfq.free@gmail.com> 112013-06-07 Xue Fuqiao <xfq.free@gmail.com>
12 12
13 * maintaining.texi (Branches): Remove text copied from other sources. 13 * 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 @@
151 (cl-define-compiler-macro): Use eval-and-compile. Give a name to the 151 (cl-define-compiler-macro): Use eval-and-compile. Give a name to the
152 compiler-macro function instead of setting `compiler-macro-file'. 152 compiler-macro function instead of setting `compiler-macro-file'.
153 153
1542013-06-09 Xue Fuqiao <xfq.free@gmail.com>
155
156 * vc/vc-cvs.el (vc-cvs-stay-local): Doc fix.
157 * vc/vc-hooks.el (vc-stay-local): Doc fix.
158
1542013-06-12 Stefan Monnier <monnier@iro.umontreal.ca> 1592013-06-12 Stefan Monnier <monnier@iro.umontreal.ca>
155 Daniel Hackney <dan@haxney.org> 160 Daniel Hackney <dan@haxney.org>
156 161
@@ -241,11 +246,6 @@
241 * epa.el (epa-read-file-name): New function. (Bug#14510) 246 * epa.el (epa-read-file-name): New function. (Bug#14510)
242 (epa-decrypt-file): Make plain-file optional. Use epa-read-file-name. 247 (epa-decrypt-file): Make plain-file optional. Use epa-read-file-name.
243 248
2442013-06-09 Xue Fuqiao <xfq.free@gmail.com>
245
246 * vc/vc-cvs.el (vc-cvs-stay-local): Doc fix.
247 * vc/vc-hooks.el (vc-stay-local): Doc fix.
248
2492013-06-09 Aidan Gauland <aidalgol@amuri.net> 2492013-06-09 Aidan Gauland <aidalgol@amuri.net>
250 250
251 * eshell/em-term.el (eshell-visual-command-p): Fix bug that caused 251 * eshell/em-term.el (eshell-visual-command-p): Fix bug that caused