diff options
| author | Paul Eggert | 2011-07-13 23:41:47 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-13 23:41:47 -0700 |
| commit | cf950e6bbdeec3f6aab3e119f26f9cd5d962ac2e (patch) | |
| tree | 1bdb0fd052770b8c3b0c6ea83fb7c6a9bfdd5b85 /lisp/ChangeLog.6 | |
| parent | ca4aa9359160557f8103639fc3c0ccb16c6ba8d2 (diff) | |
| parent | 27fa387ad10e6a5639de1ab08e7559c06e9d802d (diff) | |
| download | emacs-cf950e6bbdeec3f6aab3e119f26f9cd5d962ac2e.tar.gz emacs-cf950e6bbdeec3f6aab3e119f26f9cd5d962ac2e.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/ChangeLog.6')
| -rw-r--r-- | lisp/ChangeLog.6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6 index 2f73c290231..7ba9261ccf0 100644 --- a/lisp/ChangeLog.6 +++ b/lisp/ChangeLog.6 | |||
| @@ -6892,7 +6892,7 @@ | |||
| 6892 | (find-file-noselect): Use it if new optional argument `rawfile' is | 6892 | (find-file-noselect): Use it if new optional argument `rawfile' is |
| 6893 | non-nil. | 6893 | non-nil. |
| 6894 | 6894 | ||
| 6895 | * startup.el (command-line-1): Add option --eval to evalute an | 6895 | * startup.el (command-line-1): Add option --eval to evaluate an |
| 6896 | expression on the command line and print the result. | 6896 | expression on the command line and print the result. |
| 6897 | 6897 | ||
| 6898 | 1995-08-14 Richard Stallman <rms@mole.gnu.ai.mit.edu> | 6898 | 1995-08-14 Richard Stallman <rms@mole.gnu.ai.mit.edu> |