aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/cmdargs.texi9
2 files changed, 11 insertions, 3 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d1378a34c19..93ae618d1bc 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
12015-01-26 Eli Zaretskii <eliz@gnu.org>
2
3 * cmdargs.texi (Action Arguments): Clarify into which buffer
4 '--insert' inserts. (Bug#19694)
5
12015-01-21 Eli Zaretskii <eliz@gnu.org> 62015-01-21 Eli Zaretskii <eliz@gnu.org>
2 7
3 * programs.texi (Custom C Indent): Fix a typo. (Bug#19647) 8 * programs.texi (Custom C Indent): Fix a typo. (Bug#19647)
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index f724f77e230..42c8e33d5c7 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -165,9 +165,12 @@ Evaluate Lisp expression @var{expression}.
165@item --insert=@var{file} 165@item --insert=@var{file}
166@opindex --insert 166@opindex --insert
167@cindex insert file contents, command-line argument 167@cindex insert file contents, command-line argument
168Insert the contents of @var{file} into the @file{*scratch*} buffer 168Insert the contents of @var{file} into the buffer that is current when
169(@pxref{Lisp Interaction}). This is like what @kbd{M-x insert-file} 169this command-line argument is processed. Usually, this is the
170does (@pxref{Misc File Ops}). 170@file{*scratch*} buffer (@pxref{Lisp Interaction}), but if arguments
171earlier on the command line visit files or switch buffers, that might
172be a different buffer. The effect of this command-line argument is
173like what @kbd{M-x insert-file} does (@pxref{Misc File Ops}).
171 174
172@item --kill 175@item --kill
173@opindex --kill 176@opindex --kill