[release-branch.go1] go-mode: Works for both GNU-Emacs and XEmacs-21.5

««« backport 83f7ee1fa792
go-mode: Works for both GNU-Emacs and XEmacs-21.5

Fixes some portability issues between the Emacsen.

R=golang-dev, sameer, bradfitz, ryanb
CC=golang-dev
https://golang.org/cl/6206043

»»»

diff --git a/misc/emacs/go-mode.el b/misc/emacs/go-mode.el
index f806de6a2bd684c2f3ca1fc87ebb9ed799d5680d..0e7e2184393e0879efbadbecb6cab96f3e89e929 100644 (file)
--- a/misc/emacs/go-mode.el
+++ b/misc/emacs/go-mode.el
@@ -33,8 +33,8 @@
     ;; Operators (punctuation)
     (modify-syntax-entry ?+  "." st)
     (modify-syntax-entry ?-  "." st)
-    (modify-syntax-entry ?*  ". 23" st)   ; also part of comments
-    (modify-syntax-entry ?/  ". 124b" st) ; ditto
+    (modify-syntax-entry ?*  ". 23" st)                                    ; also part of comments
+    (modify-syntax-entry ?/ (if (featurep 'xemacs) ". 1456" ". 124b") st)  ; ditto
     (modify-syntax-entry ?%  "." st)
     (modify-syntax-entry ?&  "." st)
     (modify-syntax-entry ?|  "." st)
@@ -442,7 +442,7 @@ if no further tokens of the type exist."
                  (when (search-forward "\n" (cdr cs) t)
                    (put-text-property
                     (car cs) (cdr cs) 'font-lock-multline t))
-                 (set-match-data (list (car cs) (cdr cs) (current-buffer)))
+                 (set-match-data (list (car cs) (copy-marker (cdr cs))))
                  (goto-char (cdr cs))
                  (setq result t))
              ;; Wrong type.  Look for next comment/string after this one.
@@ -554,7 +554,7 @@ token on the line."
 (defun go-mode-whitespace-p (char)
   "Is newline, or char whitespace in the syntax table for go."
   (or (eq char ?\n)
-      (eq 32 (char-syntax char))))
+      (= (char-syntax char) ?\ )))
 
 (defun go-mode-backward-skip-comments ()
   "Skip backward over comments and whitespace."