From: root <root>
Date: Mon, 9 Jan 2006 19:25:57 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=74875ea3ba3cd6d6d9adc5c44257c434296590c1;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/src/perl/selection-popup b/src/perl/selection-popup
index ce3fe526..e5984873 100644
--- a/src/perl/selection-popup
+++ b/src/perl/selection-popup
@@ -55,7 +55,7 @@ sub on_button_press {
          $add_button->("rot13" => sub { y/A-Za-z/N-ZA-Mn-za-m/ });
 
          urxvt::safe
-            and $add_button->("eval perl expression" => sub { $_ = eval urxvt::untaint $_ });
+            and $add_button->("eval perl expression" => sub { no warnings; $_ = eval urxvt::untaint $_ });
 
          /^(\S+):(\d+):?$/
             and $add_button->("vi-commands to load '$1'" => sub { s/^(\S+):(\d+):?$/\x1b:e $1\x0d:$2\x0d/ });
diff --git a/src/rxvtperl.xs b/src/rxvtperl.xs
index c5ea2909..ef2bf4dc 100644
--- a/src/rxvtperl.xs
+++ b/src/rxvtperl.xs
@@ -936,8 +936,15 @@ rxvt_term::ModLevel3Mask ()
 
 char *
 rxvt_term::display_id ()
+	ALIAS:
+           display_id = 0
+           locale     = 1
 	CODE:
-        RETVAL = THIS->display->id;
+        switch (ix)
+          {
+            case 0: RETVAL = THIS->display->id; break;
+            case 1: RETVAL = THIS->locale;      break;
+          }
         OUTPUT:
         RETVAL
 
diff --git a/src/urxvt.pm b/src/urxvt.pm
index 62cb9aec..6ad1ca22 100644
--- a/src/urxvt.pm
+++ b/src/urxvt.pm
@@ -919,6 +919,14 @@ Return the window id of the terminal window.
 
 Return various integers describing terminal characteristics.
 
+=item $lc_ctype = $term->locale
+
+Returns the LC_CTYPE category string used by this rxvt-unicode.
+
+=item $x_display = $term->display_id
+
+Return the DISPLAY used by rxvt-unicode.
+
 =item $modifiermask = $term->ModLevel3Mask
 
 =item $modifiermask = $term->ModMetaMask
@@ -1170,7 +1178,7 @@ sub add_item {
 sub add_separator {
    my ($self, $sep) = @_;
 
-   $sep ||= "═";
+   $sep ||= "=";
 
    $self->add_item ({
       rend => { normal => "\x1b[0;30;47m", hover => "\x1b[0;30;47m", active => "\x1b[0;30;47m" },