4 files changed, 29 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b51f3c15a66..d44de652dde 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2014-11-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * fileio.c (Finsert_file_contents): Invalidate buffer caches also
+        when the inserted text does not need decoding.  (Bug#18982)
+
+2014-11-10  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.h (EmacsScroller): judge returns bool.
+
+        * nsterm.m (ns_set_vertical_scroll_bar): Release bar.
+        (ns_judge_scroll_bars): Only set removed if judge returns true.
+        (judge): Returns bool == condemned.  Remove self from window.
+        (setPosition:portion:whole:): Remove raise SIGIO (Bug#18757).
+
 2014-11-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * keyboard.c (command_loop_1): Record this-command in recent-keys.
diff --git a/src/fileio.c b/src/fileio.c
index cdbd0be28ad..7d7b0b3148f 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4329,8 +4329,11 @@ by calling `format-decode', which see.  */)
       coding_system = CODING_ID_NAME (coding.id);
     }
   else if (inserted > 0)
-    adjust_after_insert (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted,
-                         inserted);
+    {
+      invalidate_buffer_caches (current_buffer, PT, PT + inserted);
+      adjust_after_insert (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted,
+                           inserted);
+    }
 
   /* Call after-change hooks for the inserted text, aside from the case
      of normal visiting (not with REPLACE), which is done in a new buffer
diff --git a/src/nsterm.h b/src/nsterm.h
index 7997072dcac..b33e6b2ee08 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -396,7 +396,7 @@ typedef float EmacsCGFloat;
 - repeatScroll: (NSTimer *)sender;
 - condemn;
 - reprieve;
-- judge;
+- (bool)judge;
 @end
 
 
diff --git a/src/nsterm.m b/src/nsterm.m
index 577b2a27724..64951da308f 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3803,6 +3803,7 @@ ns_set_vertical_scroll_bar (struct window *window,
           bar = XNS_SCROLL_BAR (window->vertical_scroll_bar);
           [bar removeFromSuperview];
           wset_vertical_scroll_bar (window, Qnil);
+          [bar release];
         }
       ns_clear_frame_area (f, left, top, width, height);
       unblock_input ();
@@ -3996,8 +3997,8 @@ ns_judge_scroll_bars (struct frame *f)
     {
       view = [subviews objectAtIndex: i];
       if (![view isKindOfClass: [EmacsScroller class]]) continue;
-      [view judge];
-      removed = YES;
+      if ([view judge])
+        removed = YES;
     }
 
   if (removed)
@@ -7227,9 +7228,10 @@ if (cols > 0 && rows > 0)
 }
 
 
-- judge
+-(bool)judge
 {
   NSTRACE (judge);
+  bool ret = condemned;
   if (condemned)
     {
       EmacsView *view;
@@ -7238,11 +7240,14 @@ if (cols > 0 && rows > 0)
       view = (EmacsView *)FRAME_NS_VIEW (frame);
       if (view != nil)
         view->scrollbarsNeedingUpdate++;
+      if (window)
+        wset_vertical_scroll_bar (window, Qnil);
+      window = 0;
       [self removeFromSuperview];
       [self release];
       unblock_input ();
     }
-  return self;
+  return ret;
 }
 
 
@@ -7297,11 +7302,6 @@ if (cols > 0 && rows > 0)
 #endif
     }
 
-  /* Events may come here even if the event loop is not running.
-     If we don't enter the event loop, the scroll bar will not update.
-     So send SIGIO to ourselves.  */
-  if (apploopnr == 0) raise (SIGIO);
-
   return self;
 }