Merge from emacs-24; up to 2014-08-07T11:49:36Z!rrt@sc3d.org

4 files changed, 29 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2f719681afb..6b62a60f7b0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2014-11-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (Fdump_glyph_matrix, Fdump_frame_glyph_matrix): Doc fix.
+        (Fdump_frame_glyph_matrix): Don't segfault if invoked on a GUI
+        frame; instead, print an error message.
+
+2014-11-03  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsfns.m (ns_set_doc_edited): Check for FRAME_NS (Bug#18925).
+
 2014-11-02  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsimage.m (allocInitFromFile:): Initialize bmRep.
diff --git a/src/nsfns.m b/src/nsfns.m
index ce859e8333d..1537adbc56d 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -639,8 +639,12 @@ ns_set_doc_edited (void)
     {
       BOOL edited = NO;
       struct frame *f = XFRAME (frame);
-      struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f));
-      NSView *view = FRAME_NS_VIEW (f);
+      struct window *w;
+      NSView *view;
+
+      if (! FRAME_NS_P (f)) continue;
+      w = XWINDOW (FRAME_SELECTED_WINDOW (f));
+      view = FRAME_NS_VIEW (f);
       if (!MINI_WINDOW_P (w))
         edited = ! NILP (Fbuffer_modified_p (w->contents)) &&
           ! NILP (Fbuffer_file_name (w->contents));
diff --git a/src/window.c b/src/window.c
index 0b0f2140a58..2c9292d5b02 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4930,8 +4930,8 @@ window_scroll_pixel_based (Lisp_Object window, int n, bool whole, int noerror)
       /* The function move_iterator_vertically may move over more than
          the specified y-distance.  If it->w is small, e.g. a
          mini-buffer window, we may end up in front of the window's
-         display area.  This is the case when Start displaying at the
-         start of the line containing PT in this case.  */
+         display area.  Start displaying at the start of the line
+         containing PT in this case.  */
       if (it.current_y <= 0)
         {
           init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID);
diff --git a/src/xdisp.c b/src/xdisp.c
index 228b6cb586d..2cdbade3062 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18803,7 +18803,10 @@ DEFUN ("dump-glyph-matrix", Fdump_glyph_matrix,
        doc: /* Dump the current matrix of the selected window to stderr.
 Shows contents of glyph row structures.  With non-nil
 parameter GLYPHS, dump glyphs as well.  If GLYPHS is 1 show
-glyphs in short form, otherwise show glyphs in long form.  */)
+glyphs in short form, otherwise show glyphs in long form.
+
+Interactively, no argument means show glyphs in short form;
+with numeric argument, its value is passed as the GLYPHS flag.  */)
   (Lisp_Object glyphs)
 {
   struct window *w = XWINDOW (selected_window);
@@ -18821,11 +18824,16 @@ glyphs in short form, otherwise show glyphs in long form.  */)
 
 
 DEFUN ("dump-frame-glyph-matrix", Fdump_frame_glyph_matrix,
-       Sdump_frame_glyph_matrix, 0, 0, "", doc: /* */)
+       Sdump_frame_glyph_matrix, 0, 0, "", doc: /* Dump the current glyph matrix of the selected frame to stderr.
+Only text-mode frames have frame glyph matrices.  */)
   (void)
 {
   struct frame *f = XFRAME (selected_frame);
-  dump_glyph_matrix (f->current_matrix, 1);
+
+  if (f->current_matrix)
+    dump_glyph_matrix (f->current_matrix, 1);
+  else
+    fprintf (stderr, "*** This frame doesn't have a frame glyph matrix ***\n");
   return Qnil;
 }