Commit 00afe3a4 authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from emacs-24; up to 2012-12-02T06:22:32Z!cyd@gnu.org

parents 04d9b71a ddc41264
......@@ -372,7 +372,7 @@ Generate a one-month calendar (@code{cal-html-cursor-month}).
@item H y
Generate a calendar file for each month of a year, as well as an index
page (@code{cal-html-cursor-year}). By default, this command writes
files to a @var{yyyy} subdirectory - if this is altered some hyperlinks
files to a @var{yyyy} subdirectory---if this is altered some hyperlinks
between years will not work.
@end table
......
......@@ -11,7 +11,7 @@
@copying
This manual describes specialized features of Emacs.
Copyright @copyright{} 2004-2012 Free Software Foundation, Inc.
Copyright @copyright{} 2004--2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
......@@ -53,7 +53,7 @@ modify this GNU manual.''
@menu
* Introduction:: What documentation belongs here?
@iftex
* Picture Mode:: Editing pictures made up of characters using
* Picture Mode:: Editing pictures made up of characters using
the quarter-plane screen model.
* Autorevert:: Auto Reverting non-file buffers.
......
......@@ -26,7 +26,7 @@ This is the @cite{GNU Emacs Manual},
@end ifnottex
updated for Emacs version @value{EMACSVER}.
Copyright @copyright{} 1985-1987, 1993-2012 Free Software Foundation, Inc.
Copyright @copyright{} 1985--1987, 1993--2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
......
This diff is collapsed.
......@@ -817,5 +817,5 @@ of color names and RGB triplets. Color names should be enclosed with
double quotes, e.g., @samp{"red"}. RGB triplets should be written
without double quotes, e.g., @samp{#ff0000}. GTK-style RGB triplets
have the form @w{@code{@{ @var{r}, @var{g}, @var{b} @}}}, where
@var{r}, @var{g} and @var{b} are either integers in the range 0-65535
or floats in the range 0.0-1.0.
@var{r}, @var{g} and @var{b} are either integers in the range 0--65535
or floats in the range 0.0--1.0.
2012-12-22 Glenn Morris <rgm@gnu.org>
* Makefile.in (srcs): New variable, adding doclicense.texi.
(${buildinfodir}/eintr$(INFO_EXT), emacs-lisp-intro.dvi)
(emacs-lisp-intro.pdf, emacs-lisp-intro.html):
Use $srcs for dependencies.
2012-12-14 Paul Eggert <eggert@cs.ucla.edu>
Fix permissions bugs with setgid directories etc. (Bug#13125)
......
......@@ -43,6 +43,8 @@ ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \
mkinfodir = @${MKDIR_P} ${buildinfodir}
srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi
.PHONY: info dvi html pdf ps
info: ${buildinfodir}/eintr$(INFO_EXT)
......@@ -55,20 +57,20 @@ ps: emacs-lisp-intro.ps
# The file name eintr must fit within 5 characters, to allow for
# -NN extensions to fit into DOS 8+3 limits without clashing.
# Note: "<" is not portable in ordinary make rules.
${buildinfodir}/eintr$(INFO_EXT): ${srcdir}/emacs-lisp-intro.texi
${buildinfodir}/eintr$(INFO_EXT): ${srcs}
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi
emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi
emacs-lisp-intro.dvi: ${srcs}
$(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-lisp-intro.texi
emacs-lisp-intro.ps: emacs-lisp-intro.dvi
$(DVIPS) -o $@ emacs-lisp-intro.dvi
emacs-lisp-intro.pdf: ${srcdir}/emacs-lisp-intro.texi
emacs-lisp-intro.pdf: ${srcs}
$(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-lisp-intro.texi
emacs-lisp-intro.html: ${srcdir}/emacs-lisp-intro.texi
emacs-lisp-intro.html: ${srcs}
$(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ ${srcdir}/emacs-lisp-intro.texi
.PHONY: mostlyclean clean distclean maintainer-clean infoclean
......
......@@ -228,7 +228,8 @@ people who are not programmers.
@sp 1
Edition @value{edition-number}, @value{update-date}
@sp 1
Copyright @copyright{} 1990-1995, 1997, 2001-2012 Free Software Foundation, Inc.
Copyright @copyright{} 1990--1995, 1997, 2001--2012 Free Software
Foundation, Inc.
@sp 1
 
@iftex
......@@ -6281,7 +6282,7 @@ the arithmetic, a conversion is necessary, and
@findex / @r{(division)}
@cindex Division
The second argument is @code{(/ size 10)}. This expression divides
the numeric value by ten --- the numeric value of the size of the
the numeric value by ten---the numeric value of the size of the
accessible portion of the buffer. This produces a number that tells
how many characters make up one tenth of the buffer size. (In Lisp,
@code{/} is used for division, just as @code{*} is used for
......@@ -9402,7 +9403,7 @@ either by setting it manually or by using @code{customize}.
 
For me, the major use of the @code{set-variable} command is to suggest
variables that I might want to set in my @file{.emacs} file. There
are now more than 700 such variables --- far too many to remember
are now more than 700 such variables, far too many to remember
readily. Fortunately, you can press @key{TAB} after calling the
@code{M-x set-variable} command to see the list of variables.
(@xref{Examining, , Examining and Setting Variables, emacs,
......@@ -11195,8 +11196,8 @@ The @code{dolist} expression does very much the same as the
of the work you have to do when writing a @code{while} expression.
 
Like a @code{while} loop, a @code{dolist} loops. What is different is
that it automatically shortens the list each time it loops --- it
`@sc{cdr}s down the list' on its own --- and it automatically binds
that it automatically shortens the list each time it loops---it
`@sc{cdr}s down the list' on its own---and it automatically binds
the @sc{car} of each shorter version of the list to the first of its
arguments.
 
......@@ -13300,8 +13301,8 @@ We can see that this is a decrementing counter @code{while} loop,
using the expression @code{(setq arg (1- arg))} as the decrementer.
That expression is not far from the @code{while}, but is hidden in
another Lisp macro, an @code{unless} macro. Unless we are at the end
of the buffer --- that is what the @code{eobp} function determines; it
is an abbreviation of @samp{End Of Buffer P} --- we decrease the value
of the buffer---that is what the @code{eobp} function determines; it
is an abbreviation of @samp{End Of Buffer P}---we decrease the value
of @code{arg} by one.
 
(If we are at the end of the buffer, we cannot go forward any more and
......@@ -15657,7 +15658,7 @@ as a list that looks like this (but with more elements):
The @code{directory-files-and-attributes} function returns a list of
lists. Each of the lists within the main list consists of 13
elements. The first element is a string that contains the name of the
file -- which, in GNU/Linux, may be a `directory file', that is to
file---which, in GNU/Linux, may be a `directory file', that is to
say, a file with the special attributes of a directory. The second
element of the list is @code{t} for a directory, a string
for symbolic link (the string is the name linked to), or @code{nil}.
......@@ -16850,7 +16851,7 @@ Write a line graph version of the graph printing functions.
@cindex Customizing your @file{.emacs} file
@cindex Initialization file
 
``You don't have to like Emacs to like it'' -- this seemingly
``You don't have to like Emacs to like it''---this seemingly
paradoxical statement is the secret of GNU Emacs. The plain, `out of
the box' Emacs is a generic tool. Most people who use it, customize
it to suit themselves.
......@@ -18282,7 +18283,7 @@ or `All'. (A lower case @samp{p} tell you the percentage above the
@emph{top} of the window.) @samp{%-} inserts enough dashes to fill
out the line.
 
Remember, ``You don't have to like Emacs to like it'' --- your own
Remember, ``You don't have to like Emacs to like it''---your own
Emacs can have different colors, different commands, and different
keys than a default Emacs.
 
......@@ -21946,7 +21947,7 @@ Here is the graph:
@sp 2
 
@noindent
The largest group of functions contain 10 -- 19 words and symbols each.
The largest group of functions contain 10--19 words and symbols each.
 
@node Free Software and Free Manuals
@appendix Free Software and Free Manuals
......
2012-12-22 Martin Rudalics <rudalics@gmx.at>
* windows.texi (Selecting Windows): Reword description of
select-window (Bug#13248).
2012-12-22 Eli Zaretskii <eliz@gnu.org>
* files.texi (File Attributes, Changing Files): Remove the details
......
......@@ -650,7 +650,7 @@ the last modification time of that directory, as recorded by Dired.
For a new buffer visiting a not yet existing file, @var{high} is
@minus{}1 and @var{low} is 65535, that is,
@ifnottex
@w{2**16 - 1.}
@w{2**16 @minus{} 1.}
@end ifnottex
@tex
@math{2^{16}-1}.
......
......@@ -2660,7 +2660,7 @@ The command @code{quoted-insert} uses this function.
@cindex control characters, reading
@cindex nonprinting characters, reading
This function is like @code{read-char}, except that if the first
character read is an octal digit (0-7), it reads any number of octal
character read is an octal digit (0--7), it reads any number of octal
digits (but stopping if a non-octal digit is found), and returns the
character represented by that numeric character code. If the
character that terminates the sequence of octal digits is @key{RET},
......
......@@ -98,7 +98,7 @@ This is the @cite{GNU Emacs Lisp Reference Manual}
@end ifnottex
corresponding to Emacs version @value{EMACSVER}.
Copyright @copyright{} 1990-1996, 1998-2012 Free Software Foundation, Inc.
Copyright @copyright{} 1990--1996, 1998--2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
......
......@@ -43,7 +43,7 @@ minimum range is @minus{}536870912 to 536870911 (30 bits; i.e.,
@end tex
to
@ifnottex
2**29 - 1),
2**29 @minus{} 1),
@end ifnottex
@tex
@math{2^{29}-1}),
......
......@@ -171,7 +171,7 @@ latter are unique to Emacs Lisp.
@end tex
to
@ifnottex
2**29 - 1)
2**29 @minus{} 1)
@end ifnottex
@tex
@math{2^{29}-1})
......
......@@ -1421,23 +1421,23 @@ This stands for the day of month, blank-padded.
@item %h
This is a synonym for @samp{%b}.
@item %H
This stands for the hour (00-23).
This stands for the hour (00--23).
@item %I
This stands for the hour (01-12).
This stands for the hour (01--12).
@item %j
This stands for the day of the year (001-366).
This stands for the day of the year (001--366).
@item %k
This stands for the hour (0-23), blank padded.
This stands for the hour (0--23), blank padded.
@item %l
This stands for the hour (1-12), blank padded.
This stands for the hour (1--12), blank padded.
@item %m
This stands for the month (01-12).
This stands for the month (01--12).
@item %M
This stands for the minute (00-59).
This stands for the minute (00--59).
@item %n
This stands for a newline.
@item %N
This stands for the nanoseconds (000000000-999999999). To ask for
This stands for the nanoseconds (000000000--999999999). To ask for
fewer digits, use @samp{%3N} for milliseconds, @samp{%6N} for
microseconds, etc. Any excess digits are discarded, without rounding.
@item %p
......@@ -1447,18 +1447,18 @@ This is a synonym for @samp{%I:%M:%S %p}.
@item %R
This is a synonym for @samp{%H:%M}.
@item %S
This stands for the seconds (00-59).
This stands for the seconds (00--59).
@item %t
This stands for a tab character.
@item %T
This is a synonym for @samp{%H:%M:%S}.
@item %U
This stands for the week of the year (01-52), assuming that weeks
This stands for the week of the year (01--52), assuming that weeks
start on Sunday.
@item %w
This stands for the numeric day of week (0-6). Sunday is day 0.
This stands for the numeric day of week (0--6). Sunday is day 0.
@item %W
This stands for the week of the year (01-52), assuming that weeks
This stands for the week of the year (01--52), assuming that weeks
start on Monday.
@item %x
This has a locale-specific meaning. In the default locale (named
......@@ -1467,7 +1467,7 @@ This has a locale-specific meaning. In the default locale (named
This has a locale-specific meaning. In the default locale (named
@samp{C}), it is equivalent to @samp{%T}.
@item %y
This stands for the year without century (00-99).
This stands for the year without century (00--99).
@item %Y
This stands for the year with century.
@item %Z
......
......@@ -1296,10 +1296,12 @@ windows.
@cindex selecting a window
@defun select-window window &optional norecord
This function makes @var{window} the selected window, as well as the
window selected within its frame (@pxref{Basic Windows}). @var{window}
must be a live window. This function makes also @var{window}'s buffer
current (@pxref{Buffers and Windows}). The return value is
This function makes @var{window} the selected window and the window
selected within its frame (@pxref{Basic Windows}) and selects that
frame. @var{window} must be a live window. This function also makes
@var{window}'s buffer (@pxref{Buffers and Windows}) current and sets
that buffer's value of @code{point} to the value of @code{window-point}
(@pxref{Window Point}) in @var{window}. The return value is
@var{window}.
By default, this function also moves @var{window}'s buffer to the front
......@@ -1865,7 +1867,7 @@ default value is empty, i.e., @code{(nil . nil)}.
@defopt display-buffer-alist
The value of this option is an alist mapping conditions to display
actions. Each condition may be either a regular expression matching a
buffer name or a function that takes two arguments - a buffer name and
buffer name or a function that takes two arguments: a buffer name and
the @var{action} argument passed to @code{display-buffer}. If the name
of the buffer passed to @code{display-buffer} either matches a regular
expression in this alist or the function specified by a condition
......@@ -1966,7 +1968,7 @@ height of the frame's root window.
@item
If the @sc{cdr} specifies a function, that function is called with one
argument - the new window. The function is supposed to adjust the
argument: the new window. The function is supposed to adjust the
height of the window; its return value is ignored. Suitable functions
are @code{shrink-window-if-larger-than-buffer} and
@code{fit-window-to-buffer}, see @ref{Resizing Windows}.
......@@ -1987,7 +1989,7 @@ width of the frame's root window.
@item
If the @sc{cdr} specifies a function, that function is called with one
argument - the new window. The function is supposed to adjust the width
argument: the new window. The function is supposed to adjust the width
of the window; its return value is ignored.
@end itemize
......@@ -3616,10 +3618,10 @@ This parameter is installed by the buffer display functions
(@pxref{Choosing Window}) and consulted by @code{quit-restore-window}
(@pxref{Quitting Windows}). It contains four elements:
The first element is one of the symbols @code{window} - meaning that the
window has been specially created by @code{display-buffer}, @code{frame}
- a separate frame has been created, @code{same} - the window has
displayed the same buffer before, or @code{other} - the window showed
The first element is one of the symbols @code{window}, meaning that the
window has been specially created by @code{display-buffer}; @code{frame},
a separate frame has been created; @code{same}, the window has
displayed the same buffer before; or @code{other}, the window showed
another buffer before.
The second element is either one of the symbols @code{window} or
......
2012-12-22 Glenn Morris <rgm@gnu.org>
* Makefile.in (gfdl): New variable. Use throughout where
appropriate so that targets depend on doclicense.texi.
2012-12-22 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in ($(INFO_TARGETS), $(DVI_TARGETS)): Depend on
......
This diff is collapsed.
......@@ -3,7 +3,7 @@
@settitle Ada Mode
@copying
Copyright @copyright{} 1999-2012 Free Software Foundation, Inc.
Copyright @copyright{} 1999--2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
......@@ -1506,7 +1506,7 @@ Start a comment in default column.
@item M-j
Continue comment on next line.
@item C-c ;
Comment the selected region (add -- at the beginning of lines).
Comment the selected region (add @samp{--} at the beginning of lines).
@item C-c :
Uncomment the selected region
@item M-q
......
......@@ -10,7 +10,7 @@
@copying
This file describes the Emacs auth-source library.
Copyright @copyright{} 2008-2012 Free Software Foundation, Inc.
Copyright @copyright{} 2008--2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment