aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2011-01-04 11:09:13 +0100
committerAndreas Schwab2011-01-04 11:09:13 +0100
commitc3e4b003c22fc5c343d0d1736f43405aeec650e6 (patch)
treef849a1a395139cc704fbac1f94e8bd35aaa0015b
parentef4271fe82c076b0c259df267371e747339aa669 (diff)
downloademacs-c3e4b003c22fc5c343d0d1736f43405aeec650e6.tar.gz
emacs-c3e4b003c22fc5c343d0d1736f43405aeec650e6.zip
* lisp/textmodes/rst.el (rst-compile-pdf-preview)
(rst-compile-slides-preview): Remove extra line.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/textmodes/rst.el3
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66c5d1839ed..b41711e26db 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-01-04 Andreas Schwab <schwab@linux-m68k.org>
2
3 * textmodes/rst.el (rst-compile-pdf-preview)
4 (rst-compile-slides-preview): Remove extra line.
5
12011-01-04 Glenn Morris <rgm@gnu.org> 62011-01-04 Glenn Morris <rgm@gnu.org>
2 7
3 * textmodes/rst.el (rst-compile-toolsets): Make it a defcustom. 8 * textmodes/rst.el (rst-compile-toolsets): Make it a defcustom.
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index bbeab60bfd6..34ac6000d0c 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -3364,7 +3364,6 @@ or of the entire buffer, if the region is not selected."
3364 (let* ((tmp-filename (make-temp-file "rst-out" nil ".pdf")) 3364 (let* ((tmp-filename (make-temp-file "rst-out" nil ".pdf"))
3365 (command (format "%s %s %s && %s %s" 3365 (command (format "%s %s %s && %s %s"
3366 (cadr (assq 'pdf rst-compile-toolsets)) 3366 (cadr (assq 'pdf rst-compile-toolsets))
3367 (command (format "rst2pdf.py %s %s && %s %s"
3368 buffer-file-name tmp-filename 3367 buffer-file-name tmp-filename
3369 rst-pdf-program tmp-filename))) 3368 rst-pdf-program tmp-filename)))
3370 (start-process-shell-command "rst-pdf-preview" nil command) 3369 (start-process-shell-command "rst-pdf-preview" nil command)
@@ -3381,8 +3380,6 @@ or of the entire buffer, if the region is not selected."
3381 (let* ((tmp-filename (make-temp-file "rst-slides" nil ".html")) 3380 (let* ((tmp-filename (make-temp-file "rst-slides" nil ".html"))
3382 (command (format "%s %s %s && %s %s" 3381 (command (format "%s %s %s && %s %s"
3383 (cadr (assq 's5 rst-compile-toolsets)) 3382 (cadr (assq 's5 rst-compile-toolsets))
3384 (command (format "rst2s5.py %s %s && %s %s"
3385
3386 buffer-file-name tmp-filename 3383 buffer-file-name tmp-filename
3387 rst-slides-program tmp-filename))) 3384 rst-slides-program tmp-filename)))
3388 (start-process-shell-command "rst-slides-preview" nil command) 3385 (start-process-shell-command "rst-slides-preview" nil command)