Mark Wooding [Sun, 19 Apr 2020 20:49:25 +0000 (21:49 +0100)]
dot/putty-defaults: Hide the mouse cursor when typing.
Emacs does this, and it's not too annoying.
Mark Wooding [Sun, 19 Apr 2020 20:47:50 +0000 (21:47 +0100)]
el/dot-emacs.el: Revert `variable-pitch' to (server-side) Helvetica 12pt.
The anti-aliased `Sans' is harder to read and takes up more space. The
9pt Helvetica is a poor match for `6x13'.
Mark Wooding [Mon, 20 Apr 2020 12:18:36 +0000 (13:18 +0100)]
bin/wakey.zsh: Implement the active-window check from Lange's version.
This is actually rather annoying, because (unlike `xterm'), `pterm''s
announced `WINDOWID' isn't its toplevel, so we have to go digging. In
theory I should do a recursive walk, but, well, I don't yet.
Mark Wooding [Mon, 20 Apr 2020 12:17:02 +0000 (13:17 +0100)]
bin/wakey.zsh: Refactor the logic in `__wakey_precmd'.
Split it into two sections: one to decide whether to report a
notification, and a second to actually do it.
The logic for the first stage is going to become more complicated, and
this avoids having to have two copies of the notification code.
Mark Wooding [Mon, 20 Apr 2020 12:14:23 +0000 (13:14 +0100)]
bin/wakey.zsh: Don't do anything if there's no X display, or `notify-send'.
Mark Wooding [Mon, 20 Apr 2020 12:13:59 +0000 (13:13 +0100)]
bin/wakey.zsh: Implement `LONG_RUNNING_IGNORE_LIST' from Lange's version.
Mark Wooding [Tue, 14 Apr 2020 17:30:07 +0000 (18:30 +0100)]
dot/gnus.el: Make `.' be a symbol constituent when splitting mail.
This sometimes gets used in email address local parts.
Mark Wooding [Tue, 14 Apr 2020 17:24:32 +0000 (18:24 +0100)]
dot/gnus.el: Make `<' and `>' be punctuation when splitting mail.
Email addresses are commonly written between angle brackets in header
lines. I sometimes want to be able to parse out an entire email
address, or at least a local-part, from a header, as part of a Gnus
split specifier. But Gnus prepends a `.*' to the split regexp, so one
needs to take special precautions to start in the right place, typically
by using `\_<' to align to the start of a symbol. But if `<' is a
symbol character, then this won't work.
Worse, Gnus typically also tries to align to a word boundary by sneaking
in `\<'. But then we have `\<\_<', which rejects an email address
starting enclosed in `<' ... `>' altogether.
Fortunately, the syntax table used by Gnus while splitting email is
configurable, so we can override this silliness.
Mark Wooding [Mon, 20 Apr 2020 00:22:44 +0000 (01:22 +0100)]
bin/wakey.zsh: Add a new hack to tell me about long-running commands.
This idea was from Jonathan Lange's `undistract-me': see
https://github.com/jml/undistract-me
for the original for Bash.
Mark Wooding [Sun, 19 Apr 2020 23:39:51 +0000 (00:39 +0100)]
bin/disorder-notify, dot/e16-bindings: Use `notify-send', not `gdbus'.
Mark Wooding [Sat, 18 Apr 2020 22:25:03 +0000 (23:25 +0100)]
dot/emacs: Don't start a server if we're running as a daemon.
Emacs will just close it and try to start another anyway.
Mark Wooding [Sat, 18 Apr 2020 22:19:20 +0000 (23:19 +0100)]
dot/emacs: Don't use the `trash' on Emacs 23.
It doesn't actually work. Specifically, if you try to delete a file on,
say, `/tmp', then Emacs tries to rename it and fails with `EXDEV'.
This is especially troublesome because it breaks `emacs --daemon'.
Emacs doesn't usually delete its socket when it quits, so it gets left
behind as `/tmp/mdw/emacs1000/server' or something. When you run `emacs
--daemon' later, it finds the old socket and tries to delete it, which
fails. And /then/ you get left with a strange half-daemonized Emacs
which has crashed during startup, and the husk of its parent, and
neither of them can do anything very useful.
Mark Wooding [Sat, 18 Apr 2020 18:39:23 +0000 (19:39 +0100)]
dot/gnus.el, ...: Move general configuration into the common file.
This way, everyone benefits.
Mark Wooding [Sat, 18 Apr 2020 18:38:24 +0000 (19:38 +0100)]
dot/gnus-local.el.distorted: Require `nnmail' before mentioning its variables.
Fixes an error on startup.
Mark Wooding [Sat, 18 Apr 2020 02:28:43 +0000 (03:28 +0100)]
dot/profile: Persuade Gtk 3 not to hide scrollbars.
Idiotic idea.
Mark Wooding [Sat, 18 Apr 2020 02:27:53 +0000 (03:27 +0100)]
dot/gnus-local.el.distorted: Add more split rules.
Mark Wooding [Sat, 18 Apr 2020 02:26:52 +0000 (03:26 +0100)]
dot/gnus-local.el.distorted: Check `Envelope-To:' for recipients.
Mark Wooding [Fri, 17 Apr 2020 23:43:57 +0000 (00:43 +0100)]
dot/gtk3-settings.ini: Switch Gtk 3 theme to `raleigh-reloaded'.
The `compact' version is too lopsided, and, well, squished. It seems
that I have no ability to stick with a decision at the moment.
Mark Wooding [Fri, 17 Apr 2020 10:12:40 +0000 (11:12 +0100)]
dot/gnus-local.el.distorted: Remove the wildcard rule for `spam.'.
Now `spam.corpus' is handled correctly.
Mark Wooding [Fri, 17 Apr 2020 10:11:27 +0000 (11:11 +0100)]
dot/gnus-local.el.distorted: Abolish the `spam.' prefix.
Redesignate most of this as `crap'.
Mark Wooding [Fri, 17 Apr 2020 09:59:48 +0000 (10:59 +0100)]
dot/gnus-local.el.distorted: Add list for Cambridge crypto whisku.
Mark Wooding [Fri, 17 Apr 2020 09:59:26 +0000 (10:59 +0100)]
dot/gnus-local.el.distorted: Put the `nationwide' entries together.
Mark Wooding [Fri, 17 Apr 2020 09:56:41 +0000 (10:56 +0100)]
dot/gnus-local.el.distorted: Fix name of `noationwide' folder.
Broken in
a93d193834218880aebeb239586903acfa5bf164 because I'm a stoat.
Mark Wooding [Wed, 15 Apr 2020 22:54:11 +0000 (23:54 +0100)]
dot/gnus-local.el.distorted: Make new group `spam.oubliette' auto-expire.
Mark Wooding [Wed, 15 Apr 2020 21:05:42 +0000 (22:05 +0100)]
el/dot-emacs.el: Arrange for mail/news frames to be 80 columns wide.
Mark Wooding [Wed, 15 Apr 2020 21:05:03 +0000 (22:05 +0100)]
dot/emacs, el/dot-emacs.el: Formalize the frame-width fudge term.
Capture this in a variable so that we can use it in other places.
Mark Wooding [Wed, 15 Apr 2020 17:03:47 +0000 (18:03 +0100)]
dot/gnus-local.el.distorted: Collect and use the `odin.gg' mapping table.
An awful hack, but it seems to work.
Mark Wooding [Wed, 15 Apr 2020 17:02:44 +0000 (18:02 +0100)]
dot/gnus-local.el.distorted: Make `nnimap-...' settings be server vars.
Later versions of Gnus ignore them otherwise.
Mark Wooding [Wed, 15 Apr 2020 17:00:00 +0000 (18:00 +0100)]
dot/gnus-local.el.distorted: Remove `--insecure' for chiark.
It has a proper certificate now.
Mark Wooding [Wed, 15 Apr 2020 16:58:58 +0000 (17:58 +0100)]
dot/gnus-local.el.distorted: Collect mail for `jump-discuss' too.
Mark Wooding [Wed, 15 Apr 2020 16:57:40 +0000 (17:57 +0100)]
dot/gnus-local.el.distorted: Fix the Amazon pattern.
They send Marketplace email from a subdomain, so cope with that.
Mark Wooding [Wed, 15 Apr 2020 16:51:10 +0000 (17:51 +0100)]
dot/gnus-local.el.distorted: Be more careful about word boundaries.
I've found a number of things being sorted into the wrong folder as a
result of this.
Mark Wooding [Wed, 15 Apr 2020 16:48:27 +0000 (17:48 +0100)]
dot/gnus-local.el.distorted: Move select methods after split rules.
There's going to be a data dependency here.
Mark Wooding [Wed, 15 Apr 2020 16:44:17 +0000 (17:44 +0100)]
dot/gnus-local.el.distorted: Leave a limbo between unsubscribed and zombie.
This is an oubliette where mail folders that otherwise keep coming back
can be left and ignored.
Mark Wooding [Wed, 15 Apr 2020 16:43:12 +0000 (17:43 +0100)]
dot/gnus-local.el.distorted: Don't expire already-read articles.
It's easy enough to do with `E'.
Mark Wooding [Wed, 15 Apr 2020 16:42:03 +0000 (17:42 +0100)]
dot/gnus-local.el.distorted: Put a `Random configuration' banner at the top.
There's going to be more of this.
This is the start of a major overhaul.
Mark Wooding [Wed, 15 Apr 2020 17:06:26 +0000 (18:06 +0100)]
el/dot-emacs.el: Fix the Gnus hacking.
The `mm-...' compatibility alias has disappeared in Emacs 26. It turns
out that it wasn't necessary in Emacs 24 either, which is what I care
about, so just don't use it.
Mark Wooding [Mon, 13 Apr 2020 14:16:56 +0000 (15:16 +0100)]
el/dot-emacs.el: Remove `noip' from `LD_PRELOAD' list while running `man'.
Later versions of `man-db' install a `seccomp' filter to prevent stray
manpages from (among other stuff) doing network things. This interacts
badly with `noip', which wants to fetch the list of network interfaces
at startup. Since the `man-db' filter is strictly better than what
`noip' is doing, just turn off `noip' while running `man'.
Mark Wooding [Sat, 11 Apr 2020 16:41:32 +0000 (17:41 +0100)]
dot/gtk3-settings.ini, dot/xinitrc: Switch default Gtk 3 theme.
Yay! I found a conversion of the Gtk 2 `raleigh' theme. Set this in
the Gtk 3 configuration file, and adjust the `pterm' width to
compensate.
Mark Wooding [Sat, 11 Apr 2020 01:17:51 +0000 (02:17 +0100)]
dot/emacs: Don't automatically stage files after resolving conflicts.
I like to check the combined diff before staging, to make sure that my
proposed resolution looks right.
Mark Wooding [Fri, 10 Apr 2020 19:57:16 +0000 (20:57 +0100)]
dot/profile: Inhibit Qt `auto-scale-factor' stoatage.
On spirit, this makes the icons HUGE and the UI text almost unreadably
tiny -- even for me.
Mark Wooding [Fri, 10 Apr 2020 17:11:24 +0000 (18:11 +0100)]
dot/emacs, dot/xinitrc: Chicanery for Emacs 26 frame-width disaster.
It seems that Emacs 26 just won't create frames at the size I ask for.
The initial frame comes out one column two wide; subsequent
frames (after a short initial delay which I still don't understand) come
out three columns too narrow. The initial divvy still doesn't work
properly. But things are mostly right.
Mark Wooding [Fri, 10 Apr 2020 17:03:54 +0000 (18:03 +0100)]
dot/xinitrc: If we find an unversioned Emacs, discover its version.
This is because Debian has (rather annoyingly) given up its policy of
allowing multiple Emacs versions to be coinstalled.
Mark Wooding [Fri, 10 Apr 2020 17:03:37 +0000 (18:03 +0100)]
dot/xinitrc: Accept an `emacs-lucid' if we find one.
Mark Wooding [Fri, 10 Apr 2020 17:01:18 +0000 (18:01 +0100)]
dot/emacs: Cope with `ido-completing-read+' configuration differences.
The old `ido-ubiquitous-command-overrides' doesn't exist any more,
so (a) configuring it won't do any good, and (b) extending it doesn't
work because the variable is unbound. Instead, apply the same
configuration to `ido-cr+-function-blacklist' (which has a different --
but simpler -- format).
Mark Wooding [Fri, 10 Apr 2020 17:00:28 +0000 (18:00 +0100)]
dot/emacs: Cope if `warning-suppress-types' is unbound at startup.
This happens in Emacs 26. I have no idea why.
Mark Wooding [Fri, 10 Apr 2020 16:57:25 +0000 (17:57 +0100)]
Makefile: Link `fonts.conf' into the XDG configuration directory.
Later versions of `fontconfig' don't bother looking in `~/.fonts.conf'
any more, despite documentation to the contrary.
Mark Wooding [Fri, 10 Apr 2020 16:57:07 +0000 (17:57 +0100)]
dot/xinitrc: Add hacking for Gtk 3-based `pterm'.
Mark Wooding [Fri, 10 Apr 2020 16:55:29 +0000 (17:55 +0100)]
el/dot-emacs.el: Define a `fixed-pitch-serif' face.
This is primarily needed for Info mode, which, in later Emacs, otherwise
uses Courier for explicitly-monospace text, which really doesn't fit
well against X11 Fixed.
Mark Wooding [Fri, 10 Apr 2020 16:53:13 +0000 (17:53 +0100)]
el/dot-emacs.el: Ensure that `diary-time-regexp' exists as a variable.
Otherwise later versions of Emacs (at least) report a warning at startup
about our advice on `diary-add-to-list'.
Mark Wooding [Fri, 10 Apr 2020 16:51:22 +0000 (17:51 +0100)]
mdw/build: Check out the `mdw-build' branch by hand.
Later versions of Git leave the working tree empty after `git checkout
-b'. Instead, just go through the necessary motions using the plumbing-
level commands.
Mark Wooding [Sat, 28 Mar 2020 16:06:35 +0000 (16:06 +0000)]
el/dot-emacs.el: Show italic characters in manpages correctly where possible.
They're still underlined in terminals where I don't expect italic
rendering to work.
Mark Wooding [Sat, 28 Mar 2020 12:42:53 +0000 (12:42 +0000)]
etc/profile: Fix the Qt style hacking.
See Debian #852836.
Mark Wooding [Sat, 28 Mar 2020 09:51:22 +0000 (09:51 +0000)]
dot/e16-bindings: Remove the 5-f8 binding for opening terminals.
I want to train myself to use the new C-5-t binding instead.
Mark Wooding [Sun, 22 Mar 2020 19:16:51 +0000 (19:16 +0000)]
bin/check-blkdev-size: Add script for checking suspicious block devices.
I've had this lying around for a while.
Mark Wooding [Fri, 20 Mar 2020 16:47:45 +0000 (16:47 +0000)]
dot/e16-bindings: Add `C-M-t' to open a new terminal.
Infuriatingly, Intel have decided to steal `5-f8' for some useless thing
to do with the Windows video settings, with no way to override or turn
this off. Add a different keystroke for the same thing.
Maybe I'll even end up preferring this.
Mark Wooding [Fri, 20 Mar 2020 16:46:37 +0000 (16:46 +0000)]
dot/e16-bindings: Dislodge transparency to `C-5-c'.
This isn't very frequently needed, so it won't be too annoying. The `c'
is mnemonic for `compositing'. Part two of the sliding block puzzle.
Mark Wooding [Fri, 20 Mar 2020 16:45:16 +0000 (16:45 +0000)]
dot/e16-bindings: Dislodge `reset pointer shape' to `C-5-p'.
I'd forgotten that this even existed, so it's not going to upset my
finger macros. This is part of an annoying sliding-block puzzle.
Mark Wooding [Fri, 20 Mar 2020 16:28:45 +0000 (16:28 +0000)]
dot/gitconfig.in: Delete the external grep colour setting.
I don't know where this came from, and it's not supported by the
documentation. Later versions of Git refuse to do anything while this
is here.
Mark Wooding [Fri, 20 Mar 2020 16:27:56 +0000 (16:27 +0000)]
dot/emacs: Only load `ido-ubiquitous' if we really need it.
It's folded into `ido-completing-read+' in later versions, and you get
an annoying warning if you ask for it anyway.
Mark Wooding [Wed, 26 Feb 2020 13:53:42 +0000 (13:53 +0000)]
dot/inputrc: Show completions on the first `tab' keypress.
Mark Wooding [Tue, 25 Feb 2020 23:27:53 +0000 (23:27 +0000)]
dot/gtk3-settings.ini: Add reminder about Gtk 3's vanishing scrollbars.
This setting ought to do something, but doesn't. Huh.
Mark Wooding [Tue, 25 Feb 2020 23:27:26 +0000 (23:27 +0000)]
dot/gtk3-settings.ini: Try to get Gtk programs to be dark.
This doesn't seem to help much. Oh, well.
Mark Wooding [Tue, 25 Feb 2020 23:25:59 +0000 (23:25 +0000)]
dot/e16-bindings: Add bindings for switching compositing on and off.
Compositing without hardware acceleration imposes a very heavy CPU load,
so under those circumstances it's best only used on special occasions.
Mark Wooding [Tue, 25 Feb 2020 23:25:23 +0000 (23:25 +0000)]
dot/e16-bindings: Remove untabification debris.
Introduced in
07321cbb237f2d0fe05e155b312d0f93461b8214, but it doesn't
seem to have done any damage.
Mark Wooding [Tue, 25 Feb 2020 23:23:40 +0000 (23:23 +0000)]
dot/e16-bindings: Remove the scroll-wheel bindings for switching desktops.
They're far too easy to trigger automatically.
Mark Wooding [Sat, 9 Nov 2019 04:54:55 +0000 (04:54 +0000)]
bin/check-debsyms: New script simplifies checking Debian `symbols' files.
Mark Wooding [Fri, 8 Nov 2019 12:03:36 +0000 (12:03 +0000)]
el/dot-emacs.el: Turn off global diff refinement in Magit.
It turns out that this is really slow.
Mark Wooding [Wed, 9 Oct 2019 16:24:08 +0000 (17:24 +0100)]
el/dot-emacs.el: Try again to prevent switching to windows in other frames.
Ian Jackson pointed out that my previous countermeasure wasn't working.
I now have some new scars from `display-buffer'.
Mark Wooding [Tue, 8 Oct 2019 22:19:16 +0000 (23:19 +0100)]
dot/profile: Inhibit angry-fruit-salad errors from things.
There'll be more of this to come, I'm sure, but it's a start. Maybe
I'll be able to find my prompt again.
Mark Wooding [Tue, 8 Oct 2019 10:42:22 +0000 (11:42 +0100)]
git/gitignore: Ignore `debian/build/' directory.
Mark Wooding [Mon, 7 Oct 2019 13:41:16 +0000 (14:41 +0100)]
git/gitignore: Ignore general Debian build debris.
Mark Wooding [Mon, 30 Sep 2019 01:51:14 +0000 (02:51 +0100)]
bin/mdw-build: Support interim Debian package versions.
If the Debian version in the changelog ends with `~' then append the Git
version to this to form the synthetic version. This will make a Debian
version number which is correctly slightly short of the target release
version.
Mark Wooding [Sun, 22 Sep 2019 14:25:35 +0000 (15:25 +0100)]
bin/mdw-sbuild-server: Run builds sequentially.
Otherwise they can interfere with each other, and cause test failures.
For example, TrIPE wants to use fixed port numbers in its fancier tests.
Mark Wooding [Fri, 20 Sep 2019 02:03:53 +0000 (03:03 +0100)]
bin/mdw-sbuild-server: Align `sbuild' output in the log spew.
Mark Wooding [Fri, 13 Sep 2019 16:21:49 +0000 (17:21 +0100)]
dot/emacs, el/dot-emacs.el: Gather mode settings together.
Not my cleanest patch, but this should just be a bunch of reordering of
stuff with some light formatting.
Mark Wooding [Fri, 13 Sep 2019 18:53:33 +0000 (19:53 +0100)]
el/dot-emacs.el: Use `dolist' or `mapc' rather than `mapcar' for effect.
Prefer the former where the compiler can macroexpand it reliably.
Mark Wooding [Fri, 13 Sep 2019 16:20:11 +0000 (17:20 +0100)]
dot/emacs, el/dot-emacs.el: Consistently use `setq-default' for mode defaults.
More-or-less consistently anyway.
Mark Wooding [Fri, 13 Sep 2019 16:14:00 +0000 (17:14 +0100)]
el/dot-emacs.el: Add a heading for `m4'.
Mark Wooding [Fri, 13 Sep 2019 16:13:14 +0000 (17:13 +0100)]
el/dot-emacs.el: Promote `Lispy languages' to a top-level section.
Mark Wooding [Fri, 13 Sep 2019 16:09:34 +0000 (17:09 +0100)]
el/dot-emacs.el (comint-...): Lift out into utilities.
They didn't really have much to do with Lisp.
Mark Wooding [Fri, 13 Sep 2019 16:07:07 +0000 (17:07 +0100)]
el/dot-emacs.el (date): Use primitive `delete-char' to remove newline.
Mark Wooding [Fri, 13 Sep 2019 16:06:04 +0000 (17:06 +0100)]
dot/emacs, dot/xinitrc, el/dot-emacs.el: Flag for Emacs splash screen.
It turns out to be rather annoying when used from the command line, so
add an option to inhibit it and other related cruft.
Mark Wooding [Fri, 13 Sep 2019 16:05:13 +0000 (17:05 +0100)]
el/dot-emacs.el: Factor out the command-line option scanning.
Mark Wooding [Wed, 11 Sep 2019 16:50:49 +0000 (17:50 +0100)]
dot/gitconfig.in: Add rune to run a command in all modules.
For some daft reason, `git submodule foreach' won't run the command in
the top-level working tree.
Mark Wooding [Mon, 9 Sep 2019 22:57:27 +0000 (23:57 +0100)]
Merge remote-tracking branch 'staging/master'
* staging/master:
dot/gitconfig.in: Support the `scissors' convention in incoming mail.
dot/gitconfig.in: Force the `from' address on Git patches.
dot/gitconfig.in: Delete the `patches' alias.
Mark Wooding [Mon, 9 Sep 2019 17:26:30 +0000 (18:26 +0100)]
dot/gitconfig.in: Support the `scissors' convention in incoming mail.
Mark Wooding [Mon, 9 Sep 2019 17:25:56 +0000 (18:25 +0100)]
dot/gitconfig.in: Force the `from' address on Git patches.
I don't think it's right to sign other people up for email just because
I'm presenting their patches upstream.
Mark Wooding [Mon, 9 Sep 2019 17:23:04 +0000 (18:23 +0100)]
dot/gitconfig.in: Delete the `patches' alias.
I wasn't using it. :-/
Mark Wooding [Sun, 8 Sep 2019 19:15:26 +0000 (20:15 +0100)]
dot/e16-bindings: Swap window-move and area-move.
The former seems more useful, so it should have the simpler chord.
Mark Wooding [Wed, 4 Sep 2019 18:10:52 +0000 (19:10 +0100)]
bin/datasyms: New utility to print the writable-data symbols in object files.
It turns out that I have a habit of forgetting to declare constant
tables as being `const'. This tool is one of the few ways to notice
that I've done this.
Mark Wooding [Tue, 3 Sep 2019 10:52:18 +0000 (11:52 +0100)]
dot/gitconfig.in: Show Git output in columns.
Why have I only just noticed that this exists?
Mark Wooding [Tue, 3 Sep 2019 10:51:41 +0000 (11:51 +0100)]
dot/emacs: Have `ediff' windows side-by-side by default.
Mark Wooding [Tue, 3 Sep 2019 10:51:20 +0000 (11:51 +0100)]
dot/emacs: Configure BibTeX record key generation.
Mark Wooding [Tue, 3 Sep 2019 10:50:33 +0000 (11:50 +0100)]
dot/emacs: Configure BibTeX record sorting.
Expand the string entries, and sort by entry class.
Mark Wooding [Tue, 3 Sep 2019 10:48:40 +0000 (11:48 +0100)]
dot/emacs: Sort fields and add braces as necessary in BibTeX records.
Mark Wooding [Tue, 3 Sep 2019 10:36:52 +0000 (11:36 +0100)]
dot/emacs: Align the `=' signs in a BibTeX record.
Mark Wooding [Tue, 3 Sep 2019 10:36:06 +0000 (11:36 +0100)]
dot/emacs: Include optional fields in new BibTeX records.
The formatting will delete them if they're not wanted.
Mark Wooding [Tue, 3 Sep 2019 10:33:51 +0000 (11:33 +0100)]
el/dot-emacs.el: Set fill column smaller in `bibtex-mode'.
There's some bug in the mode-specific filling which causes overly long
lines sometimes.
Mark Wooding [Fri, 23 Aug 2019 16:35:36 +0000 (17:35 +0100)]
dot/lesskey: Switch `less' back to `-R'.
This reverts
b59e8644263f6e5bd31778ffada9be6e0a539a92, but puts the `R'
option with the other uppercase things for consistency.
With `-r', `less' (a) won't truncate lines, and (b) hopelessly corrupts
the screen.
I shall resolve the problem with `diff' by installing version 3.7, which
fixes the bug.