From e8153ad9c250b181a8d06ad1abb907ba8d362997 Mon Sep 17 00:00:00 2001
From: Edwin Pujols <edwin.pujols5@outlook.com>
Date: Thu, 3 Dec 2020 18:49:27 -0400
Subject: [PATCH] man.vim: Set iskeyword explicitly.

This also fixes `:Man!`, which wasn't setting 'iskeyword' to contain
parentheses, etc.
---
 runtime/autoload/man.vim | 2 --
 runtime/ftplugin/man.vim | 6 +++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim
index 486ed99e3f..d97ac684c3 100644
--- a/runtime/autoload/man.vim
+++ b/runtime/autoload/man.vim
@@ -139,8 +139,6 @@ function! s:put_page(page) abort
   setlocal modifiable
   setlocal noreadonly
   setlocal noswapfile
-  " git-ls-files(1) is all one keyword/tag-target
-  setlocal iskeyword+=(,)
   silent keepjumps %delete _
   silent put =a:page
   while getline(1) =~# '^\s*$'
diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim
index 74225a558c..f01314dc82 100644
--- a/runtime/ftplugin/man.vim
+++ b/runtime/ftplugin/man.vim
@@ -16,7 +16,11 @@ setlocal noswapfile buftype=nofile bufhidden=hide
 setlocal nomodified readonly nomodifiable
 setlocal noexpandtab tabstop=8 softtabstop=8 shiftwidth=8
 setlocal wrap breakindent linebreak
-setlocal iskeyword+=-
+
+" Parentheses and '-' for references like `git-ls-files(1)`; '@' for systemd
+" pages; ':' for Perl and C++ pages.  Here, I intentionally omit the locale
+" specific characters matched by `@`.
+setlocal iskeyword=@-@,:,a-z,A-Z,48-57,_,.,-,(,)
 
 setlocal nonumber norelativenumber
 setlocal foldcolumn=0 colorcolumn=0 nolist nofoldenable