diff options
author | Stefan Monnier <[email protected]> | 2010-06-16 16:08:41 -0400 |
---|---|---|
committer | Stefan Monnier <[email protected]> | 2010-06-16 16:08:41 -0400 |
commit | 2a64315a111fb4da67e9c40c9b69045c4f63d619 (patch) | |
tree | 2e7ba99465f6eb5eae64361767af5bc5fff7aca4 /doc | |
parent | 288cf4e907c0350eb24824016763bddd09df8ea8 (diff) | |
parent | 36901266a8acb83880fefee50c93abb09f64533b (diff) |
Merge from emacs-23
Diffstat (limited to 'doc')
-rw-r--r-- | doc/emacs/ChangeLog | 6 | ||||
-rw-r--r-- | doc/emacs/basic.texi | 11 | ||||
-rw-r--r-- | doc/misc/ChangeLog | 5 | ||||
-rw-r--r-- | doc/misc/idlwave.texi | 2 | ||||
-rw-r--r-- | doc/misc/org.texi | 2 |
5 files changed, 19 insertions, 7 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 2b9b81d2bd..e954fe496c 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,5 +1,11 @@ 2010-06-10 Glenn Morris <[email protected]> + * basic.texi (Inserting Text): Minor clarification. (Bug#6374) + + * basic.texi (Inserting Text): Fix typo. + +2010-06-10 Glenn Morris <[email protected]> + * ack.texi (Acknowledgments): * emacs.texi (Acknowledgments): Update for notifications.el. diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi index 27ca459333..b5a194f1cc 100644 --- a/doc/emacs/basic.texi +++ b/doc/emacs/basic.texi @@ -1,6 +1,7 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +@c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Basic, Minibuffer, Exiting, Top @chapter Basic Editing Commands @@ -92,9 +93,9 @@ of overwriting with it. @vindex read-quoted-char-radix @noindent To use decimal or hexadecimal instead of octal, set the variable -@code{read-quoted-char-radix} to 10 or 16. If the radix is greater -than 10, some letters starting with @kbd{a} serve as part of a -character code, just like digits. +@code{read-quoted-char-radix} to 10 or 16. If the radix is 16, +the letters @kbd{a} to @kbd{f} serve as part of a character code, +just like digits. Case is ignored. A numeric argument tells @kbd{C-q} how many copies of the quoted character to insert (@pxref{Arguments}). @@ -104,7 +105,7 @@ character to insert (@pxref{Arguments}). @cindex Unicode Instead of @kbd{C-q}, you can use @kbd{C-x 8 @key{RET}} (@code{ucs-insert}) to insert a character based on its Unicode name or -code-point. This commands prompts for a character to insert, using +code-point. This command prompts for a character to insert, using the minibuffer; you can specify the character using either (i) the character's name in the Unicode standard, or (ii) the character's code-point in the Unicode standard. If you specify the character's diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 2ab078d547..a159715a69 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2010-06-10 Glenn Morris <[email protected]> + + * idlwave.texi (Load-Path Shadows): + * org.texi (Handling links): Fix typos. + 2010-06-07 Teodor Zlatanov <[email protected]> * gnus.texi (Interactive): Explain effect of gnus-expert-user better. diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index 6292902aa9..94a2c2c6db 100644 --- a/doc/misc/idlwave.texi +++ b/doc/misc/idlwave.texi @@ -3717,7 +3717,7 @@ C-i}. Here are the different routines (also available in the Menu @table @asis @item @kbd{M-x idlwave-list-buffer-load-path-shadows} -This commands checks the names of all routines defined in the current +This command checks the names of all routines defined in the current buffer for shadowing conflicts with other routines accessible to IDLWAVE. The command also has a key binding: @kbd{C-c C-b} @item @kbd{M-x idlwave-list-shell-load-path-shadows}. diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 00474f6d70..c4285d59f2 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -2978,7 +2978,7 @@ link and description parts of the link. Open link at point. This will launch a web browser for URLs (using @command{browse-url-at-point}), run VM/MH-E/Wanderlust/Rmail/Gnus/BBDB for the corresponding links, and execute the command in a shell link. When the -cursor is on an internal link, this commands runs the corresponding search. +cursor is on an internal link, this command runs the corresponding search. When the cursor is on a TAG list in a headline, it creates the corresponding TAGS view. If the cursor is on a timestamp, it compiles the agenda for that date. Furthermore, it will visit text and remote files in @samp{file:} links |