procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix minor issues with functions that dump glyph matrices.

Browse source 
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.
This commit is contained in:
Eli Zaretskii 2014-11-03 19:14:50 +02:00
parent 6c5a32ddbc
commit 29a13e2afe
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
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).

14
src/xdisp.c
View file

@ -18755,7 +18755,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);
@ -18773,11 +18776,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;
}