HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Misc manual updates.
[bpt/emacs.git]
/
lisp
/
gs.el
diff --git
a/lisp/gs.el
b/lisp/gs.el
index
913c741
..
c9e7955
100644
(file)
--- a/
lisp/gs.el
+++ b/
lisp/gs.el
@@
-1,7
+1,6
@@
;;; gs.el --- interface to Ghostscript
;;; gs.el --- interface to Ghostscript
-;; Copyright (C) 1998, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001-2012 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
;; Maintainer: FSF
;; Keywords: internal
@@
-93,21
+92,28
@@
FILE is the value to substitute for the place-holder `<file>'."
;; specified in PostScript points. If omitted, the margins are
;; assumed to be 0.
;; specified in PostScript points. If omitted, the margins are
;; assumed to be 0.
+(declare-function x-display-mm-width "xfns.c" (&optional terminal))
+(declare-function x-display-pixel-width "xfns.c" (&optional terminal))
+
(defun gs-width-in-pt (frame pixel-width)
(defun gs-width-in-pt (frame pixel-width)
- "Return, on FRAME, pixel width PIXEL-WIDTH tranlated to pt."
+ "Return, on FRAME, pixel width PIXEL-WIDTH tran
s
lated to pt."
(let ((mm (* (float pixel-width)
(/ (float (x-display-mm-width frame))
(float (x-display-pixel-width frame))))))
(/ (* 25.4 mm) 72.0)))
(let ((mm (* (float pixel-width)
(/ (float (x-display-mm-width frame))
(float (x-display-pixel-width frame))))))
(/ (* 25.4 mm) 72.0)))
+(declare-function x-display-mm-height "xfns.c" (&optional terminal))
+(declare-function x-display-pixel-height "xfns.c" (&optional terminal))
(defun gs-height-in-pt (frame pixel-height)
(defun gs-height-in-pt (frame pixel-height)
- "Return, on FRAME, pixel height PIXEL-HEIGHT tranlated to pt."
+ "Return, on FRAME, pixel height PIXEL-HEIGHT tran
s
lated to pt."
(let ((mm (* (float pixel-height)
(/ (float (x-display-mm-height frame))
(float (x-display-pixel-height frame))))))
(/ (* 25.4 mm) 72.0)))
(let ((mm (* (float pixel-height)
(/ (float (x-display-mm-height frame))
(float (x-display-pixel-height frame))))))
(/ (* 25.4 mm) 72.0)))
+(declare-function x-change-window-property "xfns.c"
+ (prop value &optional frame type format outer-p))
(defun gs-set-ghostview-window-prop (frame spec img-width img-height)
"Set the `GHOSTVIEW' window property of FRAME.
(defun gs-set-ghostview-window-prop (frame spec img-width img-height)
"Set the `GHOSTVIEW' window property of FRAME.
@@
-131,6
+137,7
@@
image in pixels."
rotation llx lly urx ury xdpi ydpi)
frame)))
rotation llx lly urx ury xdpi ydpi)
frame)))
+(declare-function x-display-grayscale-p "xfns.c" (&optional terminal))
(defun gs-set-ghostview-colors-window-prop (frame pixel-colors)
"Set the `GHOSTVIEW_COLORS' environment variable depending on FRAME."
(defun gs-set-ghostview-colors-window-prop (frame pixel-colors)
"Set the `GHOSTVIEW_COLORS' environment variable depending on FRAME."
@@
-141,8
+148,9
@@
image in pixels."
(format "%s %s" mode pixel-colors)
frame)))
(format "%s %s" mode pixel-colors)
frame)))
+(declare-function x-window-property "xfns.c"
+ (prop &optional frame type source delete-p vector-ret-p))
-;
;;;###autoload
(defun gs-load-image (frame spec img-width img-height window-and-pixmap-id
pixel-colors)
;;;###autoload
(defun gs-load-image (frame spec img-width img-height window-and-pixmap-id
pixel-colors)
@@
-171,8
+179,8
@@
the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful."
;; out even more sluggish.
;; (get-buffer-process "*GS*")
(not (zerop timeout)))
;; out even more sluggish.
;; (get-buffer-process "*GS*")
(not (zerop timeout)))
- (unless (sit-for 0
100
t)
- (sleep-for 0
50
))
+ (unless (sit-for 0
.1
t)
+ (sleep-for 0
.05
))
(setq timeout (1- timeout)))
;; No use waiting longer. We might want to try killing off
(setq timeout (1- timeout)))
;; No use waiting longer. We might want to try killing off
@@
-187,7
+195,7
@@
the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful."
;; proper implementation not waiting at all but creating
;; appropriate queues, or b) permanently bad display due to
;; bad cached images. So remember that this
;; proper implementation not waiting at all but creating
;; appropriate queues, or b) permanently bad display due to
;; bad cached images. So remember that this
- ;; is just a hack and if people don't like the behavio
u
r, they
+ ;; is just a hack and if people don't like the behavior, they
;; will most likely like the easy alternatives even less.
;; And at least the image cache will make the delay apparent
;; just once.
;; will most likely like the easy alternatives even less.
;; And at least the image cache will make the delay apparent
;; just once.
@@
-212,5
+220,4
@@
the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful."
(provide 'gs)
(provide 'gs)
-;; arch-tag: 06ab51b8-4932-4cfe-9f60-b924a8edb3f0
;;; gs.el ends here
;;; gs.el ends here