[Emacs-diffs] /srv/bzr/emacs/trunk r109114: Document insert-char changes.

[Chong Yidong]

------------------------------------------------------------
revno: 109114
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-17 15:43:01 +0800
message:
  Document insert-char changes.
  
  * doc/emacs/basic.texi (Inserting Text): Replace ucs-insert with
  insert-char.  Provide more details of input.
  
  * doc/lispref/mule.texi (International Chars, Input Methods): Likewise.
  
  * doc/lispref/text.texi (Insertion): Document insert-char changes.
  
  * src/editfns.c (Finsert_char): Doc fix.
modified:
  doc/emacs/ChangeLog
  doc/emacs/basic.texi
  doc/emacs/mule.texi
  doc/lispref/ChangeLog
  doc/lispref/text.texi
  etc/NEWS
  src/ChangeLog
  src/editfns.c

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-07-14 02:08:32 +0000
+++ b/doc/emacs/ChangeLog       2012-07-17 07:43:01 +0000
@@ -1,3 +1,10 @@
+2012-07-17  Chong Yidong  <address@hidden>
+
+       * basic.texi (Inserting Text): Replace ucs-insert with
+       insert-char.  Provide more details of input.
+
+       * mule.texi (International Chars, Input Methods): Likewise.
+
 2012-07-13  Chong Yidong  <address@hidden>
 
        * custom.texi (Examining): Update C-h v message.

=== modified file 'doc/emacs/basic.texi'
--- a/doc/emacs/basic.texi      2012-07-06 04:31:46 +0000
+++ b/doc/emacs/basic.texi      2012-07-17 07:43:01 +0000
@@ -97,28 +97,29 @@
 the letters @kbd{a} to @kbd{f} serve as part of a character code,
 just like digits.  Case is ignored.
 
address@hidden ucs-insert
address@hidden insert-char
 @kindex C-x 8 RET
 @cindex Unicode characters, inserting
 @cindex insert Unicode character
 @cindex characters, inserting by name or code-point
-  Instead of @kbd{C-q}, you can use the command @kbd{C-x 8 @key{RET}}
-(@code{ucs-insert}).  This prompts for the Unicode name or code-point
+  Alternatively, you can use the command @kbd{C-x 8 @key{RET}}
+(@code{insert-char}).  This prompts for the Unicode name or code-point
 of a character, using the minibuffer.  If you enter a name, the
 command provides completion (@pxref{Completion}).  If you enter a
-code-point, it should be a hexadecimal number (which is the convention
-for Unicode).  The command then inserts the corresponding character
-into the buffer.  For example, both of the following insert the
-infinity sign (Unicode code-point @code{U+221E}):
+code-point, it should be as a hexadecimal number (the convention for
+Unicode), or a number with a specified radix, e.g.@: @code{#o23072}
+(octal); @xref{Integer Basics,,, elisp, The Emacs Lisp Reference
+Manual}.  The command then inserts the corresponding character into
+the buffer.  For example, both of the following insert the infinity
+sign (Unicode code-point @code{U+221E}):
 
 @example
 @kbd{C-x 8 @key{RET} infinity @key{RET}}
 @kbd{C-x 8 @key{RET} 221e @key{RET}}
 @end example
 
-  A numeric argument to either @kbd{C-q} or @kbd{C-x 8 @key{RET}}
-specifies how many copies of the character to insert
-(@pxref{Arguments}).
+  A numeric argument to @kbd{C-q} or @kbd{C-x 8 @key{RET}} specifies
+how many copies of the character to insert (@pxref{Arguments}).
 
 @node Moving Point
 @section Changing the Location of Point

=== modified file 'doc/emacs/mule.texi'
--- a/doc/emacs/mule.texi       2012-06-17 05:13:40 +0000
+++ b/doc/emacs/mule.texi       2012-07-17 07:43:01 +0000
@@ -146,7 +146,7 @@
 used, generally don't have keys for all the characters in them.  You
 can insert characters that your keyboard does not support, using
 @kbd{C-q} (@code{quoted-insert}) or @kbd{C-x 8 @key{RET}}
-(@code{ucs-insert}).  @xref{Inserting Text}.  Emacs also supports
+(@code{insert-char}).  @xref{Inserting Text}.  Emacs also supports
 various @dfn{input methods}, typically one for each script or
 language, which make it easier to type characters in the script.
 @xref{Input Methods}.
@@ -548,7 +548,7 @@
 not when you are in the minibuffer).
 
   Another facility for typing characters not on your keyboard is by
-using @kbd{C-x 8 @key{RET}} (@code{ucs-insert}) to insert a single
+using @kbd{C-x 8 @key{RET}} (@code{insert-char}) to insert a single
 character based on its Unicode name or code-point; see @ref{Inserting
 Text}.
 

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-07-15 00:52:16 +0000
+++ b/doc/lispref/ChangeLog     2012-07-17 07:43:01 +0000
@@ -1,3 +1,7 @@
+2012-07-17  Chong Yidong  <address@hidden>
+
+       * text.texi (Insertion): Document insert-char changes.
+
 2012-07-15  Leo Liu  <address@hidden>
 
        * display.texi (Fringe Bitmaps): Add exclamation-mark.

=== modified file 'doc/lispref/text.texi'
--- a/doc/lispref/text.texi     2012-07-06 04:25:04 +0000
+++ b/doc/lispref/text.texi     2012-07-17 07:43:01 +0000
@@ -401,19 +401,23 @@
 overlay.
 @end defun
 
address@hidden insert-char character count &optional inherit
-This function inserts @var{count} instances of @var{character} into the
-current buffer before point.  The argument @var{count} should be an
-integer, and @var{character} must be a character.  The value is @code{nil}.
address@hidden Command insert-char character &optional count inherit
+This command inserts @var{count} instances of @var{character} into the
+current buffer before point.  The argument @var{count} must be an
+integer, and @var{character} must be a character.
+
+If called interactively, this command prompts for @var{character}
+using its Unicode name or its code point.  @xref{Inserting Text,,,
+emacs, The GNU Emacs Manual}.
 
 This function does not convert unibyte character codes 128 through 255
 to multibyte characters, not even if the current buffer is a multibyte
 buffer.  @xref{Converting Representations}.
 
-If @var{inherit} is address@hidden, then the inserted characters inherit
+If @var{inherit} is address@hidden, the inserted characters inherit
 sticky text properties from the two characters before and after the
 insertion point.  @xref{Sticky Properties}.
address@hidden defun
address@hidden deffn
 
 @defun insert-buffer-substring from-buffer-or-name &optional start end
 This function inserts a portion of buffer @var{from-buffer-or-name}

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-07-17 04:17:23 +0000
+++ b/etc/NEWS  2012-07-17 07:43:01 +0000
@@ -140,6 +140,7 @@
 ** Setting `enable-remote-dir-locals' to non-nil allows directory
 local variables on remote hosts.
 
++++
 ** `insert-char' is now a command, and `ucs-insert' an obsolete alias
 for it.
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-17 07:15:50 +0000
+++ b/src/ChangeLog     2012-07-17 07:43:01 +0000
@@ -1,3 +1,7 @@
+2012-07-17  Chong Yidong  <address@hidden>
+
+       * editfns.c (Finsert_char): Doc fix.
+
 2012-07-17  Dmitry Antipov  <address@hidden>
 
        Fix previous change to make Fmemory_free always accurate.

=== modified file 'src/editfns.c'
--- a/src/editfns.c     2012-07-17 04:17:23 +0000
+++ b/src/editfns.c     2012-07-17 07:43:01 +0000
@@ -2369,27 +2369,34 @@
 }
 
 DEFUN ("insert-char", Finsert_char, Sinsert_char, 1, 3,
-       "(list (read-char-by-name \"Unicode (name or hex): \")\
+       "(list (read-char-by-name \"Insert character (Unicode name or hex): \")\
         (prefix-numeric-value current-prefix-arg)\
         t))",
        doc: /* Insert COUNT copies of CHARACTER.
-Interactively, prompts for a Unicode character name or a hex number
-using `read-char-by-name'.
-
-You can type a few of the first letters of the Unicode name and
-use completion.  If you type a substring of the Unicode name
-preceded by an asterisk `*' and use completion, it will show all
-the characters whose names include that substring, not necessarily
-at the beginning of the name.
-
-This function also accepts a hexadecimal number of Unicode code
-point or a number in hash notation, e.g. #o21430 for octal,
-#x2318 for hex, or #10r8984 for decimal.
-
-Point, and before-insertion markers, are relocated as in the function `insert'.
-The optional third arg INHERIT, if non-nil, says to inherit text properties
-from adjoining text, if those properties are sticky.  If called
-interactively, INHERIT is t.  */)
+Interactively, prompt for CHARACTER.  You can specify CHARACTER in one
+of these ways:
+
+ - As its Unicode character name, e.g. \"LATIN SMALL LETTER A\".
+   Completion is available; if you type a substring of the name
+   preceded by an asterisk `*', Emacs shows all names which include
+   that substring, not necessarily at the beginning of the name.
+
+ - As a hexadecimal code point, e.g. 263A.  Note that code points in
+   Emacs are equivalent to Unicode up to 10FFFF (which is the limit of
+   the Unicode code space).
+
+ - As a code point with a radix specified with #, e.g. #o21430
+   (octal), #x2318 (hex), or #10r8984 (decimal).
+
+If called interactively, COUNT is given by the prefix argument.  If
+omitted or nil, it defaults to 1.
+
+Inserting the character(s) relocates point and before-insertion
+markers in the same ways as the function `insert'.
+
+The optional third argument INHERIT, if non-nil, says to inherit text
+properties from adjoining text, if those properties are sticky.  If
+called interactively, INHERIT is t.  */)
   (Lisp_Object character, Lisp_Object count, Lisp_Object inherit)
 {
   int i, stringlen;