diff options
| author | Allen Li <darkfeline@felesatra.moe> | 2019-06-16 03:32:02 -0700 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2019-06-22 19:25:44 -0400 |
| commit | 2db75262c7395483d1fa9a0c9d93dd3e4d534e1f (patch) | |
| tree | 15e7327d356d20ddcc894810ecf3615fb1a22fe7 | |
| parent | 0f01a58c390faf30c33b369fc81b2a14ec5b7f2e (diff) | |
| download | emacs-2db75262c7395483d1fa9a0c9d93dd3e4d534e1f.tar.gz | |
Fix defining inverse abbrevs on previous words (Bug#36243)
* lisp/abbrev.el (inverse-add-abbrev): Skip trailing nonword
characters when defining abbrev.
* test/lisp/abbrev-tests.el (abbrev-edit-save-to-file-test): Add
regression tests.
| -rw-r--r-- | lisp/abbrev.el | 1 | ||||
| -rw-r--r-- | test/lisp/abbrev-tests.el | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/lisp/abbrev.el b/lisp/abbrev.el index 3c88ec661a9..3d0a843e375 100644 --- a/lisp/abbrev.el +++ b/lisp/abbrev.el @@ -352,6 +352,7 @@ Expands the abbreviation after defining it." (let (name exp start end) (save-excursion (forward-word (1+ (- arg))) + (skip-syntax-backward "^w") (setq end (point)) (backward-word 1) (setq start (point) diff --git a/test/lisp/abbrev-tests.el b/test/lisp/abbrev-tests.el index 3b8acf5519a..2750e9a6263 100644 --- a/test/lisp/abbrev-tests.el +++ b/test/lisp/abbrev-tests.el @@ -274,6 +274,34 @@ (abbrev-expansion "s-a-t" ert-save-test-table))) (delete-file temp-test-file)))) +(ert-deftest inverse-add-abbrev-skips-trailing-nonword () + "Test that adding an inverse abbrev skips trailing nonword characters." + (let ((table (make-abbrev-table))) + (with-temp-buffer + (insert "some text foo ") + (cl-letf (((symbol-function 'read-string) (lambda (&rest _) "bar"))) + (inverse-add-abbrev table "Global" 1))) + (should (string= (abbrev-expansion "foo" table) "bar")))) + +(ert-deftest inverse-add-abbrev-skips-trailing-nonword/postiive-arg () + "Test that adding an inverse abbrev skips trailing nonword characters." + (let ((table (make-abbrev-table))) + (with-temp-buffer + (insert "some text foo ") + (cl-letf (((symbol-function 'read-string) (lambda (&rest _) "bar"))) + (inverse-add-abbrev table "Global" 2))) + (should (string= (abbrev-expansion "text" table) "bar")))) + +(ert-deftest inverse-add-abbrev-skips-trailing-nonword/negative-arg () + "Test that adding an inverse abbrev skips trailing nonword characters." + (let ((table (make-abbrev-table))) + (with-temp-buffer + (insert "some text foo") + (goto-char (point-min)) + (cl-letf (((symbol-function 'read-string) (lambda (&rest _) "bar"))) + (inverse-add-abbrev table "Global" -1))) + (should (string= (abbrev-expansion "text" table) "bar")))) + (provide 'abbrev-tests) ;;; abbrev-tests.el ends here |