From c830e5aeea7e711b275a36f5ecf15d890742e2f3 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 12 Jul 2011 13:33:18 -0400 Subject: [PATCH] Remove frame-local vars from Lisp manual; obsolete since Emacs 22.3. * display.texi (Window Systems): `window-system' is terminal-local. * doc/lispref/frames.texi (Frame Parameters, Parameter Access): Don't mention frame-local variables. * doc/lispref/variables.texi (Buffer-Local Variables): Don't mention obsolete frame-local variables. (Frame-Local Variables): Node deleted. * doc/lispref/elisp.texi (Top): Update node listing. --- doc/lispref/ChangeLog | 14 ++++++++++++ doc/lispref/display.texi | 4 ++-- doc/lispref/elisp.texi | 1 - doc/lispref/frames.texi | 6 ----- doc/lispref/variables.texi | 45 +++++--------------------------------- 5 files changed, 22 insertions(+), 48 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 4517faac80e..5b0711d2546 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,17 @@ +2011-07-12 Chong Yidong + + * display.texi (Window Systems): `window-system' is + terminal-local. + + * frames.texi (Frame Parameters, Parameter Access): Don't mention + frame-local variables. + + * variables.texi (Buffer-Local Variables): Don't mention obsolete + frame-local variables. + (Frame-Local Variables): Node deleted. + + * elisp.texi (Top): Update node listing. + 2011-07-12 Lars Magne Ingebrigtsen * elisp.texi: Change "inferiors" to "subnodes" in three places diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index bc81c59f05f..7e966278383 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -5910,8 +5910,8 @@ differently. An Emacs frame is a single window as far as X is concerned; the individual Emacs windows are not known to X at all. @defvar window-system -This frame-local variable tells Lisp programs what window system Emacs is using -for displaying the frame. The possible values are +This terminal-local variable tells Lisp programs what window system +Emacs is using for displaying the frame. The possible values are @table @code @item x diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 4f8dce561a5..bb05f1b4a0b 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -430,7 +430,6 @@ Variables * File Local Variables:: Handling local variable lists in files. * Directory Local Variables:: Local variables common to all files in a directory. -* Frame-Local Variables:: Frame-local bindings for variables. * Variable Aliases:: Variables that are aliases for other variables. * Variables with Restricted Values:: Non-constant variables whose value can @emph{not} be an arbitrary Lisp object. diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 9a30ba5fdb4..b6012a4dd53 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -337,9 +337,6 @@ parameters @code{foreground-color}, @code{background-color}, If the terminal supports frame transparency, the parameter @code{alpha} is also meaningful. - You can use frame parameters to define frame-local bindings for -variables. @xref{Frame-Local Variables}. - @menu * Parameter Access:: How to change a frame's parameters. * Initial Parameters:: Specifying frame parameters when you make a frame. @@ -374,9 +371,6 @@ elements of @var{alist}. Each element of @var{alist} has the form parameter. If you don't mention a parameter in @var{alist}, its value doesn't change. If @var{frame} is @code{nil}, it defaults to the selected frame. - -You can use this function to define frame-local bindings for -variables, see @ref{Frame-Local Variables}. @end defun @defun set-frame-parameter frame parm value diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 4ec1779b732..3da09369882 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -39,7 +39,6 @@ representing the variable. * Buffer-Local Variables:: Variable values in effect only in one buffer. * File Local Variables:: Handling local variable lists in files. * Directory Local Variables:: Local variables common to all files in a directory. -* Frame-Local Variables:: Frame-local bindings for variables. * Variable Aliases:: Variables that are aliases for other variables. * Variables with Restricted Values:: Non-constant variables whose value can @emph{not} be an arbitrary Lisp object. @@ -1187,8 +1186,7 @@ additional, unusual kinds of variable binding, such as @dfn{buffer-local} bindings, which apply only in one buffer. Having different values for a variable in different buffers is an important customization method. (Variables can also have bindings that are -local to each terminal, or to each frame. @xref{Multiple Terminals}, -and @xref{Frame-Local Variables}.) +local to each terminal. @xref{Multiple Terminals}.) @menu * Intro to Buffer-Local:: Introduction and concepts. @@ -1287,9 +1285,8 @@ buffer-local binding of buffer @samp{b}. values when you visit the file. @xref{File Variables,,, emacs, The GNU Emacs Manual}. - A buffer-local variable cannot be made frame-local -(@pxref{Frame-Local Variables}) or terminal-local (@pxref{Multiple -Terminals}). + A buffer-local variable cannot be made terminal-local +(@pxref{Multiple Terminals}). @node Creating Buffer-Local @subsection Creating and Deleting Buffer-Local Bindings @@ -1340,9 +1337,9 @@ is not current either on entry to or exit from the @code{let}. This is because @code{let} does not distinguish between different kinds of bindings; it knows only which variable the binding was made for. -If the variable is terminal-local (@pxref{Multiple Terminals}), or -frame-local (@pxref{Frame-Local Variables}), this function signals an -error. Such variables cannot have buffer-local bindings as well. +If the variable is terminal-local (@pxref{Multiple Terminals}), this +function signals an error. Such variables cannot have buffer-local +bindings as well. @strong{Warning:} do not use @code{make-local-variable} for a hook variable. The hook variables are automatically made buffer-local as @@ -1880,36 +1877,6 @@ modification times of the associated directory local variables file updates this list. @end defvar -@node Frame-Local Variables -@section Frame-Local Values for Variables -@cindex frame-local variables - - In addition to buffer-local variable bindings (@pxref{Buffer-Local -Variables}), Emacs supports @dfn{frame-local} bindings. A frame-local -binding for a variable is in effect in a frame for which it was -defined. - - In practice, frame-local variables have not proven very useful. -Ordinary frame parameters are generally used instead (@pxref{Frame -Parameters}). The function @code{make-variable-frame-local}, which -was used to define frame-local variables, has been deprecated since -Emacs 22.2. However, you can still define a frame-specific binding -for a variable @var{var} in frame @var{frame}, by setting the -@var{var} frame parameter for that frame: - -@lisp - (modify-frame-parameters @var{frame} '((@var{var} . @var{value}))) -@end lisp - -@noindent -This causes the variable @var{var} to be bound to the specified -@var{value} in the named @var{frame}. To check the frame-specific -values of such variables, use @code{frame-parameter}. @xref{Parameter -Access}. - - Note that you cannot have a frame-local binding for a variable that -has a buffer-local binding. - @node Variable Aliases @section Variable Aliases @cindex variable aliases -- 2.39.5