Doc fixes.

* lisp/emacs-lisp/regexp-opt.el (regexp-opt-charset): Doc fix.

* src/chartab.c (Fmap_char_table): Doc fix.

* src/editfns.c (Fformat): Doc fix.

Fixes: debbugs:12059 debbugs:12085 debbugs:12061

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 454b8ed38eac287bc90d249700703306dcba9c28..8d27fc65185447996e79330e84252d24bd66556c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-14  Chong Yidong  <cyd@gnu.org>
+
+       * emacs-lisp/regexp-opt.el (regexp-opt-charset): Doc fix
+       (Bug#12085).
+
 2012-08-14  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/bytecomp.el (byte-recompile-file): Doc fix.

diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index 72e3c398dc01bdcffd22e11aa6f0c95eab1621d2..8c64327c0ff38a964616c52ee9af3885c6803f28 100644 (file)
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -234,7 +234,8 @@ Merges keywords to avoid backtracking in Emacs's regexp matcher."
 
 
 (defun regexp-opt-charset (chars)
-  "Return a regexp to match a character in CHARS."
+  "Return a regexp to match a character in CHARS.
+CHARS should be a list of characters."
   ;; The basic idea is to find character ranges.  Also we take care in the
   ;; position of character set meta characters in the character set regexp.
   ;;

diff --git a/src/ChangeLog b/src/ChangeLog
index 93dc127acdc3c9f069605a0c1a36b9fd49b22a0b..22f2ca18775836347a8d5ef06a6342e61e6aaca4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-14  Chong Yidong  <cyd@gnu.org>
+
+       * chartab.c (Fmap_char_table): Doc fix (Bug#12061).
+
+       * editfns.c (Fformat): Doc fix (Bug#12059).
+
 2012-08-14  Barry OReilly  <gundaetiapo@gmail.com>  (tiny change)
 
        * keyboard.c (access_keymap_keyremap): Accept anonymous functions

diff --git a/src/chartab.c b/src/chartab.c
index e125296261241546c1b82eb04b0581776bfe1c0d..c022bc03e66ce3945162d4a0a9a8b0a7668e42b9 100644 (file)
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -945,11 +945,11 @@ map_char_table (void (*c_function) (Lisp_Object, Lisp_Object, Lisp_Object),
 
 DEFUN ("map-char-table", Fmap_char_table, Smap_char_table,
   2, 2, 0,
-       doc: /*
-Call FUNCTION for each character in CHAR-TABLE that has non-nil value.
-FUNCTION is called with two arguments--a key and a value.
-The key is a character code or a cons of character codes specifying a
-range of characters that have the same value.  */)
+       doc: /* Call FUNCTION for each character in CHAR-TABLE that has non-nil value.
+FUNCTION is called with two arguments, KEY and VALUE.
+KEY is a character code or a cons of character codes specifying a
+range of characters that have the same value.
+VALUE is what (char-table-range CHAR-TABLE KEY) returns.  */)
   (Lisp_Object function, Lisp_Object char_table)
 {
   CHECK_CHAR_TABLE (char_table);

diff --git a/src/editfns.c b/src/editfns.c
index c76009a099cb4762b873d09233a7ec620060fd19..806c80c19366c11be882263c32d18c18a002720d 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3615,9 +3615,13 @@ where flags is [+ #-0]+, width is [0-9]+, and precision is .[0-9]+
 The + flag character inserts a + before any positive number, while a
 space inserts a space before any positive number; these flags only
 affect %d, %e, %f, and %g sequences, and the + flag takes precedence.
+The - and 0 flags affect the width specifier, as described below.
+
 The # flag means to use an alternate display form for %o, %x, %X, %e,
-%f, and %g sequences.  The - and 0 flags affect the width specifier,
-as described below.
+%f, and %g sequences: for %o, it ensures that the result begins with
+\"0\"; for %x and %X, it prefixes the result with \"0x\" or \"0X\";
+for %e, %f, and %g, it causes a decimal point to be included even if
+the precision is zero.
 
 The width specifier supplies a lower limit for the length of the
 printed representation.  The padding, if any, normally goes on the