47 files changed, 583 insertions, 444 deletions

diff --git a/ChangeLog b/ChangeLog
index 2298c21a7fa..f306aefbd1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-01-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Enable conservative stack scanning for all architectures.
+        Suggested by Stefan Monnier in
+        <http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00183.html>.
+        * configure.ac (GC_MARK_STACK): Remove.
+
+2013-01-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * lib/getopt_.h: Remove trailing CRs that crept in.
+
 2013-01-11  Eli Zaretskii  <eliz@gnu.org>
 
         * lib/getopt_.h: Regenerate.
diff --git a/autogen/config.in b/autogen/config.in
index 68f2c426ffa..b02b1fe462a 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -160,10 +160,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Mark a secondary stack, like the register stack on the ia64. */
 #undef GC_MARK_SECONDARY_STACK
 
-/* Define to GC_USE_GCPROS_AS_BEFORE if conservative garbage collection is not
-   known to work. */
-#undef GC_MARK_STACK
-
 /* Define if setjmp is known to save all registers relevant for conservative
    garbage collection in the jmp_buf. */
 #undef GC_SETJMP_WORKS
diff --git a/autogen/configure b/autogen/configure
index e1df418eede..750e8a8087d 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -15707,14 +15707,7 @@ esac
 
 
 
-
-
 case $opsys in
-  aix4-2 | hpux* | unixware)
-            $as_echo "#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE" >>confdefs.h
-
-    ;;
-
           gnu-linux | gnu-kfreebsd )
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -15739,9 +15732,6 @@ _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
   $as_echo "#define GC_SETJMP_WORKS 1" >>confdefs.h
 
-else
-  $as_echo "#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE" >>confdefs.h
-
 fi
 rm -f conftest.err conftest.$ac_ext
     ;;
diff --git a/configure.ac b/configure.ac
index a6b544e86d3..30c1ae075da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3838,22 +3838,13 @@ case $opsys in
 esac
 
 
-dnl These won't be used automatically yet.  We also need to know, at least,
+dnl This won't be used automatically yet.  We also need to know, at least,
 dnl that the stack is continuous.
 AH_TEMPLATE(GC_SETJMP_WORKS, [Define if setjmp is known to save all
   registers relevant for conservative garbage collection in the jmp_buf.])
 
-AH_TEMPLATE(GC_MARK_STACK, [Define to GC_USE_GCPROS_AS_BEFORE if
-  conservative garbage collection is not known to work.])
-
 
 case $opsys in
-  aix4-2 | hpux* | unixware)
-    dnl Conservative garbage collection has not been tested, so for now
-    dnl play it safe and stick with the old-fashioned way of marking.
-    AC_DEFINE(GC_MARK_STACK, [GC_USE_GCPROS_AS_BEFORE])
-    ;;
-
   dnl Not all the architectures are tested, but there are Debian packages
   dnl for SCM and/or Guile on them, so the technique must work.  See also
   dnl comments in alloc.c concerning setjmp and gcc.
@@ -3868,8 +3859,7 @@ case $opsys in
 #else
 # error "setjmp not known to work on this arch"
 #endif
-    ]], [[]])], AC_DEFINE(GC_SETJMP_WORKS, 1),
-      AC_DEFINE(GC_MARK_STACK, [GC_USE_GCPROS_AS_BEFORE]) )
+    ]], [[]])], AC_DEFINE(GC_SETJMP_WORKS, 1))
     ;;
 esac
 
diff --git a/lib/getopt_.h b/lib/getopt_.h
index 10edb73f417..dd958138b22 100644
--- a/lib/getopt_.h
+++ b/lib/getopt_.h
@@ -1,285 +1,285 @@
-/* Declarations for getopt.

-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2013 Free Software

-   Foundation, Inc.

-   This file is part of the GNU C Library.

-

-   This program is free software: you can redistribute it and/or modify

-   it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 3 of the License, or

-   (at your option) any later version.

-

-   This program is distributed in the hope that it will be useful,

-   but WITHOUT ANY WARRANTY; without even the implied warranty of

-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-   GNU General Public License for more details.

-

-   You should have received a copy of the GNU General Public License

-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

-

-#ifndef _GL_GETOPT_H

-

-#if __GNUC__ >= 3

-#pragma GCC system_header

-#endif

-

-

-/* The include_next requires a split double-inclusion guard.  We must

-   also inform the replacement unistd.h to not recursively use

-   <getopt.h>; our definitions will be present soon enough.  */

-#if HAVE_GETOPT_H

-# define _GL_SYSTEM_GETOPT

-# ifndef __GNUC__

-# include <next_getopt.h>

-# else

-# include_next <getopt.h>

-# endif

-# undef _GL_SYSTEM_GETOPT

-#endif

-

-#ifndef _GL_GETOPT_H

-

-#ifndef __need_getopt

-# define _GL_GETOPT_H 1

-#endif

-

-/* Standalone applications should #define __GETOPT_PREFIX to an

-   identifier that prefixes the external functions and variables

-   defined in this header.  When this happens, include the

-   headers that might declare getopt so that they will not cause

-   confusion if included after this file (if the system had <getopt.h>,

-   we have already included it).  Then systematically rename

-   identifiers so that they do not collide with the system functions

-   and variables.  Renaming avoids problems with some compilers and

-   linkers.  */

-#if defined __GETOPT_PREFIX && !defined __need_getopt

-# if !HAVE_GETOPT_H

-#  define __need_system_stdlib_h

-#  include <stdlib.h>

-#  undef __need_system_stdlib_h

-#  include <stdio.h>

-#  include <unistd.h>

-# endif

-# undef __need_getopt

-# undef getopt

-# undef getopt_long

-# undef getopt_long_only

-# undef optarg

-# undef opterr

-# undef optind

-# undef optopt

-# undef option

-# define __GETOPT_CONCAT(x, y) x ## y

-# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y)

-# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y)

-# define getopt __GETOPT_ID (getopt)

-# define getopt_long __GETOPT_ID (getopt_long)

-# define getopt_long_only __GETOPT_ID (getopt_long_only)

-# define optarg __GETOPT_ID (optarg)

-# define opterr __GETOPT_ID (opterr)

-# define optind __GETOPT_ID (optind)

-# define optopt __GETOPT_ID (optopt)

-# define option __GETOPT_ID (option)

-# define _getopt_internal __GETOPT_ID (getopt_internal)

-#endif

-

-/* Standalone applications get correct prototypes for getopt_long and

-   getopt_long_only; they declare "char **argv".  libc uses prototypes

-   with "char *const *argv" that are incorrect because getopt_long and

-   getopt_long_only can permute argv; this is required for backward

-   compatibility (e.g., for LSB 2.0.1).

-

-   This used to be '#if defined __GETOPT_PREFIX && !defined __need_getopt',

-   but it caused redefinition warnings if both unistd.h and getopt.h were

-   included, since unistd.h includes getopt.h having previously defined

-   __need_getopt.

-

-   The only place where __getopt_argv_const is used is in definitions

-   of getopt_long and getopt_long_only below, but these are visible

-   only if __need_getopt is not defined, so it is quite safe to rewrite

-   the conditional as follows:

-*/

-#if !defined __need_getopt

-# if defined __GETOPT_PREFIX

-#  define __getopt_argv_const /* empty */

-# else

-#  define __getopt_argv_const const

-# endif

-#endif

-

-/* If __GNU_LIBRARY__ is not already defined, either we are being used

-   standalone, or this is the first header included in the source file.

-   If we are being used with glibc, we need to include <features.h>, but

-   that does not exist if we are standalone.  So: if __GNU_LIBRARY__ is

-   not defined, include <ctype.h>, which will pull in <features.h> for us

-   if it's from glibc.  (Why ctype.h?  It's guaranteed to exist and it

-   doesn't flood the namespace with stuff the way some other headers do.)  */

-#if !defined __GNU_LIBRARY__

-# include <ctype.h>

-#endif

-

-#ifndef __THROW

-# ifndef __GNUC_PREREQ

-#  define __GNUC_PREREQ(maj, min) (0)

-# endif

-# if defined __cplusplus && __GNUC_PREREQ (2,8)

-#  define __THROW       throw ()

-# else

-#  define __THROW

-# endif

-#endif

-

-/* The definition of _GL_ARG_NONNULL is copied here.  */

-/* A C macro for declaring that specific arguments must not be NULL.

-   Copyright (C) 2009-2013 Free Software Foundation, Inc.

-

-   This program is free software: you can redistribute it and/or modify it

-   under the terms of the GNU General Public License as published

-   by the Free Software Foundation; either version 3 of the License, or

-   (at your option) any later version.

-

-   This program is distributed in the hope that it will be useful,

-   but WITHOUT ANY WARRANTY; without even the implied warranty of

-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-   General Public License for more details.

-

-   You should have received a copy of the GNU General Public License

-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

-

-/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools

-   that the values passed as arguments n, ..., m must be non-NULL pointers.

-   n = 1 stands for the first argument, n = 2 for the second argument etc.  */

-#ifndef _GL_ARG_NONNULL

-# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3

-#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))

-# else

-#  define _GL_ARG_NONNULL(params)

-# endif

-#endif

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-/* For communication from 'getopt' to the caller.

-   When 'getopt' finds an option that takes an argument,

-   the argument value is returned here.

-   Also, when 'ordering' is RETURN_IN_ORDER,

-   each non-option ARGV-element is returned here.  */

-

-extern char *optarg;

-

-/* Index in ARGV of the next element to be scanned.

-   This is used for communication to and from the caller

-   and for communication between successive calls to 'getopt'.

-

-   On entry to 'getopt', zero means this is the first call; initialize.

-

-   When 'getopt' returns -1, this is the index of the first of the

-   non-option elements that the caller should itself scan.

-

-   Otherwise, 'optind' communicates from one call to the next

-   how much of ARGV has been scanned so far.  */

-

-extern int optind;

-

-/* Callers store zero here to inhibit the error message 'getopt' prints

-   for unrecognized options.  */

-

-extern int opterr;

-

-/* Set to an option character which was unrecognized.  */

-

-extern int optopt;

-

-#ifndef __need_getopt

-/* Describe the long-named options requested by the application.

-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector

-   of 'struct option' terminated by an element containing a name which is

-   zero.

-

-   The field 'has_arg' is:

-   no_argument          (or 0) if the option does not take an argument,

-   required_argument    (or 1) if the option requires an argument,

-   optional_argument    (or 2) if the option takes an optional argument.

-

-   If the field 'flag' is not NULL, it points to a variable that is set

-   to the value given in the field 'val' when the option is found, but

-   left unchanged if the option is not found.

-

-   To have a long-named option do something other than set an 'int' to

-   a compiled-in constant, such as set a value from 'optarg', set the

-   option's 'flag' field to zero and its 'val' field to a nonzero

-   value (the equivalent single-letter option character, if there is

-   one).  For long options that have a zero 'flag' field, 'getopt'

-   returns the contents of the 'val' field.  */

-

-# if !GNULIB_defined_struct_option

-struct option

-{

-  const char *name;

-  /* has_arg can't be an enum because some compilers complain about

-     type mismatches in all the code that assumes it is an int.  */

-  int has_arg;

-  int *flag;

-  int val;

-};

-#  define GNULIB_defined_struct_option 1

-# endif

-

-/* Names for the values of the 'has_arg' field of 'struct option'.  */

-

-# define no_argument            0

-# define required_argument      1

-# define optional_argument      2

-#endif  /* need getopt */

-

-

-/* Get definitions and prototypes for functions to process the

-   arguments in ARGV (ARGC of them, minus the program name) for

-   options given in OPTS.

-

-   Return the option character from OPTS just read.  Return -1 when

-   there are no more options.  For unrecognized options, or options

-   missing arguments, 'optopt' is set to the option letter, and '?' is

-   returned.

-

-   The OPTS string is a list of characters which are recognized option

-   letters, optionally followed by colons, specifying that that letter

-   takes an argument, to be placed in 'optarg'.

-

-   If a letter in OPTS is followed by two colons, its argument is

-   optional.  This behavior is specific to the GNU 'getopt'.

-

-   The argument '--' causes premature termination of argument

-   scanning, explicitly telling 'getopt' that there are no more

-   options.

-

-   If OPTS begins with '-', then non-option arguments are treated as

-   arguments to the option '\1'.  This behavior is specific to the GNU

-   'getopt'.  If OPTS begins with '+', or POSIXLY_CORRECT is set in

-   the environment, then do not permute arguments.  */

-

-extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)

-       __THROW _GL_ARG_NONNULL ((2, 3));

-

-#ifndef __need_getopt

-extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv,

-                        const char *__shortopts,

-                        const struct option *__longopts, int *__longind)

-       __THROW _GL_ARG_NONNULL ((2, 3));

-extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv,

-                             const char *__shortopts,

-                             const struct option *__longopts, int *__longind)

-       __THROW _GL_ARG_NONNULL ((2, 3));

-

-#endif

-

-#ifdef __cplusplus

-}

-#endif

-

-/* Make sure we later can get all the definitions and declarations.  */

-#undef __need_getopt

-

-#endif /* _GL_GETOPT_H */

-#endif /* _GL_GETOPT_H */

+/* Declarations for getopt.
+   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2013 Free Software
+   Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _GL_GETOPT_H
+
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+
+/* The include_next requires a split double-inclusion guard.  We must
+   also inform the replacement unistd.h to not recursively use
+   <getopt.h>; our definitions will be present soon enough.  */
+#if HAVE_GETOPT_H
+# define _GL_SYSTEM_GETOPT
+# ifndef __GNUC__
+# include <next_getopt.h>
+# else
+# include_next <getopt.h>
+# endif
+# undef _GL_SYSTEM_GETOPT
+#endif
+
+#ifndef _GL_GETOPT_H
+
+#ifndef __need_getopt
+# define _GL_GETOPT_H 1
+#endif
+
+/* Standalone applications should #define __GETOPT_PREFIX to an
+   identifier that prefixes the external functions and variables
+   defined in this header.  When this happens, include the
+   headers that might declare getopt so that they will not cause
+   confusion if included after this file (if the system had <getopt.h>,
+   we have already included it).  Then systematically rename
+   identifiers so that they do not collide with the system functions
+   and variables.  Renaming avoids problems with some compilers and
+   linkers.  */
+#if defined __GETOPT_PREFIX && !defined __need_getopt
+# if !HAVE_GETOPT_H
+#  define __need_system_stdlib_h
+#  include <stdlib.h>
+#  undef __need_system_stdlib_h
+#  include <stdio.h>
+#  include <unistd.h>
+# endif
+# undef __need_getopt
+# undef getopt
+# undef getopt_long
+# undef getopt_long_only
+# undef optarg
+# undef opterr
+# undef optind
+# undef optopt
+# undef option
+# define __GETOPT_CONCAT(x, y) x ## y
+# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y)
+# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y)
+# define getopt __GETOPT_ID (getopt)
+# define getopt_long __GETOPT_ID (getopt_long)
+# define getopt_long_only __GETOPT_ID (getopt_long_only)
+# define optarg __GETOPT_ID (optarg)
+# define opterr __GETOPT_ID (opterr)
+# define optind __GETOPT_ID (optind)
+# define optopt __GETOPT_ID (optopt)
+# define option __GETOPT_ID (option)
+# define _getopt_internal __GETOPT_ID (getopt_internal)
+#endif
+
+/* Standalone applications get correct prototypes for getopt_long and
+   getopt_long_only; they declare "char **argv".  libc uses prototypes
+   with "char *const *argv" that are incorrect because getopt_long and
+   getopt_long_only can permute argv; this is required for backward
+   compatibility (e.g., for LSB 2.0.1).
+
+   This used to be '#if defined __GETOPT_PREFIX && !defined __need_getopt',
+   but it caused redefinition warnings if both unistd.h and getopt.h were
+   included, since unistd.h includes getopt.h having previously defined
+   __need_getopt.
+
+   The only place where __getopt_argv_const is used is in definitions
+   of getopt_long and getopt_long_only below, but these are visible
+   only if __need_getopt is not defined, so it is quite safe to rewrite
+   the conditional as follows:
+*/
+#if !defined __need_getopt
+# if defined __GETOPT_PREFIX
+#  define __getopt_argv_const /* empty */
+# else
+#  define __getopt_argv_const const
+# endif
+#endif
+
+/* If __GNU_LIBRARY__ is not already defined, either we are being used
+   standalone, or this is the first header included in the source file.
+   If we are being used with glibc, we need to include <features.h>, but
+   that does not exist if we are standalone.  So: if __GNU_LIBRARY__ is
+   not defined, include <ctype.h>, which will pull in <features.h> for us
+   if it's from glibc.  (Why ctype.h?  It's guaranteed to exist and it
+   doesn't flood the namespace with stuff the way some other headers do.)  */
+#if !defined __GNU_LIBRARY__
+# include <ctype.h>
+#endif
+
+#ifndef __THROW
+# ifndef __GNUC_PREREQ
+#  define __GNUC_PREREQ(maj, min) (0)
+# endif
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+#  define __THROW       throw ()
+# else
+#  define __THROW
+# endif
+#endif
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+/* A C macro for declaring that specific arguments must not be NULL.
+   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
+   that the values passed as arguments n, ..., m must be non-NULL pointers.
+   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
+#ifndef _GL_ARG_NONNULL
+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
+#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
+# else
+#  define _GL_ARG_NONNULL(params)
+# endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* For communication from 'getopt' to the caller.
+   When 'getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when 'ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to 'getopt'.
+
+   On entry to 'getopt', zero means this is the first call; initialize.
+
+   When 'getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, 'optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+extern int optind;
+
+/* Callers store zero here to inhibit the error message 'getopt' prints
+   for unrecognized options.  */
+
+extern int opterr;
+
+/* Set to an option character which was unrecognized.  */
+
+extern int optopt;
+
+#ifndef __need_getopt
+/* Describe the long-named options requested by the application.
+   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+   of 'struct option' terminated by an element containing a name which is
+   zero.
+
+   The field 'has_arg' is:
+   no_argument          (or 0) if the option does not take an argument,
+   required_argument    (or 1) if the option requires an argument,
+   optional_argument    (or 2) if the option takes an optional argument.
+
+   If the field 'flag' is not NULL, it points to a variable that is set
+   to the value given in the field 'val' when the option is found, but
+   left unchanged if the option is not found.
+
+   To have a long-named option do something other than set an 'int' to
+   a compiled-in constant, such as set a value from 'optarg', set the
+   option's 'flag' field to zero and its 'val' field to a nonzero
+   value (the equivalent single-letter option character, if there is
+   one).  For long options that have a zero 'flag' field, 'getopt'
+   returns the contents of the 'val' field.  */
+
+# if !GNULIB_defined_struct_option
+struct option
+{
+  const char *name;
+  /* has_arg can't be an enum because some compilers complain about
+     type mismatches in all the code that assumes it is an int.  */
+  int has_arg;
+  int *flag;
+  int val;
+};
+#  define GNULIB_defined_struct_option 1
+# endif
+
+/* Names for the values of the 'has_arg' field of 'struct option'.  */
+
+# define no_argument            0
+# define required_argument      1
+# define optional_argument      2
+#endif  /* need getopt */
+
+
+/* Get definitions and prototypes for functions to process the
+   arguments in ARGV (ARGC of them, minus the program name) for
+   options given in OPTS.
+
+   Return the option character from OPTS just read.  Return -1 when
+   there are no more options.  For unrecognized options, or options
+   missing arguments, 'optopt' is set to the option letter, and '?' is
+   returned.
+
+   The OPTS string is a list of characters which are recognized option
+   letters, optionally followed by colons, specifying that that letter
+   takes an argument, to be placed in 'optarg'.
+
+   If a letter in OPTS is followed by two colons, its argument is
+   optional.  This behavior is specific to the GNU 'getopt'.
+
+   The argument '--' causes premature termination of argument
+   scanning, explicitly telling 'getopt' that there are no more
+   options.
+
+   If OPTS begins with '-', then non-option arguments are treated as
+   arguments to the option '\1'.  This behavior is specific to the GNU
+   'getopt'.  If OPTS begins with '+', or POSIXLY_CORRECT is set in
+   the environment, then do not permute arguments.  */
+
+extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
+       __THROW _GL_ARG_NONNULL ((2, 3));
+
+#ifndef __need_getopt
+extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv,
+                        const char *__shortopts,
+                        const struct option *__longopts, int *__longind)
+       __THROW _GL_ARG_NONNULL ((2, 3));
+extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv,
+                             const char *__shortopts,
+                             const struct option *__longopts, int *__longind)
+       __THROW _GL_ARG_NONNULL ((2, 3));
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Make sure we later can get all the definitions and declarations.  */
+#undef __need_getopt
+
+#endif /* _GL_GETOPT_H */
+#endif /* _GL_GETOPT_H */
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7eef2c80382..7723528c886 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,84 @@
+2013-01-12  Michael Albinus  <michael.albinus@gmx.de>
+
+        * autorevert.el (auto-revert-notify-watch-descriptor): Give it
+        `permanent-local' property.
+        (auto-revert-notify-handler): Use `file-equal-p'.
+
+2013-01-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * autorevert.el (auto-revert-notify-handler): Fix filtering of
+        file notification by ACTION. For filtering by file name, compare
+        only the non-directory part of the file name.
+
+2013-01-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * autorevert.el: Use cl-lib instead of cl.
+
+        * vc/vc-bzr.el (vc-bzr--sanitize-header): New function (bug#13307).
+        (vc-bzr-checkin): Use it.
+        * vc/log-edit.el (log-edit-extract-headers): Don't presume FUNCTION
+        will preserve match-data.
+
+2013-01-11  Felix H. Dahlke  <fhd@ubercode.de>
+
+        * progmodes/js.el: Fix multiline declarations's indentation (bug#8576).
+        (js--declaration-keyword-re): New var.
+        (js--multi-line-declaration-indentation): New function.
+        (js--proper-indentation): Use it.
+
+2013-01-11  Aaron S. Hawley  <Aaron.Hawley@vtinfo.com>
+
+        * calc/calc.el (calc-highlight-selections-with-faces)
+         (calc-dispatch):
+        * comint.el (comint-history-isearch-message):
+        * emacs-lisp/edebug.el (edebug-read, edebug-eval-defun):
+        * ffap.el (ffap-string-at-point-region, ffap-next)
+        (ffap-string-at-point, ffap-string-around)
+        (ffap-copy-string-as-kill, ffap-highlight-overlay)
+        (ffap-literally):
+        * font-lock.el (font-lock-keywords-alist)
+        (font-lock-removed-keywords-alist):
+        * help-mode.el (help-xref-symbol-regexp):
+        * info.el (Info-find-emacs-command-nodes):
+        * international/mule.el (add-to-coding-system-list):
+        * isearch.el (isearch-message-function, isearch-fail-pos):
+        * misearch.el (multi-isearch-next-buffer-function):
+        * newcomment.el (comment-box):
+        * printing.el (pr-txt-printer-alist, pr-ps-printer-alist)
+        (pr-setting-database):
+        * progmodes/cc-fonts.el (c-font-lock-keywords-3)
+        (c++-font-lock-keywords-3, objc-font-lock-keywords-3)
+        (java-font-lock-keywords-3, idl-font-lock-keywords-3)
+        (pike-font-lock-keywords-3):
+        * progmodes/compile.el (compile):
+        * progmodes/etags.el (tags-table-files)
+        (tags-table-files-function, tags-included-tables-function):
+        * progmodes/gdb-mi.el (gdb, gdb-setup-windows)
+        (gdb-restore-windows):
+        * ps-print.el (ps-even-or-odd-pages, ps-spool-buffer-with-faces)
+        (ps-n-up-filling-database):
+        * server.el (server-buffer, server-log):
+        * simple.el (newline, delete-backward-char, delete-forward-char)
+        (minibuffer-history-isearch-message, kill-line, track-eol)
+        (temporary-goal-column):
+        * textmodes/flyspell.el (flyspell-mark-duplications-flag)
+        (flyspell-default-deplacement-commands):
+        * textmodes/ispell.el (ispell-accept-output):
+        * textmodes/sgml-mode.el (html-tag-help):
+        * vc/compare-w.el (compare-ignore-whitespace)
+        (compare-ignore-case, compare-windows-dehighlight):
+        * vc/diff.el (diff):
+        * whitespace.el (whitespace-point)
+        (whitespace-font-lock-refontify, whitespace-bob-marker)
+        (whitespace-eob-marker): Fix ambiguous doc string cross-reference(s).
+
 2013-01-11  Michael Albinus  <michael.albinus@gmx.de>
 
         * autorevert.el (top): Require 'cl in order to pacify byte compiler.
         (auto-revert-notify-rm-watch): Ignore errors.
         (auto-revert-notify-add-watch): Ignore errors.  Use '(modify) for
-        inotify, and '(size last-write-time) for w32notify.  Set
-        buffer-local `auto-revert-use-notify' to nil when adding a file
+        inotify, and '(size last-write-time) for w32notify.
+        Set buffer-local `auto-revert-use-notify' to nil when adding a file
         watch fails - this is a fallback to the file modification check.
         (auto-revert-notify-event-p, auto-revert-notify-event-descriptor)
         (auto-revert-notify-event-action)
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index e78cecf0cc2..c9180482cd9 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -97,7 +97,7 @@
 
 ;; Dependencies:
 
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
 (require 'timer)
 
 ;; Custom Group:
@@ -311,7 +311,7 @@ Hash key is a watch descriptor, hash value is the corresponding buffer.")
 
 (defvar auto-revert-notify-watch-descriptor nil
   "The file watch descriptor active for the current buffer.")
-(make-variable-buffer-local 'auto-revert-notify-watch-descriptor)
+(put 'auto-revert-notify-watch-descriptor 'permanent-local t)
 
 (defvar auto-revert-notify-modified-p nil
   "Non-nil when file has been modified on the file system.
@@ -527,17 +527,18 @@ will use an up-to-date value of `auto-revert-interval'"
       (ignore-errors
         ;; Check, that event is meant for us.
         ;; TODO: Filter events which stop watching, like `move' or `removed'.
-        (assert descriptor)
-        (when (featurep 'inotify) (assert (memq 'modify descriptor)))
-        (when (featurep 'w32notify) (assert (eq 'modified descriptor)))
-        (assert (bufferp buffer))
-        (when (stringp file)
-          (assert (string-equal
-                   (directory-file-name file)
-                   (directory-file-name (buffer-file-name buffer)))))
-
-        ;; Mark buffer modified.
+        (cl-assert descriptor)
+        (when (featurep 'inotify) (cl-assert (memq 'modify action)))
+        (when (featurep 'w32notify) (cl-assert (eq 'modified action)))
+        (cl-assert (bufferp buffer))
         (with-current-buffer buffer
+          (when (and (stringp file) (stringp buffer-file-name))
+            ;; w32notify returns the basename of the file without its
+            ;; leading directories; inotify returns its full absolute
+            ;; file name.
+            (cl-assert (file-equal-p file buffer-file-name)))
+
+          ;; Mark buffer modified.
           (setq auto-revert-notify-modified-p t))))))
 
 (defun auto-revert-active-p ()
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 6f51be4b89b..c35e7650254 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -435,9 +435,9 @@ when converting units."
 (defcustom calc-highlight-selections-with-faces
   nil
   "If non-nil, use a separate face to indicate selected sub-formulas.
-If `calc-show-selections' is non-nil, then selected sub-formulas are shown
-by displaying the rest of the formula in `calc-nonselected-face'.
-If `calc-show-selections' is nil, then selected sub-formulas are shown
+If option `calc-show-selections' is non-nil, then selected sub-formulas are
+shown by displaying the rest of the formula in `calc-nonselected-face'.
+If option `calc-show-selections' is nil, then selected sub-formulas are shown
 by displaying the sub-formula in `calc-selected-face'."
   :version "24.1"
   :group 'calc
@@ -1183,7 +1183,7 @@ Used by `calc-user-invocation'.")
 
 ;;;###autoload
 (defun calc-dispatch (&optional arg)
-  "Invoke the GNU Emacs Calculator.  See `calc-dispatch-help' for details."
+  "Invoke the GNU Emacs Calculator.  See \\[calc-dispatch-help] for details."
   (interactive "P")
 ;  (sit-for echo-keystrokes)
   (condition-case err   ; look for other keys bound to calc-dispatch
diff --git a/lisp/comint.el b/lisp/comint.el
index 42ac08a9ecc..21bd732b43c 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1521,7 +1521,7 @@ Intended to be added to `isearch-mode-hook' in `comint-mode'."
 If there are no search errors, this function displays an overlay with
 the Isearch prompt which replaces the original comint prompt.
 Otherwise, it displays the standard Isearch message returned from
-`isearch-message'."
+the function `isearch-message'."
   (if (not (and isearch-success (not isearch-error)))
       ;; Use standard function `isearch-message' when not in comint prompt,
       ;; or search fails, or has an error (like incomplete regexp).
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 4dba081322f..4cbd02a6e0d 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -469,8 +469,8 @@ STREAM or the value of `standard-input' may be:
 
 This version, from Edebug, maybe instruments the expression.  But the
 STREAM must be the current buffer to do so.  Whether it instruments is
-also dependent on the values of `edebug-all-defs' and
-`edebug-all-forms'."
+also dependent on the values of the option `edebug-all-defs' and
+the option `edebug-all-forms'."
   (or stream (setq stream standard-input))
   (if (eq stream (current-buffer))
       (edebug-read-and-maybe-wrap-form)
@@ -492,8 +492,8 @@ similarly.  Reinitialize the face according to `defface' specification.
 
 With a prefix argument, instrument the code for Edebug.
 
-Setting `edebug-all-defs' to a non-nil value reverses the meaning of
-the prefix argument.  Code is then instrumented when this function is
+Setting option `edebug-all-defs' to a non-nil value reverses the meaning
+of the prefix argument.  Code is then instrumented when this function is
 invoked without a prefix argument
 
 If acting on a `defun' for FUNCTION, and the function was instrumented,
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index 7a9eb3e1b28..fb1b995be2b 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -167,6 +167,8 @@ some global variables)."
             (mapconcat 'char-to-string (make-string (1- level) ?|) " ")
             (if (> level 1) " " "")
             level
+            ;; FIXME: Make it so we can click the function name to jump to its
+            ;; definition and/or untrace it.
             (cons function args)
             context)))
 
@@ -275,16 +277,8 @@ To untrace a function, use `untrace-function' or `untrace-all'."
 ;;;###autoload
 (defun trace-function-background (function &optional buffer context)
   "Traces FUNCTION with trace output going quietly to BUFFER.
-When this tracing is enabled, every call to FUNCTION writes
-a Lisp-style trace message (showing the arguments and return value)
-into BUFFER.  This function generates advice to trace FUNCTION
-and activates it together with any other advice there might be.
-The trace output goes to BUFFER quietly, without changing
-the window or buffer configuration.
-
-BUFFER defaults to `trace-buffer'.
-
-To untrace a function, use `untrace-function' or `untrace-all'."
+Like `trace-function-foreground' but without popping up the trace BUFFER or
+changing the window configuration."
   (interactive (trace--read-args "Trace function in background: "))
   (trace-function-internal function buffer t context))
 
diff --git a/lisp/ffap.el b/lisp/ffap.el
index dfb559f3f0d..c5b0784e5a2 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -321,7 +321,7 @@ disable FFAP most of the time."
   "Last value returned by `ffap-next-guess'.")
 
 (defvar ffap-string-at-point-region '(1 1)
-  "List (BEG END), last region returned by `ffap-string-at-point'.")
+  "List (BEG END), last region returned by the function `ffap-string-at-point'.")
 
 (defun ffap-next-guess (&optional back lim)
   "Move point to next file or URL, and return it as a string.
@@ -346,7 +346,7 @@ Optional argument BACK says to search backwards.
 Optional argument WRAP says to try wrapping around if necessary.
 Interactively: use a single prefix to search backwards,
 double prefix to wrap forward, triple to wrap backwards.
-Actual search is done by `ffap-next-guess'."
+Actual search is done by the function `ffap-next-guess'."
   (interactive
    (cdr (assq (prefix-numeric-value current-prefix-arg)
               '((1) (4 t) (16 nil t) (64 t t)))))
@@ -1028,14 +1028,14 @@ If a given RFC isn't in these then `ffap-rfc-path' is offered."
   "Alist of \(MODE CHARS BEG END\), where MODE is a symbol,
 possibly a major-mode name, or one of the symbol
 `file', `url', `machine', and `nocolon'.
-`ffap-string-at-point' uses the data fields as follows:
+Function `ffap-string-at-point' uses the data fields as follows:
 1. find a maximal string of CHARS around point,
 2. strip BEG chars before point from the beginning,
 3. Strip END chars after point from the end.")
 
 (defvar ffap-string-at-point nil
   ;; Added at suggestion of RHOGEE (for ff-paths), 7/24/95.
-  "Last string returned by `ffap-string-at-point'.")
+  "Last string returned by the function `ffap-string-at-point'.")
 
 (defun ffap-string-at-point (&optional mode)
   "Return a string of characters from around point.
@@ -1043,7 +1043,8 @@ MODE (defaults to value of `major-mode') is a symbol used to look up string
 syntax parameters in `ffap-string-at-point-mode-alist'.
 If MODE is not found, we use `file' instead of MODE.
 If the region is active, return a string from the region.
-Sets `ffap-string-at-point' and `ffap-string-at-point-region'."
+Sets the variable `ffap-string-at-point' and the variable
+`ffap-string-at-point-region'."
   (let* ((args
           (cdr
            (or (assq (or mode major-mode) ffap-string-at-point-mode-alist)
@@ -1068,7 +1069,8 @@ Sets `ffap-string-at-point' and `ffap-string-at-point-region'."
 
 (defun ffap-string-around ()
   ;; Sometimes useful to decide how to treat a string.
-  "Return string of two chars around last `ffap-string-at-point'.
+  "Return string of two chars around last result of function
+`ffap-string-at-point'.
 Assumes the buffer has not changed."
   (save-excursion
     (format "%c%c"
@@ -1082,7 +1084,7 @@ Assumes the buffer has not changed."
 
 (defun ffap-copy-string-as-kill (&optional mode)
   ;; Requested by MCOOK.  Useful?
-  "Call `ffap-string-at-point', and copy result to `kill-ring'."
+  "Call function `ffap-string-at-point', and copy result to `kill-ring'."
   (interactive)
   (let ((str (ffap-string-at-point mode)))
     (if (equal "" str)
@@ -1364,7 +1366,7 @@ which may actually result in an URL rather than a filename."
   :version "22.1")
 
 (defvar ffap-highlight-overlay nil
-  "Overlay used by `ffap-highlight'.")
+  "Overlay used by function `ffap-highlight'.")
 
 (defun ffap-highlight (&optional remove)
   "If `ffap-highlight' is set, highlight the guess in this buffer.
@@ -1734,7 +1736,7 @@ Only intended for interactive use."
     (call-interactively 'ffap)))
 
 (defun ffap-literally ()
-  "Like `ffap' and `find-file-literally'.
+  "Like `ffap' and command `find-file-literally'.
 Only intended for interactive use."
   (interactive)
   (let ((ffap-file-finder 'find-file-literally))
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 7a2577eabbb..f714eaab233 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -469,7 +469,7 @@ optimized.")
   "Alist of additional `font-lock-keywords' elements for major modes.
 
 Each element has the form (MODE KEYWORDS . HOW).
-`font-lock-set-defaults' adds the elements in the list KEYWORDS to
+Function `font-lock-set-defaults' adds the elements in the list KEYWORDS to
 `font-lock-keywords' when Font Lock is turned on in major mode MODE.
 
 If HOW is nil, KEYWORDS are added at the beginning of
@@ -484,7 +484,7 @@ This is normally set via `font-lock-add-keywords' and
 (defvar font-lock-removed-keywords-alist nil
   "Alist of `font-lock-keywords' elements to be removed for major modes.
 
-Each element has the form (MODE . KEYWORDS).  `font-lock-set-defaults'
+Each element has the form (MODE . KEYWORDS).  Function `font-lock-set-defaults'
 removes the elements in the list KEYWORDS from `font-lock-keywords'
 when Font Lock is turned on in major mode MODE.
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0cea790792f..44dbf060e49 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2013-01-11  Aaron S. Hawley  <Aaron.Hawley@vtinfo.com>
+
+        * gnus-start.el (gnus-check-new-newsgroups): Fix ambiguous doc string
+         cross-reference(s).
+
+        * gnus-sum.el (gnus-summary-newsgroup-prefix): Fix ambiguous doc string
+         cross-reference(s).
+
 2013-01-11  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * gnus-art.el (gnus-mime-display-security): Use point-min-marker
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 42cc284a0ad..aa8b6bf2703 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -110,7 +110,7 @@ ask the servers (primary, secondary, and archive servers) to list new
 groups since the last time it checked:
   1. This variable is `ask-server'.
   2. This variable is a list of select methods (see below).
-  3. `gnus-read-active-file' is nil or `some'.
+  3. Option `gnus-read-active-file' is nil or `some'.
   4. A prefix argument is given to `gnus-find-new-newsgroups' interactively.
 
 Thus, if this variable is `ask-server' or a list of select methods or
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 49b7e5930f6..14597f031e1 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1167,7 +1167,7 @@ using `gnus-ignored-from-addresses'."
 
 (defcustom gnus-summary-newsgroup-prefix "=> "
   "*String prefixed to the Newsgroup field in the summary
-line when using `gnus-ignored-from-addresses'."
+line when using the option `gnus-ignored-from-addresses'."
   :version "22.1"
   :group 'gnus-summary
   :type 'string)
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 662f431d3c3..b5aca1a4445 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -322,7 +322,7 @@ Commands:
 
 (defconst help-xref-symbol-regexp
   (purecopy (concat "\\(\\<\\(\\(variable\\|option\\)\\|"  ; Link to var
-                    "\\(function\\|command\\)\\|"          ; Link to function
+                    "\\(function\\|command\\|call\\)\\|"   ; Link to function
                     "\\(face\\)\\|"                        ; Link to face
                     "\\(symbol\\|program\\|property\\)\\|" ; Don't link
                     "\\(source \\(?:code \\)?\\(?:of\\|for\\)\\)\\)"
diff --git a/lisp/info.el b/lisp/info.el
index 48ad00c9f28..e230ed0f82c 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -4313,7 +4313,7 @@ If the element is just a file name, the file name also serves as the prefix.")
 The `info-file' property of COMMAND says which Info manual to search.
 If COMMAND has no property, the variable `Info-file-list-for-emacs'
 defines heuristics for which Info manual to try.
-The locations are of the format used in `Info-history', i.e.
+The locations are of the format used in the variable `Info-history', i.e.
 \(FILENAME NODENAME BUFFERPOS), where BUFFERPOS is the line number
 in the first element of the returned list (which is treated specially in
 `Info-goto-emacs-command-node'), and 0 for the rest elements of a list."
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 6fa589a9622..995df2fb9a7 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -891,7 +891,7 @@ or one is an alias of the other."
                  (and (vectorp eol-type-1) (vectorp eol-type-2)))))))
 
 (defun add-to-coding-system-list (coding-system)
-  "Add CODING-SYSTEM to `coding-system-list' while keeping it sorted."
+  "Add CODING-SYSTEM to variable `coding-system-list' while keeping it sorted."
   (if (or (null coding-system-list)
           (coding-system-lessp coding-system (car coding-system-list)))
       (setq coding-system-list (cons coding-system coding-system-list))
diff --git a/lisp/isearch.el b/lisp/isearch.el
index b13881b208b..e16e3840d0d 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -176,7 +176,7 @@ is non-nil if the user quits the search.")
 
 (defvar isearch-message-function nil
   "Function to call to display the search prompt.
-If nil, use `isearch-message'.")
+If nil, use function `isearch-message'.")
 
 (defvar isearch-wrap-function nil
   "Function to call to wrap the search when search is failed.
@@ -1101,7 +1101,7 @@ nonincremental search instead via `isearch-edit-string'."
 
 (defun isearch-fail-pos (&optional msg)
   "Return position of first mismatch in search string, or nil if none.
-If MSG is non-nil, use `isearch-message', otherwise `isearch-string'."
+If MSG is non-nil, use variable `isearch-message', otherwise `isearch-string'."
   (let ((cmds isearch-cmds)
         (curr-msg (if msg isearch-message isearch-string))
         succ-msg)
diff --git a/lisp/misearch.el b/lisp/misearch.el
index 2584f8df77b..0c4cd4ea323 100644
--- a/lisp/misearch.el
+++ b/lisp/misearch.el
@@ -73,7 +73,7 @@ end of the search space).
 The first argument of this function is the current buffer where the
 search is currently searching.  It defines the base buffer relative to
 which this function should find the next buffer.  When the isearch
-direction is backward (when `isearch-forward' is nil), this function
+direction is backward (when option `isearch-forward' is nil), this function
 should return the previous buffer to search.
 
 If the second argument of this function WRAP is non-nil, then it
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index d55feaa3c1a..bcb5f721ae8 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -1206,7 +1206,8 @@ changed with `comment-style'."
 (defun comment-box (beg end &optional arg)
   "Comment out the BEG .. END region, putting it inside a box.
 The numeric prefix ARG specifies how many characters to add to begin- and
-end- comment markers additionally to what `comment-add' already specifies."
+end- comment markers additionally to what variable `comment-add' already
+specifies."
   (interactive "*r\np")
   (comment-normalize-vars)
   (let ((comment-style (if (cadr (assoc comment-style comment-styles))
diff --git a/lisp/printing.el b/lisp/printing.el
index a8eed066a15..bf50aa8f679 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -1800,7 +1800,7 @@ The alist element has the form:
 Where:
 
 SYMBOL          It's a symbol to identify a text printer.  It's for
-                `pr-txt-name' variable setting and for menu selection.
+                setting option `pr-txt-name' and for menu selection.
                 Examples:
                         'prt_06a
                         'my_printer
@@ -1951,7 +1951,7 @@ The alist element has the form:
 Where:
 
 SYMBOL          It's a symbol to identify a PostScript printer.  It's for
-                `pr-ps-name' variable setting and for menu selection.
+                setting option `pr-ps-name' and for menu selection.
                 Examples:
                         'prt_06a
                         'my_printer
@@ -2935,9 +2935,9 @@ INHERITS	Specify the inheritance for SYMBOL group.  It's a symbol name
 
                 The example above has two setting groups: no-duplex and
                 no-duplex-and-landscape.  When setting no-duplex is activated
-                through `inherits-from:' (see `pr-ps-utility', `pr-mode-alist'
-                and `pr-ps-printer-alist'), the variables pr-file-duplex and
-                pr-file-tumble are both set to nil.
+                through `inherits-from:' (see option `pr-ps-utility',
+                `pr-mode-alist' and `pr-ps-printer-alist'), the variables
+                pr-file-duplex and pr-file-tumble are both set to nil.
 
                 Now when setting no-duplex-and-landscape is activated through
                 `inherits-from:', the variable pr-file-landscape is set to nil
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 376edcdc76b..f6c47f5bb4d 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -2049,7 +2049,7 @@ styles specified by `c-doc-comment-style'.")
 
 (defconst c-font-lock-keywords-3 (c-lang-const c-matchers-3 c)
   "Accurate normal font locking for C mode.
-Like `c-font-lock-keywords-2' but detects declarations in a more
+Like the variable `c-font-lock-keywords-2' but detects declarations in a more
 accurate way that works in most cases for arbitrary types without the
 need for `c-font-lock-extra-types'.")
 
@@ -2207,7 +2207,7 @@ styles specified by `c-doc-comment-style'.")
 
 (defconst c++-font-lock-keywords-3 (c-lang-const c-matchers-3 c++)
   "Accurate normal font locking for C++ mode.
-Like `c++-font-lock-keywords-2' but detects declarations in a more
+Like the variable `c++-font-lock-keywords-2' but detects declarations in a more
 accurate way that works in most cases for arbitrary types without the
 need for `c++-font-lock-extra-types'.")
 
@@ -2313,7 +2313,7 @@ comment styles specified by `c-doc-comment-style'.")
 
 (defconst objc-font-lock-keywords-3 (c-lang-const c-matchers-3 objc)
   "Accurate normal font locking for Objective-C mode.
-Like `objc-font-lock-keywords-2' but detects declarations in a more
+Like the variable `objc-font-lock-keywords-2' but detects declarations in a more
 accurate way that works in most cases for arbitrary types without the
 need for `objc-font-lock-extra-types'.")
 
@@ -2356,7 +2356,7 @@ comment styles specified by `c-doc-comment-style'.")
 
 (defconst java-font-lock-keywords-3 (c-lang-const c-matchers-3 java)
   "Accurate normal font locking for Java mode.
-Like `java-font-lock-keywords-2' but detects declarations in a more
+Like variable `java-font-lock-keywords-2' but detects declarations in a more
 accurate way that works in most cases for arbitrary types without the
 need for `java-font-lock-extra-types'.")
 
@@ -2389,7 +2389,7 @@ styles specified by `c-doc-comment-style'.")
 
 (defconst idl-font-lock-keywords-3 (c-lang-const c-matchers-3 idl)
   "Accurate normal font locking for CORBA IDL mode.
-Like `idl-font-lock-keywords-2' but detects declarations in a more
+Like the variable `idl-font-lock-keywords-2' but detects declarations in a more
 accurate way that works in most cases for arbitrary types without the
 need for `idl-font-lock-extra-types'.")
 
@@ -2422,7 +2422,7 @@ comment styles specified by `c-doc-comment-style'.")
 
 (defconst pike-font-lock-keywords-3 (c-lang-const c-matchers-3 pike)
   "Accurate normal font locking for Pike mode.
-Like `pike-font-lock-keywords-2' but detects declarations in a more
+Like the variable `pike-font-lock-keywords-2' but detects declarations in a more
 accurate way that works in most cases for arbitrary types without the
 need for `pike-font-lock-extra-types'.")
 
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index f6c43e2c392..4e1cd4a24e3 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1427,8 +1427,9 @@ and move to the source code that caused it.
 If optional second arg COMINT is t the buffer will be in Comint mode with
 `compilation-shell-minor-mode'.
 
-Interactively, prompts for the command if `compilation-read-command' is
-non-nil; otherwise uses `compile-command'.  With prefix arg, always prompts.
+Interactively, prompts for the command if the variable
+`compilation-read-command' is non-nil; otherwise uses`compile-command'.
+With prefix arg, always prompts.
 Additionally, with universal prefix arg, compilation buffer will be in
 comint mode, i.e. interactive.
 
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 81dc31792c3..92f9447652e 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -199,7 +199,8 @@ Pop back to the last location with \\[negative-argument] \\[find-tag].")
 
 (defvar tags-table-files nil
   "List of file names covered by current tags table.
-nil means it has not yet been computed; use `tags-table-files' to do so.")
+nil means it has not yet been computed;
+use function `tags-table-files' to do so.")
 
 (defvar tags-completion-table nil
   "Obarray of tag names defined in current tags table.")
@@ -224,7 +225,7 @@ of the format-parsing tags function variables if successful.")
 One optional argument, a boolean specifying to return complete path (nil) or
 relative path (non-nil).")
 (defvar tags-table-files-function nil
-  "Function to do the work of `tags-table-files' (which see).")
+  "Function to do the work of function `tags-table-files' (which see).")
 (defvar tags-completion-table-function nil
   "Function to build the `tags-completion-table'.")
 (defvar snarf-tag-function nil
@@ -251,7 +252,7 @@ One argument, the tag info returned by `snarf-tag-function'.")
 (defvar tags-apropos-function nil
   "Function to do the work of `tags-apropos' (which see).")
 (defvar tags-included-tables-function nil
-  "Function to do the work of `tags-included-tables' (which see).")
+  "Function to do the work of function `tags-included-tables' (which see).")
 (defvar verify-tags-table-function nil
   "Function to return t if current buffer contains valid tags file.")
 
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index fc3d336cf99..90c7cfc5008 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -607,12 +607,12 @@ executable followed by command-line options.  The command-line
 options should include \"-i=mi\" to use gdb's MI text interface.
 Note that the old \"--annotate\" option is no longer supported.
 
-If `gdb-many-windows' is nil (the default value) then gdb just
+If option `gdb-many-windows' is nil (the default value) then gdb just
 pops up the GUD buffer unless `gdb-show-main' is t.  In this case
 it starts with two windows: one displaying the GUD buffer and the
 other with the source file with the main routine of the inferior.
 
-If `gdb-many-windows' is t, regardless of the value of
+If option `gdb-many-windows' is t, regardless of the value of
 `gdb-show-main', the layout below will appear.  Keybindings are
 shown in some of the buffers.
 
@@ -4069,7 +4069,7 @@ window is dedicated."
   (set-window-dedicated-p window t))
 
 (defun gdb-setup-windows ()
-  "Layout the window pattern for `gdb-many-windows'."
+  "Layout the window pattern for option `gdb-many-windows'."
   (gdb-get-buffer-create 'gdb-locals-buffer)
   (gdb-get-buffer-create 'gdb-stack-buffer)
   (gdb-get-buffer-create 'gdb-breakpoints-buffer)
@@ -4120,7 +4120,7 @@ of the debugged program.  Non-nil means display the layout shown for
 
 (defun gdb-restore-windows ()
   "Restore the basic arrangement of windows used by gdb.
-This arrangement depends on the value of `gdb-many-windows'."
+This arrangement depends on the value of option `gdb-many-windows'."
   (interactive)
   (switch-to-buffer gud-comint-buffer) ;Select the right window and frame.
   (delete-other-windows)
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 683b3927ae3..96e6039a8c2 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -1680,12 +1680,15 @@ This performs fontification according to `js--class-styles'."
      "each"))
   "Regexp matching keywords optionally followed by an opening brace.")
 
+(defconst js--declaration-keyword-re
+  (regexp-opt '("var" "let" "const") 'words)
+  "Regular expression matching variable declaration keywords.")
+
 (defconst js--indent-operator-re
   (concat "[-+*/%<>=&^|?:.]\\([^-+*/]\\|$\\)\\|"
           (js--regexp-opt-symbol '("in" "instanceof")))
   "Regexp matching operators that affect indentation of continued expressions.")
 
-
 (defun js--looking-at-operator-p ()
   "Return non-nil if point is on a JavaScript operator, other than a comma."
   (save-match-data
@@ -1764,6 +1767,37 @@ nil."
          (list (cons 'c js-comment-lineup-func))))
     (c-get-syntactic-indentation (list (cons symbol anchor)))))
 
+(defun js--multi-line-declaration-indentation ()
+  "Helper function for `js--proper-indentation'.
+Return the proper indentation of the current line if it belongs to a declaration
+statement spanning multiple lines; otherwise, return nil."
+  (let (at-opening-bracket)
+    (save-excursion
+      (back-to-indentation)
+      (when (not (looking-at js--declaration-keyword-re))
+        (when (looking-at js--indent-operator-re)
+          (goto-char (match-end 0)))
+        (while (and (not at-opening-bracket)
+                    (not (bobp))
+                    (let ((pos (point)))
+                      (save-excursion
+                        (js--backward-syntactic-ws)
+                        (or (eq (char-before) ?,)
+                            (and (not (eq (char-before) ?\;))
+                                 (prog2
+                                     (skip-chars-backward "[[:punct:]]")
+                                     (looking-at js--indent-operator-re)
+                                   (js--backward-syntactic-ws))
+                                 (not (eq (char-before) ?\;)))
+                            (and (>= pos (point-at-bol))
+                                 (<= pos (point-at-eol)))))))
+          (condition-case err
+              (backward-sexp)
+            (scan-error (setq at-opening-bracket t))))
+        (when (looking-at js--declaration-keyword-re)
+          (goto-char (match-end 0))
+          (1+ (current-column)))))))
+
 (defun js--proper-indentation (parse-status)
   "Return the proper indentation for the current line."
   (save-excursion
@@ -1772,6 +1806,7 @@ nil."
            (js--get-c-offset 'c (nth 8 parse-status)))
           ((nth 8 parse-status) 0) ; inside string
           ((js--ctrl-statement-indentation))
+          ((js--multi-line-declaration-indentation))
           ((eq (char-after) ?#) 0)
           ((save-excursion (js--beginning-of-macro)) 4)
           ((nth 1 parse-status)
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 99f22df4107..f7c03c2de85 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1959,13 +1959,13 @@ Valid values are:
 
 Any other value is treated as nil.
 
-If you set `ps-selected-pages' (see it for documentation), first the pages are
-filtered by `ps-selected-pages' and then by `ps-even-or-odd-pages'.  For
-example, if we have:
+If you set option `ps-selected-pages', first the pages are
+filtered by option `ps-selected-pages' and then by `ps-even-or-odd-pages'.
+For example, if we have:
 
    (setq ps-selected-pages '(1 4 (6 . 10) (12 . 16) 20))
 
-Combining with `ps-even-or-odd-pages' and `ps-n-up-printing', we have:
+Combining with `ps-even-or-odd-pages' and option `ps-n-up-printing', we have:
 
 `ps-n-up-printing' = 1:
    `ps-even-or-odd-pages'       PAGES PRINTED
@@ -3566,9 +3566,9 @@ Use the command `ps-despool' to send the spooled images to the printer."
 ;;;###autoload
 (defun ps-spool-buffer-with-faces ()
   "Generate and spool a PostScript image of the buffer.
-Like `ps-spool-buffer', but includes font, color, and underline information in
-the generated image.  This command works only if you are using a window system,
-so it has a way to determine color values.
+Like the command `ps-spool-buffer', but includes font, color, and underline
+information in the generated image.  This command works only if you are using
+a window system, so it has a way to determine color values.
 
 Use the command `ps-despool' to send the spooled images to the printer."
   (interactive)
@@ -5369,7 +5369,7 @@ Each element has the following form:
    (KIND XCOL YCOL XLIN YLIN REPEAT END XSTART YSTART)
 
 Where:
-KIND is a valid value of `ps-n-up-filling'.
+KIND is a valid value of the variable `ps-n-up-filling'.
 XCOL YCOL are the relative position for the next column.
 XLIN YLIN are the relative position for the beginning of next line.
 REPEAT is the number of repetitions for external loop.
diff --git a/lisp/server.el b/lisp/server.el
index 03d4bfc33df..64224d2a310 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -361,7 +361,7 @@ Updates `server-clients'."
 
 (defconst server-buffer " *server*"
   "Buffer used internally by Emacs's server.
-One use is to log the I/O for debugging purposes (see `server-log'),
+One use is to log the I/O for debugging purposes (see option `server-log'),
 the other is to provide a current buffer in which the process filter can
 safely let-bind buffer-local variables like `default-directory'.")
 
@@ -369,7 +369,7 @@ safely let-bind buffer-local variables like `default-directory'.")
   "If non-nil, log the server's inputs and outputs in the `server-buffer'.")
 
 (defun server-log (string &optional client)
-  "If `server-log' is non-nil, log STRING to `server-buffer'.
+  "If option `server-log' is non-nil, log STRING to `server-buffer'.
 If CLIENT is non-nil, add a description of it to the logged message."
   (when server-log
     (with-current-buffer (get-buffer-create server-buffer)
diff --git a/lisp/simple.el b/lisp/simple.el
index dcd6d792acb..847c07a5c26 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -401,7 +401,7 @@ Other major modes are defined by comparison with this one."
 
 (defun newline (&optional arg)
   "Insert a newline, and move to left margin of the new line if it's blank.
-If `use-hard-newlines' is non-nil, the newline is marked with the
+If option `use-hard-newlines' is non-nil, the newline is marked with the
 text-property `hard'.
 With ARG, insert that many newlines.
 Call `auto-fill-function' if the current column number is greater
@@ -837,7 +837,7 @@ instead of deleted."
   "Delete the previous N characters (following if N is negative).
 If Transient Mark mode is enabled, the mark is active, and N is 1,
 delete the text in the region and deactivate the mark instead.
-To disable this, set `delete-active-region' to nil.
+To disable this, set option `delete-active-region' to nil.
 
 Optional second arg KILLFLAG, if non-nil, means to kill (save in
 kill ring) instead of delete.  Interactively, N is the prefix
@@ -873,7 +873,7 @@ the end of the line."
   "Delete the following N characters (previous if N is negative).
 If Transient Mark mode is enabled, the mark is active, and N is 1,
 delete the text in the region and deactivate the mark instead.
-To disable this, set `delete-active-region' to nil.
+To disable this, set variable `delete-active-region' to nil.
 
 Optional second arg KILLFLAG non-nil means to kill (save in kill
 ring) instead of delete.  Interactively, N is the prefix arg, and
@@ -1778,7 +1778,7 @@ Intended to be added to `minibuffer-setup-hook'."
 If there are no search errors, this function displays an overlay with
 the isearch prompt which replaces the original minibuffer prompt.
 Otherwise, it displays the standard isearch message returned from
-`isearch-message'."
+the function `isearch-message'."
   (if (not (and (minibufferp) isearch-success (not isearch-error)))
       ;; Use standard function `isearch-message' when not in the minibuffer,
       ;; or search fails, or has an error (like incomplete regexp).
@@ -3805,7 +3805,7 @@ If `show-trailing-whitespace' is non-nil, this command will just
 kill the rest of the current line, even if there are only
 nonblanks there.
 
-If `kill-whole-line' is non-nil, then this command kills the whole line
+If option `kill-whole-line' is non-nil, then this command kills the whole line
 including its terminating newline, when used at the beginning of a line
 with no argument.  As a consequence, you can always kill a whole line
 by typing \\[move-beginning-of-line] \\[kill-line].
@@ -4575,13 +4575,13 @@ to use and more reliable (no dependence on goal column, etc.)."
   "Non-nil means vertical motion starting at end of line keeps to ends of lines.
 This means moving to the end of each line moved onto.
 The beginning of a blank line does not count as the end of a line.
-This has no effect when `line-move-visual' is non-nil."
+This has no effect when the variable `line-move-visual' is non-nil."
   :type 'boolean
   :group 'editing-basics)
 
 (defcustom goal-column nil
   "Semipermanent goal column for vertical motion, as set by \\[set-goal-column], or nil.
-A non-nil setting overrides `line-move-visual', which see."
+A non-nil setting overrides the variable `line-move-visual', which see."
   :type '(choice integer
                  (const :tag "None" nil))
   :group 'editing-basics)
@@ -4592,7 +4592,7 @@ A non-nil setting overrides `line-move-visual', which see."
 It is the column where point was at the start of the current run
 of vertical motion commands.
 
-When moving by visual lines via `line-move-visual', it is a cons
+When moving by visual lines via the function `line-move-visual', it is a cons
 cell (COL . HSCROLL), where COL is the x-position, in pixels,
 divided by the default column width, and HSCROLL is the number of
 columns by which window is scrolled from left margin.
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index fe2f808c594..6ab3e3d3f16 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -63,7 +63,7 @@ Non-nil means use highlight, nil means use minibuffer messages."
   "Non-nil means Flyspell reports a repeated word as an error.
 See `flyspell-mark-duplications-exceptions' to add exceptions to this rule.
 Detection of repeated words is not implemented in
-\"large\" regions; see `flyspell-large-region'."
+\"large\" regions; see variable `flyspell-large-region'."
   :group 'flyspell
   :type 'boolean)
 
@@ -145,9 +145,10 @@ whose length is specified by `flyspell-delay'."
 (defcustom flyspell-default-deplacement-commands
   '(next-line previous-line
     handle-switch-frame handle-select-window
-    scroll-up scroll-down)
+    scroll-up
+    scroll-down)
   "The standard list of deplacement commands for Flyspell.
-See `flyspell-deplacement-commands'."
+See variable `flyspell-deplacement-commands'."
   :group 'flyspell
   :version "21.1"
   :type '(repeat (symbol)))
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 067ffdaa1f0..52e97b8248d 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1594,8 +1594,8 @@ You can set this variable in hooks in your init file -- eg:
 
 (defun ispell-accept-output (&optional timeout-secs timeout-msecs)
   "Wait for output from ispell process, or TIMEOUT-SECS and TIMEOUT-MSECS.
-If asynchronous subprocesses are not supported, call `ispell-filter' and
-pass it the output of the last ispell invocation."
+If asynchronous subprocesses are not supported, call function `ispell-filter'
+and pass it the output of the last ispell invocation."
   (if ispell-async-processp
       (accept-process-output ispell-process timeout-secs timeout-msecs)
     (if (null ispell-process)
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index a7e44402a26..b7288772034 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1926,7 +1926,7 @@ This takes effect when first loading the library.")
     ("ul" . "Unordered list")
     ("var" . "Math variable face")
     ("wbr" . "Enable <br> within <nobr>"))
-  "Value of `sgml-tag-help' for HTML mode.")
+  "Value of variable `sgml-tag-help' for HTML mode.")
 
 (defvar outline-regexp)
 (defvar outline-heading-end-regexp)
diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el
index 2423d322460..fa451ccbe20 100644
--- a/lisp/vc/compare-w.el
+++ b/lisp/vc/compare-w.el
@@ -53,13 +53,13 @@ whitespace is considered to match, and is skipped."
   :group 'compare-windows)
 
 (defcustom compare-ignore-whitespace nil
-  "Non-nil means `compare-windows' ignores whitespace."
+  "Non-nil means command `compare-windows' ignores whitespace."
   :type 'boolean
   :group 'compare-windows
   :version "22.1")
 
 (defcustom compare-ignore-case nil
-  "Non-nil means `compare-windows' ignores case differences."
+  "Non-nil means command `compare-windows' ignores case differences."
   :type 'boolean
   :group 'compare-windows)
 
@@ -379,7 +379,7 @@ on third call it again advances points to the next difference and so on."
         (delete-overlay compare-windows-overlay2)))))
 
 (defun compare-windows-dehighlight ()
-  "Remove highlighting created by `compare-windows-highlight'."
+  "Remove highlighting created by function `compare-windows-highlight'."
   (interactive)
   (remove-hook 'pre-command-hook 'compare-windows-dehighlight)
   (mapc 'delete-overlay compare-windows-overlays1)
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index d0e496d2d21..8b4ff792969 100644
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -86,7 +86,7 @@ exists.  If NO-ASYNC is non-nil, call diff synchronously.
 
 When called interactively with a prefix argument, prompt
 interactively for diff switches.  Otherwise, the switches
-specified in `diff-switches' are passed to the diff command."
+specified in the variable `diff-switches' are passed to the diff command."
   (interactive
    (let* ((newf (if (and buffer-file-name (file-exists-p buffer-file-name))
                     (read-file-name
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index f8e753772e4..dfc7eee81a6 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -953,13 +953,14 @@ line of MSG."
         (while (re-search-forward (concat "^" (car header)
                                           ":" log-edit-header-contents-regexp)
                                   nil t)
-          (if (eq t (cdr header))
-              (setq summary (match-string 1))
-            (if (functionp (cdr header))
-                (setq res (nconc res (funcall (cdr header) (match-string 1))))
-              (push (match-string 1) res)
-              (push (or (cdr header) (car header)) res)))
-          (replace-match "" t t)))
+          (let ((txt (match-string 1)))
+            (replace-match "" t t)
+            (if (eq t (cdr header))
+                (setq summary txt)
+              (if (functionp (cdr header))
+                  (setq res (nconc res (funcall (cdr header) txt)))
+                (push txt res)
+                (push (or (cdr header) (car header)) res))))))
       ;; Remove header separator if the header is empty.
       (widen)
       (goto-char (point-min))
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index f436d300089..0968c83ae5f 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -620,15 +620,24 @@ or a superior directory.")
 
 (declare-function log-edit-extract-headers "log-edit" (headers string))
 
+(defun vc-bzr--sanitize-header (arg)
+  ;; Newlines in --fixes (and probably other fields as well) trigger a nasty
+  ;; Bazaar bug; see https://bugs.launchpad.net/bzr/+bug/1094180.
+  (lambda (str) (list arg
+                 (replace-regexp-in-string "\\`[ \t]+\\|[ \t]+\\'"
+                                           "" (replace-regexp-in-string
+                                               "\n[ \t]?" " " str)))))
+
 (defun vc-bzr-checkin (files rev comment)
   "Check FILES in to bzr with log message COMMENT.
 REV non-nil gets an error."
   (if rev (error "Can't check in a specific revision with bzr"))
-  (apply 'vc-bzr-command "commit" nil 0
-         files (cons "-m" (log-edit-extract-headers '(("Author" . "--author")
-                                                      ("Date" . "--commit-time")
-                                                      ("Fixes" . "--fixes"))
-                                                    comment))))
+  (apply 'vc-bzr-command "commit" nil 0 files
+         (cons "-m" (log-edit-extract-headers
+                     `(("Author" . ,(vc-bzr--sanitize-header "--author"))
+                       ("Date" . ,(vc-bzr--sanitize-header "--commit-time"))
+                       ("Fixes" . ,(vc-bzr--sanitize-header "--fixes")))
+                     comment))))
 
 (defun vc-bzr-find-revision (file rev buffer)
   "Fetch revision REV of file FILE and put it into BUFFER."
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index e2a726f4264..ed7edbc5a68 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -1271,19 +1271,19 @@ SYMBOL	is a valid symbol associated with CHAR.
 
 (defvar whitespace-point (point)
   "Used to save locally current point value.
-Used by `whitespace-trailing-regexp' function (which see).")
+Used by function `whitespace-trailing-regexp' (which see).")
 
 (defvar whitespace-font-lock-refontify nil
   "Used to save locally the font-lock refontify state.
-Used by `whitespace-post-command-hook' function (which see).")
+Used by function `whitespace-post-command-hook' (which see).")
 
 (defvar whitespace-bob-marker nil
   "Used to save locally the bob marker value.
-Used by `whitespace-post-command-hook' function (which see).")
+Used by function `whitespace-post-command-hook' (which see).")
 
 (defvar whitespace-eob-marker nil
   "Used to save locally the eob marker value.
-Used by `whitespace-post-command-hook' function (which see).")
+Used by function `whitespace-post-command-hook' (which see).")
 
 (defvar whitespace-buffer-changed nil
   "Used to indicate locally if buffer changed.
diff --git a/src/ChangeLog b/src/ChangeLog
index 13a1f1a3858..13b53e922ed 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,26 @@
+2013-01-12  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * indent.c (Fvertical_motion): Remove now-incorrect GCPROs
+        for old_charpos and old_bytepos.
+
+2013-01-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix bug with set-time-zone-rule and LOCALTIME_CACHE (Bug#13415).
+        * editfns.c (set_time_zone_rule) [LOCALTIME_CACHE]:
+        Clear tzvalbuf_in_environ if this workaround is in effect.
+        Problem and fix reported by Kazuhiro Ito.
+
+2013-01-11  Aaron S. Hawley  <Aaron.Hawley@vtinfo.com>
+
+        * insdel.c (Fcombine_after_change_execute, syms_of_insdel): Fix
+         ambiguous doc string cross-reference(s).
+
+        * keyboard.c (Fcommand_execute, syms_of_keyboard): Fix ambiguous
+         doc string cross-reference(s).
+
+        * window.c (Fwindow_point, syms_of_window): Fix ambiguous doc
+         string cross-reference(s).
+
 2013-01-11  Dmitry Antipov  <dmantipov@yandex.ru>
 
         Avoid unnecessary byte position calculation for the gap movement.
diff --git a/src/alloc.c b/src/alloc.c
index 8dc3f11e80a..b147aa20723 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4446,11 +4446,6 @@ mark_memory (void *start, void *end)
       }
 }
 
-/* setjmp will work with GCC unless NON_SAVING_SETJMP is defined in
-   the GCC system configuration.  In gcc 3.2, the only systems for
-   which this is so are i386-sco5 non-ELF, i386-sysv3 (maybe included
-   by others?) and ns32k-pc532-min.  */
-
 #if !defined GC_SAVE_REGISTERS_ON_STACK && !defined GC_SETJMP_WORKS
 
 static bool setjmp_tested_p;
diff --git a/src/editfns.c b/src/editfns.c
index 64269bab8df..bf19acb42a8 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2188,6 +2188,7 @@ set_time_zone_rule (const char *tzstring)
       xputenv (set_time_zone_rule_tz[1]);
     }
   tzset ();
+  tzvalbuf_in_environ = 0;
 #endif
 
   if (!tzstring)
diff --git a/src/indent.c b/src/indent.c
index 4a30c00dd27..45b6afbd395 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1970,7 +1970,7 @@ whether or not it is currently displayed in some window.  */)
   struct window *w;
   Lisp_Object old_buffer;
   EMACS_INT old_charpos IF_LINT (= 0), old_bytepos IF_LINT (= 0);
-  struct gcpro gcpro1, gcpro2, gcpro3;
+  struct gcpro gcpro1;
   Lisp_Object lcols = Qnil;
   double cols IF_LINT (= 0);
   void *itdata = NULL;
@@ -1987,7 +1987,7 @@ whether or not it is currently displayed in some window.  */)
   w = decode_live_window (window);
 
   old_buffer = Qnil;
-  GCPRO3 (old_buffer, old_charpos, old_bytepos);
+  GCPRO1 (old_buffer);
   if (XBUFFER (w->buffer) != current_buffer)
     {
       /* Set the window's buffer temporarily to the current buffer.  */
diff --git a/src/insdel.c b/src/insdel.c
index c2a3cd42821..303247816ca 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -2084,7 +2084,7 @@ Fcombine_after_change_execute_1 (Lisp_Object val)
 
 DEFUN ("combine-after-change-execute", Fcombine_after_change_execute,
        Scombine_after_change_execute, 0, 0, 0,
-       doc: /* This function is for use internally in `combine-after-change-calls'.  */)
+       doc: /* This function is for use internally in the function `combine-after-change-calls'.  */)
   (void)
 {
   ptrdiff_t count = SPECPDL_INDEX ();
@@ -2176,7 +2176,7 @@ syms_of_insdel (void)
   combine_after_change_buffer = Qnil;
 
   DEFVAR_LISP ("combine-after-change-calls", Vcombine_after_change_calls,
-               doc: /* Used internally by the `combine-after-change-calls' macro.  */);
+               doc: /* Used internally by the function `combine-after-change-calls' macro.  */);
   Vcombine_after_change_calls = Qnil;
 
   DEFVAR_BOOL ("inhibit-modification-hooks", inhibit_modification_hooks,
diff --git a/src/keyboard.c b/src/keyboard.c
index b74084f63e6..baa69a089b3 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10189,7 +10189,7 @@ DEFUN ("command-execute", Fcommand_execute, Scommand_execute, 1, 4, 0,
        doc: /* Execute CMD as an editor command.
 CMD must be a symbol that satisfies the `commandp' predicate.
 Optional second arg RECORD-FLAG non-nil
-means unconditionally put this command in `command-history'.
+means unconditionally put this command in the variable `command-history'.
 Otherwise, that is done only if an arg is read using the minibuffer.
 The argument KEYS specifies the value to use instead of (this-command-keys)
 when reading the arguments; if it is nil, (this-command-keys) is used.
@@ -12078,8 +12078,8 @@ This takes effect only when Transient Mark mode is enabled.  */);
                Vsaved_region_selection,
                doc: /* Contents of active region prior to buffer modification.
 If `select-active-regions' is non-nil, Emacs sets this to the
-text in the region before modifying the buffer.  The next
-`deactivate-mark' call uses this to set the window selection.  */);
+text in the region before modifying the buffer.  The next call to
+the function `deactivate-mark' uses this to set the window selection.  */);
   Vsaved_region_selection = Qnil;
 
   DEFVAR_LISP ("selection-inhibit-update-commands",
diff --git a/src/lisp.h b/src/lisp.h
index 16f9c89e3cd..d4d34ac19ba 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2222,8 +2222,12 @@ struct gcpro
    2    Mark the stack, and check that everything GCPRO'd is
         marked.
    3    Mark using GCPRO's, mark stack last, and count how many
-        dead objects are kept alive.  */
+        dead objects are kept alive.
 
+   Formerly, method 0 was used.  Currently, method 1 is used unless
+   otherwise specified by hand when building, e.g.,
+   "make CPPFLAGS='-DGC_MARK_STACK=GC_USE_GCPROS_AS_BEFORE'".
+   Methods 2 and 3 are present mainly to debug the transition from 0 to 1.  */
 
 #define GC_USE_GCPROS_AS_BEFORE         0
 #define GC_MAKE_GCPROS_NOOPS            1
diff --git a/src/window.c b/src/window.c
index eafd6ef9e40..d38f4c10671 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1437,7 +1437,7 @@ window were selected.
 
 Note that, when WINDOW is selected, the value returned is the same as
 that returned by `point' for WINDOW's buffer.  It would be more strictly
-correct to return the `top-level' value of `point', outside of any
+correct to return the top-level value of `point', outside of any
 `save-excursion' forms.  But that is hard to define.  */)
   (Lisp_Object window)
 {
@@ -6797,7 +6797,8 @@ same combination.
 
 Other values are reserved for future use.
 
-This variable takes no effect if `window-combination-limit' is non-nil.  */);
+This variable takes no effect if the variable `window-combination-limit' is
+non-nil.  */);
   Vwindow_combination_resize = Qnil;
 
   DEFVAR_LISP ("window-combination-limit", Vwindow_combination_limit,