[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117661: Fix minor issues with functions that dum
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-24 r117661: Fix minor issues with functions that dump glyph matrices. |
Date: |
Mon, 03 Nov 2014 17:15:48 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117661
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-11-03 19:14:50 +0200
message:
Fix minor issues with functions that dump glyph matrices.
src/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.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/xdisp.c xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-11-03 07:15:11 +0000
+++ b/src/ChangeLog 2014-11-03 17:14:50 +0000
@@ -1,3 +1,9 @@
+2014-11-03 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
* nsfns.m (ns_set_doc_edited): Check for FRAME_NS (Bug#18925).
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2014-10-30 19:15:38 +0000
+++ b/src/xdisp.c 2014-11-03 17:14:50 +0000
@@ -18755,7 +18755,10 @@
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);
@@ -18773,11 +18776,16 @@
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;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117661: Fix minor issues with functions that dump glyph matrices.,
Eli Zaretskii <=