Browse Source

Revert the color back to its previous state.
Amazingly this change apparently was not required and was
just a typo from Paul.

The syntax coloring is extremely nice.

Miguel.

Miguel de Icaza 27 years ago
parent
commit
3acd011d4f
6 changed files with 149 additions and 134 deletions
  1. 6 0
      gnome/gmain.c
  2. 118 119
      po/mc.pot
  3. 4 0
      src/ChangeLog
  4. 16 8
      src/color.c
  5. 0 7
      src/color.h
  6. 5 0
      tk/tkmain.c

+ 6 - 0
gnome/gmain.c

@@ -46,6 +46,12 @@ char *default_edition_colors =
 /* The Dlg_head for the whole desktop */
 Dlg_head *desktop_dlg;
 
+/* This is only used by the editor, so we provide a dummy implementation */
+void
+try_alloc_color_pair (char *str, char *str2)
+{
+}
+
 void
 init_pair (int index, GdkColor *fore, GdkColor *back)
 {

+ 118 - 119
po/mc.pot

@@ -1,13 +1,13 @@
 msgid ""
 msgstr ""
-"Date: 1998-04-23 14:33:00-0500\n"
+"Date: 1998-04-24 13:50:19-0500\n"
 "From: Miguel de Icaza,computo,622-4680 <miguel@metropolis.nuclecu.unam.mx>\n"
 "Content-Type: text/plain; charset=\n"
 "Xgettext-Options: --default-domain=mc --directory=.. --add-comments --keyword=_ --keyword=N_ --files-from=./POTFILES.in\n"
 "Files: edit/edit.c edit/edit_key_translator.c edit/editcmd.c edit/editmenu.c edit/editoptions.c edit/editwidget.c src/fixhlp.c src/achown.c src/background.c src/boxes.c src/chmod.c src/chown.c src/cmd.c src/command.c src/dialog.c src/dir.c src/ext.c src/file.c src/find.c src/help.c src/hotlist.c src/info.c src/layout.c src/learn.c src/main.c src/menu.c src/option.c src/panelize.c src/screen.c src/subshell.c src/tree.c src/user.c src/util.c src/utilunix.c src/view.c src/win.c src/wtools.c gnome/gcmd.c gnome/gdesktop.c gnome/glayout.c gnome/gprop.c gnome/gscreen.c gnome/gtools.c gnome/gview.c gnome/gwidget.c\n"
 
 #. The file-name is printed after the ':'
-#: edit/edit.c:113 edit/edit.c:161 edit/edit.c:168 edit/edit.c:175 edit/edit.c:182 edit/edit.c:188 edit/edit.c:227 edit/edit.c:259 edit/editcmd.c:1679 edit/editwidget.c:797 src/tree.c:1138 src/tree.c:1144 src/wtools.c:225
+#: edit/edit.c:113 edit/edit.c:161 edit/edit.c:168 edit/edit.c:175 edit/edit.c:182 edit/edit.c:188 edit/edit.c:227 edit/edit.c:262 edit/editcmd.c:1683 edit/editwidget.c:879 src/tree.c:1138 src/tree.c:1144 src/wtools.c:225
 msgid " Error "
 msgstr ""
 
@@ -33,7 +33,7 @@ msgid ""
 " Increase edit.h:MAXBUF and recompile the editor. "
 msgstr ""
 
-#: edit/edit.c:227 edit/edit.c:259
+#: edit/edit.c:227 edit/edit.c:262
 msgid " Error allocating memory "
 msgstr ""
 
@@ -46,7 +46,7 @@ msgid " Execute Macro "
 msgstr ""
 
 #. Input line for a single key press follows the ':'
-#: edit/edit_key_translator.c:133 edit/editcmd.c:616 edit/editcmd.c:621
+#: edit/edit_key_translator.c:133 edit/editcmd.c:620 edit/editcmd.c:625
 msgid " Press macro hotkey: "
 msgstr ""
 
@@ -63,352 +63,350 @@ msgid " Save As "
 msgstr ""
 
 #. Warning message with a query to continue or cancel the operation
-#: edit/editcmd.c:407 edit/editcmd.c:714 edit/editcmd.c:726 edit/editcmd.c:827 edit/editcmd.c:910 gnome/gdesktop.c:1258 src/ext.c:295 src/help.c:320 src/main.c:683 src/subshell.c:696 src/subshell.c:722 src/utilunix.c:374 src/utilunix.c:378 src/utilunix.c:444
+#: edit/editcmd.c:409 edit/editcmd.c:718 edit/editcmd.c:730 edit/editcmd.c:831 edit/editcmd.c:914 gnome/gdesktop.c:1258 src/ext.c:295 src/help.c:320 src/main.c:683 src/subshell.c:696 src/subshell.c:722 src/utilunix.c:374 src/utilunix.c:378 src/utilunix.c:444
 msgid " Warning "
 msgstr ""
 
-#: edit/editcmd.c:408
+#: edit/editcmd.c:410
 msgid " A file already exists with this name. "
 msgstr ""
 
-#. Push buttons to over-write the current file, or cancel the operation
-#: edit/editcmd.c:410
+#: edit/editcmd.c:412
 msgid "Overwrite"
 msgstr ""
 
-#: edit/editcmd.c:410 edit/editcmd.c:687 edit/editcmd.c:714 edit/editcmd.c:726 edit/editcmd.c:827 edit/editcmd.c:1313
+#: edit/editcmd.c:412 edit/editcmd.c:691 edit/editcmd.c:718 edit/editcmd.c:730 edit/editcmd.c:831 edit/editcmd.c:1317
 msgid "Cancel"
 msgstr ""
 
-#: edit/editcmd.c:424
+#: edit/editcmd.c:428
 msgid " Save as "
 msgstr ""
 
-#: edit/editcmd.c:424 edit/editcmd.c:2259
+#: edit/editcmd.c:428 edit/editcmd.c:2263
 msgid " Error trying to save file. "
 msgstr ""
 
 #. This heads the delete macro error dialog box
-#: edit/editcmd.c:535 edit/editcmd.c:543 edit/editcmd.c:568
+#: edit/editcmd.c:539 edit/editcmd.c:547 edit/editcmd.c:572
 msgid " Delete macro "
 msgstr ""
 
-#: edit/editcmd.c:537
+#. 'Open' = load temp file
+#: edit/editcmd.c:541
 msgid " Error trying to open temp file "
 msgstr ""
 
-#. 'Open' = load temp file
-#: edit/editcmd.c:545 edit/editcmd.c:606 edit/editcmd.c:669
+#: edit/editcmd.c:549 edit/editcmd.c:610 edit/editcmd.c:673
 msgid " Error trying to open macro file "
 msgstr ""
 
-#: edit/editcmd.c:550 edit/editcmd.c:558 edit/editcmd.c:594 edit/editcmd.c:644
+#: edit/editcmd.c:554 edit/editcmd.c:562 edit/editcmd.c:598 edit/editcmd.c:648
 msgid "key '%d 0': "
 msgstr ""
 
-#: edit/editcmd.c:569
+#: edit/editcmd.c:573
 msgid " Error trying to overwrite macro file "
 msgstr ""
 
 #. This heads the 'Macro' dialog box
-#: edit/editcmd.c:586
+#: edit/editcmd.c:590
 msgid " Macro "
 msgstr ""
 
-#: edit/editcmd.c:588
+#. Input line for a single key press follows the ':'
+#: edit/editcmd.c:592
 msgid " Press the macro's new hotkey: "
 msgstr ""
 
-#: edit/editcmd.c:606
+#. This heads the 'Save Macro' dialog box
+#: edit/editcmd.c:610
 msgid " Save macro "
 msgstr ""
 
-#. This heads the 'Delete Macro' dialog box
-#: edit/editcmd.c:616 edit/editcmd.c:619
+#: edit/editcmd.c:620 edit/editcmd.c:623
 msgid " Delete Macro "
 msgstr ""
 
-#. This heads the 'Load Macro' dialog box
-#: edit/editcmd.c:668
+#: edit/editcmd.c:672
 msgid " Load macro "
 msgstr ""
 
-#: edit/editcmd.c:682 edit/editcmd.c:684
+#: edit/editcmd.c:686 edit/editcmd.c:688
 msgid " Confirm save file? : "
 msgstr ""
 
-#: edit/editcmd.c:687
+#. Buttons to 'Confirm save file' query
+#: edit/editcmd.c:691
 msgid " Save file "
 msgstr ""
 
-#: edit/editcmd.c:687 edit/editwidget.c:911 src/view.c:1982
+#: edit/editcmd.c:691 edit/editwidget.c:993 src/view.c:1982
 msgid "Save"
 msgstr ""
 
-#: edit/editcmd.c:714 edit/editcmd.c:726
+#: edit/editcmd.c:718 edit/editcmd.c:730
 msgid ""
 " Current text was modified without a file save. \n"
 " Continue discards these changes. "
 msgstr ""
 
-#: edit/editcmd.c:714 edit/editcmd.c:726 edit/editcmd.c:827
+#: edit/editcmd.c:718 edit/editcmd.c:730 edit/editcmd.c:831
 msgid "Continue"
 msgstr ""
 
-#: edit/editcmd.c:729 edit/editcmd.c:746
+#. Heads the 'Load' file dialog box
+#: edit/editcmd.c:733 edit/editcmd.c:750
 msgid " Load "
 msgstr ""
 
-#: edit/editcmd.c:746
+#: edit/editcmd.c:750
 msgid " Error trying to open file for reading "
 msgstr ""
 
-#: edit/editcmd.c:827 edit/editcmd.c:910
+#: edit/editcmd.c:831 edit/editcmd.c:914
 msgid " Block is large, you may not be able to undo this action. "
 msgstr ""
 
-#: edit/editcmd.c:910
+#: edit/editcmd.c:914
 msgid " Continue "
 msgstr ""
 
-#: edit/editcmd.c:910
+#: edit/editcmd.c:914
 msgid " Cancel "
 msgstr ""
 
 #. This is for the confirm replace dialog box. The replaced string comes after the ':'
-#: edit/editcmd.c:962 edit/editcmd.c:1311
+#: edit/editcmd.c:966 edit/editcmd.c:1315
 msgid " Replace with: "
 msgstr ""
 
 #. Heads the 'Replace' dialog box
-#: edit/editcmd.c:966 edit/editcmd.c:1043 edit/editcmd.c:1293 edit/editcmd.c:1309 edit/editcmd.c:1841 edit/editcmd.c:1872 edit/editcmd.c:1874
+#: edit/editcmd.c:970 edit/editcmd.c:1047 edit/editcmd.c:1297 edit/editcmd.c:1313 edit/editcmd.c:1845 edit/editcmd.c:1876 edit/editcmd.c:1878
 msgid " Replace "
 msgstr ""
 
 #. Heads the 'Search' dialog box
-#: edit/editcmd.c:1111 edit/editcmd.c:1287 edit/editcmd.c:1943 src/view.c:1469 src/view.c:1559 src/view.c:1681 src/view.c:1877 src/view.c:1909
+#: edit/editcmd.c:1115 edit/editcmd.c:1291 edit/editcmd.c:1947 src/view.c:1469 src/view.c:1559 src/view.c:1681 src/view.c:1877 src/view.c:1909
 msgid " Search "
 msgstr ""
 
-#. An input line comes after the ':'
-#: edit/editcmd.c:1159
+#: edit/editcmd.c:1163
 msgid " Enter search text : "
 msgstr ""
 
-#: edit/editcmd.c:1166
+#: edit/editcmd.c:1170
 msgid " Enter replace text : "
 msgstr ""
 
-#: edit/editcmd.c:1170
+#: edit/editcmd.c:1174
 msgid " Enter argument order : "
 msgstr ""
 
-#. Tool hint
-#: edit/editcmd.c:1174 edit/editcmd.c:1175
+#: edit/editcmd.c:1178 edit/editcmd.c:1179
 msgid "Enter the order of replacement of your scanf format specifiers"
 msgstr ""
 
-#. The following are check boxes
-#: edit/editcmd.c:1180
+#: edit/editcmd.c:1184
 msgid " Whole words only "
 msgstr ""
 
-#: edit/editcmd.c:1182
+#: edit/editcmd.c:1186
 msgid " Case sensitive "
 msgstr ""
 
-#: edit/editcmd.c:1185
+#: edit/editcmd.c:1189
 msgid " Regular expression "
 msgstr ""
 
-#: edit/editcmd.c:1186 edit/editcmd.c:1187
+#: edit/editcmd.c:1190 edit/editcmd.c:1191
 msgid "See the regex man page for how to compose a regular expression"
 msgstr ""
 
-#: edit/editcmd.c:1193
+#: edit/editcmd.c:1197
 msgid " Backwards "
 msgstr ""
 
-#. Tool hint
-#: edit/editcmd.c:1195 edit/editcmd.c:1196
+#: edit/editcmd.c:1199 edit/editcmd.c:1200
 msgid "Warning: Searching backward can be slow"
 msgstr ""
 
-#: edit/editcmd.c:1209
+#: edit/editcmd.c:1213
 msgid " Prompt on replace "
 msgstr ""
 
-#: edit/editcmd.c:1211
+#. Tool hint
+#: edit/editcmd.c:1215
 msgid "Ask before making each replacement"
 msgstr ""
 
-#: edit/editcmd.c:1213
+#: edit/editcmd.c:1217
 msgid " Replace all "
 msgstr ""
 
-#: edit/editcmd.c:1216
+#: edit/editcmd.c:1220
 msgid " Scanf expression "
 msgstr ""
 
 #. Tool hint
-#: edit/editcmd.c:1218
+#: edit/editcmd.c:1222
 msgid "Allows entering of a C format string, see the scanf man page"
 msgstr ""
 
-#: edit/editcmd.c:1223
+#. Tool hint
+#: edit/editcmd.c:1227
 msgid "Begin search, Enter"
 msgstr ""
 
-#: edit/editcmd.c:1226
+#. Tool hint
+#: edit/editcmd.c:1230
 msgid "Abort this dialog, Esc"
 msgstr ""
 
-#: edit/editcmd.c:1313
+#. Buttons for the confirm replace dialog box.
+#: edit/editcmd.c:1317
 msgid "Replace"
 msgstr ""
 
-#: edit/editcmd.c:1313
+#: edit/editcmd.c:1317
 msgid "Skip"
 msgstr ""
 
-#: edit/editcmd.c:1313
+#: edit/editcmd.c:1317
 msgid "Replace all"
 msgstr ""
 
-#: edit/editcmd.c:1679
+#: edit/editcmd.c:1683
 msgid " Invalid regular expression, or scanf expression with to many conversions "
 msgstr ""
 
-#: edit/editcmd.c:1843
+#. "Invalid regexp string or scanf string"
+#: edit/editcmd.c:1847
 msgid " Error in replacement format string. "
 msgstr ""
 
-#: edit/editcmd.c:1871
+#: edit/editcmd.c:1875
 msgid " %ld replacements made. "
 msgstr ""
 
-#: edit/editcmd.c:1874 edit/editcmd.c:1943
+#: edit/editcmd.c:1878 edit/editcmd.c:1947
 msgid " Search string not found. "
 msgstr ""
 
-#. Confirm 'Quit' dialog box
-#: edit/editcmd.c:1961 edit/editcmd.c:1964
+#: edit/editcmd.c:1965 edit/editcmd.c:1968
 msgid " Quit "
 msgstr ""
 
-#: edit/editcmd.c:1961
+#: edit/editcmd.c:1965
 msgid " File was modified, Save with exit? "
 msgstr ""
 
-#: edit/editcmd.c:1961
+#: edit/editcmd.c:1965
 msgid "Cancel quit"
 msgstr ""
 
-#: edit/editcmd.c:1961 gnome/gcmd.c:94 gnome/gdesktop.c:1073 src/cmd.c:241 src/file.c:2116 src/file.c:2469 src/file.c:2549 src/hotlist.c:1027 src/main.c:838 src/screen.c:1983 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:410
+#: edit/editcmd.c:1965 gnome/gcmd.c:94 gnome/gdesktop.c:1073 src/cmd.c:241 src/file.c:2116 src/file.c:2469 src/file.c:2549 src/hotlist.c:1027 src/main.c:838 src/screen.c:1983 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:410
 msgid "&Yes"
 msgstr ""
 
-#: edit/editcmd.c:1961 gnome/gcmd.c:94 gnome/gdesktop.c:1073 src/cmd.c:241 src/file.c:2116 src/file.c:2466 src/file.c:2549 src/hotlist.c:1027 src/main.c:838 src/screen.c:1983 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:410
+#: edit/editcmd.c:1965 gnome/gcmd.c:94 gnome/gdesktop.c:1073 src/cmd.c:241 src/file.c:2116 src/file.c:2466 src/file.c:2549 src/hotlist.c:1027 src/main.c:838 src/screen.c:1983 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:410
 msgid "&No"
 msgstr ""
 
-#: edit/editcmd.c:1965
+#: edit/editcmd.c:1969
 msgid ""
 " Current text was modified without a file save. \n"
 " Save with exit? "
 msgstr ""
 
-#: edit/editcmd.c:1965
+#: edit/editcmd.c:1969
 msgid " &Cancel quit "
 msgstr ""
 
-#: edit/editcmd.c:1965
+#: edit/editcmd.c:1969
 msgid " &Yes "
 msgstr ""
 
-#: edit/editcmd.c:1965
+#: edit/editcmd.c:1969
 msgid " &No "
 msgstr ""
 
-#: edit/editcmd.c:2134 edit/editcmd.c:2185
+#: edit/editcmd.c:2138 edit/editcmd.c:2189
 msgid " Copy to clipboard "
 msgstr ""
 
-#: edit/editcmd.c:2134 edit/editcmd.c:2149 edit/editcmd.c:2185 edit/editcmd.c:2198
+#: edit/editcmd.c:2138 edit/editcmd.c:2153 edit/editcmd.c:2189 edit/editcmd.c:2202
 msgid " Unable to save to file. "
 msgstr ""
 
-#: edit/editcmd.c:2149 edit/editcmd.c:2198
+#: edit/editcmd.c:2153 edit/editcmd.c:2202
 msgid " Cut to clipboard "
 msgstr ""
 
-#: edit/editcmd.c:2220 edit/editcmd.c:2222 src/view.c:1850
+#: edit/editcmd.c:2224 edit/editcmd.c:2226 src/view.c:1850
 msgid " Goto line "
 msgstr ""
 
-#: edit/editcmd.c:2220 edit/editcmd.c:2222
+#: edit/editcmd.c:2224 edit/editcmd.c:2226
 msgid " Enter line: "
 msgstr ""
 
-#: edit/editcmd.c:2242 edit/editcmd.c:2259
+#: edit/editcmd.c:2246 edit/editcmd.c:2263
 msgid " Save Block "
 msgstr ""
 
-#: edit/editcmd.c:2293
+#: edit/editcmd.c:2297
 msgid " Insert File "
 msgstr ""
 
-#: edit/editcmd.c:2308
+#: edit/editcmd.c:2312
 msgid " Insert file "
 msgstr ""
 
-#: edit/editcmd.c:2308
+#: edit/editcmd.c:2312
 msgid " Error trying to insert file. "
 msgstr ""
 
 #. Not essential to translate
-#: edit/editcmd.c:2328
+#: edit/editcmd.c:2332
 msgid " Sort block "
 msgstr ""
 
-#. Not essential to translate
-#: edit/editcmd.c:2328 edit/editcmd.c:2382
+#: edit/editcmd.c:2332 edit/editcmd.c:2386
 msgid " You must first highlight a block of text. "
 msgstr ""
 
-#: edit/editcmd.c:2335
+#: edit/editcmd.c:2339
 msgid " Run Sort "
 msgstr ""
 
 #. Not essential to translate
-#: edit/editcmd.c:2337
+#: edit/editcmd.c:2341
 msgid " Enter sort options (see manpage) separated by whitespace: "
 msgstr ""
 
-#: edit/editcmd.c:2348 edit/editcmd.c:2354
+#: edit/editcmd.c:2352 edit/editcmd.c:2358
 msgid " Sort "
 msgstr ""
 
-#. Not essential to translate
-#: edit/editcmd.c:2350
+#: edit/editcmd.c:2354
 msgid " Error trying to execute sort command "
 msgstr ""
 
-#. Not essential to translate
-#: edit/editcmd.c:2356
+#: edit/editcmd.c:2360
 msgid " Sort returned non-zero: "
 msgstr ""
 
-#: edit/editcmd.c:2380 edit/editcmd.c:2410
+#. Not essential to translate
+#: edit/editcmd.c:2384 edit/editcmd.c:2414
 msgid " Process block "
 msgstr ""
 
-#. Not essential to translate
-#: edit/editcmd.c:2412
+#: edit/editcmd.c:2416
 msgid " Error trying to stat file "
 msgstr ""
 
-#: edit/editcmd.c:2482
+#: edit/editcmd.c:2486
 msgid " Mail "
 msgstr ""
 
@@ -739,53 +737,54 @@ msgstr ""
 msgid "Type writer wrap"
 msgstr ""
 
-#. 12
-#: edit/editoptions.c:89
+#. 13
+#: edit/editoptions.c:100
 msgid "Wrap mode"
 msgstr ""
 
-#. 14
-#: edit/editoptions.c:95
+#. 15
+#: edit/editoptions.c:106
 msgid "Key emulation"
 msgstr ""
 
-#: edit/editwidget.c:84
+#. Not essential to translate
+#: edit/editwidget.c:91
 msgid "Error initialising editor.\n"
 msgstr ""
 
-#: edit/editwidget.c:910 gnome/glayout.c:358 src/help.c:812 src/main.c:1670 src/screen.c:2194 src/screen.c:2228 src/tree.c:1451 src/view.c:1977
+#: edit/editwidget.c:992 gnome/glayout.c:358 src/help.c:812 src/main.c:1670 src/screen.c:2194 src/screen.c:2228 src/tree.c:1451 src/view.c:1977
 msgid "Help"
 msgstr ""
 
-#: edit/editwidget.c:912
+#: edit/editwidget.c:994
 msgid "Mark"
 msgstr ""
 
-#: edit/editwidget.c:913
+#: edit/editwidget.c:995
 msgid "Replac"
 msgstr ""
 
-#: edit/editwidget.c:914 gnome/gdesktop.c:337 gnome/glayout.c:279 src/screen.c:2198 src/screen.c:2232 src/tree.c:1457
+#: edit/editwidget.c:996 gnome/gdesktop.c:337 gnome/glayout.c:279 src/screen.c:2198 src/screen.c:2232 src/tree.c:1457
 msgid "Copy"
 msgstr ""
 
-#: edit/editwidget.c:915 gnome/gdesktop.c:342
+#: edit/editwidget.c:997 gnome/gdesktop.c:342
 msgid "Move"
 msgstr ""
 
-#: edit/editwidget.c:916 gnome/gview.c:291 gnome/gview.c:315 src/view.c:1990
+#: edit/editwidget.c:998 gnome/gview.c:291 gnome/gview.c:315 src/view.c:1990
 msgid "Search"
 msgstr ""
 
-#: edit/editwidget.c:917 gnome/gdesktop.c:970 gnome/glayout.c:282 src/screen.c:2201 src/screen.c:2235
+#: edit/editwidget.c:999 gnome/gdesktop.c:970 gnome/glayout.c:282 src/screen.c:2201 src/screen.c:2235
 msgid "Delete"
 msgstr ""
 
-#: edit/editwidget.c:919 src/main.c:1672
+#: edit/editwidget.c:1001 src/main.c:1672
 msgid "PullDn"
 msgstr ""
 
-#: edit/editwidget.c:920 gnome/gview.c:286 src/help.c:824 src/main.c:1673 src/view.c:1979 src/view.c:1999
+#: edit/editwidget.c:1002 gnome/gview.c:286 src/help.c:824 src/main.c:1673 src/view.c:1979 src/view.c:1999
 msgid "Quit"
 msgstr ""
 
@@ -865,7 +864,7 @@ msgid ""
 " %s "
 msgstr ""
 
-#: src/achown.c:647 src/achown.c:651 src/chmod.c:329 src/chmod.c:333 src/chown.c:256 src/chown.c:260 src/panelize.c:301 src/user.c:623
+#: src/achown.c:647 src/achown.c:651 src/chmod.c:329 src/chmod.c:333 src/chown.c:256 src/chown.c:260 src/panelize.c:301 src/user.c:625
 msgid " Oops... "
 msgstr ""
 
@@ -1525,13 +1524,13 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: src/ext.c:139 src/user.c:506
+#: src/ext.c:139 src/user.c:507
 msgid ""
 " Can't create temporary command file \n"
 " %s "
 msgstr ""
 
-#: src/ext.c:152 src/user.c:532
+#: src/ext.c:152 src/user.c:534
 msgid " Parameter "
 msgstr ""
 
@@ -2086,7 +2085,7 @@ msgstr ""
 msgid " Help "
 msgstr ""
 
-#: src/help.c:772 src/user.c:639
+#: src/help.c:772 src/user.c:641
 msgid ""
 " Can't open file %s \n"
 " %s "
@@ -3274,17 +3273,17 @@ msgstr ""
 msgid " False: "
 msgstr ""
 
-#: src/user.c:605
+#: src/user.c:607
 msgid " Warning -- ignoring file "
 msgstr ""
 
-#: src/user.c:606
+#: src/user.c:608
 msgid ""
 "File %s is not owned by root or you or is world writable.\n"
 "Using it may compromise your security"
 msgstr ""
 
-#: src/user.c:624
+#: src/user.c:626
 msgid " I can't run programs while logged on a non local directory "
 msgstr ""
 

+ 4 - 0
src/ChangeLog

@@ -1,3 +1,7 @@
+1998-04-24  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* color.h: Move the CTYPE definition 
+
 Fri Apr 24 16:43:25 1998  Paul Sheer  <psheer@obsidian.co.za>
 
 	* main.h, setup.c: editor_syntax_highlighting option added

+ 16 - 8
src/color.c

@@ -40,19 +40,27 @@ int dialog_colors [4];
 
 #define ELEMENTS(arr) ( sizeof(arr) / sizeof((arr)[0]) )
 
+
+
 #ifdef HAVE_GNOME
-#   define CTYPE GdkColor *
+#	 define  CTYPE GdkColor *
 void init_pair (int, CTYPE, CTYPE);
 #else
-#    ifdef HAVE_SLANG
-#        define CTYPE char *
-#    else
-#        define CTYPE int
-#        define color_map_fg(n) (color_map[n].fg % COLORS)
-#        define color_map_bg(n) (color_map[n].bg % COLORS)
-#    endif
+#	  ifdef HAVE_SLANG
+#	      define CTYPE char *
+#	  else
+#	      define CTYPE int
+#	      define color_map_fg(n) (color_map[n].fg % COLORS)
+#	      define color_map_bg(n) (color_map[n].bg % COLORS)
+#	  endif
 #endif
 
+static struct colorpair {
+    char *name;			/* Name of the entry */
+    CTYPE fg;			/* foreground color */
+    CTYPE bg;			/* background color */
+};
+
 #ifndef color_map_fg
 #   define color_map_fg(n) color_map[n].fg
 #   define color_map_bg(n) color_map[n].bg

+ 0 - 7
src/color.h

@@ -10,13 +10,6 @@ extern int use_colors;
 extern int disable_colors;
 
 extern int attr_pairs [];
-
-struct colorpair {
-    char *name;			/* Name of the entry */
-    char *fg;			/* foreground color */
-    char *bg;			/* background color */
-};
-
 #ifdef HAVE_GNOME
 #   define MY_COLOR_PAIR(x) x
 #   define PORT_COLOR(co,bw) co

+ 5 - 0
tk/tkmain.c

@@ -481,3 +481,8 @@ edition_pre_exec (void)
     if (iconify_on_exec)
 	tk_evalf ("wm iconify .");
 }
+
+int
+try_alloc_color_pair (char *fg, char *bg)
+{
+}