Explorar el Código

Bug fixes:

Make PDF export work on windows.
Use only compatible overlay API.
Carsten Dominik hace 16 años
padre
commit
9f91de32e9
Se han modificado 3 ficheros con 15 adiciones y 3 borrados
  1. 6 0
      lisp/ChangeLog
  2. 8 2
      lisp/org-latex.el
  3. 1 1
      lisp/org.el

+ 6 - 0
lisp/ChangeLog

@@ -1,5 +1,11 @@
 2009-06-26  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-hide-block-toggle): Use `org-make-overlay' instead of
+	`make-overlay'.
+
+	* org-latex.el (org-export-as-pdf): Protect match data during call
+	to shell-quote-argument.
+
 	* org-agenda.el (org-agenda-mode-map): Modify bulk action keys.
 	(org-agenda-view-mode-dispatch): New function.
 

+ 8 - 2
lisp/org-latex.el

@@ -645,9 +645,15 @@ when PUB-DIR is set, use this as the publishing directory."
       (while cmds
 	(setq cmd (pop cmds))
 	(while (string-match "%b" cmd)
-	  (setq cmd (replace-match (shell-quote-argument base) t t cmd)))
+	  (setq cmd (replace-match 
+		     (save-match-data
+		       (shell-quote-argument base))
+		     t t cmd)))
 	(while (string-match "%s" cmd)
-	  (setq cmd (replace-match (shell-quote-argument file) t t cmd)))
+	  (setq cmd (replace-match
+		     (save-match-data
+		       (shell-quote-argument file))
+		     t t cmd)))
 	(shell-command cmd outbuf outbuf)))
     (message "Processing LaTeX file...done")
     (if (not (file-exists-p pdffile))

+ 1 - 1
lisp/org.el

@@ -5189,7 +5189,7 @@ the range."
 				    'org-hide-block)
 			    (org-delete-overlay ov)))
 			(org-overlays-at start)))
-	    (setq ov (make-overlay start end))
+	    (setq ov (org-make-overlay start end))
             (org-overlay-put ov 'invisible 'org-hide-block)
 	    (push ov org-hide-block-overlays)))
       (error "Not looking at a source block"))))