src/Pure/General/completion.scala

         case _ => None
       }
     }
 
     val words_result =
-      abbrevs_result orElse {
+      if (abbrevs_result.isDefined) None
+      else {
         val end =
           if (extend_word) Completion.Word_Parsers.extend_word(text, caret)
           else caret
         (Completion.Word_Parsers.read_symbol(text.subSequence(0, end)) match {
           case Some(symbol) => Some(symbol)

             else Some(((word, completions), end))
           case None => None
         }
       }
 
-    words_result match {
+    (abbrevs_result orElse words_result) match {
       case Some(((word, cs), end)) =>
         val range = Text.Range(- word.length, 0) + end + start
         val ds = cs.map(decode(_)).filter(_ != word)
         if (ds.isEmpty) None
         else {

                   case _ => (name1, "")
                 }
               val move = - s2.length
               val description =
                 if (move != 0) List(name1, "(template)")
-                else if (keywords(name)) List(name1, "(keyword)")
+                else if (words_result.isDefined && keywords(name)) List(name1, "(keyword)")
                 else if (Symbol.names.isDefinedAt(name) && name != name1)
                   List(name1, "(symbol " + quote(name) + ")")
                 else List(name1)
               Completion.Item(range, word, name1, description, s1 + s2, move, explicit || immediate)
             }