Merge remote-tracking branch 'staging'

* staging:
  firefox/foxy-mdwdev.json: Add configuration at work.
  dot/Xdefaults, dot/Xdefaults.pterm: Set bold font explicitly.
  dot/xinitrc: Add settings for Emacs 28 (Lucid).
  dot/xinitrc: Add settings for Emacs 25 (Lucid).
  dot/ipython-config.py: Fix bungled capability check.
  el/dot-emacs.el, dot/gnus.el: Handle character widths correctly.
  el/dot-emacs.el: Make a section for bug-fixing `defadvice' hacks.
  el/dot-emacs.el: Break out the `rename-file' hacking into its own section.
  el/dot-emacs.el: Gather up the calendar and diary hacking.
  el/dot-emacs.el: Gather up the Org-mode hacking.
  el/dot-emacs.el: Split window management hacks into their own section.

diff --cc dot/Xdefaults.pterm
Simple merge

diff --cc dot/gnus.el
Simple merge

diff --cc el/dot-emacs.el
Simple merge