Merge pull request #316 from ejmr/issue-314

Don't move cursor position in php-mode

Author: syohex

php-mode-test.el

@@ -612,6 +612,13 @@ style from Drupal."
     (php-mode)
     (should-not (buffer-modified-p))))
 
+(ert-deftest php-mode-test-issue-314 ()
+  "Activating php-mode should not move point."
+  (with-php-mode-test ("issue-314.php")
+    (let ((orig-point (point)))
+      (php-mode)
+      (should (eq (point) orig-point)))))
+
 (ert-deftest php-mode-test-issue-310 ()
   "Proper indentation after function with return type."
   (with-php-mode-test ("issue-310.php" :indent t :magic t)))

php-mode.el

@@ -1079,7 +1079,8 @@ PHP heredoc."
 
   (when (>= emacs-major-version 25)
     (with-silent-modifications
-      (php-syntax-propertize-function (point-min) (point-max)))))
+      (save-excursion
+        (php-syntax-propertize-function (point-min) (point-max))))))
 
 
 ;; Define function name completion function

tests/issue-314.php

@@ -0,0 +1,3 @@
+<?php
+
+// It's the apostrophe.