summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien <bzg@gnu.org>2018-12-01 13:30:40 +0100
committerBastien <bzg@gnu.org>2018-12-01 13:30:40 +0100
commita484c675868bdbe540c7031a980067843298bb0b (patch)
tree27bcf9cac55c248fe376f512090c6495aa54db79
parentd9ab07042ae110567aef3d6b6082ed3ba7006835 (diff)
parent04641c4bbefc5f90e05fe4e846f4aeab15f1c262 (diff)
downloadorg-mode-a484c675868bdbe540c7031a980067843298bb0b.tar.gz
Merge branch 'master' of code.orgmode.org:bzg/org-mode
-rw-r--r--lisp/org-pcomplete.el1
-rw-r--r--lisp/ox-latex.el2
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org-pcomplete.el b/lisp/org-pcomplete.el
index 062f38a..0c2b647 100644
--- 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)
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 2d77167..cae6900 100644
--- 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")