auto upstream

7 files changed, 40 insertions, 10 deletions

diff --git a/lisp/files.el b/lisp/files.el
index ce032534f04..238be36cae0 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4183,7 +4183,7 @@ Checks for files in `temporary-file-directory',
 `small-temporary-file-directory', and /tmp."
   (let ((temporary-file-directory temporary-file-directory)
         caseless)
-    ;; On MS-Windows, file-truename will convert short 8+3 alises to
+    ;; On MS-Windows, file-truename will convert short 8+3 aliases to
     ;; their long file-name equivalents, so compare-strings does TRT.
     (if (memq system-type '(ms-dos windows-nt))
         (setq temporary-file-directory (file-truename temporary-file-directory)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f15ed7e707c..cc7897accb6 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-14  Andrew Cohen  <cohen@bu.edu>
+
+        * nnir.el (nnir-request-set-mark): Make sure we are in the right
+        group.
+
 2013-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-msg.el (gnus-msg-mail): Make it avoid using posting styles
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 5d244a019cb..2fa6b600ac1 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -837,6 +837,7 @@ skips all prompting."
     (gnus-request-update-mark artgroup artnumber mark)))
 
 (deffoo nnir-request-set-mark (group actions &optional server)
+  (nnir-possibly-change-group group server)
   (let (mlist)
     (dolist (action actions)
       (destructuring-bind (range action marks) action
@@ -853,7 +854,7 @@ skips all prompting."
 
 
 (deffoo nnir-request-update-info (group info &optional server)
-  (nnir-possibly-change-group group)
+  (nnir-possibly-change-group group server)
   ;; clear out all existing marks.
   (gnus-info-set-marks info nil)
   (gnus-info-set-read info nil)
diff --git a/src/ChangeLog b/src/ChangeLog
index af2d38d2e87..5c0e26760c7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2013-04-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * keyboard.c (timer_start_idle): Remove no-longer-used local.
+
+2013-04-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * buffer.c (syms_of_buffer) <left-margin-width, right-margin-width>
+        <left-fringe-width, right-fringe-width, fringes-outside-margins>:
+        Mention in the doc string that setting these variables takes
+        effect only after a call to set-window-buffer.  (Bug#14200)
+
 2013-04-13  Eli Zaretskii  <eliz@gnu.org>
 
         * indent.c (Fvertical_motion): Don't consider display strings on
diff --git a/src/buffer.c b/src/buffer.c
index 8728b418812..3810d3db079 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5883,29 +5883,44 @@ See also the functions `display-table-slot' and `set-display-table-slot'.  */);
   DEFVAR_PER_BUFFER ("left-margin-width", &BVAR (current_buffer, left_margin_cols),
                      Qintegerp,
                      doc: /* Width of left marginal area for display of a buffer.
-A value of nil means no marginal area.  */);
+A value of nil means no marginal area.
+
+Setting this variable does not take effect until a new buffer is displayed
+in a window.  To make the change take effect, call `set-window-buffer'.  */);
 
   DEFVAR_PER_BUFFER ("right-margin-width", &BVAR (current_buffer, right_margin_cols),
                      Qintegerp,
                      doc: /* Width of right marginal area for display of a buffer.
-A value of nil means no marginal area.  */);
+A value of nil means no marginal area.
+
+Setting this variable does not take effect until a new buffer is displayed
+in a window.  To make the change take effect, call `set-window-buffer'.  */);
 
   DEFVAR_PER_BUFFER ("left-fringe-width", &BVAR (current_buffer, left_fringe_width),
                      Qintegerp,
                      doc: /* Width of this buffer's left fringe (in pixels).
 A value of 0 means no left fringe is shown in this buffer's window.
-A value of nil means to use the left fringe width from the window's frame.  */);
+A value of nil means to use the left fringe width from the window's frame.
+
+Setting this variable does not take effect until a new buffer is displayed
+in a window.  To make the change take effect, call `set-window-buffer'.  */);
 
   DEFVAR_PER_BUFFER ("right-fringe-width", &BVAR (current_buffer, right_fringe_width),
                      Qintegerp,
                      doc: /* Width of this buffer's right fringe (in pixels).
 A value of 0 means no right fringe is shown in this buffer's window.
-A value of nil means to use the right fringe width from the window's frame.  */);
+A value of nil means to use the right fringe width from the window's frame.
+
+Setting this variable does not take effect until a new buffer is displayed
+in a window.  To make the change take effect, call `set-window-buffer'.  */);
 
   DEFVAR_PER_BUFFER ("fringes-outside-margins", &BVAR (current_buffer, fringes_outside_margins),
                      Qnil,
                      doc: /* Non-nil means to display fringes outside display margins.
-A value of nil means to display fringes between margins and buffer text.  */);
+A value of nil means to display fringes between margins and buffer text.
+
+Setting this variable does not take effect until a new buffer is displayed
+in a window.  To make the change take effect, call `set-window-buffer'.  */);
 
   DEFVAR_PER_BUFFER ("scroll-bar-width", &BVAR (current_buffer, scroll_bar_width),
                      Qintegerp,
diff --git a/src/keyboard.c b/src/keyboard.c
index dbd3717c428..845c62726ea 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4198,8 +4198,6 @@ swallow_events (bool do_display)
 static void
 timer_start_idle (void)
 {
-  Lisp_Object timers;
-
   /* If we are already in the idle state, do nothing.  */
   if (EMACS_TIME_VALID_P (timer_idleness_start_time))
     return;
diff --git a/test/automated/add-log-tests.el b/test/automated/add-log-tests.el
index 28029e18b99..f6e803cd317 100644
--- a/test/automated/add-log-tests.el
+++ b/test/automated/add-log-tests.el
@@ -73,7 +73,7 @@ function foo()
 
 (add-log-current-defun-deftest
  sh-var
- "Test sh-current-defun-name can find variabe definition."
+ "Test sh-current-defun-name can find variable definition."
  sh-mode "
 PATH=a:/ab:/usr/abc
 DIR=/pr><oc"