merge trunk

7 files changed, 158 insertions, 75 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1040b93fe70..fef02d8cbb5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,50 @@
+2012-08-30  Glenn Morris  <rgm@gnu.org>
+
+        * lread.c (init_lread): For out-of-tree builds, only add the
+        source directory's site-lisp dir to the load-path if it exists,
+        consistent with in-tree builds.  (Bug#12302)
+
+2012-08-28  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsmenu.m (initWithContentRect:styleMask:backing:defer:): Initialize
+        button_values to NULL. Call setStykeMask so dialogs get a close button.
+        (windowShouldClose:): Set window_closed.
+        (dealloc): New member, free button_values.
+        (process_dialog:): Make member function. Remove window argument,
+        replace window with self. Count buttons and allocate and store values
+        in button_values.
+        (addButton:value:row:): value is int with the name tag.  Call setTag
+        with tag. Remove return self, declare return value as void.
+        (addString:row:): Remove return self, declare return value as void.
+        (addSplit): Remove return self, declare return value as void.
+        (clicked:): Remove return self, declare return value as void.
+        Set dialog_return to button_values[seltag]. Code formatting change.
+        (initFromContents:isQuestion:): Adjust call to process_dialog.
+        Code formatting change.
+        (timeout_handler:): Set timer_fired to YES.
+        (runDialogAt:): Set timer_fired to NO.
+        Handle click on close button as quit.
+
+        * nsterm.h (EmacsDialogPanel): Make timer_fired BOOL.
+        Add window_closed and button_values.  Add void as return value for
+        add(Button|String|Split).  addButton takes int instead of Lisp_Object.
+        Add process_dialog as new member.
+
+2012-08-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * ralloc.c (free_bloc): Don't dereference a 'heap' structure if it
+        is not one of the heaps we manage.  (Bug#12242)
+
+2012-08-28  Glenn Morris  <rgm@gnu.org>
+
+        * eval.c (Fcalled_interactively_p): Doc fix.  (Bug#11747)
+
+2012-08-28  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (Fset_window_configuration): Remove handling of
+        auto-buffer-name window parameter.  Install revision of reverted
+        fix.
+
 2012-08-28  Dmitry Antipov  <dmantipov@yandex.ru>
 
         Do not allow to set major mode for a dead buffer.
diff --git a/src/eval.c b/src/eval.c
index df44c87dc25..c56be10c5a0 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -544,11 +544,10 @@ thinking of using it for any other purpose, it is quite likely that
 you're making a mistake.  Think: what do you want to do when the
 command is called from a keyboard macro?
 
-This function is meant for implementing advice and other
-function-modifying features.  Instead of using this, it is sometimes
-cleaner to give your function an extra optional argument whose
-`interactive' spec specifies non-nil unconditionally (\"p\" is a good
-way to do this), or via (not (or executing-kbd-macro noninteractive)).  */)
+Instead of using this function, it is sometimes cleaner to give your
+function an extra optional argument whose `interactive' spec specifies
+non-nil unconditionally (\"p\" is a good way to do this), or via
+\(not (or executing-kbd-macro noninteractive)).  */)
   (Lisp_Object kind)
 {
   return ((INTERACTIVE || !EQ (kind, intern ("interactive")))
diff --git a/src/lread.c b/src/lread.c
index b0413c98765..aa3e0cfc5b8 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4253,9 +4253,12 @@ init_lread (void)
                         {
                           tem = Fexpand_file_name (build_string ("site-lisp"),
                                                    Vsource_directory);
-
-                          if (NILP (Fmember (tem, Vload_path)))
-                            Vload_path = Fcons (tem, Vload_path);
+                          tem1 = Ffile_exists_p (tem);
+                          if (!NILP (tem1))
+                            {
+                              if (NILP (Fmember (tem, Vload_path)))
+                                Vload_path = Fcons (tem, Vload_path);
+                            }
                         }
                     }
                 } /* Vinstallation_directory != Vsource_directory */
diff --git a/src/nsmenu.m b/src/nsmenu.m
index ab285f26df2..9e290486213 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1498,6 +1498,7 @@ ns_popup_dialog (Lisp_Object position, Lisp_Object contents, Lisp_Object header)
   NSImage *img;
 
   dialog_return   = Qundefined;
+  button_values   = NULL;
   area.origin.x   = 3*SPACER;
   area.origin.y   = 2*SPACER;
   area.size.width = ICONSIZE;
@@ -1579,44 +1580,65 @@ ns_popup_dialog (Lisp_Object position, Lisp_Object contents, Lisp_Object header)
   [self setOneShot: YES];
   [self setReleasedWhenClosed: YES];
   [self setHidesOnDeactivate: YES];
+  [self setStyleMask:
+          NSTitledWindowMask|NSClosableWindowMask|NSUtilityWindowMask];
+
   return self;
 }
 
 
 - (BOOL)windowShouldClose: (id)sender
 {
+  window_closed = YES;
   [NSApp stop:self];
   return NO;
 }
 
+- (void)dealloc
+{
+  xfree (button_values);
+  [super dealloc];
+}
 
-void process_dialog (id window, Lisp_Object list)
+- (void)process_dialog: (Lisp_Object) list
 {
-  Lisp_Object item;
+  Lisp_Object item, lst = list;
   int row = 0;
+  int buttons = 0, btnnr = 0;
+
+  for (; XTYPE (lst) == Lisp_Cons; lst = XCDR (lst))
+    {
+      item = XCAR (list);
+      if (XTYPE (item) == Lisp_Cons)
+        ++buttons;
+    }
+
+  if (buttons > 0)
+    button_values = (Lisp_Object *) xmalloc (buttons * sizeof (*button_values));
 
   for (; XTYPE (list) == Lisp_Cons; list = XCDR (list))
     {
       item = XCAR (list);
       if (XTYPE (item) == Lisp_String)
         {
-          [window addString: SSDATA (item) row: row++];
+          [self addString: SSDATA (item) row: row++];
         }
       else if (XTYPE (item) == Lisp_Cons)
         {
-          [window addButton: SSDATA (XCAR (item))
-                      value: XCDR (item) row: row++];
+          button_values[btnnr] = XCDR (item);
+          [self addButton: SSDATA (XCAR (item)) value: btnnr row: row++];
+          ++btnnr;
         }
       else if (NILP (item))
         {
-          [window addSplit];
+          [self addSplit];
           row = 0;
         }
     }
 }
 
 
-- addButton: (char *)str value: (Lisp_Object)val row: (int)row
+- (void)addButton: (char *)str value: (int)tag row: (int)row
 {
   id cell;
 
@@ -1629,15 +1651,13 @@ void process_dialog (id window, Lisp_Object list)
   [cell setTarget: self];
   [cell setAction: @selector (clicked: )];
   [cell setTitle: [NSString stringWithUTF8String: str]];
-  [cell setTag: XHASH (val)];   // FIXME: BIG UGLY HACK!!
+  [cell setTag: tag];
   [cell setBordered: YES];
   [cell setEnabled: YES];
-
-  return self;
 }
 
 
-- addString: (char *)str row: (int)row
+- (void)addString: (char *)str row: (int)row
 {
   id cell;
 
@@ -1650,36 +1670,28 @@ void process_dialog (id window, Lisp_Object list)
   [cell setTitle: [NSString stringWithUTF8String: str]];
   [cell setBordered: YES];
   [cell setEnabled: NO];
-
-  return self;
 }
 
 
-- addSplit
+- (void)addSplit
 {
   [matrix addColumn];
   cols++;
-  return self;
 }
 
 
-- clicked: sender
+- (void)clicked: sender
 {
   NSArray *sellist = nil;
   EMACS_INT seltag;
 
   sellist = [sender selectedCells];
-  if ([sellist count]<1)
-    return self;
+  if ([sellist count] < 1)
+    return;
 
   seltag = [[sellist objectAtIndex: 0] tag];
-  if (seltag != XHASH (Qundefined)) // FIXME: BIG UGLY HACK!!
-    {
-      dialog_return = seltag;
-      [NSApp stop:self];
-    }
-
-  return self;
+  dialog_return = button_values[seltag];
+  [NSApp stop:self];
 }
 
 
@@ -1691,7 +1703,7 @@ void process_dialog (id window, Lisp_Object list)
   if (XTYPE (contents) == Lisp_Cons)
     {
       head = Fcar (contents);
-      process_dialog (self, Fcdr (contents));
+      [self process_dialog: Fcdr (contents)];
     }
   else
     head = contents;
@@ -1711,7 +1723,7 @@ void process_dialog (id window, Lisp_Object list)
     if (cols == 1 && rows > 1)  /* Never told where to split */
       {
         [matrix addColumn];
-        for (i = 0; i<rows/2; i++)
+        for (i = 0; i < rows/2; i++)
           {
             [matrix putCell: [matrix cellAtRow: (rows+1)/2 column: 0]
                       atRow: i column: 1];
@@ -1771,7 +1783,7 @@ void process_dialog (id window, Lisp_Object list)
                                data1: 0
                                data2: 0];
 
-  timer_fired = 1;
+  timer_fired = YES;
   /* We use sto because stopModal/abortModal out of the main loop does not
      seem to work in 10.6.  But as we use stop we must send a real event so
      the stop is seen and acted upon.  */
@@ -1799,9 +1811,9 @@ void process_dialog (id window, Lisp_Object list)
           [[NSRunLoop currentRunLoop] addTimer: tmo
                                        forMode: NSModalPanelRunLoopMode];
         }
-      timer_fired = 0;
+      timer_fired = NO;
       dialog_return = Qundefined;
-      ret = [NSApp runModalForWindow: self];
+      [NSApp runModalForWindow: self];
       ret = dialog_return;
       if (! timer_fired)
         {
@@ -1810,11 +1822,11 @@ void process_dialog (id window, Lisp_Object list)
         }
     }
 
-  {                             /* FIXME: BIG UGLY HACK!!! */
-      Lisp_Object tmp;
-      *(EMACS_INT*)(&tmp) = ret;
-      return tmp;
-  }
+  if (EQ (ret, Qundefined) && window_closed)
+    /* Make close button pressed equivalent to C-g.  */
+    Fsignal (Qquit, Qnil);
+
+  return ret;
 }
 
 @end
diff --git a/src/nsterm.h b/src/nsterm.h
index 72b8d13cc47..f9149d97571 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -195,13 +195,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    NSTextField *title;
    NSMatrix *matrix;
    int rows, cols;
-   int timer_fired;
+   BOOL timer_fired, window_closed;
    Lisp_Object dialog_return;
+   Lisp_Object *button_values;
    }
 - initFromContents: (Lisp_Object)menu isQuestion: (BOOL)isQ;
-- addButton: (char *)str value: (Lisp_Object)val row: (int)row;
-- addString: (char *)str row: (int)row;
-- addSplit;
+- (void)process_dialog: (Lisp_Object)list;
+- (void)addButton: (char *)str value: (int)tag row: (int)row;
+- (void)addString: (char *)str row: (int)row;
+- (void)addSplit;
 - (Lisp_Object)runDialogAt: (NSPoint)p;
 - (void)timeout_handler: (NSTimer *)timedEntry;
 @end
diff --git a/src/ralloc.c b/src/ralloc.c
index c40258693f5..3877e21d4f6 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -670,6 +670,7 @@ static void
 free_bloc (bloc_ptr bloc)
 {
   heap_ptr heap = bloc->heap;
+  heap_ptr h;
 
   if (r_alloc_freeze_level)
     {
@@ -699,20 +700,38 @@ free_bloc (bloc_ptr bloc)
       bloc->prev->next = bloc->next;
     }
 
-  /* Update the records of which blocs are in HEAP.  */
-  if (heap->first_bloc == bloc)
+  /* Sometimes, 'heap' obtained from bloc->heap above is not really a
+     'heap' structure.  It can even be beyond the current break point,
+     which will cause crashes when we dereference it below (see
+     bug#12242).  Evidently, the reason is bloc allocations done while
+     use_relocatable_buffers was non-positive, because additional
+     memory we get then is not recorded in the heaps we manage.  If
+     bloc->heap records such a "heap", we cannot (and don't need to)
+     update its records.  So we validate the 'heap' value by making
+     sure it is one of the heaps we manage via the heaps linked list,
+     and don't touch a 'heap' that isn't found there.  This avoids
+     accessing memory we know nothing about.  */
+  for (h = first_heap; h != NIL_HEAP; h = h->next)
+    if (heap == h)
+      break;
+
+  if (h)
     {
-      if (bloc->next != 0 && bloc->next->heap == heap)
-        heap->first_bloc = bloc->next;
-      else
-        heap->first_bloc = heap->last_bloc = NIL_BLOC;
-    }
-  if (heap->last_bloc == bloc)
-    {
-      if (bloc->prev != 0 && bloc->prev->heap == heap)
-        heap->last_bloc = bloc->prev;
-      else
-        heap->first_bloc = heap->last_bloc = NIL_BLOC;
+      /* Update the records of which blocs are in HEAP.  */
+      if (heap->first_bloc == bloc)
+        {
+          if (bloc->next != 0 && bloc->next->heap == heap)
+            heap->first_bloc = bloc->next;
+          else
+            heap->first_bloc = heap->last_bloc = NIL_BLOC;
+        }
+      if (heap->last_bloc == bloc)
+        {
+          if (bloc->prev != 0 && bloc->prev->heap == heap)
+            heap->last_bloc = bloc->prev;
+          else
+            heap->first_bloc = heap->last_bloc = NIL_BLOC;
+        }
     }
 
   relinquish ();
diff --git a/src/window.c b/src/window.c
index ba1ec2544f8..38124cb13a9 100644
--- a/src/window.c
+++ b/src/window.c
@@ -62,7 +62,7 @@ static Lisp_Object Qreplace_buffer_in_windows, Qget_mru_window;
 static Lisp_Object Qwindow_resize_root_window, Qwindow_resize_root_window_vertically;
 static Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command;
 static Lisp_Object Qsafe, Qabove, Qbelow;
-static Lisp_Object Qauto_buffer_name, Qclone_of;
+static Lisp_Object Qclone_of;
 
 static int displayed_window_lines (struct window *);
 static int count_windows (struct window *);
@@ -5540,7 +5540,6 @@ the return value is nil.  Otherwise the value is t.  */)
   struct Lisp_Vector *saved_windows;
   Lisp_Object new_current_buffer;
   Lisp_Object frame;
-  Lisp_Object auto_buffer_name;
   FRAME_PTR f;
   ptrdiff_t old_point = -1;
 
@@ -5616,6 +5615,21 @@ the return value is nil.  Otherwise the value is t.  */)
       int previous_frame_menu_bar_lines = FRAME_MENU_BAR_LINES (f);
       int previous_frame_tool_bar_lines = FRAME_TOOL_BAR_LINES (f);
 
+      /* Don't do this within the main loop below: This may call Lisp
+         code and is thus potentially unsafe while input is blocked.  */
+      for (k = 0; k < saved_windows->header.size; k++)
+        {
+          p = SAVED_WINDOW_N (saved_windows, k);
+          window = p->window;
+          w = XWINDOW (window);
+          if (!NILP (w->buffer)
+              && !EQ (w->buffer, p->buffer)
+              && !NILP (BVAR (XBUFFER (p->buffer), name)))
+            /* If a window we restore gets another buffer, record the
+               window's old buffer.  */
+            call1 (Qrecord_window_buffer, window);
+        }
+
       /* The mouse highlighting code could get screwed up
          if it runs during this.  */
       BLOCK_INPUT;
@@ -5794,18 +5808,6 @@ the return value is nil.  Otherwise the value is t.  */)
                     BUF_PT_BYTE (XBUFFER (w->buffer)));
                w->start_at_line_beg = 1;
              }
-           else if (STRINGP (auto_buffer_name =
-                             Fwindow_parameter (window, Qauto_buffer_name))
-                    && SCHARS (auto_buffer_name) != 0
-                    && (wset_buffer (w, Fget_buffer_create (auto_buffer_name)),
-                        !NILP (w->buffer)))
-            {
-              set_marker_restricted (w->start,
-                                     make_number (0), w->buffer);
-              set_marker_restricted (w->pointm,
-                                     make_number (0), w->buffer);
-              w->start_at_line_beg = 1;
-            }
           else
             /* Window has no live buffer, get one.  */
             {
@@ -6711,7 +6713,6 @@ syms_of_window (void)
   DEFSYM (Qtemp_buffer_show_hook, "temp-buffer-show-hook");
   DEFSYM (Qabove, "above");
   DEFSYM (Qbelow, "below");
-  DEFSYM (Qauto_buffer_name, "auto-buffer-name");
   DEFSYM (Qclone_of, "clone-of");
 
   staticpro (&Vwindow_list);