Merge with git+ssh://pasky.or.cz/srv/git/elinks.git

AUTHORS

@@ -575,4 +575,3 @@ Yurii Rashkovskii <yrashk@univer.kharkov.ua>
 	RPM spec file in contrib/
 	RedHat compilation fixes
 
-$Id: AUTHORS,v 1.198 2005/08/10 15:38:28 jonas Exp $

BUGS

@@ -2,4 +2,3 @@ All the known bugs are now kept in the Bugzilla, available at
 
 	http://bugzilla.elinks.or.cz/
 
-$Id: BUGS,v 1.61 2003/05/10 23:03:12 pasky Exp $

INSTALL

@@ -169,5 +169,4 @@ old_to_new_bookmarks.sh.
 
 ##########
 
-$Id: INSTALL,v 1.29 2004/09/22 16:17:23 pasky Exp $
 vim: textwidth=80

Makefile

@@ -1,5 +1,5 @@
-path_to_top = .
+top_builddir=.
--include $(path_to_top)/Makefile.config
+-include $(top_builddir)/Makefile.config
 
 SUBDIRS = doc po src
 CLEAN	= features.log
@@ -7,23 +7,24 @@ CLEAN	= features.log
 all-recursive: config.h
 
 # Automagically rerun autotools
-config.status: $(top_srcdir)/configure
+$(top_builddir)/config.status: $(top_srcdir)/configure
-	$(SHELL) ./config.status --recheck
+	cd $(top_builddir) && $(SHELL) ./config.status --recheck
 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-$(ACLOCAL_M4): configure.in acinclude.m4
+$(ACLOCAL_M4): $(top_srcdir)/configure.in $(top_srcdir)/acinclude.m4
 	cd $(top_srcdir) && $(ACLOCAL)
 
 $(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && $(AUTOCONF)
 
-config.h: stamp-h
+$(top_builddir)/config.h: $(top_builddir)/stamp-h
-	@if test ! -f $@; then \
+	@cd $(top_builddir) && \
+	if test ! -f $@; then \
 		rm -f stamp-h; \
 		$(MAKE) stamp-h; \
 	else :; fi
 
-stamp-h: $(top_srcdir)/config.h.in $(top_builddir)/config.status
+$(top_builddir)/stamp-h: $(top_srcdir)/config.h.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
 	     $(SHELL) ./config.status
@@ -45,5 +46,5 @@ ifeq ($(wildcard Makefile.config),)
 $(MAKECMDGOALS) default:
 	@echo "You need to first run ./configure"
 else
-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
 endif

Makefile.config.in

@@ -5,9 +5,15 @@
 
 SHELL = @SHELL@
 
-top_srcdir = $(path_to_top)/@top_srcdir@
+CURPATH = $(shell pwd)
-srcdir = $(top_srcdir)/$(shell pwd | sed 's!.*/\($(shell echo $(path_to_top) | sed 's!\.\.![^/]*!')\)$$!\1!')
+TOPPATH = $(shell cd $(top_builddir) && pwd)
-top_builddir = $(path_to_top)
+RELPATH = $(shell echo '$(CURPATH)' | sed 's,$(TOPPATH),,;s,^/,,;s,\([a-z0-9]\)$$,\1/,')
+
+PATHSCRIPT = case '@top_srcdir@' in /*) ;; *) echo $(top_builddir)/;; esac
+PATHPREFIX = $(shell $(PATHSCRIPT))
+
+top_srcdir = $(PATHPREFIX)@top_srcdir@
+srcdir = $(top_srcdir)/$(RELPATH)
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
@@ -56,7 +62,7 @@ LIBDIR = @LIBDIR@
 LOCALEDIR = @LOCALEDIR@
 LUA_CFLAGS = @LUA_CFLAGS@
 LUA_LIBS = @LUA_LIBS@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
+MKINSTALLDIRS = $(PATHPREFIX)@MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 PACKAGE = @PACKAGE@
@@ -68,6 +74,7 @@ PYTHON_LIBS = @PYTHON_LIBS@
 RANLIB = @RANLIB@
 RUBY_CFLAGS = @RUBY_CFLAGS@
 RUBY_LIBS = @RUBY_LIBS@
+SEE_CFLAGS = @SEE_CFLAGS@
 SPIDERMONKEY_CFLAGS = @SPIDERMONKEY_CFLAGS@
 SPIDERMONKEY_LIBS = @SPIDERMONKEY_LIBS@
 VERSION = @VERSION@
@@ -124,6 +131,7 @@ CONFIG_RISCOS = @CONFIG_RISCOS@
 CONFIG_RUBY = @CONFIG_RUBY@
 CONFIG_SCANNER = @CONFIG_SCANNER@
 CONFIG_SCRIPTING = @CONFIG_SCRIPTING@
+CONFIG_SEE = @CONFIG_SEE@
 CONFIG_SHA1 = @CONFIG_SHA1@
 CONFIG_SMALL = @CONFIG_SMALL@
 CONFIG_SMB = @CONFIG_SMB@

Makefile.lib

@@ -14,30 +14,28 @@ else
 	mquiet = quiet_
 endif
 
-CURPATH = $(shell pwd)
-TOPPATH = $(shell cd $(path_to_top) && pwd)
-RELPATH = $(shell echo '$(CURPATH)' | sed 's,$(TOPPATH),,;s,^/,,;s,\([a-z0-9]\)$$,\1/,')
-
 # Show the command (quiet or non-quiet version based on the assignment
 # just above) and then execute it.
 ncmd = $(if $($(quiet)cmd_$(1)),echo $($(quiet)cmd_$(1)) &&) $(cmd_$(1))
 cmd = @$(if $($(quiet)cmd_$(1)),echo $($(quiet)cmd_$(1)) &&) $(cmd_$(1))
 mcmd = @$(if $($(mquiet)cmd_$(1)),echo $($(mquiet)cmd_$(1)) &&) $(cmd_$(1))
 
-quiet_cmd_compile = '      [CC]   $(RELPATH)$<'
+quiet_cmd_compile = '      [CC]   $(RELPATH)$@'
  masq_cmd_compile = $(COMPILE) -c $<
       cmd_compile = $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
 
 # Rule to compile a set of .o files into one .o file
 quiet_cmd_ld_objs = "      [LD]   $(RELPATH)$@"
-      cmd_ld_objs = $(LD) -r -o $@ $(filter $(OBJS), $^)
+      cmd_ld_objs = $(LD) -r -o $@ $(filter $(OBJS), $^) \
+      		    $(foreach subdir,$(sort $(filter-out src,$(SUBDIRS))), \
+			    `test -e $(subdir)/lib.o && echo $(subdir)/lib.o`)
 
    quiet_cmd_link = '    [LINK]   $(RELPATH)$@'
          cmd_link = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 # Recursive make
-quiet_cmd_recmake = "[MAKE $$target]   $(RELPATH)$$subdir"
+quiet_cmd_recmake = "[MAKE $(3)]   $(RELPATH)$(2)"
-      cmd_recmake = $(MAKE) -C $$subdir $$target
+      cmd_recmake = $(MAKE) -C $(2) $(3)
 
 quiet_cmd_installdata = "     [INSTALL]   $(RELPATH)$(2) -> $(3)"
       cmd_installdata = $(INSTALL_DATA) $(2) $(3)
@@ -58,7 +56,7 @@ ifdef OBJS
 -include $(DEP_FILES)
 endif
 
-%.o: %.c
+%.o: $(srcdir)%.c
 	$(call mcmd,compile)
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 		tr ' ' '\012' < .deps/$(*F).pp \
@@ -74,18 +72,20 @@ ifdef OBJS-yes
 OBJS += $(OBJS-yes)
 endif
 
-ifdef SUBDIRS
+ifneq ($(findstring cleanall,$(MAKECMDGOALS)),)
-# Apparently wildcard won't expand *.o files so check if there are any *.c
+
-# files and use that to magically add the lib.o file of the subdirectory.
+ifdef SUBDIRS-no
-subobjs := $(strip $(foreach subdir,$(sort $(filter-out src,$(SUBDIRS))), \
+SUBDIRS += $(SUBDIRS-no)
-		$(if $(wildcard $(subdir)/*.c),$(subdir)/lib.o)))
 endif
-ifneq ($(subobjs),)
+ifdef OBJS-no
-OBJS += $(subobjs)
+OBJS += $(OBJS-no)
 endif
 
+endif
+
+
 ifdef OBJS
-lib.o: $(sort $(OBJS))
+lib.o: $(sort $(OBJS)) $(foreach subdir,$(sort $(filter-out src,$(SUBDIRS))), $(wildcard $(subdir)/lib.o))
 	$(call cmd,ld_objs)
 
 LIB_O = lib.o
@@ -96,44 +96,48 @@ CLEAN += $(PROG)
 
 all-default: $(LIB_O) $(PROGS) $(MAN1) $(MAN5)
 
+list-default:
+	@echo '$(RELPATH)Makefile'
+
 clean-default:
 	-test -z "$(CLEAN)" || $(RM) $(CLEAN)
 
+cleanall-default: clean-default
+
 install-default: all-default
 ifdef PROGS
 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
-	@for file in $(PROGS); do \
+	$(foreach file,$(PROGS), \
-		$(call ncmd,installprog,$$file,$(DESTDIR)$(bindir)); \
+		$(call ncmd,installprog,$(file),$(DESTDIR)$(bindir));)
-	done
 endif
 ifdef MAN1
 	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
-	@for file in $(MAN1); do \
+	$(foreach file,$(MAN1), \
-		$(call ncmd,installdata,$$file,$(DESTDIR)$(mandir)/man1); \
+		$(call ncmd,installdata,$(file),$(DESTDIR)$(mandir)/man1);)
-	done
 endif
 ifdef MAN5
 	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man5
-	@for file in $(MAN5); do \
+	$(foreach file,$(MAN5), \
-		$(call ncmd,installdata,$$file,$(DESTDIR)$(mandir)/man5); \
+		$(call ncmd,installdata,$(file),$(DESTDIR)$(mandir)/man5);)
-	done
 endif
 
 # Recursion:
 
-.PHONY: all-recursive install-recursive clean-recursive
+.PHONY: all-recursive install-recursive clean-recursive cleanall-recursive list-recursive
-all-recursive install-recursive clean-recursive:
+
+all-recursive install-recursive clean-recursive cleanall-recursive list-recursive:
 ifdef SUBDIRS
-	@target=`echo $@ | sed s/-recursive//`; \
+	@$(foreach subdir,$(sort $(SUBDIRS)), \
-	for subdir in $(sort $(SUBDIRS)); do \
+		$(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || exit 1;)
-		$(call ncmd,recmake) || exit 1; \
-	done
 endif
 
 all: all-recursive all-default all-local
 install: install-recursive install-default install-local
 clean: clean-recursive clean-default clean-local
 
+cleanall: cleanall-recursive cleanall-default
+list: list-recursive list-default
+
 all-local:
 install-local:
 clean-local:

NEWS

@@ -1,14 +1,19 @@
-You can see the complete list of recent changes, bugfixes and new features
+Release info
-in the gitweb interface. See the ChangeLog file for details.
+============
+
+You can see the complete list of recent changes, bugfixes and new features in
+the link:http://pasky.or.cz/gitweb.cgi[gitweb interface]. See the ChangeLog
+file for details.
 
 ELinks now:
+-----------
 
 * SSL support via GNUTLS now requires 1.2 or higher
 * support for Lua 4.x was dropped, we only support Lua 5.x now
 * Python scripting back-end (experimental)
 * 88 colors support
-* default URI-rewrite rule, used when no other rules match but the string
+* default URI-rewrite rule, used when no other rules match but the string that
-  that was entered in the Go to URL box does not resemble a URI
+  was entered in the Go to URL box does not resemble a URI
 * support prefixes for add-bookmark-link, document-info, goto-url-current-link,
   history-move-back, and history-move-forward
 * BitTorrent protocol (experimental)
@@ -18,20 +23,24 @@ ELinks now:
 * move from CVS to GIT
 
 ELinks 0.10.6:
+--------------
 
 * external editor is configurable at run-time
 
 ELinks 0.10.4:
+--------------
 
-* explicit keyboard accelerators were defined for buttons in dialogue boxes
+* explicit keyboard accelerators were defined for buttons in dialogue boxes and
-  and are now highlighted
+  are now highlighted
 
 ELinks 0.10.2:
+--------------
 
 * Ruby scripting back-end (experimental)
 * Debian package files (apt-get install devscripts && debuild -uc -us)
 
 ELinks 0.10.0 (Thelma):
+-----------------------
 
 * simple CSS
 * simple JavaScript/ECMAScript support by the SpiderMonkey Mozilla JS engine
@@ -62,12 +71,14 @@ ELinks 0.10.0 (Thelma):
 * enhanced documentation
 
 ELinks 0.9.2:
+-------------
 
 * directional links navigation
-* 'unset' configuration directive, which can be used, e.g.,
+* 'unset' configuration directive, which can be used, e.g., to delete default
-  to delete default MIME type settings or external protocol handlers.
+  MIME type settings or external protocol handlers.
 
 ELinks 0.9.1:
+-------------
 
 * support <object> tags by displaying a link to the data
 * add beginning-of-buffer and end-of-buffer actions for text fields
@@ -79,6 +90,7 @@ ELinks 0.9.1:
   since its document was loaded
 
 ELinks 0.9.0 (Skyrider):
+------------------------
 
 * used gettext for internationalization
 * support for background document colors
@@ -99,13 +111,14 @@ ELinks 0.9.0 (Skyrider):
 * typeahead link searching (press '#')
 
 ELinks 0.4.0 (Iceberg):
+-----------------------
 
 * merged HTTP_AUTH
 * basic proxy auth support
 * cookies parser rewritten
 * support for tabindex,accesskey,title attribute
-* FTP support dramatically improved (bugfixes, interoperability fixes, passive
+* FTP support dramatically improved: bugfixes, interoperability fixes, passive
-  mode support, ...)
+  mode support, ...
 * global history support (+vlink support)
 * make some modules (cookies,bookmarks,globhist,..) optional at compile time
 * secure saving support (see secure_save option desc. if you're doing weird
@@ -130,6 +143,7 @@ ELinks 0.4.0 (Iceberg):
 * extensive memory debugging support
 
 ELinks 0.3.0:
+-------------
 
 * unhistory
 * external textarea editor
@@ -141,6 +155,7 @@ ELinks 0.3.0:
 * added possibility to change default colors settings
 
 Links 0.96-pb3:
+---------------
 
 * secured cookies file creation
 * support for title attribute of img tag
@@ -150,6 +165,7 @@ Links 0.96-pb3:
 * <listing> tag support
 
 Links 0.96-pb2:
+---------------
 
 * cookies expiration, saving and resaving
 * do NOT strip everything after ? in form action

README

@@ -64,6 +64,5 @@ you can examine the website at
 
 
 
-$Id: README,v 1.24 2005/01/11 15:51:02 jonas Exp $
 
 vim: textwidth=80

SITES

@@ -46,4 +46,3 @@ RPMs:
 	http://ftp.nest.pld-linux.org/pool/l/links/
 	http://ftp.pld-linux.org/pool/l/links/
 
-$Id: SITES,v 1.21 2005/01/31 23:14:14 jonas Exp $

TODO

@@ -22,4 +22,3 @@ General goals:
   Speed/memory optimizations
 
 
-$Id: TODO,v 1.64 2003/06/08 12:33:40 jonas Exp $

Unicode/gen

@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id: gen,v 1.3 2005/03/05 21:49:29 zas Exp $
 
 export LC_ALL=C
 ./gen-cp

Unicode/gen-7b

@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id: gen-7b,v 1.8 2005/03/05 21:49:29 zas Exp $
 
 echo
 echo Generating Unicode2ascii translation table.

Unicode/gen-cp

@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id: gen-cp,v 1.13 2005/03/05 22:08:22 zas Exp $
 
 echo
 echo Generating code page translation tables.

Unicode/gen-ent

@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id: gen-ent,v 1.10 2005/03/05 21:49:29 zas Exp $
 
 echo
 echo Generating entity table.

Unicode/tr7bit.awk

@@ -1,5 +1,4 @@
 #!/bin/awk -f
-# $Id: tr7bit.awk,v 1.4 2005/03/05 21:49:29 zas Exp $
 
 function join(array, start, sep, end, result, i)
 {

config/m4/see.m4

@@ -0,0 +1,48 @@
+AC_DEFUN([EL_CONFIG_SEE],
+[
+
+enable_see="no";
+
+AC_ARG_WITH(see, [  --with-see              enable Simple Ecmascript Engine (SEE) support],
+            [ if test "x$withval" != xno; then enable_see=yes; fi ])
+
+# The following is probably bad, ugly and so on. Stolen from Guile's (1.4)
+# SEE_FLAGS but I really don't want to require people to have Guile in order
+# to compile CVS. Also, the macro seems to be really stupid regarding searching
+# for Guile in $PATH etc. --pasky
+
+AC_MSG_CHECKING([for SEE])
+
+if test "$enable_see" = "yes"; then
+	AC_MSG_RESULT(yes);
+	## Based on the SEE_FLAGS macro.
+
+	if test -d "$withval"; then
+		SEE_PATH="$withval:$PATH"
+	else
+		SEE_PATH="$PATH"
+	fi
+
+	AC_PATH_PROG(SEE_CONFIG, libsee-config, no, $SEE_PATH)
+
+	## First, let's just see if we can find Guile at all.
+	if test "$SEE_CONFIG" != no; then
+		cf_result="yes";
+
+		SEE_LIBS="`$SEE_CONFIG --libs`"
+		SEE_CFLAGS="`$SEE_CONFIG --cppflags`"
+		LIBS="$SEE_LIBS $LIBS"
+		CPPFLAGS="$CPPFLAGS $SEE_CFLAGS"
+		EL_CONFIG(CONFIG_SEE, [SEE])
+		AC_SUBST(SEE_CFLAGS)
+	else
+		if test -n "$withval" && test "x$withval" != xno; then
+			AC_MSG_ERROR([SEE not found])
+		else
+			AC_MSG_WARN([SEE support disabled])
+		fi
+	fi
+else
+	AC_MSG_RESULT(no);
+fi
+])

config/mkinstalldirs

@@ -4,7 +4,6 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
 
 errstatus=0
 

configure.in

@@ -18,6 +18,19 @@ AC_CHECK_PROG(AUTOHEADER,[autoheader],[autoheader],[config/missing autoheader])
 
 AC_PROG_MAKE_SET
 
+MAKE=
+
+for make in gnumake gmake make false; do
+	if test "x$MAKE" = x; then
+		AC_PATH_PROGS(MAKE, "$make")
+	fi
+done
+
+# Cleanup if we are configuring with a previous build in the tree
+if test -e Makefile.config; then
+	"$MAKE" -C "$builddir" cleanall  >/dev/null 2>/dev/null
+fi
+
 builddir="`pwd`"
 
 dnl ===================================================================
@@ -708,16 +721,23 @@ dnl ===================================================================
 
 EL_CONFIG_RUBY
 
+dnl ===================================================================
+dnl Check for SEE, optional even if installed.
+dnl ===================================================================
+
+EL_CONFIG_SEE
+
 dnl ===================================================================
 dnl Setup global scripting
 dnl ===================================================================
 
-EL_CONFIG_DEPENDS(CONFIG_SCRIPTING, [CONFIG_GUILE CONFIG_LUA CONFIG_PERL CONFIG_PYTHON CONFIG_RUBY], [Scripting])
+EL_CONFIG_DEPENDS(CONFIG_SCRIPTING, [CONFIG_GUILE CONFIG_LUA CONFIG_PERL CONFIG_PYTHON CONFIG_RUBY CONFIG_SEE], [Scripting])
 AC_SUBST(CONFIG_GUILE)
 AC_SUBST(CONFIG_LUA)
 AC_SUBST(CONFIG_PERL)
 AC_SUBST(CONFIG_PYTHON)
 AC_SUBST(CONFIG_RUBY)
+AC_SUBST(CONFIG_SEE)
 AC_SUBST(CONFIG_SCRIPTING)
 
 
@@ -1245,6 +1265,21 @@ AC_OUTPUT([ \
  src/intl/gettext/ref-del.sed
 ])
 
+srcdir2="$(cd "$srcdir" && pwd)"
+if test "$srcdir2" != "$builddir"; then
+	MAKEFILES=$("$MAKE" -C "$srcdir" list | grep Makefile)
+
+	for i in $MAKEFILES; do
+		$MKINSTALLDIRS "$builddir/$(dirname $i)"
+		grep top_builddir= "$srcdir/$i" > "$builddir/$i"
+		case "$srcdir" in
+		/*)	echo "include $srcdir/$i" >> "$builddir/$i" ;;
+		*)	echo "include \$(top_builddir)/$srcdir/$i" >> "$builddir/$i" ;;
+		esac
+		echo "creating $builddir/$i"
+	done
+fi
+
 
 dnl ===================================================================
 dnl Configuration summary

contrib/README

@@ -24,4 +24,3 @@ Files not listed here have description included in their header.
 	patch for $VIMRUNTIME/filetype.vim so that elinks.conf is properly
 	detected and the elinks syntax is associated to it.
 
-$Id: README,v 1.11 2003/06/21 13:25:02 jonas Exp $

contrib/cgi/fspcgi.c

@@ -1,5 +1,4 @@
 /* CGI script for FSP protocol support */
-/* $Id: fspcgi.c,v 1.8 2005/06/29 19:53:18 witekfl Exp $ */
 
 #include <ctype.h>
 #include <fsplib.h>

contrib/elinks.spec.in

@@ -28,7 +28,6 @@
 #
 # Spec file format from < http://www.rpm.org/RPM-HOWTO/build.html >
 #
-# $Id: elinks.spec.in,v 1.19 2005/06/14 13:34:04 witekfl Exp $
 
 Summary:	Enhanced version of Links (Lynx-like text WWW browser)
 Name:		elinks

contrib/elinks.vim

@@ -4,7 +4,6 @@
 " Last Change:	Dec 12th 2002
 " Description:	This file covers elinks version 0.4pre15
 
-" $Id: elinks.vim,v 1.8 2003/12/22 00:10:42 jonas Exp $
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded

contrib/keybind.conf

@@ -1,5 +1,4 @@
 # Example keybinding
-# $Id: keybind.conf,v 1.1 2002/06/30 21:30:24 pasky Exp $
 
 # Copy this file to ~/.elinks/ and use include "keybind.conf" in
 # "elinks.conf" to include it.

contrib/lua/bm.lua

@@ -1,5 +1,4 @@
 -- Bookmark system for Links-Lua.
--- $Id: bm.lua,v 1.7 2005/03/27 22:59:41 miciah Exp $
 
 -----------------------------------------------------------------------
 --  User options

contrib/lua/config.lua

@@ -1,5 +1,4 @@
 -- Configuration for hooks.lua file, put in ~/.elinks/ as config.lua.
--- $Id: config.lua,v 1.11 2005/04/15 18:15:24 miciah Exp $
 
 -- ** IMPORTANT **
 -- Individual functions may be disabled for security by assigning them

contrib/lua/highlight.lua

@@ -1,5 +1,4 @@
 -- Source-code highlighting hook
--- $Id: highlight.lua,v 1.5 2005/03/25 19:02:48 miciah Exp $
 
 highlight_file_types = {
     patch = "%.patch$",

contrib/lua/hooks.lua.in

@@ -1,5 +1,4 @@
 -- Example hooks.lua file, put in ~/.elinks/ as hooks.lua.
--- $Id: hooks.lua.in,v 1.82 2005/08/23 00:18:45 miciah Exp $
 
 -- TODO: Bookmarks stuff should be completely moved to bm.lua. --pasky
 

contrib/lua/md5check.lua

@@ -1,6 +1,5 @@
 -- Check MD5 sums of download files automagically (it expects them in
 -- downloadedfile.txt).
--- $Id: md5check.lua,v 1.5 2005/04/15 15:03:48 miciah Exp $
 
 ----------------------------------------------------------------------
 -- Installation

contrib/lua/remote.lua

@@ -1,5 +1,4 @@
 -- ELinks-side part of elinks-remote
--- $Id: remote.lua,v 1.3 2005/03/27 22:59:41 miciah Exp $
 
 -- See script elinks-remote for explanation what's this about.
 

contrib/see/hooks.js

@@ -0,0 +1,206 @@
+/* Hooks for the ELinks SEE browser scripting
+ *
+ * Copyright (c) Jonas Fonseca, 2005
+ */
+
+function quit() {
+	// ELinks.write("quiting ... " + ELinks.version);
+}
+
+/*********************************************************************
+ *  goto_url(url, current_url)
+ *********************************************************************/
+
+var goto_url_hooks = []
+
+function goto_url(url, current_url)
+{
+	var context = {
+		url: url,
+		current_url: current_url ? current_url : ""
+	}
+
+	for (var i = 0; i < goto_url_hooks.length; i++)
+		if (goto_url_hooks[i](context, current_url))
+			break
+
+	return context.url
+}
+
+// Don't take localhost as directory name
+function expand_localhost(context)
+{
+	if (context.url.match(/localhost/)) {
+		context.url = "http://" + context.url + "/"
+		return true
+	}
+
+	return false
+}
+
+goto_url_hooks.push(expand_localhost)
+
+// You can write smt like "gg" to goto URL dialog and it'll go to google.com.
+// Note that this is obsoleted by the URI rewrite plugin.
+
+var dumbprefixes = {
+	arc:		"http://web.archive.org/web/*/%c",
+	b:		"http://babelfish.altavista.com/babelfish/tr",
+	bz:		"http://bugzilla.elinks.or.cz",
+	bug:		"http://bugzilla.elinks.or.cz",
+	d:		"http://www.dict.org",
+	g:		"http://www.google.com/",
+	gg:		"http://www.google.com/",
+	go:		"http://www.google.com/",
+	fm:		"http://www.freshmeat.net/",
+	sf:		"http://www.sourceforge.net/",
+	dbug:		"http://bugs.debian.org/",
+	dpkg:		"http://packages.debian.org/",
+	pycur:		"http://www.python.org/doc/current/",
+	pydev:		"http://www.python.org/dev/doc/devel/",
+	pyhelp:		"http://starship.python.net/crew/theller/pyhelp.cgi",
+	pyvault:	"http://www.vex.net/parnassus/",
+	e2:		"http://www.everything2.org/",
+	sd:		"http://www.slashdot.org/",
+	vhtml:		"http://validator.w3.org/check?uri=%c",
+	vcss:		"http://jigsaw.w3.org/css-validator/validator?uri=%c"
+}
+
+function expand_dumbprefix(context, current_url)
+{
+	if (dumbprefixes[context.url]) {
+		context.url = dumbprefixes[context.url].replace(/%c/, context.current_url)
+		return true
+	}
+
+	return false
+}
+
+goto_url_hooks.push(expand_dumbprefix)
+
+function gmane (url)
+{
+	var match = url.match(/([^\s]+)\s+(.*)$/)
+	var group = match[1]
+	var words = match[2]
+
+	if (!words) return null
+
+	return "http://search.gmane.org/search.php?query=" + words + "&group=" + group
+}
+
+// You can write "gg:foo" or "gg foo" to goto URL dialog and it'll ask google
+// for it automagically.
+
+// Note that this is _mostly_ obsoleted by the URI rewrite plugin. (It can't do the
+// metas, though.)
+
+function bugzilla (base_url)
+{
+	return function (arguments) {
+		if (!arguments || arguments == '')
+			return base_url
+
+		if (arguments.match(/^[\d]+$/))
+			return base_url + 'show_bug.cgi?id=' + arguments
+
+		return base_url + 'buglist.cgi?short_desc_type=allwordssubstr'
+			+ '&short_desc=' + escape(arguments)
+	}
+}
+
+
+var smartprefixes = {
+	arc:		"http://web.archive.org/web/*/%s",
+	bug:		bugzilla('http://bugzilla.elinks.or.cz/'),
+	cambridge:	"http://dictionary.cambridge.org/results.asp?searchword=%s",
+	cliki:		"http://www.cliki.net/admin/search?words:	%s",
+	d:		"http://www.dict.org/bin/Dict?Query:	%s&Form=Dict1&Strategy=*&Database=*&submit=Submit+query",
+	dmoz:		"http://search.dmoz.org/cgi-bin/search?search=%s",
+	foldoc:		"http://wombat.doc.ic.ac.uk/foldoc/foldoc.cgi?%s",
+	g:		"http://www.google.com/search?q=%s&btnG=Google+Search",
+	gd:		"http://www.google.com/search?q=%s&cat=gwd/Top",
+	gg:		"http://www.google.com/search?q=%s&btnG=Google+Search",
+	// Whose idea was it to use 'gg' for websearches? -- Miciah
+	//gg = "http://groups.google.com/groups?q=%s",
+	gi:		"http://images.google.com/images?q=%s",
+	gmane:		gmane,
+	gn:		"http://news.google.com/news?q=%s",
+	go:		"http://www.google.com/search?q=%s&btnG=Google+Search",
+	gwho:		"http://www.googlism.com/?ism=%s&name=1",
+	gwhat:		"http://www.googlism.com/?ism=%s&name=2",
+	gwhere:		"http://www.googlism.com/?ism=%s&name=3",
+	gwhen:		"http://www.googlism.com/?ism=%s&name=4",
+	fm:		"http://www.freshmeat.net/search/?q=%s",
+	savannah:	"http://savannah.nongnu.org/search/?words=%s&type_of_search=soft&exact=1",
+	sf:		"http://sourceforge.net/search/?q=%s",
+	sfp:		"http://sourceforge.net/projects/%s",
+	sd:		"http://www.slashdot.org/search.pl?query=%s",
+	sdc:		"http://www.slashdot.org/search.pl?query=%s&op=comments",
+	sdu:		"http://www.slashdot.org/search.pl?query=%s&op=users",
+	sdp:		"http://www.slashdot.org/search.pl?query=%s&op=polls",
+	sdj:		"http://www.slashdot.org/search.pl?query=%s&op=journals",
+	dbug:		"http://bugs.debian.org/%s",
+	dpkg:		"http://packages.debian.org/%s",
+	emacs:		"http://www.emacswiki.org/cgi-bin/wiki.pl?search=%s",
+	lyrics:		"http://music.lycos.com/lyrics/results.asp?QT=L&QW=%s",
+	lxr:		"http://lxr.linux.no/ident?i=%s",
+	leo:		"http://dict.leo.org/?search=%s",
+	onelook:	"http://onelook.com/?w=%s&ls=a",
+	py:		"http://starship.python.net/crew/theller/pyhelp.cgi?keyword=%s&version=current",
+	pydev:		"http://starship.python.net/crew/theller/pyhelp.cgi?keyword=%s&version=devel",
+	pyvault:	"http://py.vaults.ca/apyllo.py?find=%s",
+	e2:		"http://www.everything2.org/?node=%s",
+	encz:		"http://www.slovnik.cz/bin/ecd?ecd_il=1&ecd_vcb=%s&ecd_trn=translate&ecd_trn_dir=0&ecd_lines=15&ecd_hptxt=0",
+	czen:		"http://www.slovnik.cz/bin/ecd?ecd_il=1&ecd_vcb=%s&ecd_trn=translate&ecd_trn_dir=1&ecd_lines=15&ecd_hptxt=0",
+	dict:		"http://dictionary.reference.com/search?q=%s",
+	thes:		"http://thesaurus.reference.com/search?q=%s",
+	a:		"http://acronymfinder.com/af-query.asp?String=exact&Acronym=%s",
+	imdb:		"http://imdb.com/Find?%s",
+	mw:		"http://www.m-w.com/cgi-bin/dictionary?book=Dictionary&va=%s",
+	mwt:		"http://www.m-w.com/cgi-bin/thesaurus?book=Thesaurus&va=%s",
+	whatis:		"http://uptime.netcraft.com/up/graph/?host=%s",
+	wiki:		"http://www.wikipedia.org/w/wiki.phtml?search=%s",
+	wn:		"http://www.cogsci.princeton.edu/cgi-bin/webwn1.7.1?stage=1&word=%s",
+	// rfc by number
+	rfc:		"http://www.rfc-editor.org/rfc/rfc%s.txt",
+	// rfc search
+	rfcs:		"http://www.rfc-editor.org/cgi-bin/rfcsearch.pl?searchwords=%s&format=http&abstract=abson&keywords=keyon&num=25",
+	cr:		"http://www.rfc-editor.org/cgi-bin/rfcsearch.pl?searchwords=%s&format=http&abstract=abson&keywords=keyon&num=25",
+	// Internet Draft search
+	rfcid:		"http://www.rfc-editor.org/cgi-bin/idsearch.pl?searchwords=%s&format=http&abstract=abson&keywords=keyon&num=25",
+	urbandict:	"http://www.urbandictionary.com/define.php?term=%s",
+	id:		"http://www.rfc-editor.org/cgi-bin/idsearch.pl?searchwords=%s&format=http&abstract=abson&keywords=keyon&num=25",
+	draft:		"http://www.rfc-editor.org/cgi-bin/idsearch.pl?searchwords=%s&format=http&abstract=abson&keywords=keyon&num=25"
+}
+
+
+function expand_smartprefix(context, current_url)
+{
+	var match = context.url.match(/^([^:\s]+)(:|\s)\s*(.*)\s*$/)
+
+	if (match && match[1] && match[3]) {
+		var nick = match[1]
+		var val = match[3]
+		
+		if (smartprefixes[nick]) {
+			if (typeof smartprefixes[nick] == 'string') {
+				context.url = smartprefixes[nick].replace(/%s/, escape(val))
+				return true
+
+			} else if (typeof smartprefixes[nick] == 'function') {
+				context.url = smartprefixes[nick](val)
+				return true
+
+			} else {
+				ELinks.write('smartprefix "' + nick + '" has unsupported type "' + typeof smartprefixes[nick] + '".')
+				return false
+			}
+		}
+	}
+
+	// Unmatched.
+	return false
+}
+
+goto_url_hooks.push(expand_smartprefix)

contrib/user.css

@@ -3,7 +3,6 @@
  * or filename, put the appropriate pathname in document.css.stylesheet.
  * ELinks will assume that the path is relative to the its configuration
  * directory if it does not begin with a slash. */
-/* $Id: user.css,v 1.2 2005/01/28 14:19:57 jonas Exp $ */
 
 body {
 	/* Don't like the default colours? No problem: */

debian/README.Debian

@@ -1,6 +1,5 @@
 ELinks for Debian
 ----------------------
-$Id: README.Debian,v 1.1 2005/01/11 00:02:17 jonas Exp $
 
 ELinks is a code fork of Links, the original character mode browser of
 Mikulas Patocka. ELinks provides lots of new features over the original 

debian/rules

@@ -3,7 +3,6 @@
 # ELinks debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 #
-# $Id: rules,v 1.17 2005/05/09 11:17:08 jonas Exp $
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1

doc/Makefile

@@ -1,5 +1,5 @@
-path_to_top=..
+top_builddir=..
-include $(path_to_top)/Makefile.config
+include $(top_builddir)/Makefile.config
 
 SUBDIRS = man
 
@@ -198,4 +198,4 @@ $(HTML_DIR)/perl.html: $(top_srcdir)/doc/perl.pod doc-dirs
 $(HTML_DIR)/perl-hooks.html: $(top_srcdir)/contrib/perl/hooks.pl doc-dirs
 	$(POD2HTML) --outfile=$@ < $<
 
-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib

doc/README

@@ -40,4 +40,3 @@ ELinks mailing list. If you are changing something in an existing document,
 please read about how to make unified patches in the Patches section of the
 doc/hacking.txt file.
 
-$Id: README,v 1.14 2005/05/24 19:05:14 jonas Exp $

doc/bookmarks.txt

@@ -222,5 +222,4 @@ TODO list. So be sure to tell us if you would like this process to be
 simplified rather sooner than later.
 
 ///////////////////////////////////////////////////////////////////////////////
-$Id: bookmarks.txt,v 1.21 2005/09/15 11:24:54 jonas Exp $
 ///////////////////////////////////////////////////////////////////////////////

doc/color-model.txt

@@ -296,5 +296,4 @@ http://www.lighthouse.org/color_contrast.htm
 
 
 
-$Id: color-model.txt,v 1.18 2005/01/03 21:51:40 pasky Exp $
 vim: textwidth=80

doc/ecmascript.txt

@@ -122,5 +122,4 @@ detection for it and tie it to `src/ecmascript/ecmascript.c`, which should be
 easy. We await your patches eagerly.
 
 ///////////////////////////////////////////////////////////////////////////////
-$Id: ecmascript.txt,v 1.16 2005/05/24 18:21:45 jonas Exp $
 ///////////////////////////////////////////////////////////////////////////////

doc/events.txt

@@ -245,4 +245,3 @@ Description:
  Allows a subsystem to do whatever clean-up is required when ELinks quits.
 
 -------------------------------------------------------------------------------
-$Id: events.txt,v 1.16 2005/01/03 08:12:57 miciah Exp $

doc/exmode.txt

@@ -101,5 +101,4 @@ command handler, it's just that no one has done it yet ;-). Also, more actions
 should be able to take arguments.
 
 ///////////////////////////////////////////////////////////////////////////////
-$Id: exmode.txt,v 1.11 2005/05/24 18:21:45 jonas Exp $
 ///////////////////////////////////////////////////////////////////////////////

doc/faq.txt

@@ -153,5 +153,4 @@ users can change their User-Agent through the options system.
 
 
 ///////////////////////////////////////////////////////////////////////////////
-$Id: faq.txt,v 1.5 2005/05/24 18:21:45 jonas Exp $
 ///////////////////////////////////////////////////////////////////////////////

doc/feedback.txt

@@ -35,5 +35,4 @@ he'll split the stuff properly amongst himself and other developers >:).
 
 
 ///////////////////////////////////////////////////////////////////////////////
-$Id: feedback.txt,v 1.7 2005/05/24 18:21:45 jonas Exp $
 ///////////////////////////////////////////////////////////////////////////////

doc/hacking.txt

@@ -683,5 +683,4 @@ to compile or execute in one of these modes, then rework it.
 Happy hacking!
 
 ///////////////////////////////////////////////////////////////////////////////
-$Id: hacking.txt,v 1.36 2005/05/24 18:21:45 jonas Exp $
 ///////////////////////////////////////////////////////////////////////////////

doc/index.txt

@@ -85,7 +85,6 @@ detailed notes regarding given modules/subsystems.
 
 
 
-$Id: index.txt,v 1.18 2005/05/03 17:30:02 jonas Exp $
 
 (Note: Sometimes, I broke the lines manually earlier than gqap would,
 for greater aesthetical effect. --pasky)

doc/installation.txt

@@ -76,5 +76,4 @@ include::txt/import-features.conf.txt[]
 endif::installation-webpage[]
 
 ///////////////////////////////////////////////////////////////////////////////
-$Id: installation.txt,v 1.12 2005/06/15 20:08:14 jonas Exp $
 ///////////////////////////////////////////////////////////////////////////////

doc/introduction.txt

@@ -362,5 +362,4 @@ everything is marked TODO!
 
 
 ///////////////////////////////////////////////////////////////////////////////
-$Id: introduction.txt,v 1.24 2005/05/24 18:21:45 jonas Exp $
 ///////////////////////////////////////////////////////////////////////////////

doc/lua-scripting.txt

@@ -561,5 +561,4 @@ More ideas
    do.
 
 ///////////////////////////////////////////////////////////////////////////////
-$Id: lua-scripting.txt,v 1.5 2005/05/24 18:21:45 jonas Exp $
 ///////////////////////////////////////////////////////////////////////////////

doc/mailcap.txt

@@ -126,5 +126,4 @@ application/postscript; ps2ascii %s ; copiousoutput
 -------------------------------------------------------------------------------
 
 ///////////////////////////////////////////////////////////////////////////////
-$Id: mailcap.txt,v 1.10 2005/05/24 18:21:45 jonas Exp $
 ///////////////////////////////////////////////////////////////////////////////

doc/man/Makefile

@@ -1,6 +1,6 @@
-path_to_top=../..
+top_builddir=../..
-include $(path_to_top)/Makefile.config
+include $(top_builddir)/Makefile.config
 
 SUBDIRS = man1 man5
 
-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib

doc/man/man1/Makefile

@@ -1,10 +1,10 @@
-path_to_top=../../..
+top_builddir=../../..
-include $(path_to_top)/Makefile.config
+include $(top_builddir)/Makefile.config
 
-elinks.1: elinks.1.in $(path_to_top)/configure.in
+elinks.1: $(srcdir)/elinks.1.in $(top_srcdir)/configure.in
-	cd $(path_to_top) && \
+	cd $(top_srcdir) && \
 	CONFIG_FILES="$(RELPATH)$@" CONFIG_HEADERS= $(SHELL) ./config.status
 
 MAN1 = elinks.1
 
-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib

doc/man/man5/Makefile

@@ -1,6 +1,6 @@
-path_to_top=../../..
+top_builddir=../../..
-include $(path_to_top)/Makefile.config
+include $(top_builddir)/Makefile.config
 
-MAN5 = elinks.conf.5 elinkskeys.5
+MAN5 = $(srcdir)/elinks.conf.5 $(srcdir)/elinkskeys.5
 
-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib

doc/marks.txt

@@ -86,5 +86,4 @@ you must quit (or kill) them all to get rid of the damn thing.  But that's a
 different story.
 
 ///////////////////////////////////////////////////////////////////////////////
-$Id: marks.txt,v 1.13 2005/08/23 13:19:58 zas Exp $
 ///////////////////////////////////////////////////////////////////////////////

doc/mime.txt

@@ -180,5 +180,4 @@ handler with the name for the handler you want to assign to the MIME type.
 E.g. you may want to have set mime.type.image.jpeg = "image_viewer".
 
 ///////////////////////////////////////////////////////////////////////////////
-$Id: mime.txt,v 1.3 2005/05/24 18:21:45 jonas Exp $
 ///////////////////////////////////////////////////////////////////////////////

doc/remote.txt

@@ -84,5 +84,4 @@ new tabs containing `slashdot.org`, `freshmeat.net` and a Google search of elink
 will be opened.
 
 ///////////////////////////////////////////////////////////////////////////////
-$Id: remote.txt,v 1.12 2005/05/24 18:21:45 jonas Exp $
 ///////////////////////////////////////////////////////////////////////////////

doc/small.txt

@@ -92,5 +92,4 @@ Whow ! Around 200kb :)
 ==============================================================================
 
 ///////////////////////////////////////////////////////////////////////////////
-$Id: small.txt,v 1.18 2005/05/24 18:21:45 jonas Exp $
 ///////////////////////////////////////////////////////////////////////////////

doc/tabs.txt

@@ -112,5 +112,4 @@ bookmark therein the currently displayed document of each tab:
   periodically saved tabs will be removed.
 
 ///////////////////////////////////////////////////////////////////////////////
-$Id: tabs.txt,v 1.9 2005/05/24 18:21:45 jonas Exp $
 ///////////////////////////////////////////////////////////////////////////////

doc/terminals.txt

@@ -165,5 +165,4 @@ within a terminal emulator that supports 256 colors and you have compiled both
 Screen and ELinks to support it, choose '256 colors'.
 
 ///////////////////////////////////////////////////////////////////////////////
-$Id: terminals.txt,v 1.6 2005/06/15 20:08:14 jonas Exp $
 ///////////////////////////////////////////////////////////////////////////////

doc/tools/help2doc

@@ -1,6 +1,5 @@
 #!/bin/sh
 #
-# $Id: help2doc,v 1.19 2005/05/17 16:30:55 jonas Exp $
 #
 # Script used to generate doc/book/config/cmdoptions.xml
 # and hopefully other in the future.

doc/tools/import-features.conf

@@ -3,7 +3,6 @@
 # Generate asciidoc from the features.conf file in the top-level direftory.
 # Copyright (c) Jonas Fonseca <fonseca@diku.dk>, 2005
 #
-# $Id: import-features.conf,v 1.2 2005/05/18 00:45:26 jonas Exp $
 
 TMPFILE=$(mktemp import-features.conf.XXXXXX) || exit 1
 

doc/tools/make-elinks-manpage

@@ -3,7 +3,6 @@
 # Generate the elinks(1) manpage.
 # Copyright (c) Jonas Fonseca <fonseca@diku.dk>, 2005
 #
-# $Id: make-elinks-manpage,v 1.12 2005/07/01 13:15:53 jonas Exp $
 
 DOCTYPE=$(echo "$1" | sed 's/.*elinks.1.//' | sed 's/.txt.*//')
 ELINKS=$2

doc/tools/make-elinkskeys-manpage

@@ -3,7 +3,6 @@
 # Generate the elinkskeys(5) manpage.
 # Copyright (c) Jonas Fonseca <fonseca@diku.dk>, 2005
 #
-# $Id: make-elinkskeys-manpage,v 1.8 2005/06/13 20:41:48 jonas Exp $
 
 # FIXME:
 #

doc/urlshortcuts.txt

@@ -89,5 +89,4 @@ scripting enabled in order to make use of it, and many users don't have Lua
 installed.
 
 ///////////////////////////////////////////////////////////////////////////////
-$Id: urlshortcuts.txt,v 1.5 2005/05/24 18:21:45 jonas Exp $
 ///////////////////////////////////////////////////////////////////////////////

features.conf

@@ -604,5 +604,4 @@ CONFIG_BACKTRACE=yes
 CONFIG_NO_ROOT_EXEC=no
 
 
-# $Id: features.conf,v 1.35 2005/08/09 17:04:01 jonas Exp $
 # vim: filetype=sh textwidth=80

po/Makefile

@@ -1,5 +1,5 @@
-path_to_top=..
+top_builddir=..
-include $(path_to_top)/Makefile.config
+include $(top_builddir)/Makefile.config
 
 # Where to install the catalog files.
 localedir = $(datadir)/locale
@@ -7,17 +7,15 @@ localedir = $(datadir)/locale
 # These are for some reason not added magically to the Makefile.
 MSGMERGE = msgmerge
 
-POTFILES_REL = $(shell find $(top_srcdir)/src/ -name '*.[ch]' -o -name options.inc -o -name 'actions-*.inc' | sort)
+# Name of the file containing the list of files to translate (used by
-POTFILES_ABS = $(shell cd $(top_srcdir); find src/ -name '*.[ch]' -o -name options.inc -o -name 'actions-*.inc' | sort)
+# xgettext) 
+POTFILES_ABS_LIST = potfiles.list
 
 
 SUFFIXES = .po .gmo .mo
 .SUFFIXES: .gmo .mo .po
 
-.po.mo:
+%.gmo: $(srcdir)/%.po
-	$(MSGFMT) -o $@ $<
-
-.po.gmo:
 	@file=`echo $* | sed 's,.*/,,'`.gmo \
 	  && rm -f $$file && echo -n $*": " \
 	  && $(GMSGFMT) --statistics -o $$file $<
@@ -43,16 +41,20 @@ all-local: $(CATALOGS)
 ### Creating the template po template file
 #
 # This pulls in _all_ .c and .h files in the src directory. Even files that has
-# not been added to the cvs repo. Beware of junk entries!
+# not been added to the git repo. Beware of junk entries!
 
-$(srcdir)/$(PACKAGE).pot: $(POTFILES_REL)
+$(srcdir)/$(POTFILES_ABS_LIST):
+	@( cd $(top_srcdir); \
+	  find src/ -type f -name '*.[ch]' -o -name options.inc -o -name 'actions-*.inc' | sort ) \
+	 > $(srcdir)/$(POTFILES_ABS_LIST)
+
+$(srcdir)/$(PACKAGE).pot: $(srcdir)/$(POTFILES_ABS_LIST)
 	$(XGETTEXT) --default-domain=$(PACKAGE) \
 		    --directory=$(top_srcdir) \
 		    --add-comments --language=C \
-		    --keyword=_ --keyword=N_ --keyword=n_:1,2 --keyword=N__ $(POTFILES_ABS) \
+		    --keyword=_ --keyword=N_ --keyword=n_:1,2 --keyword=N__ -f $(srcdir)/$(POTFILES_ABS_LIST) \
-	&& test ! -f $(PACKAGE).po \
+	&& test -f $(PACKAGE).po \
-	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
+	&& mv -f $(PACKAGE).po $(srcdir)/$(PACKAGE).pot 
-		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
 
 
 ### Updating po and gmo files
@@ -63,23 +65,16 @@ $(srcdir)/$(PACKAGE).pot: $(POTFILES_REL)
 # either <lang> or <lang>.po when calling make. Example: make update-po PO=is
 
 update-po: Makefile $(srcdir)/$(PACKAGE).pot
-	@cd $(srcdir); \
+	@cd $(srcdir)
-	if test -n "$(PO)"; then \
+	@$(foreach lang,$(basename $(if $(strip $(PO)),$(PO),$(GMOFILES))), \
-	  lang=`echo $(PO) | sed 's/\.po//'`; \
+	  echo -n "$(lang): "; \
-	  catalogs=$$lang.gmo; \
+	  if $(MSGMERGE) $(lang).po $(PACKAGE).pot -o $(lang).new.po; then \
-	fi; \
+	    mv -f $(lang).new.po $(lang).po; \
-	if test -z "$$catalogs"; then catalogs='$(GMOFILES)'; fi; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-	  echo -n "$$lang: "; \
-	  if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \
-	    mv -f $$lang.new.po $$lang.po; \
 	  else \
-	    echo "msgmerge for $$cat failed!"; \
+	    echo "msgmerge failed!"; \
-	    rm -f $$lang.new.po; \
+	    rm -f $(lang).new.po; \
 	  fi; \
-	done
+	)
 	$(MAKE) update-gmo
 
 update-gmo: Makefile $(GMOFILES)
@@ -90,17 +85,10 @@ update-gmo: Makefile $(GMOFILES)
 #
 
 check-po:
-	@if test -n "$(PO)"; then \
+	@$(foreach lang,$(basename $(if $(strip $(PO)),$(PO),$(GMOFILES))), \
-	  lang=`echo $(PO) | sed 's/\.po//'`; \
+	  echo -n "$(lang): "; \
-	  catalogs=$$lang.gmo; \
+	  $(GMSGFMT) --check --check-accelerators=~ --verbose --statistics -o /dev/null $(lang).po; \
-	fi; \
+	)
-	if test -z "$$catalogs"; then catalogs='$(GMOFILES)'; fi; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-	  echo -n "$$lang: "; \
-	  $(GMSGFMT) --check --check-accelerators=~ --verbose --statistics -o /dev/null $$lang.po; \
-	done
 
 ### Installation and distribution
 #
@@ -108,28 +96,18 @@ check-po:
 
 install-local: install-local-$(CONFIG_NLS)
 install-local-no:
-install-local-yes:
+install-local-yes: all-local
 	$(MKINSTALLDIRS) $(DESTDIR)$(localedir)
-	@catalogs='$(CATALOGS)'; \
+	@$(foreach lang,$(basename $(if $(strip $(PO)),$(PO),$(CATALOGS))), \
-	for cat in $$catalogs; do \
+		$(MKINSTALLDIRS) $(DESTDIR)$(localedir)/$(lang)/LC_MESSAGES; \
-	  cat=`basename $$cat`; \
+		$(call ncmd,installdata,$(lang).gmo,$(DESTDIR)$(localedir)/$(lang)/LC_MESSAGES/$(PACKAGE).mo); \
-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+	)
-	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(MKINSTALLDIRS) $(DESTDIR)$$dir; \
-	  if test -r $(srcdir)/$$cat; then \
-	    podir=./$(srcdir); \
-	    if test "$$(cd $$podir && pwd)" = "$$(pwd)"; then podir=; fi; \
-	    $(call ncmd,installdata,$$podir$$cat,$(DESTDIR)$$dir/$(PACKAGE).mo); \
-	  else \
-	    echo "Error: Cannot find $$cat"; \
-	  fi; \
-	done
 
 # Steal the `dist' target so that .po and .gmo files will be properly updated
 # then the dependence on `distdir' will take care of copying.
 dist: update-po distdir
 
 clean-local:
-	rm -f $(PACKAGE).po *.new.po
+	rm -f $(PACKAGE).po *.new.po $(srcdir)/$(POTFILES_ABS_LIST)
 
-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib

po/README

@@ -349,5 +349,4 @@ current status of each language file. Be proud if your language file rank higher
 or the same as the French one.
 
 
-$Id: README,v 1.9 2005/03/03 10:48:00 zas Exp $
 vim: textwidth=80

po/gen_translations_stats.sh

@@ -19,4 +19,3 @@ done | sort -b -k1,1nr -k2,2 | sed 's/^ *[0-9]*//'
 
 echo
 
-# $Id: gen_translations_stats.sh,v 1.6 2003/10/18 17:38:26 jonas Exp $ #

po/hu.po

@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-05-01 20:48+0000\n"
-"PO-Revision-Date: 2005-05-01 22:57+0000\n"
+"PO-Revision-Date: 2005-10-11 19:06+0000\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -331,6 +331,11 @@ msgid ""
 "kept across ELinks sessions. If disabled all folders will\n"
 "appear unexpanded next time ELinks is run."
 msgstr ""
+"A k<>nyvjelz<6C>k ment<6E>sekor azt az <20>llapotot is t<>rolja el, hogy\n"
+"a k<>nyvjelz<6C>kben l<>v<EFBFBD> mapp<70>k nyitott vagy <20>sszez<65>rt <20>llapot<6F>ak\n"
+"voltak, ezzel megmarad a k<>nyvjelz<6C> ablak kin<69>zete. Ha ez az\n"
+"opci<63> ki van kapcsolva, az <20>sszes mappa be lesz z<>rva az ELinks\n"
+"k<>vetkez<65> ind<6E>t<EFBFBD>sakor."
 
 #: src/bookmarks/bookmarks.c:74
 msgid "Periodic snapshotting"
@@ -708,6 +713,9 @@ msgid ""
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
+"Az ELinks <20>j ablakban val<61> megnyit<69>s<EFBFBD>hoz haszn<7A>lhat<61>. A megadott\n"
+"ID-vel rendelkez<65> p<>ld<6C>ny adatait haszn<7A>lja fel az <20>j p<>ld<6C>ny l<>trehoz<6F>s<EFBFBD>hoz.\n"
+"Ritk<74>n haszn<7A>lt opci<63>."
 
 #: src/config/cmdline.c:642
 msgid "Name of directory with configuration file"
@@ -1733,7 +1741,7 @@ msgstr "A linkek sorsz
 
 #: src/config/kbdbind.c:542
 msgid "Toggle plain renderer compression of empty lines"
-msgstr ""
+msgstr "Az <20>res sorok <20>sszevon<6F>s<EFBFBD>nak v<>ltogat<61>sa"
 
 #: src/config/kbdbind.c:543
 msgid "Toggle wrapping of text"
@@ -2455,6 +2463,10 @@ msgid ""
 "in which links should receive focus when using the keyboard\n"
 "to navigating the document."
 msgstr ""
+"Navig<69>ci<63> a tabindex <20>ltal megadott sorrend szerint.\n"
+"A HTML elemek TABINDEX attrib<69>tuma meghat<61>rozza hogy\n"
+"a billenty<74>zettel t<>rt<72>n<EFBFBD> navig<69>ci<63> sor<6F>n melyik elem milyen\n"
+"sorrendben k<>vetkezzen egym<79>s ut<75>n."
 
 #: src/config/options.inc:322
 msgid "Number keys select links"

src/Makefile

@@ -1,5 +1,5 @@
-path_to_top=..
+top_builddir=..
-include $(path_to_top)/Makefile.config
+include $(top_builddir)/Makefile.config
 
 SUBDIRS-$(CONFIG_BOOKMARKS)	+= bookmarks
 SUBDIRS-$(CONFIG_COOKIES)	+= cookies
@@ -41,5 +41,4 @@ elinks: lib.o
 
 PROGS = elinks
 
-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
-

src/README

@@ -69,4 +69,3 @@ the other way around)".
                  `----------'
 
 
-$Id: README,v 1.18 2005/06/15 21:24:35 pasky Exp $

src/bfu/Makefile

@@ -1,5 +1,5 @@
-path_to_top=../..
+top_builddir=../..
-include $(path_to_top)/Makefile.config
+include $(top_builddir)/Makefile.config
 
 OBJS-$(CONFIG_LEDS) += leds.o
 
@@ -20,4 +20,4 @@ OBJS = \
  text.o \
  widget.o
 
-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib

src/bfu/button.c

@@ -1,5 +1,4 @@
 /* Button widget handlers. */
-/* $Id: button.c,v 1.94 2005/03/24 14:56:31 zas Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

src/bfu/button.h

@@ -1,4 +1,3 @@
-/* $Id: button.h,v 1.40 2005/03/23 10:57:56 zas Exp $ */
 
 #ifndef EL__BFU_BUTTON_H
 #define EL__BFU_BUTTON_H

src/bfu/checkbox.c

@@ -1,5 +1,4 @@
 /* Checkbox widget handlers. */
-/* $Id: checkbox.c,v 1.99 2005/03/24 15:10:11 zas Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

src/bfu/checkbox.h

@@ -1,4 +1,3 @@
-/* $Id: checkbox.h,v 1.39 2005/03/01 16:30:05 zas Exp $ */
 
 #ifndef EL__BFU_CHECKBOX_H
 #define EL__BFU_CHECKBOX_H

src/bfu/common.h

@@ -1,4 +1,3 @@
-/* $Id: common.h,v 1.8 2005/03/05 20:50:34 zas Exp $ */
 
 #ifndef EL__BFU_COMMON_H
 #define EL__BFU_COMMON_H

src/bfu/dialog.c

@@ -1,5 +1,4 @@
 /* Dialog box implementation. */
-/* $Id: dialog.c,v 1.206 2005/06/13 00:43:26 jonas Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

src/bfu/dialog.h

@@ -1,4 +1,3 @@
-/* $Id: dialog.h,v 1.57 2005/06/13 00:43:26 jonas Exp $ */
 
 #ifndef EL__BFU_DIALOG_H
 #define EL__BFU_DIALOG_H

src/bfu/group.c

@@ -1,5 +1,4 @@
 /* Widget group implementation. */
-/* $Id: group.c,v 1.72 2005/03/24 11:44:42 zas Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

src/bfu/group.h

@@ -1,4 +1,3 @@
-/* $Id: group.h,v 1.15 2003/12/01 15:19:53 pasky Exp $ */
 
 #ifndef EL__BFU_GROUP_H
 #define EL__BFU_GROUP_H

src/bfu/hierbox.c

@@ -1,5 +1,4 @@
 /* Hiearchic listboxes browser dialog commons */
-/* $Id: hierbox.c,v 1.221 2005/07/31 00:14:18 miciah Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

src/bfu/hierbox.h

@@ -1,4 +1,3 @@
-/* $Id: hierbox.h,v 1.71 2005/07/31 00:14:18 miciah Exp $ */
 
 #ifndef EL__BFU_HIERBOX_H
 #define EL__BFU_HIERBOX_H

src/bfu/hotkey.c

@@ -1,5 +1,4 @@
 /* Hotkeys handling. */
-/* $Id: hotkey.c,v 1.31 2005/01/05 14:37:44 jonas Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

src/bfu/hotkey.h

@@ -1,5 +1,4 @@
 /* Hotkeys handling. */
-/* $Id: hotkey.h,v 1.9 2005/01/05 14:37:44 jonas Exp $ */
 
 #ifndef EL__BFU_HOTKEY_H
 #define EL__BFU_HOTKEY_H

src/bfu/inpfield.c

@@ -1,5 +1,4 @@
 /* Input field widget implementation. */
-/* $Id: inpfield.c,v 1.216 2005/08/03 23:02:59 jonas Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

src/bfu/inpfield.h

@@ -1,4 +1,3 @@
-/* $Id: inpfield.h,v 1.54 2005/06/10 04:47:02 miciah Exp $ */
 
 #ifndef EL__BFU_INPFIELD_H
 #define EL__BFU_INPFIELD_H

src/bfu/inphist.c

@@ -1,5 +1,4 @@
 /* Input history for input fields. */
-/* $Id: inphist.c,v 1.96 2005/08/03 23:02:59 jonas Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

src/bfu/inphist.h

@@ -1,4 +1,3 @@
-/* $Id: inphist.h,v 1.19 2005/08/03 23:02:59 jonas Exp $ */
 
 #ifndef EL__BFU_INPHIST_H
 #define EL__BFU_INPHIST_H

src/bfu/leds.c

@@ -1,5 +1,4 @@
 /* These cute LightEmittingDiode-like indicators. */
-/* $Id: leds.c,v 1.88 2005/08/25 15:08:00 zas Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

src/bfu/leds.h

@@ -1,4 +1,3 @@
-/* $Id: leds.h,v 1.23 2005/06/13 00:43:27 jonas Exp $ */
 
 #ifndef EL__BFU_LEDS_H
 #define EL__BFU_LEDS_H

src/bfu/listbox.c

@@ -1,5 +1,4 @@
 /* Listbox widget implementation. */
-/* $Id: listbox.c,v 1.212 2005/08/02 01:20:45 miciah Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

src/bfu/listbox.h

@@ -1,4 +1,3 @@
-/* $Id: listbox.h,v 1.83 2005/05/12 22:19:53 miciah Exp $ */
 
 #ifndef EL__BFU_LISTBOX_H
 #define EL__BFU_LISTBOX_H

src/bfu/listmenu.c

@@ -1,5 +1,4 @@
 /* List menus functions */
-/* $Id: listmenu.c,v 1.38 2005/06/14 12:25:19 jonas Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

src/bfu/listmenu.h

@@ -1,4 +1,3 @@
-/* $Id: listmenu.h,v 1.4 2004/11/22 13:27:41 zas Exp $ */
 
 #ifndef EL__BFU_LISTMENU_H
 #define EL__BFU_LISTMENU_H

src/bfu/menu.c

@@ -1,5 +1,4 @@
 /* Menu system implementation. */
-/* $Id: menu.c,v 1.302 2005/09/13 09:22:58 zas Exp $ */
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE /* XXX: we _WANT_ strcasestr() ! */

src/bfu/menu.h

@@ -1,4 +1,3 @@
-/* $Id: menu.h,v 1.70 2005/06/10 04:47:02 miciah Exp $ */
 
 #ifndef EL__BFU_MENU_H
 #define EL__BFU_MENU_H

src/bfu/msgbox.c

@@ -1,5 +1,4 @@
 /* Prefabricated message box implementation. */
-/* $Id: msgbox.c,v 1.102 2005/06/22 14:00:44 witekfl Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

src/bfu/msgbox.h

@@ -1,4 +1,3 @@
-/* $Id: msgbox.h,v 1.28 2005/03/23 11:18:08 zas Exp $ */
 
 #ifndef EL__BFU_MSGBOX_H
 #define EL__BFU_MSGBOX_H

src/bfu/style.c

@@ -1,5 +1,4 @@
 /* BFU display helpers. */
-/* $Id: style.c,v 1.15 2005/03/05 21:34:30 jonas Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

src/bfu/style.h

@@ -1,4 +1,3 @@
-/* $Id: style.h,v 1.7 2004/11/19 17:46:05 zas Exp $ */
 
 #ifndef EL__BFU_STYLE_H
 #define EL__BFU_STYLE_H