Merge from emacs-24; up to 2012-04-16T19:06:02Z!rgm@gnu.org

ChangeLog

+2012-05-02  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (uninstall): Remove useless-use-of-for; that for
+	some reason caused problems on an old Solaris.
+
+	* Makefile.in (install-arch-indep, uninstall):
+	Ensure that INSTALL-type commands are run from top-level.
+
+	* Makefile.in (INFO_FILES): Add emacs-gnutls; accidentally
+	omitted from 2012-04-12 backport from trunk.
+
+	* info/dir: Make some entries consistent with the source texi files.
+
+	* configure.in (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04.
+
+	* info/dir: Make some entries consistent with the source texi files.
+
+	* configure.in (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04.
+
 2012-05-02  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (install-arch-indep):

Makefile.in

@@ -232,6 +232,11 @@ gamedir=@gamedir@
 # ==================== Utility Programs for the Build ====================
 
 # Allow the user to specify the install program.
+# Note that if the system does not provide a suitable install,
+# configure will use build-aux/install-sh.  Annoyingly, it does
+# not use an absolute path.  So we must take care to always run
+# INSTALL-type commands from the top-level directory.
+# This explains (I think) the cd thisdir seen in several install rules.
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -616,7 +621,8 @@ install-arch-indep: mkdir info install-etc
 	   for elt in $(INFO_FILES); do \
 	      test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
 	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
-	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
+	       (cd $${thisdir}; \
+	        ${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f); \
 	        chmod a+r $(DESTDIR)${infodir}/$$f; \
 	        if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
 	          rm -f $(DESTDIR)${infodir}/$$f.gz; \
@@ -711,14 +717,14 @@ uninstall:
 	  fi ;						\
 	done
 	-rm -rf $(DESTDIR)${libexecdir}/emacs/${version}
+	thisdir=`/bin/pwd`; \
 	(cd $(DESTDIR)${infodir} && \
 	  for elt in $(INFO_FILES); do \
-	    $(INSTALL_INFO) --remove --info-dir=. $$elt; \
+	    (cd $${thisdir}; \
+	     $(INSTALL_INFO) --remove --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
 	    if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
 	       ext=.gz; else ext=; fi; \
-	    for f in `ls $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext 2>/dev/null`; do \
-	      rm -f $$f; \
-	    done; \
+	    rm -f $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext; \
 	  done;)
 	(if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
 	    ext=.gz; else ext=; fi; \

admin/FOR-RELEASE

@@ -37,6 +37,7 @@ Regenerate the pdf versions in etc/refcards/.
 What paper size are the English versions supposed to be on?
 On Debian testing, the packages texlive-lang-czechslovak and
 texlive-lang-polish will let you generate the cs-* and sk-* pdfs.
+(You may need texlive-lang-cyrillic, texlive-lang-german for others.)
 The Makefile rules did not work for me, I had to use something like:
 csplain -output-format=pdf cs-refcard
 

configure.in

@@ -2931,9 +2931,7 @@ fail;
     ;;
 
   netbsd)
-    if test $ac_cv_search_tputs = -lterminfo; then
-      LIBS_TERMCAP="-lterminfo"
-    else
+    if [ "x$LIBS_TERMCAP" != "x-lterminfo" ]; then
       TERMINFO=no
       LIBS_TERMCAP="-ltermcap"
     fi

doc/emacs/ChangeLog

+2012-05-02  Glenn Morris  <rgm@gnu.org>
+
+	* emacs.texi (@copying): Only print EDITION in the TeX version.
+
+	* search.texi (Regexp Search): Just say "Emacs".
+
+	* display.texi (Auto Scrolling):
+	Reword to avoid repetition and improve page break.
+
+	* xresources.texi (Resources):
+	* mule.texi (Language Environments):
+	* misc.texi (Amusements):
+	* maintaining.texi (VC Change Log):
+	* frames.texi (Fonts):
+	* custom.texi (Specifying File Variables, Minibuffer Maps):
+	* cmdargs.texi (Initial Options):
+	* building.texi (Flymake):
+	Reword to remove/reduce some overly long/short lines.
+
 2012-04-27  Glenn Morris  <rgm@gnu.org>
 
 	* emacs.texi: Some fixes for detailed menu.
@@ -9213,7 +9232,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2012  Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 

doc/emacs/building.texi

@@ -426,11 +426,11 @@ syntax checking tool used depends on the language; for example, for
 C/C++ files this is usually the C compiler.  Flymake can also use
 build tools such as @code{make} for checking complicated projects.
 
-  To enable Flymake mode, type @kbd{M-x flymake-mode}.  You can go to
-the errors found by Flymake mode with @kbd{M-x
-flymake-goto-next-error} and @kbd{M-x flymake-goto-prev-error}.  To
-display any error messages associated with the current line, use
-@kbd{M-x flymake-display-err-menu-for-current-line}.
+  To enable Flymake mode, type @kbd{M-x flymake-mode}.  You can jump to
+the errors that it finds by using @kbd{M-x
+flymake-goto-next-error} and @kbd{M-x flymake-goto-prev-error}.
+Use the command @kbd{M-x flymake-display-err-menu-for-current-line}
+to display any error messages associated with the current line.
 
   For more details about using Flymake,
 @ifnottex

doc/emacs/cmdargs.texi

@@ -308,7 +308,7 @@ in your initialization file (@pxref{Entering Emacs}).
 @opindex -Q
 @itemx --quick
 @opindex --quick
-Start emacs with minimum customizations, similar to using @samp{-q},
+Start emacs with minimum customizations.  This is similar to using @samp{-q},
 @samp{--no-site-file}, @samp{--no-site-lisp}, and @samp{--no-splash}
 together.  This also stops Emacs from processing X resources by
 setting @code{inhibit-x-resources} to @code{t} (@pxref{Resources}).

doc/emacs/custom.texi

@@ -1054,8 +1054,8 @@ pair with a colon and semicolon.  The special variable/value pair
 @findex add-file-local-variable-prop-line
 @findex delete-file-local-variable-prop-line
 @findex copy-dir-locals-to-file-locals-prop-line
-  Instead of adding variable/value pairs by hand, you can use the
-command @kbd{M-x add-file-local-variable-prop-line}.  This prompts for
+  You can use the command @kbd{M-x add-file-local-variable-prop-line}
+instead of adding entries by hand.  It prompts for
 a variable and value, and adds them to the first line in the
 appropriate way.  @kbd{M-x delete-file-local-variable-prop-line}
 prompts for a variable, and deletes its entry from the line.  @kbd{M-x
@@ -1522,7 +1522,7 @@ circumstances.
 @vindex minibuffer-local-completion-map
 @vindex minibuffer-local-must-match-map
 @vindex minibuffer-local-filename-completion-map
-@vindex minibuffer-local-must-match-filename-map
+@vindex minibuffer-local-filename-must-match-map
   The minibuffer has its own set of local keymaps; they contain various
 completion and exit commands.
 
@@ -1539,7 +1539,7 @@ just like @key{RET}.
 for cautious completion.
 @item
 @code{minibuffer-local-filename-completion-map} and
-@code{minibuffer-local-must-match-filename-map} are like the two
+@code{minibuffer-local-filename-must-match-map} are like the two
 previous ones, but they are specifically for file name completion.
 They do not bind @key{SPC}.
 @end itemize

doc/emacs/display.texi

@@ -260,14 +260,11 @@ placed from the top margin of the window; thus, as with
   These two variables are ignored if either @code{scroll-step} or
 @code{scroll-conservatively} are set to a non-zero value.
 
-  Note that @code{scroll-margin}, described below, limits the amount
-of scrolling so as to put point outside of the top or bottom margin,
-even if aggressive scrolling specifies a fraction @var{f} that is
-larger than the window portion between the top and the bottom margins.
-
 @vindex scroll-margin
   The variable @code{scroll-margin} restricts how close point can come
-to the top or bottom of a window.  Its value is a number of screen
+to the top or bottom of a window (even if aggressive scrolling
+specifies a fraction @var{f} that is larger than the window portion
+between the top and the bottom margins).  Its value is a number of screen
 lines; if point comes within that many lines of the top or bottom of
 the window, Emacs performs automatic scrolling.  By default,
 @code{scroll-margin} is 0.

doc/emacs/emacs.texi

@@ -3,12 +3,27 @@
 @setfilename ../../info/emacs
 @settitle GNU Emacs Manual
 
-@c The edition number appears in several places in this file
+@c The edition number appears in more than one place in this file
+@c I don't really know what it means...
+@c For example, it has said "Sixteenth" since sometime in the Emacs 22
+@c series, all through 23, and into 24.  So it is not very useful IMO,
+@c and offers nothing that EMACSVER does not.  I guess it relates
+@c mainly to the published book sold by the FSF.  Hence no longer
+@c bother including it except iftex.  Really, I think it should not be
+@c here at all (since anyone can make a pdf version), but should just
+@c be something added by the FSF during the publishing process.
+@c Also, the lispref uses a float (3.0), whereas this uses an ordinal,
+@c so the format is not even consistent.
 @set EDITION   Sixteenth
 @include emacsver.texi
 
 @copying
+@iftex
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@*
+@end iftex
+@ifnottex
+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.

doc/emacs/frames.texi

@@ -666,8 +666,8 @@ The font slant---normally @samp{r} (roman), @samp{i} (italic),
 Some font names support other values.
 @item widthtype
 The font width---normally @samp{normal}, @samp{condensed},
-@samp{extended}, or @samp{semicondensed} (some font names support
-other values).
+@samp{semicondensed}, or @samp{extended}.  Some font names support
+other values.
 @item style
 An optional additional style name.  Usually it is empty---most XLFDs
 have two hyphens in a row at this point.

doc/emacs/maintaining.texi

@@ -893,7 +893,7 @@ Display the change history for the current repository
 (@code{vc-print-root-log}).
 
 @item C-x v I
-Display the changes that will be received with a pull operation
+Display the changes that a pull operation will retrieve
 (@code{vc-log-incoming}).
 
 @item C-x v O

doc/emacs/misc.texi

@@ -2481,8 +2481,8 @@ find the one you select (@code{ffap-menu}).
 
 @findex animate-birthday-present
 @cindex animate
-  The @code{animate} package makes text dance.  For an example, try
-@kbd{M-x animate-birthday-present}.
+  The @code{animate} package makes text dance (e.g. try
+@kbd{M-x animate-birthday-present}).
 
 @findex blackbox
 @findex mpuz

doc/emacs/mule.texi

@@ -350,7 +350,7 @@ to the Emacs session.  The supported language environments
 @cindex Euro sign
 @cindex UTF-8
 @quotation
-ASCII, Belarusian, Bengali, Brazilian Portuguese, Bulgarian,
+ASCII, Belarusian, Bengali, Brazilian Portuguese, Bulgarian, Cham,
 Chinese-BIG5, Chinese-CNS, Chinese-EUC-TW, Chinese-GB, Chinese-GBK,
 Chinese-GB18030, Croatian, Cyrillic-ALT, Cyrillic-ISO, Cyrillic-KOI8,
 Czech, Devanagari, Dutch, English, Esperanto, Ethiopic, French,

doc/emacs/search.texi

@@ -456,7 +456,7 @@ apply to the lazy highlight, which always matches whole words.
 @cindex search for a regular expression
 
   A @dfn{regular expression} (or @dfn{regexp} for short) is a pattern
-that denotes a class of alternative strings to match.  GNU Emacs
+that denotes a class of alternative strings to match.  Emacs
 provides both incremental and nonincremental ways to search for a
 match for a regexp.  The syntax of regular expressions is explained in
 the next section.

doc/emacs/xresources.texi

@@ -47,7 +47,7 @@ its own list of resources; to update it, use the command
 @command{xrdb}---for instance, @samp{xrdb ~/.Xdefaults}.
 
 @cindex registry, setting resources (MS-Windows)
-  (MS-Windows systems do not support X resource files; on Windows,
+  (MS-Windows systems do not support X resource files; on such systems,
 Emacs looks for X resources in the Windows Registry, first under the
 key @samp{HKEY_CURRENT_USER\SOFTWARE\GNU\Emacs}, which affects only
 the current user and override the system-wide settings, and then under

doc/lispintro/ChangeLog

+2012-05-02  Glenn Morris  <rgm@gnu.org>
+
+	* emacs-lisp-intro.texi (Syntax): Reword to avoid underfull hbox.
+
 2012-04-14  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in: Replace non-portable use of $< in ordinary rules.
@@ -498,7 +502,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2001-2012  Free Software Foundation, Inc.
+  Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 

doc/lispintro/emacs-lisp-intro.texi

@@ -1084,6 +1084,14 @@ Robert J. Chassell
 \fi
 @end tex
+@c Note: this resetting of the page number back to 1 causes TeX to gripe
+@c about already having seen page numbers 1-4 before (in the preface):
+@c   pdfTeX warning (ext4): destination with the same identifier (name{1})
+@c   has been already used, duplicate ignored
+@c I guess that is harmless (what happens if a later part of the text
+@c makes a link to something in the first 4 pages though?).
+@c Note that eg the Emacs manual has a preface, but does not bother
+@c resetting the page numbers back to 1 after that.
 @iftex
 @headings off
 @evenheading @thispage @| @| @thischapter
@@ -14855,7 +14863,7 @@ action would serve our purpose, except that a hyphen is merely the
 most common character within symbols that is not typically a word
 constituent character; there are others, too.
-Alternatively, we can redefine the regular expression used in the
+Alternatively, we can redefine the regexp used in the
 @code{@value{COUNT-WORDS}} definition so as to include symbols.  This
 procedure has the merit of clarity, but the task is a little tricky.

doc/lispref/ChangeLog

+2012-05-02  Glenn Morris  <rgm@gnu.org>
+
+	* elisp.texi (@copying):
+	* intro.texi (Introduction): Only print VERSION in the TeX version.
+
+2012-05-02  Chong Yidong  <cyd@gnu.org>
+
+	* text.texi (Change Hooks): Minor fix for after-change-functions.
+
+2012-05-02  Glenn Morris  <rgm@gnu.org>
+
+	* package.texi (Packaging Basics):
+	* loading.texi (Autoload):
+	* files.texi (Magic File Names):
+	Reword to remove/reduce some overly long/short lines.
+
 2012-04-27  Glenn Morris  <rgm@gnu.org>
 
 	* elisp.texi, vol1.texi, vol2.texi: Some fixes for detailed menu.

doc/lispref/elisp.texi

@@ -6,6 +6,7 @@
 
 @c Version of the manual and of Emacs.
 @c Please remember to update these in vol1.texi and vol2.texi as well.
+@c (See comments for EDITION in emacs.texi)
 @set VERSION  3.1
 @include emacsver.texi
 @set DATE July 2012
@@ -40,7 +41,12 @@
 @c @syncodeindex tp fn
 
 @copying
-This is edition @value{VERSION} of the GNU Emacs Lisp Reference Manual,@*
+@iftex
+This is edition @value{VERSION} of the @cite{GNU Emacs Lisp Reference Manual},@*
+@end iftex
+@ifnottex
+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.