Merge from origin/emacs-25

[gnu-emacs] / lisp / cedet / semantic / ia.el

diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el
index 8a5cbac41293b15d3b4ca1e82869b646dbf19393..214fbb50f982bff986b3acfc481d1aa25d424033 100644 (file)
--- a/lisp/cedet/semantic/ia.el
+++ b/lisp/cedet/semantic/ia.el
@@ -1,6 +1,6 @@
 ;;; semantic/ia.el --- Interactive Analysis functions
 
-;;; Copyright (C) 2000-2014 Free Software Foundation, Inc.
+;;; Copyright (C) 2000-2016 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
@@ -364,15 +364,17 @@ origin of the code at point."
       (let ((secondclass (car (reverse (oref ctxt prefixtypes)))))
        (cond
         ((and (semantic-tag-with-position-p secondclass)
-              (y-or-n-p (format "Could not find `%s'.  Jump to %s? "
-                                first (semantic-tag-name secondclass))))
+              (y-or-n-p (format-message
+                         "Could not find `%s'.  Jump to %s? "
+                         first (semantic-tag-name secondclass))))
          (semantic-ia--fast-jump-helper secondclass)
          )
         ;; If we missed out on the class of the second item, then
         ;; just visit SECOND.
         ((and (semantic-tag-p second)
-              (y-or-n-p (format "Could not find `%s'.  Jump to %s? "
-                                first (semantic-tag-name second))))
+              (y-or-n-p (format-message
+                         "Could not find `%s'.  Jump to %s? "
+                         first (semantic-tag-name second))))
          (semantic-ia--fast-jump-helper second)
          ))))