diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-27 09:07:17 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-27 09:07:17 +0000 |
| commit | fdc9061358d3654e14bfc1419632e1d6c6c5c13e (patch) | |
| tree | 00f5484d576513deddd938a9a277d0db860b9a5b /lisp/subr.el | |
| parent | ebe4c71027cd6ec8583631e895e7fdd3decfc099 (diff) | |
| parent | b6ff295c434269fe824ec47cbfc87c6a02dfd94d (diff) | |
| download | emacs-fdc9061358d3654e14bfc1419632e1d6c6c5c13e.tar.gz emacs-fdc9061358d3654e14bfc1419632e1d6c6c5c13e.tar.bz2 emacs-fdc9061358d3654e14bfc1419632e1d6c6c5c13e.zip | |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-908
Diffstat (limited to 'lisp/subr.el')
| -rw-r--r-- | lisp/subr.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index bce80963705..17008e058ba 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -945,7 +945,7 @@ is converted into a string by expressing it in decimal." (make-obsolete 'focus-frame "it does nothing." "22.1") (defalias 'unfocus-frame 'ignore "") (make-obsolete 'unfocus-frame "it does nothing." "22.1") - +(make-obsolete 'make-variable-frame-local "use a frame-parameter instead" "22.2") ;;;; Obsolescence declarations for variables, and aliases. @@ -989,7 +989,6 @@ to reread, so it now uses nil to mean `no event', instead of -1." (defalias 'search-backward-regexp (symbol-function 're-search-backward)) (defalias 'int-to-string 'number-to-string) (defalias 'store-match-data 'set-match-data) -(defalias 'make-variable-frame-localizable 'make-variable-frame-local) ;; These are the XEmacs names: (defalias 'point-at-eol 'line-end-position) (defalias 'point-at-bol 'line-beginning-position) |