Merge branch 'master' into dev

diff --cc gitk
index fda06186b4dcf7d42560cd1ac6cf25d06e295925,4a923afdf3198ef0086c30f1ae84fb6bdd606f5d..dc716597f079aece8e8dde4cf5a5ee703f0165dd
--- 1/gitk
--- 2/gitk
+++ b/gitk
@@@ -1348,8 -613,21 +1348,21 @@@ proc confirm_popup msg 
      return $confirm_ok
  }
  
+ proc setoptions {} {
+     option add *Panedwindow.showHandle 1 startupFile
+     option add *Panedwindow.sashRelief raised startupFile
+     option add *Button.font uifont startupFile
+     option add *Checkbutton.font uifont startupFile
+     option add *Radiobutton.font uifont startupFile
+     option add *Menu.font uifont startupFile
+     option add *Menubutton.font uifont startupFile
+     option add *Label.font uifont startupFile
+     option add *Message.font uifont startupFile
+     option add *Entry.font uifont startupFile
+ }
+ 
  proc makewindow {} {
 -    global canv canv2 canv3 linespc charspc ctext cflist
 +    global canv canv2 canv3 linespc charspc ctext cflist cscroll
      global tabstop
      global findtype findtypemenu findloc findstring fstring geometry
      global entries sha1entry sha1string sha1but
@@@ -1366,10 -644,8 +1379,9 @@@
  
      menu .bar
      .bar add cascade -label [mc "File"] -menu .bar.file
-     .bar configure -font uifont
      menu .bar.file
      .bar.file add command -label [mc "Update"] -command updatecommits
 +    .bar.file add command -label [mc "Reload"] -command reloadcommits
      .bar.file add command -label [mc "Reread references"] -command rereadrefs
      .bar.file add command -label [mc "List references"] -command showrefs
      .bar.file add command -label [mc "Quit"] -command doquit