- always load a shared configuration file;

- updated documentation.

doc/man.org

@@ -100,10 +100,11 @@
    #+NAME: simple file example
    #+BEGIN_SRC text
 
-   # a file can be included in another with this directive:
-   use "shared.conf"
-
    # a line starting with a '#' is a comment
+
+   # a file can be included in another with this directive:
+   # use "shared.conf"
+
    # The server instance name
    server = server address
 
@@ -112,7 +113,7 @@
 
    #+END_SRC
 
-   Not  incidentally  the information  i  the  example above  are  the
+   Not incidentally the information in the example above are the
    absolute minimum the user has to provide before starts the program:
    the name you chose when you made the account on the server and the
    address of the server.

doc/tinmop.man

@@ -78,11 +78,13 @@ The screen is subdivided in five window:
 .TP
 \fBtag window\fP
 shows the tag users subscribed for and available
+.PP
 messages for each tag;
 
 .TP
 \fBthreads window\fP
 for a given timeline and folder (see
+.PP
 \fIFolders\fP) show the discussions saved in user's local database;
 
 .TP
@@ -117,10 +119,12 @@ available two different kind with different syntax and scope.
 
 .IP \(em 4
 a key-value text files used to configure the access credential to
+.PP
 server and visual theme of the program (simple configuration);
 
 .IP \(em 4
 common lisp source code. Used to write module (AKA plugin) and to
+.PP
 configure keybindings to interact with the software.
 
 .PP
@@ -135,10 +139,11 @@ This is a simple file with each entry in a single line that look like this:
 .RS
 .nf
 \fC
-# a file can be included in another with this directive:
-use "shared.conf"
-
 # a line starting with a '#' is a comment
+
+# a file can be included in another with this directive:
+# use "shared.conf"
+
 # The server instance name
 server = server address
 
@@ -150,7 +155,7 @@ username = username
 .RE
 
 .PP
-Not  incidentally  the information  i  the  example above  are  the
+Not incidentally the information in the example above are the
 absolute minimum the user has to provide before starts the program:
 the name you chose when you made the account on the server and the
 address of the server.

src/main.lisp

@@ -81,10 +81,14 @@ etc.) happened"
                                        :new-timeline command-line:*start-timeline*)))
     (program-events:push-event refresh-event)))
 
+(defun load-configuration-files ()
+  (swconf:load-config-file swconf:+shared-conf-filename+)
+  (swconf:load-config-file swconf:+conf-filename+))
+
 (defun init ()
   "Initialize the program"
   (res:init)
-  (swconf:load-config-file)
+  (load-configuration-files)
   (init-db)
   (db-utils:with-ready-database (:connect nil)
     (modules:load-module +starting-init-file+)
@@ -129,7 +133,7 @@ etc.) happened"
 (defun load-script-file ()
   "Load (exexute) a lisp file used in requests of a command line switch"
   (setf program-events:*process-events-immediately* t)
-  (swconf:load-config-file)
+  (load-configuration-files)
   (init-db)
   (db-utils:with-ready-database (:connect nil)
     (client:init)

src/package.lisp

@@ -900,6 +900,8 @@
   (:nicknames :swconf)
   (:shadowing-import-from :misc :random-elt :shuffle)
   (:export
+   :+conf-filename+
+   :+shared-conf-filename+
    :+key-background+
    :+key-foreground+
    :+key-width+

src/software-configuration.lisp

@@ -78,6 +78,8 @@
 
 (define-constant +conf-filename+         "main.conf"             :test #'string=)
 
+(define-constant +shared-conf-filename+  "shared.conf"           :test #'string=)
+
 (define-constant +field-separator-value+ "."                     :test #'string=)
 
 (define-constant +field-separator+       :field-separator        :test #'eq)