aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-12-22 13:09:40 -0800
committerGlenn Morris2012-12-22 13:09:40 -0800
commitceccabdb93e2fc0509e8e70223fcc659376506f2 (patch)
tree52cbf6b3a06fcd89a17a95f988f0f13bd44047ea
parent88edc57f6f15458f9a21b021f24f67fed9f487ea (diff)
downloademacs-ceccabdb93e2fc0509e8e70223fcc659376506f2.tar.gz
emacs-ceccabdb93e2fc0509e8e70223fcc659376506f2.zip
Tweak some over/underfull lines
* doc/misc/ada-mode.texi (Project file variables): Reword to reduce underfull hbox. (No project files, Use GNAT project file): Use smallexample to make some overfull lines less terrible.
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/ada-mode.texi16
2 files changed, 13 insertions, 8 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index e3e73965f1b..23bc19a6862 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,10 @@
12012-12-22 Glenn Morris <rgm@gnu.org> 12012-12-22 Glenn Morris <rgm@gnu.org>
2 2
3 * ada-mode.texi (Project file variables):
4 Reword to reduce underfull hbox.
5 (No project files, Use GNAT project file):
6 Use smallexample to make some overfull lines less terrible.
7
3 * autotype.texi, bovine.texi, ede.texi, eieio.texi, pcl-cvs.texi: 8 * autotype.texi, bovine.texi, ede.texi, eieio.texi, pcl-cvs.texi:
4 Fix cross-references to separate manuals. 9 Fix cross-references to separate manuals.
5 10
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index f4c29bb6e16..191babf97bd 100644
--- a/doc/misc/ada-mode.texi
+++ b/doc/misc/ada-mode.texi
@@ -521,8 +521,8 @@ ada_project_path_sep=:
521ada_project_path=$GDS_ROOT/makerules 521ada_project_path=$GDS_ROOT/makerules
522ada_project_path=../opentoken 522ada_project_path=../opentoken
523@end example 523@end example
524the environment variable @code{ADA_PROJECT_PATH} will be set to 524then as a result the environment variable @code{ADA_PROJECT_PATH} will
525@code{"/home/shared/makerules:/home/opentoken/"}. 525be set to @code{"/home/shared/makerules:/home/opentoken/"}.
526 526
527The default value is not the current value of this environment 527The default value is not the current value of this environment
528variable, because that will typically have been set by another 528variable, because that will typically have been set by another
@@ -730,7 +730,7 @@ In buffer @file{hello.adb}, invoke @samp{Ada | Check file}. You should
730get a @code{*compilation*} buffer containing something like (the 730get a @code{*compilation*} buffer containing something like (the
731directory paths will be different): 731directory paths will be different):
732 732
733@example 733@smallexample
734cd c:/Examples/Example_1/ 734cd c:/Examples/Example_1/
735gnatmake -u -c -gnatc -g c:/Examples/Example_1/hello.adb -cargs -gnatq -gnatQ 735gnatmake -u -c -gnatc -g c:/Examples/Example_1/hello.adb -cargs -gnatq -gnatQ
736gcc -c -Ic:/Examples/Example_1/ -gnatc -g -gnatq -gnatQ -I- c:/Examples/Example_1/hello.adb 736gcc -c -Ic:/Examples/Example_1/ -gnatc -g -gnatq -gnatQ -I- c:/Examples/Example_1/hello.adb
@@ -738,7 +738,7 @@ hello.adb:4:04: "Put_Line" is not visible
738hello.adb:4:04: non-visible declaration at a-textio.ads:264 738hello.adb:4:04: non-visible declaration at a-textio.ads:264
739hello.adb:4:04: non-visible declaration at a-textio.ads:260 739hello.adb:4:04: non-visible declaration at a-textio.ads:260
740gnatmake: "c:/Examples/Example_1/hello.adb" compilation error 740gnatmake: "c:/Examples/Example_1/hello.adb" compilation error
741@end example 741@end smallexample
742 742
743If you have enabled font-lock, the lines with actual errors (starting 743If you have enabled font-lock, the lines with actual errors (starting
744with @file{hello.adb}) are highlighted, with the file name in red. 744with @file{hello.adb}) are highlighted, with the file name in red.
@@ -1045,14 +1045,14 @@ Then, again in @file{hello_4.adb}, invoke @samp{Ada | Set main and
1045Build}. You should get a @code{*compilation*} buffer containing 1045Build}. You should get a @code{*compilation*} buffer containing
1046something like (the directory paths will be different): 1046something like (the directory paths will be different):
1047 1047
1048@example 1048@smallexample
1049cd c:/Examples/Example_4/Gnat_Project/ 1049cd c:/Examples/Example_4/Gnat_Project/
1050gnatmake -o hello_4 hello_4 -Phello_4.gpr -cargs -gnatq -gnatQ -bargs -largs 1050gnatmake -o hello_4 hello_4 -Phello_4.gpr -cargs -gnatq -gnatQ -bargs -largs
1051gcc -c -g -gnatyt -gnatq -gnatQ -I- -gnatA c:\Examples\Example_4\Gnat_Project\hello_4.adb 1051gcc -c -g -gnatyt -gnatq -gnatQ -I- -gnatA c:\Examples\Example_4\Gnat_Project\hello_4.adb
1052gcc -c -g -gnatyt -gnatq -gnatQ -I- -gnatA c:\Examples\Example_4\hello_pkg.adb 1052gcc -c -g -gnatyt -gnatq -gnatQ -I- -gnatA c:\Examples\Example_4\hello_pkg.adb
1053hello_pkg.adb:2:08: keyword "body" expected here [see file name] 1053hello_pkg.adb:2:08: keyword "body" expected here [see file name]
1054gnatmake: "c:\examples\example_4\hello_pkg.adb" compilation error 1054gnatmake: "c:\examples\example_4\hello_pkg.adb" compilation error
1055@end example 1055@end smallexample
1056 1056
1057Compare the @code{gcc} options to the compiler output in @ref{Set 1057Compare the @code{gcc} options to the compiler output in @ref{Set
1058compiler options}; this shows that @file{hello_4.gpr} is being used to 1058compiler options}; this shows that @file{hello_4.gpr} is being used to
@@ -1112,14 +1112,14 @@ Then, again in @file{hello_5.adb}, invoke @samp{Ada | Set main and
1112Build}. You should get a @code{*compilation*} buffer containing 1112Build}. You should get a @code{*compilation*} buffer containing
1113something like (the directory paths will be different): 1113something like (the directory paths will be different):
1114 1114
1115@example 1115@smallexample
1116cd c:/Examples/Example_5/ 1116cd c:/Examples/Example_5/
1117gnatmake -o hello_5 hello_5 -Phello_5.gpr -g -cargs -gnatq -gnatQ -bargs -largs 1117gnatmake -o hello_5 hello_5 -Phello_5.gpr -g -cargs -gnatq -gnatQ -bargs -largs
1118gcc -c -g -gnatyt -g -gnatq -gnatQ -I- -gnatA c:\Examples\Example_5\hello_5.adb 1118gcc -c -g -gnatyt -g -gnatq -gnatQ -I- -gnatA c:\Examples\Example_5\hello_5.adb
1119gcc -c -g -gnatyt -g -gnatq -gnatQ -I- -gnatA c:\Examples\Example_4\hello_pkg.adb 1119gcc -c -g -gnatyt -g -gnatq -gnatQ -I- -gnatA c:\Examples\Example_4\hello_pkg.adb
1120hello_pkg.adb:2:08: keyword "body" expected here [see file name] 1120hello_pkg.adb:2:08: keyword "body" expected here [see file name]
1121gnatmake: "c:\examples\example_4\hello_pkg.adb" compilation error 1121gnatmake: "c:\examples\example_4\hello_pkg.adb" compilation error
1122@end example 1122@end smallexample
1123 1123
1124Now type @kbd{C-x `}. @file{Example_4/hello_pkg.adb} is shown, 1124Now type @kbd{C-x `}. @file{Example_4/hello_pkg.adb} is shown,
1125demonstrating that @file{hello_5.gpr} and @file{hello_4.gpr} are being 1125demonstrating that @file{hello_5.gpr} and @file{hello_4.gpr} are being