repo: rxvt-unicode-sixel
action: commit
revision: 
path_from: 
revision_from: 88385d169c4e46759f6df872aa8833bdcd1145d0:
path_to: 
revision_to: 

commit 88385d169c4e46759f6df872aa8833bdcd1145d0
Author: Emanuele Giaquinta 
Date:   Sat Oct 11 22:02:50 2014 +0000

    Fix extension autoload.

diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod

--- a/doc/rxvt.1.pod
+++ b/doc/rxvt.1.pod
@@ -1230,10 +1230,12 @@ example, C will use all the default extensions except
 C.

 The default set includes the C, C,
-C and C extensions, any extensions that define
-keybindings via C meta comments, extensions loaded because
-their resources/commandline switches were used, and extensions which are
-mentioned in B resources.
+C and C extensions, any extensions that
+define keybindings via C meta comments, and extensions which
+are mentioned in B resources.
+
+Any extension such that a corresponding resource is given on the
+command line is automatically appended to B.

 Each extension is looked up in the library directories, loaded if
 necessary, and bound to the current terminal instance. When the library
diff --git a/src/urxvt.pm b/src/urxvt.pm

--- a/src/urxvt.pm
+++ b/src/urxvt.pm
@@ -681,14 +681,14 @@ sub invoke {
       }

       for (
-         grep $_, map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2
+         (grep $_, map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2),
+         @{ delete $TERM->{perl_ext_3} }
       ) {
          if ($_ eq "default") {

             $ext_arg{$_} = []
                for
                   qw(selection option-popup selection-popup readline),
-                  @{ delete $TERM->{perl_ext_3} },
                   map $_->[0], values %{ $TERM->{meta}{binding} };

             for ($TERM->_keysym_resources) {

-----END OF PAGE-----