Merge branch 'master' into geldfix

Author: myk002

changelog.txt

@@ -41,7 +41,8 @@ Template for new versions:
 - `control-panel`: fix setting numeric preferences from the commandline
 - `gui/quickfort`: fix build mode evluation rules to allow placement of various furniture and constructions on tiles with stair shapes or without orthagonal floor.
 - `emigration`: save-and-reload no longer resets the emigration cycle timeout, making gameplay more consistent
-- `geld`/`ungeld`: fix permanence of gelding/ungelding status
+- `geld`, `ungeld`: fix gelding/ungelding being undone for units who are historical figures when reloading a game
+- `rejuvenate`: fix error when specifying ``--age`` parameter
 
 ## Misc Improvements
 - `control-panel`: Add realistic-melting tweak to control-panel registry

gui/journal.lua

@@ -5,7 +5,6 @@ local gui = require 'gui'
 local widgets = require 'gui.widgets'
 local utils = require 'utils'
 local json = require 'json'
-local text_editor = reqscript('internal/journal/text_editor')
 local shifter = reqscript('internal/journal/shifter')
 local table_of_contents = reqscript('internal/journal/table_of_contents')
 
@@ -113,7 +112,7 @@ function JournalWindow:init()
             interior_b=true,
             frame_style_t=false,
         },
-        text_editor.TextEditor{
+        widgets.TextArea{
             view_id='journal_editor',
             frame={t=1, b=3, l=25, r=0},
             resize_min={w=30, h=10},