master 3312710fd6 2/2: Make conf-javaprop-mode only claim that # lines are comments

[Lars Ingebrigtsen]

branch: master
commit 3312710fd672021b17983ef2287dbd57a9a110a1
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Make conf-javaprop-mode only claim that # lines are comments
    
    * lisp/textmodes/conf-mode.el (conf-javaprop-mode-syntax-table):
    Make obsolete and remove syntax entries for // and /* (bug#49077),
    because only # are comments in javaprop files.
    (conf-javaprop-mode): Adjust doc string to just mention #
    comments.
---
 lisp/textmodes/conf-mode.el            | 13 +++----------
 test/lisp/textmodes/conf-mode-tests.el |  5 +----
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index f940de3ff4..c3c9af5a83 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -139,11 +139,9 @@ not align (only setting space according to 
`conf-assignment-space')."
   "Syntax table in use in Unix style `conf-mode' buffers.")
 
 (defvar conf-javaprop-mode-syntax-table
-  (let ((table (make-syntax-table conf-unix-mode-syntax-table)))
-    (modify-syntax-entry ?/  ". 124" table)
-    (modify-syntax-entry ?*  ". 23b" table)
-    table)
+  (make-syntax-table conf-unix-mode-syntax-table)
   "Syntax table in use in Java properties buffers.")
+(make-obsolete-variable 'conf-javaprop-mode-syntax-table nil "29.1")
 
 (defvar conf-ppd-mode-syntax-table
   (let ((table (make-syntax-table conf-mode-syntax-table)))
@@ -470,13 +468,9 @@ PersistMoniker=file://Folder.htt"
 ;;;###autoload
 (define-derived-mode conf-javaprop-mode conf-mode "Conf[JavaProp]"
   "Conf Mode starter for Java properties files.
-Comments start with `#' but are also recognized with `//' or
-between `/*' and `*/'.
-For details see `conf-mode'.  Example:
+Comments start with `#'.  Example:
 
 # Conf mode font-locks this right with \\[conf-javaprop-mode] (Java properties)
-// another kind of comment
-/* yet another */
 
 name:value
 name=value
@@ -487,7 +481,6 @@ x.2.y.1.z.2.zz ="
   (conf-mode-initialize "#" 'conf-javaprop-font-lock-keywords)
   (setq-local conf-assignment-column conf-javaprop-assignment-column)
   (setq-local conf-assignment-regexp ".+?\\([ \t]*[=: \t][ \t]*\\|$\\)")
-  (setq-local comment-start-skip "\\(?:#+\\|/[/*]+\\)\\s *")
   (setq-local imenu-generic-expression
              '(("Parameters" "^[ \t]*\\(.+?\\)[=: \t]" 1))))
 
diff --git a/test/lisp/textmodes/conf-mode-tests.el 
b/test/lisp/textmodes/conf-mode-tests.el
index 2b4fde40c3..097b25f114 100644
--- a/test/lisp/textmodes/conf-mode-tests.el
+++ b/test/lisp/textmodes/conf-mode-tests.el
@@ -74,8 +74,7 @@ PersistMoniker=file://Folder.htt")
 (ert-deftest conf-test-javaprop-mode ()
   (with-temp-buffer
     ;; From `conf-javaprop-mode' docstring
-    (insert "// another kind of comment
-/* yet another */
+    (insert "# comment
 
 name:value
 name=value
@@ -90,8 +89,6 @@ x.2.y.1.z.2.zz =")
     (should (equal (face-at-point) 'font-lock-comment-delimiter-face))
     (forward-char 3)
     (should (equal (face-at-point) 'font-lock-comment-face))
-    (search-forward "*")
-    (should (equal (face-at-point) 'font-lock-comment-delimiter-face))
     (while (search-forward "nam" nil t)
       (should (equal (face-at-point) 'font-lock-variable-name-face))
       (search-forward "val")