Merge branch 'emacs-25-merge'

[gnu-emacs] / doc / lispref / functions.texi

diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 40b8322c73eb3fe70018469bac812bf33d3bcfd6..7cc041fa77e40b67b5437562de26b7b67b64c660 100644 (file)
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -1,4 +1,4 @@
-@c -*-texinfo-*-
+@c -*- mode: texinfo; coding: utf-8 -*-

 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software
 @c Foundation, Inc.
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software
 @c Foundation, Inc.


@@ -118,7 +118,7 @@ Components}); such a @dfn{named command} can be invoked with
 
 @item closure
 A function object that is much like a lambda expression, except that
 
 @item closure
 A function object that is much like a lambda expression, except that

-it also encloses an ``environment'' of lexical variable bindings.
+it also encloses an environment of lexical variable bindings.

 @xref{Closures}.
 
 @item byte-code function
 @xref{Closures}.
 
 @item byte-code function


@@ -368,7 +368,7 @@ This is what @code{substring} does; @code{nil} as the third argument to
 @quotation
 @b{Common Lisp note:} Common Lisp allows the function to specify what
 default value to use when an optional argument is omitted; Emacs Lisp
 @quotation
 @b{Common Lisp note:} Common Lisp allows the function to specify what
 default value to use when an optional argument is omitted; Emacs Lisp

-always uses @code{nil}.  Emacs Lisp does not support ``supplied-p''
+always uses @code{nil}.  Emacs Lisp does not support @code{supplied-p}

 variables that tell you whether an argument was explicitly passed.
 @end quotation
 
 variables that tell you whether an argument was explicitly passed.
 @end quotation
 


@@ -660,7 +660,7 @@ already been evaluated.
 
 The argument @var{function} must be either a Lisp function or a
 primitive function.  Special forms and macros are not allowed, because
 
 The argument @var{function} must be either a Lisp function or a
 primitive function.  Special forms and macros are not allowed, because

-they make sense only when given the ``unevaluated'' argument
+they make sense only when given the unevaluated argument

 expressions.  @code{funcall} cannot provide these because, as we saw
 above, it never knows them in the first place.
 
 expressions.  @code{funcall} cannot provide these because, as we saw
 above, it never knows them in the first place.
 


@@ -861,15 +861,18 @@ into a list.  @code{mapc} always returns @var{sequence}.
 
 @defun mapconcat function sequence separator
 @code{mapconcat} applies @var{function} to each element of
 
 @defun mapconcat function sequence separator
 @code{mapconcat} applies @var{function} to each element of

-@var{sequence}: the results, which must be strings, are concatenated.
-Between each pair of result strings, @code{mapconcat} inserts the string
-@var{separator}.  Usually @var{separator} contains a space or comma or
-other suitable punctuation.
+@var{sequence}; the results, which must be sequences of characters
+(strings, vectors, or lists), are concatenated into a single string
+return value.  Between each pair of result sequences, @code{mapconcat}
+inserts the characters from @var{separator}, which also must be a
+string, or a vector or list of characters.  @xref{Sequences Arrays
+Vectors}.

 
 The argument @var{function} must be a function that can take one
 
 The argument @var{function} must be a function that can take one

-argument and return a string.  The argument @var{sequence} can be any
-kind of sequence except a char-table; that is, a list, a vector, a
-bool-vector, or a string.
+argument and returns a sequence of characters: a string, a vector, or
+a list.  The argument @var{sequence} can be any kind of sequence
+except a char-table; that is, a list, a vector, a bool-vector, or a
+string.

 
 @example
 @group
 
 @example
 @group


@@ -912,7 +915,7 @@ This macro returns an anonymous function with argument list
 @var{args}, documentation string @var{doc} (if any), interactive spec
 @var{interactive} (if any), and body forms given by @var{body}.
 
 @var{args}, documentation string @var{doc} (if any), interactive spec
 @var{interactive} (if any), and body forms given by @var{body}.
 

-In effect, this macro makes @code{lambda} forms ``self-quoting'':
+In effect, this macro makes @code{lambda} forms self-quoting:

 evaluating a form whose @sc{car} is @code{lambda} yields the form
 itself:
 
 evaluating a form whose @sc{car} is @code{lambda} yields the form
 itself:
 


@@ -1133,7 +1136,7 @@ argument list and body forms as the remaining elements:
 
 @noindent
 However, the fact that the internal structure of a closure is
 
 @noindent
 However, the fact that the internal structure of a closure is

-``exposed'' to the rest of the Lisp world is considered an internal
+exposed to the rest of the Lisp world is considered an internal

 implementation detail.  For this reason, we recommend against directly
 examining or altering the structure of closure objects.
 
 implementation detail.  For this reason, we recommend against directly
 examining or altering the structure of closure objects.
 


@@ -1222,7 +1225,7 @@ This macro is the handy way to add the advice @var{function} to the function
 stored in @var{place} (@pxref{Generalized Variables}).
 
 @var{where} determines how @var{function} is composed with the
 stored in @var{place} (@pxref{Generalized Variables}).
 
 @var{where} determines how @var{function} is composed with the

-existing function, e.g. whether @var{function} should be called before, or
+existing function, e.g., whether @var{function} should be called before, or

 after the original function.  @xref{Advice combinators}, for the list of
 available ways to compose the two functions.
 
 after the original function.  @xref{Advice combinators}, for the list of
 available ways to compose the two functions.
 


@@ -1310,7 +1313,7 @@ and its properties.
 @defun advice-eval-interactive-spec spec
 Evaluate the interactive @var{spec} just like an interactive call to a function
 with such a spec would, and then return the corresponding list of arguments
 @defun advice-eval-interactive-spec spec
 Evaluate the interactive @var{spec} just like an interactive call to a function
 with such a spec would, and then return the corresponding list of arguments

-that was built.  E.g. @code{(advice-eval-interactive-spec "r\nP")} will
+that was built.  E.g., @code{(advice-eval-interactive-spec "r\nP")} will

 return a list of three elements, containing the boundaries of the region and
 the current prefix argument.
 @end defun
 return a list of three elements, containing the boundaries of the region and
 the current prefix argument.
 @end defun


@@ -1720,7 +1723,7 @@ performed later on in the same file, just like macros.
 @section The @code{declare} Form
 @findex declare
 
 @section The @code{declare} Form
 @findex declare
 

-  @code{declare} is a special macro which can be used to add ``meta''
+  @code{declare} is a special macro which can be used to add meta

 properties to a function or macro: for example, marking it as
 obsolete, or giving its forms a special @key{TAB} indentation
 convention in Emacs Lisp mode.
 properties to a function or macro: for example, marking it as
 obsolete, or giving its forms a special @key{TAB} indentation
 convention in Emacs Lisp mode.


@@ -1821,7 +1824,7 @@ example, byte-compiling @file{fortran.el} used to warn:
 
 @example
 In end of data:
 
 @example
 In end of data:

-fortran.el:2152:1:Warning: the function `gud-find-c-expr' is not
+fortran.el:2152:1:Warning: the function ‘gud-find-c-expr’ is not

     known to be defined.
 @end example
 
     known to be defined.
 @end example
 


@@ -1912,7 +1915,7 @@ list of buffer-local bindings.
 Being quick and simple, @code{unsafep} does a very light analysis and
 rejects many Lisp expressions that are actually safe.  There are no
 known cases where @code{unsafep} returns @code{nil} for an unsafe
 Being quick and simple, @code{unsafep} does a very light analysis and
 rejects many Lisp expressions that are actually safe.  There are no
 known cases where @code{unsafep} returns @code{nil} for an unsafe

-expression.  However, a ``safe'' Lisp expression can return a string
+expression.  However, a safe Lisp expression can return a string

 with a @code{display} property, containing an associated Lisp
 expression to be executed after the string is inserted into a buffer.
 This associated expression can be a virus.  In order to be safe, you
 with a @code{display} property, containing an associated Lisp
 expression to be executed after the string is inserted into a buffer.
 This associated expression can be a virus.  In order to be safe, you