Fix mouse clicks on characters with parenthesis syntax

* lisp/mouse.el (context-menu-region, mouse-skip-word)
(mouse-start-end): Use 'syntax-after' instead of 'char-syntax', to
pay attention to 'syntax-table' text properties.  (Bug#74415)

(cherry picked from commit 742b792175bd7149b1401a45aae1af83798bf188)

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 120a55b48a68aacc9398dbd419c1ac9b6cdaff0a..2e9862852d2233921fb212cded5e623c9f4c077e 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -631,7 +631,9 @@ Some context functions add menu items below the separator."
     (with-current-buffer (window-buffer (posn-window (event-end click)))
       (when (let* ((pos (posn-point (event-end click)))
                    (char (when pos (char-after pos))))
-              (or (and char (eq (char-syntax char) ?\"))
+              (or (and char (eq (syntax-class-to-char
+                                 (syntax-class (syntax-after pos)))
+                                ?\"))
                   (nth 3 (save-excursion (syntax-ppss pos)))))
         (define-key-after submenu [mark-string]
           `(menu-item "String"
@@ -1872,7 +1874,8 @@ The region will be defined with mark and point."
 If `mouse-1-double-click-prefer-symbols' is non-nil, skip over symbol.
 If DIR is positive skip forward; if negative, skip backward."
   (let* ((char (following-char))
-        (syntax (char-to-string (char-syntax char)))
+        (syntax (char-to-string
+                  (syntax-class-to-char (syntax-class (syntax-after (point))))))
          sym)
     (cond ((and mouse-1-double-click-prefer-symbols
                 (setq sym (bounds-of-thing-at-point 'symbol)))
@@ -1920,34 +1923,31 @@ If MODE is 2 then do the same for lines."
         ((and (= mode 1)
               (= start end)
              (char-after start)
-              (= (char-syntax (char-after start)) ?\())
-         (if (/= (syntax-class (syntax-after start)) 4) ; raw syntax code for ?\(
-             ;; This happens in CC Mode when unbalanced parens in CPP
-             ;; constructs are given punctuation syntax with
-             ;; syntax-table text properties.  (2016-02-21).
-             (signal 'scan-error (list "Containing expression ends prematurely"
-                                       start start))
-           (list start
-                 (save-excursion
-                   (goto-char start)
-                   (forward-sexp 1)
-                   (point)))))
+              (= (syntax-class-to-char
+                  (syntax-class (syntax-after start)))
+                 ?\())
+         (list start
+               (save-excursion
+                 (goto-char start)
+                 (forward-sexp 1)
+                 (point))))
         ((and (= mode 1)
               (= start end)
              (char-after start)
-              (= (char-syntax (char-after start)) ?\)))
-         (if (/= (syntax-class (syntax-after start)) 5) ; raw syntax code for ?\)
-             ;; See above comment about CC Mode.
-             (signal 'scan-error (list "Unbalanced parentheses" start start))
-           (list (save-excursion
-                   (goto-char (1+ start))
-                   (backward-sexp 1)
-                   (point))
-                 (1+ start))))
+              (= (syntax-class-to-char
+                  (syntax-class (syntax-after start)))
+                 ?\)))
+         (list (save-excursion
+                 (goto-char (1+ start))
+                 (backward-sexp 1)
+                 (point))
+               (1+ start)))
        ((and (= mode 1)
               (= start end)
              (char-after start)
-              (= (char-syntax (char-after start)) ?\"))
+              (= (syntax-class-to-char
+                  (syntax-class (syntax-after start)))
+                 ?\"))
         (let ((open (or (eq start (point-min))
                         (save-excursion
                           (goto-char (- start 1))