Merged Emacs rev. 114135.

  * semantic/fw.el (semantic-make-local-hook): Simplify by dropping Emacs <= 20.
Merged Emacs rev. 114199

  Use define-derived-mode (and derived-mode-p).
  
  * lisp/cedet/semantic/grammar.el (semantic-grammar-mode): Use define-derived-mode
  (semantic-grammar-mode-syntax-table): Rename from
  semantic-grammar-syntax-table.
  (semantic-grammar-mode-map): Rename from semantic-grammar-map.
  * lisp/cedet/data-debug.el (data-debug-mode-map): Rename from data-debug-map.
  (data-debug-mode): Use define-derived-mode.
Merged Emacs rev. 114249 and 114258

  * lisp/cedet/semantic/find.el (semantic-find-first-tag-by-name):
  Replace obsolete function assoc-ignore-case with assoc-string.

  * cedet/semantic/ia.el (semantic-ia-complete-symbol-menu):
  Comment it out, since it cannot work.
Merged Emacs rev. 114331.

  * lisp/cedet/semantic/symref/list.el (semantic-symref-results-mode):
  Use define-derived-mode.
  (semantic-symref-produce-list-on-results): Set up the results here
  instead of in semantic-symref-results-mode.  Move after
  semantic-symref-current-results's defvar now that it refers to that var.
  (semantic-symref-auto-expand-results)
  (semantic-symref-results-summary-function)
  (semantic-symref-results-mode-hook): Remove redundant :group arg.
  (semantic-symref, semantic-symref-symbol, semantic-symref-regexp):
  Initialize directly in the let.
Merged Emacs rev. 114367, 114368, and 114412

  * semantic/complete.el (tooltip-mode, tooltip-frame-parameters, tooltip-show):
  Declare.
  * semantic/find.el (semantic-brute-find-first-tag-by-name):
  Replace obsolete function assoc-ignore-case with assoc-string.
  * lisp/cedet/semantic.el (semantic-new-buffer-fcn-was-run, semantic-active-p):
  Move from here...
  * lisp/cedet/semantic/fw.el: ...to here.
Merged Emacs rev. 114470

  Rename lookup-words to ispell-lookup-words
  
  * cedet/semantic/texi.el (semantic-analyze-possible-completions): Use
  ispell-lookup-words instead.
Merged Emacs rev. 114725

  * lisp/cedet/semantic/db-mode.el (global-semanticdb-minor-mode): Remove hooks
  correctly.
  (semanticdb-toggle-global-mode): Pass `toggle' to minor mode function.
Merged Emacs rev. 114862

  * lisp/cedet/semantic/grammar.el (semantic-grammar-mode-keywords-2)
  (semantic-grammar-mode-keywords-3): Handle renamed font-lock vars.
Merged Emacs rev. 114879

  * semantic/idle.el (semantic-idle-symbol-highlight)
  (semantic-idle-symbol-highlight-face): Define face with defface
  and obsolete the replaced one defined with defvar.  (Bug#15745)
  * pulse.el (pulse-momentary-highlight-overlay)
  (pulse-momentary-highlight-region): Fix typo in doc
Merged Emacs rev. 114926

  * cedet/semantic/lex.el (semantic-lex-start-block)
  (semantic-lex-end-block): Move after definition of
  semantic-lex-token macro.
Merged Emacs rev. 115123

  * semantic/fw.el (semantic-exit-on-input)
  (semantic-throw-on-input): Restore point before
  accept-process-output because timers which redisplay can run.
  (Bug#15045)
Spelling Fixes
Merged Emacs rev. 116247, 116379, 116462 and 116652

  Be more consistent in using register-read-with-preview to read registers

  Replace "Maintainer: FSF" with the emacs-devel mailing address

  * cedet/semantic/senator.el (senator-copy-tag-to-register):
  Use register-read-with-preview, if available.

  * lisp/cedet/ede/cpp-root.el: Comment update.

  * lisp/cedet/semantic/util.el (semantic-complete-symbol):
  Replace use of obsolete argument of display-completion-list.
Merged Emacs rev. 116743

  lisp/emacs-lisp/eieio.el (with-slots): Use cl-symbol-macrolet (bug#16998).
Merged Emacs rev. 116905, 116922, 116811.1.233

  * lisp/cedet/ede/dired.el (ede-dired-minor-mode): Add autoload cookie.
  (generated-autoload-file, generated-autoload-load-name):
  Set file-local values.
  
  * lisp/cedet/ede.el: Load ede/loaddefs at compile time too.
  (ede-dired-minor-mode): Remove hand-written autoload.

  * lisp/cedet/ede/emacs.el (ede-emacs-version): Update AC_INIT regexp.

  Various doc fixes.
Merged Emacs rev. 117371

  * cedet/semantic/ia.el (semantic-ia-complete-symbol-menu): Use posn-at-point
  instead of senator-completion-menu-point-as-event; un-comment, tho keep
  the "no smart completion" fallback commented since it still doesn't work.
Merged Emacs rev. 116811.1.698

  Do not call egrep to determine emacs version in EDE.
  
  * ede/emacs.el (ede-emacs-version): Do not call 'egrep' to
  determine Emacs version (it was dead code anyway).  Make sure that
  configure.ac or configure.in exist.  (Bug#18476)
Merged Emacs rev. 118129 and 118188

  * lisp/cedet/semantic/wisent/comp.el (wisent-defcontext): Move declarations
  outside of eval-when-compile.  Use `declare'.
  (wisent-with-context): Add `defvar' declarations in case this macro is
  used in a file compiled with lexical-binding.
  (wisent-semantic-action-expand-body): Avoid add-to-list on local var.

  * lisp/cedet/semantic/complete.el: Require semantic/db-find.
Merged Emacs rev. 118228

  Simplify use of current-time and friends.

  * lisp/cedet/srecode/args.el (srecode-semantic-handle-time): Don't
  call current-time twice to get the current time stamp, as this can
  lead to inconsistent results.
Commit merge state