diff options
Diffstat (limited to 'doc/emacs')
| -rw-r--r-- | doc/emacs/ChangeLog | 12 | ||||
| -rw-r--r-- | doc/emacs/cmdargs.texi | 9 | ||||
| -rw-r--r-- | doc/emacs/files.texi | 7 | ||||
| -rw-r--r-- | doc/emacs/programs.texi | 2 |
4 files changed, 26 insertions, 4 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index a90c58725f8..1287733b129 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,15 @@ +2015-01-28 Eli Zaretskii <eliz@gnu.org> + + * cmdargs.texi (Action Arguments): Clarify into which buffer + '--insert' inserts. (Bug#19694) + + * programs.texi (Custom C Indent): Fix a typo. (Bug#19647) + +2015-01-27 Ivan Shmakov <ivan@siamics.net> + + * files.texi (File Archives): Document "I" for tar-new-entry. + (Bug#19274) + 2014-12-31 Paul Eggert <eggert@cs.ucla.edu> Less 'make' chatter for Emacs doc 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}. @item --insert=@var{file} @opindex --insert @cindex insert file contents, command-line argument -Insert the contents of @var{file} into the @file{*scratch*} buffer -(@pxref{Lisp Interaction}). This is like what @kbd{M-x insert-file} -does (@pxref{Misc File Ops}). +Insert the contents of @var{file} into the buffer that is current when +this command-line argument is processed. Usually, this is the +@file{*scratch*} buffer (@pxref{Lisp Interaction}), but if arguments +earlier on the command line visit files or switch buffers, that might +be a different buffer. The effect of this command-line argument is +like what @kbd{M-x insert-file} does (@pxref{Misc File Ops}). @item --kill @opindex --kill diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 196c6bb0092..b12b28f9c17 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1689,6 +1689,13 @@ likewise. @kbd{v} extracts a file into a buffer in View mode another window, so you could edit the file and operate on the archive simultaneously. + The @kbd{I} key adds a new (regular) file to the archive. The file +is initially empty, but can readily be edited using the commands +above. The command inserts the new file before the current one, so +that using it on the topmost line of the Tar buffer makes the new file +the first one in the archive, and using it at the end of the buffer +makes it the last one. + @kbd{d} marks a file for deletion when you later use @kbd{x}, and @kbd{u} unmarks a file, as in Dired. @kbd{C} copies a file from the archive to disk and @kbd{R} renames a file within the archive. diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 8f6111dfa24..609392f6bb7 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -546,7 +546,7 @@ your selected @dfn{style} with the syntactic construct and adds this onto the indentation of the @dfn{anchor statement}. @table @kbd -@item C-c . @key{RET} @var{style} @key{RET} +@item C-c . @var{style} @key{RET} Select a predefined style @var{style} (@code{c-set-style}). @end table |