merge from trunk

15 files changed, 39 insertions, 29 deletions

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 8e7278ee2ee..993d0d051e8 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,10 @@
+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)
@@ -561,7 +568,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2001-2012 Free Software Foundation, Inc.
+  Copyright (C) 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 3f2fe1f9526..a6b50b88ad9 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -1,6 +1,6 @@
 #### Makefile for the Emacs Lisp Introduction manual
 
-# Copyright (C) 1994-1999, 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-1999, 2001-2013 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -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
diff --git a/doc/lispintro/README b/doc/lispintro/README
index d81a6bc2a3a..360d6296b70 100644
--- a/doc/lispintro/README
+++ b/doc/lispintro/README
@@ -1,4 +1,4 @@
-Copyright (C) 2001-2012  Free Software Foundation, Inc.
+Copyright (C) 2001-2013 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/doc/lispintro/cons-1.eps b/doc/lispintro/cons-1.eps
index d17082f5ac7..77d24cbddcc 100644
--- a/doc/lispintro/cons-1.eps
+++ b/doc/lispintro/cons-1.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Wed Mar  8 14:26:58 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
 
-% Copyright (C) 1995, 1997, 2001-2012  Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2013 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/cons-2.eps b/doc/lispintro/cons-2.eps
index bd227a14c03..961b00a13ec 100644
--- a/doc/lispintro/cons-2.eps
+++ b/doc/lispintro/cons-2.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Wed Mar  8 14:26:39 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
 
-% Copyright (C) 1995, 1997, 2001-2012  Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2013 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/cons-2a.eps b/doc/lispintro/cons-2a.eps
index 676030d780f..993609638a1 100644
--- a/doc/lispintro/cons-2a.eps
+++ b/doc/lispintro/cons-2a.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Tue Mar 14 15:09:30 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
 
-% Copyright (C) 1995, 1997, 2001-2012  Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2013 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/cons-3.eps b/doc/lispintro/cons-3.eps
index 329c751b856..e37dad0de60 100644
--- a/doc/lispintro/cons-3.eps
+++ b/doc/lispintro/cons-3.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Wed Mar  8 14:25:41 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
 
-% Copyright (C) 1995, 1997, 2001-2012  Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2013 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/cons-4.eps b/doc/lispintro/cons-4.eps
index fe28852a872..9af4c2afd75 100644
--- a/doc/lispintro/cons-4.eps
+++ b/doc/lispintro/cons-4.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Wed Mar  8 14:25:06 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
 
-% Copyright (C) 1995, 1997, 2001-2012  Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2013 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/cons-5.eps b/doc/lispintro/cons-5.eps
index 214c4059e32..8a400f320de 100644
--- a/doc/lispintro/cons-5.eps
+++ b/doc/lispintro/cons-5.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Wed Mar  8 14:27:28 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
 
-% Copyright (C) 1995, 1997, 2001-2012  Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2013 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/drawers.eps b/doc/lispintro/drawers.eps
index 2c066fc708a..abfec2a7362 100644
--- a/doc/lispintro/drawers.eps
+++ b/doc/lispintro/drawers.eps
@@ -9,7 +9,7 @@
 %%EndComments
 %%BeginProlog
 
-% Copyright (C) 2001-2012  Free Software Foundation, Inc.
+% Copyright (C) 2001-2013 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 5111ee116a3..3366ad6e7f7 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -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--2013 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
diff --git a/doc/lispintro/lambda-1.eps b/doc/lispintro/lambda-1.eps
index 42f8d54264c..11f3318037c 100644
--- a/doc/lispintro/lambda-1.eps
+++ b/doc/lispintro/lambda-1.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Wed Mar  8 14:31:53 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
 
-% Copyright (C) 1995, 1997, 2001-2012  Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2013 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/lambda-2.eps b/doc/lispintro/lambda-2.eps
index ab9e8a85820..3022ce9bb6c 100644
--- a/doc/lispintro/lambda-2.eps
+++ b/doc/lispintro/lambda-2.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Wed Mar  8 14:33:09 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
 
-% Copyright (C) 1995, 1997, 2001-2012  Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2013 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/lambda-3.eps b/doc/lispintro/lambda-3.eps
index 8269650e0ec..0d66eb73332 100644
--- a/doc/lispintro/lambda-3.eps
+++ b/doc/lispintro/lambda-3.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Wed Mar  8 14:33:49 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
 
-% Copyright (C) 1995, 1997, 2001-2012  Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2013 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/makefile.w32-in b/doc/lispintro/makefile.w32-in
index ea9b04b87ca..377112a80d2 100644
--- a/doc/lispintro/makefile.w32-in
+++ b/doc/lispintro/makefile.w32-in
@@ -1,6 +1,6 @@
 #### -*- Makefile -*- for the Emacs Lisp Introduction manual.
 
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.