diff --git a/common/Makefile.doc b/common/Makefile.doc
index 59898e8a..a340d77a 100644
--- a/common/Makefile.doc
+++ b/common/Makefile.doc
@@ -5,10 +5,11 @@
 BASE          = ../../../common
 
 THIS_LOCALE   = $(notdir $(shell pwd))
+THIS_LANG     = $(firstword $(subst -, ,$(THIS_LOCALE)))
 
 ADC_SRC_FILES = $(wildcard *.txt)
 ADC_FILES     = $(ADC_SRC_FILES:%.txt=%.html)
-ADC_DEPS      = $(wildcard asciidoc.conf)
+ADC_DEPS      = $(wildcard asciidoc.conf lang-$(THIS_LANG).conf)
 
 T2T_SRC_FILES = $(wildcard *.t2t)
 T2T_FILES     = $(T2T_SRC_FILES:%.t2t=%.xhtml)
@@ -64,7 +65,7 @@ check-asciidoc:
 
 $(ADC_FILES): %.html: %.txt $(BASE)/Makefile.doc $(ADC_DEPS)
 	@echo "DOC locale/$(THIS_LOCALE)/$@"
-	$(ASCIIDOC) --unsafe -a linkcss -a quirks! -a doctitle="$(shell basename $@)" -o $@ $<
+	$(ASCIIDOC) --unsafe -a linkcss -a quirks! -a lang=$(THIS_LANG) -a doctitle="$(shell basename $@)" -o $@ $<
 
 #### txt2tags
 
diff --git a/common/content/editor.js b/common/content/editor.js
index 7d055a57..2b2bbd3f 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -1139,7 +1139,7 @@ function Editor() //{{{
         removeAllAbbreviations: function (filter)
         {
             let searchFilter = (filter == "!") ? "!ci" : filter + "!";
-            for ([lhs, [mode, rhs]] in abbrevs())
+            for (let [lhs, [mode, rhs]] in abbrevs())
                 if (searchFilter.indexOf(mode) >= 0)
                     this.removeAbbreviation(filter, lhs);
         }
diff --git a/vimperator/content/bookmarks.js b/vimperator/content/bookmarks.js
index 4b7ca786..bd888b2f 100644
--- a/vimperator/content/bookmarks.js
+++ b/vimperator/content/bookmarks.js
@@ -734,7 +734,7 @@ function History() //{{{
             {
                 let sh = window.getWebNavigation().sessionHistory;
 
-                context.anchor = false;
+                context.anchored = false;
                 context.completions = [sh.getEntryAtIndex(i, false) for (i in util.range(sh.index, 0, true))];
                 context.keys = { text: function (item) item.URI.spec, description: "title" };
             },
@@ -780,7 +780,7 @@ function History() //{{{
             {
                 let sh = window.getWebNavigation().sessionHistory;
 
-                context.anchor = false;
+                context.anchored = false;
                 context.completions = [sh.getEntryAtIndex(i, false) for (i in util.range(sh.index + 1, sh.count))];
                 context.keys = { text: function (item) item.URI.spec, description: "title" };
             },