merge trunk

25 files changed, 187 insertions, 64 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7acfeccea04..4559864c23f 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-02  Christoph  <cschol2112@googlemail.com>
+
+        * control.texi (Handling Errors) <error-message-string>: Fix arg name.
+
+2010-07-29  Juanma Barranquero  <lekktu@gmail.com>
+
+        * modes.texi (Defining Minor Modes): Use C-backspace, not C-delete.
+        Suggested by Štěpán Němec <stepnem@gmail.com>.
+
+2010-07-28  Juanma Barranquero  <lekktu@gmail.com>
+
+        * minibuf.texi (High-Level Completion): Document args of
+        `read-buffer-function' (bug#5625).
+
 2010-07-27  Juanma Barranquero  <lekktu@gmail.com>
 
         * modes.texi (Defining Minor Modes): Use C-delete in examples,
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 1c4447e9eb5..16564677f32 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -1039,7 +1039,7 @@ to @code{condition-case} whose error condition you want to re-throw.
 @xref{Definition of signal}.
 @end defspec
 
-@defun error-message-string error-description
+@defun error-message-string error-descriptor
 This function returns the error message string for a given error
 descriptor.  It is useful if you want to handle an error by printing the
 usual error message for that error.  @xref{Definition of signal}.
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 3588704b054..9bc6be432ae 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -1222,10 +1222,11 @@ Buffer name (default foo): @point{}
 @end defun
 
 @defopt read-buffer-function
-This variable specifies how to read buffer names.  For example, if you
-set this variable to @code{iswitchb-read-buffer}, all Emacs commands
-that call @code{read-buffer} to read a buffer name will actually use the
-@code{iswitchb} package to read it.
+This variable specifies how to read buffer names.  The function is
+called with the arguments passed to @code{read-buffer}.  For example,
+if you set this variable to @code{iswitchb-read-buffer}, all Emacs
+commands that call @code{read-buffer} to read a buffer name will
+actually use the @code{iswitchb} package to read it.
 @end defopt
 
 @defopt read-buffer-completion-ignore-case
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index c095a9e195d..3953da59b93 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -1494,7 +1494,7 @@ See the command \\[hungry-electric-delete]."
  ;; The indicator for the mode line.
  " Hungry"
  ;; The minor mode bindings.
- '(([C-delete] . hungry-electric-delete))
+ '(([C-backspace] . hungry-electric-delete))
  :group 'hunger)
 @end smallexample
 
@@ -1526,8 +1526,8 @@ See the command \\[hungry-electric-delete]."
  :lighter " Hungry"
  ;; The minor mode bindings.
  :keymap
- '(([C-delete] . hungry-electric-delete)
-   ([C-M-delete]
+ '(([C-backspace] . hungry-electric-delete)
+   ([C-M-backspace]
     . (lambda ()
         (interactive)
         (hungry-electric-delete t))))
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 72dc8097760..49abc7af2cf 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-01  Juanma Barranquero  <lekktu@gmail.com>
+
+        * org.texi (Footnotes, Tables in HTML export): Fix typos.
+
 2010-07-23  Chong Yidong  <cyd@stupidchicken.com>
 
         * nxml-mode.texi (Limitations): Remove obsolete discussion (Bug#6708).
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index f31d852ea10..d4857d7a61c 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -1437,7 +1437,7 @@ LaTeX}).  Here are the valid references:
 @table @code
 @item [1]
 A plain numeric footnote marker.  Compatible with @file{footnote.el}, but not
-recommended because somthing like @samp{[1]} could easily be part of a code
+recommended because something like @samp{[1]} could easily be part of a code
 snippet.
 @item [fn:name]
 A named footnote reference, where @code{name} is a unique label word, or, for
@@ -9165,7 +9165,7 @@ and @code{style} attributes for a link:
 Org-mode tables are exported to HTML using the table tag defined in
 @code{org-export-html-table-tag}.  The default setting makes tables without
 cell borders and frame.  If you would like to change this for individual
-tables, place somthing like the following before the table:
+tables, place something like the following before the table:
 
 @cindex #+CAPTION
 @cindex #+ATTR_HTML
diff --git a/etc/ChangeLog b/etc/ChangeLog
index d9ae36b7b21..456033af1c9 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-27  Ken Brown  <kbrown@cornell.edu>
+
+        * PROBLEMS: Mention problem with Cygwin 1.5.19.
+
 2010-06-19  Ken Brown  <kbrown@cornell.edu>
 
         * PROBLEMS: Update Cygwin GCC information.  (Bug#6458)
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 7a2cc56699b..fb1b2b38d56 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2482,6 +2482,14 @@ files are installed. Then use:
 As of Emacs 22.1, there have been stability problems with Cygwin
 builds of Emacs using GCC 3.  Cygwin users are advised to use GCC 4.
 
+*** Building Emacs 23.3 and later will fail under Cygwin 1.5.19
+
+This is a consequence of a change to src/dired.c on 2010-07-27.  The
+issue is that Cygwin 1.5.19 did not have d_ino in 'struct dirent'.
+See
+
+  http://lists.gnu.org/archive/html/emacs-devel/2010-07/msg01266.html
+
 *** Building the native MS-Windows port fails due to unresolved externals
 
 The linker error messages look like this:
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 775ddcdc2e7..149de6629f0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -15,6 +15,48 @@
         (ctext-no-compositions): Doc fix.
         (compound-text-with-extensions): Doc fix.
 
+2010-08-03  Juanma Barranquero  <lekktu@gmail.com>
+
+        * progmodes/which-func.el (which-func-format): Split help-echo text
+        into lines, like other mode-line tooltips.
+
+        * server.el (server-start): When using TCP sockets, force IPv4
+        and use a literal 127.0.0.1 for localhost.  (Related to bug#6781.)
+
+2010-08-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * bindings.el (complete-symbol): Run completion-at-point as a fallback.
+
+2010-08-02  Juanma Barranquero  <lekktu@gmail.com>
+
+        * term.el (term-delimiter-argument-list): Reflow docstring.
+        (term-read-input-ring, term-write-input-ring, term-send-input)
+        (term-bol, term-erase-in-display, serial-supported-or-barf):
+        Fix typos in docstrings.
+
+2010-08-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * bindings.el (function-key-map): Add a S-tab => backtab fallback.
+
+2010-08-01  Juanma Barranquero  <lekktu@gmail.com>
+
+        * dabbrev.el (dabbrev-completion): Fix typo in docstring.
+
+2010-08-01  MON KEY  <monkey@sandpframing.com>  (tiny change)
+
+        * emacs-lisp/syntax.el (syntax-ppss-toplevel-pos):
+        Fix typo in docstring (bug#6747).
+
+2010-07-30  Leo  <sdl.web@gmail.com>
+
+        * eshell/esh-io.el (eshell-get-target): Better detection of
+        read-only file (Bug#6762).
+
+2010-07-30  Juanma Barranquero  <lekktu@gmail.com>
+
+        * align.el (align-default-spacing): Doc fix.
+        (align-region-heuristic, align-regexp): Fix typos in docstrings.
+
 2010-07-23  Juanma Barranquero  <lekktu@gmail.com>
 
         * help-fns.el (find-lisp-object-file-name): Doc fix (bug#6494).
diff --git a/lisp/align.el b/lisp/align.el
index 83ed0f4693a..9d811327021 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -140,8 +140,8 @@
   "An integer that represents the default amount of padding to use.
 If `align-to-tab-stop' is non-nil, this will represent the number of
 tab stops to use for alignment, rather than the number of spaces.
-Each alignment rule can optionally override both this variable.  See
-`align-mode-alist'."
+Each alignment rule can optionally override both this variable and
+`align-to-tab-stop'.  See `align-rules-list'."
   :type 'integer
   :group 'align)
 
@@ -157,8 +157,8 @@ Since each alignment rule can possibly have its own set of alignment
 sections (whenever `align-region-separate' is non-nil, and not a
 string), this heuristic is used to determine how far before and after
 point we should search in looking for a region separator.  Larger
-values can mean slower perform in large files, although smaller values
-may cause unexpected behavior at times."
+values can mean slower performance in large files, although smaller
+values may cause unexpected behavior at times."
   :type 'integer
   :group 'align)
 
@@ -926,7 +926,7 @@ align them so that the opening parentheses would line up:
     Joe (123) 456-7890
 
 There is no predefined rule to handle this, but you could easily do it
-using a REGEXP like \"(\". All you would have to do is to mark the
+using a REGEXP like \"(\".  All you would have to do is to mark the
 region, call `align-regexp' and type in that regular expression."
   (interactive
    (append
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 37ca3b86055..3ce21a578d5 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -688,6 +688,7 @@ language you are using."
               (fboundp 'semantic-active-p)
               (semantic-active-p))
          (semantic-ia-complete-symbol))
+        (completion-at-point-functions (completion-at-point))
         (t
          (error "%s"
                 (substitute-command-keys
@@ -1035,6 +1036,9 @@ or \\[semantic-mode]")))))
 ;; so we can't distinguish those two keys, but usually we consider C-SPC
 ;; (rather than C-@) as the "canonical" binding.
 (define-key function-key-map [?\C-@] [?\C-\s])
+;; Many keyboards don't have a `backtab' key, so by convention the user
+;; can use S-tab instead to access that binding.
+(define-key function-key-map [S-tab] [backtab])
 
 (define-key global-map [mouse-movement] 'ignore)
 
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 3ba9d56af16..1127181dca2 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -377,7 +377,7 @@ With a prefix argument ARG, it searches all buffers accepted by the
 function pointed out by `dabbrev-friend-buffer-function' to find the
 completions.
 
-If the prefix argument is 16 (which comes from \\[prefix-argument] \\[prefix-argument]),
+If the prefix argument is 16 (which comes from \\[universal-argument] \\[universal-argument]),
 then it searches *all* buffers."
   (interactive "*P")
   (dabbrev--reset-global-variables)
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index a3110f8d8c5..5cc89596ef5 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -52,7 +52,7 @@
 
 (defun syntax-ppss-toplevel-pos (ppss)
   "Get the latest syntactically outermost position found in a syntactic scan.
-PPSS is a scan state, as returned by `partial-parse-sexp' or `syntax-ppss'.
+PPSS is a scan state, as returned by `parse-partial-sexp' or `syntax-ppss'.
 An \"outermost position\" means one that it is outside of any syntactic entity:
 outside of any parentheses, comments, or strings encountered in the scan.
 If no such position is recorded in PPSS (because the end of the scan was
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index 1bcfe2b46e7..3aa785c7c1b 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -343,8 +343,9 @@ it defaults to `insert'."
         (let* ((exists (get-file-buffer target))
                (buf (find-file-noselect target t)))
           (with-current-buffer buf
-            (if buffer-read-only
+            (if buffer-file-read-only
                 (error "Cannot write to read-only file `%s'" target))
+            (setq buffer-read-only nil)
             (set (make-local-variable 'eshell-output-file-buffer)
                  (if (eq exists buf) 0 t))
             (cond ((eq mode 'overwrite)
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 6a72c161429..469786e04dd 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -145,7 +145,9 @@ Zero means compute the Imenu menu regardless of size."
                  local-map ,which-func-keymap
                  face which-func
                  ;;mouse-face highlight ; currently not evaluated :-(
-                 help-echo "mouse-1: go to beginning, mouse-2: toggle rest visibility, mouse-3: go to end")
+                 help-echo "mouse-1: go to beginning\n\
+mouse-2: toggle rest visibility\n\
+mouse-3: go to end")
     "]")
   "Format for displaying the function in the mode line."
   :group 'which-func
diff --git a/lisp/server.el b/lisp/server.el
index d36b99cc5b6..e8a0125f554 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -560,9 +560,9 @@ server or call `M-x server-force-delete' to forcibly disconnect it.")
                        :coding 'raw-text-unix
                        ;; The other args depend on the kind of socket used.
                        (if server-use-tcp
-                           (list :family nil
+                           (list :family 'ipv4  ;; We're not ready for IPv6 yet
                                  :service t
-                                 :host (or server-host 'local)
+                                 :host (or server-host "127.0.0.1") ;; See bug#6781
                                  :plist '(:authenticated nil))
                          (list :family 'local
                                :service server-file
diff --git a/lisp/term.el b/lisp/term.el
index 7cb364af622..2223ff2587d 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -502,8 +502,8 @@ This is a good thing to set in mode hooks.")
 (defvar term-delimiter-argument-list ()
   "List of characters to recognize as separate arguments in input.
 Strings comprising a character in this list will separate the arguments
-surrounding them, and also be regarded as arguments in their own right (unlike
-whitespace).  See `term-arguments'.
+surrounding them, and also be regarded as arguments in their own right
+\(unlike whitespace).  See `term-arguments'.
 Defaults to the empty list.
 
 For shells, a good value is (?\\| ?& ?< ?> ?\\( ?\\) ?\\;).
@@ -1516,7 +1516,7 @@ if [ $1 = .. ]; then shift; fi; exec \"$@\""
 ;; term-replace-by-expanded-history-before-point Workhorse function.
 
 (defun term-read-input-ring (&optional silent)
-  "Sets the buffer's `term-input-ring' from a history file.
+  "Set the buffer's `term-input-ring' from a history file.
 The name of the file is given by the variable `term-input-ring-file-name'.
 The history ring is of size `term-input-ring-size', regardless of file size.
 If `term-input-ring-file-name' is nil this function does nothing.
@@ -1564,7 +1564,7 @@ See also `term-input-ignoredups' and `term-write-input-ring'."
                  term-input-ring-index nil)))))
 
 (defun term-write-input-ring ()
-  "Writes the buffer's `term-input-ring' to a history file.
+  "Write the buffer's `term-input-ring' to a history file.
 The name of the file is given by the variable `term-input-ring-file-name'.
 The original contents of the file are lost if `term-input-ring' is not empty.
 If `term-input-ring-file-name' is nil this function does nothing.
@@ -1996,12 +1996,12 @@ Argument 0 is the command name."
   "Send input to process.
 After the process output mark, sends all text from the process mark to
 point as input to the process.  Before the process output mark, calls value
-of variable term-get-old-input to retrieve old input, copies it to the
+of variable `term-get-old-input' to retrieve old input, copies it to the
 process mark, and sends it.  A terminal newline is also inserted into the
 buffer and sent to the process.  The list of function names contained in the
 value of `term-input-filter-functions' is called on the input before sending
 it.  The input is entered into the input history ring, if the value of variable
-term-input-filter returns non-nil when called on the input.
+`term-input-filter' returns non-nil when called on the input.
 
 Any history reference may be expanded depending on the value of the variable
 `term-input-autoexpand'.  The list of function names contained in the value
@@ -2137,7 +2137,7 @@ set the hook `term-input-sender'."
   (term-send-string proc "\n"))
 
 (defun term-bol (arg)
-  "Goes to the beginning of line, then skips past the prompt, if any.
+  "Go to the beginning of line, then skip past the prompt, if any.
 If a prefix argument is given (\\[universal-argument]), then no prompt skip
 -- go straight to column 0.
 
@@ -3760,7 +3760,7 @@ all pending output has been dealt with."))
       (goto-char saved-point))))
 
 (defun term-erase-in-display (kind)
-  "Erases (that is blanks out) part of the window.
+  "Erase (that is blank out) part of the window.
 If KIND is 0, erase from (point) to (point-max);
 if KIND is 1, erase from home to point; else erase from home to point-max."
   (term-handle-deferred-scroll)
@@ -4166,7 +4166,7 @@ Typing SPC flushes the help buffer."
 
 ;; I need a make-term that doesn't surround with *s -mm
 (defun term-ansi-make-term (name program &optional startfile &rest switches)
-"Make a term process NAME in a buffer, running PROGRAM.
+  "Make a term process NAME in a buffer, running PROGRAM.
 The name of the buffer is NAME.
 If there is already a running process in that buffer, it is not restarted.
 Optional third arg STARTFILE is the name of a file to send the contents of to
@@ -4267,7 +4267,7 @@ returns nil, which is recognized by `serial-process-configure'
 for special serial ports that cannot be configured.")
 
 (defun serial-supported-or-barf ()
-  "Signal an error if serial processes are not supported"
+  "Signal an error if serial processes are not supported."
   (unless (fboundp 'make-serial-process)
     (error "Serial processes are not supported on this system")))
 
diff --git a/nt/ChangeLog b/nt/ChangeLog
index b00b5b616fc..24b421b4567 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-02  Óscar Fuentes  <ofv@wanadoo.es>
+
+        * cmdproxy.c (main): Use _snprintf instead of wsprintf,
+        which has a 1024 char limit on Windows (bug#6647).
+
 2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.2 released.
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index aae852bf4fa..4f2d113a900 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -35,6 +35,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdlib.h>  /* getenv */
 #include <string.h>  /* strlen */
 
+/* We don't want to include stdio.h because we are already duplicating
+   lots of it here */
+extern int _snprintf (char *buffer, size_t count, const char *format, ...);
 
 /*******  Mock C library routines  *********************************/
 
@@ -604,6 +607,7 @@ main (int argc, char ** argv)
     {
       char * p;
       int    extra_arg_space = 0;
+      int    maxlen, remlen;
       int    run_command_dot_com;
 
       progname = getenv ("COMSPEC");
@@ -635,21 +639,27 @@ main (int argc, char ** argv)
              case path contains spaces (fortunately it can't contain
              quotes, since they are illegal in path names).  */
 
-          buf = p = alloca (strlen (progname) + extra_arg_space +
-                            strlen (cmdline) + 16);
+          remlen = maxlen =
+            strlen (progname) + extra_arg_space + strlen (cmdline) + 16;
+          buf = p = alloca (maxlen + 1);
 
           /* Quote progname in case it contains spaces.  */
-          p += wsprintf (p, "\"%s\"", progname);
+          p += _snprintf (p, remlen, "\"%s\"", progname);
+          remlen = maxlen - (p - buf);
 
           /* Include pass_through_args verbatim; these are just switches
              so should not need quoting.  */
           for (argv = pass_through_args; *argv != NULL; ++argv)
-            p += wsprintf (p, " %s", *argv);
+            {
+              p += _snprintf (p, remlen, " %s", *argv);
+              remlen = maxlen - (p - buf);
+            }
 
           if (run_command_dot_com)
-            wsprintf(p, " /e:%d /c %s", envsize, cmdline);
+            _snprintf (p, remlen, " /e:%d /c %s", envsize, cmdline);
           else
-            wsprintf(p, " /c %s", cmdline);
+            _snprintf (p, remlen, " /c %s", cmdline);
+          remlen = maxlen - (p - buf);
           cmdline = buf;
         }
       else
@@ -669,19 +679,27 @@ main (int argc, char ** argv)
           else
             path[0] = '\0';
 
-          cmdline = p = alloca (strlen (progname) + extra_arg_space +
-                                strlen (path) + 13);
+          remlen = maxlen =
+            strlen (progname) + extra_arg_space + strlen (path) + 13;
+          cmdline = p = alloca (maxlen + 1);
 
           /* Quote progname in case it contains spaces.  */
-          p += wsprintf (p, "\"%s\" %s", progname, path);
+          p += _snprintf (p, remlen, "\"%s\" %s", progname, path);
+          remlen = maxlen - (p - cmdline);
 
           /* Include pass_through_args verbatim; these are just switches
              so should not need quoting.  */
           for (argv = pass_through_args; *argv != NULL; ++argv)
-            p += wsprintf (p, " %s", *argv);
+            {
+              p += _snprintf (p, remlen, " %s", *argv);
+              remlen = maxlen - (p - cmdline);
+            }
 
           if (run_command_dot_com)
-            wsprintf (p, " /e:%d", envsize);
+            {
+              _snprintf (p, remlen, " /e:%d", envsize);
+              remlen = maxlen - (p - cmdline);
+            }
         }
     }
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 6b9c8614837..2b413a7958c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,24 @@
+2010-08-01  Juanma Barranquero  <lekktu@gmail.com>
+
+        * w32fns.c (syms_of_w32fns) <x-max-tooltip-size>: Fix typo in docstring.
+        * xfns.c (syms_of_xfns) <x-max-tooltip-size>: Reflow docstring.
+
+2010-07-30  Juanma Barranquero  <lekktu@gmail.com>
+
+        * fns.c (Fsubstring_no_properties, Fnthcdr, Ffeaturep)
+        (Fhash_table_size): Fix typos in docstrings.
+        (Fmake_hash_table): Doc fix.
+
+2010-07-28  Juanma Barranquero  <lekktu@gmail.com>
+
+        * minibuf.c (syms_of_minibuf) <read-buffer-function>:
+        Doc fix (bug#5625).
+
+2010-07-27  Ken Brown  <kbrown@cornell.edu>
+
+        * dired.c (DIRENTRY_NONEMPTY) [cygwin]: Use d_ino instead of
+        the MSDOS definition.
+
 2010-07-25  Christoph Scholtes  <cschol2112@gmail.com>
 
         * minibuf.c (Fread_buffer): Doc fix (bug#6528).
diff --git a/src/dired.c b/src/dired.c
index d4b0ff20db2..92a768da5be 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -72,8 +72,7 @@ extern struct direct *readdir ();
 #endif /* not MSDOS */
 #endif /* not SYSV_SYSTEM_DIR */
 
-/* Some versions of Cygwin don't have d_ino in `struct dirent'.  */
-#if defined(MSDOS) || defined(__CYGWIN__)
+#ifdef MSDOS
 #define DIRENTRY_NONEMPTY(p) ((p)->d_name[0] != 0)
 #else
 #define DIRENTRY_NONEMPTY(p) ((p)->d_ino)
diff --git a/src/fns.c b/src/fns.c
index 7e6001e947c..4e8cd5db9a6 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -238,9 +238,8 @@ Symbols are also allowed; their print names are used instead.  */)
   return Qt;
 }
 
-DEFUN ("compare-strings", Fcompare_strings,
-       Scompare_strings, 6, 7, 0,
-doc: /* Compare the contents of two strings, converting to multibyte if needed.
+DEFUN ("compare-strings", Fcompare_strings, Scompare_strings, 6, 7, 0,
+       doc: /* Compare the contents of two strings, converting to multibyte if needed.
 In string STR1, skip the first START1 characters and stop at END1.
 In string STR2, skip the first START2 characters and stop at END2.
 END1 and END2 default to the full lengths of the respective strings.
@@ -1259,7 +1258,7 @@ value is a new vector that contains the elements between index FROM
 
 DEFUN ("substring-no-properties", Fsubstring_no_properties, Ssubstring_no_properties, 1, 3, 0,
        doc: /* Return a substring of STRING, without text properties.
-It starts at index FROM and ending before TO.
+It starts at index FROM and ends before TO.
 TO may be nil or omitted; then the substring runs to the end of STRING.
 If FROM is nil or omitted, the substring starts at the beginning of STRING.
 If FROM or TO is negative, it counts from the end.
@@ -1355,7 +1354,7 @@ substring_both (string, from, from_byte, to, to_byte)
 }
 
 DEFUN ("nthcdr", Fnthcdr, Snthcdr, 2, 2, 0,
-       doc: /* Take cdr N times on LIST, returns the result.  */)
+       doc: /* Take cdr N times on LIST, return the result.  */)
      (n, list)
      Lisp_Object n;
      register Lisp_Object list;
@@ -1396,7 +1395,7 @@ DEFUN ("elt", Felt, Selt, 2, 2, 0,
 }
 
 DEFUN ("member", Fmember, Smember, 2, 2, 0,
-doc: /* Return non-nil if ELT is an element of LIST.  Comparison done with `equal'.
+       doc: /* Return non-nil if ELT is an element of LIST.  Comparison done with `equal'.
 The value is actually the tail of LIST whose car is ELT.  */)
      (elt, list)
      register Lisp_Object elt;
@@ -1416,7 +1415,7 @@ The value is actually the tail of LIST whose car is ELT.  */)
 }
 
 DEFUN ("memq", Fmemq, Smemq, 2, 2, 0,
-doc: /* Return non-nil if ELT is an element of LIST.  Comparison done with `eq'.
+       doc: /* Return non-nil if ELT is an element of LIST.  Comparison done with `eq'.
 The value is actually the tail of LIST whose car is ELT.  */)
      (elt, list)
      register Lisp_Object elt, list;
@@ -1443,7 +1442,7 @@ The value is actually the tail of LIST whose car is ELT.  */)
 }
 
 DEFUN ("memql", Fmemql, Smemql, 2, 2, 0,
-doc: /* Return non-nil if ELT is an element of LIST.  Comparison done with `eql'.
+       doc: /* Return non-nil if ELT is an element of LIST.  Comparison done with `eql'.
 The value is actually the tail of LIST whose car is ELT.  */)
      (elt, list)
      register Lisp_Object elt;
@@ -2829,7 +2828,7 @@ Lisp_Object Vfeatures, Qsubfeatures;
 extern Lisp_Object Vafter_load_alist;
 
 DEFUN ("featurep", Ffeaturep, Sfeaturep, 1, 2, 0,
-       doc: /* Returns t if FEATURE is present in this Emacs.
+       doc: /* Return t if FEATURE is present in this Emacs.
 
 Use this to conditionalize execution of lisp code based on the
 presence or absence of Emacs or environment extensions.
@@ -4627,8 +4626,8 @@ is a float, it must be > 1.0, and the new size is computed by
 multiplying the old size with that factor.  Default is 1.5.
 
 :rehash-threshold THRESHOLD -- THRESHOLD must a float > 0, and <= 1.0.
-Resize the hash table when ratio of the number of entries in the
-table.  Default is 0.8.
+Resize the hash table when the ratio (number of entries / table size)
+is greater or equal than THRESHOLD.  Default is 0.8.
 
 :weakness WEAK -- WEAK must be one of nil, t, `key', `value',
 `key-or-value', or `key-and-value'.  If WEAK is not nil, the table
@@ -4757,7 +4756,7 @@ DEFUN ("hash-table-rehash-threshold", Fhash_table_rehash_threshold,
 DEFUN ("hash-table-size", Fhash_table_size, Shash_table_size, 1, 1, 0,
        doc: /* Return the size of TABLE.
 The size can be used as an argument to `make-hash-table' to create
-a hash table than can hold as many elements of TABLE holds
+a hash table than can hold as many elements as TABLE holds
 without need for resizing.  */)
      (table)
        Lisp_Object table;
diff --git a/src/minibuf.c b/src/minibuf.c
index 043eef13508..564346fd472 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -2131,7 +2131,8 @@ syms_of_minibuf ()
   staticpro (&Qread_expression_history);
 
   DEFVAR_LISP ("read-buffer-function", &Vread_buffer_function,
-               doc: /* If this is non-nil, `read-buffer' does its work by calling this function.  */);
+               doc: /* If this is non-nil, `read-buffer' does its work by calling this function.
+The function is called with the arguments passed to `read-buffer'.  */);
   Vread_buffer_function = Qnil;
 
   DEFVAR_BOOL ("read-buffer-completion-ignore-case",
diff --git a/src/w32fns.c b/src/w32fns.c
index 9df243ede7f..e27e7fecdc6 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7199,7 +7199,7 @@ or when you set the mouse color.  */);
 
   DEFVAR_LISP ("x-max-tooltip-size", &Vx_max_tooltip_size,
                doc: /* Maximum size for tooltips.
-Value is a pair (COLUMNS . ROWS). Text larger than this is clipped.  */);
+Value is a pair (COLUMNS . ROWS).  Text larger than this is clipped.  */);
   Vx_max_tooltip_size = Fcons (make_number (80), make_number (40));
 
   DEFVAR_LISP ("x-no-window-manager", &Vx_no_window_manager,
diff --git a/src/xfns.c b/src/xfns.c
index 458904b326a..1d7d3d03580 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1025,7 +1025,7 @@ x_set_mouse_color (f, arg, oldval)
 
   if (FRAME_X_DISPLAY_INFO (f)->invisible_cursor == 0)
     FRAME_X_DISPLAY_INFO (f)->invisible_cursor = make_invisible_cursor (f);
-  
+
   if (cursor != x->text_cursor
       && x->text_cursor != 0)
     XFreeCursor (dpy, x->text_cursor);
@@ -3072,7 +3072,7 @@ x_default_font_parameter (f, parms)
       if (system_font) font_param = make_string (system_font,
                                                  strlen (system_font));
     }
-  
+
   font = !NILP (font_param) ? font_param
     : x_get_arg (dpyinfo, parms, Qfont, "font", "Font", RES_TYPE_STRING);
 
@@ -5646,7 +5646,7 @@ If FRAME is omitted or nil, it defaults to the selected frame. */)
   font_param = Ffont_get (font, intern (":name"));
   if (STRINGP (font_param))
     default_name = xstrdup (SDATA (font_param));
-  else 
+  else
     {
       font_param = Fframe_parameter (frame, Qfont_param);
       if (STRINGP (font_param))
@@ -5657,7 +5657,7 @@ If FRAME is omitted or nil, it defaults to the selected frame. */)
     default_name = xstrdup (x_last_font_name);
 
   /* Convert fontconfig names to Gtk names, i.e. remove - before number */
-  if (default_name) 
+  if (default_name)
     {
       char *p = strrchr (default_name, '-');
       if (p)
@@ -5918,8 +5918,8 @@ or when you set the mouse color.  */);
   Vx_cursor_fore_pixel = Qnil;
 
   DEFVAR_LISP ("x-max-tooltip-size", &Vx_max_tooltip_size,
-    doc: /* Maximum size for tooltips.  Value is a pair (COLUMNS . ROWS).
-Text larger than this is clipped.  */);
+    doc: /* Maximum size for tooltips.
+Value is a pair (COLUMNS . ROWS).  Text larger than this is clipped.  */);
   Vx_max_tooltip_size = Fcons (make_number (80), make_number (40));
 
   DEFVAR_LISP ("x-no-window-manager", &Vx_no_window_manager,