diff options
| author | Chong Yidong | 2012-07-17 15:43:01 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-07-17 15:43:01 +0800 |
| commit | 9ea10cc3431ce03da0a375cd573ceedd5cdbdf67 (patch) | |
| tree | 4b1464950405382a3cf7be66d7fe9189b0915b4f /src | |
| parent | 441efe9fdd79cfbfc2122054e1be52f0006b9f53 (diff) | |
| download | emacs-9ea10cc3431ce03da0a375cd573ceedd5cdbdf67.tar.gz emacs-9ea10cc3431ce03da0a375cd573ceedd5cdbdf67.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/editfns.c | 37 |
2 files changed, 26 insertions, 15 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8c8ba4dd143..82bedfdf2c4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-07-17 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * editfns.c (Finsert_char): Doc fix. | ||
| 4 | |||
| 1 | 2012-07-17 Dmitry Antipov <dmantipov@yandex.ru> | 5 | 2012-07-17 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 6 | ||
| 3 | Fix previous change to make Fmemory_free always accurate. | 7 | Fix previous change to make Fmemory_free always accurate. |
diff --git a/src/editfns.c b/src/editfns.c index 5dc561a400e..9cfd0449daa 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -2369,27 +2369,34 @@ usage: (insert-before-markers-and-inherit &rest ARGS) */) | |||
| 2369 | } | 2369 | } |
| 2370 | 2370 | ||
| 2371 | DEFUN ("insert-char", Finsert_char, Sinsert_char, 1, 3, | 2371 | DEFUN ("insert-char", Finsert_char, Sinsert_char, 1, 3, |
| 2372 | "(list (read-char-by-name \"Unicode (name or hex): \")\ | 2372 | "(list (read-char-by-name \"Insert character (Unicode name or hex): \")\ |
| 2373 | (prefix-numeric-value current-prefix-arg)\ | 2373 | (prefix-numeric-value current-prefix-arg)\ |
| 2374 | t))", | 2374 | t))", |
| 2375 | doc: /* Insert COUNT copies of CHARACTER. | 2375 | doc: /* Insert COUNT copies of CHARACTER. |
| 2376 | Interactively, prompts for a Unicode character name or a hex number | 2376 | Interactively, prompt for CHARACTER. You can specify CHARACTER in one |
| 2377 | using `read-char-by-name'. | 2377 | of these ways: |
| 2378 | 2378 | ||
| 2379 | You can type a few of the first letters of the Unicode name and | 2379 | - As its Unicode character name, e.g. \"LATIN SMALL LETTER A\". |
| 2380 | use completion. If you type a substring of the Unicode name | 2380 | Completion is available; if you type a substring of the name |
| 2381 | preceded by an asterisk `*' and use completion, it will show all | 2381 | preceded by an asterisk `*', Emacs shows all names which include |
| 2382 | the characters whose names include that substring, not necessarily | 2382 | that substring, not necessarily at the beginning of the name. |
| 2383 | at the beginning of the name. | ||
| 2384 | 2383 | ||
| 2385 | This function also accepts a hexadecimal number of Unicode code | 2384 | - As a hexadecimal code point, e.g. 263A. Note that code points in |
| 2386 | point or a number in hash notation, e.g. #o21430 for octal, | 2385 | Emacs are equivalent to Unicode up to 10FFFF (which is the limit of |
| 2387 | #x2318 for hex, or #10r8984 for decimal. | 2386 | the Unicode code space). |
| 2388 | 2387 | ||
| 2389 | Point, and before-insertion markers, are relocated as in the function `insert'. | 2388 | - As a code point with a radix specified with #, e.g. #o21430 |
| 2390 | The optional third arg INHERIT, if non-nil, says to inherit text properties | 2389 | (octal), #x2318 (hex), or #10r8984 (decimal). |
| 2391 | from adjoining text, if those properties are sticky. If called | 2390 | |
| 2392 | interactively, INHERIT is t. */) | 2391 | If called interactively, COUNT is given by the prefix argument. If |
| 2392 | omitted or nil, it defaults to 1. | ||
| 2393 | |||
| 2394 | Inserting the character(s) relocates point and before-insertion | ||
| 2395 | markers in the same ways as the function `insert'. | ||
| 2396 | |||
| 2397 | The optional third argument INHERIT, if non-nil, says to inherit text | ||
| 2398 | properties from adjoining text, if those properties are sticky. If | ||
| 2399 | called interactively, INHERIT is t. */) | ||
| 2393 | (Lisp_Object character, Lisp_Object count, Lisp_Object inherit) | 2400 | (Lisp_Object character, Lisp_Object count, Lisp_Object inherit) |
| 2394 | { | 2401 | { |
| 2395 | int i, stringlen; | 2402 | int i, stringlen; |