diff man/texinfo.tex @ 81778:cd3e38bb3dc7

Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 51-54) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 233-234) - Merge from emacs--devo--0 - Update from CVS 2007-07-08 Katsumi Yamaoka <[e-mail]> * lisp/cus-start.el (file-coding-system-alist): Fix custom type. 2007-07-08 Chong Yidong <[e-mail]> * lisp/longlines.el (longlines-wrap-region): Avoid marking buffer as modified. (longlines-auto-wrap, longlines-window-change-function): Remove unnecessary calls to set-buffer-modified-p. 2007-07-03 Dan Nicolaescu <[e-mail]> * lisp/progmodes/gud.el (auto-mode-alist): Match more valid gdb init file names. 2007-07-01 Richard Stallman <[e-mail]> * lisp/files.el (find-file-visit-truename): Fix safe-local-variable value. 2007-07-04 Katsumi Yamaoka <[e-mail]> * lisp/gnus/gnus-sum.el (gnus-summary-catchup): Don't recognize cached articles as unfetched articles. 2007-07-02 Reiner Steib <[e-mail]> * lisp/gnus/gnus-start.el (gnus-level-unsubscribed): Improve doc string. 2007-06-26 Katsumi Yamaoka <[e-mail]> * lisp/gnus/gnus-art.el (gnus-article-summary-command-nosave) (gnus-article-read-summary-keys): Don't set the 3rd arg of pop-to-buffer for XEmacs. 2007-07-02 Reiner Steib <[e-mail]> * man/gnus-faq.texi ([3.2]): Fix locating of environment variables in the Control Panel. * man/gnus.texi (Misc Article): Add index entry for gnus-single-article-buffer. 2007-06-27 Andreas Seltenreich <[e-mail]> * man/gnus.texi (Starting Up): Fix typo. 2007-06-25 Katsumi Yamaoka <[e-mail]> * man/gnus.texi (Asynchronous Fetching): Fix typo. Revision: [e-mail]/emacs--devo--0--patch-806

--- a/man/texinfo.tex	Mon Jul 09 20:49:25 2007 +0000
+++ b/man/texinfo.tex	Tue Jul 10 02:02:35 2007 +0000
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2007-06-16.10}
+\def\texinfoversion{2007-07-09.21}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -7434,22 +7434,41 @@
 
 % @documentlanguage is usually given very early, just after
 % @setfilename.  If done too late, it may not override everything
-% properly.  Single argument is the language abbreviation.
-% It would be nice if we could set up a hyphenation file here.
-%
-\parseargdef\documentlanguage{%
+% properly.  Single argument is the language (de) or locale (de_DE)
+% abbreviation.  It would be nice if we could set up a hyphenation file.
+%
+{
+  \catcode`\_ = \active
+  \globaldefs=1
+\parseargdef\documentlanguage{\begingroup
+  \let_=\normalunderscore  % normal _ character for filenames
   \tex % read txi-??.tex file in plain TeX.
-    % Read the file if it exists.
+    % Read the file by the name they passed if it exists.
     \openin 1 txi-#1.tex
     \ifeof 1
-      \errhelp = \nolanghelp
-      \errmessage{Cannot read language file txi-#1.tex}%
+      \documentlanguagetrywithoutunderscore{#1_\finish}%
     \else
       \input txi-#1.tex
     \fi
     \closein 1
   \endgroup
-}
+\endgroup}
+}
+%
+% If they passed de_DE, and txi-de_DE.tex doesn't exist,
+% try txi-de.tex.
+% 
+\def\documentlanguagetrywithoutunderscore#1_#2\finish{%
+  \openin 1 txi-#1.tex
+  \ifeof 1
+    \errhelp = \nolanghelp
+    \errmessage{Cannot read language file txi-#1.tex}%
+  \else
+    \input txi-#1.tex
+  \fi
+  \closein 1
+}
+%
 \newhelp\nolanghelp{The given language definition file cannot be found or
 is empty.  Maybe you need to install it?  In the current directory
 should work if nowhere else does.}
@@ -8316,6 +8335,8 @@
   \ifpdf
     \pdfpageheight #7\relax
     \pdfpagewidth #8\relax
+    \pdfhorigin = 1 true in
+    \pdfvorigin = 1 true in
   \fi
   %
   \setleading{\textleading}