auto upstream

8 files changed, 39 insertions, 15 deletions

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,