From: Allen Li <vianchielfaura@gmail.com>
Date: Thu, 2 Mar 2017 12:56:53 +0000 (-0500)
Subject: Stop abbrev-prefix-mark from adding extra newline (Bug#25767)
X-Git-Tag: emacs-26.0.90~662
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c733d9169ce44f5600d41cf0e67e021371954c8e;p=emacs.git

Stop abbrev-prefix-mark from adding extra newline (Bug#25767)

`abbrev--before-point' does not adjust `pos' to account for when it
deletes the "-" left by abbrev-prefix-mark.  Therefore, when
`abbrev-before-point' goes to restore point, it moves point one
character too far forward.

* lisp/abbrev.el (abbrev--before-point): Adjust pos when deleting "-".
---

diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index cbc604c23d6..01ad3d478fc 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -720,9 +720,10 @@ then ABBREV is looked up in that table only."
           (setq start abbrev-start-location)
           (setq abbrev-start-location nil)
           ;; Remove the hyphen inserted by `abbrev-prefix-mark'.
-          (if (and (< start (point-max))
-                   (eq (char-after start) ?-))
-              (delete-region start (1+ start)))
+          (when (and (< start (point-max))
+                     (eq (char-after start) ?-))
+            (delete-region start (1+ start))
+            (setq pos (1- pos)))
           (skip-syntax-backward " ")
           (setq end (point))
           (when (> end start)