SF.net SVN: geany:[3469] trunk

eht16 at users.sourceforge.net eht16 at xxxxx
Thu Jan 15 18:20:19 UTC 2009


Revision: 3469
          http://geany.svn.sourceforge.net/geany/?rev=3469&view=rev
Author:   eht16
Date:     2009-01-15 18:20:19 +0000 (Thu, 15 Jan 2009)

Log Message:
-----------
Rename command line option --debug to --verbose.
Change short form of --version from -v to -V.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/geany.1.in
    trunk/doc/geany.html
    trunk/doc/geany.txt
    trunk/src/main.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-01-14 19:19:08 UTC (rev 3468)
+++ trunk/ChangeLog	2009-01-15 18:20:19 UTC (rev 3469)
@@ -1,3 +1,10 @@
+2009-01-15  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/main.c, doc/geany.txt, doc/geany.html, doc/geany.1.in:
+   Rename command line option --debug to --verbose.
+   Change short form of --version from -v to -V.
+
+
 2009-01-14  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * data/global.tags, data/latex.tags, data/pascal.tags, data/php.tags,

Modified: trunk/doc/geany.1.in
===================================================================
--- trunk/doc/geany.1.in	2009-01-14 19:19:08 UTC (rev 3468)
+++ trunk/doc/geany.1.in	2009-01-15 18:20:19 UTC (rev 3469)
@@ -1,4 +1,4 @@
-.TH "GEANY" "1" "October 19, 2008" "geany @VERSION@" ""
+.TH "GEANY" "1" "January 15, 2009" "geany @VERSION@" ""
 .SH "NAME"
 Geany \(em a small and lightweight IDE
 .SH "SYNOPSIS"
@@ -31,9 +31,7 @@
 .IP "\fB-c\fP, \fB\-\-config\fP         " 10
 Use an alternate configuration directory. Default configuration directory is
 ~/.config/geany/ and there resides geany.conf and some template files.
-.IP "\fB-d\fP, \fB\-\-debug\fP         " 10
-Run Geany in debug mode, which means being verbose and printing lots of information.
-.IP "\fB\fP, \fB\-\-ft\-names\fP         " 10
+.IP "\fB\fP    \fB\-\-ft\-names\fP         " 10
 Print a list of Geany's internal filetype names (useful snippets configuration).
 .IP "\fB-g\fP, \fB\-\-generate\-tags\fP         " 10
 Generate a global tags file (see documentation).
@@ -52,7 +50,7 @@
 For more information please see documentation.
 .IP "\fB-p\fP, \fB\-\-no-plugins\fP         " 10
 Don't load plugin support.
-.IP "\fB\fP   \fB\-\-print-prefix\fP         " 10
+.IP "\fB\fP    \fB\-\-print-prefix\fP         " 10
 Print installation prefix, the data directory, the lib directory and the locale directory (in
 this order) to stdout, each per line. This is mainly intended for plugin authors to detect
 installation paths.
@@ -62,11 +60,13 @@
 Don't load terminal support. Use this option, if you don't want to load the virtual terminal
 emulator widget at startup. If you don't have libvte.so.4 installed, then terminal-support is
 automatically disabled. Only available if Geany was compiled with support for VTE.
-.IP "\fB\fP   \fB\-\-vte-lib\fP         " 10
+.IP "\fB\fP    \fB\-\-vte-lib\fP         " 10
 Specify explicitly the path including filename or only the filename to the VTE library, e.g.
 /usr/lib/libvte.so or libvte.so. This option is only needed, when the autodetection doesn't
 work. Only available if Geany was compiled with support for VTE.
-.IP "\fB-v\fP, \fB\-\-version\fP         " 10
+.IP "\fB-v\fP, \fB\-\-verbose\fP         " 10
+Be verbose (print useful status messages).
+.IP "\fB-V\fP, \fB\-\-version\fP         " 10
 Show version information and exit.
 .IP "\fB-?\fP, \fB\-\-help\fP         " 10
 Show help information and exit.

Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html	2009-01-14 19:19:08 UTC (rev 3468)
+++ trunk/doc/geany.html	2009-01-15 18:20:19 UTC (rev 3469)
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
 <title>Geany</title>
 <meta name="authors" content="Enrico Tröger  Nick Treleaven  Frank Lanitz" />
-<meta name="date" content="2009-01-11" />
+<meta name="date" content="2009-01-14" />
 <style type="text/css">
 
 /*
@@ -139,7 +139,7 @@
 <br />Nick Treleaven
 <br />Frank Lanitz</td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2009-01-11</td></tr>
+<td>2009-01-14</td></tr>
 <tr><th class="docinfo-name">Version:</th>
 <td>0.16</td></tr>
 </tbody>
@@ -558,11 +558,6 @@
 configuration directory is <tt class="docutils literal"><span class="pre">~/.config/geany/</span></tt> and there
 resides <tt class="docutils literal"><span class="pre">geany.conf</span></tt> and other configuration files.</td>
 </tr>
-<tr><td>-d</td>
-<td>--debug</td>
-<td>Run Geany in debug mode, which means being verbose
-and printing lots of information.</td>
-</tr>
 <tr><td><em>none</em></td>
 <td>--ft-names</td>
 <td>Print a list of Geany's internal filetype names (useful
@@ -629,6 +624,10 @@
 available if Geany was compiled with support for VTE.</td>
 </tr>
 <tr><td>-v</td>
+<td>--verbose</td>
+<td>Be verbose (print useful status messages).</td>
+</tr>
+<tr><td>-V</td>
 <td>--version</td>
 <td>Show version information and exit.</td>
 </tr>
@@ -4604,7 +4603,7 @@
 <div class="footer">
 <hr class="footer" />
 <a class="reference external" href="geany.txt">View document source</a>.
-Generated on: 2009-01-14 15:59 UTC.
+Generated on: 2009-01-15 17:48 UTC.
 Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>

Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt	2009-01-14 19:19:08 UTC (rev 3468)
+++ trunk/doc/geany.txt	2009-01-15 18:20:19 UTC (rev 3469)
@@ -204,9 +204,6 @@
                                        configuration directory is ``~/.config/geany/`` and there
                                        resides ``geany.conf`` and other configuration files.
 
--d            --debug                  Run Geany in debug mode, which means being verbose
-                                       and printing lots of information.
-
 *none*        --ft-names               Print a list of Geany's internal filetype names (useful
                                        for snippets configuration).
 
@@ -248,8 +245,10 @@
                                        only needed when the auto detection does not work. Only
                                        available if Geany was compiled with support for VTE.
 
--v            --version                Show version information and exit.
+-v            --verbose                Be verbose (print useful status messages).
 
+-V            --version                Show version information and exit.
+
 -?            --help                   Show help information and exit.
 
 *none*        [files ...]              Open all given files at startup. This option causes

Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2009-01-14 19:19:08 UTC (rev 3468)
+++ trunk/src/main.c	2009-01-15 18:20:19 UTC (rev 3469)
@@ -99,6 +99,7 @@
 
 /* command-line options */
 static gboolean debug_mode = FALSE;
+static gboolean verbose_mode = FALSE;
 static gboolean ignore_global_tags = FALSE;
 static gboolean no_msgwin = FALSE;
 static gboolean show_version = FALSE;
@@ -122,7 +123,7 @@
 {
 	{ "column", 0, 0, G_OPTION_ARG_INT, &cl_options.goto_column, N_("Set initial column number for the first opened file (useful in conjunction with --line)"), NULL },
 	{ "config", 'c', 0, G_OPTION_ARG_FILENAME, &alternate_config, N_("Use an alternate configuration directory"), NULL },
-	{ "debug", 'd', 0, G_OPTION_ARG_NONE, &debug_mode, N_("Runs in debug mode (means being verbose)"), NULL },
+	{ "debug", 'd', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &debug_mode, N_("Be verbose"), NULL },
 	{ "ft-names", 0, 0, G_OPTION_ARG_NONE, &ft_names, N_("Print internal filetype names"), NULL },
 	{ "generate-tags", 'g', 0, G_OPTION_ARG_NONE, &generate_tags, N_("Generate global tags file (see documentation)"), NULL },
 	{ "no-preprocessing", 'P', 0, G_OPTION_ARG_NONE, &no_preprocessing, N_("Don't preprocess C/C++ files when generating tags"), NULL },
@@ -142,7 +143,8 @@
 	{ "no-terminal", 't', 0, G_OPTION_ARG_NONE, &no_vte, N_("Don't load terminal support"), NULL },
 	{ "vte-lib", 0, 0, G_OPTION_ARG_FILENAME, &lib_vte, N_("Filename of libvte.so"), NULL },
 #endif
-	{ "version", 'v', 0, G_OPTION_ARG_NONE, &show_version, N_("Show version and exit"), NULL },
+	{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose_mode, N_("Be verbose"), NULL },
+	{ "version", 'V', 0, G_OPTION_ARG_NONE, &show_version, N_("Show version and exit"), NULL },
 	{ "dummy", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &dummy, NULL, NULL }, /* for +NNN line number arguments */
 	{ NULL, 0, 0, 0, NULL, NULL, NULL }
 };
@@ -512,7 +514,13 @@
 		exit(0);
 	}
 
-	app->debug_mode = debug_mode;
+	app->debug_mode = verbose_mode;
+	if (debug_mode)
+	{
+		app->debug_mode = TRUE;
+		g_warning(
+			"Command line option --debug is obsolete and will be removed in the next version.");
+	}
 
 #ifdef G_OS_WIN32
 	win32_init_debug_code();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the Commits mailing list