[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 071b2e1 01/14: Remove intern calls and XXX commen
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 071b2e1 01/14: Remove intern calls and XXX comments from Fx_export_frames |
Date: |
Fri, 13 Nov 2015 20:03:31 +0000 |
branch: emacs-25
commit 071b2e16a0ca8baaf4fa7d52aaa84a652243475e
Author: YAMAMOTO Mitsuharu <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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.
---
src/xfns.c | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/xfns.c b/src/xfns.c
index 9071b89..9d90b7b 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");
- [Emacs-diffs] emacs-25 updated (26e7624 -> 84c7b38), Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 82f3dc0 02/14: Another fix for MinGW64 and Cygwin builds due to notifications, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 e0d2dc5 04/14: Fix last change in shr.el, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 071b2e1 01/14: Remove intern calls and XXX comments from Fx_export_frames,
Eli Zaretskii <=
- [Emacs-diffs] emacs-25 a95781e 07/14: Add a few more variables to redisplay--variables, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 e53f226 09/14: * lisp/progmodes/elisp-mode.el: Declare function `project-roots', Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 d6b046c 08/14: * src/undo.c: Small fixes for previous change, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 93e7db1 10/14: * test/automated/simple-test.el: Add test for bug#20698 (bug#21885), Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 f8d8e0b 03/14: Fix last change, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 27b93ec 05/14: Fix point positioning after transposing with negative arg, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 afd3e98 06/14: * lisp/loadup.el: Enlarge the size of the hash table to 80000., Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 9722634 12/14: * src/undo.c (run_undoable_change): Now static., Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 84c7b38 14/14: Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 3453057 11/14: Remove support for ':timeout' from w32 tray notifications, Eli Zaretskii, 2015/11/13