gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-14 17:35:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into vimperator-2.1

Browse Source
This commit is contained in:
Kris Maglione
2009-01-15 15:46:15 -05:00
parent 5e811785c2 bd881e062b
commit e4cd0611f9
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/Makefile.doc
View File

@@ -5,10 +5,11 @@
BASE = ../../../common BASE = ../../../common
THIS_LOCALE = $(notdir $(shell pwd)) THIS_LOCALE = $(notdir $(shell pwd))
THIS_LANG = $(firstword $(subst -, ,$(THIS_LOCALE)))
ADC_SRC_FILES = $(wildcard *.txt) ADC_SRC_FILES = $(wildcard *.txt)
ADC_FILES = $(ADC_SRC_FILES:%.txt=%.html) 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_SRC_FILES = $(wildcard *.t2t)
T2T_FILES = $(T2T_SRC_FILES:%.t2t=%.xhtml) T2T_FILES = $(T2T_SRC_FILES:%.t2t=%.xhtml)
@@ -64,7 +65,7 @@ check-asciidoc:
$(ADC_FILES): %.html: %.txt $(BASE)/Makefile.doc $(ADC_DEPS) $(ADC_FILES): %.html: %.txt $(BASE)/Makefile.doc $(ADC_DEPS)
@echo "DOC locale/$(THIS_LOCALE)/$@" @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 #### txt2tags

2
common/content/editor.js
View File

@@ -1139,7 +1139,7 @@ function Editor() //{{{
removeAllAbbreviations: function (filter) removeAllAbbreviations: function (filter)
{ {
let searchFilter = (filter == "!") ? "!ci" : filter + "!"; let searchFilter = (filter == "!") ? "!ci" : filter + "!";
for ([lhs, [mode, rhs]] in abbrevs()) for (let [lhs, [mode, rhs]] in abbrevs())
if (searchFilter.indexOf(mode) >= 0) if (searchFilter.indexOf(mode) >= 0)
this.removeAbbreviation(filter, lhs); this.removeAbbreviation(filter, lhs);
} }

4
vimperator/content/bookmarks.js
View File

@@ -734,7 +734,7 @@ function History() //{{{
{ {
let sh = window.getWebNavigation().sessionHistory; 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.completions = [sh.getEntryAtIndex(i, false) for (i in util.range(sh.index, 0, true))];
context.keys = { text: function (item) item.URI.spec, description: "title" }; context.keys = { text: function (item) item.URI.spec, description: "title" };
}, },
@@ -780,7 +780,7 @@ function History() //{{{
{ {
let sh = window.getWebNavigation().sessionHistory; 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.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" }; context.keys = { text: function (item) item.URI.spec, description: "title" };
}, },