master fba537c 1/3: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit fba537cebc4dd6fbc5d83aac80704fa08ce0be5d
Merge: d5a4772 85ac0ef
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    85ac0efe7c Fix semantic-symref-perform-search doc string
---
 lisp/cedet/semantic/symref/cscope.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/cedet/semantic/symref/cscope.el 
b/lisp/cedet/semantic/symref/cscope.el
index e63b7a7..bc3f4a2 100644
--- a/lisp/cedet/semantic/symref/cscope.el
+++ b/lisp/cedet/semantic/symref/cscope.el
@@ -43,7 +43,7 @@ the hit list.
 See the function `cedet-cscope-search' for more details.")
 
 (cl-defmethod semantic-symref-perform-search ((tool 
semantic-symref-tool-cscope))
-  "Perform a search with GNU Global."
+  "Perform a search with CScope."
   (let* ((rootproj (when (and (featurep 'ede) ede-minor-mode)
                     (ede-toplevel)))
         (default-directory (if rootproj