From: Ben Pfaff <blp@cs.stanford.edu>
Date: Mon, 25 Apr 2011 04:41:30 +0000 (-0700)
Subject: DISPLAY FILE LABEL: Display in a more natural way.
X-Git-Tag: v0.7.8~34
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfd019e1c9272143a637747cf8dbd66774696483;p=pspp-builds.git

DISPLAY FILE LABEL: Display in a more natural way.
---

diff --git a/perl-module/t/Pspp.t b/perl-module/t/Pspp.t
index d93a2702..6e267f6f 100644
--- a/perl-module/t/Pspp.t
+++ b/perl-module/t/Pspp.t
@@ -185,9 +185,7 @@ name,Format: A20,,2
 ,Display Alignment: Left,,
 ,Display Width: 20,,
 
-File label:
-
-This is the file label
+File label: This is the file label
 
 Documents in the active dataset:
 
diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c
index 84a4d8e8..7b428df5 100644
--- a/src/language/dictionary/sys-file-info.c
+++ b/src/language/dictionary/sys-file-info.c
@@ -197,10 +197,8 @@ cmd_display (struct lexer *lexer, struct dataset *ds)
 	tab_output_text (TAB_LEFT,
 			 _("The active dataset does not have a file label."));
       else
-	{
-	  tab_output_text (TAB_LEFT | TAT_TITLE, _("File label:"));
-	  tab_output_text (TAB_LEFT | TAB_FIX, dict_get_label (dataset_dict (ds)));
-	}
+        tab_output_text_format (TAB_LEFT, _("File label: %s"),
+                                dict_get_label (dataset_dict (ds)));
     }
   else
     {
diff --git a/tests/language/utilities/title.at b/tests/language/utilities/title.at
index 0d94385c..cd954f24 100644
--- a/tests/language/utilities/title.at
+++ b/tests/language/utilities/title.at
@@ -74,9 +74,7 @@ The last line should end with a period: .
 
 (Entered <date>)
 
-File label:
-
-This is a test file label
+File label: This is a test file label
 
 Documents in the active dataset:
 
@@ -94,9 +92,7 @@ Line two
 
 (Entered <date>)
 
-File label:
-
-This is a test file label
+File label: This is a test file label
 
 Documents in the active dataset:
 
@@ -138,8 +134,6 @@ document There should be another document now.
 
 (Entered <date>)
 
-File label:
-
-This is a test file label
+File label: This is a test file label
 ])
 AT_CLEANUP
diff --git a/tests/perl-module.at b/tests/perl-module.at
index 9342bc35..308dd771 100644
--- a/tests/perl-module.at
+++ b/tests/perl-module.at
@@ -56,9 +56,7 @@ DISPLAY DICTIONARY.
 SHOW WEIGHT.
 ])
 AT_CHECK([pspp -O format=csv dump-dict.sps], [0],
-  [File label:
-
-My Dictionary
+  [File label: My Dictionary
 
 Documents in the active dataset:
 
@@ -151,9 +149,7 @@ name,Format: A20,,2
 ,Display Alignment: Left,,
 ,Display Width: 20,,
 
-File label:
-
-This is the file label
+File label: This is the file label
 
 Documents in the active dataset:
 
@@ -173,9 +169,7 @@ name,Format: A20,,2
 ,Display Alignment: Left,,
 ,Display Width: 20,,
 
-File label:
-
-This is the file label
+File label: This is the file label
 
 Documents in the active dataset: