Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

Conflicts:

	lisp/ChangeLog

lisp/ChangeLog

@@ -3,6 +3,10 @@
 	* org-agenda.el (org-agenda-to-appt): Fix bug with appointment
 	time before 1am.
 
+2008-09-22  Bastien Guerry  <bzg@altern.org>
+
+	* org-export-latex.el (org-export-latex-keywords-maybe): Bug fix.
+
 2008-09-22  James TA Smith  <ahktenzero@mohorovi.cc>
 
 	* org-plot.el (org-plot/gnuplot): Make tables starting with a

lisp/org-export-latex.el

@@ -778,9 +778,8 @@ links, keywords, lists, tables, fixed-width"
 	 (org-export-latex-protect-string
 	  (format "\\texttt{%s}"
                   (save-match-data
-                    (org-quote-chars
-                     (replace-regexp-in-string
-                      "_" "\\\\_" (match-string 0))))))
+                    (replace-regexp-in-string
+                     "_" "\\\\_" (match-string 0)))))
          t t)))))
 
 (defun org-export-latex-fontify-headline (string)