aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-05-08 20:23:20 -0700
committerGlenn Morris2012-05-08 20:23:20 -0700
commit482276b8ceb2e3211c3c81310e387ce446fc976f (patch)
tree7d403c309673b4bb01f251cd0bea008a83f802db
parent5b6eebcf2b1a1fc779f018be0d9b648746c8cad6 (diff)
downloademacs-482276b8ceb2e3211c3c81310e387ce446fc976f.tar.gz
emacs-482276b8ceb2e3211c3c81310e387ce446fc976f.zip
ChangeLog merge fix
-rw-r--r--doc/lispintro/ChangeLog9
1 files changed, 0 insertions, 9 deletions
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index e556fa7e998..1191b0de919 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,12 +1,3 @@
12012-05-09 Glenn Morris <rgm@gnu.org>
2
3 * emacs-lisp-intro.texi (Making Errors): Don't mention Emacs 20.
4 (Void Function, Wrong Type of Argument, Recursion with list)
5 (Simple Extension): Assume a non-ancient Emacs.
6 (Void Variable, Switching Buffers): Improve page breaks.
7
8 * emacs-lisp-intro.texi: Update GNU Press contact details.
9
102012-05-05 Glenn Morris <rgm@gnu.org> 12012-05-05 Glenn Morris <rgm@gnu.org>
11 2
12 * emacs-lisp-intro.texi (Making Errors): Don't mention Emacs 20. 3 * emacs-lisp-intro.texi (Making Errors): Don't mention Emacs 20.