>From af0d9c48aaf99d8df5fa55a8ba2c0ee42bf695e9 Mon Sep 17 00:00:00 2001
From: Daniel Koning <dk@danielkoning.com>
Date: Wed, 10 Jun 2020 14:42:39 -0500
Subject: [PATCH] Don't stop at field boundaries when counting words
 (Bug#41761)

* lisp/simple.el (count-words): Ensure that `forward-word-strictly'
moves point from one field to the next during the word-counting loop.

Copyright-paperwork-exempt: yes
---
 lisp/simple.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/simple.el b/lisp/simple.el
index 6d7600e414..9d898eeeec 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1319,7 +1319,9 @@ count-words
 END, without printing any message."
   (interactive (list nil nil))
   (cond ((not (called-interactively-p 'any))
-	 (let ((words 0))
+	 (let ((words 0)
+               ;; Count across field boundaries. (Bug#41761)
+               (inhibit-field-text-motion t))
 	   (save-excursion
 	     (save-restriction
 	       (narrow-to-region start end)
-- 
2.20.1