Merge capitalized-words-mode and subword-mode

2 files changed, 35 insertions, 0 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 1fe024a1286..026357771bf 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,5 +1,9 @@
 2014-03-23  Daniel Colascione  <dancol@dancol.org>
 
+        * automated/subword-tests.el (subword-tests2): More subword tests.
+
+2014-03-23  Daniel Colascione  <dancol@dancol.org>
+
         * automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
         test: correct parsing of keyword arguments.
 
diff --git a/test/automated/subword-tests.el b/test/automated/subword-tests.el
index 3b37bc84886..7c6c77d4cc9 100644
--- a/test/automated/subword-tests.el
+++ b/test/automated/subword-tests.el
@@ -46,5 +46,36 @@
         (insert "^"))
       (should (equal (buffer-string) str)))))
 
+(ert-deftest subword-tests2 ()
+  "Test that motion in subword-mode stops at the right places."
+
+  (let* ((line "fooBarBAZ quXD g_TESTThingAbc word BLAH test")
+         (fwrd "*  *  *  *  * * *    *    *  *    *    *    *")
+         (bkwd "*  *  *   * *  * *   *    *   *    *    *   *"))
+
+    (with-temp-buffer
+      (subword-mode 1)
+      (insert line)
+
+      ;; Test forward motion.
+      
+      (goto-char (point-min))
+      (let ((stops (make-string (length fwrd) ?\ )))
+        (while (progn
+                 (aset stops (1- (point)) ?\*)
+                 (not (eobp)))          
+          (forward-word))
+        (should (equal stops fwrd)))
+
+      ;; Test backward motion.
+
+      (goto-char (point-max))
+      (let ((stops (make-string (length bkwd) ?\ )))
+        (while (progn
+                 (aset stops (1- (point)) ?\*)
+                 (not (bobp)))          
+          (backward-word))
+        (should (equal stops bkwd))))))
+
 (provide 'subword-tests)
 ;;; subword-tests.el ends here