Merge branch 'master' of code.orgmode.org:bzg/org-mode

2018-12-01 13:30:40 +01:00 · 2018-12-01 13:30:40 +01:00 · a484c67586
parent d9ab07042a 04641c4bbe
commit a484c67586
2 changed files with 2 additions and 1 deletions
--- a/lisp/org-pcomplete.el
+++ b/lisp/org-pcomplete.el
@ -64,6 +64,7 @@
 (defvar org-outline-regexp)
 (defvar org-property-re)
 (defvar org-startup-options)
+(defvar org-tag-re)
 (defvar org-time-stamp-formats)
 (defvar org-todo-keywords-1)
 (defvar org-todo-line-regexp)
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@ -179,7 +179,7 @@
    ("et" . "estonian")
    ("eu" . "basque")
    ("fi" . "finnish")
-    ("fr" . "frenchb")
+    ("fr" . "french")
    ("fr-ca" . "canadien")
    ("gl" . "galician")
    ("hr" . "croatian")