Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 857-865)

   - Update from CVS
   - Merge from emacs--rel--22
   - Update from CVS: lisp/emacs-lisp/avl-tree.el: New file.
   - Remove RCS keywords

 * emacs--rel--22  (patch 97-100)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 246-247)

   - Update from CVS

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

ChangeLog

@@ -1,3 +1,23 @@
+2007-08-24  Glenn Morris  <rgm@gnu.org>
+
+	* configure.in: Check for a suitably recent makeinfo.
+
+2007-08-23  Johannes Weiner  <hannes@saeurebad.de>  (tiny change)
+
+	* configure.in (Check for required libraries): Typo.
+
+2007-08-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* configure.in: Check librsvg2 also for Mac Carbon.
+
+2007-08-22  Romain Francoise  <romain@orebokech.com>
+
+	* make-dist: Follow reorganization of files in etc/.
+
+2007-08-22  Paul Pogonyshev  <pogonyshev@gmx.net>
+
+	* configure.in: Add support for SVG images through librsvg2.
+
 2007-07-28  Eli Zaretskii  <eliz@gnu.org>
 
 	* Makefile.in (install-arch-indep): Use "rm -f" for removing DOC,

README

@@ -76,7 +76,7 @@ There are several subdirectories:
 `man'       holds the source code for the Emacs Manual.  If you modify the
             manual sources, you will need the `makeinfo' program to produce
             an updated manual.  `makeinfo' is part of the GNU Texinfo
-            package; you need version 4.2 or later of Texinfo.
+            package; you need version 4.6 or later of Texinfo.
 `lispref'   holds the source code for the Emacs Lisp reference manual.
 `lispintro' holds the source code for the Introduction to Programming
             in Emacs Lisp manual.

admin/ChangeLog

@@ -1,3 +1,7 @@
+2007-08-28  Glenn Morris  <rgm@gnu.org>
+
+	* admin.el: Provide self.
+
 2007-08-10  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* FOR-RELEASE (http): Add Gtk+ tool bar and GUD focus problem.

admin/FOR-RELEASE

@@ -38,6 +38,13 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 ** henman@it.to-be.co.jp 09 Aug 2006: ispell.el problem on Cygwin.
   (Did we decide that is unreproducible?)
 
+** set-frame-size for frame without minibuffer loses mode line
+Probably a Windows only bug.  Reported by Drew Adams on bug-gnu-emacs on
+2007-08-07.  It seems that the bug manifests itself only if resizing the
+frame makes the menu bar wrap before.  On 2007-08-16 Glenn Morris
+reported on emacs-devel that he was not able to reproduce the bug on a
+GNU/Linux system.
+
 * BUGS
 
 NB the definitive copy of this file for Emacs 22 is on the
@@ -52,14 +59,9 @@ won't lose on USG or HPUX systems.
 
 * FIXES FOR EMACS 22.3
 
-Here we list small fixes that arrived too late for Emacs 22.2, but
+Here we list any small fixes that arrived too late for Emacs 22.2, but
 that should be installed on the release branch after 22.2 is released.
 
-** bojohan+news@dd.chalmers.se, 1 Aug: n_schumacher@web.de: modification hooks called only once in
-Fix is on the trunk: 2007-08-13 change to insdel.c by Stefan Monnier.
-http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00457.html
-
-
 * DOCUMENTATION
 
 ** Check the Emacs Tutorial.

admin/admin.el

@@ -205,5 +205,7 @@ Root must be the root of an Emacs source tree."
                               ?\" (0+ space)
                               "/* Long version number */")))))
 
+(provide 'admin)
+
 ;;; arch-tag: 4ea83636-2293-408b-884e-ad64f22a3bf5
 ;; admin.el ends here.

admin/notes/lel-TODO

@@ -0,0 +1,107 @@
+Some lisp/emacs-lisp/ Features and Where They Are Documented
+Copyright (C) 2007 Free Software Foundation, Inc.
+
+
+* Status Key
+  -      -- as yet unknown
+  n/a    -- not applicable (internal, uninteresting, etc)
+  todo   -- not documented but should be
+  "NODE" -- documented in or under info node NODE
+
+
+* Features
+  advice                  -
+  advice-preload          n/a
+  assoc                   -
+  authors                 -
+  autoload                -
+  avl-tree                -
+  backquote               n/a
+  benchmark               -
+  bindat                  "(elisp) Byte Packing"
+  byte-compile            -
+  byte-opt                -
+  bytecomp                -
+  checkdoc                -
+  cl                      "(cl)"
+  cl-19                   n/a
+  cl-compat               n/a
+  cl-specs                n/a
+  copyright               -
+  crm                     -
+  cust-print              -
+  debug                   -
+  derived                 -
+  disass                  -
+  easy-mmode              -
+  easymenu                -
+  edebug                  -
+  eldoc                   -
+  elint                   -
+  elp                     -
+  ewoc                    "(elisp) Separated Rendering"
+  find-func               -
+  find-gc                 -
+  generic                 -
+  gulp                    n/a
+  helper                  -
+  levents                 -
+  lisp-float-type         -
+  lisp-mnt                -
+  lisp-mode               -
+  lmenu                   -
+  lselect                 -
+  lucid                   -
+  macroexp                -
+  pp                      -
+  re-builder              -
+  regexp-opt              -
+  regi                    -
+  ring                    "(elisp) Rings"
+  rx                      -
+  shadow                  -
+  sregex                  -
+  syntax                  -
+  testcover               -
+  timer                   -
+  tq                      "(elisp) Transaction Queues"
+  trace                   -
+  unsafep                 -
+  warnings                -
+
+
+* Above list created using default directory lisp/emacs-lisp/ with
+  (shell-command
+    "sed '/^(provide '\\''/!d;s//  /;s/).*//' *.el | sort | uniq")
+
+
+* How to use this file to improve Emacs
+  (loop
+   (let* ((feature (choose-one Features))
+          (status (feature-status feature)))
+     (if (or (eq '- status) (not (verify status)))
+         (update feature (current-docs feature))
+       (case status
+         (todo (let (doc patch feedback)
+                 (while (not (grok feature))
+                   (or (play-with feature)
+                       (grep feature Internet)
+                       (grep feature (wisdom-maybe "emacs-devel"))))
+                 (setq doc (write-documentation feature)
+                       patch (diff (current-docs) doc))
+                 (while (not (and (correct doc)
+                                  (well-placed doc)
+                                  (well-formed patch)))
+                   (setq doc (revise doc)
+                         patch (diff (current-docs) doc))
+                         feedback (wisdom-maybe "emacs-devel" patch))
+                 (when (install patch)
+                   (when (update feature (current-docs feature))
+                     (job-well-done user-login-name)))))
+         (n/a (job-well-done user-login-name))))))
+
+
+* Etc
+  Local variables:
+  mode: outline
+  End:

configure

@@ -679,6 +679,7 @@ INSTALL_DATA
 RANLIB
 INSTALL_INFO
 GZIP_PROG
+MAKEINFO
 LIBSOUND
 PKG_CONFIG
 ALSA_CFLAGS
@@ -687,6 +688,8 @@ CFLAGS_SOUND
 SET_MAKE
 XMKMF
 HAVE_XSERVER
+RSVG_CFLAGS
+RSVG_LIBS
 GTK_CFLAGS
 GTK_LIBS
 XFT_CFLAGS
@@ -1351,8 +1354,9 @@ Optional Packages:
   --with-freetype         use -lfreetype for local fonts support
   --with-xft              use -lXft for anti aliased fonts
   --with-gpm              use -lgpm for mouse support on a GNU/Linux console
+  --with-rsvg             use -lrsvg-2 for displaying SVG images
   --with-gtk              use GTK (same as --with-x-toolkit=gtk)
-  --with-pkg-config-prog  Path to pkg-config to use for finding GTK
+  --with-pkg-config-prog  Path to pkg-config to use for finding GTK and librsvg
   --without-toolkit-scroll-bars
                           don't use Motif or Xaw3d scroll bars
   --without-xim           don't use X11 XIM
@@ -1971,6 +1975,12 @@ if test "${with_gpm+set}" = set; then
 fi
 
 
+# Check whether --with-rsvg was given.
+if test "${with_rsvg+set}" = set; then
+  withval=$with_rsvg;
+fi
+
+
 # Check whether --with-gtk was given.
 if test "${with_gtk+set}" = set; then
   withval=$with_gtk;
@@ -5351,6 +5361,61 @@ fi
 
 
 
+## Need makeinfo >= 4.6 (?) to build the manuals.
+# Extract the first word of "makeinfo", so it can be a program name with args.
+set dummy makeinfo; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_MAKEINFO+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $MAKEINFO in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MAKEINFO="$MAKEINFO" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_MAKEINFO="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_MAKEINFO" && ac_cv_path_MAKEINFO="no"
+  ;;
+esac
+fi
+MAKEINFO=$ac_cv_path_MAKEINFO
+if test -n "$MAKEINFO"; then
+  { echo "$as_me:$LINENO: result: $MAKEINFO" >&5
+echo "${ECHO_T}$MAKEINFO" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+if test "$MAKEINFO" != "no" && \
+  test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[^0-9]*([5-9]|4\.[6-9])'`" = x; then
+   MAKEINFO=no
+fi
+
+if test "$MAKEINFO" = "no"; then
+  { { echo "$as_me:$LINENO: error: makeinfo >= 4.6 is required " >&5
+echo "$as_me: error: makeinfo >= 4.6 is required " >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
 if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x
 then
   ac_link="$ac_link $GCC_LINK_TEST_OPTIONS"
@@ -11098,6 +11163,130 @@ echo "${ECHO_T}before 5" >&6; }
   fi
 fi
 
+### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified.
+HAVE_RSVG=no
+if test "${HAVE_X11}" = "yes" || test "${HAVE_CARBON}" = "yes"; then
+  if test "${with_rsvg}" != "no"; then
+        if test "X${with_pkg_config_prog}" != X; then
+      PKG_CONFIG="${with_pkg_config_prog}"
+    fi
+
+    RSVG_REQUIRED=2.0.0
+    RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED"
+
+
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     :
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        { echo "$as_me:$LINENO: checking for $RSVG_MODULE" >&5
+echo $ECHO_N "checking for $RSVG_MODULE... $ECHO_C" >&6; }
+
+        if $PKG_CONFIG --exists "$RSVG_MODULE" 2>&5; then
+            { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+            succeeded=yes
+
+            { echo "$as_me:$LINENO: checking RSVG_CFLAGS" >&5
+echo $ECHO_N "checking RSVG_CFLAGS... $ECHO_C" >&6; }
+            RSVG_CFLAGS=`$PKG_CONFIG --cflags "$RSVG_MODULE"|sed -e 's,///*,/,g'`
+            { echo "$as_me:$LINENO: result: $RSVG_CFLAGS" >&5
+echo "${ECHO_T}$RSVG_CFLAGS" >&6; }
+
+            { echo "$as_me:$LINENO: checking RSVG_LIBS" >&5
+echo $ECHO_N "checking RSVG_LIBS... $ECHO_C" >&6; }
+            RSVG_LIBS=`$PKG_CONFIG --libs "$RSVG_MODULE"|sed -e 's,///*,/,g'`
+            { echo "$as_me:$LINENO: result: $RSVG_LIBS" >&5
+echo "${ECHO_T}$RSVG_LIBS" >&6; }
+        else
+            { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+            RSVG_CFLAGS=""
+            RSVG_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            RSVG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$RSVG_MODULE"`
+
+        fi
+
+
+
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     :
+  else
+     :
+  fi
+
+
+
+
+    if test ".${RSVG_CFLAGS}" != "."; then
+      HAVE_RSVG=yes
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_RSVG 1
+_ACEOF
+
+      CFLAGS="$CFLAGS $RSVG_CFLAGS"
+      LIBS="$RSVG_LIBS $LIBS"
+    fi
+  fi
+fi
+
+
 HAVE_GTK=no
 if test "${with_gtk}" = "yes" && test "$USE_X_TOOLKIT" = "gtk"; then
   USE_X_TOOLKIT=none
@@ -14510,13 +14699,13 @@ if test "${HAVE_X11}" = "yes"; then
     MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no"
 
   if test "X${MISSING}" != X; then
-    { { echo "$as_me:$LINENO: error: The following required libraries was not found:
+    { { echo "$as_me:$LINENO: error: The following required libraries were not found:
     $MISSING
 Maybe some development libraries/packages are missing?
 If you don't want to link with them give
     $WITH_NO
 as options to configure" >&5
-echo "$as_me: error: The following required libraries was not found:
+echo "$as_me: error: The following required libraries were not found:
     $MISSING
 Maybe some development libraries/packages are missing?
 If you don't want to link with them give
@@ -23904,6 +24093,7 @@ echo "  Does Emacs use -ljpeg?                                  ${HAVE_JPEG}"
 echo "  Does Emacs use -ltiff?                                  ${HAVE_TIFF}"
 echo "  Does Emacs use a gif library?                           ${HAVE_GIF} $ac_gif_lib_name"
 echo "  Does Emacs use -lpng?                                   ${HAVE_PNG}"
+echo "  Does Emacs use -lrsvg-2?                                ${HAVE_RSVG}"
 echo "  Does Emacs use -lgpm?                                   ${HAVE_GPM}"
 echo "  Does Emacs use X toolkit scroll bars?                   ${USE_TOOLKIT_SCROLL_BARS}"
 echo
@@ -24657,6 +24847,7 @@ INSTALL_DATA!$INSTALL_DATA$ac_delim
 RANLIB!$RANLIB$ac_delim
 INSTALL_INFO!$INSTALL_INFO$ac_delim
 GZIP_PROG!$GZIP_PROG$ac_delim
+MAKEINFO!$MAKEINFO$ac_delim
 LIBSOUND!$LIBSOUND$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
 ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim
@@ -24665,6 +24856,8 @@ CFLAGS_SOUND!$CFLAGS_SOUND$ac_delim
 SET_MAKE!$SET_MAKE$ac_delim
 XMKMF!$XMKMF$ac_delim
 HAVE_XSERVER!$HAVE_XSERVER$ac_delim
+RSVG_CFLAGS!$RSVG_CFLAGS$ac_delim
+RSVG_LIBS!$RSVG_LIBS$ac_delim
 GTK_CFLAGS!$GTK_CFLAGS$ac_delim
 GTK_LIBS!$GTK_LIBS$ac_delim
 XFT_CFLAGS!$XFT_CFLAGS$ac_delim
@@ -24688,9 +24881,6 @@ version!$version$ac_delim
 configuration!$configuration$ac_delim
 canonical!$canonical$ac_delim
 srcdir!$srcdir$ac_delim
-lispdir!$lispdir$ac_delim
-locallisppath!$locallisppath$ac_delim
-lisppath!$lisppath$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -24732,6 +24922,9 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+lispdir!$lispdir$ac_delim
+locallisppath!$locallisppath$ac_delim
+lisppath!$lisppath$ac_delim
 x_default_search_path!$x_default_search_path$ac_delim
 etcdir!$etcdir$ac_delim
 archlibdir!$archlibdir$ac_delim
@@ -24750,7 +24943,7 @@ carbon_appdir!$carbon_appdir$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 16; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

configure.in

@@ -114,10 +114,12 @@ AC_ARG_WITH(xft,
 [  --with-xft              use -lXft for anti aliased fonts])
 AC_ARG_WITH(gpm,
 [  --with-gpm              use -lgpm for mouse support on a GNU/Linux console])
+AC_ARG_WITH(rsvg,
+[  --with-rsvg             use -lrsvg-2 for displaying SVG images])
 AC_ARG_WITH(gtk,
 [  --with-gtk              use GTK (same as --with-x-toolkit=gtk)])
 AC_ARG_WITH(pkg-config-prog,
-[  --with-pkg-config-prog  Path to pkg-config to use for finding GTK])
+[  --with-pkg-config-prog  Path to pkg-config to use for finding GTK and librsvg])
 AC_ARG_WITH(toolkit-scroll-bars,
 [  --without-toolkit-scroll-bars
                           don't use Motif or Xaw3d scroll bars])
@@ -1350,6 +1352,21 @@ AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin)
 dnl Don't use GZIP, which is used by gzip for additional parameters.
 AC_PATH_PROG(GZIP_PROG, gzip)
 
+
+## Need makeinfo >= 4.6 (?) to build the manuals.
+AC_PATH_PROG(MAKEINFO, makeinfo, no)
+dnl By this stage, configure has already checked for egrep and set EGREP, 
+dnl or exited with an error if no egrep was found.
+if test "$MAKEINFO" != "no" && \
+  test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[[^0-9]]*([[5-9]]|4\.[[6-9]])'`" = x; then
+   MAKEINFO=no    
+fi
+
+if test "$MAKEINFO" = "no"; then
+  AC_MSG_ERROR( [makeinfo >= 4.6 is required] )
+fi
+
+
 dnl Add our options to ac_link now, after it is set up.
 
 if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x
@@ -2131,6 +2148,32 @@ fail;
   fi
 fi
 
+### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified.
+HAVE_RSVG=no
+if test "${HAVE_X11}" = "yes" || test "${HAVE_CARBON}" = "yes"; then
+  if test "${with_rsvg}" != "no"; then
+    dnl Check if `--with-pkg-config-prog' has been given.
+    if test "X${with_pkg_config_prog}" != X; then
+      PKG_CONFIG="${with_pkg_config_prog}"
+    fi
+
+    RSVG_REQUIRED=2.0.0
+    RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED"
+
+    PKG_CHECK_MODULES(RSVG, $RSVG_MODULE, :, :)
+    AC_SUBST(RSVG_CFLAGS)
+    AC_SUBST(RSVG_LIBS)
+
+    if test ".${RSVG_CFLAGS}" != "."; then
+      HAVE_RSVG=yes
+      AC_DEFINE(HAVE_RSVG, 1, [Define to 1 if using librsvg.])
+      CFLAGS="$CFLAGS $RSVG_CFLAGS"
+      LIBS="$RSVG_LIBS $LIBS"
+    fi
+  fi
+fi
+
+
 HAVE_GTK=no
 if test "${with_gtk}" = "yes" && test "$USE_X_TOOLKIT" = "gtk"; then
   USE_X_TOOLKIT=none
@@ -2646,7 +2689,7 @@ if test "${HAVE_X11}" = "yes"; then
     MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no"
 
   if test "X${MISSING}" != X; then
-    AC_MSG_ERROR([The following required libraries was not found:
+    AC_MSG_ERROR([The following required libraries were not found:
     $MISSING
 Maybe some development libraries/packages are missing?
 If you don't want to link with them give
@@ -3427,6 +3470,7 @@ echo "  Does Emacs use -ljpeg?                                  ${HAVE_JPEG}"
 echo "  Does Emacs use -ltiff?                                  ${HAVE_TIFF}"
 echo "  Does Emacs use a gif library?                           ${HAVE_GIF} $ac_gif_lib_name"
 echo "  Does Emacs use -lpng?                                   ${HAVE_PNG}"
+echo "  Does Emacs use -lrsvg-2?                                ${HAVE_RSVG}"
 echo "  Does Emacs use -lgpm?                                   ${HAVE_GPM}"
 echo "  Does Emacs use X toolkit scroll bars?                   ${USE_TOOLKIT_SCROLL_BARS}"
 echo

etc/ChangeLog

@@ -1,3 +1,99 @@
+2007-08-28  Werner LEMBERG  <wl@gnu.org>
+
+	* refcards/de-refcard.tex, refcards/de-refcard.pdf: Use `C-M-%'
+	instead of `M-x query-replace-regexp'.
+
+2007-08-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* PROBLEMS (Mac OS X): Add alternative workaround for QuickTime
+	updater breakage.
+
+2007-08-26  Micha,Ak(Bl Cadilhac  <michael@cadilhac.name>
+
+	* NEWS: Say that PDF files are now the default for refcards.
+
+	* fr-drdref.tex, fr-drdref.pdf: Move these to...
+	* fr-dired-ref.tex, fr-dired-ref.pdf: ... those names.
+
+	* refcards/pdflayout.sty: New.  Handle PDF layouts through
+	\pdfpagewidth and \pdfpageheight.
+
+	* calccard.pdf, cs-dired-ref.pdf, cs-refcard.pdf, de-refcard.pdf:
+	* dired-ref.pdf, fr-drdref.pdf, fr-refcard.pdf, gnus-booklet.pdf:
+	* gnus-logo.pdf, gnus-refcard.pdf, orgcard.pdf, pl-refcard.pdf:
+	* pt-br-refcard.pdf, refcard.pdf, ru-refcard.pdf, sk-dired-ref.pdf:
+	* sk-refcard.pdf: Add PDF versions of the refcards.
+
+	* calccard.ps, cs-dired-ref.ps, cs-refcard.ps, de-refcard.ps:
+	* dired-ref.ps, fr-drdref.ps, fr-refcard.ps, gnus-booklet.ps:
+	* gnus-logo.ps, gnus-refcard.ps, orgcard.ps, pl-refcard.ps:
+	* pt-br-refcard.ps, refcard.ps, ru-refcard.ps, sk-dired-ref.ps:
+	* sk-refcard.ps: Remove the PS versions of the refcards.
+
+	* calccard.tex, fr-survival.tex, orgcard.tex, pl-refcard.tex:
+	* pt-br-refcard.tex, refcard.tex, survival.tex, vipcard.tex:
+	* viperCard.tex: Specify PDF layout, use a PDF `compile-command' local
+	variable.
+
+	* cs-dired-ref.tex, cs-refcard.tex, cs-survival.tex, dired-ref.tex:
+	* fr-drdref.tex, sk-dired-ref.tex, sk-refcard.tex, sk-survival.tex:
+	Specify PDF layout.
+
+	* fr-refcard.tex: Update copyright notice.  Update the examples.  Fix a
+	typo.  Remove the `letterpaper' counter, specify PDF layout, use a PDF
+	`compile-command' local variable.
+
+	* de-refcard.tex: Remove the `letterpaper' counter, specify PDF layout,
+	use a PDF `compile-command' local variable.
+
+	* ru-refcard.tex: Use a PDF `compile-command' local variable.
+
+	* Makefile: Add rules for creating the refcards in PDF, make them the
+	default.  Change `fr-drdref' to `fr-dired-ref'.
+
+2007-08-23  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile (mostlyclean, clean, distclean, maintainer-clean):
+	Delete these targets since nothing uses them.
+	(SOURCES): Update.
+	Move comments to e/README.  Remove license from now-trivial file.
+
+	* e/README: New file, with most information formerly in Makefile.
+
+2007-08-22  Karl Berry  <karl@gnu.org>
+
+	* refcard.tex: updates for printing.
+        (\versionyear): update to 2007.
+	(\copyrightnotice): modified or unmodified ok.
+	(Simple Customization): don't use goto-line, since now it's bound.
+^	Also, use now-preferred (kbd ...) syntax.
+
+2007-08-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	* NEWS: `shell' prompts for the default directory if called with a
+	prefix and `default-directory' is a remote file name.
+
+2007-08-22  Carsten Dominik  <dominik@science.uva.nl>
+
+	* orgcard.tex: Version number upgrade.
+
+2007-08-22  Glenn Morris  <rgm@gnu.org>
+
+	* tree-widget: Move this directory into images/ subdirectory.
+
+	* refcards/: New directory.  Move refcards here.
+	* Makefile: Move refcard rules from here...
+	* refcards/Makefile: ...to here.
+	* README: Move information about tex files from here...
+	* refcards/README: ...to here.
+
+	* tutorials/: New directory. Move TUTORIAL* here.
+
+	* gnus.pbm, letter.pbm, letter.xpm:
+	* splash.pbm, splash.xpm, splash8.xpm: Move from etc/ to etc/images/.
+	* README: Move license information for the above files from here...
+	* images/README: ...to here.
+
 2007-08-14  Glenn Morris  <rgm@gnu.org>
 
 	* NEWS: Mention `bad-packages-alist'.

etc/Makefile

@@ -1,110 +1,11 @@
-### Makefile for Emacs etc/ directory
+### Makefile for Emacs etc/ directory.
 
-## Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
-##   2007 Free Software Foundation, Inc.
+.PHONY: unlock relock
 
-## This file is part of GNU Emacs.
-
-## GNU Emacs is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3, or (at your option)
-## any later version.
-
-## GNU Emacs is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with GNU Emacs; see the file COPYING.  If not, write to the
-## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-## Boston, MA 02110-1301, USA.
-
-
-## Top-level targets.
-
-## PS files included with Emacs.
-all: refcards dired-refcards misc-refcards
-
-
-refcards: refcard.ps cs-refcard.ps de-refcard.ps fr-refcard.ps \
-          pl-refcard.ps pt-br-refcard.ps ru-refcard.ps sk-refcard.ps
-
-dired-refcards: dired-ref.ps cs-dired-ref.ps fr-drdref.ps sk-dired-ref.ps
-
-## No PS files: vipcard.tex viperCard.tex survival.tex sk-survival.tex
-misc-refcards: calccard.ps gnus-booklet.ps gnus-refcard.ps orgcard.ps
-
-## Following PS files are not included with Emacs.
-survival-cards: survival.ps cs-survival.ps sk-survival.ps
-
-viper-cards: vipcard.ps viperCard.ps
-
-
-## dvi files.
-
-## FIXME the sk-*.tex files say to use csplain, but were not
-## traditionally in this rule. Fix the doc or the rule.
-cs-refcard.dvi cs-dired-ref.dvi cs-survival.dvi: %.dvi:	%.tex
-	csplain $<
-
-pl-refcard.dvi: %.dvi: %.tex
-	if ! kpsewhich -format=fmt mex > /dev/null; then \
-	  echo "No mex format found."; false; \
-	fi
-	tex $<
-
-ru-refcard.dvi gnus-refcard.dvi: %.dvi: %.tex
-	latex $<
-
-gnus-booklet.dvi: gnus-refcard.tex
-	latex '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
-	mv gnus-refcard.dvi $@
-
-## Everything not explicitly listed above.
-%.dvi: %.tex
-	tex $<
-
-
-## PostScript files.
-
-## Note that some of the tex files (refcard, de-refcard, fr-refcard,
-## pt-br-refcard) have settings for letter or a4 paper. Following are
-## the default paper sizes (letter for English, A4 for translations).
-## FIXME orgcard.ps does not fit on letter (see orgcard.tex).
-
-## A4, landscape.
-de-refcard.ps fr-refcard.ps pt-br-refcard.ps orgcard.ps: %.ps: %.dvi
-	dvips -t a4 -t landscape $< -o $@
-
-## A4, portrait.
-cs-dired-ref.ps cs-refcard.ps cs-survival.ps fr-drdref.ps \
-pl-refcard.ps ru-refcard.ps \
-sk-dired-ref.ps sk-refcard.ps sk-survival.ps: %.ps: %.dvi
-	dvips -t a4 $< -o $@
-
-## letter, landscape.
-calccard.ps refcard.ps: %.ps: %.dvi
-	dvips -t letter -t landscape $< -o $@
-
-## letter, portrait.
-dired-ref.ps gnus-booklet.ps gnus-refcard.ps survival.ps vipcard.ps \
-viperCard.ps: %.ps: %.dvi
-	dvips -t letter $< -o $@
-
-
-.PHONY: mostlyclean clean distclean maintainer-clean unlock relock
-
-mostlyclean:
-	-rm -f *.dvi *.log
-
-## Note does not delete generated ps files.
-clean distclean maintainer-clean: mostlyclean
-	-rm -f DOC*
-
-
-SOURCES = [0-9A-QS-Z]* README *.[ch16] emacs.* ms-* \
-	spook-lines termcap.* *.tex
+## All non-directory files, if that matters.
+SOURCES = [A-Z]* *.* *-* e/* refcards/* tutorials/* \
+	images/README images/*.* images/*/README images/*/*.* \
+	images/*/*/README images/*/*/*.*
 
 unlock:
 	chmod u+w $(SOURCES)
@@ -112,15 +13,10 @@ unlock:
 relock:
 	chmod u-w $(SOURCES)
 
-# ${etcdir}/e/eterm-color is used by ../lisp/term.el.
-# TERMINFO systems use terminfo files compiled by the Terminfo Compiler (tic).
-# These files are binary, and depend on the version of tic, but they seem
-# to be system-independent and backwardly compatible.
-# So there should be no need to recompile the distributed binary version.
+## See e/README.
 TIC=tic
 e/eterm-color: e/eterm-color.ti
 	TERMINFO=`pwd`; export TERMINFO; $(TIC) e/eterm-color.ti
 
-
 ## arch-tag: 4261f003-cf77-4478-a10a-5284e9d8f797
 ### Makefile ends here

etc/NEWS

@@ -34,6 +34,10 @@ a GIF library.
 
 * Changes in Emacs 23.1
 
+** The refcards are now shipped as PDF files.
+
+** Emacs now supports the SVG image format through librsvg2.
+
 ** If you set find-file-confirm-nonexistent-file to t, then C-x C-f
 requires confirmation before opening a non-existent file.
 
@@ -48,11 +52,20 @@ recenter the visited source file.  Its value can be a number (for example,
 
 ** The mode-line display a `@' if the default-directory for the current buffer
 is on a remote machine, or a hyphen otherwise.
+
 ** The new command balance-window-area balances windows both vertically
 and horizontally.
 
 ** The new command close-display-connection can be used to close a connection
 to a remote display, e.g. because the display is about to become unreachable.
+
+** The command shell prompts for the default directory, when it is
+called with a prefix, and the default directory is a remote file name.
+This is because some file name handler (like ange-ftp) are not able to
+run processes remotely.
+
+** The new command `display-time-world' starts an updating time display
+using several time zones, in a buffer.
 
 * Startup Changes in Emacs 23.1
 
@@ -81,6 +94,8 @@ history element containing the search string becomes the current.
 
 * New Modes and Packages in Emacs 23.1
 
+** A new game called `bubble' has been added
+
 ** minibuffer-indicate-depth-mode shows the minibuffer depth in the prompt.
 
 
@@ -93,6 +108,9 @@ the first error encountered during compilations.
 Only copyright lines with holders matching copyright-names-regexp will be
 considered for update.
 
+** eldoc highlights the function argument under point
+with the face `eldoc-highlight-function-argument'.
+
 ** VC
 *** Clicking on the VC mode-line entry now pops the VC menu.
 
@@ -175,10 +193,9 @@ supported on other platforms, but not on Windows due to using the winsock
 
 * Lisp Changes in Emacs 23.1
 
-+++
-** inhibit-modification-hooks is bound to t while running modification hooks.
-As a happy consequence, after-change-functions and before-change-functions
-are not bound to nil any more while running an (after|before)-change-function.
+** The function invisible-p returns non-nil if the character
+   after a specified position is invisible, or if its argument
+   as an `invisible' property would make a character invisible.
 
 ** Non-breaking space now acts as whitespace.
 
@@ -198,6 +215,16 @@ like this:
 +++
 ** The regexp form \(?<num>:<regexp>\) specifies the group number explicitly.
 
+** New function `window-full-width-p' returns t if a window is as wide
+as its frame.
+
+** The new function `split-string-and-unquote' does (what?)
+
+** The new function `combine-and-quote-strings' does (what?)
+
+** The new function `image-refresh' refreshes all images associated
+with a given image specification.
+
 +++
 ** New variable `user-emacs-directory'.
 Use this instead of "~/.emacs.d".
@@ -225,6 +252,8 @@ forms to subroutines.
 
 * New Packages for Lisp Programming in Emacs 23.1
 
+** The new package avl-tree.el deals with the AVL tree data structure.
+
 
 ----------------------------------------------------------------------
 This file is part of GNU Emacs.

etc/NEWS.22

@@ -41,6 +41,8 @@ below.  Emacs tries to warn you about these through `bad-packages-alist'.
 
 * Changes in Emacs 22.2
 
+** `browse-url-emacs' loads a URL into an Emacs buffer.  Handy for *.el URLs.
+
 ** `bad-packages-alist' will warn about external packages that are known
 to cause problems in this version of Emacs.
 
@@ -79,6 +81,14 @@ in to make it use the scrollbars from the system theme.
 
 * Lisp Changes in Emacs 22.2.
 
+** The function invisible-p returns non-nil if the character
+   after a specified position is invisible.
+
++++
+** inhibit-modification-hooks is bound to t while running modification hooks.
+As a happy consequence, after-change-functions and before-change-functions
+are not bound to nil any more while running an (after|before)-change-function.
+
 ** New function `window-full-width-p' returns t if a window is as wide
 as its frame.
 

etc/PROBLEMS

@@ -1861,12 +1861,15 @@ There appears to be a problem with the implementation of pty's on the
 Mac OS X that causes process output to be truncated.  To avoid this,
 leave process-connection-type set to its default value of nil.
 
-*** Mac OS X 10.3.9 (Carbon): QuickTime 7.0.4 updater breaks build.
+*** Mac OS X 10.3.9 (Carbon): QuickTime updater breaks build.
 
-On the above environment, build fails at the link stage with the
-message like "Undefined symbols: _HICopyAccessibilityActionDescription
-referenced from QuickTime expected to be defined in Carbon".  A
-workaround is to use QuickTime 7.0.1 reinstaller.
+Some QuickTime updaters such as 7.0.4 and 7.2.0 are known to break
+build at the link stage with the message like "Undefined symbols:
+_HICopyAccessibilityActionDescription referenced from QuickTime
+expected to be defined in Carbon".  A workaround is to use a QuickTime
+reinstaller.  Alternatively, you can link with the frameworks in the
+corresponding SDK by specifying LDFLAGS as
+"-Wl,-F/Developer/SDKs/MacOSX10.3.0.sdk/System/Library/Frameworks".
 
 ** FreeBSD
 

etc/README

@@ -1,18 +1,8 @@
-Copyright (C) 1992, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-  Free Software Foundation, Inc.
-See the end of the file for license conditions.
-
-
 This directory contains the architecture-independent files used by or
 with Emacs.  This includes some text files of documentation for GNU
 Emacs or of interest to Emacs users, and the file of dumped docstrings
 for Emacs functions and variables.
 
-Some of the *.tex files need special versions of TeX to typeset them.
-The files cs-*.tex and sk-*.tex need csTeX, a special version of TeX
-tailored to typesetting Czech and Slovak documents.  We provide
-PostScript files for these documents, so that you could print them
-without installing the modified TeX versions.
 
 `termcap.src' is included mainly for VMS.  It is a copy of the
 `/etc/termcap' file used on Unix.
@@ -27,13 +17,13 @@ Files: splash.pbm, splash.xpm, splash8.xpm, gnus.pbm, gnus-logo.eps
   Author: Luis Fernandes <elf@ee.ryerson.ca>
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
-  License: GNU General Public License version 2 or later (see COPYING)
+  License: GNU General Public License version 3 or later (see COPYING)
 
 File: emacs.icon
   Author: Sun Microsystems, Inc
   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
-  License: GNU General Public License version 2 or later (see COPYING)
+  License: GNU General Public License version 3 or later (see COPYING)
 
 
 This file is part of GNU Emacs.

etc/e/README

@@ -0,0 +1,9 @@
+eterm-color.ti is a terminfo source file.  eterm-color is a compiled
+version produced by the terminfo compiler (tic).  The compiled files
+are binary, and depend on the version of tic, but they seem to be
+system-independent and backwardly compatible.  So there should be no
+need to recompile (see etc/Makefile) the distributed binary version.
+
+The compiled file is used by lisp/term.el, so if it is moved term.el
+needs to be changed.  terminfo requires it to be stored in an `e'
+subdirectory (the first character of the file name).

etc/images/README

@@ -23,8 +23,17 @@ Author: Satyaki Das
 Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
+The files splash.xpm, splash8.xpm contain copyright and license
+information, but it is reproduced here for convenience.
 
-The following icons are from GTK+ 2.x and GNOME 2.x.  They are not
+Files: splash.pbm, splash.xpm, splash8.xpm, gnus.pbm
+  Author: Luis Fernandes <elf@ee.ryerson.ca>
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+    Free Software Foundation, Inc.
+  License: GNU General Public License version 3 or later (see COPYING)
+
+
+* The following icons are from GTK+ 2.x and GNOME 2.x.  They are not
 part of Emacs, but distributed and used by Emacs.
 
   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007

etc/refcards/README

@@ -0,0 +1,17 @@
+Some of the *.tex files need special versions of TeX to typeset them.
+The files cs-*.tex and sk-*.tex need csTeX, a special version of TeX
+tailored to typesetting Czech and Slovak documents.  We provide
+generated files for these documents, so that you could print them
+without installing the modified TeX versions.
+
+
+COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
+
+The file gnus-logo.eps contains copyright and license information, but
+it is reproduced here for convenience.
+
+File: gnus-logo.eps
+  Author: Luis Fernandes <elf@ee.ryerson.ca>
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+    Free Software Foundation, Inc.
+  License: GNU General Public License version 3 or later (see COPYING)

etc/refcards/calccard.tex

@@ -6,10 +6,17 @@
 % card version 1.9, by Stephen Gildea.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
-% Specify how many you want here.  Nothing else needs to be changed.
+% Specify how many you want here.
 
 \columnsperpage=3
 
+% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
+% a landscape layout.
+
+\input pdflayout.sty
+\pdflayout=(1l)
+
+% Nothing else needs to be changed.
 % Typical command to format:  tex calccard.tex
 % Typical command to print (3 cols):  dvips -t landscape calccard.dvi
 
@@ -666,7 +673,7 @@ \section{Programming}
 \bye
 
 % Local variables:
-% compile-command: "tex calccard"
+% compile-command: "pdftex calccard"
 % End:
 
 % arch-tag: a2764f34-ec23-4083-bd5c-53f9e70a5da9

etc/refcards/cs-dired-ref.tex

@@ -23,13 +23,20 @@
 % Boston, MA 02110-1301, USA.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
-% Specify how many you want here.  Nothing else needs to be changed.
+% Specify how many you want here.
 %**start of header
 
 \newcount\columnsperpage
 
 \columnsperpage=2
 
+% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
+% a landscape layout.
+
+\input pdflayout.sty
+\pdflayout=(0)
+
+% Nothing else needs to be changed.
 % This file is intended to be processed by plain TeX (TeX82).
 % The reference card looks OK with 2 columns per page, portrait mode.
 % I haven't tried it with 3 columns per page.

etc/refcards/cs-refcard.tex

@@ -7,10 +7,17 @@
 \newcount\columnsperpage
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
-% Specify how many you want here.  Nothing else needs to be changed.
+% Specify how many you want here.
 
 \columnsperpage=1
 
+% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
+% a landscape layout.
+
+\input pdflayout.sty
+\pdflayout=(0)
+
+% Nothing else needs to be changed.
 % Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
 %   2005, 2006, 2007  Free Software Foundation, Inc.
 

etc/refcards/cs-survival.tex

@@ -21,6 +21,12 @@
   \endinput
 \fi
 
+% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
+% a landscape layout.
+
+\input pdflayout.sty
+\pdflayout=(0)
+
 % Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
 %   2006, 2007  Free Software Foundation, Inc.
 

etc/refcards/de-refcard.tex

@@ -4,17 +4,17 @@
 %
 %**start of header
 \newcount\columnsperpage
-\newcount\letterpaper
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.
 
 \columnsperpage=3
 
-% Set letterpaper to 0 for A4 paper, 1 for letter (US) paper.  Useful
-% only when columnsperpage is 2 or 3.
+% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
+% a landscape layout.
 
-\letterpaper=0
+\input pdflayout.sty
+\pdflayout=(0l)
 
 % If you don't have german.sty, you can either get it from CTAN or
 % change the \glqq and \grqq commands below.
@@ -394,7 +394,7 @@ \section{Markieren}
 \section{Interaktives Ersetzen}
 
 \key{Zeichenkette interaktiv ersetzen}{M-\%}
-\metax{mit regul\"aren Ausdr\"ucken}{M-x query-replace-regexp}
+\key{mit regul\"aren Ausdr\"ucken}{C-M-\%}
 
 M\"ogliche Antworten in diesem Modus:
 
@@ -689,7 +689,7 @@ \section{Eigene Befehle schreiben}
 \bye
 
 % Local variables:
-% compile-command: "tex de-refcard"
+% compile-command: "pdftex de-refcard"
 % End:
 
 % arch-tag: af0a2666-f289-49f1-a9cc-cedab9783314

etc/refcards/dired-ref.tex

@@ -20,13 +20,20 @@
 % Boston, MA 02110-1301, USA.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
-% Specify how many you want here.  Nothing else needs to be changed.
+% Specify how many you want here.  
 %**start of header
 
 \newcount\columnsperpage
 
 \columnsperpage=2
 
+% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
+% a landscape layout.
+
+\input pdflayout.sty
+\pdflayout=(0)
+
+% Nothing else needs to be changed.
 % This file is intended to be processed by plain TeX (TeX82).
 % The reference card looks OK with 2 columns per page, portrait mode.
 % I haven't tried it with 3 columns per page.

etc/refcards/fr-dired-ref.tex

@@ -20,13 +20,20 @@
 % Boston, MA 02110-1301, USA.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
-% Specify how many you want here.  Nothing else needs to be changed.
+% Specify how many you want here.
 %**start of header
 
 \newcount\columnsperpage
 
 \columnsperpage=2
 
+% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
+% a landscape layout.
+
+\input pdflayout.sty
+\pdflayout=(0)
+
+% Nothing else needs to be changed.
 % This file is intended to be processed by plain TeX (TeX82).
 % The reference card looks OK with 2 columns per page, portrait mode.
 % I haven't tried it with 3 columns per page.

etc/refcards/fr-refcard.tex

@@ -1,17 +1,17 @@
 % Reference Card for GNU Emacs version 22 on Unix systems
 %**start of header
 \newcount\columnsperpage
-\newcount\letterpaper
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.
 
 \columnsperpage=3
 
-% Set letterpaper to 0 for A4 paper, 1 for letter (US) paper.  Useful
-% only when columnsperpage is 2 or 3.
+% PDF output layout.  0 for A4, 1 for Letter (US), a `l' is added for
+% a landscape layout.
 
-\letterpaper=0
+\input pdflayout.sty
+\pdflayout=(0l)
 
 % Nothing else needs to be changed below this line.
 % Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
@@ -82,9 +82,9 @@
 \centerline{traduction fran\c{c}aise de Micha\"el Cadilhac}
 % previously: Eric Jacoboni
 
-Vous pouvez faire et distribuer des copies de cette carte, pourvu que
-la note de copyright et cette note de permission soient conserv\'ees sur
-toutes les copies.
+Vous pouvez faire et distribuer des copies de cette carte, modifiée ou
+non, pourvu que la note de copyright et cette note de permission
+soient conserv\'ees sur toutes les copies.
 
 Pour des copies du manuel GNU Emacs, \'ecrivez \`a la Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
@@ -308,7 +308,7 @@ \section{Obtenir de l'aide}
 \key{D\'ecrire une fonction}{C-h f}
 \key{Obtenir des informations relatives au mode}{C-h m}
 
-\section{R\'ecup\'eration sur erreurs}
+\section{R\'ecup\'eration sur erreur}
 
 \key{{\bf Abandonner} une commande}{C-g}
 \metax{{\bf R\'ecup\'erer} les fichiers apr\`es un crash}{M-x recover-session}
@@ -649,8 +649,8 @@ \section{Personnalisation simple}
 Exemples de d\'efinition globale de touches en Emacs Lisp :
 
 \beginexample%
-(global-set-key "\\C-cg" 'goto-line)
-(global-set-key "\\M-\#" 'query-replace-regexp)
+(global-set-key (kbd "C-c g") 'search-forward)
+(global-set-key (kbd "M-\#") 'query-replace-regexp)
 \endexample
 
 \section{\'Ecriture de commandes}
@@ -683,7 +683,7 @@ \section{\'Ecriture de commandes}
 \bye
 
 % Local variables:
-% compile-command: "tex fr-refcard"
+% compile-command: "pdftex fr-refcard"
 % End:
 
 % arch-tag: 39d6dc6e-1a4a-4071-84db-4719d4e9e40d

etc/refcards/fr-survival.tex

@@ -22,6 +22,12 @@
   \endinput
 \fi
 
+% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
+% a landscape layout.
+
+\input pdflayout.sty
+\pdflayout=(0)
+
 % Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
 %   2006, 2007  Free Software Foundation, Inc.
 
@@ -413,7 +419,7 @@ \section{Obtenir de l'aide}
 \bye
 
 % Local variables:
-% compile-command: "tex survival"
+% compile-command: "pdftex survival"
 % End:
 
 % arch-tag: 2fb4e93f-8bfa-4ab4-bc6d-b475131d766a

etc/refcards/gnus-logo.eps

@@ -1,4 +1,26 @@
 %!PS-Adobe-2.0 EPSF-2.0
+% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% Author: Luis Fernandes <elf@ee.ryerson.ca>
+%
+% This file is part of GNU Emacs.
+%
+% GNU Emacs is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 3, or (at your option)
+% any later version.
+%
+% GNU Emacs is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with GNU Emacs; see the file COPYING.  If not, write to the
+% Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
+%
 %%Title: gnuslogo1.ps
 %%Creator: XV Version 3.00  Rev: 3/30/93  -  by John Bradley
 %%BoundingBox: 0 0 493 505

etc/refcards/orgcard.tex

@@ -12,11 +12,17 @@
 
 \columnsperpage=3
 
-% Set letterpapaer to 0 for A4 paper, 1 for letter (US) paper.  Useful
+% Set letterpaper to 0 for A4 paper, 1 for letter (US) paper.  Useful
 % only when columnsperpage is 2 or 3.
 
 \letterpaper=0
 
+% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
+% a landscape layout.
+
+\input pdflayout.sty
+\pdflayout=(0l)
+
 % Nothing else needs to be changed below this line.
 % Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
 %   2005, 2006, 2007  Free Software Foundation, Inc.
@@ -775,7 +781,7 @@ \section{Notes}
 \bye
 
 % Local variables:
-% compile-command: "tex refcard"
+% compile-command: "pdftex refcard"
 % End:
 
 % arch-tag: 139f6750-5cfc-49ca-92b5-237fe5795290

etc/refcards/pdflayout.sty

@@ -0,0 +1,49 @@
+% Copyright (C) 2007  Free Software Foundation, Inc.
+
+% This file is part of GNU Emacs.
+
+% GNU Emacs is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 3, or (at your option)
+% any later version.
+
+% GNU Emacs is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+
+% You should have received a copy of the GNU General Public License
+% along with GNU Emacs; see the file COPYING.  If not, write to
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
+
+% This file defines `\pdflayout':
+%  - \pdflayout=(0) is A4 portrait,
+%  - \pdflayout=(1) is letter (US) portrait,
+%  - \pdflayout=(0l) is A4 landscape.
+%  - \pdflayout=(1l) is letter (US) landscape,
+
+\input ifpdf.sty
+
+\ifpdf
+  \def\pdflayout=(#1#2){
+    \if0#1 % A4
+      \pdfpagewidth=21cm
+      \pdfpageheight=29.7cm
+    \else\if1#1 % Letter
+      \pdfpagewidth=8.5in
+      \pdfpageheight=11in
+    \fi\fi
+    \if l#2 % Landscape
+      \edef\oldwidth{\the\pdfpagewidth}
+      \pdfpagewidth=\pdfpageheight
+      \pdfpageheight=\oldwidth
+    \fi
+  }
+\else
+  \def\pdflayout=(#1#2){}
+\fi
+
+% archtag: 63c938a5-cc78-4964-962d-603c90d34afc
+
+% arch-tag: 3464d27c-1439-473a-bc47-a7c501e8c156

etc/refcards/pl-refcard.tex

@@ -28,10 +28,17 @@
 \newcount\columnsperpage
 
 % This file can be printed with 1, or 2 columns per page (see below).
-% Specify how many you want here.  Nothing else needs to be changed.
+% Specify how many you want here.
 
 \columnsperpage=2
 
+% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
+% a landscape layout.
+
+\input pdflayout.sty
+\pdflayout=(0)
+
+% Nothing else needs to be changed.
 % Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
 %   2006, 2007  Free Software Foundation, Inc.
 
@@ -995,7 +1002,7 @@ \section{Tworzenie nowych polece/n}
 \bye
 
 % Local variables:
-% compile-command: "tex pl-refcard"
+% compile-command: "pdftex pl-refcard"
 % End:
 
 % arch-tag: 19d15a16-70be-40c8-ad91-88899aac32a9