Subject: bug#10001: displayor -> displayer

From: Paul Eggert <[email-masked]>
Date: Tue, 08 Nov 2011 22:22:53 -0800

GNU Emacs often uses the correct English spelling "displayer",
but it nearly as often uses the incorrect spelling "displayor".
In standard English there's no such thing as a "displayor"
(just as there's no such thing as a "playor").

Here's a proposed patch.  It changes some of the Lisp names, so
it's not as trivial as the spelling fixes I recently installed,
and I'm filing a bug report instead.

=== modified file 'doc/misc/sem-user.texi'
--- doc/misc/sem-user.texi	2011-01-25 04:08:28 +0000
+++ doc/misc/sem-user.texi	2011-11-09 06:14:28 +0000
@@ -676,7 +676,7 @@
 If the tag at point has at least one completion, Semantic Idle
 Completions mode displays that completion inline---i.e., as part of
 the buffer text (you can change the display method by customizing
-@code{semantic-complete-inline-analyzer-idle-displayor-class}, as
+@code{semantic-complete-inline-analyzer-idle-displayer-class}, as
 described below).  The completed part is highlighted, to indicate that
 it is not yet properly inserted into the buffer.  The echo area shows
 the completion, and whether there are other possible completions, like
@@ -723,20 +723,20 @@
 a state for inline completion.
 @end deffn
 
-@deffn Option semantic-complete-inline-analyzer-idle-displayor-class
+@deffn Option semantic-complete-inline-analyzer-idle-displayer-class
 The value of this variable determines how
 @code{semantic-complete-analyze-inline-idle} shows its completions.
 Possible values include:
 
 @table @code
-@item semantic-displayor-ghost
+@item semantic-displayer-ghost
 Display completions ``inline'' with the buffer text, as described
 above.  This is the default value.
 
-@item semantic-displayor-tooltip
+@item semantic-displayer-tooltip
 Display completions in a tooltip.
 
-@item semantic-displayor-traditional
+@item semantic-displayer-traditional
 Display completions in a separate window.
 @end table
 @end deffn
@@ -804,21 +804,21 @@
 idle time (@pxref{Idle Completions Mode}).
 @end deffn
 
-@deffn Option semantic-complete-inline-analyzer-idle-displayor-class
+@deffn Option semantic-complete-inline-analyzer-idle-displayer-class
 The value of this variable determines how
 @code{semantic-complete-analyze-inline} shows its completions.
 Possible values include:
 
 @table @code
-@item semantic-displayor-traditional
+@item semantic-displayer-traditional
 Display completions in a separate window.  This is the default value.
 
-@item semantic-displayor-ghost
+@item semantic-displayer-ghost
 Display completions ``inline'' with the buffer text, similar to the
 default behavior of Semantic Idle Completions mode (@pxref{Idle
 Completions Mode}).
 
-@item semantic-displayor-tooltip
+@item semantic-displayer-tooltip
 Display completions in a tooltip.
 @end table
 @end deffn

=== modified file 'lisp/cedet/semantic/complete.el'
--- lisp/cedet/semantic/complete.el	2011-05-10 13:57:12 +0000
+++ lisp/cedet/semantic/complete.el	2011-11-09 06:14:28 +0000
@@ -72,17 +72,17 @@
 ;; plain name format, a postfix name such as method:class, or a
 ;; prefix name such as class.method.
 ;;
-;; DISPLAYORS
+;; DISPLAYERS
 ;;
-;; A displayor is in charge if showing the user interesting things
+;; A displayer is in charge if showing the user interesting things
 ;; about available completions, and can optionally provide a focus.
 ;; The simplest display just lists all available names in a separate
 ;; window.  It may even choose to show short names when there are
 ;; many to choose from, or long names when there are fewer.
 ;;
-;; A complex displayor could opt to help the user 'focus' on some
+;; A complex displayer could opt to help the user 'focus' on some
 ;; range.  For example, if 4 tags all have the same name, subsequent
-;; calls to the displayor may opt to show each tag one at a time in
+;; calls to the displayer may opt to show each tag one at a time in
 ;; the buffer.  When the user likes one, selection would cause the
 ;; 'focus' item to be selected.
 ;;
@@ -187,22 +187,22 @@
 Keeps STRINGS only in the history.")

-(defun semantic-complete-read-tag-engine (collector displayor prompt
+(defun semantic-complete-read-tag-engine (collector displayer prompt
 						    default-tag initial-input
 						    history)
   "Read a semantic tag, and return a tag for the selection.
 Argument COLLECTOR is an object which can be used to calculate
 a list of possible hits.  See `semantic-completion-collector-engine'
 for details on COLLECTOR.
-Argument DISPLAYOR is an object used to display a list of possible
+Argument DISPLAYER is an object used to display a list of possible
 completions for a given prefix.  See`semantic-completion-display-engine'
-for details on DISPLAYOR.
+for details on DISPLAYER.
 PROMPT is a string to prompt with.
 DEFAULT-TAG is a semantic tag or string to use as the default value.
 If INITIAL-INPUT is non-nil, insert it in the minibuffer initially.
 HISTORY is a symbol representing a variable to story the history in."
   (let* ((semantic-completion-collector-engine collector)
-	 (semantic-completion-display-engine displayor)
+	 (semantic-completion-display-engine displayer)
 	 (semantic-complete-active-default nil)
 	 (semantic-complete-current-matched-tag nil)
 	 (default-as-tag (semantic-complete-default-to-tag default-tag))
@@ -238,7 +238,7 @@
 				  'semantic-completion-default-history)
 			      default-tag)
       (semantic-collector-cleanup semantic-completion-collector-engine)
-      (semantic-displayor-cleanup semantic-completion-display-engine)
+      (semantic-displayer-cleanup semantic-completion-display-engine)
       )
     ;;
     ;; Extract the tag from the completion machinery.
@@ -309,10 +309,10 @@
 (defvar semantic-complete-current-matched-tag nil
   "Variable used to pass the tags being matched to the prompt.")
 
-;; semantic-displayor-focus-abstract-child-p is part of the
-;; semantic-displayor-focus-abstract class, defined later in this
+;; semantic-displayer-focus-abstract-child-p is part of the
+;; semantic-displayer-focus-abstract class, defined later in this
 ;; file.
-(declare-function semantic-displayor-focus-abstract-child-p "semantic/complete"
+(declare-function semantic-displayer-focus-abstract-child-p "semantic/complete"
 		  t t)
 
 (defun semantic-complete-current-match ()
@@ -324,7 +324,7 @@
   string - a message to show in the minibuffer."
   ;; Query the environment for an active completion.
   (let ((collector semantic-completion-collector-engine)
-	(displayor semantic-completion-display-engine)
+	(displayer semantic-completion-display-engine)
 	(contents (semantic-completion-text))
 	matchlist
 	answer)
@@ -336,20 +336,20 @@
 	(semantic-collector-calculate-completions collector contents nil))
       (semantic-complete-try-completion)
       (cond
-       ;; Input match displayor focus entry
-       ((setq answer (semantic-displayor-current-focus displayor))
+       ;; Input match displayer focus entry
+       ((setq answer (semantic-displayer-current-focus displayer))
 	;; We have answer, continue
 	)
        ;; One match from the collector
        ((setq matchlist (semantic-collector-current-exact-match collector))
 	(if (= (semanticdb-find-result-length matchlist) 1)
 	    (setq answer (semanticdb-find-result-nth-in-buffer matchlist 0))
-	  (if (semantic-displayor-focus-abstract-child-p displayor)
-	      ;; For focusing displayors, we can claim this is
+	  (if (semantic-displayer-focus-abstract-child-p displayer)
+	      ;; For focusing displayers, we can claim this is
 	      ;; not unique.  Multiple focuses can choose the correct
 	      ;; one.
 	      (setq answer "Not Unique")
-	    ;; If we don't have a focusing displayor, we need to do something
+	    ;; If we don't have a focusing displayer, we need to do something
 	    ;; graceful.  First, see if all the matches have the same name.
 	    (let ((allsame t)
 		  (firstname (semantic-tag-name
@@ -490,7 +490,7 @@
 If PARTIAL, do partial completion stopping at spaces.
 if INLINE, then completion is happening inline in a buffer."
   (let* ((collector semantic-completion-collector-engine)
-	 (displayor semantic-completion-display-engine)
+	 (displayer semantic-completion-display-engine)
 	 (contents (semantic-completion-text))
 	 (ans nil))
 
@@ -511,8 +511,8 @@
        ;; We need to display the completions.
        ;; Set the completions into the display engine
        ((or (eq na 'display) (eq na 'displayend))
-	(semantic-displayor-set-completions
-	 displayor
+	(semantic-displayer-set-completions
+	 displayer
 	 (or
 	  ;; For the below - This caused problems for Chong Yidong
 	  ;; when experimenting with the completion engine.  I don't
@@ -523,14 +523,14 @@
 	  ;;      (semantic-collector-current-exact-match collector))
 	  (semantic-collector-all-completions collector contents))
 	 contents)
-	;; Ask the displayor to display them.
-	(semantic-displayor-show-request displayor))
+	;; Ask the displayer to display them.
+	(semantic-displayer-show-request displayer))
        ((eq na 'scroll)
-	(semantic-displayor-scroll-request displayor)
+	(semantic-displayer-scroll-request displayer)
 	)
        ((eq na 'focus)
-	(semantic-displayor-focus-next displayor)
-	(semantic-displayor-focus-request displayor)
+	(semantic-displayer-focus-next displayer)
+	(semantic-displayer-focus-request displayer)
 	)
        ((eq na 'empty)
 	(semantic-completion-message " [No Match]"))
@@ -586,8 +586,8 @@
 (defun semantic-complete-inline-done ()
   "This completion thing is DONE, OR, insert a newline."
   (interactive)
-  (let* ((displayor semantic-completion-display-engine)
-	 (tag (semantic-displayor-current-focus displayor)))
+  (let* ((displayer semantic-completion-display-engine)
+	 (tag (semantic-displayer-current-focus displayer)))
     (if tag
 	(let ((txt (semantic-completion-text)))
 	  (insert (substring (semantic-tag-name tag)
@@ -624,7 +624,7 @@
 	(when semantic-completion-collector-engine
 	  (semantic-collector-cleanup semantic-completion-collector-engine))
 	(when semantic-completion-display-engine
-	  (semantic-displayor-cleanup semantic-completion-display-engine))
+	  (semantic-displayer-cleanup semantic-completion-display-engine))
 
 	(when semantic-complete-inline-overlay
 	  (let ((wc (semantic-overlay-get semantic-complete-inline-overlay
@@ -720,29 +720,29 @@
   (condition-case e
       (save-excursion
 	(let ((collector semantic-completion-collector-engine)
-	      (displayor semantic-completion-display-engine)
+	      (displayer semantic-completion-display-engine)
 	      (contents (semantic-completion-text)))
 	  (when collector
 	    (semantic-collector-calculate-completions
 	     collector contents nil)
-	    (semantic-displayor-set-completions
-	     displayor
+	    (semantic-displayer-set-completions
+	     displayer
 	     (semantic-collector-all-completions collector contents)
 	     contents)
-	    ;; Ask the displayor to display them.
-	    (semantic-displayor-show-request displayor))
+	    ;; Ask the displayer to display them.
+	    (semantic-displayer-show-request displayer))
 	  ))
     (error (message "Bug Showing Completions: %S" e))))
 
 (defun semantic-complete-inline-tag-engine
-  (collector displayor buffer start end)
+  (collector displayer buffer start end)
   "Perform completion based on semantic tags in a buffer.
 Argument COLLECTOR is an object which can be used to calculate
 a list of possible hits.  See `semantic-completion-collector-engine'
 for details on COLLECTOR.
-Argument DISPLAYOR is an object used to display a list of possible
+Argument DISPLAYER is an object used to display a list of possible
 completions for a given prefix.  See`semantic-completion-display-engine'
-for details on DISPLAYOR.
+for details on DISPLAYER.
 BUFFER is the buffer in which completion will take place.
 START is a location for the start of the full symbol.
 If the symbol being completed is \"foo.ba\", then START
@@ -750,7 +750,7 @@
 END is at the end of the current symbol being completed."
   ;; Set us up for doing completion
   (setq semantic-completion-collector-engine collector
-	semantic-completion-display-engine displayor)
+	semantic-completion-display-engine displayer)
   ;; Create an overlay
   (setq semantic-complete-inline-overlay
 	(semantic-make-overlay start end buffer nil t))
@@ -782,19 +782,19 @@
   )
 
 (defun semantic-complete-inline-down()
-  "Focus forwards through the displayor."
+  "Focus forwards through the displayer."
   (interactive)
-  (let ((displayor semantic-completion-display-engine))
-    (semantic-displayor-focus-next    displayor)
-    (semantic-displayor-focus-request displayor)
+  (let ((displayer semantic-completion-display-engine))
+    (semantic-displayer-focus-next    displayer)
+    (semantic-displayer-focus-request displayer)
     ))
 
 (defun semantic-complete-inline-up ()
-  "Focus backwards through the displayor."
+  "Focus backwards through the displayer."
   (interactive)
-  (let ((displayor semantic-completion-display-engine))
-    (semantic-displayor-focus-previous displayor)
-    (semantic-displayor-focus-request  displayor)
+  (let ((displayer semantic-completion-display-engine))
+    (semantic-displayer-focus-previous displayer)
+    (semantic-displayer-focus-request  displayer)
     ))
 
 
@@ -802,13 +802,13 @@
 ;;; Interactions between collection and displaying
 ;;
 ;; Functional routines used to help collectors communicate with
-;; the current displayor, or for the previous section.
+;; the current displayer, or for the previous section.
 
 (defun semantic-complete-next-action (partial)
   "Determine what the next completion action should be.
 PARTIAL is non-nil if we are doing partial completion.
 First, the collector can determine if we should perform a completion or not.
-If there is nothing to complete, then the displayor determines if we are
+If there is nothing to complete, then the displayer determines if we are
 to show a completion list, scroll, or perhaps do a focus (if it is capable.)
 Expected return values are:
   done -> We have a singular match
@@ -818,21 +818,21 @@
   display -> Show the list of completions
   scroll -> The completions have been shown, and the user keeps hitting
             the complete button.  If possible, scroll the completions
-  focus -> The displayor knows how to shift focus among possible completions.
+  focus -> The displayer knows how to shift focus among possible completions.
            Let it do that.
-  displayend -> Whatever options the displayor had for repeating options, there
+  displayend -> Whatever options the displayer had for repeating options, there
            are none left.  Try something new."
   (let ((ans1 (semantic-collector-next-action
 		semantic-completion-collector-engine
 		partial))
-	(ans2 (semantic-displayor-next-action
+	(ans2 (semantic-displayer-next-action
 		semantic-completion-display-engine))
 	)
     (cond
-     ;; No collector answer, use displayor answer.
+     ;; No collector answer, use displayer answer.
      ((not ans1)
       ans2)
-     ;; Displayor selection of 'scroll, 'display, or 'focus trumps
+     ;; Displayer selection of 'scroll, 'display, or 'focus trumps
      ;; 'done
      ((and (eq ans1 'done) ans2)
       ans2)
@@ -900,7 +900,7 @@
    )
   "Root class for completion engines.
 The baseclass provides basic functionality for interacting with
-a completion displayor object, and tracking the current progress
+a completion displayer object, and tracking the current progress
 of a completion."
   :abstract t)
 
@@ -922,7 +922,7 @@
 	(cond ((and cem (= cemlen 1)
 		    cac (> caclen 1)
 		    (eq last-command this-command))
-	       ;; Defer to the displayor...
+	       ;; Defer to the displayer...
 	       nil)
 	      ((and cem (= cemlen 1))
 	       'done)
@@ -1260,44 +1260,44 @@
 ;;; ------------------------------------------------------------
 ;;; Tag List Display Engines
 ;;
-;; A typical displayor accepts a pre-determined list of completions
+;; A typical displayer accepts a pre-determined list of completions
 ;; generated by a collector.  This format is in semanticdb search
 ;; form.  This vaguely standard form is a bit challenging to navigate
 ;; because the tags do not contain buffer info, but the file associated
 ;; with the tags precedes the tag in the list.
 ;;
-;; Basic displayors don't care, and can strip the results.
-;; Advanced highlighting displayors need to know when they need
+;; Basic displayers don't care, and can strip the results.
+;; Advanced highlighting displayers need to know when they need
 ;; to load a file so that the tag in question can be highlighted.
 ;;
-;; Key interface methods to a displayor are:
-;; * semantic-displayor-next-action
-;; * semantic-displayor-set-completions
-;; * semantic-displayor-current-focus
-;; * semantic-displayor-show-request
-;; * semantic-displayor-scroll-request
-;; * semantic-displayor-focus-request
+;; Key interface methods to a displayer are:
+;; * semantic-displayer-next-action
+;; * semantic-displayer-set-completions
+;; * semantic-displayer-current-focus
+;; * semantic-displayer-show-request
+;; * semantic-displayer-scroll-request
+;; * semantic-displayer-focus-request
 
-(defclass semantic-displayor-abstract ()
+(defclass semantic-displayer-abstract ()
   ((table :type (or null semanticdb-find-result-with-nil)
 	  :initform nil
 	  :protection :protected
-	  :documentation "List of tags this displayor is showing.")
+	  :documentation "List of tags this displayer is showing.")
    (last-prefix :type string
 		:protection :protected
 		:documentation "Prefix associated with slot `table'")
    )
-  "Abstract displayor baseclass.
+  "Abstract displayer baseclass.
 Manages the display of some number of tags.
-Provides the basics for a displayor, including interacting with
+Provides the basics for a displayer, including interacting with
 a collector, and tracking tables of completion to display."
   :abstract t)
 
-(defmethod semantic-displayor-cleanup ((obj semantic-displayor-abstract))
-  "Clean up any mess this displayor may have."
+(defmethod semantic-displayer-cleanup ((obj semantic-displayer-abstract))
+  "Clean up any mess this displayer may have."
   nil)
 
-(defmethod semantic-displayor-next-action ((obj semantic-displayor-abstract))
+(defmethod semantic-displayer-next-action ((obj semantic-displayer-abstract))
   "The next action to take on the minibuffer related to display."
   (if (and (slot-boundp obj 'last-prefix)
 	   (string= (oref obj last-prefix) (semantic-completion-text))
@@ -1305,65 +1305,65 @@
       'scroll
     'display))
 
-(defmethod semantic-displayor-set-completions ((obj semantic-displayor-abstract)
+(defmethod semantic-displayer-set-completions ((obj semantic-displayer-abstract)
 					       table prefix)
   "Set the list of tags to be completed over to TABLE."
   (oset obj table table)
   (oset obj last-prefix prefix))
 
-(defmethod semantic-displayor-show-request ((obj semantic-displayor-abstract))
+(defmethod semantic-displayer-show-request ((obj semantic-displayer-abstract))
   "A request to show the current tags table."
   (ding))
 
-(defmethod semantic-displayor-focus-request ((obj semantic-displayor-abstract))
-  "A request to for the displayor to focus on some tag option."
+(defmethod semantic-displayer-focus-request ((obj semantic-displayer-abstract))
+  "A request to for the displayer to focus on some tag option."
   (ding))
 
-(defmethod semantic-displayor-scroll-request ((obj semantic-displayor-abstract))
-  "A request to for the displayor to scroll the completion list (if needed)."
+(defmethod semantic-displayer-scroll-request ((obj semantic-displayer-abstract))
+  "A request to for the displayer to scroll the completion list (if needed)."
   (scroll-other-window))
 
-(defmethod semantic-displayor-focus-previous ((obj semantic-displayor-abstract))
+(defmethod semantic-displayer-focus-previous ((obj semantic-displayer-abstract))
   "Set the current focus to the previous item."
   nil)
 
-(defmethod semantic-displayor-focus-next ((obj semantic-displayor-abstract))
+(defmethod semantic-displayer-focus-next ((obj semantic-displayer-abstract))
   "Set the current focus to the next item."
   nil)
 
-(defmethod semantic-displayor-current-focus ((obj semantic-displayor-abstract))
+(defmethod semantic-displayer-current-focus ((obj semantic-displayer-abstract))
   "Return a single tag currently in focus.
 This object type doesn't do focus, so will never have a focus object."
   nil)
 
-;; Traditional displayor
-(defcustom semantic-completion-displayor-format-tag-function
+;; Traditional displayer
+(defcustom semantic-completion-displayer-format-tag-function
   #'semantic-format-tag-name
   "*A Tag format function to use when showing completions."
   :group 'semantic
   :type semantic-format-tag-custom-list)
 
-(defclass semantic-displayor-traditional (semantic-displayor-abstract)
+(defclass semantic-displayer-traditional (semantic-displayer-abstract)
   ()
   "Display options in *Completions* buffer.
 Traditional display mechanism for a list of possible completions.
 Completions are showin in a new buffer and listed with the ability
 to click on the items to aid in completion.")
 
-(defmethod semantic-displayor-show-request ((obj semantic-displayor-traditional))
+(defmethod semantic-displayer-show-request ((obj semantic-displayer-traditional))
   "A request to show the current tags table."
 
   ;; NOTE TO SELF.  Find the character to type next, and emphesize it.
 
   (with-output-to-temp-buffer "*Completions*"
     (display-completion-list
-     (mapcar semantic-completion-displayor-format-tag-function
+     (mapcar semantic-completion-displayer-format-tag-function
 	     (semanticdb-strip-find-results (oref obj table))))
     )
   )
 
-;;; Abstract baseclass for any displayor which supports focus
-(defclass semantic-displayor-focus-abstract (semantic-displayor-abstract)
+;;; Abstract baseclass for any displayer which supports focus
+(defclass semantic-displayer-focus-abstract (semantic-displayer-abstract)
   ((focus :type number
 	  :protection :protected
 	  :documentation "A tag index from `table' which has focus.
@@ -1375,13 +1375,13 @@
     :documentation
     "Non-nil if focusing requires a tag's buffer be in memory.")
    )
-  "Abstract displayor supporting `focus'.
-A displayor which has the ability to focus in on one tag.
+  "Abstract displayer supporting `focus'.
+A displayer which has the ability to focus in on one tag.
 Focusing is a way of differentiationg between multiple tags
 which have the same name."
   :abstract t)
 
-(defmethod semantic-displayor-next-action ((obj semantic-displayor-focus-abstract))
+(defmethod semantic-displayer-next-action ((obj semantic-displayer-focus-abstract))
   "The next action to take on the minibuffer related to display."
   (if (and (slot-boundp obj 'last-prefix)
 	   (string= (oref obj last-prefix) (semantic-completion-text))
@@ -1397,13 +1397,13 @@
 	'focus)
     'display))
 
-(defmethod semantic-displayor-set-completions ((obj semantic-displayor-focus-abstract)
+(defmethod semantic-displayer-set-completions ((obj semantic-displayer-focus-abstract)
 					       table prefix)
   "Set the list of tags to be completed over to TABLE."
   (call-next-method)
   (slot-makeunbound obj 'focus))
 
-(defmethod semantic-displayor-focus-previous ((obj semantic-displayor-focus-abstract))
+(defmethod semantic-displayer-focus-previous ((obj semantic-displayer-focus-abstract))
   "Set the current focus to the previous item.
 Not meaningful return value."
   (when (and (slot-boundp obj 'table) (oref obj table))
@@ -1415,7 +1415,7 @@
 	)
       )))
 
-(defmethod semantic-displayor-focus-next ((obj semantic-displayor-focus-abstract))
+(defmethod semantic-displayer-focus-next ((obj semantic-displayer-focus-abstract))
   "Set the current focus to the next item.
 Not meaningful return value."
   (when (and (slot-boundp obj 'table) (oref obj table))
@@ -1428,13 +1428,13 @@
 	  (oset obj focus 0))
       )))
 
-(defmethod semantic-displayor-focus-tag ((obj semantic-displayor-focus-abstract))
+(defmethod semantic-displayer-focus-tag ((obj semantic-displayer-focus-abstract))
   "Return the next tag OBJ should focus on."
   (when (and (slot-boundp obj 'table) (oref obj table))
     (with-slots (table) obj
       (semanticdb-find-result-nth table (oref obj focus)))))
 
-(defmethod semantic-displayor-current-focus ((obj semantic-displayor-focus-abstract))
+(defmethod semantic-displayer-current-focus ((obj semantic-displayer-focus-abstract))
   "Return the tag currently in focus, or call parent method."
   (if (and (slot-boundp obj 'focus)
 	   (slot-boundp obj 'table)
@@ -1452,24 +1452,24 @@
     ;; Do whatever
     (call-next-method)))
 
-;;; Simple displayor which performs traditional display completion,
+;;; Simple displayer which performs traditional display completion,
 ;; and also focuses with highlighting.
-(defclass semantic-displayor-traditional-with-focus-highlight
-  (semantic-displayor-focus-abstract semantic-displayor-traditional)
+(defclass semantic-displayer-traditional-with-focus-highlight
+  (semantic-displayer-focus-abstract semantic-displayer-traditional)
   ((find-file-focus :initform t))
   "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
+A traditional displayer which can focus on a tag by showing it.
+Same as `semantic-displayer-traditional', but with selection between
 multiple tags with the same name done by 'focusing' on the source
 location of the different tags to differentiate them.")
 
-(defmethod semantic-displayor-focus-request
-  ((obj semantic-displayor-traditional-with-focus-highlight))
+(defmethod semantic-displayer-focus-request
+  ((obj semantic-displayer-traditional-with-focus-highlight))
   "Focus in on possible tag completions.
 Focus is performed by cycling through the tags and highlighting
 one in the source buffer."
   (let* ((tablelength (semanticdb-find-result-length (oref obj table)))
-	 (focus (semantic-displayor-focus-tag obj))
+	 (focus (semantic-displayer-focus-tag obj))
 	 ;; Raw tag info.
 	 (rtag (car focus))
 	 (rtable (cdr focus))
@@ -1530,7 +1530,7 @@
 ;; * Safe compatibility for tooltip free systems.
 ;; * Don't use 'avoid package for tooltip positioning.
 
-(defclass semantic-displayor-tooltip (semantic-displayor-traditional)
+(defclass semantic-displayer-tooltip (semantic-displayer-traditional)
   ((max-tags     :type integer
 		 :initarg :max-tags
 		 :initform 5
@@ -1568,14 +1568,14 @@
   "Display completions options in a tooltip.
 Display mechanism using tooltip for a list of possible completions.")
 
-(defmethod initialize-instance :AFTER ((obj semantic-displayor-tooltip) &rest args)
+(defmethod initialize-instance :AFTER ((obj semantic-displayer-tooltip) &rest args)
   "Make sure we have tooltips required."
   (condition-case nil
       (require 'tooltip)
     (error nil))
   )
 
-(defmethod semantic-displayor-show-request ((obj semantic-displayor-tooltip))
+(defmethod semantic-displayer-show-request ((obj semantic-displayer-tooltip))
   "A request to show the current tags table."
   (if (or (not (featurep 'tooltip)) (not tooltip-mode))
       ;; If we cannot use tooltips, then go to the normal mode with
@@ -1583,7 +1583,7 @@
       (call-next-method)
     (let* ((tablelong (semanticdb-strip-find-results (oref obj table)))
 	   (table (semantic-unique-tag-table-by-name tablelong))
-	   (l (mapcar semantic-completion-displayor-format-tag-function table))
+	   (l (mapcar semantic-completion-displayer-format-tag-function table))
 	   (ll (length l))
 	   (typing-count (oref obj typing-count))
 	   (force-show (oref obj force-show))
@@ -1610,7 +1610,7 @@
 	      ;; If there is nothing, say so!
 	      (if (eq 0 (length msg))
 		  (setq msg "[NO MATCH]")))
-	    (semantic-displayor-tooltip-show msg))
+	    (semantic-displayer-tooltip-show msg))
 	;; The typing count determines if the user REALLY REALLY
 	;; wanted to show that much stuff.  Only increment
 	;; if the current command is a completion command.
@@ -1623,9 +1623,9 @@
 	(setq msg (mapconcat 'identity l "\n"))
 	(cond
 	 ((= force-show -1)
-	  (semantic-displayor-tooltip-show (concat msg "\n...")))
+	  (semantic-displayer-tooltip-show (concat msg "\n...")))
 	 ((= force-show 1)
-	  (semantic-displayor-tooltip-show (concat msg "\n(TAB for more)")))
+	  (semantic-displayer-tooltip-show (concat msg "\n(TAB for more)")))
 	 )))))
 
 ;;; Compatibility
@@ -1633,14 +1633,14 @@
 (eval-and-compile
   (if (fboundp 'window-inside-edges)
       ;; Emacs devel.
-      (defalias 'semantic-displayor-window-edges
+      (defalias 'semantic-displayer-window-edges
         'window-inside-edges)
     ;; Emacs 21
-    (defalias 'semantic-displayor-window-edges
+    (defalias 'semantic-displayer-window-edges
       'window-edges)
     ))
 
-(defun semantic-displayor-point-position ()
+(defun semantic-displayer-point-position ()
   "Return the location of POINT as positioned on the selected frame.
 Return a cons cell (X . Y)"
   (let* ((frame (selected-frame))
@@ -1652,9 +1652,9 @@
           (+ (cdr point-pix-pos) (cadr edges) top))))

-(defun semantic-displayor-tooltip-show (text)
+(defun semantic-displayer-tooltip-show (text)
   "Display a tooltip with TEXT near cursor."
-  (let ((point-pix-pos (semantic-displayor-point-position))
+  (let ((point-pix-pos (semantic-displayer-point-position))
 	(tooltip-frame-parameters
 	 (append tooltip-frame-parameters nil)))
     (push
@@ -1665,19 +1665,19 @@
      tooltip-frame-parameters)
     (tooltip-show text)))
 
-(defmethod semantic-displayor-scroll-request ((obj semantic-displayor-tooltip))
-  "A request to for the displayor to scroll the completion list (if needed)."
+(defmethod semantic-displayer-scroll-request ((obj semantic-displayer-tooltip))
+  "A request to for the displayer to scroll the completion list (if needed)."
   ;; Do scrolling in the tooltip.
   (oset obj max-tags 30)
-  (semantic-displayor-show-request obj)
+  (semantic-displayer-show-request obj)
   )
 
 ;; End code contributed by Masatake YAMATO <[email-masked]>
 
 
-;;; Ghost Text displayor
+;;; Ghost Text displayer
 ;;
-(defclass semantic-displayor-ghost (semantic-displayor-focus-abstract)
+(defclass semantic-displayer-ghost (semantic-displayer-focus-abstract)
 
   ((ghostoverlay :type overlay
 		 :documentation
@@ -1687,11 +1687,11 @@
 	       "Non nil if we have not seen our first show request.")
    )
   "Cycle completions inline with ghost text.
-Completion displayor using ghost chars after point for focus options.
+Completion displayer using ghost chars after point for focus options.
 Whichever completion is currently in focus will be displayed as ghost
 text using overlay options.")
 
-(defmethod semantic-displayor-next-action ((obj semantic-displayor-ghost))
+(defmethod semantic-displayer-next-action ((obj semantic-displayer-ghost))
   "The next action to take on the inline completion related to display."
   (let ((ans (call-next-method))
 	(table (when (slot-boundp obj 'table)
@@ -1703,28 +1703,28 @@
 	nil
       ans)))
 
-(defmethod semantic-displayor-cleanup ((obj semantic-displayor-ghost))
-  "Clean up any mess this displayor may have."
+(defmethod semantic-displayer-cleanup ((obj semantic-displayer-ghost))
+  "Clean up any mess this displayer may have."
   (when (slot-boundp obj 'ghostoverlay)
     (semantic-overlay-delete (oref obj ghostoverlay)))
   )
 
-(defmethod semantic-displayor-set-completions ((obj semantic-displayor-ghost)
+(defmethod semantic-displayer-set-completions ((obj semantic-displayer-ghost)
 					       table prefix)
   "Set the list of tags to be completed over to TABLE."
   (call-next-method)
 
-  (semantic-displayor-cleanup obj)
+  (semantic-displayer-cleanup obj)
   )

-(defmethod semantic-displayor-show-request ((obj semantic-displayor-ghost))
+(defmethod semantic-displayer-show-request ((obj semantic-displayer-ghost))
   "A request to show the current tags table."
 ;  (if (oref obj first-show)
 ;      (progn
 ;	(oset obj first-show nil)
-	(semantic-displayor-focus-next obj)
-	(semantic-displayor-focus-request obj)
+	(semantic-displayer-focus-next obj)
+	(semantic-displayer-focus-request obj)
 ;	)
     ;; Only do the traditional thing if the first show request
     ;; has been seen.  Use the first one to start doing the ghost
@@ -1733,13 +1733,13 @@
 ;    )
 )
 
-(defmethod semantic-displayor-focus-request
-  ((obj semantic-displayor-ghost))
+(defmethod semantic-displayer-focus-request
+  ((obj semantic-displayer-ghost))
   "Focus in on possible tag completions.
 Focus is performed by cycling through the tags and showing a possible
 completion text in ghost text."
   (let* ((tablelength (semanticdb-find-result-length (oref obj table)))
-	 (focus (semantic-displayor-focus-tag obj))
+	 (focus (semantic-displayer-focus-tag obj))
 	 (tag (car focus))
 	 )
     (if (not tag)
@@ -1786,14 +1786,14 @@
 	       (list 'const
 		     :tag doc1
 		     C)))
-	   (eieio-build-class-alist semantic-displayor-abstract t))
+	   (eieio-build-class-alist semantic-displayer-abstract t))
 	  )
-  "Possible options for inline completion displayors.
+  "Possible options for inline completion displayers.
 Use this to enable custom editing.")
 
-(defcustom semantic-complete-inline-analyzer-displayor-class
-  'semantic-displayor-traditional
-  "*Class for displayor to use with inline completion."
+(defcustom semantic-complete-inline-analyzer-displayer-class
+  'semantic-displayer-traditional
+  "*Class for displayer to use with inline completion."
   :group 'semantic
   :type semantic-complete-inline-custom-type
   )
@@ -1812,8 +1812,8 @@
 HISTORY is a symbol representing a variable to store the history in."
   (semantic-complete-read-tag-engine
    (semantic-collector-buffer-deep prompt :buffer (current-buffer))
-   (semantic-displayor-traditional-with-focus-highlight "simple")
-   ;;(semantic-displayor-tooltip "simple")
+   (semantic-displayer-traditional-with-focus-highlight "simple")
+   ;;(semantic-displayer-tooltip "simple")
    prompt
    default-tag
    initial-input
@@ -1834,8 +1834,8 @@
 HISTORY is a symbol representing a variable to store the history in."
   (semantic-complete-read-tag-engine
    (semantic-collector-local-members prompt :buffer (current-buffer))
-   (semantic-displayor-traditional-with-focus-highlight "simple")
-   ;;(semantic-displayor-tooltip "simple")
+   (semantic-displayer-traditional-with-focus-highlight "simple")
+   ;;(semantic-displayer-tooltip "simple")
    prompt
    default-tag
    initial-input
@@ -1859,7 +1859,7 @@
 				       :buffer (current-buffer)
 				       :path (current-buffer)
 				       )
-   (semantic-displayor-traditional-with-focus-highlight "simple")
+   (semantic-displayer-traditional-with-focus-highlight "simple")
    prompt
    default-tag
    initial-input
@@ -1871,7 +1871,7 @@
 This is similar to `semantic-complete-read-tag-project', except
 that the completion interaction is in the buffer where the context
 was calculated from.
-Customize `semantic-complete-inline-analyzer-displayor-class'
+Customize `semantic-complete-inline-analyzer-displayer-class'
 to control how completion options are displayed.
 See `semantic-complete-inline-tag-engine' for details on how
 completion works."
@@ -1906,9 +1906,9 @@
 	  ;; There are several options.  Do the completion.
 	  (semantic-complete-inline-tag-engine
 	   collector
-	   (funcall semantic-complete-inline-analyzer-displayor-class
-		    "inline displayor")
-	   ;;(semantic-displayor-tooltip "simple")
+	   (funcall semantic-complete-inline-analyzer-displayer-class
+		    "inline displayer")
+	   ;;(semantic-displayer-tooltip "simple")
 	   (current-buffer)
 	   start end))
       )))
@@ -1935,7 +1935,7 @@
       prompt
       :buffer (oref context buffer)
       :context context)
-     (semantic-displayor-traditional-with-focus-highlight "simple")
+     (semantic-displayer-traditional-with-focus-highlight "simple")
      (with-current-buffer (oref context buffer)
        (goto-char (cdr (oref context bounds)))
        (concat prompt (mapconcat 'identity syms ".")
@@ -1951,7 +1951,7 @@
 that the completion interaction is in the buffer where the context
 was calculated from.
 CONTEXT is the semantic analyzer context to start with.
-Customize `semantic-complete-inline-analyzer-displayor-class'
+Customize `semantic-complete-inline-analyzer-displayer-class'
 to control how completion options are displayed.
 
 See `semantic-complete-inline-tag-engine' for details on how
@@ -1986,18 +1986,18 @@
 	  ;; There are several options.  Do the completion.
 	  (semantic-complete-inline-tag-engine
 	   collector
-	   (funcall semantic-complete-inline-analyzer-displayor-class
-		    "inline displayor")
-	   ;;(semantic-displayor-tooltip "simple")
+	   (funcall semantic-complete-inline-analyzer-displayer-class
+		    "inline displayer")
+	   ;;(semantic-displayer-tooltip "simple")
 	   (oref context buffer)
 	   (car (oref context bounds))
 	   (cdr (oref context bounds))
 	   ))
       )))
 
-(defcustom semantic-complete-inline-analyzer-idle-displayor-class
-  'semantic-displayor-ghost
-  "*Class for displayor to use with inline completion at idle time."
+(defcustom semantic-complete-inline-analyzer-idle-displayer-class
+  'semantic-displayer-ghost
+  "*Class for displayer to use with inline completion at idle time."
   :group 'semantic
   :type semantic-complete-inline-custom-type
   )
@@ -2008,13 +2008,13 @@
 This function is used from `semantic-idle-completions-mode'.
 
 This is the same as `semantic-complete-inline-analyzer', except that
-it uses `semantic-complete-inline-analyzer-idle-displayor-class'
+it uses `semantic-complete-inline-analyzer-idle-displayer-class'
 to control how completions are displayed.
 
 See `semantic-complete-inline-tag-engine' for details on how
 completion works."
-  (let ((semantic-complete-inline-analyzer-displayor-class
-	 semantic-complete-inline-analyzer-idle-displayor-class))
+  (let ((semantic-complete-inline-analyzer-displayer-class
+	 semantic-complete-inline-analyzer-idle-displayer-class))
     (semantic-complete-inline-analyzer context)
     ))
 
@@ -2086,7 +2086,7 @@
 possible values.
 The function returns immediately, leaving the buffer in a mode that
 will perform the completion.
-Configure `semantic-complete-inline-analyzer-displayor-class' to change
+Configure `semantic-complete-inline-analyzer-displayer-class' to change
 how completion options are displayed."
   (interactive)
   ;; Only do this if we are not already completing something.
@@ -2108,7 +2108,7 @@
 possible values.
 The function returns immediately, leaving the buffer in a mode that
 will perform the completion.
-Configure `semantic-complete-inline-analyzer-idle-displayor-class'
+Configure `semantic-complete-inline-analyzer-idle-displayer-class'
 to change how completion options are displayed."
   (interactive)
   ;; Only do this if we are not already completing something.

=== modified file 'lisp/cedet/semantic/idle.el'
--- lisp/cedet/semantic/idle.el	2011-11-03 20:03:45 +0000
+++ lisp/cedet/semantic/idle.el	2011-11-09 06:14:28 +0000
@@ -953,7 +953,7 @@
 
 When enabled, Emacs displays a list of possible completions at
 idle time.  The method for displaying completions is given by
-`semantic-complete-inline-analyzer-idle-displayor-class'; the
+`semantic-complete-inline-analyzer-idle-displayer-class'; the
 default is to show completions inline.
 
 While a completion is displayed, RET accepts the completion; M-n