X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/9792a944dcf08a246bf2618b2a5bee906a888069..cc0b7132:/lisp/cedet/semantic/complete.el

diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index ad931785af..de762326c3 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1,6 +1,6 @@
 ;;; semantic/complete.el --- Routines for performing tag completion
 
-;; Copyright (C) 2003-2005, 2007-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2005, 2007-2016 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
@@ -156,7 +156,7 @@ Presumably if you call this you will insert something new there."
   "Display the string FMT formatted with ARGS at the end of the minibuffer."
   (if semantic-complete-inline-overlay
       (apply 'message fmt args)
-    (message (concat (buffer-string) (apply 'format fmt args)))))
+    (apply 'message (concat "%s" fmt) (buffer-string) args)))
 
 ;;; ------------------------------------------------------------
 ;;; MINIBUFFER: Option Selection harnesses
@@ -1491,7 +1491,7 @@ Not meaningful return value."
   "Display completions in *Completions* buffer, with focus highlight.
 A traditional displayor which can focus on a tag by showing it.
 Same as `semantic-displayor-traditional', but with selection between
-multiple tags with the same name done by 'focusing' on the source
+multiple tags with the same name done by focusing on the source
 location of the different tags to differentiate them.")
 
 (cl-defmethod semantic-displayor-focus-request
@@ -1665,7 +1665,7 @@ Display mechanism using tooltip for a list of possible completions.")
 	(when (>= (oref obj typing-count) 5)
 	  (oset obj mode 'standard)
 	  (setq mode 'standard)
-	  (message "Resetting inline-mode to 'standard'."))
+	  (message "Resetting inline-mode to `standard'."))
 	(when (and (> numcompl max-tags)
 		   (< (oref obj typing-count) 2))
 	  ;; Discretely hint at completion availability.
@@ -1684,7 +1684,7 @@ Display mechanism using tooltip for a list of possible completions.")
 	      (setq msg-tail (concat "\n[<TAB> " (number-to-string (- numcompl max-tags)) " more]"))
 	    (setq msg-tail (concat "\n[<n/a> " (number-to-string (- numcompl max-tags)) " more]"))
 	    (when (>= (oref obj typing-count) 2)
-	      (message "Refine search to display results beyond the '%s' limit"
+	      (message "Refine search to display results beyond the `%s' limit"
 		       (symbol-name 'semantic-complete-inline-max-tags-extended)))))
 	 ((= numcompl 1)
 	  ;; two possible cases
@@ -1707,15 +1707,6 @@ Display mechanism using tooltip for a list of possible completions.")
 
 ;;; Compatibility
 ;;
-(eval-and-compile
-  (if (fboundp 'window-inside-edges)
-      ;; Emacs devel.
-      (defalias 'semantic-displayor-window-edges
-        'window-inside-edges)
-    ;; Emacs 21
-    (defalias 'semantic-displayor-window-edges
-      'window-edges)
-    ))
 
 (defun semantic-displayor-point-position ()
   "Return the location of POINT as positioned on the selected frame.
@@ -2226,6 +2217,7 @@ use `semantic-complete-analyze-inline' to complete."
   ;; input.
   (when (save-window-excursion
 	  (save-excursion
+            ;; FIXME: Use `while-no-input'?
 	    (and (not (semantic-exit-on-input 'csi
 			(semantic-fetch-tags)
 			(semantic-throw-on-input 'csi)