from trunk

38 files changed, 108 insertions, 75 deletions

diff --git a/etc/AUTHORS b/etc/AUTHORS
index 8fc742b97f4..72988c24c64 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -59,7 +59,7 @@ and co-wrote cc-align.el cc-cmds.el cc-defs.el cc-engine.el cc-fonts.el
   cc-langs.el cc-mode.el cc-styles.el cc-vars.el
 and changed cc-mode.texi lread.c programs.texi lisp.el cc-subword.el
   display.texi font-lock.el isearch.el modes.texi os.texi search.texi
-  startup.el subr.el text.texi INSTALL.CVS add-log.el buffers.texi
+  startup.el subr.el text.texi INSTALL.BZR add-log.el buffers.texi
   bytecomp.el callint.c cc-fix.el cc-mode-19.el and 20 other files
 
 Alan Shutko: changed diary-lib.el calendar.el bindings.el cal-hebrew.el
@@ -434,9 +434,9 @@ Chip Coldwell: changed font.c
 Chong Yidong: wrote redisplay-testsuite.el
 and co-wrote longlines.el
 and changed xdisp.c simple.el files.el display.texi files.texi
-  frames.texi keyboard.c faces.el xterm.c cus-edit.el Makefile.in
-  emacs.texi xfaces.c xfns.c font.c image.c misc.texi startup.el
-  compile.el configure.in custom.texi and 594 other files
+  frames.texi keyboard.c cus-edit.el faces.el xterm.c Makefile.in
+  emacs.texi xfaces.c font.c startup.el xfns.c image.c misc.texi
+  compile.el configure.in custom.texi and 608 other files
 
 Chris Chase: co-wrote idlw-shell.el idlwave.el
 
@@ -629,12 +629,14 @@ David Bakhash: wrote strokes.el
 
 David Blacka: co-wrote nndb.el
 
+David Burger: changed macros.el
+
 David Byers: changed minibuf.c
 
 David Casperson: changed font-core.el menu-bar.el tex-mode.el
 
-David De La Harpe Golden: changed files.el simple.el mouse.el
-  cus-start.el fileio.c select.el w32-fns.el x-win.el xterm.c
+David De La Harpe Golden: changed files.el simple.el fileio.c mouse.el
+  cus-start.el select.el w32-fns.el x-win.el xterm.c
 
 David Edmondson: changed message.el gnus-cite.el imap.el mm-view.el
   mml2015.el nnfolder.el nnml.el
@@ -723,10 +725,10 @@ and changed w32menu.c w32term.c close.png close.xpm empty.png empty.xpm
   no-handle.png no-handle.xpm open.png and 20 other files
 
 David Reitter: wrote mailclient.el
-and changed nsterm.m nsfns.m ns-win.el Makefile.in cus-start.el
-  macos.texi menu-bar.el nsfont.m commands.h cus-edit.el easy-mmode.el
-  emacsbug.el emacsclient.c faces.el flyspell.el info.el keyboard.c
-  keymap.c macterm.c menu.c minibuf.c and 11 other files
+and changed nsterm.m nsfns.m ns-win.el nsfont.m Makefile.in cus-start.el
+  macos.texi menu-bar.el commands.h cus-edit.el easy-mmode.el emacsbug.el
+  emacsclient.c faces.el flyspell.el info.el keyboard.c keymap.c
+  macterm.c menu.c minibuf.c and 11 other files
 
 David Robinow: changed makefile.w32-in w32inevt.c
 
@@ -825,8 +827,8 @@ Ed L. Cashin: changed gnus-sum.el imap.el
 
 Ed Swarthout: changed hexl.el table.el
 
-Eduard Wiebe: changed browse-url.el flymake.texi footnote.el korean.el
-  mule-conf.el objects.texi ps-print.el vc-rcs.el
+Eduard Wiebe: changed browse-url.el flymake.texi footnote.el
+  javascript.el korean.el mule-conf.el objects.texi ps-print.el vc-rcs.el
 
 Eduardo Muц╠oz: changed dired.el ls-lisp.el
 
@@ -863,8 +865,8 @@ Eli Tziperman: wrote rmail-spam-filter.el
 Eli Zaretskii: wrote rxvt.el tty-colors.el
 and changed msdos.c makefile.w32-in Makefile.in files.el info.el rmail.el
   fileio.c mainmake.v2 pc-win.el startup.el config.bat simple.el msdos.h
-  dired.c w32.c frame.c internal.el menu-bar.el process.c xfaces.c
-  INSTALL and 602 other files
+  dired.c w32.c frame.c internal.el menu-bar.el process.c INSTALL
+  xfaces.c and 602 other files
 
 Elias Oltmanns: changed tls.el gnus-agent.el gnus-int.el gnus-srvr.el
   gnus.el
@@ -903,14 +905,14 @@ Eric Knauel: changed gnus.el spam-report.el spam.el
 
 Eric M. Ludlam: wrote analyze.el args.el autoconf-edit.el bovine.el c.el
   cedet-cscope.el cedet-files.el cedet-global.el cedet-idutils.el
-  cedet-utests.el chart.el checkdoc.el compile.el complete.el cpp-root.el
+  cedet-utests.el chart.el checkdoc.el compile.el cpp-root.el
   cscope.el ctxt.el data-debug.el db-debug.el db-el.el db-file.el
   db-find.el db-global.el db-mode.el db-ref.el db-typecache.el db.el
   debug.el decorate.el dep.el dframe.el dictionary.el dired.el doc.el
   document.el ede-grammar.el ede.el edit.el eieio-base.el eieio-comp.el
   eieio-custom.el eieio-datadebug.el eieio-opt.el eieio-speedbar.el
-  eieio.el el.el emacs.el expandproto.el extract.el ezimage.el fcn.el
-  fields.el files.el filter.el filters.el find.el format.el fw.el gcc.el
+  eieio.el el.el expandproto.el extract.el ezimage.el fcn.el
+  fields.el filter.el filters.el find.el format.el fw.el gcc.el
   getset.el global.el grep.el html.el ia-sb.el ia.el idle.el idutils.el
   include.el insert.el inversion.el java.el javascript.el lex-spp.el
   lex.el linux.el list.el locate.el make.el makefile-edit.el map.el
@@ -990,6 +992,8 @@ Felix S. T. Wu: co-wrote vi.el (public domain)
 
 Ferenc Wagner: changed nnweb.el
 
+Filipe Cabecinhas: changed nsterm.m
+
 Flemming Hoejstrup Hansen: changed forms.el
 
 Florian Weimer: changed message.el gnus.el coding.c gnus-sum.el gnus.texi
@@ -1005,6 +1009,8 @@ and changed etags.c man.el delta.h etags.1 undigest.el Makefile.in
   rmail.el etags.el latin-alt.el sgml-mode.el data.c european.el
   filelock.c files.el generic-x.el gud.el and 45 other files
 
+Francis Devereux: changed nsfont.m
+
 Francis J. Wright: wrote woman.el
 and changed dired.el comint.el cus-edit.el files.el ps-print.el
 
@@ -1123,8 +1129,8 @@ Glenn Morris: wrote check-declare.el
 and changed Makefile.in calendar.el diary-lib.el rmail.el f90.el
   cal-menu.el cal-hebrew.el fortran.el holidays.el configure.in
   cal-islam.el bytecomp.el calendar.texi cal-bahai.el files.el appt.el
-  cal-china.el emacs.texi rmailsum.el startup.el cal-tex.el
-  and 968 other files
+  cal-china.el emacs.texi rmailsum.el simple.el startup.el
+  and 972 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -1417,6 +1423,8 @@ Jeramey Crawford: changed amdx86-64.h configure.in
 Jeremy Bertram Maitin-Shepard: changed erc.el erc-backend.el
   erc-button.el erc-track.el mml.el
 
+Jeremy Whitlock: changed python.el
+
 Jerry Frain: changed systime.h usg5-4.h
 
 Jerry James: changed format.el dns.el gnus-spec.el gnus-util.el
@@ -1594,7 +1602,7 @@ and changed erc.el erc-track.el erc-backend.el erc-match.el erc-stamp.el
   erc-bbdb.el erc-imenu.el erc-lang.el erc-list.el erc-macs.el
   erc-menu.el and 8 other files
 
-Jose E. Marchesi: changed gomoku.el smtpmail.el
+Jose E. Marchesi: changed ada-mode.el gomoku.el smtpmail.el
 
 Joseph Arceneaux: wrote xrdb.c
 and changed xterm.c xfns.c keyboard.c screen.c dispnew.c xdisp.c window.c
@@ -1624,7 +1632,7 @@ and changed files.el perl-mode.el
 Juanma Barranquero: changed makefile.w32-in subr.el files.el bs.el
   faces.el help-fns.el w32fns.c org.el server.el simple.el emacsclient.c
   desktop.el buffer.c mule-cmds.el ido.el window.c xdisp.c allout.el
-  keyboard.c replace.el eval.c and 922 other files
+  keyboard.c replace.el eval.c and 924 other files
 
 Juergen Hoetzel: changed url-handlers.el
 
@@ -1644,9 +1652,9 @@ Jure Cuhalev: changed ispell.el
 
 Juri Linkov: wrote files-x.el misearch.el
 and changed info.el isearch.el simple.el replace.el dired-aux.el
-  startup.el compile.el grep.el dired.el files.el faces.el display.texi
-  menu-bar.el descr-text.el cus-edit.el bindings.el man.el text.texi
-  dired-x.el edebug.el fill.el and 279 other files
+  startup.el grep.el compile.el dired.el files.el faces.el display.texi
+  menu-bar.el descr-text.el cus-edit.el bindings.el man.el image-mode.el
+  ispell.el text.texi dired-x.el and 280 other files
 
 Justin Bogner: changed fortune.el
 
@@ -1727,6 +1735,8 @@ Kaveh R. Ghazi: changed delta88k.h xterm.c
 
 Kayvan Sylvan: changed supercite.el
 
+Kazuhiro Ito: changed coding.c
+
 Kazushi Marukawa: changed filelock.c hexl.c profile.c unexalpha.c
 
 Keiichi Suzuki: changed nntp.el
@@ -1756,9 +1766,9 @@ Kenichi Handa: wrote composite.el cyrillic.el isearch-x.el ps-bdf.el
   py-punct.el pypunct-b5.el thai-word.el
 and co-wrote ps-def.el ps-mule.el ps-print.el ps-samp.el quail.el
 and changed coding.c mule-cmds.el mule.el fontset.c charset.c fontset.el
-  xterm.c xdisp.c font.c fileio.c Makefile.in mule-conf.el characters.el
-  fns.c mule-diag.el charset.h ccl.c ftfont.c xfaces.c coding.h
-  japanese.el and 376 other files
+  xdisp.c xterm.c font.c fileio.c Makefile.in mule-conf.el characters.el
+  fns.c mule-diag.el ccl.c charset.h ftfont.c xfaces.c coding.h
+  japanese.el and 377 other files
 
 Kenichi Okada: co-wrote sasl-cram.el sasl-digest.el
 
@@ -1804,8 +1814,8 @@ Kevin Rodgers: changed compile.el mailabbrev.el dired-x.el files.el
 Kevin Ryde: wrote info-xref.el
 and changed info-look.el info.el checkdoc.el arc-mode.el cl.texi
   compilation.txt ffap.el gnus-art.el mule.el os.texi MORE.STUFF
-  browse-url.el dig.el gnus-sum.el mailcap.el man.el newst-backend.el
-  nroff-mode.el simple.el text.texi widget.texi and 71 other files
+  browse-url.el compile.el dig.el etags.c gnus-sum.el mailcap.el man.el
+  newst-backend.el nroff-mode.el simple.el and 71 other files
 
 Kim F. Storm: wrote bindat.el cua-base.el cua-gmrk.el cua-rect.el ido.el
   keypad.el kmacro.el
@@ -1999,9 +2009,10 @@ and changed erc.el erc-dcc.el erc-speak.el erc-bbdb.el erc-complete.el
   and 23 other files
 
 Mark A. Hershberger: changed xml.el nnrss.el mm-url.el cperl-mode.el
-  Makefile.in NXML-NEWS cc-mode.texi compilation.txt compile.el
-  esh-mode.el flymake.el gnus-group.el makefile.w32-in nxml
-  nxml-mode.texi programs.texi python.el schema timezone.el vc-bzr.el
+  vc-bzr.el Makefile.in NXML-NEWS cc-mode.texi compilation.txt compile.el
+  ede.texi eieio.texi esh-mode.el flymake.el gnus-group.el isearch.el
+  makefile.w32-in nxml nxml-mode.texi programs.texi python.el
+  and 5 other files
 
 Mark D. Baushke: changed mh-e.el mh-utils.el mh-mime.el mh-comp.el
   mh-search.el mh-customize.el mh-identity.el mh-seq.el mh-speed.el
@@ -2156,10 +2167,10 @@ Michael Albinus: wrote dbus.el tramp-cmds.el tramp-compat.el
   tramp-fish.el tramp-ftp.el tramp-gvfs.el tramp-gw.el tramp-smb.el
   xesam.el zeroconf.el
 and co-wrote tramp-cache.el tramp.el
-and changed tramp.texi dbusbind.c dbus.texi trampver.el trampver.texi
-  ange-ftp.el files.el files.texi tramp-vc.el Makefile.in tramp-util.el
-  tramp-uu.el dired-aux.el compile.el em-unix.el grep.el simple.el vc.el
-  configure.in fileio.c processes.texi and 49 other files
+and changed tramp.texi dbusbind.c dbus.texi ange-ftp.el trampver.el
+  trampver.texi files.el files.texi tramp-vc.el Makefile.in tramp-util.el
+  tramp-uu.el dired-aux.el tramp-imap.el compile.el em-unix.el grep.el
+  simple.el vc.el configure.in dired.el and 50 other files
 
 Michael Ben-Gershon: changed acorn.h configure.in riscix1-1.h riscix1-2.h
   unexec.c
@@ -2782,7 +2793,7 @@ Sam Falkner: changed nntp.el
 Sam Kendall: changed etags.c etags.el
 
 Sam Steingold: wrote gulp.el midnight.el
-and changed cl-indent.el compile.el vc.el vc-cvs.el font-lock.el mouse.el
+and changed cl-indent.el compile.el vc-cvs.el vc.el font-lock.el mouse.el
   simple.el ange-ftp.el pcvs.el tex-mode.el vc-hg.el add-log.el
   bindings.el bookmark.el debug.el diary-lib.el dired.el files.el grep.el
   inf-lisp.el sgml-mode.el and 108 other files
@@ -2921,9 +2932,9 @@ Stefan Monnier: wrote bibtex-style.el css-mode.el cvs-status.el
   vc-mtn.el
 and co-wrote font-lock.el
 and changed vc.el lisp.h subr.el keyboard.c simple.el files.el pcvs.el
-  keymap.c xdisp.c Makefile.in alloc.c vc-hooks.el newcomment.el
+  keymap.c xdisp.c Makefile.in vc-hooks.el alloc.c newcomment.el
   tex-mode.el bytecomp.el compile.el buffer.c info.el fill.el fileio.c
-  window.c and 900 other files
+  window.c and 901 other files
 
 Stefan Reichц╤r: changed gnus-agent.el
 
@@ -3086,7 +3097,7 @@ and changed ewoc.el vc.el zone.el info.el Makefile.in processes.texi
 
 Thierry Emery: changed kinsoku.el timezone.el url-http.el wid-edit.el
 
-Thierry Volpiatto: changed bookmark.el
+Thierry Volpiatto: changed bookmark.el info.el
 
 Thomas Baumann: wrote org-mhe.el
 and co-wrote org-bbdb.el
@@ -3258,7 +3269,8 @@ and changed ps-prin1.ps ps-bdf.el ps-prin0.ps blank-mode.el ps-prin3.ps
   ps-print-def.el ps-print.ps ps-vars.el
 
 Vivek Dasmohapatra: wrote hfy-cmap.el htmlfontify.el
-and changed erc-backend.el erc.el emacs.c sh-script.el xterm.c xterm.h
+and changed erc-backend.el erc.el emacs.c erc-services.el sh-script.el
+  xterm.c xterm.h
 
 Vladimir Alexiev: changed arc-mode.el nnvirtual.el tmm.el
 
diff --git a/etc/ChangeLog b/etc/ChangeLog
index ef828345287..6659fd15190 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,24 @@
+2010-03-01  Glenn Morris  <rgm@gnu.org>
+
+        * refcards/pl-refcard.tex: Double forward-slashes in URL for Mex.
+
+        * refcards/de-refcard.tex: Fix paren typo.
+
+        * refcards/ru-refcard.tex: Rename \year command to \cyear, since
+        the former seems to be already used in some TeX installations.
+
+        * refcards/calccard.tex, refcards/cs-dired-ref.tex:
+        * refcards/cs-refcard.tex, refcards/cs-survival.tex:
+        * refcards/de-refcard.tex, refcards/dired-ref.tex:
+        * refcards/fr-dired-ref.tex, refcards/fr-refcard.tex:
+        * refcards/fr-survival.tex, refcards/orgcard.pdf:
+        * refcards/orgcard.tex, refcards/pl-refcard.tex:
+        * refcards/pt-br-refcard.tex, refcards/refcard.tex:
+        * refcards/ru-refcard.tex, refcards/sk-dired-ref.tex:
+        * refcards/sk-refcard.tex, refcards/sk-survival.tex:
+        * refcards/survival.tex, refcards/vipcard.tex:
+        * refcards/viperCard.tex: Update short copyright year to 2010.
+
 2010-02-26  Glenn Morris  <rgm@gnu.org>
 
         * tutorials/TUTORIAL.es, tutorials/TUTORIAL.pt_BR:
@@ -5,9 +26,9 @@
 
 2010-02-14  Chong Yidong  <cyd@stupidchicken.com>
 
-        * etc/images/custom/down-pushed.xpm, etc/images/custom/down.xpm:
-        * etc/images/custom/right-pushed.xpm:
-        * etc/images/custom/right-pushed.xpm: Increase height by four
+        * images/custom/down-pushed.xpm, images/custom/down.xpm:
+        * images/custom/right-pushed.xpm:
+        * images/custom/right-pushed.xpm: Increase height by four
         pixels, to improve text alignment.
 
 2010-01-16  Mario Lang  <mlang@delysid.org>
@@ -17,10 +38,10 @@
 
 2010-01-14  Nick Roberts  <nickrob@snap.net.nz>
 
-        * etc/images/gud/recstart.xpm, etc/images/gud/recstop.xpm:
-        * etc/images/gud/rcont.xpm, etc/images/gud/rnext.xpm:
-        * etc/images/gud/rfinish.xpm, etc/images/gud/rnexti.xpm:
-        * etc/images/gud/rstep.xpm, etc/images/gud/rstepi.xpm:
+        * images/gud/recstart.xpm, images/gud/recstop.xpm:
+        * images/gud/rcont.xpm, images/gud/rnext.xpm:
+        * images/gud/rfinish.xpm, images/gud/rnexti.xpm:
+        * images/gud/rstep.xpm, images/gud/rstepi.xpm:
         New icons for reverse debugging.
 
 2010-01-14  Juanma Barranquero  <lekktu@gmail.com>
@@ -2559,7 +2580,7 @@
         * images/gud/ni.xpm, images/gud/ni.xpm
         * images/gud/s.xpm, images/gud/s.xpm
         * images/gud/si.xpm, images/gud/si.xpm: Rename to
-        next.*, nexti.*, step.*, and stepi.* , respectively, as the
+        next.*, nexti.*, step.*, and stepi.*, respectively, as the
         file-name no longer clashes on 8+3 filesystems.
 
 2005-10-14  Bill Wohler  <wohler@newt.com>
diff --git a/etc/refcards/calccard.pdf b/etc/refcards/calccard.pdf
index 405dd365853..58b203672de 100644
--- a/etc/refcards/calccard.pdf
+++ b/etc/refcards/calccard.pdf
diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex
index fe2bd1c98da..3684d767a73 100644
--- a/etc/refcards/calccard.tex
+++ b/etc/refcards/calccard.tex
@@ -20,8 +20,8 @@
 % Typical command to format:  tex calccard.tex
 % Typical command to print (3 cols):  dvips -t landscape calccard.dvi
 
-% Copyright (C) 1987, 1992, 2001, 2002, 2003, 2004,
-%   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+% Copyright (C) 1987, 1992, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+%   2008, 2009, 2010  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -65,7 +65,7 @@
 %  Internet: gildea@stop.mail-abuse.org
 
 \def\emacsversionnumber{23}
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/etc/refcards/cs-dired-ref.pdf b/etc/refcards/cs-dired-ref.pdf
index 73736650438..cf16c1afd10 100644
--- a/etc/refcards/cs-dired-ref.pdf
+++ b/etc/refcards/cs-dired-ref.pdf
diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex
index 8b5f112878f..e531829f064 100644
--- a/etc/refcards/cs-dired-ref.tex
+++ b/etc/refcards/cs-dired-ref.tex
@@ -43,7 +43,7 @@
 \pdflayout=(0)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 
 % Nothing else needs to be changed.
 
diff --git a/etc/refcards/cs-refcard.pdf b/etc/refcards/cs-refcard.pdf
index 646fa1f06d4..7d0f92fa404 100644
--- a/etc/refcards/cs-refcard.pdf
+++ b/etc/refcards/cs-refcard.pdf
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index 90fc59bab39..6f902aefae6 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -60,7 +60,7 @@
 \pdflayout=(0)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 
 % Nothing else needs to be changed.
 
diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex
index f2878f80f25..d6d7cea56c3 100644
--- a/etc/refcards/cs-survival.tex
+++ b/etc/refcards/cs-survival.tex
@@ -56,7 +56,7 @@
 \chyph
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/refcards/de-refcard.pdf b/etc/refcards/de-refcard.pdf
index 66f0454a5d6..c7a619b0486 100644
--- a/etc/refcards/de-refcard.pdf
+++ b/etc/refcards/de-refcard.pdf
diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex
index 010619094aa..b37c52b6692 100644
--- a/etc/refcards/de-refcard.tex
+++ b/etc/refcards/de-refcard.tex
@@ -62,7 +62,7 @@
 \mdqoff               % deactivates the "-char
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 
 % Nothing else needs to be changed below this line.
 
@@ -83,7 +83,7 @@ Kopien befinden.
 
 F\"ur Kopien des Handbuchs zu GNU Emacs:
 
-\tt http://www.gnu.org/software/emacs/\#Manuals}
+{\tt http://www.gnu.org/software/emacs/\#Manuals}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/dired-ref.pdf b/etc/refcards/dired-ref.pdf
index ddf1113e597..18a02e28ae7 100644
--- a/etc/refcards/dired-ref.pdf
+++ b/etc/refcards/dired-ref.pdf
diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex
index d068f928534..951154da16a 100644
--- a/etc/refcards/dired-ref.tex
+++ b/etc/refcards/dired-ref.tex
@@ -45,7 +45,7 @@
 \pdflayout=(1)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 
 % Nothing else needs to be changed.
 
diff --git a/etc/refcards/fr-dired-ref.pdf b/etc/refcards/fr-dired-ref.pdf
index efcc85ffafd..1bd84b84e75 100644
--- a/etc/refcards/fr-dired-ref.pdf
+++ b/etc/refcards/fr-dired-ref.pdf
diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex
index 35063164174..66c90306a60 100644
--- a/etc/refcards/fr-dired-ref.tex
+++ b/etc/refcards/fr-dired-ref.tex
@@ -37,7 +37,7 @@
 \pdflayout=(0)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 
 % Nothing else needs to be changed.
 
diff --git a/etc/refcards/fr-refcard.pdf b/etc/refcards/fr-refcard.pdf
index 741f5e70b61..91f4fafe2d0 100644
--- a/etc/refcards/fr-refcard.pdf
+++ b/etc/refcards/fr-refcard.pdf
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index 36ecfeb9fa3..f356c229ac4 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -57,7 +57,7 @@
 \pdflayout=(0l)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 
 % Nothing else needs to be changed below this line.
 
diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex
index 7fa0156437d..168026c79f2 100644
--- a/etc/refcards/fr-survival.tex
+++ b/etc/refcards/fr-survival.tex
@@ -51,7 +51,7 @@
 \pdflayout=(0)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/refcards/gnus-booklet.pdf b/etc/refcards/gnus-booklet.pdf
index 7b67f1ccd8a..f39af860394 100644
--- a/etc/refcards/gnus-booklet.pdf
+++ b/etc/refcards/gnus-booklet.pdf
diff --git a/etc/refcards/gnus-refcard.pdf b/etc/refcards/gnus-refcard.pdf
index 5e01277c14c..016f8fd7051 100644
--- a/etc/refcards/gnus-refcard.pdf
+++ b/etc/refcards/gnus-refcard.pdf
diff --git a/etc/refcards/orgcard.pdf b/etc/refcards/orgcard.pdf
index 72ae10e8040..71f216156f3 100644
--- a/etc/refcards/orgcard.pdf
+++ b/etc/refcards/orgcard.pdf
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 1b308f5a53c..ff498236467 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,7 +1,7 @@
 % Reference Card for Org Mode
 \def\orgversionnumber{6.33x}
 \def\versionyear{2009}          % latest update
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 
 %**start of header
 \newcount\columnsperpage
diff --git a/etc/refcards/pl-refcard.pdf b/etc/refcards/pl-refcard.pdf
index 0eba15bd818..47299efa1bf 100644
--- a/etc/refcards/pl-refcard.pdf
+++ b/etc/refcards/pl-refcard.pdf
diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex
index 2c0bacd5b85..cded3166524 100644
--- a/etc/refcards/pl-refcard.tex
+++ b/etc/refcards/pl-refcard.tex
@@ -71,7 +71,7 @@
 \pdflayout=(0)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 
 % Nothing else needs to be changed.
 
@@ -92,7 +92,7 @@ are preserved on all copies.
 
 For copies of the GNU Emacs manual, see:
 
-{\tt http://www.gnu.org/software/emacs/\#Manuals}
+{\tt http:////www.gnu.org//software//emacs//\#Manuals}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/pt-br-refcard.pdf b/etc/refcards/pt-br-refcard.pdf
index 0472ea03a57..dff1c3f6c00 100644
--- a/etc/refcards/pt-br-refcard.pdf
+++ b/etc/refcards/pt-br-refcard.pdf
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex
index 69eb32b0858..c242ac2814c 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -63,7 +63,7 @@
 \pdflayout=(0l)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 
 % Nothing else needs to be changed below this line.
 
diff --git a/etc/refcards/refcard.pdf b/etc/refcards/refcard.pdf
index 1ca57319ef5..f6c47d8a5f6 100644
--- a/etc/refcards/refcard.pdf
+++ b/etc/refcards/refcard.pdf
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index fb6d6aac9b7..735639b08ee 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -64,7 +64,7 @@
 % Nothing else needs to be changed below this line.
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2009}                 % copyright year
+\def\year{2010}                 % copyright year
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/etc/refcards/ru-refcard.pdf b/etc/refcards/ru-refcard.pdf
index c9b7329384b..3bdc7895a9d 100644
--- a/etc/refcards/ru-refcard.pdf
+++ b/etc/refcards/ru-refcard.pdf
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index 4d9bbcf8d96..4b314726e1f 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -23,15 +23,15 @@
 \setlength{\ColThreeWidth}{25mm}
 
 \newcommand{\versionemacs}[0]{23} % version of Emacs this is for
-\newcommand{\year}[0]{2009}       % copyright year
+\newcommand{\cyear}[0]{2010}       % copyright year
 
 \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
-  \centerline{\footnotesize \copyright\ \year\ Free Software Foundation, Inc.
+  \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc.
   Permissions on back.}}
 
 \newcommand\copyrightnotice[0]{
 \vskip 1ex plus 2 fill\begingroup\footnotesize
-\centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
+\centerline{Copyright \copyright\ \cyear\ Free Software Foundation, Inc.}
 \centerline{For GNU Emacs version \versionemacs}
 \centerline{Designed by Stephen Gildea}
 \centerline{Перевод Alex Ott <alexott@gmail.com>}
diff --git a/etc/refcards/sk-dired-ref.pdf b/etc/refcards/sk-dired-ref.pdf
index 7725ce1aee5..e14764bd8f8 100644
--- a/etc/refcards/sk-dired-ref.pdf
+++ b/etc/refcards/sk-dired-ref.pdf
diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex
index 79e5d4427be..5a2d04123db 100644
--- a/etc/refcards/sk-dired-ref.tex
+++ b/etc/refcards/sk-dired-ref.tex
@@ -44,7 +44,7 @@
 \pdflayout=(0)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 
 % Nothing else needs to be changed.
 
diff --git a/etc/refcards/sk-refcard.pdf b/etc/refcards/sk-refcard.pdf
index 09b1424eb73..d0a34927a26 100644
--- a/etc/refcards/sk-refcard.pdf
+++ b/etc/refcards/sk-refcard.pdf
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index e42150dc186..7fd7b0d062b 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -61,7 +61,7 @@
 \pdflayout=(0)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 
 % Nothing else needs to be changed.
 
diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex
index 44590c51d11..ce499d4f529 100644
--- a/etc/refcards/sk-survival.tex
+++ b/etc/refcards/sk-survival.tex
@@ -57,7 +57,7 @@
 \shyph
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex
index 0e4a341b610..d92b414decc 100644
--- a/etc/refcards/survival.tex
+++ b/etc/refcards/survival.tex
@@ -46,7 +46,7 @@
 \pdflayout=(1)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex
index 75d99c7964f..742ef3e01bb 100644
--- a/etc/refcards/vipcard.tex
+++ b/etc/refcards/vipcard.tex
@@ -51,7 +51,7 @@
 \pdflayout=(1)
 
 \def\versionemacs{18}           % version of Emacs this is for
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 \def\versionvip{3.5}
 
 % Nothing else needs to be changed.
diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex
index 95ef384a89a..8144fb14cb1 100644
--- a/etc/refcards/viperCard.tex
+++ b/etc/refcards/viperCard.tex
@@ -54,7 +54,7 @@
 \pdflayout=(1)
 
 \def\versionemacs{21}           % version of Emacs this is for
-\def\year{2009}                 % latest copyright year
+\def\year{2010}                 % latest copyright year
 \def\versionxemacs{20}          % version of XEmacs this is for
 \def\versionviper{3.0}          % version of Viper this is for