diff --git a/auctex-11.85-preview.dif b/auctex-11.85-preview.dif index 5c494b7..261d46b 100644 --- a/auctex-11.85-preview.dif +++ b/auctex-11.85-preview.dif @@ -1,6 +1,43 @@ --- preview/preview.el -+++ preview/preview.el 2010-08-12 09:13:54.697159903 +0000 -@@ -704,7 +704,7 @@ Gets the usual PROCESS and STRING parame ++++ preview/preview.el 2010-07-21 13:48:25.830924999 +0200 +@@ -233,7 +233,7 @@ method, like when PDFTeX was used." + (symbol :tag "Emacs image-type") + (repeat :inline t :tag "Ghostscript options" string)))) + +-(defcustom preview-image-type 'png ++(defcustom preview-image-type 'dvipng + "*Image type to be used in images." + :group 'preview-gs + :type (append '(choice) +@@ -682,29 +682,31 @@ Gets the usual PROCESS and STRING parame + (setq preview-gs-sequence (list 1))) + (setcdr preview-gs-sequence 1) + (let* ((process-connection-type nil) +- (outfile (format "-dOutputFile=%s" +- (preview-ps-quote-filename ++ (inputdir (format "-I%s/" (car TeX-active-tempdir))) ++ (outfile (format "-sOutputFile=%s" + (format "%s/pr%d-%%d.%s" + (car TeX-active-tempdir) + (car preview-gs-sequence) +- preview-gs-image-type)))) ++ preview-gs-image-type))) + (process + (apply #'start-process + "Preview-Ghostscript" + (current-buffer) + preview-gs-command + outfile ++ inputdir + preview-gs-command-line))) + (goto-char (point-max)) + (insert-before-markers "Running `Preview-Ghostscript' with ``" + (mapconcat #'shell-quote-argument + (append + (list preview-gs-command +- outfile) ++ outfile ++ inputdir) preview-gs-command-line) " ") "''\n") (setq preview-gs-answer "") @@ -9,16 +46,21 @@ (set-process-sentinel process #'preview-gs-sentinel) (set-process-filter process #'preview-gs-filter) (process-send-string process preview-gs-init-string) -@@ -1072,6 +1072,12 @@ NONREL is not NIL." - (caar preview-ps-file)) - (car preview-ps-file)))) - (setq preview-gs-dsc (preview-dsc-parse file)) -+ (setq preview-gs-command-line -+ (append (list "-dDELAYSAFER") -+ (remove "-dSAFER" preview-gs-command-line) -+ (list "-c" -+ (format "<> setuserparams .locksafe" -+ (preview-ps-quote-filename file))))) +@@ -1075,7 +1077,7 @@ NONREL is not NIL." (setq preview-gs-init-string (concat preview-gs-init-string (format "[%s(r)file]aload exch %s .runandhide aload pop " +- (preview-ps-quote-filename file) ++ (preview-ps-quote-filename file t) + (preview-gs-dsc-cvx 0 preview-gs-dsc)))))) + + (defun preview-gs-urgentize (ov buff) +@@ -1163,7 +1165,7 @@ Try \\[ps-shell] and \\[ps-execute-buffe + "Make an eps error flag in overlay OV for ERR string." + (let* ((filenames (overlay-get ov 'filenames)) + (file (car (nth 0 filenames))) +- (outfile (format "-dOutputFile=%s" ++ (outfile (format "-sOutputFile=%s" + (preview-ps-quote-filename + (car (nth 1 filenames))))) + (ps-open diff --git a/emacs-auctex.changes b/emacs-auctex.changes index f2d3700..1cfa6e3 100644 --- a/emacs-auctex.changes +++ b/emacs-auctex.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Aug 11 18:58:43 CEST 2010 - werner@suse.de - -- Make fix for bnc#623719 more flexible - ------------------------------------------------------------------- Sun Jul 25 07:20:32 UTC 2010 - aj@suse.de