2 files changed, 11 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 52af4d5df1b..dd4c0f8e6ce 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-22  Juanma Barranquero  <lekktu@gmail.com>
+
+        * subr.el (focus-frame, unfocus-frame):
+        Revert deletion on 2005-05-01.
+
 2005-05-22  Andre Spiegel  <spiegel@gnu.org>
 
         * vc-cvs.el (vc-cvs-checkout-model): Handle the case where FILE
diff --git a/lisp/subr.el b/lisp/subr.el
index ee084e09f14..8f9b51c56c7 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -784,6 +784,12 @@ is converted into a string by expressing it in decimal."
   baud-rate)
 (make-obsolete 'baud-rate "use the `baud-rate' variable instead." "before 19.15")
 
+;; These are used by VM and some old programs
+(defalias 'focus-frame 'ignore "")
+(make-obsolete 'focus-frame "it does nothing." "22.1")
+(defalias 'unfocus-frame 'ignore "")
+(make-obsolete 'unfocus-frame "it does nothing." "22.1")
+
 
 ;;;; Obsolescence declarations for variables, and aliases.