Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-324

5 files changed, 293 insertions, 10 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 91b43eddaab..12539758018 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-27  Thien-Thi Nguyen  <ttn@gnuvola.org>
+
+        * display.texi (Button Types):
+        For define-button-type, clarify type of NAME.
+
+2008-01-19  Martin Rudalics  <rudalics@gmx.at>
+
+        * buffers.texi (Buffer Modification): Fix typo.
+
 2008-01-06  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * os.texi (System Environment): Remove references to OSes that are
diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi
index 0085f2cca77..56e952a44a6 100644
--- a/doc/lispref/buffers.texi
+++ b/doc/lispref/buffers.texi
@@ -584,7 +584,7 @@ The counter can wrap around occasionally.
 This function returns @var{buffer}'s character-change modification-count.
 Changes to text properties leave this counter unchanged; however, each
 time text is inserted or removed from the buffer, the counter is reset
-to the value that would be returned @code{buffer-modified-tick}.
+to the value that would be returned by @code{buffer-modified-tick}.
 By comparing the values returned by two @code{buffer-chars-modified-tick}
 calls, you can tell whether a character change occurred in that buffer
 in between the calls.  If @var{buffer} is @code{nil} (or omitted), the
@@ -783,7 +783,7 @@ are selected for display in a window (@pxref{Displaying Buffers}), and
 to the end when they are buried (see @code{bury-buffer}, below).
 There are no functions available to the Lisp programmer which directly
 manipulate the buffer list.
-  
+
   In addition to the fundamental Emacs buffer list, each frame has its
 own version of the buffer list, in which the buffers that have been
 selected in that frame come first, starting with the buffers most
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index b56d24da64e..ee3c828857a 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -4499,7 +4499,8 @@ so that it's easy to define special-purpose types of buttons for
 specific tasks.
 
 @defun define-button-type name &rest properties
-Define a `button type' called @var{name}.  The remaining arguments
+Define a `button type' called @var{name} (a symbol).
+The remaining arguments
 form a sequence of @var{property value} pairs, specifying default
 property values for buttons with this type (a button's type may be set
 by giving it a @code{type} property when creating the button, using
diff --git a/doc/lispref/elisp-covers.texi b/doc/lispref/elisp-covers.texi
new file mode 100644
index 00000000000..e0162329f51
--- /dev/null
+++ b/doc/lispref/elisp-covers.texi
@@ -0,0 +1,257 @@
+\input texinfo    @c -*-texinfo-*-
+@c This is part of the GNU Emacs Lisp Reference Manual.
+@c Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+@c   Free Software Foundation, Inc.
+@c See the file elisp.texi for copying conditions.
+@c
+@comment %**start of header
+@setfilename covers.info
+@settitle GNU Emacs Lisp Reference Manual
+@comment %**end of header
+
+@titlepage
+@c ================ Volume 1 ================
+@w{ }
+@sp 2
+@center @titlefont{The}
+@sp 1
+@center @titlefont{GNU}
+@sp 1
+@center @titlefont{Emacs Lisp}
+@sp 1
+@center @titlefont{Reference}
+@sp 1
+@center @titlefont{Manual}
+@sp 2
+@center GNU Emacs Version 19
+@center for Unix Users
+@center Edition 2.3, June 1994
+@sp 2
+@center @titlefont{Volume 1}
+@sp 2
+@center by Bil Lewis, Dan LaLiberte,
+@center and the GNU Manual Group
+
+@page
+@c ================ Volume 2 ================
+@w{ }
+@sp 5
+@center @titlefont{The}
+@sp 1
+@center @titlefont{GNU}
+@sp 1
+@center @titlefont{Emacs Lisp}
+@sp 1
+@center @titlefont{Reference}
+@sp 1
+@center @titlefont{Manual}
+@sp 2
+@center GNU Emacs Version 19
+@center for Unix Users
+@center Edition 2.3, June 1994
+@sp 2
+@center @titlefont{Volume 2}
+@sp 2
+@center by Bil Lewis,
+@center Dan LaLiberte, and
+@center the GNU Manual Group
+
+@page
+@c ================ Volume 1 with baseline skip 16pt ================
+
+@tex
+\global\baselineskip = 16pt
+@end tex
+
+16 pts baseline skip:
+
+@w{ }
+@sp 2
+@center @titlefont{The}
+@sp 1
+@center @titlefont{GNU}
+@sp 1
+@center @titlefont{Emacs Lisp}
+@sp 1
+@center @titlefont{Reference}
+@sp 1
+@center @titlefont{Manual}
+@sp 2
+@center GNU Emacs Version 19
+@center for Unix Users
+@center Edition 2.3, June 1994
+@sp 2
+@center @titlefont{Volume 1}
+@sp 2
+@center by Bil Lewis, Dan LaLiberte,
+@center and the GNU Manual Group
+
+@page
+@c ================ Volume 1 with baseline skip 18pt ================
+
+@tex
+\global\baselineskip = 18pt
+@end tex
+
+18 pts baseline skip, with 15pts  between sections
+
+@w{ }
+@sp 2
+@center @titlefont{The}
+@sp 1
+@center @titlefont{GNU}
+@sp 1
+@center @titlefont{Emacs Lisp}
+@sp 1
+@center @titlefont{Reference}
+@sp 1
+@center @titlefont{Manual}
+@tex
+\global\baselineskip = 15pt
+@end tex
+
+@sp 2
+@center GNU Emacs Version 19
+@center for Unix Users
+@center Edition 2.3, June 1994
+@sp 2
+@center @titlefont{Volume 1}
+@sp 2
+@center by Bil Lewis,
+@center Dan LaLiberte, and
+@center the GNU Manual Group
+
+@page
+@c ================ Volume 1 with more baseline skip 24 pts ================
+
+@tex
+\global\baselineskip = 24pt
+@end tex
+
+24 pts baseline skip:
+
+@w{ }
+@sp 2
+@center @titlefont{The}
+@sp 1
+@center @titlefont{GNU}
+@sp 1
+@center @titlefont{Emacs Lisp}
+@sp 1
+@center @titlefont{Reference}
+@sp 1
+@center @titlefont{Manual}
+@sp 2
+@center GNU Emacs Version 19
+@center for Unix Users
+@center Edition 2.3, June 1994
+@sp 2
+@center @titlefont{Volume 1}
+@sp 2
+@center by Bil Lewis, Dan LaLiberte,
+@center and the GNU Manual Group
+
+@page
+@c ================ Volume 2 with more baseline skip 18 pts ================
+
+@tex
+\global\baselineskip = 18pt
+@end tex
+
+18 pts baseline skip:
+
+@w{ }
+@sp 5
+@center @titlefont{The}
+@sp 1
+@center @titlefont{GNU}
+@sp 1
+@center @titlefont{Emacs Lisp}
+@sp 1
+@center @titlefont{Reference}
+@sp 1
+@center @titlefont{Manual}
+@sp 2
+@center GNU Emacs Version 19
+@center for Unix Users
+@center Edition 2.3, June 1994
+@sp 2
+@center @titlefont{Volume 2}
+@sp 2
+@center by Bil Lewis, Dan LaLiberte,
+@center and the GNU Manual Group
+
+@page
+@c ================ Volume 2 with more baseline skip 24 pts ================
+
+@tex
+\global\baselineskip = 24pt
+@end tex
+
+24 pts baseline skip:
+
+@w{ }
+@sp 5
+@center @titlefont{The}
+@sp 1
+@center @titlefont{GNU}
+@sp 1
+@center @titlefont{Emacs Lisp}
+@sp 1
+@center @titlefont{Reference}
+@sp 1
+@center @titlefont{Manual}
+@sp 2
+@center GNU Emacs Version 19
+@center for Unix Users
+@center Edition 2.3, June 1994
+@sp 2
+@center @titlefont{Volume 2}
+@sp 2
+@center by Bil Lewis, Dan LaLiberte,
+@center and the GNU Manual Group
+
+
+@page
+@c ================  Spine 1 ================
+
+@w{@titlefont{The GNU Emacs Lisp Reference Manual --- Vol. 1}}
+@sp 4
+@center GNU Emacs Version 19
+@center for Unix Users
+@center Edition 2.3, June 1994
+@sp 4
+@center by Bil Lewis, Dan LaLiberte,
+@center and the GNU Manual Group
+
+@sp 4
+@author The GNU Emacs Lisp Reference Manual --- Vol. 1
+@sp 3
+@author FSF
+
+@author
+
+@page
+@c ================  Spine 2 ================
+
+@w{@titlefont{The GNU Emacs Lisp Reference Manual --- Vol. 2}}
+@sp 4
+@center GNU Emacs Version 19
+@center for Unix Users
+@center Edition 2.3, June 1994
+@sp 4
+@center by Bil Lewis, Dan LaLiberte,
+@center and the GNU Manual Group
+
+
+@sp 4
+@author The GNU Emacs Lisp Reference Manual --- Vol. 2
+@sp 3
+@author FSF
+
+@end titlepage
+@bye
+
+@ignore
+   arch-tag: 02d65d63-3b64-49bc-a5c0-bfd5eabb6c98
+@end ignore
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 38e93b2033e..3004ca3a934 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -77,15 +77,16 @@ convention.
 @samp{-hooks}.  If the variable's name ends in @samp{-function}, then
 its value is just a single function, not a list of functions.
 
-  Here's an example that uses a mode hook to turn on Auto Fill mode when
-in Lisp Interaction mode:
+@menu
+* Running Hooks::      How to run a hook.
+* Setting Hooks::      How to put functions on a hook, or remove them.
+@end menu
 
-@example
-(add-hook 'lisp-interaction-mode-hook 'turn-on-auto-fill)
-@end example
+@node Running Hooks
+@subsection Running Hooks
 
-  At the appropriate time, Emacs uses the @code{run-hooks} function to
-run particular hooks.
+  At the appropriate times, Emacs uses the @code{run-hooks} function
+and the other functions below to run particular hooks.
 
 @defun run-hooks &rest hookvars
 This function takes one or more normal hook variable names as
@@ -125,6 +126,16 @@ the last hook function that was called.  If all hook functions return
 @code{nil}, it returns @code{nil} as well.
 @end defun
 
+@node Setting Hooks
+@subsection Setting Hooks
+
+  Here's an example that uses a mode hook to turn on Auto Fill mode when
+in Lisp Interaction mode:
+
+@example
+(add-hook 'lisp-interaction-mode-hook 'turn-on-auto-fill)
+@end example
+
 @defun add-hook hook function &optional append local
 This function is the handy way to add function @var{function} to hook
 variable @var{hook}.  You can use it for abnormal hooks as well as for
@@ -141,6 +152,11 @@ adds @code{my-text-hook-function} to the hook called @code{text-mode-hook}.
 If @var{function} is already present in @var{hook} (comparing using
 @code{equal}), then @code{add-hook} does not add it a second time.
 
+If @var{function} has a non-@code{nil} property
+@code{permanent-local-hook}, then @code{kill-all-local-variables} (or
+changing major modes) won't delete it from the hook variable's local
+value.
+
 It is best to design your hook functions so that the order in which they
 are executed does not matter.  Any dependence on the order is ``asking
 for trouble.''  However, the order is predictable: normally,