aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.6
diff options
context:
space:
mode:
authorPaul Eggert2011-07-13 23:41:47 -0700
committerPaul Eggert2011-07-13 23:41:47 -0700
commitcf950e6bbdeec3f6aab3e119f26f9cd5d962ac2e (patch)
tree1bdb0fd052770b8c3b0c6ea83fb7c6a9bfdd5b85 /src/ChangeLog.6
parentca4aa9359160557f8103639fc3c0ccb16c6ba8d2 (diff)
parent27fa387ad10e6a5639de1ab08e7559c06e9d802d (diff)
downloademacs-cf950e6bbdeec3f6aab3e119f26f9cd5d962ac2e.tar.gz
emacs-cf950e6bbdeec3f6aab3e119f26f9cd5d962ac2e.zip
Merge from trunk.
Diffstat (limited to 'src/ChangeLog.6')
-rw-r--r--src/ChangeLog.62
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index d7903568102..f9372aa666a 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -4599,7 +4599,7 @@
4599 4599
46001995-08-14 Erik Naggum <erik@naggum.no> 46001995-08-14 Erik Naggum <erik@naggum.no>
4601 4601
4602 * emacs.c (standard_args): Add option --eval to evalute an 4602 * emacs.c (standard_args): Add option --eval to evaluate an
4603 expression on the command line and print the result. 4603 expression on the command line and print the result.
4604 4604
46051995-08-14 Richard Stallman <rms@mole.gnu.ai.mit.edu> 46051995-08-14 Richard Stallman <rms@mole.gnu.ai.mit.edu>