diff options
author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2015-11-13 12:48:09 +0900 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2015-11-13 21:57:06 +0200 |
commit | 071b2e16a0ca8baaf4fa7d52aaa84a652243475e (patch) | |
tree | d5ea774464f79701990b7f56026eeb1f7e870f8e | |
parent | 9463abf4cc7571cf125bf1a637abe1a34241e83d (diff) | |
download | emacs-071b2e16a0ca8baaf4fa7d52aaa84a652243475e.tar.gz |
Remove intern calls and XXX comments from Fx_export_frames
* src/xfns.c (Fx_export_frames): Use Qpdf, Qpng, Qpostscript, and
Qsvg instead of intern calls. Use "postscript" instead of "ps"
for consistency with image types. Remove XXX comments.
(syms_of_xfns) <Qpdf>: DEFSYM it.
Backport.
-rw-r--r-- | src/xfns.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/xfns.c b/src/xfns.c index 9071b89acd9..9d90b7ba35f 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -6559,11 +6559,12 @@ present and mapped to the usual X keysyms. */) #ifdef USE_CAIRO DEFUN ("x-export-frames", Fx_export_frames, Sx_export_frames, 0, 2, 0, - doc: /* XXX Experimental. Return image data of FRAMES in TYPE format. + doc: /* Return image data of FRAMES in TYPE format. FRAMES should be nil (the selected frame), a frame, or a list of frames (each of which corresponds to one page). Optional arg TYPE -should be either `pdf' (default), `png', `ps', or `svg'. Supported -types are determined by the compile-time configuration of cairo. */) +should be either `pdf' (default), `png', `postscript', or `svg'. +Supported types are determined by the compile-time configuration of +cairo. */) (Lisp_Object frames, Lisp_Object type) { Lisp_Object result, rest, tmp; @@ -6590,12 +6591,12 @@ types are determined by the compile-time configuration of cairo. */) frames = Fnreverse (tmp); #ifdef CAIRO_HAS_PDF_SURFACE - if (NILP (type) || EQ (type, intern ("pdf"))) /* XXX: Qpdf */ + if (NILP (type) || EQ (type, Qpdf)) surface_type = CAIRO_SURFACE_TYPE_PDF; else #endif #ifdef CAIRO_HAS_PNG_FUNCTIONS - if (EQ (type, intern ("png"))) + if (EQ (type, Qpng)) { if (!NILP (XCDR (frames))) error ("PNG export cannot handle multiple frames."); @@ -6604,12 +6605,12 @@ types are determined by the compile-time configuration of cairo. */) else #endif #ifdef CAIRO_HAS_PS_SURFACE - if (EQ (type, intern ("ps"))) + if (EQ (type, Qpostscript)) surface_type = CAIRO_SURFACE_TYPE_PS; else #endif #ifdef CAIRO_HAS_SVG_SURFACE - if (EQ (type, intern ("svg"))) + if (EQ (type, Qsvg)) { /* For now, we stick to SVG 1.1. */ if (!NILP (XCDR (frames))) @@ -6763,6 +6764,8 @@ syms_of_xfns (void) DEFSYM (Qmono, "mono"); #ifdef USE_CAIRO + DEFSYM (Qpdf, "pdf"); + DEFSYM (Qorientation, "orientation"); DEFSYM (Qtop_margin, "top-margin"); DEFSYM (Qbottom_margin, "bottom-margin"); |