*** empty log message ***

diff --git a/configure.ac b/configure.ac
index fa32f803f61c3871c310558ebe8ca3a31eb04cee..552db03883ca2a45546d0bfa5916f23c7384229e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -50,12 +50,12 @@ AC_SUBST(LINKER,[$LINKER])
 
 AC_LANG(C++)
 dnl# --------------------------------------------------------------------------
-dnl# Supply default CXXLAGS, if not specified by `CXXLAGS=flags ./configure'
+dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
 dnl#
 if test -z "$orig_CXXFLAGS"; then
   if test x$GCC = xyes && test "x$GXX" = xyes; then
     CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs"
-    AC_COMPILE_IFELSE([int i;], [], [CXXFLAGS="-g -O3"])
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [], [CXXFLAGS="-g -O3"])
   else
     CXXFLAGS="-O"
   fi

diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod
index 7e4781f8e491bfdfe01c0746b2ce3b4d0aaa596c..1fe35d89949d36c02a2a78178048a9c762bbc921 100644 (file)
--- a/doc/rxvt.1.pod
+++ b/doc/rxvt.1.pod
@@ -1192,9 +1192,10 @@ the selection.
 
 =item B<Insertion>:
 
-Pressing and releasing the Middle mouse button (or B<Shift-Insert>) in
-an B<@@RXVT_NAME@@> window causes the current text selection to be
-inserted as if it had been typed on the keyboard.
+Pressing and releasing the Middle mouse button in an B<@@RXVT_NAME@@> window
+causes the value of the PRIMARY selection (Shift for CLIPBOARD) to be inserted
+as if it had been typed on the keyboard.
+B<Shift-Insert> causes the value of the PRIMARY selection to be inserted too.
 
 =back
 

diff --git a/src/urxvt.pm b/src/urxvt.pm
index 94b349c6ff93a3a07a475beea75dcd25fa5d92db..773747bcc4515715f164a9090140478ea6a0bc88 100644 (file)
--- a/src/urxvt.pm
+++ b/src/urxvt.pm
@@ -93,7 +93,7 @@ runtime.
 
 Binds a popup menu to Ctrl-Button3 that lets you convert the selection
 text into various other formats/action (such as uri unescaping, perl
-evalution, web-browser starting etc.), depending on content.
+evaluation, web-browser starting etc.), depending on content.
 
 Other extensions can extend this popup menu by pushing a code reference
 onto C<@{ $term->{selection_popup_hook} }>, that is called whenever the