[geany/geany] 0a0b4b: Merge branch '1.37'

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sun, 08 Nov 2020 17:51:20 UTC
Commit:      0a0b4b000cf18e837b921057a461ad05a08e41d3
             https://github.com/geany/geany/commit/0a0b4b000cf18e837b921057a461ad05a08e41d3

Log Message:
-----------
Merge branch '1.37'


Modified Paths:
--------------
    NEWS
    doc/geany.1.in
    doc/geany.txt
    src/libmain.c

Modified: NEWS
6 lines changed, 6 insertions(+), 0 deletions(-)
===================================================================
@@ -1,6 +1,12 @@
 Geany 1.38 (unreleased)
 
 
+Geany 1.37.1 (November 08, 2020)
+
+    Windows
+    * Fix crash on first startup (Issue#2639, PR#2645).
+
+
 Geany 1.37 (October 25, 2020)
 
     General


Modified: doc/geany.1.in
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
-.TH "GEANY" "1" "October 25, 2020" "geany @VERSION@" ""
+.TH "GEANY" "1" "November 08, 2020" "geany @VERSION@" ""
 .SH "NAME"
 Geany \(em a small and lightweight IDE
 .SH "SYNOPSIS"


Modified: doc/geany.txt
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -14,7 +14,7 @@
           Frank Lanitz,
           Colomban Wendling,
           Matthew Brush
-:Date: 2020-10-25
+:Date: 2020-11-08
 :Version: |(version)|
 
 Copyright © 2005 The Geany contributors


Modified: src/libmain.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -406,7 +406,7 @@ static gint get_windows_socket_port(void)
 	if (! g_file_test(configfile, G_FILE_TEST_IS_REGULAR))
 	{
 		geany_debug(
-			"No user config file found, use default TCP port (%s).",
+			"No user config file found, use default TCP port (%d).",
 			SOCKET_WINDOWS_REMOTE_CMD_PORT);
 		g_free(configfile);
 		return SOCKET_WINDOWS_REMOTE_CMD_PORT;



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).