* lisp/gnus/nnimap.el (nnimap-open-connection-1): Use tcp-keealive if possible.

[bpt/emacs.git] / lisp / cedet / semantic / decorate.el

diff --git a/lisp/cedet/semantic/decorate.el b/lisp/cedet/semantic/decorate.el
index 4623332..ee356ad 100644 (file)
--- a/lisp/cedet/semantic/decorate.el
+++ b/lisp/cedet/semantic/decorate.el
@@ -1,6 +1,6 @@
 ;;; semantic/decorate.el --- Utilities for decorating/highlighting tokens.
 
-;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009
+;;; Copyright (C) 1999-2003, 2005-2007, 2009-2011
 ;;; Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
@@ -45,7 +45,7 @@ Optional FACE specifies the face to use."
     ))
 
 (defun semantic-unhighlight-tag (tag)
-  "Unhighlight TAG, restoring it's previous face."
+  "Unhighlight TAG, restoring its previous face."
   (let ((o (semantic-tag-overlay tag)))
     (semantic-overlay-put o 'face (car (semantic-overlay-get o 'old-face)))
     (semantic-overlay-put o 'old-face (cdr (semantic-overlay-get o 'old-face)))
@@ -135,29 +135,6 @@ instead of read-only."
       (member 'semantic-overlay-signal-read-only
               (semantic-overlay-get o 'modification-hooks)))))
 
-;;; backwards compatability
-
-(semantic-alias-obsolete 'semantic-highlight-token
-                        'semantic-highlight-tag)
-(semantic-alias-obsolete 'semantic-unhighlight-token
-                        'semantic-unhighlight-tag)
-(semantic-alias-obsolete 'semantic-momentary-highlight-token
-                        'semantic-momentary-highlight-tag)
-(semantic-alias-obsolete 'semantic-set-token-face
-                        'semantic-set-tag-face)
-(semantic-alias-obsolete 'semantic-set-token-invisible
-                        'semantic-set-tag-invisible)
-(semantic-alias-obsolete 'semantic-token-invisible-p
-                        'semantic-tag-invisible-p)
-(semantic-alias-obsolete 'semantic-set-token-intangible
-                        'semantic-set-tag-intangible)
-(semantic-alias-obsolete 'semantic-token-intangible-p
-                        'semantic-tag-intangible-p)
-(semantic-alias-obsolete 'semantic-set-token-read-only
-                        'semantic-set-tag-read-only)
-(semantic-alias-obsolete 'semantic-token-read-only-p
-                        'semantic-tag-read-only-p)
-
 ;;; Secondary overlays
 ;;
 ;; Some types of decoration require a second overlay to be made.