diff options
| author | Miles Bader <miles@gnu.org> | 2005-05-26 05:42:19 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-05-26 05:42:19 +0000 |
| commit | d2eeec7fb90dc54c4b08e85f452a23317c0ee65d (patch) | |
| tree | cd13677b902ee91ff96c5f43ca30ae2aba828312 /lisp/subr.el | |
| parent | 5611ba87dd81c98d2cc00a4d01e19db3d26cf9d5 (diff) | |
| parent | c0e9b2d0ec9cb343733243371efecf77722b067f (diff) | |
| download | emacs-d2eeec7fb90dc54c4b08e85f452a23317c0ee65d.tar.gz emacs-d2eeec7fb90dc54c4b08e85f452a23317c0ee65d.tar.bz2 emacs-d2eeec7fb90dc54c4b08e85f452a23317c0ee65d.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-55
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 320-323)
- Update from CVS
Diffstat (limited to 'lisp/subr.el')
| -rw-r--r-- | lisp/subr.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index d91642c5cbe..f284c18ce5e 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. @@ -1452,10 +1458,6 @@ BEG and END default respectively to the beginning and end of buffer." ;;;; Miscellanea. -;; A number of major modes set this locally. -;; Give it a global value to avoid compiler warnings. -(defvar font-lock-defaults nil) - (defvar suspend-hook nil "Normal hook run by `suspend-emacs', before suspending.") |