Merge changes from emacs-23 branch

[gnu-emacs] / doc / lispref / locals.texi

diff --git a/doc/lispref/locals.texi b/doc/lispref/locals.texi
index 57711987a750c7fb30b328475bcad21675039221..a075d955add756d123f6585c7d1e24658d8bd06c 100644 (file)
--- a/doc/lispref/locals.texi
+++ b/doc/lispref/locals.texi
@@ -1,7 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004,
-@c   2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+@c Copyright (C) 1990-1993, 1999, 2001-2012  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../../info/locals
 @node Standard Buffer-Local Variables, Standard Keymaps, Standard Errors, Top
@@ -85,17 +84,17 @@ Minor mode variables will not be listed here.
 @item case-fold-search
 @xref{Searching and Case}.
 
+@item comment-column
+@xref{Comments,,, emacs, The GNU Emacs Manual}.
+
 @item ctl-arrow
 @xref{Usual Display}.
 
-@item cursor-type
-@xref{Cursor Parameters}.
-
 @item cursor-in-non-selected-windows
 @xref{Basic Windows}.
 
-@item comment-column
-@xref{Comments,,, emacs, The GNU Emacs Manual}.
+@item cursor-type
+@xref{Cursor Parameters}.
 
 @item default-directory
 @xref{File Name Expansion}.
@@ -106,11 +105,6 @@ Minor mode variables will not be listed here.
 @item desktop-save-buffer
 @xref{Desktop Save Mode}.
 
-@ignore
-@item direction-reversed
-Does not work yet.
-@end ignore
-
 @item enable-multibyte-characters
 @ref{Text Representations}.
 
@@ -199,15 +193,11 @@ Used for communication between mouse commands and scroll-bar commands.
 @xref{Scroll Bars}.
 
 @item scroll-down-aggressively
-@xref{Textual Scrolling}.
-
-@item scroll-up-aggressively
+@itemx scroll-up-aggressively
 @xref{Textual Scrolling}.
 
 @item selective-display
-@xref{Selective Display}.
-
-@item selective-display-ellipses
+@itemx selective-display-ellipses
 @xref{Selective Display}.
 
 @item tab-width
@@ -225,8 +215,3 @@ Used for communication between mouse commands and scroll-bar commands.
 @item write-contents-functions
 @xref{Saving Buffers}.
 @end table
-
-
-@ignore
-   arch-tag: 6baae835-b667-4447-91e2-9829ae1cf543
-@end ignore