summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2006-02-08 04:26:44 +0000
committerMiles Bader <miles@gnu.org>2006-02-08 04:26:44 +0000
commit380874900ca183ec2fdce91949d841328852d7a8 (patch)
tree6918a4182f8657251e83223511aa7827fb8820ed
parent72b464afc12a7532fc8555352db04c65647c15ae (diff)
parentc96ec15a58817ac97db5348187e2d8695f609cb5 (diff)
downloademacs-380874900ca183ec2fdce91949d841328852d7a8.tar.gz
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 43-57) - Update from CVS - Merge from erc--emacs--0 - Make constrain-to-field notice overlays - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 18-21) - Update from CVS - Merge from emacs--devo--0
-rw-r--r--MAINTAINERS1
-rw-r--r--admin/FOR-RELEASE16
-rw-r--r--etc/ChangeLog11
-rw-r--r--etc/DEBUG2
-rw-r--r--etc/DISTRIB2
-rw-r--r--etc/ERC-NEWS49
-rw-r--r--etc/GNU2
-rw-r--r--etc/GNUS-NEWS4
-rw-r--r--etc/NEWS2
-rw-r--r--etc/PROBLEMS2
-rw-r--r--etc/TUTORIAL2
-rw-r--r--etc/TUTORIAL.bg2
-rw-r--r--etc/TUTORIAL.cn2
-rw-r--r--etc/TUTORIAL.cs2
-rw-r--r--etc/TUTORIAL.de2
-rw-r--r--etc/TUTORIAL.es2
-rw-r--r--etc/TUTORIAL.fr2
-rw-r--r--etc/TUTORIAL.it2
-rw-r--r--etc/TUTORIAL.ja2
-rw-r--r--etc/TUTORIAL.ko2
-rw-r--r--etc/TUTORIAL.nl4
-rw-r--r--etc/TUTORIAL.pl2
-rw-r--r--etc/TUTORIAL.pt_BR2
-rw-r--r--etc/TUTORIAL.ro3
-rw-r--r--etc/TUTORIAL.ru2
-rw-r--r--etc/TUTORIAL.sk2
-rw-r--r--etc/TUTORIAL.sl2
-rw-r--r--etc/TUTORIAL.sv2
-rw-r--r--etc/TUTORIAL.th2
-rw-r--r--etc/TUTORIAL.zh2
-rw-r--r--etc/calccard.tex4
-rw-r--r--etc/cs-dired-ref.tex5
-rw-r--r--etc/cs-refcard.tex4
-rw-r--r--etc/cs-survival.tex5
-rw-r--r--etc/de-refcard.tex4
-rw-r--r--etc/dired-ref.tex4
-rw-r--r--etc/edt-user.doc2
-rw-r--r--etc/emacs.15
-rw-r--r--etc/emacs.py2
-rw-r--r--etc/emacstool.12
-rw-r--r--etc/etags.14
-rw-r--r--etc/fr-drdref.tex5
-rw-r--r--etc/fr-refcard.tex4
-rw-r--r--etc/fr-survival.tex5
-rw-r--r--etc/gnus-refcard.tex2
-rw-r--r--etc/gnus-tut.txt3
-rw-r--r--etc/orgcard.tex15
-rw-r--r--etc/pl-refcard.tex5
-rw-r--r--etc/refcard.tex4
-rw-r--r--etc/ru-refcard.tex5
-rw-r--r--etc/sk-dired-ref.tex5
-rw-r--r--etc/sk-refcard.tex4
-rw-r--r--etc/sk-survival.tex5
-rw-r--r--etc/survival.tex5
-rw-r--r--etc/vipcard.tex5
-rw-r--r--etc/viperCard.tex4
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/Makefile.in2
-rw-r--r--lib-src/cvtmail.c2
-rw-r--r--lib-src/digest-doc.c2
-rw-r--r--lib-src/ebrowse.c6
-rw-r--r--lib-src/emacsclient.c2
-rw-r--r--lib-src/emacstool.c2
-rw-r--r--lib-src/etags.c4
-rw-r--r--lib-src/fakemail.c2
-rw-r--r--lib-src/getopt.c2
-rw-r--r--lib-src/getopt1.c2
-rw-r--r--lib-src/getopt_.h2
-rw-r--r--lib-src/getopt_int.h2
-rw-r--r--lib-src/gettext.h2
-rwxr-xr-xlib-src/grep-changelog2
-rw-r--r--lib-src/hexl.c3
-rw-r--r--lib-src/make-docfile.c2
-rw-r--r--lib-src/makefile.w32-in2
-rw-r--r--lib-src/movemail.c2
-rw-r--r--lib-src/ntlib.c3
-rw-r--r--lib-src/ntlib.h3
-rw-r--r--lib-src/pop.c2
-rw-r--r--lib-src/pop.h2
-rw-r--r--lib-src/profile.c2
-rwxr-xr-xlib-src/rcs-checkin2
-rwxr-xr-xlib-src/rcs2log4
-rw-r--r--lib-src/sorted-doc.c2
-rw-r--r--lib-src/test-distrib.c2
-rw-r--r--lib-src/update-game-score.c2
-rwxr-xr-xlib-src/vcdiff2
-rw-r--r--lisp/ChangeLog120
-rw-r--r--lisp/Makefile.in3
-rw-r--r--lisp/abbrev.el2
-rw-r--r--lisp/abbrevlist.el2
-rw-r--r--lisp/align.el2
-rw-r--r--lisp/allout.el2
-rw-r--r--lisp/ansi-color.el2
-rw-r--r--lisp/apropos.el2
-rw-r--r--lisp/arc-mode.el2
-rw-r--r--lisp/autoarg.el2
-rw-r--r--lisp/autoinsert.el2
-rw-r--r--lisp/autorevert.el2
-rw-r--r--lisp/avoid.el2
-rw-r--r--lisp/battery.el2
-rw-r--r--lisp/bindings.el2
-rw-r--r--lisp/bookmark.el2
-rw-r--r--lisp/bs.el2
-rw-r--r--lisp/buff-menu.el2
-rw-r--r--lisp/button.el3
-rw-r--r--lisp/calc/README2
-rw-r--r--lisp/calc/calc-aent.el2
-rw-r--r--lisp/calc/calc-alg.el2
-rw-r--r--lisp/calc/calc-arith.el2
-rw-r--r--lisp/calc/calc-bin.el2
-rw-r--r--lisp/calc/calc-comb.el2
-rw-r--r--lisp/calc/calc-cplx.el2
-rw-r--r--lisp/calc/calc-embed.el2
-rw-r--r--lisp/calc/calc-ext.el2
-rw-r--r--lisp/calc/calc-fin.el2
-rw-r--r--lisp/calc/calc-forms.el2
-rw-r--r--lisp/calc/calc-frac.el2
-rw-r--r--lisp/calc/calc-funcs.el2
-rw-r--r--lisp/calc/calc-graph.el2
-rw-r--r--lisp/calc/calc-help.el4
-rw-r--r--lisp/calc/calc-incom.el2
-rw-r--r--lisp/calc/calc-keypd.el2
-rw-r--r--lisp/calc/calc-lang.el2
-rw-r--r--lisp/calc/calc-macs.el2
-rw-r--r--lisp/calc/calc-map.el2
-rw-r--r--lisp/calc/calc-math.el2
-rw-r--r--lisp/calc/calc-misc.el2
-rw-r--r--lisp/calc/calc-mode.el2
-rw-r--r--lisp/calc/calc-mtx.el2
-rw-r--r--lisp/calc/calc-poly.el2
-rw-r--r--lisp/calc/calc-prog.el2
-rw-r--r--lisp/calc/calc-rewr.el2
-rw-r--r--lisp/calc/calc-rules.el2
-rw-r--r--lisp/calc/calc-sel.el2
-rw-r--r--lisp/calc/calc-stat.el2
-rw-r--r--lisp/calc/calc-store.el2
-rw-r--r--lisp/calc/calc-stuff.el2
-rw-r--r--lisp/calc/calc-trail.el2
-rw-r--r--lisp/calc/calc-undo.el2
-rw-r--r--lisp/calc/calc-units.el2
-rw-r--r--lisp/calc/calc-vec.el2
-rw-r--r--lisp/calc/calc-yank.el2
-rw-r--r--lisp/calc/calc.el2
-rw-r--r--lisp/calc/calcalg2.el2
-rw-r--r--lisp/calc/calcalg3.el2
-rw-r--r--lisp/calc/calccomp.el2
-rw-r--r--lisp/calc/calcsel2.el2
-rw-r--r--lisp/calculator.el4
-rw-r--r--lisp/calendar/calendar.el2
-rw-r--r--lisp/case-table.el2
-rw-r--r--lisp/cdl.el3
-rw-r--r--lisp/chistory.el3
-rw-r--r--lisp/cmuscheme.el2
-rw-r--r--lisp/comint.el2
-rw-r--r--lisp/compare-w.el2
-rw-r--r--lisp/complete.el2
-rw-r--r--lisp/completion.el2
-rw-r--r--lisp/cus-face.el2
-rw-r--r--lisp/cus-start.el2
-rw-r--r--lisp/cus-theme.el3
-rw-r--r--lisp/custom.el2
-rw-r--r--lisp/cvs-status.el2
-rw-r--r--lisp/dabbrev.el2
-rw-r--r--lisp/delim-col.el4
-rw-r--r--lisp/delsel.el2
-rw-r--r--lisp/descr-text.el2
-rw-r--r--lisp/desktop.el2
-rw-r--r--lisp/dframe.el2
-rw-r--r--lisp/diff-mode.el2
-rw-r--r--lisp/diff.el2
-rw-r--r--lisp/dired-aux.el2
-rw-r--r--lisp/dired-x.el2
-rw-r--r--lisp/dired.el13
-rw-r--r--lisp/dirtrack.el3
-rw-r--r--lisp/disp-table.el2
-rw-r--r--lisp/dnd.el2
-rw-r--r--lisp/dos-fns.el2
-rw-r--r--lisp/dos-vars.el3
-rw-r--r--lisp/dos-w32.el3
-rw-r--r--lisp/double.el2
-rw-r--r--lisp/ebuff-menu.el2
-rw-r--r--lisp/echistory.el3
-rw-r--r--lisp/ediff-diff.el2
-rw-r--r--lisp/ediff-help.el2
-rw-r--r--lisp/ediff-hook.el2
-rw-r--r--lisp/ediff-init.el2
-rw-r--r--lisp/ediff-merg.el2
-rw-r--r--lisp/ediff-mult.el2
-rw-r--r--lisp/ediff-ptch.el2
-rw-r--r--lisp/ediff-util.el2
-rw-r--r--lisp/ediff-vers.el2
-rw-r--r--lisp/ediff-wind.el2
-rw-r--r--lisp/ediff.el2
-rw-r--r--lisp/edmacro.el2
-rw-r--r--lisp/ehelp.el2
-rw-r--r--lisp/electric.el2
-rw-r--r--lisp/elide-head.el3
-rw-r--r--lisp/emacs-lisp/advice.el2
-rw-r--r--lisp/emacs-lisp/assoc.el3
-rw-r--r--lisp/emacs-lisp/authors.el3
-rw-r--r--lisp/emacs-lisp/autoload.el2
-rw-r--r--lisp/emacs-lisp/backquote.el2
-rw-r--r--lisp/emacs-lisp/benchmark.el2
-rw-r--r--lisp/emacs-lisp/bindat.el2
-rw-r--r--lisp/emacs-lisp/byte-opt.el2
-rw-r--r--lisp/emacs-lisp/byte-run.el3
-rw-r--r--lisp/emacs-lisp/checkdoc.el2
-rw-r--r--lisp/emacs-lisp/cl-compat.el3
-rw-r--r--lisp/emacs-lisp/cl-extra.el2
-rw-r--r--lisp/emacs-lisp/cl-indent.el2
-rw-r--r--lisp/emacs-lisp/cl-macs.el2
-rw-r--r--lisp/emacs-lisp/cl-seq.el3
-rw-r--r--lisp/emacs-lisp/cl-specs.el3
-rw-r--r--lisp/emacs-lisp/cl.el3
-rw-r--r--lisp/emacs-lisp/copyright.el2
-rw-r--r--lisp/emacs-lisp/crm.el2
-rw-r--r--lisp/emacs-lisp/cust-print.el3
-rw-r--r--lisp/emacs-lisp/debug.el2
-rw-r--r--lisp/emacs-lisp/derived.el2
-rw-r--r--lisp/emacs-lisp/disass.el2
-rw-r--r--lisp/emacs-lisp/easy-mmode.el4
-rw-r--r--lisp/emacs-lisp/easymenu.el2
-rw-r--r--lisp/emacs-lisp/edebug.el2
-rw-r--r--lisp/emacs-lisp/eldoc.el2
-rw-r--r--lisp/emacs-lisp/elint.el3
-rw-r--r--lisp/emacs-lisp/elp.el2
-rw-r--r--lisp/emacs-lisp/ewoc.el2
-rw-r--r--lisp/emacs-lisp/find-func.el4
-rw-r--r--lisp/emacs-lisp/find-gc.el3
-rw-r--r--lisp/emacs-lisp/float-sup.el2
-rw-r--r--lisp/emacs-lisp/generic.el2
-rw-r--r--lisp/emacs-lisp/gulp.el3
-rw-r--r--lisp/emacs-lisp/helper.el3
-rw-r--r--lisp/emacs-lisp/levents.el2
-rw-r--r--lisp/emacs-lisp/lisp-mnt.el2
-rw-r--r--lisp/emacs-lisp/lisp-mode.el2
-rw-r--r--lisp/emacs-lisp/lisp.el2
-rw-r--r--lisp/emacs-lisp/lmenu.el2
-rw-r--r--lisp/emacs-lisp/lselect.el2
-rw-r--r--lisp/emacs-lisp/lucid.el2
-rw-r--r--lisp/emacs-lisp/macroexp.el2
-rw-r--r--lisp/emacs-lisp/map-ynp.el2
-rw-r--r--lisp/emacs-lisp/pp.el2
-rw-r--r--lisp/emacs-lisp/re-builder.el2
-rw-r--r--lisp/emacs-lisp/regexp-opt.el2
-rw-r--r--lisp/emacs-lisp/regi.el3
-rw-r--r--lisp/emacs-lisp/ring.el3
-rw-r--r--lisp/emacs-lisp/rx.el3
-rw-r--r--lisp/emacs-lisp/shadow.el3
-rw-r--r--lisp/emacs-lisp/sregex.el2
-rw-r--r--lisp/emacs-lisp/syntax.el2
-rw-r--r--lisp/emacs-lisp/tcover-ses.el2
-rw-r--r--lisp/emacs-lisp/tcover-unsafep.el2
-rw-r--r--lisp/emacs-lisp/testcover.el2
-rw-r--r--lisp/emacs-lisp/timer.el3
-rw-r--r--lisp/emacs-lisp/tq.el2
-rw-r--r--lisp/emacs-lisp/trace.el2
-rw-r--r--lisp/emacs-lisp/unsafep.el2
-rw-r--r--lisp/emacs-lisp/warnings.el2
-rw-r--r--lisp/emacs-lock.el2
-rw-r--r--lisp/emulation/crisp.el2
-rw-r--r--lisp/emulation/cua-base.el2
-rw-r--r--lisp/emulation/cua-gmrk.el2
-rw-r--r--lisp/emulation/cua-rect.el2
-rw-r--r--lisp/emulation/edt-lk201.el2
-rw-r--r--lisp/emulation/edt-mapper.el2
-rw-r--r--lisp/emulation/edt-pc.el2
-rw-r--r--lisp/emulation/edt-vt100.el2
-rw-r--r--lisp/emulation/edt.el2
-rw-r--r--lisp/emulation/keypad.el3
-rw-r--r--lisp/emulation/pc-mode.el3
-rw-r--r--lisp/emulation/pc-select.el2
-rw-r--r--lisp/emulation/tpu-edt.el2
-rw-r--r--lisp/emulation/tpu-extras.el2
-rw-r--r--lisp/emulation/tpu-mapper.el2
-rw-r--r--lisp/emulation/vip.el2
-rw-r--r--lisp/emulation/viper-cmd.el2
-rw-r--r--lisp/emulation/viper-ex.el2
-rw-r--r--lisp/emulation/viper-init.el2
-rw-r--r--lisp/emulation/viper-keym.el2
-rw-r--r--lisp/emulation/viper-macs.el2
-rw-r--r--lisp/emulation/viper-mous.el2
-rw-r--r--lisp/emulation/viper-util.el2
-rw-r--r--lisp/emulation/viper.el2
-rw-r--r--lisp/emulation/ws-mode.el3
-rw-r--r--lisp/env.el2
-rw-r--r--lisp/erc/ChangeLog66
-rw-r--r--lisp/erc/ChangeLog.01 (renamed from lisp/erc/ChangeLog.2001)0
-rw-r--r--lisp/erc/ChangeLog.02 (renamed from lisp/erc/ChangeLog.2002)2
-rw-r--r--lisp/erc/ChangeLog.03 (renamed from lisp/erc/ChangeLog.2003)2
-rw-r--r--lisp/erc/ChangeLog.04 (renamed from lisp/erc/ChangeLog.2004)2
-rw-r--r--lisp/erc/ChangeLog.05 (renamed from lisp/erc/ChangeLog.2005)2
-rw-r--r--lisp/erc/erc-goodies.el2
-rw-r--r--lisp/erc/erc-hecomplete.el (renamed from lisp/erc/erc-complete.el)41
-rw-r--r--lisp/erc/erc-join.el (renamed from lisp/erc/erc-autojoin.el)10
-rw-r--r--lisp/erc/erc-list.el2
-rw-r--r--lisp/erc/erc-networks.el (renamed from lisp/erc/erc-nets.el)11
-rw-r--r--lisp/erc/erc-notify.el2
-rw-r--r--lisp/erc/erc-services.el (renamed from lisp/erc/erc-nickserv.el)12
-rw-r--r--lisp/erc/erc-spelling.el55
-rw-r--r--lisp/erc/erc-stamp.el26
-rw-r--r--lisp/erc/erc.el44
-rw-r--r--lisp/eshell/em-alias.el2
-rw-r--r--lisp/eshell/em-banner.el2
-rw-r--r--lisp/eshell/em-basic.el2
-rw-r--r--lisp/eshell/em-cmpl.el2
-rw-r--r--lisp/eshell/em-dirs.el2
-rw-r--r--lisp/eshell/em-glob.el2
-rw-r--r--lisp/eshell/em-hist.el2
-rw-r--r--lisp/eshell/em-ls.el2
-rw-r--r--lisp/eshell/em-pred.el2
-rw-r--r--lisp/eshell/em-prompt.el2
-rw-r--r--lisp/eshell/em-rebind.el2
-rw-r--r--lisp/eshell/em-script.el2
-rw-r--r--lisp/eshell/em-smart.el2
-rw-r--r--lisp/eshell/em-term.el2
-rw-r--r--lisp/eshell/em-unix.el2
-rw-r--r--lisp/eshell/em-xtra.el2
-rw-r--r--lisp/eshell/esh-arg.el2
-rw-r--r--lisp/eshell/esh-cmd.el2
-rw-r--r--lisp/eshell/esh-ext.el2
-rw-r--r--lisp/eshell/esh-io.el2
-rw-r--r--lisp/eshell/esh-maint.el2
-rw-r--r--lisp/eshell/esh-mode.el2
-rw-r--r--lisp/eshell/esh-module.el2
-rw-r--r--lisp/eshell/esh-opt.el2
-rw-r--r--lisp/eshell/esh-proc.el2
-rw-r--r--lisp/eshell/esh-test.el2
-rw-r--r--lisp/eshell/esh-util.el2
-rw-r--r--lisp/eshell/esh-var.el2
-rw-r--r--lisp/eshell/eshell.el2
-rw-r--r--lisp/expand.el2
-rw-r--r--lisp/ezimage.el4
-rw-r--r--lisp/facemenu.el2
-rw-r--r--lisp/faces.el2
-rw-r--r--lisp/ffap.el2
-rw-r--r--lisp/filecache.el2
-rw-r--r--lisp/files.el18
-rw-r--r--lisp/filesets.el2
-rw-r--r--lisp/find-dired.el2
-rw-r--r--lisp/find-file.el2
-rw-r--r--lisp/find-lisp.el4
-rw-r--r--lisp/finder.el2
-rw-r--r--lisp/flow-ctrl.el2
-rw-r--r--lisp/foldout.el3
-rw-r--r--lisp/follow.el2
-rw-r--r--lisp/font-core.el2
-rw-r--r--lisp/format.el2
-rw-r--r--lisp/forms.el2
-rw-r--r--lisp/frame.el2
-rw-r--r--lisp/fringe.el2
-rw-r--r--lisp/generic-x.el8
-rw-r--r--lisp/gnus/ChangeLog48
-rw-r--r--lisp/gnus/binhex.el2
-rw-r--r--lisp/gnus/canlock.el2
-rw-r--r--lisp/gnus/compface.el2
-rw-r--r--lisp/gnus/deuglify.el2
-rw-r--r--lisp/gnus/dig.el2
-rw-r--r--lisp/gnus/dns.el2
-rw-r--r--lisp/gnus/earcon.el2
-rw-r--r--lisp/gnus/flow-fill.el2
-rw-r--r--lisp/gnus/format-spec.el2
-rw-r--r--lisp/gnus/gnus-agent.el2
-rw-r--r--lisp/gnus/gnus-art.el75
-rw-r--r--lisp/gnus/gnus-async.el2
-rw-r--r--lisp/gnus/gnus-audio.el2
-rw-r--r--lisp/gnus/gnus-bcklg.el2
-rw-r--r--lisp/gnus/gnus-cache.el2
-rw-r--r--lisp/gnus/gnus-cite.el2
-rw-r--r--lisp/gnus/gnus-delay.el2
-rw-r--r--lisp/gnus/gnus-demon.el2
-rw-r--r--lisp/gnus/gnus-diary.el2
-rw-r--r--lisp/gnus/gnus-dired.el2
-rw-r--r--lisp/gnus/gnus-draft.el2
-rw-r--r--lisp/gnus/gnus-dup.el2
-rw-r--r--lisp/gnus/gnus-eform.el2
-rw-r--r--lisp/gnus/gnus-ems.el2
-rw-r--r--lisp/gnus/gnus-fun.el2
-rw-r--r--lisp/gnus/gnus-gl.el2
-rw-r--r--lisp/gnus/gnus-int.el2
-rw-r--r--lisp/gnus/gnus-kill.el2
-rw-r--r--lisp/gnus/gnus-logic.el2
-rw-r--r--lisp/gnus/gnus-mh.el2
-rw-r--r--lisp/gnus/gnus-ml.el2
-rw-r--r--lisp/gnus/gnus-mlspl.el2
-rw-r--r--lisp/gnus/gnus-move.el2
-rw-r--r--lisp/gnus/gnus-msg.el2
-rw-r--r--lisp/gnus/gnus-nocem.el2
-rw-r--r--lisp/gnus/gnus-picon.el2
-rw-r--r--lisp/gnus/gnus-range.el2
-rw-r--r--lisp/gnus/gnus-registry.el2
-rw-r--r--lisp/gnus/gnus-salt.el2
-rw-r--r--lisp/gnus/gnus-score.el2
-rw-r--r--lisp/gnus/gnus-setup.el2
-rw-r--r--lisp/gnus/gnus-sieve.el2
-rw-r--r--lisp/gnus/gnus-soup.el2
-rw-r--r--lisp/gnus/gnus-spec.el2
-rw-r--r--lisp/gnus/gnus-srvr.el2
-rw-r--r--lisp/gnus/gnus-topic.el2
-rw-r--r--lisp/gnus/gnus-undo.el2
-rw-r--r--lisp/gnus/gnus-util.el4
-rw-r--r--lisp/gnus/gnus-uu.el2
-rw-r--r--lisp/gnus/gnus-vm.el2
-rw-r--r--lisp/gnus/gnus-win.el2
-rw-r--r--lisp/gnus/gnus.el2
-rw-r--r--lisp/gnus/hex-util.el2
-rw-r--r--lisp/gnus/html2text.el2
-rw-r--r--lisp/gnus/ietf-drums.el2
-rw-r--r--lisp/gnus/imap.el2
-rw-r--r--lisp/gnus/mail-parse.el2
-rw-r--r--lisp/gnus/mail-prsvr.el2
-rw-r--r--lisp/gnus/mail-source.el2
-rw-r--r--lisp/gnus/messcompat.el2
-rw-r--r--lisp/gnus/mm-decode.el19
-rw-r--r--lisp/gnus/mm-encode.el2
-rw-r--r--lisp/gnus/mm-extern.el2
-rw-r--r--lisp/gnus/mm-partial.el2
-rw-r--r--lisp/gnus/mm-url.el2
-rw-r--r--lisp/gnus/mm-util.el2
-rw-r--r--lisp/gnus/mml-sec.el2
-rw-r--r--lisp/gnus/mml-smime.el2
-rw-r--r--lisp/gnus/mml.el33
-rw-r--r--lisp/gnus/mml1991.el2
-rw-r--r--lisp/gnus/mml2015.el2
-rw-r--r--lisp/gnus/nnagent.el2
-rw-r--r--lisp/gnus/nnbabyl.el2
-rw-r--r--lisp/gnus/nndb.el2
-rw-r--r--lisp/gnus/nndiary.el2
-rw-r--r--lisp/gnus/nndir.el2
-rw-r--r--lisp/gnus/nndoc.el2
-rw-r--r--lisp/gnus/nndraft.el2
-rw-r--r--lisp/gnus/nneething.el2
-rw-r--r--lisp/gnus/nnfolder.el2
-rw-r--r--lisp/gnus/nngateway.el2
-rw-r--r--lisp/gnus/nnheader.el2
-rw-r--r--lisp/gnus/nnimap.el2
-rw-r--r--lisp/gnus/nnkiboze.el2
-rw-r--r--lisp/gnus/nnlistserv.el2
-rw-r--r--lisp/gnus/nnmail.el2
-rw-r--r--lisp/gnus/nnmbox.el2
-rw-r--r--lisp/gnus/nnmh.el2
-rw-r--r--lisp/gnus/nnml.el2
-rw-r--r--lisp/gnus/nnoo.el2
-rw-r--r--lisp/gnus/nnslashdot.el2
-rw-r--r--lisp/gnus/nnsoup.el2
-rw-r--r--lisp/gnus/nnspool.el2
-rw-r--r--lisp/gnus/nntp.el2
-rw-r--r--lisp/gnus/nnultimate.el2
-rw-r--r--lisp/gnus/nnvirtual.el2
-rw-r--r--lisp/gnus/nnwarchive.el2
-rw-r--r--lisp/gnus/nnwfm.el3
-rw-r--r--lisp/gnus/pop3.el2
-rw-r--r--lisp/gnus/qp.el2
-rw-r--r--lisp/gnus/rfc1843.el5
-rw-r--r--lisp/gnus/rfc2045.el2
-rw-r--r--lisp/gnus/rfc2047.el2
-rw-r--r--lisp/gnus/rfc2104.el2
-rw-r--r--lisp/gnus/rfc2231.el171
-rw-r--r--lisp/gnus/score-mode.el2
-rw-r--r--lisp/gnus/sha1.el2
-rw-r--r--lisp/gnus/sieve-manage.el3
-rw-r--r--lisp/gnus/sieve-mode.el3
-rw-r--r--lisp/gnus/sieve.el2
-rw-r--r--lisp/gnus/smiley.el2
-rw-r--r--lisp/gnus/smime.el2
-rw-r--r--lisp/gnus/spam-report.el8
-rw-r--r--lisp/gnus/spam-stat.el2
-rw-r--r--lisp/gnus/spam.el2
-rw-r--r--lisp/gnus/starttls.el2
-rw-r--r--lisp/gnus/utf7.el2
-rw-r--r--lisp/gnus/uudecode.el2
-rw-r--r--lisp/gnus/webmail.el4
-rw-r--r--lisp/gnus/yenc.el2
-rw-r--r--lisp/gs.el2
-rw-r--r--lisp/help-at-pt.el2
-rw-r--r--lisp/help-macro.el2
-rw-r--r--lisp/help-mode.el2
-rw-r--r--lisp/help.el2
-rw-r--r--lisp/hexl.el2
-rw-r--r--lisp/hi-lock.el2
-rw-r--r--lisp/hilit-chg.el2
-rw-r--r--lisp/hippie-exp.el3
-rw-r--r--lisp/ibuf-macs.el2
-rw-r--r--lisp/icomplete.el2
-rw-r--r--lisp/ido.el2
-rw-r--r--lisp/ielm.el3
-rw-r--r--lisp/iimage.el2
-rw-r--r--lisp/image-file.el2
-rw-r--r--lisp/image-mode.el2
-rw-r--r--lisp/image.el2
-rw-r--r--lisp/imenu.el2
-rw-r--r--lisp/indent.el2
-rw-r--r--lisp/info-look.el2
-rw-r--r--lisp/info-xref.el2
-rw-r--r--lisp/info.el8
-rw-r--r--lisp/informat.el3
-rw-r--r--lisp/isearch.el2
-rw-r--r--lisp/isearchb.el2
-rw-r--r--lisp/iswitchb.el2
-rw-r--r--lisp/jit-lock.el2
-rw-r--r--lisp/jka-cmpr-hook.el2
-rw-r--r--lisp/jka-compr.el2
-rw-r--r--lisp/kermit.el3
-rw-r--r--lisp/kmacro.el2
-rw-r--r--lisp/ldefs-boot.el2575
-rw-r--r--lisp/ledit.el3
-rw-r--r--lisp/loadhist.el2
-rw-r--r--lisp/loadup.el2
-rw-r--r--lisp/locate.el2
-rw-r--r--lisp/log-edit.el2
-rw-r--r--lisp/log-view.el4
-rw-r--r--lisp/longlines.el2
-rw-r--r--lisp/lpr.el2
-rw-r--r--lisp/ls-lisp.el2
-rw-r--r--lisp/macros.el2
-rw-r--r--lisp/mail/blessmail.el3
-rw-r--r--lisp/mail/emacsbug.el2
-rw-r--r--lisp/mail/footnote.el2
-rw-r--r--lisp/mail/mail-extr.el2
-rw-r--r--lisp/mail/mail-hist.el3
-rw-r--r--lisp/mail/mail-utils.el2
-rw-r--r--lisp/mail/mailabbrev.el2
-rw-r--r--lisp/mail/mailalias.el2
-rw-r--r--lisp/mail/mailclient.el2
-rw-r--r--lisp/mail/mailheader.el3
-rw-r--r--lisp/mail/metamail.el2
-rw-r--r--lisp/mail/mspools.el3
-rw-r--r--lisp/mail/reporter.el2
-rw-r--r--lisp/mail/rfc2368.el2
-rw-r--r--lisp/mail/rfc822.el2
-rw-r--r--lisp/mail/rmail-spam-filter.el2
-rw-r--r--lisp/mail/rmail.el2
-rw-r--r--lisp/mail/rmailedit.el2
-rw-r--r--lisp/mail/rmailkwd.el2
-rw-r--r--lisp/mail/rmailmsc.el3
-rw-r--r--lisp/mail/rmailout.el2
-rw-r--r--lisp/mail/rmailsort.el2
-rw-r--r--lisp/mail/rmailsum.el2
-rw-r--r--lisp/mail/sendmail.el2
-rw-r--r--lisp/mail/smtpmail.el4
-rw-r--r--lisp/mail/supercite.el2
-rw-r--r--lisp/mail/uce.el2
-rw-r--r--lisp/mail/undigest.el2
-rw-r--r--lisp/mail/unrmail.el3
-rw-r--r--lisp/mail/vms-pmail.el3
-rw-r--r--lisp/makesum.el3
-rw-r--r--lisp/man.el2
-rw-r--r--lisp/menu-bar.el2
-rw-r--r--lisp/mh-e/ChangeLog13
-rw-r--r--lisp/mh-e/mh-e.el7
-rw-r--r--lisp/mh-e/mh-mime.el14
-rw-r--r--lisp/midnight.el3
-rw-r--r--lisp/minibuf-eldef.el2
-rw-r--r--lisp/misc.el3
-rw-r--r--lisp/mouse-copy.el3
-rw-r--r--lisp/mouse-drag.el2
-rw-r--r--lisp/mouse-sel.el2
-rw-r--r--lisp/mouse.el2
-rw-r--r--lisp/msb.el2
-rw-r--r--lisp/mwheel.el2
-rw-r--r--lisp/net/ange-ftp.el2
-rw-r--r--lisp/net/browse-url.el2
-rw-r--r--lisp/net/eudc-bob.el2
-rw-r--r--lisp/net/eudc-export.el2
-rw-r--r--lisp/net/eudc-hotlist.el2
-rw-r--r--lisp/net/eudc-vars.el2
-rw-r--r--lisp/net/eudc.el2
-rw-r--r--lisp/net/eudcb-bbdb.el2
-rw-r--r--lisp/net/eudcb-ldap.el2
-rw-r--r--lisp/net/eudcb-mab.el2
-rw-r--r--lisp/net/eudcb-ph.el2
-rw-r--r--lisp/net/goto-addr.el2
-rw-r--r--lisp/net/ldap.el2
-rw-r--r--lisp/net/net-utils.el2
-rw-r--r--lisp/net/netrc.el2
-rw-r--r--lisp/net/newsticker.el2
-rw-r--r--lisp/net/quickurl.el2
-rw-r--r--lisp/net/rcirc.el2
-rw-r--r--lisp/net/rcompile.el2
-rw-r--r--lisp/net/rlogin.el2
-rw-r--r--lisp/net/snmp-mode.el2
-rw-r--r--lisp/net/telnet.el2
-rw-r--r--lisp/net/tls.el2
-rw-r--r--lisp/net/tramp-smb.el2
-rw-r--r--lisp/net/tramp-uu.el2
-rw-r--r--lisp/net/tramp.el4
-rw-r--r--lisp/net/trampver.el2
-rw-r--r--lisp/net/webjump.el2
-rw-r--r--lisp/net/zone-mode.el3
-rw-r--r--lisp/novice.el2
-rw-r--r--lisp/obsolete/awk-mode.el2
-rw-r--r--lisp/obsolete/bg-mouse.el3
-rw-r--r--lisp/obsolete/fast-lock.el2
-rw-r--r--lisp/obsolete/float.el3
-rw-r--r--lisp/obsolete/hilit19.el2
-rw-r--r--lisp/obsolete/hscroll.el2
-rw-r--r--lisp/obsolete/iso-acc.el2
-rw-r--r--lisp/obsolete/iso-swed.el3
-rw-r--r--lisp/obsolete/keyswap.el3
-rw-r--r--lisp/obsolete/lazy-lock.el2
-rw-r--r--lisp/obsolete/mlsupport.el3
-rw-r--r--lisp/obsolete/ooutline.el2
-rw-r--r--lisp/obsolete/options.el3
-rw-r--r--lisp/obsolete/profile.el2
-rw-r--r--lisp/obsolete/rnews.el2
-rw-r--r--lisp/obsolete/rnewspost.el2
-rw-r--r--lisp/obsolete/rsz-mini.el2
-rw-r--r--lisp/obsolete/scribe.el3
-rw-r--r--lisp/obsolete/sun-curs.el3
-rw-r--r--lisp/obsolete/sun-fns.el3
-rw-r--r--lisp/obsolete/uncompress.el2
-rw-r--r--lisp/obsolete/x-apollo.el3
-rw-r--r--lisp/obsolete/x-menu.el3
-rw-r--r--lisp/outline.el2
-rw-r--r--lisp/paren.el2
-rw-r--r--lisp/paths.el2
-rw-r--r--lisp/pcmpl-cvs.el2
-rw-r--r--lisp/pcmpl-gnu.el2
-rw-r--r--lisp/pcmpl-linux.el2
-rw-r--r--lisp/pcmpl-rpm.el2
-rw-r--r--lisp/pcmpl-unix.el2
-rw-r--r--lisp/pcomplete.el2
-rw-r--r--lisp/pcvs-defs.el2
-rw-r--r--lisp/pcvs-info.el2
-rw-r--r--lisp/pcvs-parse.el2
-rw-r--r--lisp/pcvs-util.el2
-rw-r--r--lisp/pcvs.el2
-rw-r--r--lisp/pgg-def.el3
-rw-r--r--lisp/pgg-gpg.el2
-rw-r--r--lisp/pgg-parse.el3
-rw-r--r--lisp/pgg-pgp.el2
-rw-r--r--lisp/pgg-pgp5.el2
-rw-r--r--lisp/pgg.el2
-rw-r--r--lisp/play/5x5.el2
-rw-r--r--lisp/play/animate.el3
-rw-r--r--lisp/play/blackbox.el2
-rw-r--r--lisp/play/bruce.el2
-rw-r--r--lisp/play/cookie1.el3
-rw-r--r--lisp/play/decipher.el2
-rw-r--r--lisp/play/dissociate.el3
-rw-r--r--lisp/play/dunnet.el2
-rw-r--r--lisp/play/fortune.el2
-rw-r--r--lisp/play/gamegrid.el2
-rw-r--r--lisp/play/gametree.el2
-rw-r--r--lisp/play/gomoku.el2
-rw-r--r--lisp/play/handwrite.el3
-rw-r--r--lisp/play/landmark.el2
-rw-r--r--lisp/play/life.el2
-rw-r--r--lisp/play/morse.el3
-rw-r--r--lisp/play/mpuz.el3
-rw-r--r--lisp/play/pong.el2
-rw-r--r--lisp/play/snake.el3
-rw-r--r--lisp/play/solitaire.el3
-rw-r--r--lisp/play/spook.el2
-rw-r--r--lisp/play/tetris.el3
-rw-r--r--lisp/play/yow.el2
-rw-r--r--lisp/play/zone.el2
-rw-r--r--lisp/printing.el5
-rw-r--r--lisp/progmodes/gdb-ui.el24
-rw-r--r--lisp/progmodes/gud.el1
-rw-r--r--lisp/ps-bdf.el3
-rw-r--r--lisp/ps-mule.el2
-rw-r--r--lisp/ps-print.el2
-rw-r--r--lisp/recentf.el2
-rw-r--r--lisp/rect.el2
-rw-r--r--lisp/register.el2
-rw-r--r--lisp/repeat.el3
-rw-r--r--lisp/replace.el2
-rw-r--r--lisp/reposition.el2
-rw-r--r--lisp/resume.el3
-rw-r--r--lisp/rfn-eshadow.el2
-rw-r--r--lisp/rot13.el3
-rw-r--r--lisp/ruler-mode.el3
-rw-r--r--lisp/s-region.el2
-rw-r--r--lisp/savehist.el2
-rw-r--r--lisp/saveplace.el2
-rw-r--r--lisp/sb-image.el3
-rw-r--r--lisp/scroll-all.el3
-rw-r--r--lisp/scroll-bar.el2
-rw-r--r--lisp/scroll-lock.el2
-rw-r--r--lisp/select.el2
-rw-r--r--lisp/server.el2
-rw-r--r--lisp/shadowfile.el2
-rw-r--r--lisp/shell.el2
-rw-r--r--lisp/simple.el9
-rw-r--r--lisp/skeleton.el2
-rw-r--r--lisp/smerge-mode.el2
-rw-r--r--lisp/sort.el2
-rw-r--r--lisp/soundex.el3
-rw-r--r--lisp/speedbar.el3
-rw-r--r--lisp/strokes.el2
-rw-r--r--lisp/subr.el2
-rw-r--r--lisp/tabify.el2
-rw-r--r--lisp/talk.el3
-rw-r--r--lisp/tar-mode.el2
-rw-r--r--lisp/tempo.el2
-rw-r--r--lisp/term/AT386.el3
-rw-r--r--lisp/term/internal.el2
-rw-r--r--lisp/term/iris-ansi.el3
-rw-r--r--lisp/term/mac-win.el2
-rw-r--r--lisp/term/news.el2
-rw-r--r--lisp/term/pc-win.el2
-rw-r--r--lisp/term/rxvt.el2
-rw-r--r--lisp/term/sun-mouse.el3
-rw-r--r--lisp/term/sun.el2
-rw-r--r--lisp/term/sup-mouse.el2
-rw-r--r--lisp/term/tty-colors.el2
-rw-r--r--lisp/term/tvi970.el3
-rw-r--r--lisp/term/vt100.el2
-rw-r--r--lisp/term/wyse50.el2
-rw-r--r--lisp/term/x-win.el2
-rw-r--r--lisp/term/xterm.el3
-rw-r--r--lisp/terminal.el2
-rw-r--r--lisp/textmodes/artist.el2
-rw-r--r--lisp/textmodes/bib-mode.el3
-rw-r--r--lisp/textmodes/bibtex.el2
-rw-r--r--lisp/textmodes/conf-mode.el2
-rw-r--r--lisp/textmodes/dns-mode.el2
-rw-r--r--lisp/textmodes/enriched.el2
-rw-r--r--lisp/textmodes/fill.el2
-rw-r--r--lisp/textmodes/makeinfo.el2
-rw-r--r--lisp/textmodes/nroff-mode.el52
-rw-r--r--lisp/textmodes/org.el2
-rw-r--r--lisp/textmodes/page-ext.el2
-rw-r--r--lisp/textmodes/page.el3
-rw-r--r--lisp/textmodes/paragraphs.el2
-rw-r--r--lisp/textmodes/picture.el2
-rw-r--r--lisp/textmodes/po.el2
-rw-r--r--lisp/textmodes/refbib.el3
-rw-r--r--lisp/textmodes/refer.el2
-rw-r--r--lisp/textmodes/refill.el3
-rw-r--r--lisp/textmodes/reftex-auc.el18
-rw-r--r--lisp/textmodes/reftex-cite.el4
-rw-r--r--lisp/textmodes/reftex-dcr.el4
-rw-r--r--lisp/textmodes/reftex-global.el4
-rw-r--r--lisp/textmodes/reftex-index.el4
-rw-r--r--lisp/textmodes/reftex-parse.el4
-rw-r--r--lisp/textmodes/reftex-ref.el4
-rw-r--r--lisp/textmodes/reftex-sel.el4
-rw-r--r--lisp/textmodes/reftex-toc.el4
-rw-r--r--lisp/textmodes/reftex-vars.el4
-rw-r--r--lisp/textmodes/reftex.el4
-rw-r--r--lisp/textmodes/sgml-mode.el2
-rw-r--r--lisp/textmodes/spell.el3
-rw-r--r--lisp/textmodes/tex-mode.el2
-rw-r--r--lisp/textmodes/texinfmt.el2
-rw-r--r--lisp/textmodes/texinfo.el2
-rw-r--r--lisp/textmodes/texnfo-upd.el2
-rw-r--r--lisp/textmodes/text-mode.el2
-rw-r--r--lisp/textmodes/tildify.el2
-rw-r--r--lisp/textmodes/two-column.el2
-rw-r--r--lisp/textmodes/underline.el3
-rw-r--r--lisp/thingatpt.el2
-rw-r--r--lisp/thumbs.el2
-rw-r--r--lisp/time-stamp.el4
-rw-r--r--lisp/time.el2
-rw-r--r--lisp/timezone.el2
-rw-r--r--lisp/tmm.el2
-rw-r--r--lisp/tool-bar.el2
-rw-r--r--lisp/tooltip.el2
-rw-r--r--lisp/tree-widget.el2
-rw-r--r--lisp/tumme.el208
-rw-r--r--lisp/type-break.el2
-rw-r--r--lisp/uniquify.el2
-rw-r--r--lisp/url/url-about.el2
-rw-r--r--lisp/url/url-auth.el2
-rw-r--r--lisp/url/url-cid.el2
-rw-r--r--lisp/url/url-dav.el2
-rw-r--r--lisp/url/url-dired.el2
-rw-r--r--lisp/url/url-expand.el2
-rw-r--r--lisp/url/url-file.el2
-rw-r--r--lisp/url/url-ftp.el2
-rw-r--r--lisp/url/url-gw.el2
-rw-r--r--lisp/url/url-http.el2
-rw-r--r--lisp/url/url-https.el2
-rw-r--r--lisp/url/url-imap.el2
-rw-r--r--lisp/url/url-irc.el2
-rw-r--r--lisp/url/url-ldap.el2
-rw-r--r--lisp/url/url-mailto.el2
-rw-r--r--lisp/url/url-methods.el2
-rw-r--r--lisp/url/url-misc.el2
-rw-r--r--lisp/url/url-nfs.el2
-rw-r--r--lisp/url/url-ns.el3
-rw-r--r--lisp/url/url-parse.el2
-rw-r--r--lisp/url/url-proxy.el2
-rw-r--r--lisp/url/url-util.el2
-rw-r--r--lisp/url/vc-dav.el2
-rw-r--r--lisp/userlock.el2
-rw-r--r--lisp/vc-arch.el2
-rw-r--r--lisp/vc-cvs.el2
-rw-r--r--lisp/vc-hooks.el2
-rw-r--r--lisp/vc-mcvs.el2
-rw-r--r--lisp/vc-rcs.el2
-rw-r--r--lisp/vc-sccs.el2
-rw-r--r--lisp/vc-svn.el21
-rw-r--r--lisp/vc.el5
-rw-r--r--lisp/vcursor.el2
-rw-r--r--lisp/version.el2
-rw-r--r--lisp/view.el2
-rw-r--r--lisp/vms-patch.el2
-rw-r--r--lisp/vmsproc.el3
-rw-r--r--lisp/vt-control.el2
-rw-r--r--lisp/vt100-led.el3
-rw-r--r--lisp/w32-fns.el2
-rw-r--r--lisp/w32-vars.el2
-rw-r--r--lisp/wdired.el270
-rw-r--r--lisp/whitespace.el2
-rw-r--r--lisp/wid-browse.el3
-rw-r--r--lisp/wid-edit.el2
-rw-r--r--lisp/widget.el2
-rw-r--r--lisp/windmove.el2
-rw-r--r--lisp/window.el2
-rw-r--r--lisp/winner.el4
-rw-r--r--lisp/woman.el3
-rw-r--r--lisp/x-dnd.el2
-rw-r--r--lisp/xml.el2
-rw-r--r--lisp/xt-mouse.el2
-rw-r--r--lispintro/ChangeLog4
-rw-r--r--lispintro/Makefile.in2
-rw-r--r--lispintro/aclocal.m42
-rw-r--r--lispintro/emacs-lisp-intro.texi2
-rw-r--r--lispintro/makefile.w32-in2
-rw-r--r--lispref/ChangeLog35
-rw-r--r--lispref/Makefile.in2
-rw-r--r--lispref/abbrevs.texi2
-rw-r--r--lispref/advice.texi2
-rw-r--r--lispref/anti.texi3
-rw-r--r--lispref/backups.texi2
-rw-r--r--lispref/buffers.texi2
-rw-r--r--lispref/commands.texi4
-rw-r--r--lispref/compile.texi2
-rw-r--r--lispref/control.texi2
-rw-r--r--lispref/customize.texi2
-rw-r--r--lispref/debugging.texi2
-rw-r--r--lispref/display.texi18
-rw-r--r--lispref/edebug.texi2
-rw-r--r--lispref/elisp.texi4
-rw-r--r--lispref/errors.texi2
-rw-r--r--lispref/eval.texi2
-rw-r--r--lispref/files.texi2
-rw-r--r--lispref/frames.texi2
-rw-r--r--lispref/functions.texi4
-rw-r--r--lispref/hash.texi3
-rw-r--r--lispref/help.texi2
-rw-r--r--lispref/hooks.texi2
-rw-r--r--lispref/internals.texi2
-rw-r--r--lispref/intro.texi2
-rw-r--r--lispref/keymaps.texi14
-rw-r--r--lispref/lists.texi2
-rw-r--r--lispref/loading.texi2
-rw-r--r--lispref/locals.texi2
-rw-r--r--lispref/macros.texi2
-rw-r--r--lispref/makefile.w32-in2
-rw-r--r--lispref/maps.texi2
-rw-r--r--lispref/markers.texi2
-rw-r--r--lispref/minibuf.texi2
-rw-r--r--lispref/modes.texi2
-rw-r--r--lispref/nonascii.texi2
-rw-r--r--lispref/numbers.texi2
-rw-r--r--lispref/objects.texi2
-rw-r--r--lispref/os.texi2
-rw-r--r--lispref/positions.texi2
-rw-r--r--lispref/processes.texi2
-rw-r--r--lispref/searching.texi2
-rw-r--r--lispref/sequences.texi2
-rw-r--r--lispref/streams.texi2
-rw-r--r--lispref/strings.texi2
-rw-r--r--lispref/symbols.texi2
-rw-r--r--lispref/syntax.texi2
-rw-r--r--lispref/text.texi2
-rwxr-xr-xlispref/tindex.pl3
-rw-r--r--lispref/tips.texi2
-rw-r--r--lispref/variables.texi2
-rw-r--r--lispref/vol1.texi2
-rw-r--r--lispref/vol2.texi2
-rw-r--r--lispref/windows.texi2
-rw-r--r--lwlib/ChangeLog2
-rw-r--r--lwlib/lwlib-Xlw.c2
-rw-r--r--lwlib/lwlib-Xm.c2
-rw-r--r--lwlib/lwlib-Xm.h2
-rw-r--r--lwlib/xlwmenu.c2
-rw-r--r--lwlib/xlwmenu.h3
-rw-r--r--lwlib/xlwmenuP.h2
-rw-r--r--m4/getopt.m42
-rw-r--r--mac/ChangeLog3
-rw-r--r--mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings2
-rw-r--r--mac/INSTALL3
-rw-r--r--mac/README3
-rw-r--r--mac/cw6-mcp.xml3
-rw-r--r--mac/inc/alloca.h3
-rw-r--r--mac/inc/config.h2
-rw-r--r--mac/inc/defs-cw6.h3
-rw-r--r--mac/inc/dirent.h2
-rw-r--r--mac/inc/epaths.h2
-rwxr-xr-xmac/inc/grp.h2
-rw-r--r--mac/inc/m-mac.h2
-rw-r--r--mac/inc/pwd.h2
-rw-r--r--mac/inc/s-mac.h2
-rw-r--r--mac/inc/sys/file.h2
-rw-r--r--mac/inc/sys/ioctl.h2
-rw-r--r--mac/inc/sys/param.h2
-rw-r--r--mac/inc/sys/stat.h2
-rw-r--r--mac/inc/sys/time.h3
-rw-r--r--mac/inc/sys/types.h2
-rw-r--r--mac/inc/termio.h2
-rw-r--r--mac/inc/utime.h3
-rw-r--r--mac/inc/utsname.h3
-rwxr-xr-xmac/make-package2
-rw-r--r--mac/makefile.MPW2
-rw-r--r--mac/src/Emacs.r4
-rw-r--r--mac/src/EmacsMPW.r2
-rw-r--r--mac/src/chdir.c2
-rw-r--r--man/ChangeLog122
-rw-r--r--man/Makefile.in2
-rw-r--r--man/abbrevs.texi126
-rw-r--r--man/ack.texi2
-rw-r--r--man/ada-mode.texi2
-rw-r--r--man/anti.texi4
-rw-r--r--man/autotype.texi4
-rw-r--r--man/basic.texi8
-rw-r--r--man/buffers.texi2
-rw-r--r--man/building.texi535
-rw-r--r--man/calc.texi4
-rw-r--r--man/calendar.texi2
-rw-r--r--man/cc-mode.texi2
-rw-r--r--man/cl.texi2
-rw-r--r--man/cmdargs.texi12
-rw-r--r--man/commands.texi4
-rw-r--r--man/custom.texi12
-rw-r--r--man/dired-x.texi2
-rw-r--r--man/dired.texi2
-rw-r--r--man/display.texi4
-rw-r--r--man/ebrowse.texi2
-rw-r--r--man/ediff.texi2
-rw-r--r--man/emacs-mime.texi2
-rw-r--r--man/emacs-xtra.texi2
-rw-r--r--man/emacs.texi28
-rw-r--r--man/entering.texi2
-rw-r--r--man/erc.texi4
-rw-r--r--man/eshell.texi2
-rw-r--r--man/eudc.texi2
-rw-r--r--man/faq.texi19
-rw-r--r--man/files.texi13
-rw-r--r--man/fixit.texi2
-rw-r--r--man/forms.texi2
-rw-r--r--man/frames.texi12
-rw-r--r--man/glossary.texi20
-rw-r--r--man/gnu.texi2
-rw-r--r--man/help.texi4
-rw-r--r--man/idlwave.texi4
-rw-r--r--man/indent.texi2
-rw-r--r--man/info.texi2
-rw-r--r--man/killing.texi6
-rw-r--r--man/kmacro.texi67
-rw-r--r--man/m-x.texi2
-rw-r--r--man/macos.texi2
-rw-r--r--man/maintaining.texi253
-rw-r--r--man/major.texi2
-rw-r--r--man/makefile.w32-in2
-rw-r--r--man/mark.texi2
-rw-r--r--man/mh-e.texi4
-rw-r--r--man/mini.texi2
-rw-r--r--man/misc.texi2
-rw-r--r--man/msdog.texi2
-rw-r--r--man/mule.texi58
-rw-r--r--man/newsticker.texi2
-rw-r--r--man/org.texi2
-rw-r--r--man/pcl-cvs.texi2
-rw-r--r--man/pgg.texi2
-rw-r--r--man/picture.texi4
-rw-r--r--man/programs.texi146
-rw-r--r--man/reftex.texi3
-rw-r--r--man/regs.texi2
-rw-r--r--man/rmail.texi186
-rw-r--r--man/sc.texi2
-rw-r--r--man/screen.texi2
-rw-r--r--man/search.texi4
-rw-r--r--man/sending.texi18
-rw-r--r--man/ses.texi3
-rw-r--r--man/sieve.texi2
-rw-r--r--man/smtpmail.texi2
-rw-r--r--man/speedbar.texi2
-rw-r--r--man/texinfo.tex4
-rw-r--r--man/text.texi427
-rw-r--r--man/trouble.texi10
-rw-r--r--man/url.texi4
-rw-r--r--man/vip.texi2
-rw-r--r--man/viper.texi2
-rw-r--r--man/widget.texi3
-rw-r--r--man/windows.texi2
-rw-r--r--man/woman.texi4
-rw-r--r--man/xresources.texi16
-rw-r--r--msdos/ChangeLog2
-rw-r--r--msdos/README3
-rw-r--r--msdos/mainmake2
-rw-r--r--msdos/mainmake.v22
-rw-r--r--msdos/sed1.inp2
-rw-r--r--msdos/sed1v2.inp2
-rw-r--r--msdos/sed2.inp2
-rw-r--r--msdos/sed2v2.inp2
-rw-r--r--msdos/sed2x.inp3
-rw-r--r--msdos/sed3.inp2
-rw-r--r--msdos/sed3v2.inp2
-rw-r--r--msdos/sed4.inp3
-rw-r--r--msdos/sed5x.inp3
-rw-r--r--msdos/sed6.inp2
-rw-r--r--msdos/sedleim.inp2
-rw-r--r--msdos/sedlisp.inp3
-rw-r--r--nt/ChangeLog2
-rw-r--r--nt/INSTALL3
-rw-r--r--nt/README3
-rw-r--r--nt/addpm.c3
-rw-r--r--nt/addsection.c3
-rw-r--r--nt/cmdproxy.c3
-rw-r--r--nt/config.nt2
-rwxr-xr-xnt/configure.bat4
-rw-r--r--nt/ddeclient.c3
-rw-r--r--nt/emacs.rc2
-rw-r--r--nt/envadd.bat2
-rw-r--r--nt/gmake.defs4
-rwxr-xr-xnt/inc/grp.h2
-rw-r--r--nt/inc/sys/socket.h3
-rw-r--r--nt/makefile.w32-in2
-rw-r--r--nt/multi-install-info.bat2
-rw-r--r--nt/nmake.defs2
-rw-r--r--nt/paths.h2
-rw-r--r--nt/preprep.c3
-rw-r--r--nt/runemacs.c2
-rw-r--r--oldXMenu/Activate.c3
-rw-r--r--oldXMenu/AddPane.c3
-rw-r--r--oldXMenu/AddSel.c3
-rw-r--r--oldXMenu/ChangeLog2
-rw-r--r--oldXMenu/ChgPane.c3
-rw-r--r--oldXMenu/ChgSel.c3
-rw-r--r--oldXMenu/Create.c3
-rw-r--r--oldXMenu/DelPane.c3
-rw-r--r--oldXMenu/DelSel.c3
-rw-r--r--oldXMenu/Destroy.c3
-rw-r--r--oldXMenu/Error.c3
-rw-r--r--oldXMenu/EvHand.c3
-rw-r--r--oldXMenu/FindPane.c3
-rw-r--r--oldXMenu/FindSel.c3
-rw-r--r--oldXMenu/InsPane.c3
-rw-r--r--oldXMenu/InsSel.c3
-rw-r--r--oldXMenu/Internal.c3
-rw-r--r--oldXMenu/Locate.c3
-rw-r--r--oldXMenu/Post.c3
-rw-r--r--oldXMenu/Recomp.c3
-rw-r--r--oldXMenu/SetAEQ.c3
-rw-r--r--oldXMenu/SetFrz.c3
-rw-r--r--oldXMenu/SetPane.c3
-rw-r--r--oldXMenu/SetSel.c3
-rw-r--r--oldXMenu/X10.h3
-rw-r--r--oldXMenu/XCrAssoc.c3
-rw-r--r--oldXMenu/XDelAssoc.c3
-rw-r--r--oldXMenu/XDestAssoc.c3
-rw-r--r--oldXMenu/XLookAssoc.c3
-rw-r--r--oldXMenu/XMakeAssoc.c3
-rw-r--r--oldXMenu/XMenu.h3
-rw-r--r--oldXMenu/XMenuInt.h4
-rw-r--r--oldXMenu/copyright.h3
-rw-r--r--oldXMenu/insque.c3
-rw-r--r--src/.gdbinit4
-rw-r--r--src/ChangeLog38
-rw-r--r--src/Makefile.in2
-rw-r--r--src/abbrev.c2
-rw-r--r--src/atimer.c3
-rw-r--r--src/atimer.h3
-rw-r--r--src/blockinput.h2
-rw-r--r--src/buffer.c2
-rw-r--r--src/buffer.h2
-rw-r--r--src/bytecode.c2
-rw-r--r--src/callint.c2
-rw-r--r--src/callproc.c2
-rw-r--r--src/casefiddle.c2
-rw-r--r--src/casetab.c2
-rw-r--r--src/category.c2
-rw-r--r--src/ccl.c3
-rw-r--r--src/charset.c3
-rw-r--r--src/charset.h3
-rw-r--r--src/cm.c2
-rw-r--r--src/cm.h2
-rw-r--r--src/cmds.c2
-rw-r--r--src/coding.c3
-rw-r--r--src/coding.h3
-rw-r--r--src/commands.h2
-rw-r--r--src/composite.c3
-rw-r--r--src/composite.h3
-rw-r--r--src/config.in4
-rw-r--r--src/cxux-crt0.s3
-rw-r--r--src/data.c2
-rw-r--r--src/dired.c2
-rw-r--r--src/dispextern.h4
-rw-r--r--src/dispnew.c2
-rw-r--r--src/disptab.h3
-rw-r--r--src/doc.c2
-rw-r--r--src/doprnt.c3
-rw-r--r--src/dosfns.c2
-rw-r--r--src/dosfns.h2
-rw-r--r--src/ecrt0.c2
-rw-r--r--src/editfns.c17
-rw-r--r--src/epaths.in2
-rw-r--r--src/eval.c2
-rw-r--r--src/filelock.c2
-rw-r--r--src/filemode.c2
-rw-r--r--src/firstfile.c3
-rw-r--r--src/floatfns.c2
-rw-r--r--src/fns.c2
-rw-r--r--src/fontset.c2
-rw-r--r--src/fontset.h3
-rw-r--r--src/frame.c2
-rw-r--r--src/frame.h2
-rw-r--r--src/fringe.c2
-rw-r--r--src/getloadavg.c2
-rw-r--r--src/getpagesize.h2
-rw-r--r--src/gmalloc.c2
-rw-r--r--src/gtkutil.c2
-rw-r--r--src/gtkutil.h2
-rw-r--r--src/image.c2
-rw-r--r--src/indent.c2
-rw-r--r--src/indent.h2
-rw-r--r--src/insdel.c2
-rw-r--r--src/intervals.c2
-rw-r--r--src/intervals.h2
-rw-r--r--src/keyboard.c2
-rw-r--r--src/keyboard.h2
-rw-r--r--src/keymap.c2
-rw-r--r--src/keymap.h3
-rw-r--r--src/lastfile.c3
-rw-r--r--src/lisp.h8
-rw-r--r--src/lread.c4
-rw-r--r--src/m/7300.h3
-rw-r--r--src/m/acorn.h3
-rw-r--r--src/m/alliant-2800.h3
-rw-r--r--src/m/alliant.h2
-rw-r--r--src/m/alpha.h2
-rw-r--r--src/m/altos.h2
-rw-r--r--src/m/amdahl.h2
-rw-r--r--src/m/amdx86-64.h2
-rw-r--r--src/m/apollo.h2
-rw-r--r--src/m/arm.h3
-rw-r--r--src/m/att3b.h3
-rw-r--r--src/m/aviion.h2
-rw-r--r--src/m/celerity.h2
-rw-r--r--src/m/clipper.h2
-rw-r--r--src/m/cnvrgnt.h3
-rw-r--r--src/m/convex.h2
-rw-r--r--src/m/cydra5.h2
-rw-r--r--src/m/delta88k.h2
-rw-r--r--src/m/dpx2.h2
-rw-r--r--src/m/dual.h2
-rw-r--r--src/m/elxsi.h2
-rw-r--r--src/m/ews4800.h2
-rw-r--r--src/m/gould-np1.h3
-rw-r--r--src/m/gould.h3
-rw-r--r--src/m/hp800.h3
-rw-r--r--src/m/hp9000s300.h3
-rw-r--r--src/m/i860.h2
-rw-r--r--src/m/ia64.h3
-rw-r--r--src/m/ibm370aix.h2
-rw-r--r--src/m/ibmps2-aix.h3
-rw-r--r--src/m/ibmrs6000.h3
-rw-r--r--src/m/ibmrt-aix.h2
-rw-r--r--src/m/ibmrt.h3
-rw-r--r--src/m/ibms390.h2
-rw-r--r--src/m/intel386.h3
-rw-r--r--src/m/iris4d.h3
-rw-r--r--src/m/irist.h2
-rw-r--r--src/m/isi-ov.h2
-rw-r--r--src/m/m68k.h2
-rw-r--r--src/m/macppc.h2
-rw-r--r--src/m/masscomp.h3
-rw-r--r--src/m/mega68.h3
-rw-r--r--src/m/mg1.h3
-rw-r--r--src/m/mips-siemens.h2
-rw-r--r--src/m/mips.h2
-rw-r--r--src/m/news.h2
-rw-r--r--src/m/next.h3
-rw-r--r--src/m/nh3000.h3
-rw-r--r--src/m/nh4000.h3
-rw-r--r--src/m/ns16000.h3
-rw-r--r--src/m/ns32000.h2
-rw-r--r--src/m/nu.h3
-rw-r--r--src/m/orion.h3
-rw-r--r--src/m/orion105.h3
-rw-r--r--src/m/pfa50.h2
-rw-r--r--src/m/plexus.h3
-rw-r--r--src/m/powermac.h2
-rw-r--r--src/m/powerpcle.h3
-rw-r--r--src/m/pyramid.h2
-rw-r--r--src/m/sequent-ptx.h2
-rw-r--r--src/m/sequent.h2
-rw-r--r--src/m/sparc.h3
-rw-r--r--src/m/sps7.h2
-rw-r--r--src/m/sr2k.h3
-rw-r--r--src/m/stride.h2
-rw-r--r--src/m/sun1.h2
-rw-r--r--src/m/sun2.h2
-rw-r--r--src/m/sun386.h7
-rw-r--r--src/m/symmetry.h2
-rw-r--r--src/m/tad68k.h3
-rw-r--r--src/m/tahoe.h3
-rw-r--r--src/m/targon31.h2
-rw-r--r--src/m/tek4300.h3
-rw-r--r--src/m/tekxd88.h3
-rw-r--r--src/m/template.h2
-rw-r--r--src/m/tower32.h3
-rw-r--r--src/m/tower32v3.h3
-rw-r--r--src/m/ustation.h2
-rw-r--r--src/m/vax.h2
-rw-r--r--src/m/wicat.h3
-rw-r--r--src/m/windowsnt.h2
-rw-r--r--src/m/xps100.h2
-rw-r--r--src/mac.c2
-rw-r--r--src/macfns.c2
-rw-r--r--src/macgui.h2
-rw-r--r--src/macmenu.c2
-rw-r--r--src/macros.c2
-rw-r--r--src/macros.h3
-rw-r--r--src/macterm.c2
-rw-r--r--src/macterm.h5
-rw-r--r--src/makefile.w32-in2
-rw-r--r--src/marker.c2
-rw-r--r--src/md5.c2
-rw-r--r--src/md5.h2
-rw-r--r--src/mem-limits.h2
-rw-r--r--src/minibuf.c3
-rw-r--r--src/mktime.c2
-rw-r--r--src/msdos.c2
-rw-r--r--src/msdos.h2
-rw-r--r--src/prefix-args.c3
-rw-r--r--src/print.c2
-rw-r--r--src/process.c2
-rw-r--r--src/process.h2
-rw-r--r--src/puresize.h3
-rw-r--r--src/ralloc.c2
-rw-r--r--src/regex.h2
-rw-r--r--src/region-cache.c2
-rw-r--r--src/region-cache.h2
-rw-r--r--src/s/aix3-1.h2
-rw-r--r--src/s/bsd4-1.h2
-rw-r--r--src/s/bsd4-2.h2
-rw-r--r--src/s/bsd4-3.h2
-rw-r--r--src/s/cxux.h3
-rw-r--r--src/s/cygwin.h2
-rw-r--r--src/s/darwin.h3
-rw-r--r--src/s/dgux.h2
-rw-r--r--src/s/dgux4.h3
-rw-r--r--src/s/dgux5-4-3.h3
-rw-r--r--src/s/dgux5-4r2.h3
-rw-r--r--src/s/freebsd.h2
-rw-r--r--src/s/gnu-linux.h2
-rw-r--r--src/s/gnu.h2
-rw-r--r--src/s/hpux.h2
-rw-r--r--src/s/iris3-5.h2
-rw-r--r--src/s/iris3-6.h2
-rw-r--r--src/s/irix3-3.h2
-rw-r--r--src/s/lynxos.h2
-rw-r--r--src/s/ms-w32.h2
-rw-r--r--src/s/msdos.h2
-rw-r--r--src/s/newsos5.h2
-rw-r--r--src/s/nextstep.h2
-rw-r--r--src/s/ptx.h2
-rw-r--r--src/s/riscix1-1.h3
-rw-r--r--src/s/riscix12.h3
-rw-r--r--src/s/rtu.h2
-rw-r--r--src/s/sco4.h2
-rw-r--r--src/s/sco5.h2
-rw-r--r--src/s/template.h2
-rw-r--r--src/s/umax.h2
-rw-r--r--src/s/unipl5-2.h2
-rw-r--r--src/s/usg5-0.h2
-rw-r--r--src/s/usg5-2-2.h2
-rw-r--r--src/s/usg5-2.h2
-rw-r--r--src/s/usg5-3.h2
-rw-r--r--src/s/usg5-4.h2
-rw-r--r--src/s/vms.h3
-rw-r--r--src/s/xenix.h2
-rw-r--r--src/scroll.c2
-rw-r--r--src/search.c2
-rw-r--r--src/sheap.c2
-rw-r--r--src/sound.c2
-rw-r--r--src/strftime.c2
-rw-r--r--src/sunfns.c2
-rw-r--r--src/syntax.c2
-rw-r--r--src/syntax.h2
-rw-r--r--src/sysdep.c2
-rw-r--r--src/sysselect.h3
-rw-r--r--src/syssignal.h2
-rw-r--r--src/systime.h2
-rw-r--r--src/systty.h2
-rw-r--r--src/syswait.h2
-rw-r--r--src/term.c23
-rw-r--r--src/termcap.c2
-rw-r--r--src/termchar.h2
-rw-r--r--src/termhooks.h2
-rw-r--r--src/terminfo.c2
-rw-r--r--src/termopts.h2
-rw-r--r--src/textprop.c2
-rw-r--r--src/tparam.c2
-rw-r--r--src/uaf.h3
-rw-r--r--src/undo.c2
-rw-r--r--src/unexaix.c2
-rw-r--r--src/unexalpha.c2
-rw-r--r--src/unexapollo.c2
-rw-r--r--src/unexconvex.c2
-rw-r--r--src/unexcw.c2
-rw-r--r--src/unexec.c2
-rw-r--r--src/unexelf.c2
-rw-r--r--src/unexenix.c2
-rw-r--r--src/unexmacosx.c3
-rw-r--r--src/unexmips.c2
-rw-r--r--src/unexnext.c2
-rw-r--r--src/unexsni.c2
-rw-r--r--src/unexsunos4.c2
-rw-r--r--src/unexw32.c3
-rw-r--r--src/vm-limit.c2
-rw-r--r--src/w16select.c2
-rw-r--r--src/w32.c2
-rw-r--r--src/w32.h3
-rw-r--r--src/w32bdf.c3
-rw-r--r--src/w32bdf.h3
-rw-r--r--src/w32console.c2
-rw-r--r--src/w32fns.c2
-rw-r--r--src/w32gui.h3
-rw-r--r--src/w32heap.c3
-rw-r--r--src/w32heap.h3
-rw-r--r--src/w32inevt.c2
-rw-r--r--src/w32inevt.h3
-rw-r--r--src/w32menu.c2
-rw-r--r--src/w32proc.c2
-rw-r--r--src/w32reg.c2
-rw-r--r--src/w32select.c2
-rw-r--r--src/w32term.c2
-rw-r--r--src/w32term.h5
-rw-r--r--src/w32xfns.c2
-rw-r--r--src/widget.c2
-rw-r--r--src/widget.h3
-rw-r--r--src/widgetprv.h3
-rw-r--r--src/window.c2
-rw-r--r--src/xfaces.c2
-rw-r--r--src/xfns.c2
-rw-r--r--src/xmenu.c2
-rw-r--r--src/xrdb.c6
-rw-r--r--src/xselect.c2
-rw-r--r--src/xsmfns.c2
-rw-r--r--src/xterm.h5
-rw-r--r--vms/make-mms-derivative.el2
1348 files changed, 5347 insertions, 3991 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 5b23f9af189..d2fda5ed700 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -39,7 +39,6 @@ Eli Zaretskii
lisp/term/tty-colors.el
lisp/international/codepage.el
- man/faq.texi
man/msdog.texi
Kenichi Handa
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 1d4f943b255..e8411b3c7c5 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -65,23 +65,23 @@ you're going to handle.
DIRECTORY STATUS IN CHARGE
--------- ------ ---------
etc (and subdirs) done Thien-Thi Nguyen (ttn(@gnu.org))
-leim done Kenichi Handa
+leim working Kenichi Handa
lib-src done ttn
lisp done ttn
-lisp/calc done ttn
-lisp/calendar done Glenn Morris
+lisp/calc done Jay Belanger
+lisp/calendar working Glenn Morris
lisp/emacs-lisp done ttn
lisp/emulation done ttn
lisp/eshell done ttn
-lisp/gnus done ttn
-lisp/international done Kenichi Handa
-lisp/language done Kenichi Handa
+lisp/gnus done Romain Francoise
+lisp/international working Kenichi Handa
+lisp/language working Kenichi Handa
lisp/mail done ttn
lisp/mh-e done Bill Wohler
lisp/net done ttn
lisp/obsolete done ttn
-lisp/play done ttn
-lisp/progmodes done Nick Roberts
+lisp/play done Romain Francoise
+lisp/progmodes working Nick Roberts
lisp/term done ttn
lisp/textmodes done ttn
lisp/url done ttn
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 5411a0cf626..3d64ba12cc3 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-05 Jay Belanger <belanger@truman.edu>
+
+ * calccard.tex: Update copyright year.
+
+2006-02-04 Michael Olson <mwolson@gnu.org>
+
+ * NEWS: Update for ERC 5.1.1. Use the same wording for headings
+ that Emacs does in its NEWS file.
+
2006-02-03 Bill Wohler <wohler@newt.com>
Release MH-E version 7.91.
@@ -2542,7 +2551,7 @@
;; End:
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.
diff --git a/etc/DEBUG b/etc/DEBUG
index 0c2739cafc8..1695c6e7f07 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -1,6 +1,6 @@
Debugging GNU Emacs
Copyright (C) 1985, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
diff --git a/etc/DISTRIB b/etc/DISTRIB
index f5c380bfe37..8b52ee51418 100644
--- a/etc/DISTRIB
+++ b/etc/DISTRIB
@@ -5,7 +5,7 @@ the USA, see http://www.gnu.org/order/order.html.
GNU Emacs availability information, October 2000
Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998,
- 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute
verbatim copies of this document provided that the
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index fea5497a4a5..eee5589ad8d 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -1,6 +1,39 @@
ERC NEWS -*- outline -*-
-* Changes since ERC 5.0.4
+* Changes in ERC 5.1.1
+
+** Fix a requirement on cl.el.
+
+** Use tls.el for SSL connections, rather than ssl.el.
+
+** Changes and additions to modules
+
+*** ibuffer integration (erc-ibuffer.el)
+
+**** Update this to work with the version of ibuffer.el that comes with
+recent Emacs variants.
+
+*** Old completion (erc-complete.el)
+
+**** Fix a few errors.
+
+*** Speedbar (erc-speedbar.el)
+
+**** Make this work with the version of speedbar.el that comes with
+recent Emacs variants.
+
+*** Timestamps (erc-stamp.el)
+
+**** By default, use a more failsafe method of displaying right timestamps.
+To get right timestamps to align perfectly in Emacs22 using X, set the
+new `erc-timestamp-right-align-by-pixel' option to non-nil.
+
+*** Viper compatibility (erc-viper.el)
+
+**** Since most of these changes are now merged into Emacs22, detect
+whether we need these changes and install them only if necessary.
+
+* Changes in ERC 5.1
** Improve XEmacs compatibility.
@@ -206,11 +239,11 @@ the right margin.
**** Helps ERC work correctly in viper-mode.
-* Fixes since ERC 5.0.3
+* Changes in ERC 5.0.4
** Fix a problem with undo in channels.
-* Fixes since ERC 5.0.2
+* Changes in ERC 5.0.3
** Fix typo in the `ctcp-request-to' entry of the English catalog.
@@ -251,7 +284,7 @@ indicator. Previously, there was an additional unnecessary space.
**** Fix an error that occurred when unchecked buffers existed when
invoking /QUIT.
-* Fixes since ERC 5.0.1
+* Changes in ERC 5.0.2
** If a channel key is required for a certain channel, ERC will prompt
for one if `erc-prompt-for-channel-key' is non-nil.
@@ -284,7 +317,7 @@ choice anymore.
**** You can now save logs and truncate buffers from the menu-bar.
-* Fixes since ERC 5.0
+* Changes in ERC 5.0.1
** Narrowing in ERC buffers no longer causes formatting errors.
@@ -298,7 +331,7 @@ choice anymore.
This means that `erc-track-priority-faces-only', `erc-track-exclude',
and `erc-track-exclude-types' now work with server buffers.
-* Changes since ERC 4.0
+* Changes in ERC 5.0
** Channel members are now stored as a hash-table.
`erc-server-users' and `erc-channel-users' are now hash-tables, rather
@@ -542,7 +575,7 @@ in XEmacs.
mode-line where modified channels are shown (only works in GNU
Emacs versions above 21.3).
-* Changes since ERC 3.0.cvs.20030119
+* Changes in ERC 4.0
** The module system has again changed a lot. You can now customize
the variable `erc-modules' and define once and for all which
@@ -565,7 +598,7 @@ in XEmacs.
openprojects to freenode. You may need to update your configuration
for a successful automatic nickserv identification.
-* Changes since ERC 2.93.cvs.20020819
+* Changes in ERC 3.0.cvs.20030119
** New module erc-dcc:
diff --git a/etc/GNU b/etc/GNU
index 6d54265d849..53d7f576129 100644
--- a/etc/GNU
+++ b/etc/GNU
@@ -1,5 +1,5 @@
Copyright (C) 1985, 1993, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document, in any medium, provided that the copyright notice and
diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index 59e0b5dbd2e..d5fbfe78106 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -1,6 +1,6 @@
GNUS NEWS -- history of user-visible changes.
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
See the end for copying conditions.
Please send Gnus bug reports to bugs@gnus.org.
@@ -529,7 +529,7 @@ ever-changing layouts.
Copyright information:
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
diff --git a/etc/NEWS b/etc/NEWS
index 2ea7ddb9b25..e63c2d3bc76 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -14868,7 +14868,7 @@ select one of those items.
Copyright information:
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 8db27aab035..93561daa534 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -3599,7 +3599,7 @@ of machine defines NO_UNION_TYPE.
Copyright 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
Copying and redistribution of this file with or without modification
are permitted without royalty provided this notice is preserved.
diff --git a/etc/TUTORIAL b/etc/TUTORIAL
index 0df9a6f2711..5748d0d4e5e 100644
--- a/etc/TUTORIAL
+++ b/etc/TUTORIAL
@@ -1104,7 +1104,7 @@ This version of the tutorial, like GNU Emacs, is copyrighted, and
comes with permission to distribute copies on certain conditions:
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.bg b/etc/TUTORIAL.bg
index 8f51458381f..9cb97696772 100644
--- a/etc/TUTORIAL.bg
+++ b/etc/TUTORIAL.bg
@@ -1170,7 +1170,7 @@ This version of the tutorial, like GNU Emacs, is copyrighted, and
comes with permission to distribute copies on certain conditions:
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.cn b/etc/TUTORIAL.cn
index f35c53be663..ce22ac0b349 100644
--- a/etc/TUTORIAL.cn
+++ b/etc/TUTORIAL.cn
@@ -1050,7 +1050,7 @@ issue here>¡¹¡£
É¢²¼Æ俽±´£º
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Chinese Translation by Chao-Hong Liu (2002, 2003)
Permission is granted to anyone to make or distribute verbatim copies
diff --git a/etc/TUTORIAL.cs b/etc/TUTORIAL.cs
index 57e77de9a4b..5b0e20ce218 100644
--- a/etc/TUTORIAL.cs
+++ b/etc/TUTORIAL.cs
@@ -1023,7 +1023,7 @@ Tato verze tutoriálu je, podobnì jako GNU Emacs, chránìna copyrightem a
je ¹íøena se svolením distribuovat kopie za jistých podmínek:
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Ka¾dému je zaruèeno právo vytváøet a distribuovat pøesné kopie tohoto
dokumentu tak, jak jej obdr¾el, na jakémkoliv médiu, s tím, ¾e bude
diff --git a/etc/TUTORIAL.de b/etc/TUTORIAL.de
index 17019ad66dc..a571b15c545 100644
--- a/etc/TUTORIAL.de
+++ b/etc/TUTORIAL.de
@@ -1461,7 +1461,7 @@ Beachten Sie bitte, daß im Zweifelsfalle das englische Original dieser
Urheberrechtsnotiz gültig ist (zu finden in der Datei TUTORIAL).
Copyright (C) 1985, 1996, 1997, 2002, 2003, 2004,
- 2005 Free Software Foundation
+ 2005, 2006 Free Software Foundation, Inc.
Hiermit wird für jedermann die Erlaubnis erteilt, wörtliche,
unveränderte Kopien dieses Dokumentes für jegliches Medium zu
diff --git a/etc/TUTORIAL.es b/etc/TUTORIAL.es
index cb5e92a2df3..0860cb7972c 100644
--- a/etc/TUTORIAL.es
+++ b/etc/TUTORIAL.es
@@ -1188,7 +1188,7 @@ siguiente nota de derechos de reproducción (que puede encontrar en el
archivo TUTORIAL).
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Se permite a cualquiera hacer o distribuir copias literales de este
documento como se recibe, en cualquier medio, siempre que la nota
diff --git a/etc/TUTORIAL.fr b/etc/TUTORIAL.fr
index 30a6f05fe23..0c8b3d3ee9b 100644
--- a/etc/TUTORIAL.fr
+++ b/etc/TUTORIAL.fr
@@ -1171,7 +1171,7 @@ copyright, et vous pouvez en distribuer des copies sous certaines
conditions :
Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Chacun peut créer ou distribuer des copies de ce document tel qu'il
l'a reçu, sur n'importe quel support, pourvu que la note de
diff --git a/etc/TUTORIAL.it b/etc/TUTORIAL.it
index d310a16eae4..46388e78cc3 100644
--- a/etc/TUTORIAL.it
+++ b/etc/TUTORIAL.it
@@ -1093,7 +1093,7 @@ distribuito con il permesso di farne copie a determinate condizioni:
indicativo, restando comunque inteso il fatto che è quella originale a
fare fede.
-Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
È permesso a chiunque copiare e distribuire attraverso ogni mezzo copie
fedeli di questo documento così come viene ricevuto, a condizione che
diff --git a/etc/TUTORIAL.ja b/etc/TUTORIAL.ja
index dec03f35d20..826a175e8c6 100644
--- a/etc/TUTORIAL.ja
+++ b/etc/TUTORIAL.ja
@@ -1048,7 +1048,7 @@ This version of the tutorial, like GNU Emacs, is copyrighted, and
comes with permission to distribute copies on certain conditions:
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.ko b/etc/TUTORIAL.ko
index c8875dc31be..9a9f28612c5 100644
--- a/etc/TUTORIAL.ko
+++ b/etc/TUTORIAL.ko
@@ -990,7 +990,7 @@ GNU $(C@L8F=:?M(B $(C00@L(B $(C@L(B $(CAvD'<-(B $(CFG@:(B $(C@z@[1G@L
$(C6'?!(B $(C:9;g:;@;(B $(C9hFwGR(B $(C<v(B $(C@V4B(B $(CGc0!8&(B $(C0.0m(B $(C3*?B(B $(C0M@L4Y(B:
Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
$(C@L(B $(C9.<-4B(B $(C@L(B $(C@z@[1G(B $(C0x0m?M(B $(CGc?k(B $(C0x0m0!(B $(C1W4k7N(B $(C@/Av5G0m(B, $(C9hFw@Z0!(B
$(C<vCk@Z?!0T(B $(C@L(B $(C0x0m?!(B $(C5{6s(B $(CGc?k5G4B(B $(C0MC373(B $(C6G(B $(C@g:P9hGO4B(B $(C0M@;(B
diff --git a/etc/TUTORIAL.nl b/etc/TUTORIAL.nl
index 6438869369f..1efe9748803 100644
--- a/etc/TUTORIAL.nl
+++ b/etc/TUTORIAL.nl
@@ -1205,7 +1205,7 @@ Deze versie van de inleiding valt onder copyright, net als GNU Emacs.
Je mag deze inleiding verspreiden onder bepaalde voorwaarden:
Copyright (C) 1985, 1996, 1997, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Iedereen mag letterlijke kopieën van dit document, zowel ontvangen
als verspreiden, op elk medium, vooropgesteld dat de
@@ -1230,7 +1230,7 @@ This version of the tutorial, like GNU Emacs, is copyrighted, and
comes with permission to distribute copies on certain conditions:
Copyright (C) 1985, 1996, 1997, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim
copies of this document as received, in any medium, provided that
diff --git a/etc/TUTORIAL.pl b/etc/TUTORIAL.pl
index cff0b9dd40c..e1cfeec9dab 100644
--- a/etc/TUTORIAL.pl
+++ b/etc/TUTORIAL.pl
@@ -1218,7 +1218,7 @@ Ta wersja samouczka, podobnie jak GNU Emacs, jest chroniona prawem
autorskim, ale wolno j± kopiowaæ pod nastêpuj±cymi warunkami:
Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Zezwala siê na wykonywanie lub rozpowszechnianie
wiernych kopii tego dokumentu w otrzymanej formie, na dowolnym
diff --git a/etc/TUTORIAL.pt_BR b/etc/TUTORIAL.pt_BR
index bd7cf84d6c1..b9309d31d5d 100644
--- a/etc/TUTORIAL.pt_BR
+++ b/etc/TUTORIAL.pt_BR
@@ -1063,7 +1063,7 @@ Essa versão do tutorial foi originalmente traduzida por Marcelo Toledo
<marcelo@gnu.org> e como o GNU Emacs, tem um copyright, e vem
com uma permissão de distribuição de cópias nas seguintes condições:
-Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
Permissão é garantida a qualquer um para fazer ou distribuir copias
integrais deste documento como recebido, em qualquer meio, deixando
diff --git a/etc/TUTORIAL.ro b/etc/TUTORIAL.ro
index 85e8e30892f..3a4c7fb77af 100644
--- a/etc/TUTORIAL.ro
+++ b/etc/TUTORIAL.ro
@@ -1091,7 +1091,8 @@ continuare noþita de copyright originalã în limba englezã.
This version of the tutorial, like GNU Emacs, is copyrighted, and
comes with permission to distribute copies on certain conditions:
-Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 1998, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.ru b/etc/TUTORIAL.ru
index cd84911db2d..4a097635a59 100644
--- a/etc/TUTORIAL.ru
+++ b/etc/TUTORIAL.ru
@@ -1132,7 +1132,7 @@ Dired ÐÏÚ×ÏÌÑÅÔ ×ÁÍ ÏÔÏÂÒÁÖÁÔØ ÓÐÉÓÏË ÆÁÊÌÏ× × ËÁÔÁÌÏÇÅ (Á ÔÁËÖÅ
ÓÌÅÄÕÀÝÉÍÉ ÓÏÇÌÁÛÅÎÉÑÍÉ:
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.sk b/etc/TUTORIAL.sk
index 26e3f834748..6b2cd86bf91 100644
--- a/etc/TUTORIAL.sk
+++ b/etc/TUTORIAL.sk
@@ -1082,7 +1082,7 @@ Táto verzia tútorialu je, podobne ako GNU Emacs, chránená copyrightom
a je ¹írená s povolením distribuova» kópie za istých podmienok:
Copyright (C) 1985, 1996, 1998, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Ka¾dému je zaruèené právo vytvára» a distribuova» presné kópie tohto
dokumentu tak, ako ho dostal, na akomkoµvek médiu, s tým, ¾e bude
diff --git a/etc/TUTORIAL.sl b/etc/TUTORIAL.sl
index 37ebb2fbf11..52d2d18766c 100644
--- a/etc/TUTORIAL.sl
+++ b/etc/TUTORIAL.sl
@@ -1115,7 +1115,7 @@ To besedilo, kot sam GNU Emacs, je avtorsko delo, in njegovo
razmno¾evanje in raz¹irjanje je dovoljeno pod naslednjimi pogoji:
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Dovoljeno je izdelovati in raz¹irjati neokrnjene kopije tega spisa
v kakr¹nikoli obliki pod pogojem, da je ohranjena navedba o
diff --git a/etc/TUTORIAL.sv b/etc/TUTORIAL.sv
index 65dff742ec2..a2e0cd9abea 100644
--- a/etc/TUTORIAL.sv
+++ b/etc/TUTORIAL.sv
@@ -1127,7 +1127,7 @@ This version of the tutorial, like GNU Emacs, is copyrighted, and
comes with permission to distribute copies on certain conditions:
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.th b/etc/TUTORIAL.th
index 5db33b3d470..1156925e2a5 100644
--- a/etc/TUTORIAL.th
+++ b/etc/TUTORIAL.th
@@ -971,7 +971,7 @@ This version of the tutorial, like GNU Emacs, is copyrighted, and
comes with permission to distribute copies on certain conditions:
Copyright (C) 1985, 1996, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.zh b/etc/TUTORIAL.zh
index 1a1020a425b..0a04da4d9e1 100644
--- a/etc/TUTORIAL.zh
+++ b/etc/TUTORIAL.zh
@@ -1050,7 +1050,7 @@ issue here>¡v¡C
´²§G¨ä«þ¨©¡G
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Chinese Translation by Chao-Hong Liu (2002, 2003)
Permission is granted to anyone to make or distribute verbatim copies
diff --git a/etc/calccard.tex b/etc/calccard.tex
index 1502a3c73c2..befdea965ae 100644
--- a/etc/calccard.tex
+++ b/etc/calccard.tex
@@ -14,7 +14,7 @@
% Typical command to print (3 cols): dvips -t landscape calccard.dvi
% Copyright (C) 1987, 1992, 2001, 2002, 2003, 2004,
-% 2005 Free Software Foundation, Inc.
+% 2005, 2006 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@@ -60,7 +60,7 @@
% Internet: gildea@stop.mail-abuse.org
\def\versionnumber{2.1}
-\def\year{2005}
+\def\year{2006}
\def\version{v\versionnumber}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
diff --git a/etc/cs-dired-ref.tex b/etc/cs-dired-ref.tex
index 12e3c01c871..46f7d7c6985 100644
--- a/etc/cs-dired-ref.tex
+++ b/etc/cs-dired-ref.tex
@@ -1,5 +1,6 @@
% Reference Card for Dired
-% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005,
+% 2006 Free Software Foundation, Inc.
% Czech hyphenation rules applied
\chyph
@@ -47,7 +48,7 @@
% e.g. in the TeX Live CD).
\def\versionnumber{0.1}
-\def\year{2005}
+\def\year{2006}
\def\version{May \year\ v\versionnumber}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
diff --git a/etc/cs-refcard.tex b/etc/cs-refcard.tex
index 1164817a14d..be54da104ad 100644
--- a/etc/cs-refcard.tex
+++ b/etc/cs-refcard.tex
@@ -12,7 +12,7 @@
\columnsperpage=1
% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
-% 2005 Free Software Foundation, Inc.
+% 2005, 2006 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@@ -66,7 +66,7 @@
% e.g. in the TeX Live CD).
\def\versionnumber{2.2}
-\def\year{2005}
+\def\year{2006}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
\centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/etc/cs-survival.tex b/etc/cs-survival.tex
index 4140f2a858e..cf8297e7f39 100644
--- a/etc/cs-survival.tex
+++ b/etc/cs-survival.tex
@@ -21,7 +21,8 @@
\endinput
\fi
-% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005,
+% 2006 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@@ -49,7 +50,7 @@
% e.g. in the TeX Live CD).
\def\versionnumber{1.0}
-\def\year{2005}
+\def\year{2006}
\def\copyrightnotice{\penalty-1\vfill
\vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/de-refcard.tex b/etc/de-refcard.tex
index bb0ce3c978d..743e699fd76 100644
--- a/etc/de-refcard.tex
+++ b/etc/de-refcard.tex
@@ -8,7 +8,7 @@
\columnsperpage=2
% Copyright (C) 1987, 1993, 1996, 2000, 2002, 2003, 2004,
-% 2005 Free Software Foundation, Inc.
+% 2005, 2006 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@@ -53,7 +53,7 @@
% If there were room, it would be nice to see a section on Dired.
\def\versionnumber{2.1}
-\def\year{2005}
+\def\year{2006}
\def\version{March \year\ v\versionnumber}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
diff --git a/etc/dired-ref.tex b/etc/dired-ref.tex
index 62038525a21..ce4150e1df7 100644
--- a/etc/dired-ref.tex
+++ b/etc/dired-ref.tex
@@ -1,6 +1,6 @@
% Reference Card for Dired
% Copyright (C) 2000, 2001, 2002, 2003, 2004,
-% 2005 Free Software Foundation, Inc.
+% 2005, 2006 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@@ -41,7 +41,7 @@
\def\versionnumber{0.1}
-\def\year{2005}
+\def\year{2006}
\def\version{May \year\ v\versionnumber}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
diff --git a/etc/edt-user.doc b/etc/edt-user.doc
index 9910317de0a..1195c21841f 100644
--- a/etc/edt-user.doc
+++ b/etc/edt-user.doc
@@ -3,7 +3,7 @@ File: edt-user.doc --- EDT Emulation User Instructions
For GNU Emacs 19
Copyright (C) 1986, 1992, 1994, 1995, 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Author: Kevin Gallagher <kevingal@onramp.net>
Maintainer: Kevin Gallagher <kevingal@onramp.net>
diff --git a/etc/emacs.1 b/etc/emacs.1
index 1c9707243d9..ed9de22bf33 100644
--- a/etc/emacs.1
+++ b/etc/emacs.1
@@ -1,5 +1,5 @@
.\" Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004,
-.\" 2005 Free Software Foundation, Inc.
+.\" 2005, 2006 Free Software Foundation, Inc.
.\"
.\" This file is part of GNU Emacs.
.\"
@@ -536,7 +536,8 @@ Joachim Martillo and Robert Krawitz added the X features.
Copyright
.if t \(co
.if n (c)
-1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
.PP
Permission is granted to make and distribute verbatim copies of this
document provided the copyright notice and this permission notice are
diff --git a/etc/emacs.py b/etc/emacs.py
index fcb55a0a205..9538b0b7127 100644
--- a/etc/emacs.py
+++ b/etc/emacs.py
@@ -1,6 +1,6 @@
"""Definitions used by commands sent to inferior Python in python.el."""
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
# Author: Dave Love <d.love@dl.ac.uk>
# This file is part of GNU Emacs.
diff --git a/etc/emacstool.1 b/etc/emacstool.1
index 7f3200a0700..22eb311789a 100644
--- a/etc/emacstool.1
+++ b/etc/emacstool.1
@@ -136,7 +136,7 @@ emacs(1)
Copyright
.if t \(co
.if n (c)
-2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
.PP
Permission is granted to make and distribute verbatim copies of this
document provided the copyright notice and this permission notice are
diff --git a/etc/etags.1 b/etc/etags.1
index ad049066577..39228685d08 100644
--- a/etc/etags.1
+++ b/etc/etags.1
@@ -1,5 +1,5 @@
.\" Copyright (C) 1992, 2001, 2002, 2003, 2004,
-.\" 2005 Free Software Foundation, Inc.
+.\" 2005, 2006 Free Software Foundation, Inc.
.\" See section COPYING for conditions for redistribution
.TH etags 1 "23nov2001" "GNU Tools" "GNU Tools"
.de BP
@@ -292,7 +292,7 @@ Stallman.
Copyright
.if t \(co
.if n (c)
-1999, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+1999, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
.PP
Permission is granted to make and distribute verbatim copies of this
document provided the copyright notice and this permission notice are
diff --git a/etc/fr-drdref.tex b/etc/fr-drdref.tex
index e64fe9574a5..40a238d529f 100644
--- a/etc/fr-drdref.tex
+++ b/etc/fr-drdref.tex
@@ -1,6 +1,7 @@
% Reference Card for Dired
-% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005,
+% 2006 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@@ -41,7 +42,7 @@
\def\versionnumber{0.1}
-\def\year{2005}
+\def\year{2006}
\def\version{Mai \year\ v\versionnumber}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
diff --git a/etc/fr-refcard.tex b/etc/fr-refcard.tex
index bff17c6d625..54d73ca6312 100644
--- a/etc/fr-refcard.tex
+++ b/etc/fr-refcard.tex
@@ -9,7 +9,7 @@
\columnsperpage=1
% Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
-% 2005 Free Software Foundation, Inc.
+% 2005, 2006 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@@ -54,7 +54,7 @@
% If there were room, it would be nice to see a section on Dired.
\def\versionnumber{2.2}
-\def\year{2005}
+\def\year{2006}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
\centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/etc/fr-survival.tex b/etc/fr-survival.tex
index e73db5352a5..5c99fb27c49 100644
--- a/etc/fr-survival.tex
+++ b/etc/fr-survival.tex
@@ -22,7 +22,8 @@
\endinput
\fi
-% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005,
+% 2006 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@@ -44,7 +45,7 @@
% Translated to french by \'Eric Jacoboni <jaco@teaser.fr> in November 2001
\def\versionnumber{1.0}
-\def\year{2005}
+\def\year{2006}
\def\copyrightnotice{\penalty-1\vfill
\vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/gnus-refcard.tex b/etc/gnus-refcard.tex
index 87c02032424..3bfca03d93d 100644
--- a/etc/gnus-refcard.tex
+++ b/etc/gnus-refcard.tex
@@ -113,7 +113,7 @@
\newcommand{\Copyright}{%
\begin{center}
Copyright \copyright\ 1995, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.\\*
+ 2005, 2006 Free Software Foundation, Inc.\\*
Copyright \copyright\ 1995 Vladimir Alexiev
$<$vladimir@cs.ualberta.ca$>$.\\*
Copyright \copyright\ 2000 Felix Natter $<$fnatter@gmx.net$>$.\\*
diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt
index 29b5356e9e9..5dd26f1dfc5 100644
--- a/etc/gnus-tut.txt
+++ b/etc/gnus-tut.txt
@@ -24,7 +24,8 @@ was done by moi, yours truly, your humble servant, Lars Magne
Ingebrigtsen. If you have a WWW browser, you can investigate to your
heart's delight at <URL:http://www.ifi.uio.no/~larsi/larsi.html>.
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
;; Keywords: news
diff --git a/etc/orgcard.tex b/etc/orgcard.tex
index 494ef6b3ae7..064d9decc95 100644
--- a/etc/orgcard.tex
+++ b/etc/orgcard.tex
@@ -5,7 +5,7 @@
% This file can be printed with 1, 2, or 3 columns per page (see below).
% At the moment this card works quite nicely in 3 column format and
-% currently takes 2 full pages. It is thus suited to producing one
+% currently takes 2 full pages. It is thus suited to producing one
% double-side page when printed.
% There are a couple of tweaks in the format of this card which make it work
@@ -18,7 +18,8 @@
\columnsperpage=3
-% Copyright (c) 2004 Philip Rooke, 2005, 2006 Free Software Foundation
+% Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+% Copyright (c) 2004 Philip Rooke
% 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
@@ -88,7 +89,7 @@ are preserved on all copies.
\def\ncolumns{\the\columnsperpage}
-\message{[\ncolumns\space
+\message{[\ncolumns\space
column\if 1\ncolumns\else s\fi\space per page]}
\def\scaledmag#1{ scaled \magstep #1}
@@ -173,7 +174,7 @@ are preserved on all copies.
\def\bye{\par\vfill\supereject
\if a\abc \else\null\vfill\eject\fi
\if a\abc \else\null\vfill\eject\fi
- \end}
+ \end}
\fi
% we won't be using math mode much, so redefine some of the characters
@@ -710,7 +711,7 @@ an org file. In the file, find a location with:
\key{next heading}{DOWN}
\key{previous heading}{UP}
-Insert the note with one of the following:
+Insert the note with one of the following:
\key{as sublevel of heading at cursor}{RET}
\key{right here (cursor not on heading)}{RET}
@@ -752,7 +753,7 @@ $^4$ Keybinding affected by {\tt org-CUA-compatibility}.
% arch-tag: 139f6750-5cfc-49ca-92b5-237fe5795290
-%%% Local Variables:
+%%% Local Variables:
%%% mode: latex
%%% TeX-master: t
-%%% End:
+%%% End:
diff --git a/etc/pl-refcard.tex b/etc/pl-refcard.tex
index dfbb5a2783a..0d5f008378e 100644
--- a/etc/pl-refcard.tex
+++ b/etc/pl-refcard.tex
@@ -32,7 +32,8 @@
\columnsperpage=2
-% Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 1999, 2002, 2003, 2004, 2005,
+% 2006 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@@ -73,7 +74,7 @@
% If there were room, it would be nice to see a section on Dired.
\def\versionnumber{1.1}
-\def\year{2005}
+\def\year{2006}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
\centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/etc/refcard.tex b/etc/refcard.tex
index 5567320c98a..218a6cc8e36 100644
--- a/etc/refcard.tex
+++ b/etc/refcard.tex
@@ -15,7 +15,7 @@
% Nothing else needs to be changed below this line.
% Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
-% 2005 Free Software Foundation, Inc.
+% 2005, 2006 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@@ -64,7 +64,7 @@
% If there were room, it would be nice to see a section on Dired.
\def\versionnumber{2.3}
-\def\year{2005}
+\def\year{2006}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
\centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/etc/ru-refcard.tex b/etc/ru-refcard.tex
index 1083055bd9f..72fbe28e86f 100644
--- a/etc/ru-refcard.tex
+++ b/etc/ru-refcard.tex
@@ -1,4 +1,5 @@
-% Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 1997, 2002, 2003, 2004, 2005,
+% 2006 Free Software Foundation, Inc.
\documentclass[10pt]{article}
\usepackage{multicol,tabularx}
@@ -19,7 +20,7 @@
\setlength{\ColThreeWidth}{25mm}
\newcommand{\versionnumber}[0]{2.2}
-\newcommand{\nyear}[0]{2005}
+\newcommand{\nyear}[0]{2006}
\newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
\centerline{\footnotesize \copyright\ \nyear\ Free Software Foundation, Inc.
diff --git a/etc/sk-dired-ref.tex b/etc/sk-dired-ref.tex
index 26846834b36..82a3d2a5be0 100644
--- a/etc/sk-dired-ref.tex
+++ b/etc/sk-dired-ref.tex
@@ -1,5 +1,6 @@
% Reference Card for Dired
-% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005,
+% 2006 Free Software Foundation, Inc.
% Slovak hyphenation rules applied
\shyph
@@ -48,7 +49,7 @@
% e.g. in the TeX Live CD).
\def\versionnumber{0.1}
-\def\year{2005}
+\def\year{2006}
\def\version{May \year\ v\versionnumber}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
diff --git a/etc/sk-refcard.tex b/etc/sk-refcard.tex
index 40f36f2109f..97911a66db8 100644
--- a/etc/sk-refcard.tex
+++ b/etc/sk-refcard.tex
@@ -12,7 +12,7 @@
\columnsperpage=1
% Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
-% 2005 Free Software Foundation, Inc.
+% 2005, 2006 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@@ -68,7 +68,7 @@
% e.g. in the TeX Live CD).
\def\versionnumber{2.2}
-\def\year{2005}
+\def\year{2006}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
\centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/etc/sk-survival.tex b/etc/sk-survival.tex
index 346516cf48e..4cd12672ada 100644
--- a/etc/sk-survival.tex
+++ b/etc/sk-survival.tex
@@ -21,7 +21,8 @@
\endinput
\fi
-% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005,
+% 2006 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@@ -50,7 +51,7 @@
% e.g. in the TeX Live CD).
\def\versionnumber{1.0}
-\def\year{2005}
+\def\year{2006}
\def\copyrightnotice{\penalty-1\vfill
\vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/survival.tex b/etc/survival.tex
index 0e164d7654f..8c56232d7ad 100644
--- a/etc/survival.tex
+++ b/etc/survival.tex
@@ -25,7 +25,8 @@
\endinput
\fi
-% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005,
+% 2006 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@@ -45,7 +46,7 @@
% Boston, MA 02110-1301, USA.
\def\versionnumber{1.0}
-\def\year{2005}
+\def\year{2006}
\def\copyrightnotice{\penalty-1\vfill
\vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/vipcard.tex b/etc/vipcard.tex
index cca644b6bfd..693667bd076 100644
--- a/etc/vipcard.tex
+++ b/etc/vipcard.tex
@@ -7,7 +7,8 @@
\columnsperpage=1
-% Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 1987, 2002, 2003, 2004, 2005,
+% 2006 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@@ -54,7 +55,7 @@
\def\versionnumber{1.2}
-\def\year{2005}
+\def\year{2006}
\def\version{September \year\ v\versionnumber}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
diff --git a/etc/viperCard.tex b/etc/viperCard.tex
index 50f65b2c0d5..b2761126837 100644
--- a/etc/viperCard.tex
+++ b/etc/viperCard.tex
@@ -8,7 +8,7 @@
\columnsperpage=2
% Copyright (C) 1995, 1996, 1997, 2002, 2003, 2004,
-% 2005 Free Software Foundation, Inc.
+% 2005, 2006 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@@ -62,7 +62,7 @@
\def\versionnumber{3.0}
-\def\year{2005}
+\def\year{2006}
\def\version{August \year\ v\versionnumber}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index c8d1cb41dea..df8639f31fa 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -5788,8 +5788,8 @@ Tue Jul 1 01:09:07 1997 Geoff Voelker <voelker@cs.washington.edu>
;; End:
Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
- 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
- Free Software Foundation, Inc.
+ 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 7f071543965..33af87019e0 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,6 +1,6 @@
# Makefile for lib-src subdirectory in GNU Emacs.
# Copyright (C) 1985, 1987, 1988, 1993, 1994, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c
index 562c5522ed9..c9f4f3713a7 100644
--- a/lib-src/cvtmail.c
+++ b/lib-src/cvtmail.c
@@ -1,5 +1,5 @@
/* Copyright (C) 1985, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/lib-src/digest-doc.c b/lib-src/digest-doc.c
index d3df334841e..7b5a9677e7c 100644
--- a/lib-src/digest-doc.c
+++ b/lib-src/digest-doc.c
@@ -2,7 +2,7 @@
standard output a file of nroff output containing the doc strings.
Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index a9a3eb78442..94fa9114d23 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -1,7 +1,7 @@
/* ebrowse.c --- parsing files for the ebrowse C++ browser
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -3689,7 +3689,7 @@ void
version ()
{
printf ("ebrowse %s\n", VERSION);
- puts ("Copyright (C) 1992-1999, 2000, 2001 Free Software Foundation, Inc.");
+ puts ("Copyright (C) 1992-2006 Free Software Foundation, Inc.");
puts ("This program is distributed under the same terms as Emacs.");
exit (EXIT_SUCCESS);
}
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 034d5c9faa9..46cb7ec2aea 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1,6 +1,6 @@
/* Client process that communicates with GNU Emacs acting as server.
Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/lib-src/emacstool.c b/lib-src/emacstool.c
index b883b442bd9..0843a3c5083 100644
--- a/lib-src/emacstool.c
+++ b/lib-src/emacstool.c
@@ -1,6 +1,6 @@
/*
Copyright (C) 1986, 1988, 1990, 1991, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/lib-src/etags.c b/lib-src/etags.c
index fecf7904117..a073acb92d6 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -1,7 +1,7 @@
/* Tags file maker to go with GNU Emacs -*- coding: latin-1 -*-
Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995,
1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc. and Ken Arnold
+ 2005, 2006 Free Software Foundation, Inc. and Ken Arnold
This file is not considered part of GNU Emacs.
@@ -858,7 +858,7 @@ static void
print_version ()
{
printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION);
- puts ("Copyright (C) 2002 Free Software Foundation, Inc. and Ken Arnold");
+ puts ("Copyright (C) 2006 Free Software Foundation, Inc. and Ken Arnold");
puts ("This program is distributed under the same terms as Emacs");
exit (EXIT_SUCCESS);
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index de1e2cbf858..c8bfcfc0931 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -1,6 +1,6 @@
/* sendmail-like interface to /bin/mail for system V,
Copyright (C) 1985, 1994, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/lib-src/getopt.c b/lib-src/getopt.c
index 70fd4186261..a0698bba77a 100644
--- a/lib-src/getopt.c
+++ b/lib-src/getopt.c
@@ -4,7 +4,7 @@
before changing it!
Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
diff --git a/lib-src/getopt1.c b/lib-src/getopt1.c
index 8aa9b183578..48d263e922a 100644
--- a/lib-src/getopt1.c
+++ b/lib-src/getopt1.c
@@ -1,6 +1,6 @@
/* getopt_long and getopt_long_only entry points for GNU getopt.
Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997,
- 1998, 2004, 2005 Free Software Foundation, Inc.
+ 1998, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
diff --git a/lib-src/getopt_.h b/lib-src/getopt_.h
index fbd45d42aab..e17da9e243c 100644
--- a/lib-src/getopt_.h
+++ b/lib-src/getopt_.h
@@ -1,6 +1,6 @@
/* Declarations for getopt.
Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999,
- 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
diff --git a/lib-src/getopt_int.h b/lib-src/getopt_int.h
index f59ab32ce28..f20d417b11f 100644
--- a/lib-src/getopt_int.h
+++ b/lib-src/getopt_int.h
@@ -1,6 +1,6 @@
/* Internal declarations for getopt.
Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999,
- 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
diff --git a/lib-src/gettext.h b/lib-src/gettext.h
index 658fa17fcb8..eb1976b6588 100644
--- a/lib-src/gettext.h
+++ b/lib-src/gettext.h
@@ -1,6 +1,6 @@
/* Convenience header for conditional use of GNU <libintl.h>.
Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index 45bf841ae59..e3d3af2c577 100755
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -1,7 +1,7 @@
#! /usr/bin/perl
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 0dfdddf468f..62fdd52b5a1 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -1,5 +1,6 @@
/* Convert files for Emacs Hexl mode.
- Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1989, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is not considered part of GNU Emacs.
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 537eafec7f5..bfdb206ad97 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1,6 +1,6 @@
/* Generate doc-string file for GNU Emacs from source files.
Copyright (C) 1985, 1986, 1992, 1993, 1994, 1997, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index e8bc7399da0..10b7c07f5c2 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,6 +1,6 @@
# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
# Copyright (C) 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index e8f1122e943..d3ec1fcd178 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -1,7 +1,7 @@
/* movemail foo bar -- move file foo to file bar,
locking file foo the way /bin/mail respects.
Copyright (C) 1986, 1992, 1993, 1994, 1996, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index caaf521206b..94110e4306c 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -1,5 +1,6 @@
/* Utility and Unix shadow routines for GNU Emacs support programs on NT.
- Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1994, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 07e730567f7..96862aa334b 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -1,5 +1,6 @@
/* Utility and Unix shadow routines for GNU Emacs support programs on NT.
- Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1994, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 9bc73e90a54..7d6bcc5cdc9 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1,6 +1,6 @@
/* pop.c: client routines for talking to a POP3-protocol post-office server
Copyright (C) 1991, 1993, 1996, 1997, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Written by Jonathan Kamens, jik@security.ov.com.
This file is part of GNU Emacs.
diff --git a/lib-src/pop.h b/lib-src/pop.h
index eed24a89934..102fef6327b 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -1,6 +1,6 @@
/* pop.h: Header file for the "pop.c" client POP3 protocol.
Copyright (C) 1991, 1993, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Written by Jonathan Kamens, jik@security.ov.com.
This file is part of GNU Emacs.
diff --git a/lib-src/profile.c b/lib-src/profile.c
index 615a43d912c..399752b5808 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -1,6 +1,6 @@
/* profile.c --- generate periodic events for profiling of Emacs Lisp code.
Copyright (C) 1992, 1994, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin
index beee6ce29f7..f805705ae6a 100755
--- a/lib-src/rcs-checkin
+++ b/lib-src/rcs-checkin
@@ -3,7 +3,7 @@
# This script accepts any number of file arguments and checks them into RCS.
# Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 4e7c6c1bb1b..795c70ecd85 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -55,7 +55,7 @@ Report bugs to <bug-gnu-emacs@gnu.org>.'
Id='$Id$'
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
-# 2004, 2005 Free Software Foundation, Inc.
+# 2004, 2005, 2006 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@ Id='$Id$'
# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
-Copyright='Copyright (C) 2005 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2006 Free Software Foundation, Inc.
This program comes with NO WARRANTY, to the extent permitted by law.
You may redistribute copies of this program
under the terms of the GNU General Public License.
diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c
index cb04be26842..a2416993a1b 100644
--- a/lib-src/sorted-doc.c
+++ b/lib-src/sorted-doc.c
@@ -2,7 +2,7 @@
standard output a file of texinfo input containing the doc strings.
Copyright (C) 1989, 1992, 1994, 1996, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index 0d3587af8da..0fdb29b1f39 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -1,7 +1,7 @@
/* test-distrib.c --- testing distribution of nonprinting chars
Copyright (C) 1987, 1993, 1994, 1995, 1999, 2001, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 46d0d8b0600..56d873044e7 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -1,5 +1,5 @@
/* update-game-score.c --- Update a score file
- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index a57811a7f6d..52fdaee0f7f 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -4,7 +4,7 @@
# This version is more compatible with rcsdiff(1).
#
# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b6eae823e0..75802219b4e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,15 +1,125 @@
+2006-02-07 Mathias Dahl <brakjoller@hotmail.com>
+
+ * dired.el (dired-mode-map): Add more bindings for tumme.
+
+2006-02-07 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * wdired.el (wdired-mode-map): Use remap.
+ (wdired-get-filename): Massage.
+ (wdired-perm-mode-map): Don't copy bindings from wdired-mode-map.
+ (wdired-preprocess-perms, wdired-set-bit, wdired-toggle-bit): Use the
+ `keymap' property rather than `local-map'.
+
+2006-02-07 Mathias Dahl <brakjoller@hotmail.com>
+
+ * tumme.el (tumme-get-thumbnail-image): New utility function.
+ Suggested by from Chong Yidong.
+ (tumme-dired-with-window-configuration): Rename from
+ `tumme-dired'. Add code to save window configuration.
+ (tumme-restore-window-configuration): New command to restore the
+ window configuration that `tumme-dired-with-window-configuration'
+ saves before it changes the window configuration.
+ (tumme-show-all-from-dir): New command to display thumbnails for
+ all files in a directory entered by the user, like M-x thumbs.
+ (tumme-display-thumbs): Call `pop-to-buffer' after all thumbnails
+ have been created.
+ (tumme-display-thumbnail-original-image): Call `display-buffer'.
+ (obsolete-tumme-display-thumbnail-original-image-and-buffer):
+ Remove obsolete test function.
+
+2006-02-07 Juanma Barranquero <lekktu@gmail.com>
+
+ * vc.el (small-temporary-file-directory): Remove defvar; there's
+ a defcustom for it in files.el.
+
+ * tumme.el (tumme-get-thumbnail-image): Add missing arg to `error'.
+ Fix typo in message.
+ (tumme-gallery-generate): Fix typo in `error' message.
+ (tumme-display-window-height-correction)
+ (tumme-display-window-width-correction, tumme-line-up-dynamic)
+ (tumme-line-up-interactive): Dox fixes.
+ (tumme-cmd-rotate-original-options, tumme-display-properties-format)
+ (tumme-restore-window-configuration, tumme-format-properties-string)
+ (tumme-create-thumbs, tumme-display-previous-thumbnail-original):
+ Fix typos in docstrings.
+
+2006-02-07 Chris Moore <christopher.ian.moore@gmail.com> (tiny change)
+
+ * wdired.el (wdired-get-filename): Fix bug: Don't re-normalize OLD.
+
+2006-02-07 Nick Roberts <nickrob@snap.net.nz>
+
+ * progmodes/gud.el (gud-tooltip-mode): Remove autoload cookie.
+ User should use hook if desired.
+
+ * progmodes/gdb-ui.el (gdb-post-prompt): Regenerate breakpoints
+ buffer if necessary.
+ (gdb-delete-frame-or-window): New function.
+ (gdb-breakpoints-mode-map): Bind "q" to it.
+
+2006-02-06 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * textmodes/nroff-mode.el: Clean up name space.
+ (nroff-mode-syntax-table): Remove spurious `1' in the syntax of \n.
+ (nroff-mode): Obey the global setting of nroff-electric-mode.
+ (nroff-electric-mode): Use define-minor-mode and derived-mode-p.
+
+ * calendar/calendar.el (calendar-increment-month): Typo in last change.
+
+2006-02-06 Thien-Thi Nguyen <ttn@gnu.org>
+
+ * vc-svn.el (vc-svn-previous-version, vc-svn-next-version): New funcs.
+
+2006-02-06 Lars Hansen <larsh@soem.dk>
+
+ * generic-x.el (etc-fstab-generic-mode): Add file system types
+ cifs and usbdevfs. Allow special chars in file names.
+
+2006-02-05 Jay Belanger <belanger@truman.edu>
+
+ Update copyright notices of the files in lisp/calc.
+
+2006-02-05 Romain Francoise <romain@orebokech.com>
+
+ Update copyright notices of all files in the lisp/play directory.
+
+2006-02-04 Luc Teirlinck <teirllm@auburn.edu>
+
+ * ldefs-boot.el: Regenerate.
+
+ * emacs-lisp/find-func.el (find-definition-noselect): Minor doc fix.
+
+2006-02-05 Kim F. Storm <storm@cua.dk>
+
+ * files.el (magic-mode-regexp-match-limit): New defvar.
+ (set-auto-mode): Use it to limit magic-mode-alist matching.
+
+2006-02-04 Kevin Rodgers <ihs_4664@yahoo.com>
+
+ * simple.el (display-message-or-buffer): Compare the number of
+ characters to the frame width when determining whether a 1-line
+ message string will fit in the echo area. Count screen lines
+ instead of buffer lines when determining whether a multi-line
+ message will fit in the echo area/minibuffer window.
+
+2006-02-04 Eli Zaretskii <eliz@gnu.org>
+
+ * info.el (Info-index, Info-mode): Improve the description of the
+ `i' command.
+
+ * ldefs-boot.el: Regenerate.
+
2006-02-03 Werner Lemberg <wl@gnu.org>
* textmodes/nroff-mode.el (nroff-font-lock-keywords): Don't be
greedy to find the closing bracket in \*[...] and similar
expressions. This is a first rough fix -- many additional
- refinements are necessary to make nroff mode really usable with
- groff.
+ refinements are necessary to make nroff mode really usable with groff.
2006-02-03 Jens Petersen <petersen@redhat.com> (tiny change)
- * international/mule-cmds.el (set-locale-environment): Add
- "/usr/share/X11/locale/locale.alias" to search list for xorg-x11
+ * international/mule-cmds.el (set-locale-environment):
+ Add "/usr/share/X11/locale/locale.alias" to search list for xorg-x11
libX11.
2006-02-03 Joe Wells <jbw@macs.hw.ac.uk> (tiny change)
@@ -20030,7 +20140,7 @@ See ChangeLog.11 for earlier changes.
;; coding: iso-2022-7bit
;; End:
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index e5a74f1d623..4f92816e4eb 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1,5 +1,6 @@
# Maintenance productions for the Lisp directory
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 774bb1892b7..bd0c6ffc094 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -1,7 +1,7 @@
;;; abbrev.el --- abbrev mode commands for Emacs
;; Copyright (C) 1985, 1986, 1987, 1992, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: abbrev convenience
diff --git a/lisp/abbrevlist.el b/lisp/abbrevlist.el
index 3be9c257af2..bd3482f974b 100644
--- a/lisp/abbrevlist.el
+++ b/lisp/abbrevlist.el
@@ -1,7 +1,7 @@
;;; abbrevlist.el --- list one abbrev table alphabetically ordered
;; Copyright (C) 1986, 1992, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Suggested by a previous version by Gildea.
;; Maintainer: FSF
diff --git a/lisp/align.el b/lisp/align.el
index f63085011b7..b40f96e7f83 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -1,7 +1,7 @@
;;; align.el --- align text to a specific column, by regexp
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
;; Keywords: convenience languages lisp
diff --git a/lisp/allout.el b/lisp/allout.el
index bfadf27f058..78e61dacde2 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -1,7 +1,7 @@
;;; allout.el --- extensive outline mode for use alone and with other modes
;; Copyright (C) 1992, 1993, 1994, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Ken Manheimer <ken dot manheimer at gmail dot com>
;; Maintainer: Ken Manheimer <ken dot manheimer at gmail dot com>
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index ce84af445a5..20cdfaad2cf 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -1,7 +1,7 @@
;;; ansi-color.el --- translate ANSI escape sequences into faces
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Alex Schroeder <alex@gnu.org>
;; Maintainer: Alex Schroeder <alex@gnu.org>
diff --git a/lisp/apropos.el b/lisp/apropos.el
index c8201de492a..3333981c5e5 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -1,7 +1,7 @@
;;; apropos.el --- apropos commands for users and programmers
;; Copyright (C) 1989, 1994, 1995, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Joe Wells <jbw@bigbird.bu.edu>
;; Rewritten: Daniel Pfeiffer <occitan@esperanto.org>
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 4eff3b65635..e664368df4f 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -1,7 +1,7 @@
;;; arc-mode.el --- simple editing of archives
;; Copyright (C) 1995, 1997, 1998, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Morten Welinder <terra@gnu.org>
;; Keywords: archives msdog editing major-mode
diff --git a/lisp/autoarg.el b/lisp/autoarg.el
index aca22ace5b5..1b87c664514 100644
--- a/lisp/autoarg.el
+++ b/lisp/autoarg.el
@@ -1,7 +1,7 @@
;;; autoarg.el --- make digit keys supply prefix args
;; Copyright (C) 1998, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Dave Love <fx@gnu.org>
;; Created: 1998-09-04
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index 465817d5b81..c1a2047a9c6 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -1,7 +1,7 @@
;;; autoinsert.el --- automatic mode-dependent insertion of text into new files
;; Copyright (C) 1985, 1986, 1987, 1994, 1995, 1998, 2000, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Charlie Martin <crm@cs.duke.edu>
;; Adapted-By: Daniel Pfeiffer <occitan@esperanto.org>
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 9892dca2d41..4119dba5755 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -1,7 +1,7 @@
;;; autorevert.el --- revert buffers when files on disk change
;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Anders Lindgren <andersl@andersl.com>
;; Keywords: convenience
diff --git a/lisp/avoid.el b/lisp/avoid.el
index e99d09d6753..1d97dd306db 100644
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -1,7 +1,7 @@
;;; avoid.el --- make mouse pointer stay out of the way of editing
;; Copyright (C) 1993, 1994, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Boris Goldowsky <boris@gnu.org>
;; Keywords: mouse
diff --git a/lisp/battery.el b/lisp/battery.el
index 54a0e207ffc..fa816c585b4 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -1,7 +1,7 @@
;;; battery.el --- display battery status information
;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
;; Keywords: hardware
diff --git a/lisp/bindings.el b/lisp/bindings.el
index aae21186920..f8dfc9fe6c0 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -1,7 +1,7 @@
;;; bindings.el --- define standard key bindings and some variables
;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996, 1999,
-;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 31616469454..104a9c6512f 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1,7 +1,7 @@
;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later
;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Karl Fogel <kfogel@red-bean.com>
;; Maintainer: Karl Fogel <kfogel@red-bean.com>
diff --git a/lisp/bs.el b/lisp/bs.el
index bdeb00f5804..a1dfad6ac7a 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -1,7 +1,7 @@
;;; bs.el --- menu for selecting and displaying buffers
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Olaf Sylvester <Olaf.Sylvester@netsurf.de>
;; Maintainer: Olaf Sylvester <Olaf.Sylvester@netsurf.de>
;; Keywords: convenience
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 62ff0c0a01d..5388ff9863d 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -1,7 +1,7 @@
;;; buff-menu.el --- buffer menu main function and support functions -*- coding:utf-8 -*-
;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: convenience
diff --git a/lisp/button.el b/lisp/button.el
index d50452fc97a..3924a9c9418 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -1,6 +1,7 @@
;;; button.el --- clickable buttons
;;
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;;
;; Author: Miles Bader <miles@gnu.org>
;; Keywords: extensions
diff --git a/lisp/calc/README b/lisp/calc/README
index 86539341358..00d0e9b232a 100644
--- a/lisp/calc/README
+++ b/lisp/calc/README
@@ -3,7 +3,7 @@ This directory contains Calc, an advanced desk calculator for GNU
Emacs.
"Calc" Copyright 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Written by:
Dave Gillespie
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el
index 6919527751b..fadfabce663 100644
--- a/lisp/calc/calc-aent.el
+++ b/lisp/calc/calc-aent.el
@@ -1,7 +1,7 @@
;;; calc-aent.el --- algebraic entry functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Dave Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-alg.el b/lisp/calc/calc-alg.el
index a57f7ede375..f2929eb5a84 100644
--- a/lisp/calc/calc-alg.el
+++ b/lisp/calc/calc-alg.el
@@ -1,7 +1,7 @@
;;; calc-alg.el --- algebraic functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-arith.el b/lisp/calc/calc-arith.el
index 64e0b4b7d10..2372b0ebbfb 100644
--- a/lisp/calc/calc-arith.el
+++ b/lisp/calc/calc-arith.el
@@ -1,7 +1,7 @@
;;; calc-arith.el --- arithmetic functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-bin.el b/lisp/calc/calc-bin.el
index 376c049e93e..5a4cf72a0ac 100644
--- a/lisp/calc/calc-bin.el
+++ b/lisp/calc/calc-bin.el
@@ -1,7 +1,7 @@
;;; calc-bin.el --- binary functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-comb.el b/lisp/calc/calc-comb.el
index 5105148a60f..7c274d39aa6 100644
--- a/lisp/calc/calc-comb.el
+++ b/lisp/calc/calc-comb.el
@@ -1,7 +1,7 @@
;;; calc-comb.el --- combinatoric functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-cplx.el b/lisp/calc/calc-cplx.el
index cf9054343d4..5223a98c7d0 100644
--- a/lisp/calc/calc-cplx.el
+++ b/lisp/calc/calc-cplx.el
@@ -1,7 +1,7 @@
;;; calc-cplx.el --- Complex number functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el
index 7878034694e..28a319f84e4 100644
--- a/lisp/calc/calc-embed.el
+++ b/lisp/calc/calc-embed.el
@@ -1,7 +1,7 @@
;;; calc-embed.el --- embed Calc in a buffer
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index ed290ea780a..8a6e65d74db 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -1,7 +1,7 @@
;;; calc-ext.el --- various extension functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-fin.el b/lisp/calc/calc-fin.el
index b15f7c254d1..0f4f00a958a 100644
--- a/lisp/calc/calc-fin.el
+++ b/lisp/calc/calc-fin.el
@@ -1,7 +1,7 @@
;;; calc-fin.el --- financial functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el
index 3a192e3f0be..7ebbba2aec5 100644
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -1,7 +1,7 @@
;;; calc-forms.el --- data format conversion functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-frac.el b/lisp/calc/calc-frac.el
index bf3850b72b9..59849cbf975 100644
--- a/lisp/calc/calc-frac.el
+++ b/lisp/calc/calc-frac.el
@@ -1,7 +1,7 @@
;;; calc-frac.el --- fraction functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-funcs.el b/lisp/calc/calc-funcs.el
index 9d491a2c540..291cbc9b47f 100644
--- a/lisp/calc/calc-funcs.el
+++ b/lisp/calc/calc-funcs.el
@@ -1,7 +1,7 @@
;;; calc-funcs.el --- well-known functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el
index 31d45c50a70..355f66649ca 100644
--- a/lisp/calc/calc-graph.el
+++ b/lisp/calc/calc-graph.el
@@ -1,7 +1,7 @@
;;; calc-graph.el --- graph output functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index 2d79fd36f6c..510e61a12b6 100644
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -1,7 +1,7 @@
;;; calc-help.el --- help display functions for Calc,
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
@@ -414,7 +414,7 @@ C-w Describe how there is no warranty for Calc."
(princ (format "GNU Emacs Calculator version %s.\n"
calc-version))
(princ " By Dave Gillespie.\n")
- (princ " Copyright (C) 2005 Free Software Foundation, Inc.\n\n")
+ (princ " Copyright (C) 2006 Free Software Foundation, Inc.\n\n")
(princ "Type `h s' for a more detailed summary.\n")
(princ "Or type `h i' to read the full Calc manual on-line.\n\n")
(princ "Basic keys:\n")
diff --git a/lisp/calc/calc-incom.el b/lisp/calc/calc-incom.el
index 50d6f16f7bd..ac25ad5b875 100644
--- a/lisp/calc/calc-incom.el
+++ b/lisp/calc/calc-incom.el
@@ -1,7 +1,7 @@
;;; calc-incom.el --- complex data type input functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-keypd.el b/lisp/calc/calc-keypd.el
index 475592c8ab6..b04804eb1ba 100644
--- a/lisp/calc/calc-keypd.el
+++ b/lisp/calc/calc-keypd.el
@@ -1,7 +1,7 @@
;;; calc-keypd.el --- mouse-capable keypad input for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el
index 7653673c082..c7f92a13847 100644
--- a/lisp/calc/calc-lang.el
+++ b/lisp/calc/calc-lang.el
@@ -1,7 +1,7 @@
;;; calc-lang.el --- calc language functions
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-macs.el b/lisp/calc/calc-macs.el
index 352ffafe389..496c3fff858 100644
--- a/lisp/calc/calc-macs.el
+++ b/lisp/calc/calc-macs.el
@@ -1,7 +1,7 @@
;;; calc-macs.el --- important macros for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-map.el b/lisp/calc/calc-map.el
index da9b91243ae..63e45538c32 100644
--- a/lisp/calc/calc-map.el
+++ b/lisp/calc/calc-map.el
@@ -1,7 +1,7 @@
;;; calc-map.el --- higher-order functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el
index 53d80350834..869d7457ed6 100644
--- a/lisp/calc/calc-math.el
+++ b/lisp/calc/calc-math.el
@@ -1,7 +1,7 @@
;;; calc-math.el --- mathematical functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index ca8e8bbdbfe..14bf3908b83 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -1,7 +1,7 @@
;;; calc-misc.el --- miscellaneous functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el
index d04a95831ef..9b3bc297a80 100644
--- a/lisp/calc/calc-mode.el
+++ b/lisp/calc/calc-mode.el
@@ -1,7 +1,7 @@
;;; calc-mode.el --- calculator modes for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-mtx.el b/lisp/calc/calc-mtx.el
index 0b18927a7f1..2945049a744 100644
--- a/lisp/calc/calc-mtx.el
+++ b/lisp/calc/calc-mtx.el
@@ -1,7 +1,7 @@
;;; calc-mtx.el --- matrix functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el
index 4714b2f7d38..6d1780ce357 100644
--- a/lisp/calc/calc-poly.el
+++ b/lisp/calc/calc-poly.el
@@ -1,7 +1,7 @@
;;; calc-poly.el --- polynomial functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el
index 8736d4375dd..ea625c7a77c 100644
--- a/lisp/calc/calc-prog.el
+++ b/lisp/calc/calc-prog.el
@@ -1,7 +1,7 @@
;;; calc-prog.el --- user programmability functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-rewr.el b/lisp/calc/calc-rewr.el
index 5c08bd4baf6..71dce50d976 100644
--- a/lisp/calc/calc-rewr.el
+++ b/lisp/calc/calc-rewr.el
@@ -1,7 +1,7 @@
;;; calc-rewr.el --- rewriting functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-rules.el b/lisp/calc/calc-rules.el
index a3a07b04563..339993f98a5 100644
--- a/lisp/calc/calc-rules.el
+++ b/lisp/calc/calc-rules.el
@@ -1,7 +1,7 @@
;;; calc-rules.el --- rules for simplifying algebraic expressions in Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-sel.el b/lisp/calc/calc-sel.el
index 87767a12244..bf18fa968c5 100644
--- a/lisp/calc/calc-sel.el
+++ b/lisp/calc/calc-sel.el
@@ -1,7 +1,7 @@
;;; calc-sel.el --- data selection functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-stat.el b/lisp/calc/calc-stat.el
index 9db057d30d1..2b4f8e7358f 100644
--- a/lisp/calc/calc-stat.el
+++ b/lisp/calc/calc-stat.el
@@ -1,7 +1,7 @@
;;; calc-stat.el --- statistical functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el
index d6a37644cc7..218ae46b88a 100644
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -1,7 +1,7 @@
;;; calc-store.el --- value storage functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-stuff.el b/lisp/calc/calc-stuff.el
index 635dcf95036..708dff18632 100644
--- a/lisp/calc/calc-stuff.el
+++ b/lisp/calc/calc-stuff.el
@@ -1,7 +1,7 @@
;;; calc-stuff.el --- miscellaneous functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-trail.el b/lisp/calc/calc-trail.el
index d5bba8dbb92..e93e5e5c88c 100644
--- a/lisp/calc/calc-trail.el
+++ b/lisp/calc/calc-trail.el
@@ -1,7 +1,7 @@
;;; calc-trail.el --- functions for manipulating the Calc "trail"
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-undo.el b/lisp/calc/calc-undo.el
index e52ab015f26..0d429ef145a 100644
--- a/lisp/calc/calc-undo.el
+++ b/lisp/calc/calc-undo.el
@@ -1,7 +1,7 @@
;;; calc-undo.el --- undo functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index c4b1127a5c5..68e294a5939 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -1,7 +1,7 @@
;;; calc-units.el --- unit conversion functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-vec.el b/lisp/calc/calc-vec.el
index a830887a652..3ec387053c3 100644
--- a/lisp/calc/calc-vec.el
+++ b/lisp/calc/calc-vec.el
@@ -1,7 +1,7 @@
;;; calc-vec.el --- vector functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-yank.el b/lisp/calc/calc-yank.el
index 628b1fef1c0..2d80561faac 100644
--- a/lisp/calc/calc-yank.el
+++ b/lisp/calc/calc-yank.el
@@ -1,7 +1,7 @@
;;; calc-yank.el --- kill-ring functionality for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index fe55b7587f3..c251d28acfb 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -1,7 +1,7 @@
;;; calc.el --- the GNU Emacs calculator
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calcalg2.el b/lisp/calc/calcalg2.el
index 849ec42c5f6..facb691c08b 100644
--- a/lisp/calc/calcalg2.el
+++ b/lisp/calc/calcalg2.el
@@ -1,7 +1,7 @@
;;; calcalg2.el --- more algebraic functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calcalg3.el b/lisp/calc/calcalg3.el
index d5ef567866f..b1c5b80b17b 100644
--- a/lisp/calc/calcalg3.el
+++ b/lisp/calc/calcalg3.el
@@ -1,7 +1,7 @@
;;; calcalg3.el --- more algebraic functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el
index aab079ed739..548fe83882d 100644
--- a/lisp/calc/calccomp.el
+++ b/lisp/calc/calccomp.el
@@ -1,7 +1,7 @@
;;; calccomp.el --- composition functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calcsel2.el b/lisp/calc/calcsel2.el
index 6734065a701..3f5b94ef771 100644
--- a/lisp/calc/calcsel2.el
+++ b/lisp/calc/calcsel2.el
@@ -1,7 +1,7 @@
;;; calcsel2.el --- selection functions for Calc
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calculator.el b/lisp/calculator.el
index b9ba03f657f..fb5e9e41f69 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -1,11 +1,11 @@
;;; calculator.el --- a [not so] simple calculator for Emacs
;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Eli Barzilay <eli@barzilay.org>
;; Keywords: tools, convenience
-;; Time-stamp: <2005-07-18 17:45:34 juri>
+;; Time-stamp: <2006-02-06 13:36:00 ttn>
;; This file is part of GNU Emacs.
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index f01f4305708..b48f63458dc 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1308,7 +1308,7 @@ A negative YR is interpreted as BC; -1 being 1 BC, and so on."
The return value is a pair (MONTH . YEAR).
MON defaults to `displayed-month'. YR defaults to `displayed-year'."
(unless mon (setq mon displayed-month))
- (unless yr (setq mon displayed-year))
+ (unless yr (setq yr displayed-year))
(increment-calendar-month mon yr n)
(cons mon yr))
diff --git a/lisp/case-table.el b/lisp/case-table.el
index d1b8de5fb6a..dcba1d82c2b 100644
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -1,7 +1,7 @@
;;; case-table.el --- code to extend the character set and support case tables
;; Copyright (C) 1988, 1994, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Howard Gayle
;; Maintainer: FSF
diff --git a/lisp/cdl.el b/lisp/cdl.el
index abd339de9b8..378bc993aed 100644
--- a/lisp/cdl.el
+++ b/lisp/cdl.el
@@ -1,6 +1,7 @@
;;; cdl.el --- Common Data Language (CDL) utility functions for GNU Emacs
-;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: ATAE@spva.physics.imperial.ac.uk (Ata Etemadi)
;; Maintainer: FSF
diff --git a/lisp/chistory.el b/lisp/chistory.el
index c05fd849db4..3fbc068ac86 100644
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -1,6 +1,7 @@
;;; chistory.el --- list command history
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: K. Shane Hartman
;; Maintainer: FSF
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index 82d39fd2c00..622612648f3 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -1,7 +1,7 @@
;;; cmuscheme.el --- Scheme process in a buffer. Adapted from tea.el
;; Copyright (C) 1988, 1994, 1997, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Olin Shivers <olin.shivers@cs.cmu.edu>
;; Maintainer: FSF
diff --git a/lisp/comint.el b/lisp/comint.el
index 6676e836735..0cae078f481 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1,7 +1,7 @@
;;; comint.el --- general command interpreter in a window stuff
;; Copyright (C) 1988, 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Olin Shivers <shivers@cs.cmu.edu>
;; Simon Marshall <simon@gnu.org>
diff --git a/lisp/compare-w.el b/lisp/compare-w.el
index e3e7bd3945d..2d23de8c54c 100644
--- a/lisp/compare-w.el
+++ b/lisp/compare-w.el
@@ -1,7 +1,7 @@
;;; compare-w.el --- compare text between windows for Emacs
;; Copyright (C) 1986, 1989, 1993, 1997, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: convenience files
diff --git a/lisp/complete.el b/lisp/complete.el
index cde669a943f..a48942d2df1 100644
--- a/lisp/complete.el
+++ b/lisp/complete.el
@@ -1,7 +1,7 @@
;;; complete.el --- partial completion mechanism plus other goodies
;; Copyright (C) 1990, 1991, 1992, 1993, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Dave Gillespie <daveg@synaptics.com>
;; Keywords: abbrev convenience
diff --git a/lisp/completion.el b/lisp/completion.el
index e231906ad27..64bf8026e9d 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -1,7 +1,7 @@
;;; completion.el --- dynamic word-completion code
;; Copyright (C) 1990, 1993, 1995, 1997, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: abbrev convenience
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index ba8e21c8a4c..53ad08498f6 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -1,7 +1,7 @@
;;; cus-face.el --- customization support for faces
;;
;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Keywords: help, faces
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index a21a6fdeba3..81d1ab7cf6f 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -1,7 +1,7 @@
;;; cus-start.el --- define customization properties of builtins
;;
;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Keywords: internal
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index a21832c7b62..3a89c6a664e 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -1,6 +1,7 @@
;;; cus-theme.el -- custom theme creation user interface
;;
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;;
;; Author: Alex Schroeder <alex@gnu.org>
;; Maintainer: FSF
diff --git a/lisp/custom.el b/lisp/custom.el
index 6267febe0d5..0f95e3bab73 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1,7 +1,7 @@
;;; custom.el --- tools for declaring and initializing options
;;
;; Copyright (C) 1996, 1997, 1999, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Maintainer: FSF
diff --git a/lisp/cvs-status.el b/lisp/cvs-status.el
index 792dcb2ef26..cf0ee85db23 100644
--- a/lisp/cvs-status.el
+++ b/lisp/cvs-status.el
@@ -1,7 +1,7 @@
;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8 -*-
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: pcl-cvs cvs status tree tools
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index ea99030d943..624a59bf880 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -1,7 +1,7 @@
;;; dabbrev.el --- dynamic abbreviation package
;; Copyright (C) 1985, 1986, 1992, 1994, 1996, 1997, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Don Morrison
;; Maintainer: Lars Lindberg <Lars.Lindberg@sypro.cap.se>
diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index 50d09a6414b..7433c728405 100644
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -1,11 +1,11 @@
;;; delim-col.el --- prettify all columns in a region or rectangle
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2004/03/09 21:32:06 vinicius>
+;; Time-stamp: <2006-02-06 13:37:10 ttn>
;; Version: 2.1
;; Keywords: internal
;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
diff --git a/lisp/delsel.el b/lisp/delsel.el
index d7a3d90e969..278849233b7 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -1,7 +1,7 @@
;;; delsel.el --- delete selection if you insert
;; Copyright (C) 1992, 1997, 1998, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Matthieu Devin <devin@lucid.com>
;; Maintainer: FSF
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index ba1365cfc43..ec75610c3d7 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -1,7 +1,7 @@
;;; descr-text.el --- describe text mode
;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Boris Goldowsky <boris@gnu.org>
;; Maintainer: FSF
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 98e31081abf..355f8d9394c 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1,7 +1,7 @@
;;; desktop.el --- save partial status of Emacs when killed
;; Copyright (C) 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Morten Welinder <terra@diku.dk>
;; Maintainter: Lars Hansen <larsh@soem.dk>
diff --git a/lisp/dframe.el b/lisp/dframe.el
index e15b57af605..e238a469dd5 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -1,7 +1,7 @@
;;; dframe --- dedicate frame support modes
;;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Keywords: file, tags, tools
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 8f018185c98..09645864573 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -1,7 +1,7 @@
;;; diff-mode.el --- a mode for viewing/editing context diffs
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: convenience patch diff
diff --git a/lisp/diff.el b/lisp/diff.el
index 8c4332b2da2..221d7b2e363 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -1,7 +1,7 @@
;;; diff.el --- run `diff' in compilation-mode
;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: unix, tools
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 7a34c39bed5..20b0037ab7e 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1,7 +1,7 @@
;;; dired-aux.el --- less commonly used parts of dired -*-byte-compile-dynamic: t;-*-
;; Copyright (C) 1985, 1986, 1992, 1994, 1998, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>.
;; Maintainer: FSF
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 14e0a459f86..da9fc284801 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -8,7 +8,7 @@
;; Keywords: dired extensions files
;; Copyright (C) 1993, 1994, 1997, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
diff --git a/lisp/dired.el b/lisp/dired.el
index fe8f6996b28..8433432ff09 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1,7 +1,7 @@
;;; dired.el --- directory-browsing commands
;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 2000,
-;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
;; Maintainer: FSF
@@ -1247,6 +1247,17 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
(define-key map "\177" 'dired-unmark-backward)
(define-key map [remap undo] 'dired-undo)
(define-key map [remap advertised-undo] 'dired-undo)
+ ;; thumbnail manipulation (tumme)
+ (define-key map "\C-td" 'tumme-display-thumbs)
+ (define-key map "\C-tt" 'tumme-tag-files)
+ (define-key map "\C-tr" 'tumme-tag-remove)
+ (define-key map "\C-tj" 'tumme-jump-thumbnail-buffer)
+ (define-key map "\C-ti" 'tumme-display-dired-image)
+ (define-key map "\C-tx" 'tumme-dired-display-external)
+ (define-key map "\C-ta" 'tumme-display-thumbs-append)
+ (define-key map "\C-t." 'tumme-display-thumb)
+ (define-key map "\C-tc" 'tumme-dired-comment-files)
+ (define-key map "\C-tf" 'tumme-mark-tagged-files)
;; Make menu bar items.
diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el
index 573803bfb98..30ef3570ad2 100644
--- a/lisp/dirtrack.el
+++ b/lisp/dirtrack.el
@@ -1,6 +1,7 @@
;;; dirtrack.el --- Directory Tracking by watching the prompt
-;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Peter Breton <pbreton@cs.umb.edu>
;; Created: Sun Nov 17 1996
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 22d803517cb..d1b49c0b7f0 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -1,7 +1,7 @@
;;; disp-table.el --- functions for dealing with char tables
;; Copyright (C) 1987, 1994, 1995, 1999, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Erik Naggum <erik@naggum.no>
;; Based on a previous version by Howard Gayle
diff --git a/lisp/dnd.el b/lisp/dnd.el
index f85984fb7d8..dec57481570 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -1,6 +1,6 @@
;;; dnd.el --- drag and drop support.
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
;; Author: Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
;; Maintainer: FSF
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index bf25ce1f589..7270dc8fa27 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -1,7 +1,7 @@
;;; dos-fns.el --- MS-Dos specific functions
;; Copyright (C) 1991, 1993, 1995, 1996, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: Morten Welinder <terra@diku.dk>
;; Keywords: internal
diff --git a/lisp/dos-vars.el b/lisp/dos-vars.el
index 1909e941c1f..9d00756804f 100644
--- a/lisp/dos-vars.el
+++ b/lisp/dos-vars.el
@@ -1,6 +1,7 @@
;;; dos-vars.el --- MS-Dos specific user options
-;; Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el
index 697f6eb4d5c..ae2bd8052bb 100644
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -1,6 +1,7 @@
;; dos-w32.el --- Functions shared among MS-DOS and W32 (NT/95) platforms
-;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: Geoff Voelker <voelker@cs.washington.edu>
;; Keywords: internal
diff --git a/lisp/double.el b/lisp/double.el
index fb4947fbd88..e869ca323e7 100644
--- a/lisp/double.el
+++ b/lisp/double.el
@@ -1,7 +1,7 @@
;;; double.el --- support for keyboard remapping with double clicking
;; Copyright (C) 1994, 1997, 1998, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Keywords: i18n
diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el
index 2ee90192ea3..9d0a3e989fc 100644
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -1,7 +1,7 @@
;;; ebuff-menu.el --- electric-buffer-list mode
;; Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Richard Mlynarik <mly@ai.mit.edu>
;; Maintainer: FSF
diff --git a/lisp/echistory.el b/lisp/echistory.el
index 6556680f5ca..2ddc7f1e7c6 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -1,6 +1,7 @@
;;; echistory.el --- Electric Command History Mode
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: K. Shane Hartman
;; Maintainer: FSF
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index 0a3f6920e2b..67da6eae25d 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -1,7 +1,7 @@
;;; ediff-diff.el --- diff-related utilities
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
diff --git a/lisp/ediff-help.el b/lisp/ediff-help.el
index 21fe85c415f..cc266e3c8a3 100644
--- a/lisp/ediff-help.el
+++ b/lisp/ediff-help.el
@@ -1,7 +1,7 @@
;;; ediff-help.el --- Code related to the contents of Ediff help buffers
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el
index c0add7f8f86..1b86e2f8f62 100644
--- a/lisp/ediff-hook.el
+++ b/lisp/ediff-hook.el
@@ -1,7 +1,7 @@
;;; ediff-hook.el --- setup for Ediff's menus and autoloads
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index 5bffea1ec4b..4897ffd2e59 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -1,7 +1,7 @@
;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index 5a5a2983327..7f0eea2cf09 100644
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -1,7 +1,7 @@
;;; ediff-merg.el --- merging utilities
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index f4ad4f1e612..c24e32a2124 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -1,7 +1,7 @@
;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el
index 9379b6127a9..9c5c75d847c 100644
--- a/lisp/ediff-ptch.el
+++ b/lisp/ediff-ptch.el
@@ -1,7 +1,7 @@
;;; ediff-ptch.el --- Ediff's patch support
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index caa927f2113..feb7b69d7b6 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -1,7 +1,7 @@
;;; ediff-util.el --- the core commands and utilities of ediff
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index f1f2305de81..4c9dc4dd9c8 100644
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -1,7 +1,7 @@
;;; ediff-vers.el --- version control interface to Ediff
;; Copyright (C) 1995, 1996, 1997, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 9fd9f45ff03..648a80b6156 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -1,7 +1,7 @@
;;; ediff-wind.el --- window manipulation utilities
;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
diff --git a/lisp/ediff.el b/lisp/ediff.el
index 32ca177388e..abb0f22b047 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -1,7 +1,7 @@
;;; ediff.el --- a comprehensive visual interface to diff & patch
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Created: February 2, 1994
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index b606d0f4b70..3d4a58d2c15 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -1,7 +1,7 @@
;;; edmacro.el --- keyboard macro editor
;; Copyright (C) 1993, 1994, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Dave Gillespie <daveg@synaptics.com>
;; Maintainer: Dave Gillespie <daveg@synaptics.com>
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index d0dfd8d6bed..376f31f1ca5 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -1,7 +1,7 @@
;;; ehelp.el --- bindings for electric-help mode
;; Copyright (C) 1986, 1995, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: help, extensions
diff --git a/lisp/electric.el b/lisp/electric.el
index 4c4f70b0939..e4506190571 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -1,7 +1,7 @@
;;; electric.el --- window maker and Command loop for `electric' modes
;; Copyright (C) 1985, 1986, 1995, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: K. Shane Hartman
;; Maintainer: FSF
diff --git a/lisp/elide-head.el b/lisp/elide-head.el
index 8be40ce17c3..6f14a5275a8 100644
--- a/lisp/elide-head.el
+++ b/lisp/elide-head.el
@@ -1,6 +1,7 @@
;;; elide-head.el --- hide headers in files
-;; Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Dave Love <fx@gnu.org>
;; Keywords: outlines tools
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index dc285a717af..486a3b049ae 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -1,7 +1,7 @@
;;; advice.el --- an overloading mechanism for Emacs Lisp functions
;; Copyright (C) 1993, 1994, 2000, 2001, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/assoc.el b/lisp/emacs-lisp/assoc.el
index d12b1dcbcb5..f3d0b9efc9b 100644
--- a/lisp/emacs-lisp/assoc.el
+++ b/lisp/emacs-lisp/assoc.el
@@ -1,6 +1,7 @@
;;; assoc.el --- insert/delete/sort functions on association lists
-;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Barry A. Warsaw <bwarsaw@cen.com>
;; Keywords: extensions
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index 437332baec9..d18567580aa 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -1,6 +1,7 @@
;;; authors.el --- utility for maintaining Emacs' AUTHORS file -*-coding: iso-2022-7bit;-*-
-;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Gerd Moellmann <gerd@gnu.org>
;; Maintainer: Kim F. Storm <storm@cua.dk>
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index a6bc4dd9514..d6477b854a1 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -1,7 +1,7 @@
;; autoload.el --- maintain autoloads in loaddefs.el
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Roland McGrath <roland@gnu.org>
;; Keywords: maint
diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el
index 627c2cfdbc7..c9f2a052b0b 100644
--- a/lisp/emacs-lisp/backquote.el
+++ b/lisp/emacs-lisp/backquote.el
@@ -1,7 +1,7 @@
;;; backquote.el --- implement the ` Lisp construct
;; Copyright (C) 1990, 1992, 1994, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Rick Sladkey <jrs@world.std.com>
;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/benchmark.el b/lisp/emacs-lisp/benchmark.el
index c2be5a5c3b5..d46c86b623b 100644
--- a/lisp/emacs-lisp/benchmark.el
+++ b/lisp/emacs-lisp/benchmark.el
@@ -1,6 +1,6 @@
;;; benchmark.el --- support for benchmarking code
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Dave Love <fx@gnu.org>
;; Keywords: lisp, extensions
diff --git a/lisp/emacs-lisp/bindat.el b/lisp/emacs-lisp/bindat.el
index f2b1d19a696..455b049dc8a 100644
--- a/lisp/emacs-lisp/bindat.el
+++ b/lisp/emacs-lisp/bindat.el
@@ -1,6 +1,6 @@
;;; bindat.el --- binary data structure packing and unpacking.
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Kim F. Storm <storm@cua.dk>
;; Assignment name: struct.el
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 42b876d7a23..db6d96ee9a0 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -1,7 +1,7 @@
;;; byte-opt.el --- the optimization passes of the emacs-lisp byte compiler
;; Copyright (C) 1991, 1994, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Jamie Zawinski <jwz@lucid.com>
;; Hallvard Furuseth <hbf@ulrik.uio.no>
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 1ebc8f765fa..ba68b842305 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -1,6 +1,7 @@
;;; byte-run.el --- byte-compiler support for inlining
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Jamie Zawinski <jwz@lucid.com>
;; Hallvard Furuseth <hbf@ulrik.uio.no>
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index bab50a1c822..bbeea5d703d 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -1,7 +1,7 @@
;;; checkdoc.el --- check documentation strings for style requirements
;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Version: 0.6.2
diff --git a/lisp/emacs-lisp/cl-compat.el b/lisp/emacs-lisp/cl-compat.el
index 66425576b5f..34f9642fe1f 100644
--- a/lisp/emacs-lisp/cl-compat.el
+++ b/lisp/emacs-lisp/cl-compat.el
@@ -1,6 +1,7 @@
;;; cl-compat.el --- Common Lisp extensions for GNU Emacs Lisp (compatibility)
-;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Dave Gillespie <daveg@synaptics.com>
;; Version: 2.02
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index c5a006912df..2e741408c04 100644
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -1,7 +1,7 @@
;;; cl-extra.el --- Common Lisp features, part 2 -*-byte-compile-dynamic: t;-*-
;; Copyright (C) 1993, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Dave Gillespie <daveg@synaptics.com>
;; Keywords: extensions
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 2497e02dc62..c3ceb4c2f3a 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -1,7 +1,7 @@
;;; cl-indent.el --- enhanced lisp-indent mode
;; Copyright (C) 1987, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Richard Mlynarik <mly@eddie.mit.edu>
;; Created: July 1987
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 20b2bc2e493..45ec97b3281 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1,6 +1,6 @@
;;; cl-macs.el --- Common Lisp macros -*-byte-compile-dynamic: t;-*-
-;; Copyright (C) 1993, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Dave Gillespie <daveg@synaptics.com>
;; Version: 2.02
diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el
index ba7845aaa9c..6b14acd23df 100644
--- a/lisp/emacs-lisp/cl-seq.el
+++ b/lisp/emacs-lisp/cl-seq.el
@@ -1,6 +1,7 @@
;;; cl-seq.el --- Common Lisp features, part 3 -*-byte-compile-dynamic: t;-*-
-;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Dave Gillespie <daveg@synaptics.com>
;; Version: 2.02
diff --git a/lisp/emacs-lisp/cl-specs.el b/lisp/emacs-lisp/cl-specs.el
index 650a341f955..9d3f1f63061 100644
--- a/lisp/emacs-lisp/cl-specs.el
+++ b/lisp/emacs-lisp/cl-specs.el
@@ -1,6 +1,7 @@
;;; cl-specs.el --- Edebug specs for cl.el -*- no-byte-compile: t -*-
-;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Daniel LaLiberte <liberte@holonexus.org>
;; Keywords: lisp, tools, maint
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index b7cf3ad8bcc..222407f86f2 100644
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -1,6 +1,7 @@
;;; cl.el --- Common Lisp extensions for Emacs -*-byte-compile-dynamic: t;-*-
-;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Dave Gillespie <daveg@synaptics.com>
;; Version: 2.02
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index 03eac0abd0a..371fdd66b60 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -1,7 +1,7 @@
;;; copyright.el --- update the copyright notice in current buffer
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1998, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Daniel Pfeiffer <occitan@esperanto.org>
;; Keywords: maint, tools
diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el
index 12f0788a0de..5a9787b5ca8 100644
--- a/lisp/emacs-lisp/crm.el
+++ b/lisp/emacs-lisp/crm.el
@@ -1,7 +1,7 @@
;;; crm.el --- read multiple strings with completion
;; Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Sen Nagata <sen@eccosys.com>
;; Keywords: completion, minibuffer, multiple elements
diff --git a/lisp/emacs-lisp/cust-print.el b/lisp/emacs-lisp/cust-print.el
index 102efdae9b9..332ea81932e 100644
--- a/lisp/emacs-lisp/cust-print.el
+++ b/lisp/emacs-lisp/cust-print.el
@@ -1,6 +1,7 @@
;;; cust-print.el --- handles print-level and print-circle
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Daniel LaLiberte <liberte@holonexus.org>
;; Adapted-By: ESR
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 612abaf7091..0c79a3eae9b 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -1,7 +1,7 @@
;;; debug.el --- debuggers and related commands for Emacs
;; Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: lisp, tools, maint
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 899c40456e7..10482bd49c4 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -2,7 +2,7 @@
;; (formerly mode-clone.el)
;; Copyright (C) 1993, 1994, 1999, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Megginson (dmeggins@aix1.uottawa.ca)
;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el
index fa0898f609e..db114e3cdf8 100644
--- a/lisp/emacs-lisp/disass.el
+++ b/lisp/emacs-lisp/disass.el
@@ -1,7 +1,7 @@
;;; disass.el --- disassembler for compiled Emacs Lisp code
;; Copyright (C) 1986, 1991, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Doug Cutting <doug@csli.stanford.edu>
;; Jamie Zawinski <jwz@lucid.com>
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 9d118cd5351..caac02c2ee3 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -1,7 +1,7 @@
;;; easy-mmode.el --- easy definition for major and minor modes
-;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Georges Brun-Cottan <Georges.Brun-Cottan@inria.fr>
;; Maintainer: Stefan Monnier <monnier@gnu.org>
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 65826290851..92f5251a8b1 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -1,7 +1,7 @@
;;; easymenu.el --- support the easymenu interface for defining a menu
;; Copyright (C) 1994, 1996, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Keywords: emulations
;; Author: Richard Stallman <rms@gnu.org>
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index beb88cfea25..49cf4115923 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1,7 +1,7 @@
;;; edebug.el --- a source-level debugger for Emacs Lisp
;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999,
-;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Daniel LaLiberte <liberte@holonexus.org>
;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 7712ab5af1c..805184e15de 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -1,7 +1,7 @@
;;; eldoc.el --- show function arglist or variable docstring in echo area
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Noah Friedman <friedman@splode.com>
;; Maintainer: friedman@splode.com
diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el
index e72613695e3..85c0026e801 100644
--- a/lisp/emacs-lisp/elint.el
+++ b/lisp/emacs-lisp/elint.el
@@ -1,6 +1,7 @@
;;; elint.el --- Lint Emacs Lisp
-;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Peter Liljenberg <petli@lysator.liu.se>
;; Created: May 1997
diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index 569847a0ea1..da5fd6c760c 100644
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -1,7 +1,7 @@
;;; elp.el --- Emacs Lisp Profiler
;; Copyright (C) 1994, 1995, 1997, 1998, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Barry A. Warsaw
;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el
index da9aa09119a..085ae532a63 100644
--- a/lisp/emacs-lisp/ewoc.el
+++ b/lisp/emacs-lisp/ewoc.el
@@ -1,7 +1,7 @@
;;; ewoc.el --- utility to maintain a view of a list of objects in a buffer
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Per Cederqvist <ceder@lysator.liu.se>
;; Inge Wallin <inge@lysator.liu.se>
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 4c218263a62..8776d4522c2 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -1,7 +1,7 @@
;;; find-func.el --- find the definition of the Emacs Lisp function near point
;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Jens Petersen <petersen@kurims.kyoto-u.ac.jp>
;; Maintainer: petersen@kurims.kyoto-u.ac.jp
@@ -414,7 +414,7 @@ See `find-variable' for more details."
(defun find-definition-noselect (symbol type &optional file)
"Return a pair `(BUFFER . POINT)' pointing to the definition of SYMBOL.
TYPE says what type of definition: nil for a function, `defvar' for a
-variabke, `defface' for a face. This function does not switch to the
+variable, `defface' for a face. This function does not switch to the
buffer nor display it.
The library where SYMBOL is defined is searched for in FILE or
diff --git a/lisp/emacs-lisp/find-gc.el b/lisp/emacs-lisp/find-gc.el
index 29e9dffbbde..dedadfa8c36 100644
--- a/lisp/emacs-lisp/find-gc.el
+++ b/lisp/emacs-lisp/find-gc.el
@@ -1,6 +1,7 @@
;;; find-gc.el --- detect functions that call the garbage collector
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/float-sup.el b/lisp/emacs-lisp/float-sup.el
index 1d30d60ea99..fb367d1cac4 100644
--- a/lisp/emacs-lisp/float-sup.el
+++ b/lisp/emacs-lisp/float-sup.el
@@ -1,7 +1,7 @@
;;; float-sup.el --- define some constants useful for floating point numbers.
;; Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el
index 4dd10ad3a9c..e52072e9db1 100644
--- a/lisp/emacs-lisp/generic.el
+++ b/lisp/emacs-lisp/generic.el
@@ -1,7 +1,7 @@
;;; generic.el --- defining simple major modes with comment and font-lock
;;
;; Copyright (C) 1997, 1999, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Peter Breton <pbreton@cs.umb.edu>
;; Created: Fri Sep 27 1996
diff --git a/lisp/emacs-lisp/gulp.el b/lisp/emacs-lisp/gulp.el
index 6e0c4ded4dd..d6b963a7e3d 100644
--- a/lisp/emacs-lisp/gulp.el
+++ b/lisp/emacs-lisp/gulp.el
@@ -1,6 +1,7 @@
;;; gulp.el --- ask for updates for Lisp packages
-;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Sam Shteingold <shteingd@math.ucla.edu>
;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el
index e97491aa6bb..3b614be26f4 100644
--- a/lisp/emacs-lisp/helper.el
+++ b/lisp/emacs-lisp/helper.el
@@ -1,6 +1,7 @@
;;; helper.el --- utility help package supporting help in electric modes
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: K. Shane Hartman
;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/levents.el b/lisp/emacs-lisp/levents.el
index 70961912815..fa747ed3eb4 100644
--- a/lisp/emacs-lisp/levents.el
+++ b/lisp/emacs-lisp/levents.el
@@ -1,7 +1,7 @@
;;; levents.el --- emulate the Lucid event data type and associated functions
;; Copyright (C) 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: emulations
diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el
index 0fd49024beb..d83bf182e7a 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -1,7 +1,7 @@
;;; lisp-mnt.el --- utility functions for Emacs Lisp maintainers
;; Copyright (C) 1992, 1994, 1997, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index f9b77c58eed..84841aea97b 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -1,7 +1,7 @@
;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands
;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: lisp, languages
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 30505c95223..29c70f8c344 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -1,7 +1,7 @@
;;; lisp.el --- Lisp editing commands for Emacs
;; Copyright (C) 1985, 1986, 1994, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: lisp, languages
diff --git a/lisp/emacs-lisp/lmenu.el b/lisp/emacs-lisp/lmenu.el
index 68d3a3de9a9..aa87b7fed09 100644
--- a/lisp/emacs-lisp/lmenu.el
+++ b/lisp/emacs-lisp/lmenu.el
@@ -1,7 +1,7 @@
;;; lmenu.el --- emulate Lucid's menubar support
;; Copyright (C) 1992, 1993, 1994, 1997, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Keywords: emulations obsolete
diff --git a/lisp/emacs-lisp/lselect.el b/lisp/emacs-lisp/lselect.el
index d0b333edfe4..1d40d2e8368 100644
--- a/lisp/emacs-lisp/lselect.el
+++ b/lisp/emacs-lisp/lselect.el
@@ -1,7 +1,7 @@
;;; lselect.el --- Lucid interface to X Selections
;; Copyright (C) 1990, 1993, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: emulations
diff --git a/lisp/emacs-lisp/lucid.el b/lisp/emacs-lisp/lucid.el
index f3c9519edf0..81bdd13171e 100644
--- a/lisp/emacs-lisp/lucid.el
+++ b/lisp/emacs-lisp/lucid.el
@@ -1,7 +1,7 @@
;;; lucid.el --- emulate some Lucid Emacs functions
;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: emulations
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index 98e4f67f630..97a4d8c52c1 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -1,6 +1,6 @@
;;; macroexp.el --- Additional macro-expansion support
;;
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Miles Bader <miles@gnu.org>
;; Keywords: lisp, compiler, macros
diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index 84c7ae58ced..dc966a75cd6 100644
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -1,7 +1,7 @@
;;; map-ynp.el --- general-purpose boolean question-asker
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 2000, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Roland McGrath <roland@gnu.org>
;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index 1635aa4bfeb..f30b69ddac0 100644
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -1,7 +1,7 @@
;;; pp.el --- pretty printer for Emacs Lisp
;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Randal Schwartz <merlyn@stonehenge.com>
;; Keywords: lisp
diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index 1d1e002cf5f..827578f694c 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -1,7 +1,7 @@
;;; re-builder.el --- building Regexps with visual feedback
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Detlev Zundel <dzu@gnu.org>
;; Keywords: matching, lisp, tools
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index 26a4debd6f3..c2e13be20d8 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -1,7 +1,7 @@
;;; regexp-opt.el --- generate efficient regexps to match strings
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Marshall <simon@gnu.org>
;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/regi.el b/lisp/emacs-lisp/regi.el
index 4326ba37786..06ed2880ee1 100644
--- a/lisp/emacs-lisp/regi.el
+++ b/lisp/emacs-lisp/regi.el
@@ -1,6 +1,7 @@
;;; regi.el --- REGular expression Interpreting engine
-;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: 1993 Barry A. Warsaw, Century Computing, Inc. <bwarsaw@cen.com>
;; Maintainer: bwarsaw@cen.com
diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el
index f04d98f399d..c5391f94b05 100644
--- a/lisp/emacs-lisp/ring.el
+++ b/lisp/emacs-lisp/ring.el
@@ -1,6 +1,7 @@
;;; ring.el --- handle rings of items
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: extensions
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index f526ffae948..763aa97f214 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -1,6 +1,7 @@
;;; rx.el --- sexp notation for regular expressions
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Gerd Moellmann <gerd@gnu.org>
;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el
index 9e68fb08967..5a2521ff7cb 100644
--- a/lisp/emacs-lisp/shadow.el
+++ b/lisp/emacs-lisp/shadow.el
@@ -1,6 +1,7 @@
;;; shadow.el --- locate Emacs Lisp file shadowings
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Terry Jones <terry@santafe.edu>
;; Keywords: lisp
diff --git a/lisp/emacs-lisp/sregex.el b/lisp/emacs-lisp/sregex.el
index 7bfa9402836..23145bccc36 100644
--- a/lisp/emacs-lisp/sregex.el
+++ b/lisp/emacs-lisp/sregex.el
@@ -1,7 +1,7 @@
;;; sregex.el --- symbolic regular expressions
;; Copyright (C) 1997, 1998, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Bob Glickstein <bobg+sregex@zanshin.com>
;; Maintainer: Bob Glickstein <bobg+sregex@zanshin.com>
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index feccf7939c5..1484c38a403 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -1,7 +1,7 @@
;;; syntax.el --- helper functions to find syntactic context
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/emacs-lisp/tcover-ses.el b/lisp/emacs-lisp/tcover-ses.el
index e79c42180f4..340096429d1 100644
--- a/lisp/emacs-lisp/tcover-ses.el
+++ b/lisp/emacs-lisp/tcover-ses.el
@@ -1,6 +1,6 @@
;;;; testcover-ses.el -- Example use of `testcover' to test "SES"
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Jonathan Yavner <jyavner@engineer.com>
;; Maintainer: Jonathan Yavner <jyavner@engineer.com>
diff --git a/lisp/emacs-lisp/tcover-unsafep.el b/lisp/emacs-lisp/tcover-unsafep.el
index 7f7a8fa57de..7390e6a830d 100644
--- a/lisp/emacs-lisp/tcover-unsafep.el
+++ b/lisp/emacs-lisp/tcover-unsafep.el
@@ -1,6 +1,6 @@
;;;; testcover-unsafep.el -- Use testcover to test unsafep's code coverage
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Jonathan Yavner <jyavner@engineer.com>
;; Maintainer: Jonathan Yavner <jyavner@engineer.com>
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index c0afffdf391..4ee83cfdba2 100644
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -1,6 +1,6 @@
;;;; testcover.el -- Visual code-coverage tool
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Jonathan Yavner <jyavner@member.fsf.org>
;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 2aa30220f4f..a98dd60fc21 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -1,6 +1,7 @@
;;; timer.el --- run a function with args at some time in future
-;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/tq.el b/lisp/emacs-lisp/tq.el
index 8b1baad6596..a4a22806d09 100644
--- a/lisp/emacs-lisp/tq.el
+++ b/lisp/emacs-lisp/tq.el
@@ -1,7 +1,7 @@
;;; tq.el --- utility to maintain a transaction queue
;; Copyright (C) 1985, 1986, 1987, 1992, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Scott Draves <spot@cs.cmu.edu>
;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index cda23f39c04..1ebf1186c2d 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -1,7 +1,7 @@
;;; trace.el --- tracing facility for Emacs Lisp functions
;; Copyright (C) 1993, 1998, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/unsafep.el b/lisp/emacs-lisp/unsafep.el
index 27e079b1dcd..41e98694c71 100644
--- a/lisp/emacs-lisp/unsafep.el
+++ b/lisp/emacs-lisp/unsafep.el
@@ -1,6 +1,6 @@
;;;; unsafep.el -- Determine whether a Lisp form is safe to evaluate
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Jonathan Yavner <jyavner@member.fsf.org>
;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index 61f6b98005e..133c4c42f2a 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -1,6 +1,6 @@
;;; warnings.el --- log and display warnings
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index e94be04213c..7a084adcb6b 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -1,7 +1,7 @@
;;; emacs-lock.el --- prevents you from exiting emacs if a buffer is locked
;; Copyright (C) 1994, 1997, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc
+;; 2005, 2006 Free Software Foundation, Inc
;; Author: Tom Wurgler <twurgler@goodyear.com>
;; Created: 12/8/94
diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el
index 66ff29ecab1..361d1b98d3b 100644
--- a/lisp/emulation/crisp.el
+++ b/lisp/emulation/crisp.el
@@ -1,7 +1,7 @@
;;; crisp.el --- CRiSP/Brief Emacs emulator
;; Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Gary D. Foster <Gary.Foster@Corp.Sun.COM>
;; Keywords: emulations brief crisp
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 11ba0ea37ae..cdc0cb7fea3 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1,7 +1,7 @@
;;; cua-base.el --- emulate CUA key bindings
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Kim F. Storm <storm@cua.dk>
;; Keywords: keyboard emulation convenience cua
diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el
index c7c5dd3db6d..c3e6727ab65 100644
--- a/lisp/emulation/cua-gmrk.el
+++ b/lisp/emulation/cua-gmrk.el
@@ -1,7 +1,7 @@
;;; cua-gmrk.el --- CUA unified global mark support
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Kim F. Storm <storm@cua.dk>
;; Keywords: keyboard emulations convenience cua mark
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index aa82e148aff..120866e7925 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -1,7 +1,7 @@
;;; cua-rect.el --- CUA unified rectangle support
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Kim F. Storm <storm@cua.dk>
;; Keywords: keyboard emulations convenience CUA
diff --git a/lisp/emulation/edt-lk201.el b/lisp/emulation/edt-lk201.el
index 4db235c60fa..17308c132e0 100644
--- a/lisp/emulation/edt-lk201.el
+++ b/lisp/emulation/edt-lk201.el
@@ -1,7 +1,7 @@
;;; edt-lk201.el --- enhanced EDT keypad mode emulation for LK-201 keyboards
;; Copyright (C) 1986, 1992, 1993, 1995, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Kevin Gallagher <kevingal@onramp.net>
;; Maintainer: Kevin Gallagher <kevingal@onramp.net>
diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el
index 9334c74392b..14838987d1d 100644
--- a/lisp/emulation/edt-mapper.el
+++ b/lisp/emulation/edt-mapper.el
@@ -1,7 +1,7 @@
;;; edt-mapper.el --- create an EDT LK-201 map file for X-Windows Emacs
;; Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Kevin Gallagher <kevingal@onramp.net>
;; Maintainer: Kevin Gallagher <kevingal@onramp.net>
diff --git a/lisp/emulation/edt-pc.el b/lisp/emulation/edt-pc.el
index 419f6549ba6..6f393197281 100644
--- a/lisp/emulation/edt-pc.el
+++ b/lisp/emulation/edt-pc.el
@@ -1,7 +1,7 @@
;;; edt-pc.el --- enhanced EDT keypad mode emulation for PC 101 keyboards
;; Copyright (C) 1986, 1994, 1995, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Kevin Gallagher <kevingal@onramp.net>
;; Maintainer: Kevin Gallagher <kevingal@onramp.net>
diff --git a/lisp/emulation/edt-vt100.el b/lisp/emulation/edt-vt100.el
index cd9a065acf8..b4599cdb2cd 100644
--- a/lisp/emulation/edt-vt100.el
+++ b/lisp/emulation/edt-vt100.el
@@ -1,7 +1,7 @@
;;; edt-vt100.el --- enhanced EDT keypad mode emulation for VT series terminals
;; Copyright (C) 1986, 1992, 1993, 1995, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Kevin Gallagher <kevingal@onramp.net>
;; Maintainer: Kevin Gallagher <kevingal@onramp.net>
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 8d5071be314..ae131dc50e9 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -1,7 +1,7 @@
;;; edt.el --- enhanced EDT keypad mode emulation for GNU Emacs 19
;; Copyright (C) 1986, 1992, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Kevin Gallagher <kevingal@onramp.net>
;; Maintainer: Kevin Gallagher <kevingal@onramp.net>
diff --git a/lisp/emulation/keypad.el b/lisp/emulation/keypad.el
index 6fc5103c728..fa6310e9017 100644
--- a/lisp/emulation/keypad.el
+++ b/lisp/emulation/keypad.el
@@ -1,6 +1,7 @@
;;; keypad.el --- simplified keypad bindings
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Kim F. Storm <storm@cua.dk>
;; Keywords: keyboard convenience
diff --git a/lisp/emulation/pc-mode.el b/lisp/emulation/pc-mode.el
index 1ec66664b6a..e2b0d36f0f4 100644
--- a/lisp/emulation/pc-mode.el
+++ b/lisp/emulation/pc-mode.el
@@ -1,6 +1,7 @@
;;; pc-mode.el --- emulate certain key bindings used on PCs
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: emulations
diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el
index 9b9f4d51b41..bc048fd46d1 100644
--- a/lisp/emulation/pc-select.el
+++ b/lisp/emulation/pc-select.el
@@ -3,7 +3,7 @@
;;; including key bindings.
;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Staats <michael@thp.Uni-Duisburg.DE>
;; Keywords: convenience emulation
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el
index eca6e5c74ce..878ac56ac8d 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -1,7 +1,7 @@
;;; tpu-edt.el --- Emacs emulating TPU emulating EDT
;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Rob Riepel <riepel@networking.stanford.edu>
;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
diff --git a/lisp/emulation/tpu-extras.el b/lisp/emulation/tpu-extras.el
index c48aa974762..2aed6f464d5 100644
--- a/lisp/emulation/tpu-extras.el
+++ b/lisp/emulation/tpu-extras.el
@@ -1,7 +1,7 @@
;;; tpu-extras.el --- scroll margins and free cursor mode for TPU-edt
;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Rob Riepel <riepel@networking.stanford.edu>
;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
diff --git a/lisp/emulation/tpu-mapper.el b/lisp/emulation/tpu-mapper.el
index e21a85db2af..eb71542e811 100644
--- a/lisp/emulation/tpu-mapper.el
+++ b/lisp/emulation/tpu-mapper.el
@@ -1,7 +1,7 @@
;;; tpu-mapper.el --- create a TPU-edt X-windows keymap file
;; Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Rob Riepel <riepel@networking.stanford.edu>
;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index b07c634d9b4..227fe88b1a1 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -1,7 +1,7 @@
;;; vip.el --- a VI Package for GNU Emacs
;; Copyright (C) 1986, 1987, 1988, 1992, 1993, 1998, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Masahiko Sato <ms@sail.stanford.edu>
;; Keywords: emulations
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 08ebbbcc9d0..db82952a6ef 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -1,7 +1,7 @@
;;; viper-cmd.el --- Vi command support for Viper
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index 5321228fe29..e2824246fad 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -1,7 +1,7 @@
;;; viper-ex.el --- functions implementing the Ex commands for Viper
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 33713e8a869..59a78e46dee 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -1,7 +1,7 @@
;;; viper-init.el --- some common definitions for Viper
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index c8a5d53b504..6f9ade2f9e4 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -1,7 +1,7 @@
;;; viper-keym.el --- Viper keymaps
;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el
index d401c148ad6..1cd1ce1f627 100644
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -1,7 +1,7 @@
;;; viper-macs.el --- functions implementing keyboard macros for Viper
;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el
index 084d70050a2..7670e3226db 100644
--- a/lisp/emulation/viper-mous.el
+++ b/lisp/emulation/viper-mous.el
@@ -1,7 +1,7 @@
;;; viper-mous.el --- mouse support for Viper
;; Copyright (C) 1994, 1995, 1996, 1997, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index def90669885..8f79c0dab4a 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -1,7 +1,7 @@
;;; viper-util.el --- Utilities used by viper.el
;; Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index ad366135ff1..223cff3dd99 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -4,7 +4,7 @@
;; Viper Is also a Package for Emacs Rebels.
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Keywords: emulations
diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el
index e677e5a20ff..0230d6e118a 100644
--- a/lisp/emulation/ws-mode.el
+++ b/lisp/emulation/ws-mode.el
@@ -1,6 +1,7 @@
;;; ws-mode.el --- WordStar emulation mode for GNU Emacs
-;; Copyright (C) 1991, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Juergen Nickelsen <nickel@cs.tu-berlin.de>
;; Version: 0.7
diff --git a/lisp/env.el b/lisp/env.el
index 409765f5ff4..81760ececfc 100644
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -1,7 +1,7 @@
;;; env.el --- functions to manipulate environment variables
;; Copyright (C) 1991, 1994, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: processes, unix
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index c77b091bdb4..50b37eb044f 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,8 +1,72 @@
+2006-02-07 Michael Olson <mwolson@gnu.org>
+
+ * ChangeLog.01, ChangeLog.02, ChangeLog.03, ChangeLog.04,
+ ChangeLog.05: Rename from ChangeLog.NNNN in order to disambiguate
+ the filenames in DOS.
+
+ * erc-goodies.el: Comment fix.
+
+ * erc-hecomplete.el: Rename from erc-complete.el. Update
+ commentary. Use define-erc-module so that it's possible to
+ actually use this.
+ (erc-hecomplete): Rename function from `erc-complete'.
+ (erc-hecomplete): Rename group from `erc-old-complete'. Docfix.
+
+ * erc-join.el: Rename from erc-autojoin.el.
+
+ * erc-networks.el: Rename from erc-nets.el.
+
+ * erc-services.el: Rename from erc-nickserv.el.
+
+ * erc-stamp.el (erc-insert-aligned): Don't take 3rd argument. Use
+ the simpler `indent-to' function when
+ `erc-timestamp-right-align-by-pixel' is nil.
+ (erc-insert-timestamp-right): If the timestamp goes on the
+ following line, don't add timestamp properties to the spaces in
+ front of it.
+
+ * erc.el (erc-migrate-modules): New function that eases migration
+ of module names.
+ (erc-modules): Call erc-migrate-modules in the :get accessor.
+ (erc-modules, erc-update-modules): Update for new modules names.
+ (erc-cmd-SMV): Remove, since this does not give useful output due
+ to the version strings being removed from ERC modules.
+
+2006-02-05 Michael Olson <mwolson@gnu.org>
+
+ * erc-spelling.el (erc-spelling-init): If
+ `erc-spelling-dictionaries' is nil, do not set
+ ispell-local-dictionary. Before, it was being set to nil, which
+ was causing a long delay while the ispell process restarted.
+ (erc-spelling-unhighlight-word): New function that removes
+ flyspell properties from a spell-checked word.
+ (erc-spelling-flyspell-verify): Don't spell-check nicks or words
+ that have '/' before them.
+
+2006-02-04 Michael Olson <mwolson@gnu.org>
+
+ * erc-autojoin.el: Use (eval-when-compile (require 'cl)).
+
+ * erc-complete.el (erc-nick-completion-exclude-myself)
+ (erc-try-complete-nick): Use better function for getting list of
+ channel users.
+
+ * erc-goodies.el: Docfix.
+
+ * erc-stamp.el: Use new arch tagline, since the other one wasn't
+ being treated properly.
+
+ * erc.el (erc-version-string): Release ERC 5.1.1
+
2006-02-03 Zhang Wei <id.brep@gmail.com> (tiny change)
* erc.el (erc-version-string): Don't hard-code Emacs version.
(erc-version): Use emacs-version.
+2006-01-31 Michael Olson <mwolson@gnu.org>
+
+ * erc-stamp.el: Update copyright years.
+
2006-01-30 Simon Josefsson <jas@extundo.com>
* erc.el (erc-open-ssl-stream): Use tls.el.
@@ -363,7 +427,7 @@
where global-mode-string is not a list. Emacs22 permits this.
-See ChangeLog.2005 for earlier changes.
+See ChangeLog.05 for earlier changes.
Copyright (C) 2006 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
diff --git a/lisp/erc/ChangeLog.2001 b/lisp/erc/ChangeLog.01
index 20a03801477..20a03801477 100644
--- a/lisp/erc/ChangeLog.2001
+++ b/lisp/erc/ChangeLog.01
diff --git a/lisp/erc/ChangeLog.2002 b/lisp/erc/ChangeLog.02
index 81b3169e98c..006ac0c1415 100644
--- a/lisp/erc/ChangeLog.2002
+++ b/lisp/erc/ChangeLog.02
@@ -2594,7 +2594,7 @@
Default it is used for URLs, but other things could be added.
see if you can find another use, erc-button-alist
-See ChangeLog.2001 for earlier changes.
+See ChangeLog.01 for earlier changes.
Copyright (C) 2002 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
diff --git a/lisp/erc/ChangeLog.2003 b/lisp/erc/ChangeLog.03
index 6d650c9e150..6f55258c04e 100644
--- a/lisp/erc/ChangeLog.2003
+++ b/lisp/erc/ChangeLog.03
@@ -2138,7 +2138,7 @@
behavior - if you think this was the wrong decision, please correct it and
I'll remember it for next time.
-See ChangeLog.2002 for earlier changes.
+See ChangeLog.02 for earlier changes.
Copyright (C) 2003 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
diff --git a/lisp/erc/ChangeLog.2004 b/lisp/erc/ChangeLog.04
index fd5e0aff795..3ab41db65b4 100644
--- a/lisp/erc/ChangeLog.2004
+++ b/lisp/erc/ChangeLog.04
@@ -2067,7 +2067,7 @@
* erc-list.el: Added variable erc-chanlist-mode-hook.
-See ChangeLog.2003 for earlier changes.
+See ChangeLog.03 for earlier changes.
Copyright (C) 2004 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
diff --git a/lisp/erc/ChangeLog.2005 b/lisp/erc/ChangeLog.05
index 09dc245d13c..8fa725459e2 100644
--- a/lisp/erc/ChangeLog.2005
+++ b/lisp/erc/ChangeLog.05
@@ -1215,7 +1215,7 @@
bug where emacs would get stuck in a loop when \C-g was in a
message and `erc-beep-p' was set to nil (default setting).
-See ChangeLog.2004 for earlier changes.
+See ChangeLog.04 for earlier changes.
Copyright (C) 2005 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index dbbdaacc141..c844af55594 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -110,7 +110,7 @@ Put this function on `erc-insert-post-hook' and/or `erc-send-post-hook'."
(put-text-property (point-min) (point-max) 'front-sticky t)
(put-text-property (point-min) (point-max) 'rear-nonsticky t))
-;; Distingush non-commands
+;; Distinguish non-commands
(defvar erc-noncommands-list '(erc-cmd-ME
erc-cmd-COUNTRY
erc-cmd-SV
diff --git a/lisp/erc/erc-complete.el b/lisp/erc/erc-hecomplete.el
index 3b124f597ce..763d75c8fc7 100644
--- a/lisp/erc/erc-complete.el
+++ b/lisp/erc/erc-hecomplete.el
@@ -1,4 +1,4 @@
-;;; erc-complete.el --- Provides Nick name completion for ERC
+;;; erc-hecomplete.el --- Provides Nick name completion for ERC
;; Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
@@ -24,12 +24,11 @@
;;; Commentary:
-;; This file is obsolete. Use completion from erc-pcomplete instead.
-;; This file is based on hippie-expand, while the new file is based on
-;; pcomplete. There is no autoload cookie in this file. If you want
-;; to use the code in this file, add the following to your ~/.emacs:
+;; This file is considered obsolete. It is recommended to use
+;; completion from erc-pcomplete instead.
-;; (autoload 'erc-complete "erc-complete" "Complete nick at point." t)
+;; This file is based on hippie-expand, while the new file is based on
+;; pcomplete.
;;; Code:
@@ -37,8 +36,13 @@
(require 'erc-match); for erc-pals
(require 'hippie-exp); for the hippie expand stuff
-;;;###autoload
-(defun erc-complete ()
+;;;###autoload (autoload 'erc-hecomplete-mode "erc-hecomplete" nil t)
+(define-erc-module hecomplete nil
+ "Complete nick at point."
+ ((add-hook 'erc-complete-functions 'erc-hecomplete))
+ ((remove-hook 'erc-complete-functions 'erc-hecomplete)))
+
+(defun erc-hecomplete ()
"Complete nick at point.
See `erc-try-complete-nick' for more technical info.
This function is obsolete, use `erc-pcomplete' instead."
@@ -46,8 +50,8 @@ This function is obsolete, use `erc-pcomplete' instead."
(let ((hippie-expand-try-functions-list '(erc-try-complete-nick)))
(hippie-expand nil)))
-(defgroup erc-old-complete nil
- "Nick completion. Obsolete, use erc-pcomplete instead."
+(defgroup erc-hecomplete nil
+ "Nick completion. It is recommended to use erc-pcomplete instead."
:group 'erc)
(defcustom erc-nick-completion 'all
@@ -67,14 +71,14 @@ or you may use an arbitrary lisp expression."
(repeat :tag "List" (string :tag "Nick"))
function
sexp)
- :group 'erc-old-complete)
+ :group 'erc-hecomplete)
(defcustom erc-nick-completion-ignore-case t
"*Non-nil means don't consider case significant in nick completion.
Case will be automatically corrected when non-nil.
For instance if you type \"dely TAB\" the word completes and changes to
\"delYsid\"."
- :group 'erc-old-complete
+ :group 'erc-hecomplete
:type 'boolean)
(defun erc-nick-completion-exclude-myself ()
@@ -84,14 +88,14 @@ This function returns a list of all the members in the channel, except
your own nick. This way if you're named foo and someone is called foobar,
typing \"f o TAB\" will directly give you foobar. Use this with
`erc-nick-completion'."
- (delete
+ (remove
(erc-current-nick)
- (mapcar (function car) (erc-get-channel-user-list))))
+ (erc-get-channel-nickname-list)))
(defcustom erc-nick-completion-postfix ": "
"*When `erc-complete' is used in the first word after the prompt,
add this string when a unique expansion was found."
- :group 'erc-old-complete
+ :group 'erc-hecomplete
:type 'string)
(defun erc-command-list ()
@@ -110,8 +114,7 @@ The type of completion depends on `erc-nick-completion'."
(try-complete-erc-nick old erc-pals))
((eq erc-nick-completion 'all)
(try-complete-erc-nick old (append
- (mapcar (function car)
- (erc-get-channel-user-list))
+ (erc-get-channel-nickname-list)
(erc-command-list))))
((functionp erc-nick-completion)
(try-complete-erc-nick old (funcall erc-nick-completion)))
@@ -210,9 +213,9 @@ Window configurations are stored in
"Returns t if point is directly after `erc-prompt' when doing completion."
(erc-at-beginning-of-line-p (he-dabbrev-beg)))
-(provide 'erc-complete)
+(provide 'erc-hecomplete)
-;;; erc-complete.el ends here
+;;; erc-hecomplete.el ends here
;;
;; Local Variables:
;; indent-tabs-mode: t
diff --git a/lisp/erc/erc-autojoin.el b/lisp/erc/erc-join.el
index 38a149d8921..da41ea77374 100644
--- a/lisp/erc/erc-autojoin.el
+++ b/lisp/erc/erc-join.el
@@ -1,4 +1,4 @@
-;;; erc-autojoin.el --- autojoin channels on connect and reconnects
+;;; erc-join.el --- autojoin channels on connect and reconnects
;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
@@ -34,13 +34,13 @@
;;; Code:
(require 'erc)
-;;; Minor Mode
+(eval-when-compile (require 'cl))
(defgroup erc-autojoin nil
"Enable autojoining."
:group 'erc)
-;;;###autoload (autoload 'erc-autojoin-mode "erc-autojoin" nil t)
+;;;###autoload (autoload 'erc-autojoin-mode "erc-join" nil t)
(define-erc-module autojoin nil
"Makes ERC autojoin on connects and reconnects."
((add-hook 'erc-after-connect 'erc-autojoin-channels)
@@ -127,9 +127,9 @@ servers, presumably in the same domain."
;; functions.
nil)
-(provide 'erc-autojoin)
+(provide 'erc-join)
-;;; erc-autojoin.el ends here
+;;; erc-join.el ends here
;;
;; Local Variables:
;; indent-tabs-mode: t
diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el
index 785e4d19750..9bc561523d9 100644
--- a/lisp/erc/erc-list.el
+++ b/lisp/erc/erc-list.el
@@ -32,7 +32,7 @@
;;; Code:
(require 'erc)
-(require 'erc-nets)
+(require 'erc-networks)
(require 'sort)
(unless (fboundp 'make-overlay)
(require 'overlay))
diff --git a/lisp/erc/erc-nets.el b/lisp/erc/erc-networks.el
index 716a42996d5..b79a56a359c 100644
--- a/lisp/erc/erc-nets.el
+++ b/lisp/erc/erc-networks.el
@@ -1,4 +1,4 @@
-;;; erc-nets.el --- IRC networks
+;;; erc-networks.el --- IRC networks
;; Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
@@ -30,7 +30,7 @@
;;
;; Put into your .emacs:
;;
-;; (require 'erc-nets)
+;; (require 'erc-networks)
;;
;; M-x erc-server-select provides an alternative way to connect to servers by
;; choosing networks.
@@ -742,7 +742,7 @@ network as a symbol."
(intern (downcase (symbol-name erc-network)))))
(erc-make-obsolete 'erc-current-network 'erc-network
- "Obsolete since erc-nets 1.5")
+ "Obsolete since erc-networks 1.5")
(defun erc-network-name ()
"Returns the name of the current network as a string."
@@ -848,10 +848,9 @@ VALUE is the options value.")
(erc-get 'pals 'freenode)
+(provide 'erc-networks)
-(provide 'erc-nets)
-
-;;; erc-nets.el ends here
+;;; erc-networks.el ends here
;;
;; Local Variables:
;; indent-tabs-mode: t
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
index 9fc7f572977..1d2bdbd5f45 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -30,7 +30,7 @@
;;; Code:
(require 'erc)
-(require 'erc-nets)
+(require 'erc-networks)
(eval-when-compile
(require 'cl)
(require 'pcomplete))
diff --git a/lisp/erc/erc-nickserv.el b/lisp/erc/erc-services.el
index be5541d3b5c..676948752fd 100644
--- a/lisp/erc/erc-nickserv.el
+++ b/lisp/erc/erc-services.el
@@ -1,4 +1,4 @@
-;;; erc-nickserv.el --- Identify to NickServ
+;;; erc-services.el --- Identify to NickServ
;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
@@ -37,7 +37,7 @@
;;
;; Put into your .emacs:
;;
-;; (require 'erc-nickserv)
+;; (require 'erc-services)
;; (erc-services-mode 1)
;;
;; Add your nickname and NickServ password to `erc-nickserv-passwords'.
@@ -60,7 +60,7 @@
;;; Code:
(require 'erc)
-(require 'erc-nets)
+(require 'erc-networks)
(eval-when-compile (require 'cl))
;; Customization:
@@ -77,7 +77,7 @@ This group allows you to set variables to somewhat automate
communication with those Services."
:group 'erc)
-;;;###autoload (autoload 'erc-services-mode "erc-nickserv" nil t)
+;;;###autoload (autoload 'erc-services-mode "erc-services" nil t)
(define-erc-module services nickserv
"This mode automates communication with services."
((erc-nickserv-identify-mode erc-nickserv-identify-mode))
@@ -325,9 +325,9 @@ When called interactively, read the password using `read-passwd'."
(erc-message msgtype
(concat nickserv " " identify-word " " nick password)))))
-(provide 'erc-nickserv)
+(provide 'erc-services)
-;;; erc-nickserv.el ends here
+;;; erc-services.el ends here
;;
;; Local Variables:
;; indent-tabs-mode: t
diff --git a/lisp/erc/erc-spelling.el b/lisp/erc/erc-spelling.el
index dd9aad68f22..41e342c0e50 100644
--- a/lisp/erc/erc-spelling.el
+++ b/lisp/erc/erc-spelling.el
@@ -64,28 +64,51 @@ name here."
"Enable flyspell mode in an ERC buffer."
(let ((name (downcase (buffer-name)))
(dicts erc-spelling-dictionaries))
- (while (and dicts
- (not (string= name (downcase (caar dicts)))))
- (setq dicts (cdr dicts)))
- (setq ispell-local-dictionary
- (if dicts
- (cadr (car dicts))
- (let ((server (erc-server-buffer)))
- (if server
- (with-current-buffer server
- ispell-local-dictionary)
- nil)))))
+ (when dicts
+ (while (and dicts
+ (not (string= name (downcase (caar dicts)))))
+ (setq dicts (cdr dicts)))
+ (setq ispell-local-dictionary
+ (if dicts
+ (cadr (car dicts))
+ (let ((server (erc-server-buffer)))
+ (if server
+ (with-current-buffer server
+ ispell-local-dictionary)
+ nil))))))
(setq flyspell-generic-check-word-p 'erc-spelling-flyspell-verify)
(flyspell-mode 1))
-(put 'erc-mode
- 'flyspell-mode-predicate
- 'erc-spelling-flyspell-verify)
+(defun erc-spelling-unhighlight-word (word)
+ "Unhighlight the given WORD.
+The cadr is the beginning and the caddr is the end."
+ (let ((beg (nth 1 word))
+ (end (nth 2 word)))
+ (flyspell-unhighlight-at beg)
+ (when (> end beg)
+ (flyspell-unhighlight-at (1- end)))))
(defun erc-spelling-flyspell-verify ()
"Flyspell only the input line, nothing else."
- (> (point)
- erc-input-marker))
+ (let ((word-data (and (boundp 'flyspell-word)
+ flyspell-word)))
+ (when word-data
+ (cond ((< (point) erc-input-marker)
+ nil)
+ ;; don't spell-check names of users
+ ((and erc-channel-users
+ (erc-get-channel-user (car word-data)))
+ (erc-spelling-unhighlight-word word-data)
+ nil)
+ ;; if '/' occurs before the word, don't spell-check it
+ ((eq (char-before (nth 1 word-data)) ?/)
+ (erc-spelling-unhighlight-word word-data)
+ nil)
+ (t t)))))
+
+(put 'erc-mode
+ 'flyspell-mode-predicate
+ 'erc-spelling-flyspell-verify)
(provide 'erc-spelling)
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index afd070e4e06..ead847ff73f 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -1,6 +1,6 @@
;;; erc-stamp.el --- Timestamping for Emacs IRC CLient
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
;; Author: Mario Lang <mlang@delysid.org>
;; Keywords: comm, processes, timestamp
@@ -199,20 +199,20 @@ Window System."
(erc-put-text-property 0 len 'field 'erc-timestamp s)
(insert s)))
-(defun erc-insert-aligned (string pos &optional fallback)
+(defun erc-insert-aligned (string pos)
"Insert STRING based on a fraction of the width of the buffer.
Fraction is roughly (/ POS (window-width)).
-If `erc-timestamp-right-align-by-pixel' is nil, use
-\(- POS FALLBACK) to determine how many spaces to insert."
+If `erc-timestamp-right-align-by-pixel' is nil, insert STRING at the
+POSth column, without using pixel coordinates."
(if (not erc-timestamp-right-align-by-pixel)
- (insert (make-string (- pos fallback) ? ) string)
+ (indent-to pos)
(insert " ")
(let ((offset (floor (* (/ (1- pos) (window-width) 1.0)
(nth 2 (window-inside-pixel-edges))))))
(put-text-property (1- (point)) (point) 'display
- `(space :align-to (,offset))))
- (insert string)))
+ `(space :align-to (,offset)))))
+ (insert string))
(defun erc-insert-timestamp-right (string)
"Insert timestamp on the right side of the screen.
@@ -257,14 +257,16 @@ be printed just before the window-width."
indent)
;; deal with variable-width characters
(setq pos (- pos (string-width string))
- ;; the following is a kludge that works with most
- ;; international input
+ ;; The following is a kludge that works with most
+ ;; international input. It is now only used to calculate
+ ;; whether to move to the next line before inserting a
+ ;; stamp.
col (+ col (ceiling (/ (- col (- (point) (point-at-bol))) 1.6))))
(if (< col pos)
- (erc-insert-aligned string pos col)
+ (erc-insert-aligned string pos)
(newline)
- (setq from (point))
(indent-to pos)
+ (setq from (point))
(insert string))
(erc-put-text-property from (1+ (point)) 'field 'erc-timestamp)
(erc-put-text-property from (1+ (point)) 'rear-nonsticky t)
@@ -338,4 +340,4 @@ NOW is position of point currently."
;; tab-width: 8
;; End:
-;; arch-tag: 9f6d31bf-61ba-45c5-bdbf-56331486ea27
+;; arch-tag: 57aefab4-63e0-4c48-91d5-6efa145487e0
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index cc9dc8bf1b9..936fffa252f 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -66,7 +66,7 @@
;;; Code:
-(defconst erc-version-string "Version 5.1"
+(defconst erc-version-string "Version 5.1.1"
"ERC version. This is used by function `erc-version'.")
(eval-when-compile (require 'cl))
@@ -1716,6 +1716,22 @@ all channel buffers on all servers."
"Used to keep track of how many times an attempt at changing nick is made.")
(make-variable-buffer-local 'erc-nick-change-attempt-count)
+(defun erc-migrate-modules (mods)
+ "Migrate old names of ERC modules to new ones."
+ ;; modify `transforms' to specify what needs to be changed
+ ;; each item is in the format '(new .old)
+ (let ((transforms '((pcomplete . completion)))
+ (modules (copy-alist mods)))
+ (dolist (transform transforms)
+ (let ((addp nil))
+ (setq modules (erc-delete-if `(lambda (val)
+ (and (eq val ',(car transform))
+ (setq addition t)))
+ modules))
+ (when addp
+ (add-to-list 'modules (cdr transform)))))
+ (erc-delete-dups modules)))
+
(defcustom erc-modules '(netsplit fill button match track pcomplete readonly
ring autojoin noncommands irccontrols
stamp)
@@ -1723,6 +1739,9 @@ all channel buffers on all servers."
If you set the value of this without using `customize' remember to call
\(erc-update-modules) after you change it. When using `customize', modules
removed from the list will be disabled."
+ :get (lambda (sym)
+ ;; replace outdated names with their newer equivalents
+ (erc-migrate-modules (symbol-value sym)))
:set (lambda (sym val)
;; disable modules which have just been removed
(when (and (boundp 'erc-modules) erc-modules val)
@@ -1732,7 +1751,7 @@ removed from the list will be disabled."
(when (and (fboundp f) (boundp f) (symbol-value f))
(message "Disabling `erc-%s'" module)
(funcall f 0))))))
- (set-default sym val)
+ (set sym val)
;; this test is for the case where erc hasn't been loaded yet
(when (fboundp 'erc-update-modules)
(erc-update-modules)))
@@ -1753,8 +1772,8 @@ removed from the list will be disabled."
"Notify when the online status of certain users changes"
notify)
(const :tag "Complete nicknames and commands (programmable)"
- pcomplete)
- (const :tag "Complete nicknames and commands (old)" completion)
+ completion)
+ (const :tag "Complete nicknames and commands (old)" hecomplete)
(const :tag "Make displayed lines read-only" readonly)
(const :tag "Replace text in messages" replace)
(const :tag "Enable an input history" ring)
@@ -1781,10 +1800,13 @@ removed from the list will be disabled."
;; yuck. perhaps we should bring the filenames into sync?
((string= req "erc-completion")
(setq req "erc-pcomplete")
- (setq mod 'pcomplete))
- ((string= req "erc-services")
- (setq req "erc-nickserv")
- (setq mod 'services)))
+ (setq mod 'completion))
+ ((string= req "erc-pcomplete")
+ (setq req "erc-pcomplete")
+ (setq mod 'completion))
+ ((string= req "erc-autojoin")
+ (setq req "erc-join")
+ (setq mod 'autojoin)))
(condition-case nil
(require (intern req))
(error nil))
@@ -3142,12 +3164,6 @@ the message given by REASON."
(erc-modes)))
t)
-(defun erc-cmd-SMV ()
- "Say the current ERC module versions into channel."
- (erc-send-message (format "I'm using the following module revisions: %s!"
- (erc-version-modules)))
- t)
-
(defun erc-cmd-DEOP (&rest people)
"Remove the operator setting from user(s) given in PEOPLE."
(when (> (length people) 0)
diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el
index 67e007a7f00..30b7f69cc38 100644
--- a/lisp/eshell/em-alias.el
+++ b/lisp/eshell/em-alias.el
@@ -1,7 +1,7 @@
;;; em-alias.el --- creation and management of command aliases
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el
index 017474ca6f1..18f7cd84c04 100644
--- a/lisp/eshell/em-banner.el
+++ b/lisp/eshell/em-banner.el
@@ -1,7 +1,7 @@
;;; em-banner.el --- sample module that displays a login banner
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el
index c42b843add4..c942b3c6913 100644
--- a/lisp/eshell/em-basic.el
+++ b/lisp/eshell/em-basic.el
@@ -1,7 +1,7 @@
;;; em-basic.el --- basic shell builtin commands
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index 423a93d46e2..19b1ad34569 100644
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -1,7 +1,7 @@
;;; em-cmpl.el --- completion using the TAB key
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index 3a18b1e042a..12e84b5403f 100644
--- a/lisp/eshell/em-dirs.el
+++ b/lisp/eshell/em-dirs.el
@@ -1,7 +1,7 @@
;;; em-dirs.el --- directory navigation commands
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index 869144dad74..76bde7784dc 100644
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -1,7 +1,7 @@
;;; em-glob.el --- extended file name globbing
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index e7844028542..66356c11925 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -1,7 +1,7 @@
;;; em-hist.el --- history list management
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index 24b61aa492f..f705ca0e375 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -1,7 +1,7 @@
;;; em-ls.el --- implementation of ls in Lisp
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el
index 9e2e8a32af2..a506bc03b2a 100644
--- a/lisp/eshell/em-pred.el
+++ b/lisp/eshell/em-pred.el
@@ -1,7 +1,7 @@
;;; em-pred.el --- argument predicates and modifiers (ala zsh)
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index a4ba51609b5..e55008fe2e8 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -1,7 +1,7 @@
;;; em-prompt.el --- command prompts
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el
index da36551a4dc..98627be2363 100644
--- a/lisp/eshell/em-rebind.el
+++ b/lisp/eshell/em-rebind.el
@@ -1,7 +1,7 @@
;;; em-rebind.el --- rebind keys when point is at current input
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el
index d67c5e063c9..782d70bb864 100644
--- a/lisp/eshell/em-script.el
+++ b/lisp/eshell/em-script.el
@@ -1,7 +1,7 @@
;;; em-script.el --- Eshell script files
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index 1d8133effef..65a3280d34e 100644
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -1,7 +1,7 @@
;;; em-smart.el --- smart display of output
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index 8e0786349a6..a91eb044987 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -1,7 +1,7 @@
;;; em-term.el --- running visual commands
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 340b95f4d53..ead8e6e48a6 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -1,7 +1,7 @@
;;; em-unix.el --- UNIX command aliases
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el
index 3db159ad84e..d53d67314a0 100644
--- a/lisp/eshell/em-xtra.el
+++ b/lisp/eshell/em-xtra.el
@@ -1,7 +1,7 @@
;;; em-xtra.el --- extra alias functions
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index 322a0173b27..5f636c66611 100644
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -1,7 +1,7 @@
;;; esh-arg.el --- argument processing
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index e655a87f898..aad62bfc7dc 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -1,7 +1,7 @@
;;; esh-cmd.el --- command invocation
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index 0aa3f4486ad..9f77f1e2868 100644
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -1,7 +1,7 @@
;;; esh-ext.el --- commands external to Eshell
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index 1c3fd219455..19f90e67f92 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -1,7 +1,7 @@
;;; esh-io.el --- I/O management
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/esh-maint.el b/lisp/eshell/esh-maint.el
index 56d92b0c6a3..d0d9f85ece7 100644
--- a/lisp/eshell/esh-maint.el
+++ b/lisp/eshell/esh-maint.el
@@ -1,7 +1,7 @@
;;; esh-maint.el --- init code for building eshell -*- no-byte-compile: t -*-
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index df5d7732ef2..35c3fb36850 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -1,7 +1,7 @@
;;; esh-mode.el --- user interface
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el
index ea87c662c1d..412ee68d4a2 100644
--- a/lisp/eshell/esh-module.el
+++ b/lisp/eshell/esh-module.el
@@ -1,7 +1,7 @@
;;; esh-module.el --- Eshell modules
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
;; Keywords: processes
diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el
index a3adac8db0c..5d6e5821029 100644
--- a/lisp/eshell/esh-opt.el
+++ b/lisp/eshell/esh-opt.el
@@ -1,7 +1,7 @@
;;; esh-opt.el --- command options processing
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index 530eb9c900a..379ac972206 100644
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -1,7 +1,7 @@
;;; esh-proc.el --- process management
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/esh-test.el b/lisp/eshell/esh-test.el
index b7dcfab0274..5aad4126f91 100644
--- a/lisp/eshell/esh-test.el
+++ b/lisp/eshell/esh-test.el
@@ -1,7 +1,7 @@
;;; esh-test.el --- Eshell test suite
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index c05f6abb23b..50ff77c7725 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -1,7 +1,7 @@
;;; esh-util.el --- general utilities
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el
index 10cc7c703d5..2bebb6a79cc 100644
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -1,7 +1,7 @@
;;; esh-var.el --- handling of variables
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index ce9641026c7..ed9e3e56c9e 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -1,7 +1,7 @@
;;; eshell.el --- the Emacs command shell
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
;; Version: 2.4.2
diff --git a/lisp/expand.el b/lisp/expand.el
index aeb9ec83b14..5d213128ad4 100644
--- a/lisp/expand.el
+++ b/lisp/expand.el
@@ -1,7 +1,7 @@
;;; expand.el --- make abbreviations more usable
;; Copyright (C) 1995, 1996, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Frederic Lepied <Frederic.Lepied@sugix.frmug.org>
;; Maintainer: Frederic Lepied <Frederic.Lepied@sugix.frmug.org>
diff --git a/lisp/ezimage.el b/lisp/ezimage.el
index a689adc25cd..84ad10ad599 100644
--- a/lisp/ezimage.el
+++ b/lisp/ezimage.el
@@ -1,7 +1,7 @@
;;; ezimage --- Generalized Image management
-;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;; 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Keywords: file, tags, tools
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 00fb13fe8f9..04f70708359 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -1,7 +1,7 @@
;;; facemenu.el --- create a face menu for interactively adding fonts to text
;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Boris Goldowsky <boris@gnu.org>
;; Keywords: faces
diff --git a/lisp/faces.el b/lisp/faces.el
index 14613bec679..67f8a2af07a 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1,7 +1,7 @@
;;; faces.el --- Lisp faces
;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/ffap.el b/lisp/ffap.el
index ff35ae0deac..d487c4f67a0 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1,7 +1,7 @@
;;; ffap.el --- find file (or url) at point
;; Copyright (C) 1995, 1996, 1997, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Michelangelo Grigni <mic@mathcs.emory.edu>
;; Maintainer: Rajesh Vaidheeswarran <rv@gnu.org>
diff --git a/lisp/filecache.el b/lisp/filecache.el
index 442f729dd15..c0e9e9e5f5d 100644
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -5,7 +5,7 @@
;; Keywords: convenience
;;
;; Copyright (C) 1996, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
diff --git a/lisp/files.el b/lisp/files.el
index 112056e4f9e..fee3a5ea65f 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1,7 +1,8 @@
;;; files.el --- file input and output commands for Emacs
-;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-;; 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996,
+;; 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
@@ -2047,6 +2048,9 @@ to decide the buffer's major mode.
If FUNCTION is nil, then it is not called. (That is a way of saying
\"allow `auto-mode-alist' to decide for these files.\")")
+(defvar magic-mode-regexp-match-limit 4000
+ "Upper limit on `magic-mode-alist' regexp matches.")
+
(defun set-auto-mode (&optional keep-mode-if-same)
"Select major mode appropriate for current buffer.
@@ -2120,9 +2124,13 @@ only set the major mode, if that would change it."
(unless done
(if (setq done (save-excursion
(goto-char (point-min))
- (assoc-default nil magic-mode-alist
- (lambda (re dummy)
- (looking-at re)))))
+ (save-restriction
+ (narrow-to-region (point-min)
+ (min (point-max)
+ (+ (point-min) magic-mode-regexp-match-limit)))
+ (assoc-default nil magic-mode-alist
+ (lambda (re dummy)
+ (looking-at re))))))
(set-auto-mode-0 done keep-mode-if-same)
;; Compare the filename against the entries in auto-mode-alist.
(if buffer-file-name
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 1ee126465a5..4ca5a9d1420 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -1,6 +1,6 @@
;;; filesets.el --- handle group of files
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Thomas Link <t.link@gmx.at>
;; Maintainer: FSF
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 8347e68c58e..88e5414d525 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -1,7 +1,7 @@
;;; find-dired.el --- run a `find' command and dired the output
;; Copyright (C) 1992, 1994, 1995, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Roland McGrath <roland@gnu.org>,
;; Sebastian Kremer <sk@thp.uni-koeln.de>
diff --git a/lisp/find-file.el b/lisp/find-file.el
index db03adce29f..e15d6e62b0b 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -5,7 +5,7 @@
;; Keywords: c, matching, tools
;; Copyright (C) 1994, 1995, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
diff --git a/lisp/find-lisp.el b/lisp/find-lisp.el
index 19ebe3fae6f..c7527fe21f5 100644
--- a/lisp/find-lisp.el
+++ b/lisp/find-lisp.el
@@ -3,10 +3,10 @@
;; Author: Peter Breton
;; Created: Fri Mar 26 1999
;; Keywords: unix
-;; Time-stamp: <2005-11-11 20:37:50 teirllm>
+;; Time-stamp: <2006-02-06 13:40:10 ttn>
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
diff --git a/lisp/finder.el b/lisp/finder.el
index dfbd6851129..fc96381e8f7 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -1,7 +1,7 @@
;;; finder.el --- topic & keyword-based code finder
;; Copyright (C) 1992, 1997, 1998, 1999, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Created: 16 Jun 1992
diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el
index 0acbe41c6ed..bfa86317809 100644
--- a/lisp/flow-ctrl.el
+++ b/lisp/flow-ctrl.el
@@ -1,7 +1,7 @@
;;; flow-ctrl.el --- help for lusers on cu(1) or ttys with wired-in ^S/^Q flow control
;; Copyright (C) 1990, 1991, 1994, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author Kevin Gallagher
;; Maintainer: FSF
diff --git a/lisp/foldout.el b/lisp/foldout.el
index 42f889fb96e..7666ee48bc7 100644
--- a/lisp/foldout.el
+++ b/lisp/foldout.el
@@ -1,6 +1,7 @@
;;; foldout.el --- folding extensions for outline-mode and outline-minor-mode
-;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Kevin Broadey <KevinB@bartley.demon.co.uk>
;; Maintainer: FSF
diff --git a/lisp/follow.el b/lisp/follow.el
index ef1b2231950..1958c407664 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -1,7 +1,7 @@
;;; follow.el --- synchronize windows showing the same buffer
;; Copyright (C) 1995, 1996, 1997, 1999, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Anders Lindgren <andersl@andersl.com>
;; Maintainer: FSF (Anders' email bounces, Sep 2005)
diff --git a/lisp/font-core.el b/lisp/font-core.el
index cfddbca5f5c..85bbf60f0d9 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -1,7 +1,7 @@
;;; font-core.el --- Core interface to font-lock
;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: languages, faces
diff --git a/lisp/format.el b/lisp/format.el
index fb242b9a143..fa1c9ff3362 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -1,7 +1,7 @@
;;; format.el --- read and save files in multiple formats
;; Copyright (C) 1994, 1995, 1997, 1999, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Boris Goldowsky <boris@gnu.org>
diff --git a/lisp/forms.el b/lisp/forms.el
index e7282ee0ea5..ab5e591938c 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -1,7 +1,7 @@
;;; forms.el --- Forms mode: edit a file as a form to fill in
;; Copyright (C) 1991, 1994, 1995, 1996, 1997, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Johan Vromans <jvromans@squirrel.nl>
diff --git a/lisp/frame.el b/lisp/frame.el
index 34f96a309a2..5e6451dccac 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1,7 +1,7 @@
;;; frame.el --- multi-frame management independent of window systems
;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/fringe.el b/lisp/fringe.el
index a32d6b5902c..fd9e70b5846 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -1,6 +1,6 @@
;;; fringe.el --- change fringes appearance in various ways
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
;; Maintainer: FSF
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index d6f56cfc76c..5b1d0bfb93d 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1,7 +1,7 @@
;;; generic-x.el --- A collection of generic modes
;; Copyright (C) 1997, 1998, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Peter Breton <pbreton@cs.umb.edu>
;; Created: Tue Oct 08 1996
@@ -1706,6 +1706,8 @@ like an INI file. You can add this hook to `find-file-hook'."
"reiserfs"
"romfs"
"smbfs"
+ "cifs"
+ "usbdevfs"
"sysv"
"tmpfs"
"udf"
@@ -1717,7 +1719,7 @@ like an INI file. You can add this hook to `find-file-hook'."
"swap"
"auto"
"ignore")
- '(("^\\([/-A-Za-z0-9_]+\\)\\s-+\\([/-A-Za-z0-9_]+\\)"
+ '(("^\\([^# \t]+\\)\\s-+\\([^# \t]+\\)"
(1 font-lock-type-face t)
(2 font-lock-variable-name-face t)))
'("/etc/[v]*fstab\\'")
@@ -1725,7 +1727,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(function
(lambda ()
(setq imenu-generic-expression
- '((nil "^\\([/-A-Za-z0-9_]+\\)\\s-+" 1))))))))
+ '((nil "^\\([^# \t]+\\)\\s-+" 1))))))))
;; From Jacques Duthen <jacques.duthen@sncf.fr>
(when (memq 'show-tabs-generic-mode generic-extras-enable-list)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1edd84bea48..168280e8e24 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,51 @@
+2006-02-07 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * gnus-art.el (article-decode-charset): Don't use ignore-errors
+ when calling mail-header-parse-content-type.
+ (article-de-quoted-unreadable): Ditto.
+ (article-de-base64-unreadable): Ditto.
+ (article-wash-html): Ditto.
+
+ * mm-decode.el (mm-dissect-buffer): Don't use ignore-errors when
+ calling mail-header-parse-content-type and
+ mail-header-parse-content-disposition.
+ (mm-find-raw-part-by-type): Don't use ignore-errors when calling
+ mail-header-parse-content-type.
+
+ * mml.el (mml-insert-mime-headers): Use mml-insert-parameter to
+ insert charset and format parameters; encode description after
+ inserting it to buffer.
+ (mml-insert-parameter): Fold lines properly even if a parameter is
+ segmented into two or more lines; change the max column to 76.
+
+ * rfc1843.el (rfc1843-decode-article-body): Don't use
+ ignore-errors when calling mail-header-parse-content-type.
+
+ * rfc2231.el (rfc2231-parse-string): Return at least type if
+ possible; don't cause an error even if it fails in parsing of
+ parameters. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
+ (rfc2231-encode-string): Don't break lines at the beginning, leave
+ it to mml-insert-parameter.
+
+ * webmail.el (webmail-yahoo-article): Don't use ignore-errors when
+ calling mail-header-parse-content-type.
+
+2006-02-06 Reiner Steib <Reiner.Steib@gmx.de>
+
+ * spam-report.el (spam-report-gmane-use-article-number): Improve
+ doc string.
+ (spam-report-gmane-internal): Check if a suitable header was found
+ in the article.
+
+2006-02-04 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * rfc2231.el (rfc2231-parse-string): Revert 2006-02-03 change.
+ (rfc2231-encode-string): Make param*=value always begin with LWSP.
+
+2006-02-05 Romain Francoise <romain@orebokech.com>
+
+ Update copyright notices of all files in the gnus directory.
+
2006-02-03 Reiner Steib <Reiner.Steib@gmx.de>
* gnus-util.el (gnus-error): Describe `args'.
diff --git a/lisp/gnus/binhex.el b/lisp/gnus/binhex.el
index af0669f62aa..f01b2ff8b51 100644
--- a/lisp/gnus/binhex.el
+++ b/lisp/gnus/binhex.el
@@ -1,7 +1,7 @@
;;; binhex.el --- elisp native binhex decode
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: binhex news
diff --git a/lisp/gnus/canlock.el b/lisp/gnus/canlock.el
index bad7ea0409e..9f063bb3644 100644
--- a/lisp/gnus/canlock.el
+++ b/lisp/gnus/canlock.el
@@ -1,7 +1,7 @@
;;; canlock.el --- functions for Cancel-Lock feature
;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
;; Keywords: news, cancel-lock, hmac, sha1, rfc2104
diff --git a/lisp/gnus/compface.el b/lisp/gnus/compface.el
index 874c8bd6222..f6bd9bfd720 100644
--- a/lisp/gnus/compface.el
+++ b/lisp/gnus/compface.el
@@ -1,6 +1,6 @@
;;; compface.el --- functions for converting X-Face headers
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/deuglify.el b/lisp/gnus/deuglify.el
index 98e22e04eaa..4096324fdaa 100644
--- a/lisp/gnus/deuglify.el
+++ b/lisp/gnus/deuglify.el
@@ -1,6 +1,6 @@
;;; deuglify.el --- deuglify broken Outlook (Express) articles
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Copyright (C) 2001, 2002 Raymond Scholz
;; Author: Raymond Scholz <rscholz@zonix.de>
diff --git a/lisp/gnus/dig.el b/lisp/gnus/dig.el
index ed752e56520..e180cdad364 100644
--- a/lisp/gnus/dig.el
+++ b/lisp/gnus/dig.el
@@ -1,7 +1,7 @@
;;; dig.el --- Domain Name System dig interface
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: DNS BIND dig
diff --git a/lisp/gnus/dns.el b/lisp/gnus/dns.el
index d73848ca6e5..d6c41ea823e 100644
--- a/lisp/gnus/dns.el
+++ b/lisp/gnus/dns.el
@@ -1,6 +1,6 @@
;;; dns.el --- Domain Name Service lookups
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: network
diff --git a/lisp/gnus/earcon.el b/lisp/gnus/earcon.el
index 37ccb3baba1..a70e68d9a62 100644
--- a/lisp/gnus/earcon.el
+++ b/lisp/gnus/earcon.el
@@ -1,7 +1,7 @@
;;; earcon.el --- Sound effects for messages
;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Steven L. Baur <steve@miranova.com>
diff --git a/lisp/gnus/flow-fill.el b/lisp/gnus/flow-fill.el
index b69bb20e31f..c3f7f7bb20e 100644
--- a/lisp/gnus/flow-fill.el
+++ b/lisp/gnus/flow-fill.el
@@ -1,7 +1,7 @@
;;; flow-fill.el --- interpret RFC2646 "flowed" text
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <jas@pdc.kth.se>
;; Keywords: mail
diff --git a/lisp/gnus/format-spec.el b/lisp/gnus/format-spec.el
index b2fde53b3f1..d287cd4081f 100644
--- a/lisp/gnus/format-spec.el
+++ b/lisp/gnus/format-spec.el
@@ -1,7 +1,7 @@
;;; format-spec.el --- functions for formatting arbitrary formatting strings
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: tools
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 400dbe7c29f..c467c296fa0 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -1,7 +1,7 @@
;;; gnus-agent.el --- unplugged support for Gnus
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index b51ceff29a9..c15151729a0 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2267,38 +2267,37 @@ If PROMPT (the prefix), prompt for a coding system to use."
(error))
gnus-newsgroup-ignored-charsets))
ct cte ctl charset format)
- (save-excursion
- (save-restriction
- (article-narrow-to-head)
- (setq ct (message-fetch-field "Content-Type" t)
- cte (message-fetch-field "Content-Transfer-Encoding" t)
- ctl (and ct (ignore-errors
- (mail-header-parse-content-type ct)))
- charset (cond
- (prompt
- (mm-read-coding-system "Charset to decode: "))
- (ctl
- (mail-content-type-get ctl 'charset)))
- format (and ctl (mail-content-type-get ctl 'format)))
- (when cte
- (setq cte (mail-header-strip cte)))
- (if (and ctl (not (string-match "/" (car ctl))))
- (setq ctl nil))
- (goto-char (point-max)))
- (forward-line 1)
- (save-restriction
- (narrow-to-region (point) (point-max))
- (when (and (eq mail-parse-charset 'gnus-decoded)
- (eq (mm-body-7-or-8) '8bit))
- ;; The text code could have been decoded.
- (setq charset mail-parse-charset))
- (when (and (or (not ctl)
- (equal (car ctl) "text/plain"))
- (not format)) ;; article with format will decode later.
- (mm-decode-body
- charset (and cte (intern (downcase
- (gnus-strip-whitespace cte))))
- (car ctl)))))))
+ (save-excursion
+ (save-restriction
+ (article-narrow-to-head)
+ (setq ct (message-fetch-field "Content-Type" t)
+ cte (message-fetch-field "Content-Transfer-Encoding" t)
+ ctl (and ct (mail-header-parse-content-type ct))
+ charset (cond
+ (prompt
+ (mm-read-coding-system "Charset to decode: "))
+ (ctl
+ (mail-content-type-get ctl 'charset)))
+ format (and ctl (mail-content-type-get ctl 'format)))
+ (when cte
+ (setq cte (mail-header-strip cte)))
+ (if (and ctl (not (string-match "/" (car ctl))))
+ (setq ctl nil))
+ (goto-char (point-max)))
+ (forward-line 1)
+ (save-restriction
+ (narrow-to-region (point) (point-max))
+ (when (and (eq mail-parse-charset 'gnus-decoded)
+ (eq (mm-body-7-or-8) '8bit))
+ ;; The text code could have been decoded.
+ (setq charset mail-parse-charset))
+ (when (and (or (not ctl)
+ (equal (car ctl) "text/plain"))
+ (not format)) ;; article with format will decode later.
+ (mm-decode-body
+ charset (and cte (intern (downcase
+ (gnus-strip-whitespace cte))))
+ (car ctl)))))))
(defun article-decode-encoded-words ()
"Remove encoded-word encoding from headers."
@@ -2390,9 +2389,7 @@ If READ-CHARSET, ask for a coding system."
(setq type
(gnus-fetch-field "content-transfer-encoding"))
(let* ((ct (gnus-fetch-field "content-type"))
- (ctl (and ct
- (ignore-errors
- (mail-header-parse-content-type ct)))))
+ (ctl (and ct (mail-header-parse-content-type ct))))
(setq charset (and ctl
(mail-content-type-get ctl 'charset)))
(if (stringp charset)
@@ -2420,9 +2417,7 @@ If READ-CHARSET, ask for a coding system."
(setq type
(gnus-fetch-field "content-transfer-encoding"))
(let* ((ct (gnus-fetch-field "content-type"))
- (ctl (and ct
- (ignore-errors
- (mail-header-parse-content-type ct)))))
+ (ctl (and ct (mail-header-parse-content-type ct))))
(setq charset (and ctl
(mail-content-type-get ctl 'charset)))
(if (stringp charset)
@@ -2488,9 +2483,7 @@ charset defined in `gnus-summary-show-article-charset-alist' is used."
(when (gnus-buffer-live-p gnus-original-article-buffer)
(with-current-buffer gnus-original-article-buffer
(let* ((ct (gnus-fetch-field "content-type"))
- (ctl (and ct
- (ignore-errors
- (mail-header-parse-content-type ct)))))
+ (ctl (and ct (mail-header-parse-content-type ct))))
(setq charset (and ctl
(mail-content-type-get ctl 'charset)))
(when (stringp charset)
diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el
index 54e651c9e9c..91d6358d2ad 100644
--- a/lisp/gnus/gnus-async.el
+++ b/lisp/gnus/gnus-async.el
@@ -1,7 +1,7 @@
;;; gnus-async.el --- asynchronous support for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-audio.el b/lisp/gnus/gnus-audio.el
index 7f6bd1167d5..be100195b84 100644
--- a/lisp/gnus/gnus-audio.el
+++ b/lisp/gnus/gnus-audio.el
@@ -1,7 +1,7 @@
;;; gnus-audio.el --- Sound effects for Gnus
;; Copyright (C) 1996, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Steven L. Baur <steve@miranova.com>
;; Keywords: news, mail, multimedia
diff --git a/lisp/gnus/gnus-bcklg.el b/lisp/gnus/gnus-bcklg.el
index 4ae08d2e470..e1456d8a9cd 100644
--- a/lisp/gnus/gnus-bcklg.el
+++ b/lisp/gnus/gnus-bcklg.el
@@ -1,7 +1,7 @@
;;; gnus-bcklg.el --- backlog functions for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-cache.el b/lisp/gnus/gnus-cache.el
index 7785fd4c7de..c95ef75ceb1 100644
--- a/lisp/gnus/gnus-cache.el
+++ b/lisp/gnus/gnus-cache.el
@@ -1,7 +1,7 @@
;;; gnus-cache.el --- cache interface for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index c33d224a49c..44f54047be8 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -1,7 +1,7 @@
;;; gnus-cite.el --- parse citations in articles for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Per Abhiddenware
diff --git a/lisp/gnus/gnus-delay.el b/lisp/gnus/gnus-delay.el
index a427aaefab8..9aab7d0996d 100644
--- a/lisp/gnus/gnus-delay.el
+++ b/lisp/gnus/gnus-delay.el
@@ -1,6 +1,6 @@
;;; gnus-delay.el --- Delayed posting of articles
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
;; Keywords: mail, news, extensions
diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el
index 09015bfd636..8df3a3b0e70 100644
--- a/lisp/gnus/gnus-demon.el
+++ b/lisp/gnus/gnus-demon.el
@@ -1,7 +1,7 @@
;;; gnus-demon.el --- daemonic Gnus behaviour
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index d9ab81a4b9f..5dfbd56af24 100644
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -1,6 +1,6 @@
;;; gnus-diary.el --- Wrapper around the NNDiary Gnus backend
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Copyright (C) 1999, 2000, 2001 Didier Verna.
;; Author: Didier Verna <didier@xemacs.org>
diff --git a/lisp/gnus/gnus-dired.el b/lisp/gnus/gnus-dired.el
index 665e75b2e86..8eda432f3f8 100644
--- a/lisp/gnus/gnus-dired.el
+++ b/lisp/gnus/gnus-dired.el
@@ -1,7 +1,7 @@
;;; gnus-dired.el --- utility functions where gnus and dired meet
;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Authors: Benjamin Rutt <brutt@bloomington.in.us>,
;; Shenghuo Zhu <zsh@cs.rochester.edu>
diff --git a/lisp/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el
index c4cd4deddac..0d250a3ad0b 100644
--- a/lisp/gnus/gnus-draft.el
+++ b/lisp/gnus/gnus-draft.el
@@ -1,7 +1,7 @@
;;; gnus-draft.el --- draft message support for Gnus
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-dup.el b/lisp/gnus/gnus-dup.el
index c5358728d0b..651237f1348 100644
--- a/lisp/gnus/gnus-dup.el
+++ b/lisp/gnus/gnus-dup.el
@@ -1,7 +1,7 @@
;;; gnus-dup.el --- suppression of duplicate articles in Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-eform.el b/lisp/gnus/gnus-eform.el
index c133d1541d8..be31e37c8fe 100644
--- a/lisp/gnus/gnus-eform.el
+++ b/lisp/gnus/gnus-eform.el
@@ -1,7 +1,7 @@
;;; gnus-eform.el --- a mode for editing forms for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index c6ab1939547..44f84237a4b 100644
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -1,7 +1,7 @@
;;; gnus-ems.el --- functions for making Gnus work under different Emacsen
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index 43cd02c1b5e..e1655e91945 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -1,6 +1,6 @@
;;; gnus-fun.el --- various frivolous extension functions to Gnus
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-gl.el b/lisp/gnus/gnus-gl.el
index aac386cefc9..59214cec024 100644
--- a/lisp/gnus/gnus-gl.el
+++ b/lisp/gnus/gnus-gl.el
@@ -1,7 +1,7 @@
;;; gnus-gl.el --- an interface to GroupLens for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Brad Miller <bmiller@cs.umn.edu>
;; Keywords: news, score
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index 8b274a09212..b59a3c1530b 100644
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -1,7 +1,7 @@
;;; gnus-int.el --- backend interface functions for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-kill.el b/lisp/gnus/gnus-kill.el
index 6cdd76647df..90a4fcb593f 100644
--- a/lisp/gnus/gnus-kill.el
+++ b/lisp/gnus/gnus-kill.el
@@ -1,7 +1,7 @@
;;; gnus-kill.el --- kill commands for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/gnus-logic.el b/lisp/gnus/gnus-logic.el
index 288bf3caa92..b7091eda6f5 100644
--- a/lisp/gnus/gnus-logic.el
+++ b/lisp/gnus/gnus-logic.el
@@ -1,7 +1,7 @@
;;; gnus-logic.el --- advanced scoring code for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-mh.el b/lisp/gnus/gnus-mh.el
index cc36aa64687..34c310f3205 100644
--- a/lisp/gnus/gnus-mh.el
+++ b/lisp/gnus/gnus-mh.el
@@ -1,7 +1,7 @@
;;; gnus-mh.el --- mh-e interface for Gnus
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/gnus-ml.el b/lisp/gnus/gnus-ml.el
index c2cf1090d97..cde039d03c0 100644
--- a/lisp/gnus/gnus-ml.el
+++ b/lisp/gnus/gnus-ml.el
@@ -1,7 +1,7 @@
;;; gnus-ml.el --- Mailing list minor mode for Gnus
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Julien Gilles <jgilles@free.fr>
;; Keywords: news
diff --git a/lisp/gnus/gnus-mlspl.el b/lisp/gnus/gnus-mlspl.el
index 291145cabfc..cf2877caf0f 100644
--- a/lisp/gnus/gnus-mlspl.el
+++ b/lisp/gnus/gnus-mlspl.el
@@ -1,7 +1,7 @@
;;; gnus-mlspl.el --- a group params-based mail splitting mechanism
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
;; Keywords: news, mail
diff --git a/lisp/gnus/gnus-move.el b/lisp/gnus/gnus-move.el
index 7accde21db4..8a27ccd5d7f 100644
--- a/lisp/gnus/gnus-move.el
+++ b/lisp/gnus/gnus-move.el
@@ -1,7 +1,7 @@
;;; gnus-move.el --- commands for moving Gnus from one server to another
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index a1efede2a4d..28a90b5b796 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1,7 +1,7 @@
;;; gnus-msg.el --- mail and post interface for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/gnus-nocem.el b/lisp/gnus/gnus-nocem.el
index 7718e53ea60..b17c33a5d7f 100644
--- a/lisp/gnus/gnus-nocem.el
+++ b/lisp/gnus/gnus-nocem.el
@@ -1,7 +1,7 @@
;;; gnus-nocem.el --- NoCeM pseudo-cancellation treatment
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el
index 90733027cc5..4f8d603c814 100644
--- a/lisp/gnus/gnus-picon.el
+++ b/lisp/gnus/gnus-picon.el
@@ -1,7 +1,7 @@
;;; gnus-picon.el --- displaying pretty icons in Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news xpm annotation glyph faces
diff --git a/lisp/gnus/gnus-range.el b/lisp/gnus/gnus-range.el
index 90ea8556754..14355bc96af 100644
--- a/lisp/gnus/gnus-range.el
+++ b/lisp/gnus/gnus-range.el
@@ -1,7 +1,7 @@
;;; gnus-range.el --- range and sequence functions for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 17e8d5a5f50..2e452136f3c 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -1,7 +1,7 @@
;;; gnus-registry.el --- article registry for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Ted Zlatanov <tzz@lifelogs.com>
;; Keywords: news
diff --git a/lisp/gnus/gnus-salt.el b/lisp/gnus/gnus-salt.el
index 89e45cac052..fd2411809b4 100644
--- a/lisp/gnus/gnus-salt.el
+++ b/lisp/gnus/gnus-salt.el
@@ -1,7 +1,7 @@
;;; gnus-salt.el --- alternate summary mode interfaces for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index f9edda4ec64..642ca1aefa9 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -1,7 +1,7 @@
;;; gnus-score.el --- scoring code for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Per Abrahamsen <amanda@iesd.auc.dk>
;; Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/gnus-setup.el b/lisp/gnus/gnus-setup.el
index f67fe491d82..8cdce45b7a9 100644
--- a/lisp/gnus/gnus-setup.el
+++ b/lisp/gnus/gnus-setup.el
@@ -1,7 +1,7 @@
;;; gnus-setup.el --- Initialization & Setup for Gnus 5
;; Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Steven L. Baur <steve@miranova.com>
;; Keywords: news
diff --git a/lisp/gnus/gnus-sieve.el b/lisp/gnus/gnus-sieve.el
index d790fec9aec..99e8f6b4986 100644
--- a/lisp/gnus/gnus-sieve.el
+++ b/lisp/gnus/gnus-sieve.el
@@ -1,6 +1,6 @@
;;; gnus-sieve.el --- Utilities to manage sieve scripts for Gnus
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: NAGY Andras <nagya@inf.elte.hu>,
;; Simon Josefsson <simon@josefsson.org>
diff --git a/lisp/gnus/gnus-soup.el b/lisp/gnus/gnus-soup.el
index 6bcd2c32cce..bca59849766 100644
--- a/lisp/gnus/gnus-soup.el
+++ b/lisp/gnus/gnus-soup.el
@@ -1,7 +1,7 @@
;;; gnus-soup.el --- SOUP packet writing support for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Per Abrahamsen <abraham@iesd.auc.dk>
;; Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el
index 67c0ba88742..c6ffee78c77 100644
--- a/lisp/gnus/gnus-spec.el
+++ b/lisp/gnus/gnus-spec.el
@@ -1,7 +1,7 @@
;;; gnus-spec.el --- format spec functions for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el
index d7629c26fda..5d4f9c2a3f6 100644
--- a/lisp/gnus/gnus-srvr.el
+++ b/lisp/gnus/gnus-srvr.el
@@ -1,7 +1,7 @@
;;; gnus-srvr.el --- virtual server support for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el
index 945665fdcca..fc80a26f6b9 100644
--- a/lisp/gnus/gnus-topic.el
+++ b/lisp/gnus/gnus-topic.el
@@ -1,7 +1,7 @@
;;; gnus-topic.el --- a folding minor mode for Gnus group buffers
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Ilja Weis <kult@uni-paderborn.de>
;; Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/gnus-undo.el b/lisp/gnus/gnus-undo.el
index 09753150aa3..47be2ed97f5 100644
--- a/lisp/gnus/gnus-undo.el
+++ b/lisp/gnus/gnus-undo.el
@@ -1,7 +1,7 @@
;;; gnus-undo.el --- minor mode for undoing in Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index c71b9630db2..c9a3f8c965a 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1,7 +1,7 @@
;;; gnus-util.el --- utility functions for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el
index 01f21887aee..e9756547167 100644
--- a/lisp/gnus/gnus-uu.el
+++ b/lisp/gnus/gnus-uu.el
@@ -1,7 +1,7 @@
;;; gnus-uu.el --- extract (uu)encoded files in Gnus
;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998,
-;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Created: 2 Oct 1993
diff --git a/lisp/gnus/gnus-vm.el b/lisp/gnus/gnus-vm.el
index 31bd639a7c6..775e0aabf1d 100644
--- a/lisp/gnus/gnus-vm.el
+++ b/lisp/gnus/gnus-vm.el
@@ -1,7 +1,7 @@
;;; gnus-vm.el --- vm interface for Gnus
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Per Persson <pp@gnu.ai.mit.edu>
;; Keywords: news, mail
diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el
index 5b8ddb32c00..42289109546 100644
--- a/lisp/gnus/gnus-win.el
+++ b/lisp/gnus/gnus-win.el
@@ -1,7 +1,7 @@
;;; gnus-win.el --- window configuration functions for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 20e41bde239..359e48cb701 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1,7 +1,7 @@
;;; gnus.el --- a newsreader for GNU Emacs
;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998,
-;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/hex-util.el b/lisp/gnus/hex-util.el
index 1cc67c2861c..51553c2f8d1 100644
--- a/lisp/gnus/hex-util.el
+++ b/lisp/gnus/hex-util.el
@@ -1,7 +1,7 @@
;;; hex-util.el --- Functions to encode/decode hexadecimal string.
;; Copyright (C) 1999, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
;; Keywords: data
diff --git a/lisp/gnus/html2text.el b/lisp/gnus/html2text.el
index 41ba54f759e..ceba84decf1 100644
--- a/lisp/gnus/html2text.el
+++ b/lisp/gnus/html2text.el
@@ -1,6 +1,6 @@
;;; html2text.el --- a simple html to plain text converter
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Joakim Hove <hove@phys.ntnu.no>
diff --git a/lisp/gnus/ietf-drums.el b/lisp/gnus/ietf-drums.el
index 98f3d20330f..aace5f4f7e2 100644
--- a/lisp/gnus/ietf-drums.el
+++ b/lisp/gnus/ietf-drums.el
@@ -1,7 +1,7 @@
;;; ietf-drums.el --- Functions for parsing RFC822bis headers
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/imap.el b/lisp/gnus/imap.el
index 967d79463f2..7b40773ca06 100644
--- a/lisp/gnus/imap.el
+++ b/lisp/gnus/imap.el
@@ -1,7 +1,7 @@
;;; imap.el --- imap library
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <jas@pdc.kth.se>
;; Keywords: mail
diff --git a/lisp/gnus/mail-parse.el b/lisp/gnus/mail-parse.el
index 106aedad085..6a9a4755bb2 100644
--- a/lisp/gnus/mail-parse.el
+++ b/lisp/gnus/mail-parse.el
@@ -1,7 +1,7 @@
;;; mail-parse.el --- Interface functions for parsing mail
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/mail-prsvr.el b/lisp/gnus/mail-prsvr.el
index d990f8dbc54..144d61eb6a3 100644
--- a/lisp/gnus/mail-prsvr.el
+++ b/lisp/gnus/mail-prsvr.el
@@ -1,7 +1,7 @@
;;; mail-prsvr.el --- Interface variables for parsing mail
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index c31fa6825f4..9683f28154b 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -1,7 +1,7 @@
;;; mail-source.el --- functions for fetching mail
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news, mail
diff --git a/lisp/gnus/messcompat.el b/lisp/gnus/messcompat.el
index d7c8f40de26..f7b06f69029 100644
--- a/lisp/gnus/messcompat.el
+++ b/lisp/gnus/messcompat.el
@@ -1,7 +1,7 @@
;;; messcompat.el --- making message mode compatible with mail mode
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: mail, news
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index b275807c051..996c934191c 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -534,13 +534,13 @@ Postpone undisplaying of viewers for types in
loose-mime
(mail-fetch-field "mime-version"))
(setq ct (mail-fetch-field "content-type")
- ctl (ignore-errors (mail-header-parse-content-type ct))
+ ctl (and ct (mail-header-parse-content-type ct))
cte (mail-fetch-field "content-transfer-encoding")
cd (mail-fetch-field "content-disposition")
description (mail-fetch-field "content-description")
id (mail-fetch-field "content-id"))
(unless from
- (setq from (mail-fetch-field "from")))
+ (setq from (mail-fetch-field "from")))
;; FIXME: In some circumstances, this code is running within
;; an unibyte macro. mail-extract-address-components
;; creates unibyte buffers. This `if', though not a perfect
@@ -557,7 +557,7 @@ Postpone undisplaying of viewers for types in
(mail-header-remove-comments
cte)))))
no-strict-mime
- (and cd (ignore-errors (mail-header-parse-content-disposition cd)))
+ (and cd (mail-header-parse-content-disposition cd))
description)
(setq type (split-string (car ctl) "/"))
(setq subtype (cadr type)
@@ -592,8 +592,7 @@ Postpone undisplaying of viewers for types in
(mail-header-remove-comments
cte)))))
no-strict-mime
- (and cd (ignore-errors
- (mail-header-parse-content-disposition cd)))
+ (and cd (mail-header-parse-content-disposition cd))
description id)
ctl))))
(when id
@@ -1401,9 +1400,8 @@ If RECURSIVE, search recursively."
(save-excursion
(save-restriction
(narrow-to-region start (1- (point)))
- (when (let ((ctl (ignore-errors
- (mail-header-parse-content-type
- (mail-fetch-field "content-type")))))
+ (when (let* ((ct (mail-fetch-field "content-type"))
+ (ctl (and ct (mail-header-parse-content-type ct))))
(if notp
(not (equal (car ctl) type))
(equal (car ctl) type)))
@@ -1414,9 +1412,8 @@ If RECURSIVE, search recursively."
(save-excursion
(save-restriction
(narrow-to-region start end)
- (when (let ((ctl (ignore-errors
- (mail-header-parse-content-type
- (mail-fetch-field "content-type")))))
+ (when (let* ((ct (mail-fetch-field "content-type"))
+ (ctl (and ct (mail-header-parse-content-type ct))))
(if notp
(not (equal (car ctl) type))
(equal (car ctl) type)))
diff --git a/lisp/gnus/mm-encode.el b/lisp/gnus/mm-encode.el
index 5e149d16ed3..5ea2d7dd1b6 100644
--- a/lisp/gnus/mm-encode.el
+++ b/lisp/gnus/mm-encode.el
@@ -1,7 +1,7 @@
;;; mm-encode.el --- Functions for encoding MIME things
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; MORIOKA Tomohiko <morioka@jaist.ac.jp>
diff --git a/lisp/gnus/mm-extern.el b/lisp/gnus/mm-extern.el
index 2f75139497e..da3ecb8f351 100644
--- a/lisp/gnus/mm-extern.el
+++ b/lisp/gnus/mm-extern.el
@@ -1,7 +1,7 @@
;;; mm-extern.el --- showing message/external-body
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: message external-body
diff --git a/lisp/gnus/mm-partial.el b/lisp/gnus/mm-partial.el
index 1c0c708d2a0..69f8b1ff504 100644
--- a/lisp/gnus/mm-partial.el
+++ b/lisp/gnus/mm-partial.el
@@ -1,7 +1,7 @@
;;; mm-partial.el --- showing message/partial
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: message partial
diff --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el
index 22a9dbf077c..ba21247f356 100644
--- a/lisp/gnus/mm-url.el
+++ b/lisp/gnus/mm-url.el
@@ -1,6 +1,6 @@
;;; mm-url.el --- a wrapper of url functions/commands for Gnus
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index ef050f3d621..13d786f7a99 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -1,7 +1,7 @@
;;; mm-util.el --- Utility functions for Mule and low level things
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; MORIOKA Tomohiko <morioka@jaist.ac.jp>
diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el
index f8c573a7656..2af068897f0 100644
--- a/lisp/gnus/mml-sec.el
+++ b/lisp/gnus/mml-sec.el
@@ -1,7 +1,7 @@
;;; mml-sec.el --- A package with security functions for MML documents
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index 2933c14744a..8115a78e618 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -1,7 +1,7 @@
;;; mml-smime.el --- S/MIME support for MML
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: Gnus, MIME, S/MIME, MML
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 8993f641786..ee155755bab 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -663,10 +663,10 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
"Can't encode a part with several charsets"))
(insert "Content-Type: " type)
(when charset
- (insert "; " (mail-header-encode-parameter
- "charset" (symbol-name charset))))
+ (mml-insert-parameter
+ (mail-header-encode-parameter "charset" (symbol-name charset))))
(when flowed
- (insert "; format=flowed"))
+ (mml-insert-parameter "format=flowed"))
(when parameters
(mml-insert-parameter-string
cont mml-content-type-parameters))
@@ -686,8 +686,11 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
(unless (eq encoding '7bit)
(insert (format "Content-Transfer-Encoding: %s\n" encoding)))
(when (setq description (cdr (assq 'description cont)))
- (insert "Content-Description: "
- (mail-encode-encoded-word-string description) "\n"))))
+ (insert "Content-Description: ")
+ (setq description (prog1
+ (point)
+ (insert description "\n")))
+ (mail-encode-encoded-word-region description (point)))))
(defun mml-parameter-string (cont types)
(let ((string "")
@@ -840,14 +843,20 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
(defun mml-insert-parameter (&rest parameters)
"Insert PARAMETERS in a nice way."
- (dolist (param parameters)
- (insert ";")
- (let ((point (point)))
+ (let (start end)
+ (dolist (param parameters)
+ (insert ";")
+ (setq start (point))
(insert " " param)
- (when (> (current-column) 71)
- (goto-char point)
- (insert "\n ")
- (end-of-line)))))
+ (setq end (point))
+ (goto-char start)
+ (end-of-line)
+ (if (> (current-column) 76)
+ (progn
+ (goto-char start)
+ (insert "\n")
+ (goto-char (1+ end)))
+ (goto-char end)))))
;;;
;;; Mode for inserting and editing MML forms
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index 932737dc4be..761ce4f0af4 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -1,7 +1,7 @@
;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Sascha Lüdecke <sascha@meta-x.de>,
;; Simon Josefsson <simon@josefsson.org> (Mailcrypt interface, Gnus glue)
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index c8d46c99f51..cb9e77983d3 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -1,7 +1,7 @@
;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP)
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: PGP MIME MML
diff --git a/lisp/gnus/nnagent.el b/lisp/gnus/nnagent.el
index 4b8233a4d54..d1c95bd2aa6 100644
--- a/lisp/gnus/nnagent.el
+++ b/lisp/gnus/nnagent.el
@@ -1,7 +1,7 @@
;;; nnagent.el --- offline backend for Gnus
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news, mail
diff --git a/lisp/gnus/nnbabyl.el b/lisp/gnus/nnbabyl.el
index afdd4d15350..f0c135b4cc9 100644
--- a/lisp/gnus/nnbabyl.el
+++ b/lisp/gnus/nnbabyl.el
@@ -1,7 +1,7 @@
;;; nnbabyl.el --- rmail mbox access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1099, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff --git a/lisp/gnus/nndb.el b/lisp/gnus/nndb.el
index ca5b27cdd1d..7aa4edc7ab8 100644
--- a/lisp/gnus/nndb.el
+++ b/lisp/gnus/nndb.el
@@ -1,7 +1,7 @@
;;; nndb.el --- nndb access for Gnus
;; Copyright (C) 1997, 1998, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Kai Grossjohann <grossjohann@ls6.informatik.uni-dortmund.de>
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index 4be4c6f6646..0c83a2d5124 100644
--- a/lisp/gnus/nndiary.el
+++ b/lisp/gnus/nndiary.el
@@ -1,7 +1,7 @@
;;; nndiary.el --- A diary backend for Gnus
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Didier Verna <didier@xemacs.org>
;; Maintainer: Didier Verna <didier@xemacs.org>
diff --git a/lisp/gnus/nndir.el b/lisp/gnus/nndir.el
index 18e64e83997..ec47c94749f 100644
--- a/lisp/gnus/nndir.el
+++ b/lisp/gnus/nndir.el
@@ -1,7 +1,7 @@
;;; nndir.el --- single directory newsgroup access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/nndoc.el b/lisp/gnus/nndoc.el
index 70e301b5b00..764f085e6a7 100644
--- a/lisp/gnus/nndoc.el
+++ b/lisp/gnus/nndoc.el
@@ -1,7 +1,7 @@
;;; nndoc.el --- single file access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff --git a/lisp/gnus/nndraft.el b/lisp/gnus/nndraft.el
index beea344e0c3..fa497e1c76f 100644
--- a/lisp/gnus/nndraft.el
+++ b/lisp/gnus/nndraft.el
@@ -1,7 +1,7 @@
;;; nndraft.el --- draft article access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/nneething.el b/lisp/gnus/nneething.el
index 33f6a5f4ea5..92a62d12386 100644
--- a/lisp/gnus/nneething.el
+++ b/lisp/gnus/nneething.el
@@ -1,7 +1,7 @@
;;; nneething.el --- arbitrary file access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index 5a29878b5fb..c7043011fa2 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -1,7 +1,7 @@
;;; nnfolder.el --- mail folder access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org> (adding MARKS)
;; ShengHuo Zhu <zsh@cs.rochester.edu> (adding NOV)
diff --git a/lisp/gnus/nngateway.el b/lisp/gnus/nngateway.el
index 8ddbf9ca13b..2f4e33d80ca 100644
--- a/lisp/gnus/nngateway.el
+++ b/lisp/gnus/nngateway.el
@@ -1,7 +1,7 @@
;;; nngateway.el --- posting news via mail gateways
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news, mail
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index 45e030027a9..d564d42414e 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -2,7 +2,7 @@
;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994,
;; 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index a2906a900df..26c0f8901ee 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1,7 +1,7 @@
;;; nnimap.el --- imap backend for Gnus
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <jas@pdc.kth.se>
;; Jim Radford <radford@robby.caltech.edu>
diff --git a/lisp/gnus/nnkiboze.el b/lisp/gnus/nnkiboze.el
index ee3c804ae8f..b1fbc1f3d1d 100644
--- a/lisp/gnus/nnkiboze.el
+++ b/lisp/gnus/nnkiboze.el
@@ -1,7 +1,7 @@
;;; nnkiboze.el --- select virtual news access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/nnlistserv.el b/lisp/gnus/nnlistserv.el
index 2b9d478086d..3ee8f4200a4 100644
--- a/lisp/gnus/nnlistserv.el
+++ b/lisp/gnus/nnlistserv.el
@@ -1,7 +1,7 @@
;;; nnlistserv.el --- retrieving articles via web mailing list archives
;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news, mail
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 1f0d1c91f49..edffd6f709a 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1,7 +1,7 @@
;;; nnmail.el --- mail support functions for the Gnus mail backends
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news, mail
diff --git a/lisp/gnus/nnmbox.el b/lisp/gnus/nnmbox.el
index fe25ef9d0a4..7d75f655337 100644
--- a/lisp/gnus/nnmbox.el
+++ b/lisp/gnus/nnmbox.el
@@ -1,7 +1,7 @@
;;; nnmbox.el --- mail mbox access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el
index 4c0af4fdcfb..afcee98299c 100644
--- a/lisp/gnus/nnmh.el
+++ b/lisp/gnus/nnmh.el
@@ -1,7 +1,7 @@
;;; nnmh.el --- mhspool access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index 9bdd08fd3ca..2cc8023366b 100644
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -1,7 +1,7 @@
;;; nnml.el --- mail spool access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org> (adding MARKS)
;; Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/nnoo.el b/lisp/gnus/nnoo.el
index fcd50c3a767..7a66b4c55aa 100644
--- a/lisp/gnus/nnoo.el
+++ b/lisp/gnus/nnoo.el
@@ -1,7 +1,7 @@
;;; nnoo.el --- OO Gnus Backends
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/nnslashdot.el b/lisp/gnus/nnslashdot.el
index 522f94acabc..38468d7d194 100644
--- a/lisp/gnus/nnslashdot.el
+++ b/lisp/gnus/nnslashdot.el
@@ -1,7 +1,7 @@
;;; nnslashdot.el --- interfacing with Slashdot
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/nnsoup.el b/lisp/gnus/nnsoup.el
index 94c259b6d96..9dc429ec135 100644
--- a/lisp/gnus/nnsoup.el
+++ b/lisp/gnus/nnsoup.el
@@ -1,7 +1,7 @@
;;; nnsoup.el --- SOUP access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff --git a/lisp/gnus/nnspool.el b/lisp/gnus/nnspool.el
index 228879a4dad..8de0c17c708 100644
--- a/lisp/gnus/nnspool.el
+++ b/lisp/gnus/nnspool.el
@@ -1,7 +1,7 @@
;;; nnspool.el --- spool access for GNU Emacs
;; Copyright (C) 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998,
-;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index ca63fa597ef..c5ab7da7b2b 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -2,7 +2,7 @@
;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993,
;; 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/nnultimate.el b/lisp/gnus/nnultimate.el
index 46896640168..53522c099e5 100644
--- a/lisp/gnus/nnultimate.el
+++ b/lisp/gnus/nnultimate.el
@@ -1,7 +1,7 @@
;;; nnultimate.el --- interfacing with the Ultimate Bulletin Board system
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/nnvirtual.el b/lisp/gnus/nnvirtual.el
index 28ef0f5c830..ba1b6445623 100644
--- a/lisp/gnus/nnvirtual.el
+++ b/lisp/gnus/nnvirtual.el
@@ -1,7 +1,7 @@
;;; nnvirtual.el --- virtual newsgroups access for Gnus
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: David Moore <dmoore@ucsd.edu>
;; Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/nnwarchive.el b/lisp/gnus/nnwarchive.el
index a543c8edb82..13a22419672 100644
--- a/lisp/gnus/nnwarchive.el
+++ b/lisp/gnus/nnwarchive.el
@@ -1,7 +1,7 @@
;;; nnwarchive.el --- interfacing with web archives
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: news egroups mail-archive
diff --git a/lisp/gnus/nnwfm.el b/lisp/gnus/nnwfm.el
index d759d12f798..90bf4e9c79d 100644
--- a/lisp/gnus/nnwfm.el
+++ b/lisp/gnus/nnwfm.el
@@ -1,6 +1,7 @@
;;; nnwfm.el --- interfacing with a web forum
-;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index f021e063fcd..7714c566dce 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -1,7 +1,7 @@
;;; pop3.el --- Post Office Protocol (RFC 1460) interface
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Richard L. Pieri <ratinox@peorth.gweep.net>
;; Maintainer: FSF
diff --git a/lisp/gnus/qp.el b/lisp/gnus/qp.el
index b81a215ee47..afd6ad72b4d 100644
--- a/lisp/gnus/qp.el
+++ b/lisp/gnus/qp.el
@@ -1,7 +1,7 @@
;;; qp.el --- Quoted-Printable functions
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: mail, extensions
diff --git a/lisp/gnus/rfc1843.el b/lisp/gnus/rfc1843.el
index 55150fbdacf..aac75758c05 100644
--- a/lisp/gnus/rfc1843.el
+++ b/lisp/gnus/rfc1843.el
@@ -1,7 +1,7 @@
;;; rfc1843.el --- HZ (rfc1843) decoding
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: news HZ HZ+ mail i18n
@@ -149,8 +149,7 @@ ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc"
(let* ((inhibit-point-motion-hooks t)
(case-fold-search t)
(ct (message-fetch-field "Content-Type" t))
- (ctl (and ct (ignore-errors
- (mail-header-parse-content-type ct)))))
+ (ctl (and ct (mail-header-parse-content-type ct))))
(if (and ctl (not (string-match "/" (car ctl))))
(setq ctl nil))
(goto-char (point-max))
diff --git a/lisp/gnus/rfc2045.el b/lisp/gnus/rfc2045.el
index b3bbe373d9d..f38ec0548fe 100644
--- a/lisp/gnus/rfc2045.el
+++ b/lisp/gnus/rfc2045.el
@@ -1,7 +1,7 @@
;;; rfc2045.el --- Functions for decoding rfc2045 headers
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el
index 3d06ca6bdf1..1167cb0a62b 100644
--- a/lisp/gnus/rfc2047.el
+++ b/lisp/gnus/rfc2047.el
@@ -1,7 +1,7 @@
;;; rfc2047.el --- functions for encoding and decoding rfc2047 messages
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; MORIOKA Tomohiko <morioka@jaist.ac.jp>
diff --git a/lisp/gnus/rfc2104.el b/lisp/gnus/rfc2104.el
index 07ea3a424e0..c343953177c 100644
--- a/lisp/gnus/rfc2104.el
+++ b/lisp/gnus/rfc2104.el
@@ -1,7 +1,7 @@
;;; rfc2104.el --- RFC2104 Hashed Message Authentication Codes
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <jas@pdc.kth.se>
;; Keywords: mail
diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el
index fb2d070328e..31c9f1ade94 100644
--- a/lisp/gnus/rfc2231.el
+++ b/lisp/gnus/rfc2231.el
@@ -41,10 +41,13 @@
N.B. This is in violation with RFC2047, but it seem to be in common use."
(rfc2231-parse-string (rfc2047-decode-string string)))
-(defun rfc2231-parse-string (string)
+(defun rfc2231-parse-string (string &optional signal-error)
"Parse STRING and return a list.
The list will be on the form
- `(name (attribute . value) (attribute . value)...)"
+ `(name (attribute . value) (attribute . value)...)'.
+
+If the optional SIGNAL-ERROR is non-nil, signal an error when this
+function fails in parsing of parameters."
(with-temp-buffer
(let ((ttoken (ietf-drums-token-to-list ietf-drums-text-token))
(stoken (ietf-drums-token-to-list ietf-drums-tspecials))
@@ -74,63 +77,68 @@ The list will be on the form
(setq type (downcase (buffer-substring
(point) (progn (forward-sexp 1) (point)))))
;; Do the params
- (while (not (eobp))
- (setq c (char-after))
- (unless (eq c ?\;)
- (error "Invalid header: %s" string))
- (forward-char 1)
- ;; If c in nil, then this is an invalid header, but
- ;; since elm generates invalid headers on this form,
- ;; we allow it.
- (when (setq c (char-after))
- (if (and (memq c ttoken)
- (not (memq c stoken)))
- (setq attribute
- (intern
- (downcase
- (buffer-substring
- (point) (progn (forward-sexp 1) (point))))))
- (error "Invalid header: %s" string))
- (setq c (char-after))
- (when (eq c ?*)
- (forward-char 1)
- (setq c (char-after))
- (if (not (memq c ntoken))
- (setq encoded t
- number nil)
- (setq number
- (string-to-number
- (buffer-substring
- (point) (progn (forward-sexp 1) (point)))))
+ (condition-case err
+ (progn
+ (while (not (eobp))
(setq c (char-after))
- (when (eq c ?*)
- (setq encoded t)
+ (unless (eq c ?\;)
+ (error "Invalid header: %s" string))
+ (forward-char 1)
+ ;; If c in nil, then this is an invalid header, but
+ ;; since elm generates invalid headers on this form,
+ ;; we allow it.
+ (when (setq c (char-after))
+ (if (and (memq c ttoken)
+ (not (memq c stoken)))
+ (setq attribute
+ (intern
+ (downcase
+ (buffer-substring
+ (point) (progn (forward-sexp 1) (point))))))
+ (error "Invalid header: %s" string))
+ (setq c (char-after))
+ (when (eq c ?*)
+ (forward-char 1)
+ (setq c (char-after))
+ (if (not (memq c ntoken))
+ (setq encoded t
+ number nil)
+ (setq number
+ (string-to-number
+ (buffer-substring
+ (point) (progn (forward-sexp 1) (point)))))
+ (setq c (char-after))
+ (when (eq c ?*)
+ (setq encoded t)
+ (forward-char 1)
+ (setq c (char-after)))))
+ ;; See if we have any previous continuations.
+ (when (and prev-attribute
+ (not (eq prev-attribute attribute)))
+ (push (cons prev-attribute
+ (if prev-encoded
+ (rfc2231-decode-encoded-string prev-value)
+ prev-value))
+ parameters)
+ (setq prev-attribute nil
+ prev-value ""
+ prev-encoded nil))
+ (unless (eq c ?=)
+ (error "Invalid header: %s" string))
(forward-char 1)
- (setq c (char-after)))))
- ;; See if we have any previous continuations.
- (when (and prev-attribute
- (not (eq prev-attribute attribute)))
- (push (cons prev-attribute
- (if prev-encoded
- (rfc2231-decode-encoded-string prev-value)
- prev-value))
- parameters)
- (setq prev-attribute nil
- prev-value ""
- prev-encoded nil))
- (unless (eq c ?=)
- (error "Invalid header: %s" string))
- (forward-char 1)
- (setq c (char-after))
- (cond
- ((eq c ?\")
- (setq value
- (buffer-substring (1+ (point))
- (progn (forward-sexp 1) (1- (point))))))
- ((and (or (memq c ttoken)
- (> c ?\177)) ;; EXTENSION: Support non-ascii chars.
- (not (memq c stoken)))
- (setq value (buffer-substring
+ (setq c (char-after))
+ (cond
+ ((eq c ?\")
+ (setq value (buffer-substring (1+ (point))
+ (progn
+ (forward-sexp 1)
+ (1- (point))))))
+ ((and (or (memq c ttoken)
+ ;; EXTENSION: Support non-ascii chars.
+ (> c ?\177))
+ (not (memq c stoken)))
+ (setq value
+ (buffer-substring
(point)
(progn
(forward-sexp)
@@ -142,25 +150,31 @@ The list will be on the form
(forward-char 1)
(forward-sexp))
(point)))))
- (t
- (error "Invalid header: %s" string)))
- (if number
- (setq prev-attribute attribute
- prev-value (concat prev-value value)
- prev-encoded encoded)
- (push (cons attribute
- (if encoded
- (rfc2231-decode-encoded-string value)
- value))
- parameters))))
+ (t
+ (error "Invalid header: %s" string)))
+ (if number
+ (setq prev-attribute attribute
+ prev-value (concat prev-value value)
+ prev-encoded encoded)
+ (push (cons attribute
+ (if encoded
+ (rfc2231-decode-encoded-string value)
+ value))
+ parameters))))
- ;; Take care of any final continuations.
- (when prev-attribute
- (push (cons prev-attribute
- (if prev-encoded
- (rfc2231-decode-encoded-string prev-value)
- prev-value))
- parameters))
+ ;; Take care of any final continuations.
+ (when prev-attribute
+ (push (cons prev-attribute
+ (if prev-encoded
+ (rfc2231-decode-encoded-string prev-value)
+ prev-value))
+ parameters)))
+ (error
+ (setq parameters nil)
+ (if signal-error
+ (signal (car err) (cdr err))
+ ;;(message "%s" (error-message-string err))
+ )))
(when type
`(,type ,@(nreverse parameters)))))))
@@ -189,12 +203,15 @@ These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"."
(buffer-string))))
(defun rfc2231-encode-string (param value)
- "Return and PARAM=VALUE string encoded according to RFC2231."
+ "Return and PARAM=VALUE string encoded according to RFC2231.
+Use `mml-insert-parameter' or `mml-insert-parameter-string' to insert
+the result of this function."
(let ((control (ietf-drums-token-to-list ietf-drums-no-ws-ctl-token))
(tspecial (ietf-drums-token-to-list ietf-drums-tspecials))
(special (ietf-drums-token-to-list "*'%\n\t"))
(ascii (ietf-drums-token-to-list ietf-drums-text-token))
(num -1)
+ ;; Don't make lines exceeding 76 column.
(limit (- 74 (length param)))
spacep encodep charsetp charset broken)
(with-temp-buffer
@@ -241,7 +258,7 @@ These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"."
(if (not broken)
(insert param "*=")
(while (not (eobp))
- (insert (if (>= num 0) " " "\n ")
+ (insert (if (>= num 0) " " "")
param "*" (format "%d" (incf num)) "*=")
(forward-line 1))))
(spacep
diff --git a/lisp/gnus/score-mode.el b/lisp/gnus/score-mode.el
index add14ea6ded..3e604ab39d6 100644
--- a/lisp/gnus/score-mode.el
+++ b/lisp/gnus/score-mode.el
@@ -1,7 +1,7 @@
;;; score-mode.el --- mode for editing Gnus score files
;; Copyright (C) 1996, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news, mail
diff --git a/lisp/gnus/sha1.el b/lisp/gnus/sha1.el
index 99b9aa47bb6..664933bfec1 100644
--- a/lisp/gnus/sha1.el
+++ b/lisp/gnus/sha1.el
@@ -1,7 +1,7 @@
;;; sha1.el --- SHA1 Secure Hash Algorithm in Emacs-Lisp
;; Copyright (C) 1999, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
;; Keywords: SHA1, FIPS 180-1
diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index dc2016f282e..3512ed15b2d 100644
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/sieve-manage.el
@@ -1,6 +1,7 @@
;;; sieve-manage.el --- Implementation of the managesive protocol in elisp
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
diff --git a/lisp/gnus/sieve-mode.el b/lisp/gnus/sieve-mode.el
index 31ff5d1e9c9..b58435693bf 100644
--- a/lisp/gnus/sieve-mode.el
+++ b/lisp/gnus/sieve-mode.el
@@ -1,6 +1,7 @@
;;; sieve-mode.el --- Sieve code editing commands for Emacs
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
diff --git a/lisp/gnus/sieve.el b/lisp/gnus/sieve.el
index 5badbe7869a..b39ed5c78e6 100644
--- a/lisp/gnus/sieve.el
+++ b/lisp/gnus/sieve.el
@@ -1,6 +1,6 @@
;;; sieve.el --- Utilities to manage sieve scripts
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index cdd1c8dbc9b..d7657e444b8 100644
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -1,7 +1,7 @@
;;; smiley.el --- displaying smiley faces
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Dave Love <fx@gnu.org>
;; Keywords: news mail multimedia
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 22489affa89..e5a2328f9d6 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -1,7 +1,7 @@
;;; smime.el --- S/MIME support library
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: SMIME X.509 PEM OpenSSL
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 293a41d7b60..a5f46bb79f4 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -1,6 +1,6 @@
;;; spam-report.el --- Reporting spam
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Teodor Zlatanov <tzz@lifelogs.com>
;; Keywords: network
@@ -50,7 +50,11 @@ instead."
:group 'spam-report)
(defcustom spam-report-gmane-use-article-number t
- "Whether the article number (faster!) or the header should be used."
+ "Whether the article number (faster!) or the header should be used.
+
+You must set this to nil if you don't read Gmane groups directly
+from news.gmane.org, e.g. when using local newsserver such as
+leafnode."
:type 'boolean
:group 'spam-report)
diff --git a/lisp/gnus/spam-stat.el b/lisp/gnus/spam-stat.el
index c8870454be8..66f302d32e5 100644
--- a/lisp/gnus/spam-stat.el
+++ b/lisp/gnus/spam-stat.el
@@ -1,6 +1,6 @@
;;; spam-stat.el --- detecting spam based on statistics
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Alex Schroeder <alex@gnu.org>
;; Keywords: network
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index 32de2f60e22..ed5fd6e7980 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -1,6 +1,6 @@
;;; spam.el --- Identifying spam
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: network
diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el
index c63e08fc12e..a9b64b4d1fc 100644
--- a/lisp/gnus/starttls.el
+++ b/lisp/gnus/starttls.el
@@ -1,7 +1,7 @@
;;; starttls.el --- STARTTLS functions
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Author: Simon Josefsson <simon@josefsson.org>
diff --git a/lisp/gnus/utf7.el b/lisp/gnus/utf7.el
index 957dfc45796..7347259a35c 100644
--- a/lisp/gnus/utf7.el
+++ b/lisp/gnus/utf7.el
@@ -1,7 +1,7 @@
;;; utf7.el --- UTF-7 encoding/decoding for Emacs -*-coding: iso-8859-1;-*-
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Jon K Hellan <hellan@acm.org>
;; Maintainer: bugs@gnus.org
diff --git a/lisp/gnus/uudecode.el b/lisp/gnus/uudecode.el
index c1fc56ad8bf..f47a8e90c3a 100644
--- a/lisp/gnus/uudecode.el
+++ b/lisp/gnus/uudecode.el
@@ -1,7 +1,7 @@
;;; uudecode.el -- elisp native uudecode
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: uudecode news
diff --git a/lisp/gnus/webmail.el b/lisp/gnus/webmail.el
index e9bc074f2cf..304a206a97f 100644
--- a/lisp/gnus/webmail.el
+++ b/lisp/gnus/webmail.el
@@ -1,7 +1,7 @@
;;; webmail.el --- interface of web mail
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: hotmail netaddress my-deja netscape
@@ -637,7 +637,7 @@
(goto-char (point-min))
(delete-blank-lines)
(setq ct (mail-fetch-field "content-type")
- ctl (ignore-errors (mail-header-parse-content-type ct))
+ ctl (and ct (mail-header-parse-content-type ct))
;;cte (mail-fetch-field "content-transfer-encoding")
cd (mail-fetch-field "content-disposition")
description (mail-fetch-field "content-description")
diff --git a/lisp/gnus/yenc.el b/lisp/gnus/yenc.el
index 37018d2fa19..767d2620cfe 100644
--- a/lisp/gnus/yenc.el
+++ b/lisp/gnus/yenc.el
@@ -1,6 +1,6 @@
;;; yenc.el --- elisp native yenc decoder
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Jesper Harder <harder@ifa.au.dk>
;; Keywords: yenc news
diff --git a/lisp/gs.el b/lisp/gs.el
index 8f9414f0e5f..4594fb00bc2 100644
--- a/lisp/gs.el
+++ b/lisp/gs.el
@@ -1,7 +1,7 @@
;;; gs.el --- interface to Ghostscript
;; Copyright (C) 1998, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el
index fcb431feba9..db00fff6c1c 100644
--- a/lisp/help-at-pt.el
+++ b/lisp/help-at-pt.el
@@ -1,6 +1,6 @@
;;; help-at-pt.el --- local help through the keyboard
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Luc Teirlinck <teirllm@auburn.edu>
;; Keywords: help
diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 3170bf287b5..cc78bd71210 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -1,7 +1,7 @@
;;; help-macro.el --- makes command line help such as help-for-help
;; Copyright (C) 1993, 1994, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lynn Slater <lrs@indetech.com>
;; Maintainer: FSF
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 2e5bbb9315b..c2e1f59e578 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -1,7 +1,7 @@
;;; help-mode.el --- `help-mode' used by *Help* buffers
;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: help, internal
diff --git a/lisp/help.el b/lisp/help.el
index 3b78194b6a3..f8ed27810ea 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1,7 +1,7 @@
;;; help.el --- help commands for Emacs
;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: help, internal
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 45044da0985..bdece19f96b 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -1,7 +1,7 @@
;;; hexl.el --- edit a file in a hex dump format using the hexl filter
;; Copyright (C) 1989, 1994, 1998, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu>
;; Maintainer: FSF
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index f028bd1f464..fcba2466d01 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -1,7 +1,7 @@
;;; hi-lock.el --- minor mode for interactive automatic highlighting
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David M. Koppelman, koppel@ee.lsu.edu
;; Keywords: faces, minor-mode, matching, display
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el
index 55eafb5c617..a68e20cf6de 100644
--- a/lisp/hilit-chg.el
+++ b/lisp/hilit-chg.el
@@ -1,7 +1,7 @@
;;; hilit-chg.el --- minor mode displaying buffer changes with special face
;; Copyright (C) 1998, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Richard Sharman <rsharman@pobox.com>
;; Keywords: faces
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 1210166305b..92fb9083cd4 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -1,6 +1,7 @@
;;; hippie-exp.el --- expand text trying various ways to find its expansion
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Anders Holst <aho@sans.kth.se>
;; Last change: 3 March 1998
diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el
index 3e814d4770f..38fee1b56c1 100644
--- a/lisp/ibuf-macs.el
+++ b/lisp/ibuf-macs.el
@@ -1,7 +1,7 @@
;;; ibuf-macs.el --- macros for ibuffer
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Colin Walters <walters@verbum.org>
;; Maintainer: John Paul Wallington <jpw@gnu.org>
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 085c111d856..f835d91ff9a 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -1,7 +1,7 @@
;;; icomplete.el --- minibuffer completion incremental feedback
;; Copyright (C) 1992, 1993, 1994, 1997, 1999, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Ken Manheimer <klm@i.am>
;; Maintainer: Ken Manheimer <klm@i.am>
diff --git a/lisp/ido.el b/lisp/ido.el
index 9fe063bade6..9c1a3bbbaa6 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1,7 +1,7 @@
;;; ido.el --- interactively do things with buffers and files.
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Kim F. Storm <storm@cua.dk>
;; Based on: iswitchb by Stephen Eglen <stephen@cns.ed.ac.uk>
diff --git a/lisp/ielm.el b/lisp/ielm.el
index 57354008b1b..ff0de14c3b1 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -1,6 +1,7 @@
;;; ielm.el --- interaction mode for Emacs Lisp
-;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: David Smith <maa036@lancaster.ac.uk>
;; Maintainer: FSF
diff --git a/lisp/iimage.el b/lisp/iimage.el
index ace21702a0f..b5633582081 100644
--- a/lisp/iimage.el
+++ b/lisp/iimage.el
@@ -1,6 +1,6 @@
;;; iimage.el --- Inline image minor mode.
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: KOSEKI Yoshinori <kose@meadowy.org>
;; Maintainer: KOSEKI Yoshinori <kose@meadowy.org>
diff --git a/lisp/image-file.el b/lisp/image-file.el
index 94028b740f5..d90f5efc8cd 100644
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -1,7 +1,7 @@
;;; image-file.el --- support for visiting image files
;;
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Miles Bader <miles@gnu.org>
;; Keywords: multimedia
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 3c0544edf89..e49ca27db72 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -1,6 +1,6 @@
;;; image-mode.el --- support for visiting image files
;;
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Richard Stallman <rms@gnu.org>
;; Keywords: multimedia
diff --git a/lisp/image.el b/lisp/image.el
index 87102dd34e4..316896cabce 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -1,7 +1,7 @@
;;; image.el --- image API
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: multimedia
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 1a107ed8aea..774903e1092 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -1,7 +1,7 @@
;;; imenu.el --- framework for mode-specific buffer indexes
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Ake Stenhoff <etxaksf@aom.ericsson.se>
;; Lars Lindberg <lli@sypro.cap.se>
diff --git a/lisp/indent.el b/lisp/indent.el
index 9e84dfe13e0..ee3eea8d901 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -1,7 +1,7 @@
;;; indent.el --- indentation commands for Emacs
;; Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
diff --git a/lisp/info-look.el b/lisp/info-look.el
index ad09df777cf..404eee3f2d0 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -2,7 +2,7 @@
;; An older version of this was known as libc.el.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
;; (did not show signs of life (Nov 2001) -stef)
diff --git a/lisp/info-xref.el b/lisp/info-xref.el
index 18d64cf0a1c..75bc72f25b4 100644
--- a/lisp/info-xref.el
+++ b/lisp/info-xref.el
@@ -1,6 +1,6 @@
;;; info-xref.el --- check external references in an Info document
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Kevin Ryde <user42@zip.com.au>
;; Keywords: docs
diff --git a/lisp/info.el b/lisp/info.el
index 912e31f62ad..fa1e3060c10 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1,7 +1,7 @@
;;; info.el --- info package for Emacs
;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: help
@@ -2775,11 +2775,11 @@ If FILE is nil, check the current Info file."
;;;###autoload
(defun Info-index (topic)
- "Look up a string TOPIC in the index for this file.
+ "Look up a string TOPIC in the index for this manual and go to that entry.
If there are no exact matches to the specified topic, this chooses
the first match which is a case-insensitive substring of a topic.
Use the \\<Info-mode-map>\\[Info-index-next] command to see the other matches.
-Give a blank topic name to go to the Index node itself."
+Give an empty topic name to go to the Index node itself."
(interactive
(list
(let ((Info-complete-menu-buffer (clone-buffer))
@@ -3352,7 +3352,7 @@ Advanced commands:
\\[Info-search-case-sensitively] Search through this Info file for specified regexp case-sensitively.
\\[Info-search-next] Search for another occurrence of regexp
from a previous \\<Info-mode-map>\\[Info-search] command.
-\\[Info-index] Look up a topic in this file's Index and move to that node.
+\\[Info-index] Look up a topic in this manual's Index and move to that index entry.
\\[Info-index-next] (comma) Move to the next match from a previous \\<Info-mode-map>\\[Info-index] command.
\\[info-apropos] Look for a string in the indices of all manuals.
\\[Info-goto-node] Move to node specified by name.
diff --git a/lisp/informat.el b/lisp/informat.el
index c9198d93191..96dc0180418 100644
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -1,6 +1,7 @@
;;; informat.el --- info support functions package for Emacs
-;; Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: help
diff --git a/lisp/isearch.el b/lisp/isearch.el
index ce104f74b11..c97f5062c61 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1,7 +1,7 @@
;;; isearch.el --- incremental search minor mode
;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000,
-;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
;; Maintainer: FSF
diff --git a/lisp/isearchb.el b/lisp/isearchb.el
index 0e7a20a57ec..56797bd0fb1 100644
--- a/lisp/isearchb.el
+++ b/lisp/isearchb.el
@@ -1,6 +1,6 @@
;;; isearchb --- a marriage between iswitchb and isearch
-;; Copyright (C) 2004, 2005 John Wiegley
+;; Copyright (C) 2004, 2005, 2006 John Wiegley
;; Author: John Wiegley <johnw@gnu.org>
;; Created: 16 Apr 2004
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index 3fd03cf5d0a..d7d82ae5551 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -1,7 +1,7 @@
;;; iswitchb.el --- switch between buffers using substrings
;; Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Stephen Eglen <stephen@gnu.org>
;; Maintainer: Stephen Eglen <stephen@gnu.org>
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 16db1e25a9a..09870310584 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -1,7 +1,7 @@
;;; jit-lock.el --- just-in-time fontification
;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Gerd Moellmann <gerd@gnu.org>
;; Keywords: faces files
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index d5305211f50..3de3b7daccc 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -1,7 +1,7 @@
;;; jka-cmpr-hook.el --- preloaded code to enable jka-compr.el
;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: jka@ece.cmu.edu (Jay K. Adams)
;; Maintainer: FSF
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index c15cfbdea30..389944fa3e2 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -1,7 +1,7 @@
;;; jka-compr.el --- reading/writing/loading compressed files
;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: jka@ece.cmu.edu (Jay K. Adams)
;; Maintainer: FSF
diff --git a/lisp/kermit.el b/lisp/kermit.el
index 73cac8f3bc8..e1bec988ccd 100644
--- a/lisp/kermit.el
+++ b/lisp/kermit.el
@@ -1,6 +1,7 @@
;;; kermit.el --- additions to shell mode for use with kermit
-;; Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Jeff Norden <jeff@colgate.csnet>
;; Maintainer: FSF
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index 6bb1ab6f58d..4566d4c32c3 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -1,6 +1,6 @@
;;; kmacro.el --- enhanced keyboard macros
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Kim F. Storm <storm@cua.dk>
;; Keywords: keyboard convenience
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 77fe9837142..413a24559fb 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -64,7 +64,7 @@ should return a grid vector array that is the new solution.
;;;***
;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el"
-;;;;;; (17205 6157))
+;;;;;; (17276 44726))
;;; Generated autoloads from progmodes/ada-mode.el
(autoload (quote ada-add-extensions) "ada-mode" "\
@@ -151,7 +151,7 @@ Completion is available.
;;;;;; change-log-mode add-change-log-entry-other-window add-change-log-entry
;;;;;; find-change-log prompt-for-change-log-name add-log-mailing-address
;;;;;; add-log-full-name add-log-current-defun-function) "add-log"
-;;;;;; "add-log.el" (17244 43726))
+;;;;;; "add-log.el" (17352 9346))
;;; Generated autoloads from add-log.el
(defvar add-log-current-defun-function nil "\
@@ -289,7 +289,7 @@ Fix any old-style date entries in the current log file to default format.
;;;### (autoloads (defadvice ad-add-advice ad-default-compilation-action
;;;;;; ad-redefinition-action) "advice" "emacs-lisp/advice.el" (17245
-;;;;;; 4869))
+;;;;;; 16459))
;;; Generated autoloads from emacs-lisp/advice.el
(defvar ad-redefinition-action (quote warn) "\
@@ -388,7 +388,7 @@ See Info node `(elisp)Advising Functions' for comprehensive documentation.
;;;### (autoloads (align-newline-and-indent align-unhighlight-rule
;;;;;; align-highlight-rule align-current align-entire align-regexp
-;;;;;; align) "align" "align.el" (17148 24935))
+;;;;;; align) "align" "align.el" (17320 4537))
;;; Generated autoloads from align.el
(autoload (quote align) "align" "\
@@ -478,7 +478,7 @@ A replacement function for `newline-and-indent', aligning as it goes.
;;;***
;;;### (autoloads (outlineify-sticky allout-mode) "allout" "allout.el"
-;;;;;; (17243 21661))
+;;;;;; (17296 51181))
;;; Generated autoloads from allout.el
(autoload (quote allout-mode) "allout" "\
@@ -581,7 +581,7 @@ to enable reliable topic privacy while preventing accidents like neglected
encryption, encryption with a mistaken passphrase, forgetting which
passphrase was used, and other practical pitfalls.
-See the `allout-toggle-current-subtree-encryption' function and
+See `allout-toggle-current-subtree-encryption' function docstring and
`allout-encrypt-unencrypted-on-saves' customization variable for details.
HOT-SPOT Operation
@@ -809,7 +809,7 @@ Used in `antlr-mode'. Also a useful function in `java-mode-hook'.
;;;### (autoloads (appt-activate appt-make-list appt-delete appt-add
;;;;;; appt-display-diary appt-display-duration appt-display-mode-line
;;;;;; appt-msg-window appt-visible appt-audible appt-message-warning-time
-;;;;;; appt-issue-message) "appt" "calendar/appt.el" (17239 32265))
+;;;;;; appt-issue-message) "appt" "calendar/appt.el" (17307 14150))
;;; Generated autoloads from calendar/appt.el
(defvar appt-issue-message t "\
@@ -896,28 +896,51 @@ ARG is positive, otherwise off.
;;;***
;;;### (autoloads (apropos-documentation apropos-value apropos apropos-documentation-property
-;;;;;; apropos-command apropos-variable) "apropos" "apropos.el"
-;;;;;; (17205 5977))
+;;;;;; apropos-command apropos-variable apropos-read-pattern) "apropos"
+;;;;;; "apropos.el" (17328 26188))
;;; Generated autoloads from apropos.el
+(autoload (quote apropos-read-pattern) "apropos" "\
+Read an apropos pattern, either a word list or a regexp.
+Returns the user pattern, either a list of words which are matched
+literally, or a string which is used as a regexp to search for.
+
+SUBJECT is a string that is included in the prompt to identify what
+kind of objects to search.
+
+\(fn SUBJECT)" nil nil)
+
(autoload (quote apropos-variable) "apropos" "\
-Show user variables that match REGEXP.
-With optional prefix DO-ALL or if `apropos-do-all' is non-nil, also show
+Show user variables that match PATTERN.
+PATTERN can be a word, a list of words (separated by spaces),
+or a regexp (using some regexp special characters). If it is a word,
+search for matches for that word as a substring. If it is a list of words,
+search for matches for any two (or more) of those words.
+
+With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also show
normal variables.
-\(fn REGEXP &optional DO-ALL)" t nil)
+\(fn PATTERN &optional DO-ALL)" t nil)
(defalias (quote command-apropos) (quote apropos-command))
(autoload (quote apropos-command) "apropos" "\
-Show commands (interactively callable functions) that match APROPOS-REGEXP.
-With optional prefix DO-ALL, or if `apropos-do-all' is non-nil, also show
+Show commands (interactively callable functions) that match PATTERN.
+PATTERN can be a word, a list of words (separated by spaces),
+or a regexp (using some regexp special characters). If it is a word,
+search for matches for that word as a substring. If it is a list of words,
+search for matches for any two (or more) of those words.
+
+With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also show
noninteractive functions.
If VAR-PREDICATE is non-nil, show only variables, and only those that
satisfy the predicate VAR-PREDICATE.
-\(fn APROPOS-REGEXP &optional DO-ALL VAR-PREDICATE)" t nil)
+When called from a Lisp program, a string PATTERN is used as a regexp,
+while a list of strings is used as a word list.
+
+\(fn PATTERN &optional DO-ALL VAR-PREDICATE)" t nil)
(autoload (quote apropos-documentation-property) "apropos" "\
Like (documentation-property SYMBOL PROPERTY RAW) but handle errors.
@@ -925,34 +948,53 @@ Like (documentation-property SYMBOL PROPERTY RAW) but handle errors.
\(fn SYMBOL PROPERTY RAW)" nil nil)
(autoload (quote apropos) "apropos" "\
-Show all bound symbols whose names match APROPOS-REGEXP.
-With optional prefix DO-ALL or if `apropos-do-all' is non-nil, also
-show unbound symbols and key bindings, which is a little more
-time-consuming. Returns list of symbols and documentation found.
+Show all meaningful Lisp symbols whose names match PATTERN.
+Symbols are shown if they are defined as functions, variables, or
+faces, or if they have nonempty property lists.
+
+PATTERN can be a word, a list of words (separated by spaces),
+or a regexp (using some regexp special characters). If it is a word,
+search for matches for that word as a substring. If it is a list of words,
+search for matches for any two (or more) of those words.
+
+With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil,
+consider all symbols (if they match PATTERN).
-\(fn APROPOS-REGEXP &optional DO-ALL)" t nil)
+Returns list of symbols and documentation found.
+
+\(fn PATTERN &optional DO-ALL)" t nil)
(autoload (quote apropos-value) "apropos" "\
-Show all symbols whose value's printed image matches APROPOS-REGEXP.
-With optional prefix DO-ALL or if `apropos-do-all' is non-nil, also looks
+Show all symbols whose value's printed representation matches PATTERN.
+PATTERN can be a word, a list of words (separated by spaces),
+or a regexp (using some regexp special characters). If it is a word,
+search for matches for that word as a substring. If it is a list of words,
+search for matches for any two (or more) of those words.
+
+With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also looks
at the function and at the names and values of properties.
Returns list of symbols and values found.
-\(fn APROPOS-REGEXP &optional DO-ALL)" t nil)
+\(fn PATTERN &optional DO-ALL)" t nil)
(autoload (quote apropos-documentation) "apropos" "\
-Show symbols whose documentation contain matches for APROPOS-REGEXP.
-With optional prefix DO-ALL or if `apropos-do-all' is non-nil, also use
+Show symbols whose documentation contains matches for PATTERN.
+PATTERN can be a word, a list of words (separated by spaces),
+or a regexp (using some regexp special characters). If it is a word,
+search for matches for that word as a substring. If it is a list of words,
+search for matches for any two (or more) of those words.
+
+With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also use
documentation that is not stored in the documentation file and show key
bindings.
Returns list of symbols and documentation found.
-\(fn APROPOS-REGEXP &optional DO-ALL)" t nil)
+\(fn PATTERN &optional DO-ALL)" t nil)
;;;***
-;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17239
-;;;;;; 32182))
+;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17379
+;;;;;; 25495))
;;; Generated autoloads from arc-mode.el
(autoload (quote archive-mode) "arc-mode" "\
@@ -972,7 +1014,7 @@ archive.
;;;***
-;;;### (autoloads (array-mode) "array" "array.el" (17148 24939))
+;;;### (autoloads (array-mode) "array" "array.el" (17358 48216))
;;; Generated autoloads from array.el
(autoload (quote array-mode) "array" "\
@@ -1249,8 +1291,8 @@ Keymap summary
;;;***
-;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (17140
-;;;;;; 20953))
+;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (17349
+;;;;;; 14590))
;;; Generated autoloads from progmodes/asm-mode.el
(autoload (quote asm-mode) "asm-mode" "\
@@ -1402,7 +1444,7 @@ insert a template for the file depending on the mode of the buffer.
;;;### (autoloads (batch-update-autoloads update-directory-autoloads
;;;;;; update-file-autoloads) "autoload" "emacs-lisp/autoload.el"
-;;;;;; (17239 32274))
+;;;;;; (17298 27296))
;;; Generated autoloads from emacs-lisp/autoload.el
(autoload (quote update-file-autoloads) "autoload" "\
@@ -1573,7 +1615,7 @@ Vectors work just like lists. Nested backquotes are permitted.
;;;***
;;;### (autoloads (display-battery-mode battery) "battery" "battery.el"
-;;;;;; (17148 24941))
+;;;;;; (17359 55783))
;;; Generated autoloads from battery.el
(put 'battery-mode-line-string 'risky-local-variable t)
@@ -1638,8 +1680,8 @@ non-interactive use see also `benchmark-run' and
;;;***
-;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17239
-;;;;;; 32408))
+;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17359
+;;;;;; 55795))
;;; Generated autoloads from textmodes/bibtex.el
(autoload (quote bibtex-mode) "bibtex" "\
@@ -1725,7 +1767,7 @@ Binhex decode region between START and END.
;;;***
;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (17246
-;;;;;; 24773))
+;;;;;; 40260))
;;; Generated autoloads from play/blackbox.el
(autoload (quote blackbox) "blackbox" "\
@@ -1847,7 +1889,7 @@ a reflection.
;;;### (autoloads (bookmark-bmenu-list bookmark-load bookmark-save
;;;;;; bookmark-write bookmark-delete bookmark-insert bookmark-rename
;;;;;; bookmark-insert-location bookmark-relocate bookmark-jump
-;;;;;; bookmark-set) "bookmark" "bookmark.el" (17239 32184))
+;;;;;; bookmark-set) "bookmark" "bookmark.el" (17270 26061))
;;; Generated autoloads from bookmark.el
(define-key ctl-x-map "rb" 'bookmark-jump)
(define-key ctl-x-map "rm" 'bookmark-set)
@@ -2037,7 +2079,7 @@ deletion, or > if it is flagged for displaying.
;;;;;; browse-url browse-url-of-region browse-url-of-dired-file
;;;;;; browse-url-of-buffer browse-url-of-file browse-url-url-at-point
;;;;;; browse-url-galeon-program browse-url-firefox-program browse-url-browser-function)
-;;;;;; "browse-url" "net/browse-url.el" (17246 15074))
+;;;;;; "browse-url" "net/browse-url.el" (17279 31149))
;;; Generated autoloads from net/browse-url.el
(defvar browse-url-browser-function (cond ((memq system-type (quote (windows-nt ms-dos cygwin))) (quote browse-url-default-windows-browser)) ((memq system-type (quote (darwin))) (quote browse-url-default-macosx-browser)) (t (quote browse-url-default-browser))) "\
@@ -2385,7 +2427,7 @@ Return a vector containing the lines from `bruce-phrases-file'.
;;;***
;;;### (autoloads (bs-show bs-customize bs-cycle-previous bs-cycle-next)
-;;;;;; "bs" "bs.el" (17185 27401))
+;;;;;; "bs" "bs.el" (17375 39071))
;;; Generated autoloads from bs.el
(autoload (quote bs-cycle-next) "bs" "\
@@ -2426,14 +2468,14 @@ name of buffer configuration.
;;;***
;;;### (autoloads (insert-text-button make-text-button insert-button
-;;;;;; make-button define-button-type) "button" "button.el" (17148
-;;;;;; 24943))
+;;;;;; make-button define-button-type) "button" "button.el" (17328
+;;;;;; 38637))
;;; Generated autoloads from button.el
(defvar button-map (let ((map (make-sparse-keymap))) (define-key map " " (quote push-button)) (define-key map [mouse-2] (quote push-button)) map) "\
Keymap used by buttons.")
-(defvar button-buffer-map (let ((map (make-sparse-keymap))) (define-key map [9] (quote forward-button)) (define-key map [backtab] (quote backward-button)) map) "\
+(defvar button-buffer-map (let ((map (make-sparse-keymap))) (define-key map [9] (quote forward-button)) (define-key map " " (quote backward-button)) (define-key map [backtab] (quote backward-button)) map) "\
Keymap useful for buffers containing buttons.
Mode-specific keymaps may want to use this as their parent keymap.")
@@ -2515,7 +2557,7 @@ Also see `make-text-button'.
;;;;;; batch-byte-compile-if-not-done display-call-tree byte-compile
;;;;;; compile-defun byte-compile-file byte-recompile-directory
;;;;;; byte-force-recompile) "bytecomp" "emacs-lisp/bytecomp.el"
-;;;;;; (17243 21661))
+;;;;;; (17351 57359))
;;; Generated autoloads from emacs-lisp/bytecomp.el
(autoload (quote byte-force-recompile) "bytecomp" "\
@@ -2603,11 +2645,15 @@ Run `byte-recompile-directory' on the dirs remaining on the command line.
Must be used only with `-batch', and kills Emacs on completion.
For example, invoke `emacs -batch -f batch-byte-recompile-directory .'.
+Optional argument ARG is passed as second argument ARG to
+`batch-recompile-directory'; see there for its possible values
+and corresponding effects.
+
\(fn &optional ARG)" nil nil)
;;;***
-;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17102 18464))
+;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17307 14150))
;;; Generated autoloads from calendar/cal-dst.el
(put (quote calendar-daylight-savings-starts) (quote risky-local-variable) t)
@@ -2617,7 +2663,7 @@ For example, invoke `emacs -batch -f batch-byte-recompile-directory .'.
;;;***
;;;### (autoloads (list-yahrzeit-dates) "cal-hebrew" "calendar/cal-hebrew.el"
-;;;;;; (17167 2790))
+;;;;;; (17307 14150))
;;; Generated autoloads from calendar/cal-hebrew.el
(autoload (quote list-yahrzeit-dates) "cal-hebrew" "\
@@ -2632,14 +2678,14 @@ from the cursor position.
;;;### (autoloads (defmath calc-embedded-activate calc-embedded calc-grab-rectangle
;;;;;; calc-grab-region full-calc-keypad calc-keypad calc-eval quick-calc
;;;;;; full-calc calc calc-dispatch calc-settings-file) "calc" "calc/calc.el"
-;;;;;; (17239 32263))
+;;;;;; (17291 34530))
;;; Generated autoloads from calc/calc.el
(defvar calc-settings-file (convert-standard-filename "~/.calc.el") "\
*File in which to record permanent settings.")
(custom-autoload (quote calc-settings-file) "calc")
- (global-set-key "\e#" 'calc-dispatch)
+ (define-key ctl-x-map "*" 'calc-dispatch)
(autoload (quote calc-dispatch) "calc" "\
Invoke the GNU Emacs Calculator. See `calc-dispatch-help' for details.
@@ -2739,11 +2785,11 @@ See the documentation for `calculator-mode' for more information.
;;;;;; mark-holidays-in-calendar view-calendar-holidays-initially
;;;;;; calendar-remove-frame-by-deleting mark-diary-entries-in-calendar
;;;;;; view-diary-entries-initially calendar-offset) "calendar"
-;;;;;; "calendar/calendar.el" (17239 32268))
+;;;;;; "calendar/calendar.el" (17366 25839))
;;; Generated autoloads from calendar/calendar.el
(defvar calendar-offset 0 "\
-*The offset of the principal month from the center of the calendar window.
+The offset of the principal month from the center of the calendar window.
0 means the principal month is in the center (default), -1 means on the left,
+1 means on the right. Larger (or smaller) values push the principal month off
the screen.")
@@ -2751,7 +2797,7 @@ the screen.")
(custom-autoload (quote calendar-offset) "calendar")
(defvar view-diary-entries-initially nil "\
-*Non-nil means display current date's diary entries on entry to calendar.
+Non-nil means display current date's diary entries on entry to calendar.
The diary is displayed in another window when the calendar is first displayed,
if the current date is visible. The number of days of diary entries displayed
is governed by the variable `number-of-diary-entries'. This variable can
@@ -2760,32 +2806,32 @@ be overridden by the value of `calendar-setup'.")
(custom-autoload (quote view-diary-entries-initially) "calendar")
(defvar mark-diary-entries-in-calendar nil "\
-*Non-nil means mark dates with diary entries, in the calendar window.
+Non-nil means mark dates with diary entries, in the calendar window.
The marking symbol is specified by the variable `diary-entry-marker'.")
(custom-autoload (quote mark-diary-entries-in-calendar) "calendar")
(defvar calendar-remove-frame-by-deleting nil "\
-*Determine how the calendar mode removes a frame no longer needed.
+Determine how the calendar mode removes a frame no longer needed.
If nil, make an icon of the frame. If non-nil, delete the frame.")
(custom-autoload (quote calendar-remove-frame-by-deleting) "calendar")
(defvar view-calendar-holidays-initially nil "\
-*Non-nil means display holidays for current three month period on entry.
+Non-nil means display holidays for current three month period on entry.
The holidays are displayed in another window when the calendar is first
displayed.")
(custom-autoload (quote view-calendar-holidays-initially) "calendar")
(defvar mark-holidays-in-calendar nil "\
-*Non-nil means mark dates of holidays in the calendar window.
+Non-nil means mark dates of holidays in the calendar window.
The marking symbol is specified by the variable `calendar-holiday-marker'.")
(custom-autoload (quote mark-holidays-in-calendar) "calendar")
(defvar all-hebrew-calendar-holidays nil "\
-*If nil, show only major holidays from the Hebrew calendar.
+If nil, show only major holidays from the Hebrew calendar.
This means only those Jewish holidays that appear on secular calendars.
If t, show all the holidays that would appear in a complete Hebrew calendar.")
@@ -2793,7 +2839,7 @@ If t, show all the holidays that would appear in a complete Hebrew calendar.")
(custom-autoload (quote all-hebrew-calendar-holidays) "calendar")
(defvar all-christian-calendar-holidays nil "\
-*If nil, show only major holidays from the Christian calendar.
+If nil, show only major holidays from the Christian calendar.
This means only those Christian holidays that appear on secular calendars.
If t, show all the holidays that would appear in a complete Christian
@@ -2802,7 +2848,7 @@ calendar.")
(custom-autoload (quote all-christian-calendar-holidays) "calendar")
(defvar all-islamic-calendar-holidays nil "\
-*If nil, show only major holidays from the Islamic calendar.
+If nil, show only major holidays from the Islamic calendar.
This means only those Islamic holidays that appear on secular calendars.
If t, show all the holidays that would appear in a complete Islamic
@@ -2811,7 +2857,7 @@ calendar.")
(custom-autoload (quote all-islamic-calendar-holidays) "calendar")
(defvar all-bahai-calendar-holidays nil "\
-*If nil, show only major holidays from the Baha'i calendar.
+If nil, show only major holidays from the Baha'i calendar.
These are the days on which work and school must be suspended.
If t, show all the holidays that would appear in a complete Baha'i
@@ -2820,13 +2866,13 @@ calendar.")
(custom-autoload (quote all-bahai-calendar-holidays) "calendar")
(defvar calendar-load-hook nil "\
-*List of functions to be called after the calendar is first loaded.
+List of functions to be called after the calendar is first loaded.
This is the place to add key bindings to `calendar-mode-map'.")
(custom-autoload (quote calendar-load-hook) "calendar")
(defvar initial-calendar-window-hook nil "\
-*List of functions to be called when the calendar window is first opened.
+List of functions to be called when the calendar window is first opened.
The functions invoked are called after the calendar window is opened, but
once opened is never called again. Leaving the calendar with the `q' command
and reentering it will cause these functions to be called again.")
@@ -2834,7 +2880,7 @@ and reentering it will cause these functions to be called again.")
(custom-autoload (quote initial-calendar-window-hook) "calendar")
(defvar today-visible-calendar-hook nil "\
-*List of functions called whenever the current date is visible.
+List of functions called whenever the current date is visible.
This can be used, for example, to replace today's date with asterisks; a
function `calendar-star-date' is included for this purpose:
(setq today-visible-calendar-hook 'calendar-star-date)
@@ -2853,7 +2899,7 @@ functions that move by days and weeks.")
(custom-autoload (quote today-visible-calendar-hook) "calendar")
(defvar today-invisible-calendar-hook nil "\
-*List of functions called whenever the current date is not visible.
+List of functions called whenever the current date is not visible.
The corresponding variable `today-visible-calendar-hook' is the list of
functions called when the calendar function was called when the current
@@ -2866,7 +2912,7 @@ functions that move by days and weeks.")
(custom-autoload (quote today-invisible-calendar-hook) "calendar")
(defvar calendar-move-hook nil "\
-*List of functions called whenever the cursor moves in the calendar.
+List of functions called whenever the cursor moves in the calendar.
For example,
@@ -2877,7 +2923,7 @@ redisplays the diary for whatever date the cursor is moved to.")
(custom-autoload (quote calendar-move-hook) "calendar")
(defvar diary-file "~/diary" "\
-*Name of the file in which one's personal diary of dates is kept.
+Name of the file in which one's personal diary of dates is kept.
The file's entries are lines beginning with any of the forms
specified by the variable `american-date-diary-pattern', by default:
@@ -2984,39 +3030,39 @@ details, see the documentation for the variable `list-diary-entries-hook'.")
(custom-autoload (quote diary-file) "calendar")
(defvar diary-nonmarking-symbol "&" "\
-*Symbol indicating that a diary entry is not to be marked in the calendar.")
+Symbol indicating that a diary entry is not to be marked in the calendar.")
(custom-autoload (quote diary-nonmarking-symbol) "calendar")
(defvar hebrew-diary-entry-symbol "H" "\
-*Symbol indicating a diary entry according to the Hebrew calendar.")
+Symbol indicating a diary entry according to the Hebrew calendar.")
(custom-autoload (quote hebrew-diary-entry-symbol) "calendar")
(defvar islamic-diary-entry-symbol "I" "\
-*Symbol indicating a diary entry according to the Islamic calendar.")
+Symbol indicating a diary entry according to the Islamic calendar.")
(custom-autoload (quote islamic-diary-entry-symbol) "calendar")
(defvar bahai-diary-entry-symbol "B" "\
-*Symbol indicating a diary entry according to the Baha'i calendar.")
+Symbol indicating a diary entry according to the Baha'i calendar.")
(custom-autoload (quote bahai-diary-entry-symbol) "calendar")
(defvar diary-include-string "#include" "\
-*The string indicating inclusion of another file of diary entries.
+The string indicating inclusion of another file of diary entries.
See the documentation for the function `include-other-diary-files'.")
(custom-autoload (quote diary-include-string) "calendar")
(defvar sexp-diary-entry-symbol "%%" "\
-*The string used to indicate a sexp diary entry in `diary-file'.
+The string used to indicate a sexp diary entry in `diary-file'.
See the documentation for the function `list-sexp-diary-entries'.")
(custom-autoload (quote sexp-diary-entry-symbol) "calendar")
(defvar abbreviated-calendar-year t "\
-*Interpret a two-digit year DD in a diary entry as either 19DD or 20DD.
+Interpret a two-digit year DD in a diary entry as either 19DD or 20DD.
For the Gregorian calendar; similarly for the Hebrew, Islamic and
Baha'i calendars. If this variable is nil, years must be written in
full.")
@@ -3024,7 +3070,7 @@ full.")
(custom-autoload (quote abbreviated-calendar-year) "calendar")
(defvar european-calendar-style nil "\
-*Use the European style of dates in the diary and in any displays.
+Use the European style of dates in the diary and in any displays.
If this variable is t, a date 1/2/1990 would be interpreted as February 1,
1990. The default European date styles (see `european-date-diary-pattern')
are
@@ -3045,31 +3091,31 @@ are loaded. Otherwise, use one of the functions `european-calendar' or
(custom-autoload (quote european-calendar-style) "calendar")
(defvar american-date-diary-pattern (quote ((month "/" day "[^/0-9]") (month "/" day "/" year "[^0-9]") (monthname " *" day "[^,0-9]") (monthname " *" day ", *" year "[^0-9]") (dayname "\\W"))) "\
-*List of pseudo-patterns describing the American patterns of date used.
+List of pseudo-patterns describing the American patterns of date used.
See the documentation of `diary-date-forms' for an explanation.")
(custom-autoload (quote american-date-diary-pattern) "calendar")
(defvar european-date-diary-pattern (quote ((day "/" month "[^/0-9]") (day "/" month "/" year "[^0-9]") (backup day " *" monthname "\\W+\\<\\([^*0-9]\\|\\([0-9]+[:aApP]\\)\\)") (day " *" monthname " *" year "[^0-9]") (dayname "\\W"))) "\
-*List of pseudo-patterns describing the European patterns of date used.
+List of pseudo-patterns describing the European patterns of date used.
See the documentation of `diary-date-forms' for an explanation.")
(custom-autoload (quote european-date-diary-pattern) "calendar")
(defvar european-calendar-display-form (quote ((if dayname (concat dayname ", ")) day " " monthname " " year)) "\
-*Pseudo-pattern governing the way a date appears in the European style.
+Pseudo-pattern governing the way a date appears in the European style.
See the documentation of `calendar-date-display-form' for an explanation.")
(custom-autoload (quote european-calendar-display-form) "calendar")
(defvar american-calendar-display-form (quote ((if dayname (concat dayname ", ")) monthname " " day ", " year)) "\
-*Pseudo-pattern governing the way a date appears in the American style.
+Pseudo-pattern governing the way a date appears in the American style.
See the documentation of `calendar-date-display-form' for an explanation.")
(custom-autoload (quote american-calendar-display-form) "calendar")
(defvar print-diary-entries-hook (quote lpr-buffer) "\
-*List of functions called after a temporary diary buffer is prepared.
+List of functions called after a temporary diary buffer is prepared.
The buffer shows only the diary entries currently visible in the diary
buffer. The default just does the printing. Other uses might include, for
example, rearranging the lines into order by day and time, saving the buffer
@@ -3078,7 +3124,7 @@ instead of deleting it, or changing the function used to do the printing.")
(custom-autoload (quote print-diary-entries-hook) "calendar")
(defvar list-diary-entries-hook nil "\
-*List of functions called after diary file is culled for relevant entries.
+List of functions called after diary file is culled for relevant entries.
It is to be used for diary entries that are not found in the diary file.
A function `include-other-diary-files' is provided for use as the value of
@@ -3107,13 +3153,13 @@ lexicographic order.")
(custom-autoload (quote list-diary-entries-hook) "calendar")
(defvar diary-hook nil "\
-*List of functions called after the display of the diary.
+List of functions called after the display of the diary.
Can be used for appointment notification.")
(custom-autoload (quote diary-hook) "calendar")
(defvar diary-display-hook nil "\
-*List of functions that handle the display of the diary.
+List of functions that handle the display of the diary.
If nil (the default), `simple-diary-display' is used. Use `ignore' for no
diary display.
@@ -3137,7 +3183,7 @@ diary buffer, set the variable `diary-list-include-blanks' to t.")
(custom-autoload (quote diary-display-hook) "calendar")
(defvar nongregorian-diary-listing-hook nil "\
-*List of functions called for listing diary file and included files.
+List of functions called for listing diary file and included files.
As the files are processed for diary entries, these functions are used
to cull relevant entries. You can use either or both of
`list-hebrew-diary-entries', `list-islamic-diary-entries' and
@@ -3147,7 +3193,7 @@ describes the style of such diary entries.")
(custom-autoload (quote nongregorian-diary-listing-hook) "calendar")
(defvar mark-diary-entries-hook nil "\
-*List of functions called after marking diary entries in the calendar.
+List of functions called after marking diary entries in the calendar.
A function `mark-included-diary-files' is also provided for use as the
`mark-diary-entries-hook'; it enables you to use shared diary files together
@@ -3163,7 +3209,7 @@ function `include-other-diary-files' as part of `list-diary-entries-hook'.")
(custom-autoload (quote mark-diary-entries-hook) "calendar")
(defvar nongregorian-diary-marking-hook nil "\
-*List of functions called for marking diary file and included files.
+List of functions called for marking diary file and included files.
As the files are processed for diary entries, these functions are used
to cull relevant entries. You can use either or both of
`mark-hebrew-diary-entries', `mark-islamic-diary-entries' and
@@ -3173,14 +3219,14 @@ describes the style of such diary entries.")
(custom-autoload (quote nongregorian-diary-marking-hook) "calendar")
(defvar diary-list-include-blanks nil "\
-*If nil, do not include days with no diary entry in the list of diary entries.
+If nil, do not include days with no diary entry in the list of diary entries.
Such days will then not be shown in the fancy diary buffer, even if they
are holidays.")
(custom-autoload (quote diary-list-include-blanks) "calendar")
(defvar holidays-in-diary-buffer t "\
-*Non-nil means include holidays in the diary display.
+Non-nil means include holidays in the diary display.
The holidays appear in the mode line of the diary buffer, or in the
fancy diary buffer next to the date. This slows down the diary functions
somewhat; setting it to nil makes the diary display faster.")
@@ -3190,7 +3236,7 @@ somewhat; setting it to nil makes the diary display faster.")
(put (quote general-holidays) (quote risky-local-variable) t)
(defvar general-holidays (quote ((holiday-fixed 1 1 "New Year's Day") (holiday-float 1 1 3 "Martin Luther King Day") (holiday-fixed 2 2 "Groundhog Day") (holiday-fixed 2 14 "Valentine's Day") (holiday-float 2 1 3 "President's Day") (holiday-fixed 3 17 "St. Patrick's Day") (holiday-fixed 4 1 "April Fools' Day") (holiday-float 5 0 2 "Mother's Day") (holiday-float 5 1 -1 "Memorial Day") (holiday-fixed 6 14 "Flag Day") (holiday-float 6 0 3 "Father's Day") (holiday-fixed 7 4 "Independence Day") (holiday-float 9 1 1 "Labor Day") (holiday-float 10 1 2 "Columbus Day") (holiday-fixed 10 31 "Halloween") (holiday-fixed 11 11 "Veteran's Day") (holiday-float 11 4 4 "Thanksgiving"))) "\
-*General holidays. Default value is for the United States.
+General holidays. Default value is for the United States.
See the documentation for `calendar-holidays' for details.")
(custom-autoload (quote general-holidays) "calendar")
@@ -3198,7 +3244,7 @@ See the documentation for `calendar-holidays' for details.")
(put (quote oriental-holidays) (quote risky-local-variable) t)
(defvar oriental-holidays (quote ((if (fboundp (quote atan)) (holiday-chinese-new-year)))) "\
-*Oriental holidays.
+Oriental holidays.
See the documentation for `calendar-holidays' for details.")
(custom-autoload (quote oriental-holidays) "calendar")
@@ -3206,7 +3252,7 @@ See the documentation for `calendar-holidays' for details.")
(put (quote local-holidays) (quote risky-local-variable) t)
(defvar local-holidays nil "\
-*Local holidays.
+Local holidays.
See the documentation for `calendar-holidays' for details.")
(custom-autoload (quote local-holidays) "calendar")
@@ -3214,7 +3260,7 @@ See the documentation for `calendar-holidays' for details.")
(put (quote other-holidays) (quote risky-local-variable) t)
(defvar other-holidays nil "\
-*User defined holidays.
+User defined holidays.
See the documentation for `calendar-holidays' for details.")
(custom-autoload (quote other-holidays) "calendar")
@@ -3238,7 +3284,7 @@ See the documentation for `calendar-holidays' for details.")
(put (quote hebrew-holidays) (quote risky-local-variable) t)
(defvar hebrew-holidays (append hebrew-holidays-1 hebrew-holidays-2 hebrew-holidays-3 hebrew-holidays-4) "\
-*Jewish holidays.
+Jewish holidays.
See the documentation for `calendar-holidays' for details.")
(custom-autoload (quote hebrew-holidays) "calendar")
@@ -3246,7 +3292,7 @@ See the documentation for `calendar-holidays' for details.")
(put (quote christian-holidays) (quote risky-local-variable) t)
(defvar christian-holidays (quote ((if all-christian-calendar-holidays (holiday-fixed 1 6 "Epiphany")) (holiday-easter-etc 0 "Easter Sunday") (holiday-easter-etc -2 "Good Friday") (holiday-easter-etc -46 "Ash Wednesday") (if all-christian-calendar-holidays (holiday-easter-etc -63 "Septuagesima Sunday")) (if all-christian-calendar-holidays (holiday-easter-etc -56 "Sexagesima Sunday")) (if all-christian-calendar-holidays (holiday-easter-etc -49 "Shrove Sunday")) (if all-christian-calendar-holidays (holiday-easter-etc -48 "Shrove Monday")) (if all-christian-calendar-holidays (holiday-easter-etc -47 "Shrove Tuesday")) (if all-christian-calendar-holidays (holiday-easter-etc -14 "Passion Sunday")) (if all-christian-calendar-holidays (holiday-easter-etc -7 "Palm Sunday")) (if all-christian-calendar-holidays (holiday-easter-etc -3 "Maundy Thursday")) (if all-christian-calendar-holidays (holiday-easter-etc 35 "Rogation Sunday")) (if all-christian-calendar-holidays (holiday-easter-etc 39 "Ascension Day")) (if all-christian-calendar-holidays (holiday-easter-etc 49 "Pentecost (Whitsunday)")) (if all-christian-calendar-holidays (holiday-easter-etc 50 "Whitmonday")) (if all-christian-calendar-holidays (holiday-easter-etc 56 "Trinity Sunday")) (if all-christian-calendar-holidays (holiday-easter-etc 60 "Corpus Christi")) (if all-christian-calendar-holidays (holiday-greek-orthodox-easter)) (if all-christian-calendar-holidays (holiday-fixed 8 15 "Assumption")) (if all-christian-calendar-holidays (holiday-advent 0 "Advent")) (holiday-fixed 12 25 "Christmas") (if all-christian-calendar-holidays (holiday-julian 12 25 "Eastern Orthodox Christmas")))) "\
-*Christian holidays.
+Christian holidays.
See the documentation for `calendar-holidays' for details.")
(custom-autoload (quote christian-holidays) "calendar")
@@ -3254,7 +3300,7 @@ See the documentation for `calendar-holidays' for details.")
(put (quote islamic-holidays) (quote risky-local-variable) t)
(defvar islamic-holidays (quote ((holiday-islamic 1 1 (format "Islamic New Year %d" (let ((m displayed-month) (y displayed-year)) (increment-calendar-month m y 1) (extract-calendar-year (calendar-islamic-from-absolute (calendar-absolute-from-gregorian (list m (calendar-last-day-of-month m y) y))))))) (if all-islamic-calendar-holidays (holiday-islamic 1 10 "Ashura")) (if all-islamic-calendar-holidays (holiday-islamic 3 12 "Mulad-al-Nabi")) (if all-islamic-calendar-holidays (holiday-islamic 7 26 "Shab-e-Mi'raj")) (if all-islamic-calendar-holidays (holiday-islamic 8 15 "Shab-e-Bara't")) (holiday-islamic 9 1 "Ramadan Begins") (if all-islamic-calendar-holidays (holiday-islamic 9 27 "Shab-e Qadr")) (if all-islamic-calendar-holidays (holiday-islamic 10 1 "Id-al-Fitr")) (if all-islamic-calendar-holidays (holiday-islamic 12 10 "Id-al-Adha")))) "\
-*Islamic holidays.
+Islamic holidays.
See the documentation for `calendar-holidays' for details.")
(custom-autoload (quote islamic-holidays) "calendar")
@@ -3262,7 +3308,7 @@ See the documentation for `calendar-holidays' for details.")
(put (quote bahai-holidays) (quote risky-local-variable) t)
(defvar bahai-holidays (quote ((holiday-fixed 3 21 (format "Baha'i New Year (Naw-Ruz) %d" (- displayed-year (1- 1844)))) (holiday-fixed 4 21 "First Day of Ridvan") (if all-bahai-calendar-holidays (holiday-fixed 4 22 "Second Day of Ridvan")) (if all-bahai-calendar-holidays (holiday-fixed 4 23 "Third Day of Ridvan")) (if all-bahai-calendar-holidays (holiday-fixed 4 24 "Fourth Day of Ridvan")) (if all-bahai-calendar-holidays (holiday-fixed 4 25 "Fifth Day of Ridvan")) (if all-bahai-calendar-holidays (holiday-fixed 4 26 "Sixth Day of Ridvan")) (if all-bahai-calendar-holidays (holiday-fixed 4 27 "Seventh Day of Ridvan")) (if all-bahai-calendar-holidays (holiday-fixed 4 28 "Eighth Day of Ridvan")) (holiday-fixed 4 29 "Ninth Day of Ridvan") (if all-bahai-calendar-holidays (holiday-fixed 4 30 "Tenth Day of Ridvan")) (if all-bahai-calendar-holidays (holiday-fixed 5 1 "Eleventh Day of Ridvan")) (holiday-fixed 5 2 "Twelfth Day of Ridvan") (holiday-fixed 5 23 "Declaration of the Bab") (holiday-fixed 5 29 "Ascension of Baha'u'llah") (holiday-fixed 7 9 "Martyrdom of the Bab") (holiday-fixed 10 20 "Birth of the Bab") (holiday-fixed 11 12 "Birth of Baha'u'llah") (if all-bahai-calendar-holidays (holiday-fixed 11 26 "Day of the Covenant")) (if all-bahai-calendar-holidays (holiday-fixed 11 28 "Ascension of `Abdu'l-Baha")))) "\
-*Baha'i holidays.
+Baha'i holidays.
See the documentation for `calendar-holidays' for details.")
(custom-autoload (quote bahai-holidays) "calendar")
@@ -3270,7 +3316,7 @@ See the documentation for `calendar-holidays' for details.")
(put (quote solar-holidays) (quote risky-local-variable) t)
(defvar solar-holidays (quote ((if (fboundp (quote atan)) (solar-equinoxes-solstices)) (if (progn (require (quote cal-dst)) t) (funcall (quote holiday-sexp) calendar-daylight-savings-starts (quote (format "Daylight Savings Time Begins %s" (if (fboundp (quote atan)) (solar-time-string (/ calendar-daylight-savings-starts-time (float 60)) calendar-standard-time-zone-name) ""))))) (funcall (quote holiday-sexp) calendar-daylight-savings-ends (quote (format "Daylight Savings Time Ends %s" (if (fboundp (quote atan)) (solar-time-string (/ calendar-daylight-savings-ends-time (float 60)) calendar-daylight-time-zone-name) "")))))) "\
-*Sun-related holidays.
+Sun-related holidays.
See the documentation for `calendar-holidays' for details.")
(custom-autoload (quote solar-holidays) "calendar")
@@ -3297,7 +3343,7 @@ See the documentation of that function for more information.
\(fn &optional ARG)" t nil)
(defvar calendar-week-start-day 0 "\
-*The day of the week on which a week in the calendar begins.
+The day of the week on which a week in the calendar begins.
0 means Sunday (default), 1 means Monday, and so on.
If you change this variable directly (without using customize)
@@ -3328,12 +3374,11 @@ it fails.
;;;***
;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el"
-;;;;;; (17148 25186))
+;;;;;; (17315 15382))
;;; Generated autoloads from progmodes/cc-engine.el
(autoload (quote c-guess-basic-syntax) "cc-engine" "\
Return the syntactic context of the current line.
-This function does not do any hidden buffer changes.
\(fn)" nil nil)
@@ -3341,7 +3386,7 @@ This function does not do any hidden buffer changes.
;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode
;;;;;; c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el"
-;;;;;; (17239 32368))
+;;;;;; (17296 51210))
;;; Generated autoloads from progmodes/cc-mode.el
(autoload (quote c-initialize-cc-mode) "cc-mode" "\
@@ -3499,35 +3544,31 @@ Key bindings:
;;;***
;;;### (autoloads (c-set-offset c-add-style c-set-style) "cc-styles"
-;;;;;; "progmodes/cc-styles.el" (17239 32369))
+;;;;;; "progmodes/cc-styles.el" (17296 51210))
;;; Generated autoloads from progmodes/cc-styles.el
(autoload (quote c-set-style) "cc-styles" "\
-Set CC Mode variables to use one of several different indentation styles.
-STYLENAME is a string representing the desired style from the list of
-styles described in the variable `c-style-alist'. See that variable
-for details of setting up styles.
-
-The variable `c-indentation-style' always contains the buffer's current
-style name.
-
-If the optional argument DONT-OVERRIDE is t, no style variables that
-already have values will be overridden. I.e. in the case of
-`c-offsets-alist', syntactic symbols will only be added, and in the
-case of all other style variables, only those set to `set-from-style'
-will be reassigned.
-
-If DONT-OVERRIDE is neither nil nor t, only those style variables that
-have default (i.e. non-buffer local) values will keep their settings
-while the rest will be overridden. This is useful to avoid overriding
-global settings done in ~/.emacs when setting a style from a mode hook
-\(providing the style variables are buffer local, which is the
-default).
-
-Obviously, setting DONT-OVERRIDE to t is useful mainly when the
-initial style is chosen for a CC Mode buffer by a major mode. Since
-that is done internally by CC Mode, it typically won't have any effect
-when used elsewhere.
+Set the current buffer to use the style STYLENAME.
+STYLENAME, a string, must be an existing CC Mode style - These are contained
+in the variable `c-style-alist'.
+
+The variable `c-indentation-style' will get set to STYLENAME.
+
+\"Setting the style\" is done by setting CC Mode's \"style variables\" to the
+values indicated by the pertinent entry in `c-style-alist'. Other variables
+might get set too.
+
+If DONT-OVERRIDE is neither nil nor t, style variables whose default values
+have been set (more precisely, whose default values are not the symbol
+`set-from-style') will not be changed. This avoids overriding global settings
+done in ~/.emacs. It is useful to call c-set-style from a mode hook in this
+way.
+
+If DONT-OVERRIDE is t, style variables that already have values (i.e., whose
+values are not the symbol `set-from-style') will not be overridden. CC Mode
+calls c-set-style internally in this way whilst initializing a buffer; if
+cc-set-style is called like this from anywhere else, it will usually behave as
+a null operation.
\(fn STYLENAME &optional DONT-OVERRIDE)" t nil)
@@ -3554,6 +3595,13 @@ and exists only for compatibility reasons.
;;;***
+;;;### (autoloads nil "cc-subword" "progmodes/cc-subword.el" (17296
+;;;;;; 15980))
+;;; Generated autoloads from progmodes/cc-subword.el
+ (autoload 'c-subword-mode "cc-subword" "Mode enabling subword movement and editing keys." t)
+
+;;;***
+
;;;### (autoloads (ccl-execute-with-args check-ccl-program define-ccl-program
;;;;;; declare-ccl-program ccl-dump ccl-compile) "ccl" "international/ccl.el"
;;;;;; (17102 18708))
@@ -4020,8 +4068,8 @@ checking of documentation strings.
;;;***
;;;### (autoloads (encode-hz-buffer encode-hz-region decode-hz-buffer
-;;;;;; decode-hz-region) "china-util" "language/china-util.el" (17102
-;;;;;; 18766))
+;;;;;; decode-hz-region) "china-util" "language/china-util.el" (17246
+;;;;;; 40257))
;;; Generated autoloads from language/china-util.el
(autoload (quote decode-hz-region) "china-util" "\
@@ -4088,7 +4136,7 @@ and runs the normal hook `command-history-hook'.
;;;***
-;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (17148 25089))
+;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (17374 39354))
;;; Generated autoloads from emacs-lisp/cl.el
(defvar custom-print-functions nil "\
@@ -4217,7 +4265,7 @@ read/written by MS-DOS software, or for display on the MS-DOS terminal.
;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list
;;;;;; comint-redirect-send-command-to-process comint-redirect-send-command
;;;;;; comint-run make-comint make-comint-in-buffer) "comint" "comint.el"
-;;;;;; (17239 32187))
+;;;;;; (17277 6644))
;;; Generated autoloads from comint.el
(defvar comint-output-filter-functions (quote (comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt)) "\
@@ -4307,8 +4355,8 @@ REGEXP-GROUP is the regular expression group in REGEXP to use.
;;;***
-;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17159
-;;;;;; 1461))
+;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17305
+;;;;;; 44991))
;;; Generated autoloads from compare-w.el
(autoload (quote compare-windows) "compare-w" "\
@@ -4345,7 +4393,7 @@ on third call it again advances points to the next difference and so on.
;;;;;; compilation-shell-minor-mode compilation-mode compilation-start
;;;;;; compile compilation-disable-input compile-command compilation-search-path
;;;;;; compilation-ask-about-save compilation-window-height compilation-mode-hook)
-;;;;;; "compile" "progmodes/compile.el" (17239 32370))
+;;;;;; "compile" "progmodes/compile.el" (17310 14110))
;;; Generated autoloads from progmodes/compile.el
(defvar compilation-mode-hook nil "\
@@ -4506,7 +4554,7 @@ This is the value of `next-error-function' in Compilation buffers.
;;;***
;;;### (autoloads (partial-completion-mode) "complete" "complete.el"
-;;;;;; (17148 24947))
+;;;;;; (17315 15381))
;;; Generated autoloads from complete.el
(defvar partial-completion-mode nil "\
@@ -4538,25 +4586,41 @@ specially in \\[find-file]. For example,
\\[find-file] <sys/time.h> RET finds the file `/usr/include/sys/time.h'.
See also the variable `PC-include-file-path'.
+Partial Completion mode extends the meaning of `completion-auto-help' (which
+see), so that if it is neither nil nor t, Emacs shows the `*Completions*'
+buffer only on the second attempt to complete. That is, if TAB finds nothing
+to complete, the first TAB just says \"Next char not unique\" and the
+second TAB brings up the `*Completions*' buffer.
+
\(fn &optional ARG)" t nil)
;;;***
;;;### (autoloads (dynamic-completion-mode) "completion" "completion.el"
-;;;;;; (17239 32188))
+;;;;;; (17366 63944))
;;; Generated autoloads from completion.el
+(defvar dynamic-completion-mode nil "\
+Non-nil if Dynamic-Completion mode is enabled.
+See the command `dynamic-completion-mode' for a description of this minor-mode.
+Setting this variable directly does not take effect;
+use either \\[customize] or the function `dynamic-completion-mode'.")
+
+(custom-autoload (quote dynamic-completion-mode) "completion")
+
+(put (quote dynamic-completion-mode) (quote custom-set) (quote custom-set-minor-mode))
+
(autoload (quote dynamic-completion-mode) "completion" "\
Enable dynamic word-completion.
-\(fn)" t nil)
+\(fn &optional ARG)" t nil)
;;;***
;;;### (autoloads (decompose-composite-char compose-last-chars compose-chars-after
;;;;;; find-composition compose-chars decompose-string compose-string
;;;;;; decompose-region compose-region encode-composition-rule)
-;;;;;; "composite" "composite.el" (17120 44761))
+;;;;;; "composite" "composite.el" (17318 56743))
;;; Generated autoloads from composite.el
(defconst reference-point-alist (quote ((tl . 0) (tc . 1) (tr . 2) (Bl . 3) (Bc . 4) (Br . 5) (bl . 6) (bc . 7) (br . 8) (cl . 9) (cc . 10) (cr . 11) (top-left . 0) (top-center . 1) (top-right . 2) (base-left . 3) (base-center . 4) (base-right . 5) (bottom-left . 6) (bottom-center . 7) (bottom-right . 8) (center-left . 9) (center-center . 10) (center-right . 11) (ml . 3) (mc . 10) (mr . 5) (mid-left . 3) (mid-center . 10) (mid-right . 5))) "\
@@ -4777,7 +4841,7 @@ Optional 3rd arg WITH-COMPOSITION-RULE is ignored.
;;;### (autoloads (conf-xdefaults-mode conf-ppd-mode conf-colon-mode
;;;;;; conf-space-mode conf-javaprop-mode conf-windows-mode conf-unix-mode
-;;;;;; conf-mode) "conf-mode" "textmodes/conf-mode.el" (17239 32409))
+;;;;;; conf-mode) "conf-mode" "textmodes/conf-mode.el" (17251 52024))
;;; Generated autoloads from textmodes/conf-mode.el
(autoload (quote conf-mode) "conf-mode" "\
@@ -4811,7 +4875,7 @@ See also `conf-space-mode', `conf-colon-mode', `conf-javaprop-mode',
\\{conf-mode-map}
-\(fn &optional COMMENT SYNTAX-TABLE NAME)" t nil)
+\(fn)" t nil)
(autoload (quote conf-unix-mode) "conf-mode" "\
Conf Mode starter for Unix style Conf files.
@@ -4869,8 +4933,7 @@ Conf Mode starter for space separated conf files.
recognized according to `conf-space-keywords'. Interactively
with a prefix ARG of `0' no keywords will be recognized. With
any other prefix arg you will be prompted for a regexp to match
-the keywords. Programmatically you can pass such a regexp as
-KEYWORDS, or any non-nil non-string for no keywords.
+the keywords.
For details see `conf-mode'. Example:
@@ -4886,7 +4949,7 @@ class desktop
add /dev/audio desktop
add /dev/mixer desktop
-\(fn &optional KEYWORDS)" t nil)
+\(fn)" t nil)
(autoload (quote conf-colon-mode) "conf-mode" "\
Conf Mode starter for Colon files.
@@ -4898,7 +4961,7 @@ For details see `conf-mode'. Example:
<Multi_key> <exclam> <exclam> : \"\\241\" exclamdown
<Multi_key> <c> <slash> : \"\\242\" cent
-\(fn &optional COMMENT SYNTAX-TABLE NAME)" t nil)
+\(fn)" t nil)
(autoload (quote conf-ppd-mode) "conf-mode" "\
Conf Mode starter for Adobe/CUPS PPD files.
@@ -4987,7 +5050,7 @@ Insert a copyright by $ORGANIZATION notice at cursor.
;;;***
;;;### (autoloads (cperl-mode) "cperl-mode" "progmodes/cperl-mode.el"
-;;;;;; (17185 27634))
+;;;;;; (17276 44726))
;;; Generated autoloads from progmodes/cperl-mode.el
(autoload (quote cperl-mode) "cperl-mode" "\
@@ -5160,7 +5223,7 @@ or as help on variables `cperl-tips', `cperl-problems',
;;;***
;;;### (autoloads (cpp-parse-edit cpp-highlight-buffer) "cpp" "progmodes/cpp.el"
-;;;;;; (17140 20963))
+;;;;;; (17359 40965))
;;; Generated autoloads from progmodes/cpp.el
(autoload (quote cpp-highlight-buffer) "cpp" "\
@@ -5203,7 +5266,7 @@ With ARG, turn CRiSP mode on if ARG is positive, off otherwise.
;;;***
;;;### (autoloads (completing-read-multiple) "crm" "emacs-lisp/crm.el"
-;;;;;; (17148 25089))
+;;;;;; (17315 15382))
;;; Generated autoloads from emacs-lisp/crm.el
(autoload (quote completing-read-multiple) "crm" "\
@@ -5239,7 +5302,7 @@ INHERIT-INPUT-METHOD.
;;;***
;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el"
-;;;;;; (17239 32278))
+;;;;;; (17377 26465))
;;; Generated autoloads from emulation/cua-base.el
(defvar cua-mode nil "\
@@ -5275,6 +5338,11 @@ You can customize `cua-enable-cua-keys' to completely disable the
CUA bindings, or `cua-prefix-override-inhibit-delay' to change
the prefix fallback behavior.
+CUA mode manages Transient Mark mode internally. Trying to disable
+Transient Mark mode while CUA mode is enabled does not work; if you
+only want to highlight the region when it is selected using a
+shifted movement key, set `cua-highlight-region-shift-only'.
+
\(fn &optional ARG)" t nil)
(autoload (quote cua-selection-mode) "cua-base" "\
@@ -5301,7 +5369,7 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings.
;;;;;; customize-face customize-changed-options customize-option-other-window
;;;;;; customize-option customize-group-other-window customize-group
;;;;;; customize-mode customize customize-save-variable customize-set-variable
-;;;;;; customize-set-value) "cus-edit" "cus-edit.el" (17244 43728))
+;;;;;; customize-set-value) "cus-edit" "cus-edit.el" (17369 18480))
;;; Generated autoloads from cus-edit.el
(add-hook 'same-window-regexps "\\`\\*Customiz.*\\*\\'")
@@ -5398,15 +5466,16 @@ Show the buffer in another window, but don't select it.
\(fn SYMBOL)" t nil)
+(defalias (quote customize-changed) (quote customize-changed-options))
+
(autoload (quote customize-changed-options) "cus-edit" "\
-Customize all user option variables changed in Emacs itself.
+Customize all settings whose meanings have changed in Emacs itself.
This includes new user option variables and faces, and new
-customization groups, as well as older options and faces whose default
-values have changed since the previous major Emacs release.
+customization groups, as well as older options and faces whose meanings
+or default values have changed since the previous major Emacs release.
-With argument SINCE-VERSION (a string), customize all user option
-variables that were added (or their meanings were changed) since that
-version.
+With argument SINCE-VERSION (a string), customize all settings
+that were added or redefined since that version.
\(fn SINCE-VERSION)" t nil)
@@ -5435,7 +5504,7 @@ Customize all user options set since the last save in this session.
\(fn)" t nil)
(autoload (quote customize-rogue) "cus-edit" "\
-Customize all user variable modified outside customize.
+Customize all user variables modified outside customize.
\(fn)" t nil)
@@ -5445,28 +5514,30 @@ Customize all already saved user options.
\(fn)" t nil)
(autoload (quote customize-apropos) "cus-edit" "\
-Customize all user options matching REGEXP.
+Customize all loaded options, faces and groups matching REGEXP.
If ALL is `options', include only options.
If ALL is `faces', include only faces.
If ALL is `groups', include only groups.
-If ALL is t (interactively, with prefix arg), include options which are not
-user-settable, as well as faces and groups.
+If ALL is t (interactively, with prefix arg), include variables
+that are not customizable options, as well as faces and groups
+\(but we recommend using `apropos-variable' instead).
\(fn REGEXP &optional ALL)" t nil)
(autoload (quote customize-apropos-options) "cus-edit" "\
-Customize all user options matching REGEXP.
-With prefix arg, include options which are not user-settable.
+Customize all loaded customizable options matching REGEXP.
+With prefix arg, include variables that are not customizable options
+\(but we recommend using `apropos-variable' instead).
\(fn REGEXP &optional ARG)" t nil)
(autoload (quote customize-apropos-faces) "cus-edit" "\
-Customize all user faces matching REGEXP.
+Customize all loaded faces matching REGEXP.
\(fn REGEXP)" t nil)
(autoload (quote customize-apropos-groups) "cus-edit" "\
-Customize all user groups matching REGEXP.
+Customize all loaded groups matching REGEXP.
\(fn REGEXP)" t nil)
@@ -5556,7 +5627,7 @@ The format is suitable for use with `easy-menu-define'.
;;;***
;;;### (autoloads (custom-reset-faces custom-theme-reset-faces custom-set-faces
-;;;;;; custom-declare-face) "cus-face" "cus-face.el" (17242 7305))
+;;;;;; custom-declare-face) "cus-face" "cus-face.el" (17337 17201))
;;; Generated autoloads from cus-face.el
(autoload (quote custom-declare-face) "cus-face" "\
@@ -5605,9 +5676,9 @@ COMMENT is a string comment about FACE.
Reset the specs in THEME of some faces to their specs in other themes.
Each of the arguments ARGS has this form:
- (FACE FROM-THEME)
+ (FACE IGNORED)
-This means reset FACE to its value in FROM-THEME.
+This means reset FACE. The argument IGNORED is ignored.
\(fn THEME &rest ARGS)" nil nil)
@@ -5626,7 +5697,7 @@ This means reset FACE to its value in FROM-THEME.
;;;***
;;;### (autoloads (customize-create-theme) "cus-theme" "cus-theme.el"
-;;;;;; (17185 27407))
+;;;;;; (17351 13490))
;;; Generated autoloads from cus-theme.el
(autoload (quote customize-create-theme) "cus-theme" "\
@@ -5648,7 +5719,7 @@ Mode used for cvs status output.
;;;***
;;;### (autoloads (global-cwarn-mode turn-on-cwarn-mode cwarn-mode)
-;;;;;; "cwarn" "progmodes/cwarn.el" (17140 20964))
+;;;;;; "cwarn" "progmodes/cwarn.el" (17298 27296))
;;; Generated autoloads from progmodes/cwarn.el
(autoload (quote cwarn-mode) "cwarn" "\
@@ -5721,7 +5792,7 @@ If the argument is nil, we return the display table to its standard state.
;;;***
;;;### (autoloads (dabbrev-expand dabbrev-completion) "dabbrev" "dabbrev.el"
-;;;;;; (17239 32191))
+;;;;;; (17290 15905))
;;; Generated autoloads from dabbrev.el
(define-key esc-map "/" 'dabbrev-expand)
(define-key esc-map [?\C-/] 'dabbrev-completion)
@@ -5738,9 +5809,6 @@ completions.
If the prefix argument is 16 (which comes from C-u C-u),
then it searches *all* buffers.
-With no prefix argument, it reuses an old completion list
-if there is a suitable one already.
-
\(fn &optional ARG)" t nil)
(autoload (quote dabbrev-expand) "dabbrev" "\
@@ -5768,8 +5836,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion].
;;;***
-;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (17140
-;;;;;; 20964))
+;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (17276
+;;;;;; 44726))
;;; Generated autoloads from progmodes/dcl-mode.el
(autoload (quote dcl-mode) "dcl-mode" "\
@@ -5896,7 +5964,7 @@ There is some minimal font-lock support (see vars
;;;***
;;;### (autoloads (cancel-debug-on-entry debug-on-entry debug) "debug"
-;;;;;; "emacs-lisp/debug.el" (17244 43742))
+;;;;;; "emacs-lisp/debug.el" (17244 54746))
;;; Generated autoloads from emacs-lisp/debug.el
(setq debugger (quote debug))
@@ -5994,8 +6062,8 @@ START and END delimits the corners of text rectangle.
;;;***
-;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (17185
-;;;;;; 27637))
+;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (17333
+;;;;;; 17859))
;;; Generated autoloads from progmodes/delphi.el
(autoload (quote delphi-mode) "delphi" "\
@@ -6076,7 +6144,7 @@ any selection.
;;;***
;;;### (autoloads (derived-mode-init-mode-variables define-derived-mode)
-;;;;;; "derived" "emacs-lisp/derived.el" (17148 25090))
+;;;;;; "derived" "emacs-lisp/derived.el" (17298 27296))
;;; Generated autoloads from emacs-lisp/derived.el
(autoload (quote define-derived-mode) "derived" "\
@@ -6141,7 +6209,7 @@ the first time the mode is used.
;;;***
;;;### (autoloads (describe-char describe-text-properties) "descr-text"
-;;;;;; "descr-text.el" (17185 27409))
+;;;;;; "descr-text.el" (17329 62402))
;;; Generated autoloads from descr-text.el
(autoload (quote describe-text-properties) "descr-text" "\
@@ -6166,7 +6234,7 @@ as well as widgets, buttons, overlays, and text properties.
;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir
;;;;;; desktop-load-default desktop-read desktop-locals-to-save
-;;;;;; desktop-save-mode) "desktop" "desktop.el" (17242 7306))
+;;;;;; desktop-save-mode) "desktop" "desktop.el" (17364 14032))
;;; Generated autoloads from desktop.el
(defvar desktop-save-mode nil "\
@@ -6398,7 +6466,7 @@ Not documented
;;;***
;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib"
-;;;;;; "calendar/diary-lib.el" (17245 63766))
+;;;;;; "calendar/diary-lib.el" (17307 14150))
;;; Generated autoloads from calendar/diary-lib.el
(autoload (quote diary) "diary-lib" "\
@@ -6507,7 +6575,7 @@ Minor mode for viewing/editing context diffs.
;;;;;; dired dired-copy-preserve-time dired-dwim-target dired-keep-marker-symlink
;;;;;; dired-keep-marker-hardlink dired-keep-marker-copy dired-keep-marker-rename
;;;;;; dired-trivial-filenames dired-ls-F-marks-symlinks dired-listing-switches)
-;;;;;; "dired" "dired.el" (17244 43730))
+;;;;;; "dired" "dired.el" (17359 58110))
;;; Generated autoloads from dired.el
(defvar dired-listing-switches "-al" "\
@@ -6712,7 +6780,7 @@ Keybindings:
;;;;;; dired-run-shell-command dired-do-shell-command dired-clean-directory
;;;;;; dired-do-print dired-do-touch dired-do-chown dired-do-chgrp
;;;;;; dired-do-chmod dired-compare-directories dired-backup-diff
-;;;;;; dired-diff) "dired-aux" "dired-aux.el" (17239 32194))
+;;;;;; dired-diff) "dired-aux" "dired-aux.el" (17356 25047))
;;; Generated autoloads from dired-aux.el
(autoload (quote dired-diff) "dired-aux" "\
@@ -6721,7 +6789,7 @@ FILE defaults to the file at the mark. (That's the mark set by
\\[set-mark-command], not by Dired's \\[dired-mark] command.)
The prompted-for file is the first file given to `diff'.
With prefix arg, prompt for second argument SWITCHES,
- which is options for `diff'.
+which is options for `diff'.
\(fn FILE &optional SWITCHES)" t nil)
@@ -7120,7 +7188,7 @@ true then the type of the file linked to by FILE is printed instead.
;;;***
-;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (17248 29668))
+;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (17273 1329))
;;; Generated autoloads from dired-x.el
(autoload (quote dired-jump) "dired-x" "\
@@ -7172,7 +7240,7 @@ redefine OBJECT if it is a symbol.
;;;;;; standard-display-graphic standard-display-g1 standard-display-ascii
;;;;;; standard-display-default standard-display-8bit describe-current-display-table
;;;;;; describe-display-table set-display-table-slot display-table-slot
-;;;;;; make-display-table) "disp-table" "disp-table.el" (17242 7306))
+;;;;;; make-display-table) "disp-table" "disp-table.el" (17297 52532))
;;; Generated autoloads from disp-table.el
(autoload (quote make-display-table) "disp-table" "\
@@ -7333,7 +7401,7 @@ Locate SOA record and increment the serial field.
;;;***
-;;;### (autoloads (doctor) "doctor" "play/doctor.el" (17244 43757))
+;;;### (autoloads (doctor) "doctor" "play/doctor.el" (17364 14033))
;;; Generated autoloads from play/doctor.el
(autoload (quote doctor) "doctor" "\
@@ -7388,7 +7456,7 @@ Play sounds in message buffers.
;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap
;;;;;; define-global-minor-mode define-minor-mode) "easy-mmode"
-;;;;;; "emacs-lisp/easy-mmode.el" (17167 2793))
+;;;;;; "emacs-lisp/easy-mmode.el" (17298 27296))
;;; Generated autoloads from emacs-lisp/easy-mmode.el
(defalias (quote easy-mmode-define-minor-mode) (quote define-minor-mode))
@@ -7439,8 +7507,14 @@ For example, you could write
Make GLOBAL-MODE out of the buffer-local minor MODE.
TURN-ON is a function that will be called with no args in every buffer
and that should try to turn MODE on if applicable for that buffer.
-KEYS is a list of CL-style keyword arguments:
-:group to specify the custom group.
+KEYS is a list of CL-style keyword arguments. As the minor mode
+ defined by this function is always global, any :global keyword is
+ ignored. Other keywords have the same meaning as in `define-minor-mode',
+ which see. In particular, :group specifies the custom group.
+ The most useful keywords are those that are passed on to the
+ `defcustom'. It normally makes no sense to pass the :lighter
+ or :keymap keywords to `define-global-minor-mode', since these
+ are usually passed to the buffer-local version of the minor mode.
If MODE's set-up depends on the major mode in effect when it was
enabled, then disabling and reenabling MODE should make MODE work
@@ -7475,7 +7549,7 @@ CSS contains a list of syntax specifications of the form (CHAR . SYNTAX).
;;;### (autoloads (easy-menu-change easy-menu-create-menu easy-menu-do-define
;;;;;; easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (17250
-;;;;;; 21105))
+;;;;;; 28361))
;;; Generated autoloads from emacs-lisp/easymenu.el
(put (quote easy-menu-define) (quote lisp-indent-function) (quote defun))
@@ -8067,8 +8141,9 @@ With prefix arg NOCONFIRM, execute current line as-is without editing.
;;;***
-;;;### (autoloads (edebug-eval-top-level-form def-edebug-spec edebug-all-forms
-;;;;;; edebug-all-defs) "edebug" "emacs-lisp/edebug.el" (17148 25093))
+;;;### (autoloads (edebug-all-forms edebug-all-defs edebug-eval-top-level-form
+;;;;;; def-edebug-spec edebug-all-forms edebug-all-defs) "edebug"
+;;;;;; "emacs-lisp/edebug.el" (17324 31506))
;;; Generated autoloads from emacs-lisp/edebug.el
(defvar edebug-all-defs nil "\
@@ -8120,6 +8195,16 @@ already is one.)
\(fn)" t nil)
+(autoload (quote edebug-all-defs) "edebug" "\
+Toggle edebugging of all definitions.
+
+\(fn)" t nil)
+
+(autoload (quote edebug-all-forms) "edebug" "\
+Toggle edebugging of all forms.
+
+\(fn)" t nil)
+
;;;***
;;;### (autoloads (ediff-documentation ediff-version ediff-revision
@@ -8131,7 +8216,7 @@ already is one.)
;;;;;; ediff-merge-directory-revisions ediff-merge-directories-with-ancestor
;;;;;; ediff-merge-directories ediff-directories3 ediff-directory-revisions
;;;;;; ediff-directories ediff-buffers3 ediff-buffers ediff-backup
-;;;;;; ediff-files3 ediff-files) "ediff" "ediff.el" (17239 32202))
+;;;;;; ediff-files3 ediff-files) "ediff" "ediff.el" (17287 6474))
;;; Generated autoloads from ediff.el
(autoload (quote ediff-files) "ediff" "\
@@ -8392,7 +8477,7 @@ Not documented
;;;***
;;;### (autoloads (ediff-show-registry) "ediff-mult" "ediff-mult.el"
-;;;;;; (17239 32198))
+;;;;;; (17374 18401))
;;; Generated autoloads from ediff-mult.el
(autoload (quote ediff-show-registry) "ediff-mult" "\
@@ -8405,7 +8490,7 @@ Display Ediff's registry.
;;;***
;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe)
-;;;;;; "ediff-util" "ediff-util.el" (17239 32201))
+;;;;;; "ediff-util" "ediff-util.el" (17274 24016))
;;; Generated autoloads from ediff-util.el
(autoload (quote ediff-toggle-multiframe) "ediff-util" "\
@@ -8601,8 +8686,8 @@ Initialize elint.
;;;***
;;;### (autoloads (elp-results elp-instrument-package elp-instrument-list
-;;;;;; elp-instrument-function) "elp" "emacs-lisp/elp.el" (17148
-;;;;;; 25094))
+;;;;;; elp-instrument-function) "elp" "emacs-lisp/elp.el" (17291
+;;;;;; 34530))
;;; Generated autoloads from emacs-lisp/elp.el
(autoload (quote elp-instrument-function) "elp" "\
@@ -8636,7 +8721,7 @@ displayed.
;;;***
;;;### (autoloads (report-emacs-bug) "emacsbug" "mail/emacsbug.el"
-;;;;;; (17148 25154))
+;;;;;; (17347 48575))
;;; Generated autoloads from mail/emacsbug.el
(autoload (quote report-emacs-bug) "emacsbug" "\
@@ -8651,7 +8736,7 @@ Prompts for bug subject. Leaves you in a mail buffer.
;;;;;; emerge-revisions emerge-files-with-ancestor-remote emerge-files-remote
;;;;;; emerge-files-with-ancestor-command emerge-files-command emerge-buffers-with-ancestor
;;;;;; emerge-buffers emerge-files-with-ancestor emerge-files) "emerge"
-;;;;;; "emerge.el" (17167 2775))
+;;;;;; "emerge.el" (17167 2962))
;;; Generated autoloads from emerge.el
(defvar menu-bar-emerge-menu (make-sparse-keymap "Emerge"))
@@ -8789,6 +8874,452 @@ Not documented
;;;***
+;;;### (autoloads (erc-select erc-select-read-args) "erc" "erc/erc.el"
+;;;;;; (17379 25495))
+;;; Generated autoloads from erc/erc.el
+
+(autoload (quote erc-select-read-args) "erc" "\
+Prompt the user for values of nick, server, port, and password.
+
+\(fn)" nil nil)
+
+(autoload (quote erc-select) "erc" "\
+Select connection parameters and run ERC.
+Non-interactively, it takes keyword arguments
+ (server (erc-compute-server))
+ (port (erc-compute-port))
+ (nick (erc-compute-nick))
+ password
+ (full-name (erc-compute-full-name)))
+
+That is, if called with
+ (erc-select :server \"irc.freenode.net\" :full-name \"Harry S Truman\")
+server and full-name will be set to those values, whereas
+erc-compute-port, erc-compute-nick and erc-compute-full-name will
+be invoked for those parameters' values
+
+\(fn &key (SERVER (erc-compute-server)) (PORT (erc-compute-port)) (NICK (erc-compute-nick)) PASSWORD (FULL-NAME (erc-compute-full-name)))" t nil)
+
+;;;***
+
+;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (17372
+;;;;;; 48745))
+;;; Generated autoloads from erc/erc-autoaway.el
+ (autoload 'erc-autoaway-mode "erc-autoaway")
+
+;;;***
+
+;;;### (autoloads nil "erc-autojoin" "erc/erc-autojoin.el" (17372
+;;;;;; 48745))
+;;; Generated autoloads from erc/erc-autojoin.el
+ (autoload 'erc-autojoin-mode "erc-autojoin" nil t)
+
+;;;***
+
+;;;### (autoloads nil "erc-button" "erc/erc-button.el" (17372 48745))
+;;; Generated autoloads from erc/erc-button.el
+ (autoload 'erc-button-mode "erc-button" nil t)
+
+;;;***
+
+;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (17372 48745))
+;;; Generated autoloads from erc/erc-compat.el
+ (autoload 'erc-define-minor-mode "erc-compat")
+
+;;;***
+
+;;;### (autoloads (erc-complete) "erc-complete" "erc/erc-complete.el"
+;;;;;; (17372 48745))
+;;; Generated autoloads from erc/erc-complete.el
+
+(autoload (quote erc-complete) "erc-complete" "\
+Complete nick at point.
+See `erc-try-complete-nick' for more technical info.
+This function is obsolete, use `erc-pcomplete' instead.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (erc-ctcp-query-DCC pcomplete/erc-mode/DCC erc-cmd-DCC)
+;;;;;; "erc-dcc" "erc/erc-dcc.el" (17372 48745))
+;;; Generated autoloads from erc/erc-dcc.el
+
+(autoload (quote erc-cmd-DCC) "erc-dcc" "\
+Parser for /dcc command.
+This figures out the dcc subcommand and calls the appropriate routine to
+handle it. The function dispatched should be named \"erc-dcc-do-FOO-command\",
+where FOO is one of CLOSE, GET, SEND, LIST, CHAT, etc.
+
+\(fn CMD &rest ARGS)" nil nil)
+
+(autoload (quote pcomplete/erc-mode/DCC) "erc-dcc" "\
+Provides completion for the /DCC command.
+
+\(fn)" nil nil)
+
+(defvar erc-ctcp-query-DCC-hook (quote (erc-ctcp-query-DCC)) "\
+Hook variable for CTCP DCC queries")
+
+(autoload (quote erc-ctcp-query-DCC) "erc-dcc" "\
+The function called when a CTCP DCC request is detected by the client.
+It examines the DCC subcommand, and calls the appropriate routine for
+that subcommand.
+
+\(fn PROC NICK LOGIN HOST TO QUERY)" nil nil)
+
+;;;***
+
+;;;### (autoloads (erc-ezb-initialize erc-ezb-select-session erc-ezb-select
+;;;;;; erc-ezb-add-session erc-ezb-end-of-session-list erc-ezb-init-session-list
+;;;;;; erc-ezb-identify erc-ezb-notice-autodetect erc-ezb-lookup-action
+;;;;;; erc-ezb-get-login erc-cmd-ezb) "erc-ezbounce" "erc/erc-ezbounce.el"
+;;;;;; (17372 48745))
+;;; Generated autoloads from erc/erc-ezbounce.el
+
+(autoload (quote erc-cmd-ezb) "erc-ezbounce" "\
+Send EZB commands to the EZBouncer verbatim.
+
+\(fn LINE &optional FORCE)" nil nil)
+
+(autoload (quote erc-ezb-get-login) "erc-ezbounce" "\
+Return an appropriate EZBounce login for SERVER and PORT.
+Look up entries in `erc-ezb-login-alist'. If the username or password
+in the alist is `nil', prompt for the appropriate values.
+
+\(fn SERVER PORT)" nil nil)
+
+(autoload (quote erc-ezb-lookup-action) "erc-ezbounce" "\
+Not documented
+
+\(fn MESSAGE)" nil nil)
+
+(autoload (quote erc-ezb-notice-autodetect) "erc-ezbounce" "\
+React on an EZBounce NOTICE request.
+
+\(fn PROC PARSED)" nil nil)
+
+(autoload (quote erc-ezb-identify) "erc-ezbounce" "\
+Identify to the EZBouncer server.
+
+\(fn MESSAGE)" nil nil)
+
+(autoload (quote erc-ezb-init-session-list) "erc-ezbounce" "\
+Reset the EZBounce session list to NIL.
+
+\(fn MESSAGE)" nil nil)
+
+(autoload (quote erc-ezb-end-of-session-list) "erc-ezbounce" "\
+Indicate the end of the EZBounce session listing.
+
+\(fn MESSAGE)" nil nil)
+
+(autoload (quote erc-ezb-add-session) "erc-ezbounce" "\
+Add an EZBounce session to the session list.
+
+\(fn MESSAGE)" nil nil)
+
+(autoload (quote erc-ezb-select) "erc-ezbounce" "\
+Select an IRC server to use by EZBounce, in ERC style.
+
+\(fn MESSAGE)" nil nil)
+
+(autoload (quote erc-ezb-select-session) "erc-ezbounce" "\
+Select a detached EZBounce session.
+
+\(fn)" nil nil)
+
+(autoload (quote erc-ezb-initialize) "erc-ezbounce" "\
+Add EZBouncer convenience functions to ERC.
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (17372
+;;;;;; 48745))
+;;; Generated autoloads from erc/erc-fill.el
+ (autoload 'erc-fill-mode "erc-fill" nil t)
+
+(autoload (quote erc-fill) "erc-fill" "\
+Fill a region using the function referenced in `erc-fill-function'.
+You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'.
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads (erc-create-imenu-index) "erc-imenu" "erc/erc-imenu.el"
+;;;;;; (17372 48745))
+;;; Generated autoloads from erc/erc-imenu.el
+
+(autoload (quote erc-create-imenu-index) "erc-imenu" "\
+Not documented
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads (erc-chanlist erc-cmd-LIST) "erc-list" "erc/erc-list.el"
+;;;;;; (17372 48745))
+;;; Generated autoloads from erc/erc-list.el
+
+(autoload (quote erc-cmd-LIST) "erc-list" "\
+Display a buffer containing a list of channels on the current server.
+Optional argument CHANNEL specifies a single channel to list (instead of every
+available channel).
+
+\(fn &rest CHANNEL)" t nil)
+
+(autoload (quote erc-chanlist) "erc-list" "\
+Show a channel listing of the current server in a special mode.
+Please note that this function only works with IRC servers which conform
+to RFC and send the LIST header (#321) at start of list transmission.
+
+\(fn &optional CHANNELS)" t nil)
+
+;;;***
+
+;;;### (autoloads (erc-save-buffer-in-logs erc-logging-enabled) "erc-log"
+;;;;;; "erc/erc-log.el" (17372 48745))
+;;; Generated autoloads from erc/erc-log.el
+ (autoload 'erc-log-mode "erc-log" nil t)
+
+(autoload (quote erc-logging-enabled) "erc-log" "\
+Return non-nil if logging is enabled for BUFFER.
+If BUFFER is nil, the value of `current-buffer' is used.
+Logging is enabled if `erc-log-channels-directory' is non-nil, the directory
+is writeable (it will be created as necessary) and
+`erc-enable-logging' returns a non-nil value.
+
+\(fn &optional BUFFER)" nil nil)
+
+(autoload (quote erc-save-buffer-in-logs) "erc-log" "\
+Append BUFFER contents to the log file, if logging is enabled.
+If BUFFER is not provided, current buffer is used.
+Logging is enabled if `erc-logging-enabled' returns non-nil.
+
+This is normally done on exit, to save the unsaved portion of the
+buffer, since only the text that runs off the buffer limit is logged
+automatically.
+
+You can save every individual message by putting this function on
+`erc-insert-post-hook'.
+
+\(fn &optional BUFFER)" t nil)
+
+;;;***
+
+;;;### (autoloads (erc-delete-dangerous-host erc-add-dangerous-host
+;;;;;; erc-delete-keyword erc-add-keyword erc-delete-fool erc-add-fool
+;;;;;; erc-delete-pal erc-add-pal) "erc-match" "erc/erc-match.el"
+;;;;;; (17372 48745))
+;;; Generated autoloads from erc/erc-match.el
+ (autoload 'erc-match-mode "erc-match")
+
+(autoload (quote erc-add-pal) "erc-match" "\
+Add pal interactively to `erc-pals'.
+
+\(fn)" t nil)
+
+(autoload (quote erc-delete-pal) "erc-match" "\
+Delete pal interactively to `erc-pals'.
+
+\(fn)" t nil)
+
+(autoload (quote erc-add-fool) "erc-match" "\
+Add fool interactively to `erc-fools'.
+
+\(fn)" t nil)
+
+(autoload (quote erc-delete-fool) "erc-match" "\
+Delete fool interactively to `erc-fools'.
+
+\(fn)" t nil)
+
+(autoload (quote erc-add-keyword) "erc-match" "\
+Add keyword interactively to `erc-keywords'.
+
+\(fn)" t nil)
+
+(autoload (quote erc-delete-keyword) "erc-match" "\
+Delete keyword interactively to `erc-keywords'.
+
+\(fn)" t nil)
+
+(autoload (quote erc-add-dangerous-host) "erc-match" "\
+Add dangerous-host interactively to `erc-dangerous-hosts'.
+
+\(fn)" t nil)
+
+(autoload (quote erc-delete-dangerous-host) "erc-match" "\
+Delete dangerous-host interactively to `erc-dangerous-hosts'.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (erc-server-select erc-determine-network) "erc-nets"
+;;;;;; "erc/erc-nets.el" (17372 48745))
+;;; Generated autoloads from erc/erc-nets.el
+
+(autoload (quote erc-determine-network) "erc-nets" "\
+Return the name of the network or \"Unknown\" as a symbol. Use the
+server parameter NETWORK if provided, otherwise parse the server name and
+search for a match in `erc-networks-alist'.
+
+\(fn)" nil nil)
+
+(autoload (quote erc-server-select) "erc-nets" "\
+Interactively select a server to connect to using `erc-server-alist'.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (erc-cmd-WHOLEFT) "erc-netsplit" "erc/erc-netsplit.el"
+;;;;;; (17372 48745))
+;;; Generated autoloads from erc/erc-netsplit.el
+ (autoload 'erc-netsplit-mode "erc-netsplit")
+
+(autoload (quote erc-cmd-WHOLEFT) "erc-netsplit" "\
+Show who's gone.
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads (erc-nickserv-identify erc-nickserv-identify-mode)
+;;;;;; "erc-nickserv" "erc/erc-nickserv.el" (17372 48745))
+;;; Generated autoloads from erc/erc-nickserv.el
+ (autoload 'erc-services-mode "erc-nickserv" nil t)
+
+(autoload (quote erc-nickserv-identify-mode) "erc-nickserv" "\
+Set up hooks according to which MODE the user has chosen.
+
+\(fn MODE)" t nil)
+
+(autoload (quote erc-nickserv-identify) "erc-nickserv" "\
+Send an \"identify <PASSWORD>\" message to NickServ.
+When called interactively, read the password using `read-passwd'.
+
+\(fn PASSWORD)" t nil)
+
+;;;***
+
+;;;### (autoloads (pcomplete/erc-mode/NOTIFY erc-cmd-NOTIFY) "erc-notify"
+;;;;;; "erc/erc-notify.el" (17372 48745))
+;;; Generated autoloads from erc/erc-notify.el
+ (autoload 'erc-notify-mode "erc-notify" nil t)
+
+(autoload (quote erc-cmd-NOTIFY) "erc-notify" "\
+Change `erc-notify-list' or list current notify-list members online.
+Without args, list the current list of notificated people online,
+with args, toggle notify status of people.
+
+\(fn &rest ARGS)" nil nil)
+
+(autoload (quote pcomplete/erc-mode/NOTIFY) "erc-notify" "\
+Not documented
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads nil "erc-page" "erc/erc-page.el" (17372 48745))
+;;; Generated autoloads from erc/erc-page.el
+ (autoload 'erc-page-mode "erc-page")
+
+;;;***
+
+;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (17372
+;;;;;; 48745))
+;;; Generated autoloads from erc/erc-pcomplete.el
+ (autoload 'erc-completion-mode "erc-pcomplete" nil t)
+
+;;;***
+
+;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (17372 48745))
+;;; Generated autoloads from erc/erc-replace.el
+ (autoload 'erc-replace-mode "erc-replace")
+
+;;;***
+
+;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (17372 48745))
+;;; Generated autoloads from erc/erc-ring.el
+ (autoload 'erc-ring-mode "erc-ring" nil t)
+
+;;;***
+
+;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (17372 48745))
+;;; Generated autoloads from erc/erc-sound.el
+ (autoload 'erc-sound-mode "erc-sound")
+
+;;;***
+
+;;;### (autoloads (erc-speedbar-browser) "erc-speedbar" "erc/erc-speedbar.el"
+;;;;;; (17373 26133))
+;;; Generated autoloads from erc/erc-speedbar.el
+
+(autoload (quote erc-speedbar-browser) "erc-speedbar" "\
+Initialize speedbar to display an ERC browser.
+This will add a speedbar major display mode.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (17372
+;;;;;; 48745))
+;;; Generated autoloads from erc/erc-spelling.el
+ (autoload 'erc-spelling-mode "erc-spelling" nil t)
+
+;;;***
+
+;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (17374 46377))
+;;; Generated autoloads from erc/erc-stamp.el
+ (autoload 'erc-timestamp-mode "erc-stamp" nil t)
+
+;;;***
+
+;;;### (autoloads nil "erc-track" "erc/erc-track.el" (17372 48745))
+;;; Generated autoloads from erc/erc-track.el
+ (autoload 'erc-track-mode "erc-track" nil t)
+ (autoload 'erc-track-when-inactive-mode "erc-track" nil t)
+
+;;;***
+
+;;;### (autoloads (erc-truncate-buffer erc-truncate-buffer-to-size)
+;;;;;; "erc-truncate" "erc/erc-truncate.el" (17372 48745))
+;;; Generated autoloads from erc/erc-truncate.el
+ (autoload 'erc-truncate-mode "erc-truncate" nil t)
+
+(autoload (quote erc-truncate-buffer-to-size) "erc-truncate" "\
+Truncates the buffer to the size SIZE.
+If BUFFER is not provided, the current buffer is assumed. The deleted
+region is logged if `erc-logging-enabled' returns non-nil.
+
+\(fn SIZE &optional BUFFER)" nil nil)
+
+(autoload (quote erc-truncate-buffer) "erc-truncate" "\
+Truncates the current buffer to `erc-max-buffer-size'.
+Meant to be used in hooks, like `erc-insert-post-hook'.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (erc-xdcc-add-file) "erc-xdcc" "erc/erc-xdcc.el"
+;;;;;; (17372 48745))
+;;; Generated autoloads from erc/erc-xdcc.el
+
+(autoload (quote erc-xdcc-add-file) "erc-xdcc" "\
+Add a file to `erc-xdcc-files'.
+
+\(fn FILE)" t nil)
+
+;;;***
+
;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (17140
;;;;;; 20930))
;;; Generated autoloads from eshell/esh-mode.el
@@ -9162,7 +9693,7 @@ for \\[find-tag] (which see).
;;;;;; ethio-fidel-to-sera-buffer ethio-fidel-to-sera-region ethio-sera-to-fidel-marker
;;;;;; ethio-sera-to-fidel-mail ethio-sera-to-fidel-mail-or-marker
;;;;;; ethio-sera-to-fidel-buffer ethio-sera-to-fidel-region setup-ethiopic-environment-internal)
-;;;;;; "ethio-util" "language/ethio-util.el" (17185 27568))
+;;;;;; "ethio-util" "language/ethio-util.el" (17316 61871))
;;; Generated autoloads from language/ethio-util.el
(autoload (quote setup-ethiopic-environment-internal) "ethio-util" "\
@@ -9208,7 +9739,7 @@ See also the descriptions of the variables
\(fn &optional SECONDARY FORCE)" t nil)
(autoload (quote ethio-sera-to-fidel-mail-or-marker) "ethio-util" "\
-Execute ethio-sera-to-fidel-mail or ethio-sera-to-fidel-marker depending on the current major mode.
+Execute `ethio-sera-to-fidel-mail' or `ethio-sera-to-fidel-marker' depending on the current major mode.
If in rmail-mode or in mail-mode, execute the former; otherwise latter.
\(fn &optional ARG)" t nil)
@@ -9268,7 +9799,7 @@ See also the descriptions of the variables
\(fn &optional SECONDARY FORCE)" t nil)
(autoload (quote ethio-fidel-to-sera-mail-or-marker) "ethio-util" "\
-Execute ethio-fidel-to-sera-mail or ethio-fidel-to-sera-marker depending on the current major mode.
+Execute `ethio-fidel-to-sera-mail' or `ethio-fidel-to-sera-marker' depending on the current major mode.
If in rmail-mode or in mail-mode, execute the former; otherwise latter.
\(fn &optional ARG)" t nil)
@@ -9357,7 +9888,7 @@ Transcribe Ethiopic characters in ASCII depending on the file extension.
;;;### (autoloads (eudc-load-eudc eudc-query-form eudc-expand-inline
;;;;;; eudc-get-phone eudc-get-email eudc-set-server) "eudc" "net/eudc.el"
-;;;;;; (17185 27585))
+;;;;;; (17255 34870))
;;; Generated autoloads from net/eudc.el
(autoload (quote eudc-set-server) "eudc" "\
@@ -9564,7 +10095,7 @@ This is used only in conjunction with `expand-add-abbrevs'.
;;;***
-;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17239 32377))
+;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17276 44726))
;;; Generated autoloads from progmodes/f90.el
(autoload (quote f90-mode) "f90" "\
@@ -9835,7 +10366,7 @@ Unconditionally turn on Fast Lock mode.
;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue
;;;;;; feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts
-;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (17239 32329))
+;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (17258 33756))
;;; Generated autoloads from mail/feedmail.el
(autoload (quote feedmail-send-it) "feedmail" "\
@@ -9889,7 +10420,7 @@ you can set feedmail-queue-reminder-alist to nil.
;;;***
;;;### (autoloads (ffap-bindings dired-at-point ffap-at-mouse ffap-menu
-;;;;;; find-file-at-point ffap-next) "ffap" "ffap.el" (17239 32205))
+;;;;;; find-file-at-point ffap-next) "ffap" "ffap.el" (17279 16968))
;;; Generated autoloads from ffap.el
(autoload (quote ffap-next) "ffap" "\
@@ -10131,7 +10662,7 @@ Visit the file you click on in another window.
;;;;;; find-variable find-variable-noselect find-function-other-frame
;;;;;; find-function-other-window find-function find-function-noselect
;;;;;; find-function-search-for-symbol find-library) "find-func"
-;;;;;; "emacs-lisp/find-func.el" (17246 34220))
+;;;;;; "emacs-lisp/find-func.el" (17381 36246))
;;; Generated autoloads from emacs-lisp/find-func.el
(autoload (quote find-library) "find-func" "\
@@ -10151,7 +10682,7 @@ The search is done in the source for library LIBRARY.
(autoload (quote find-function-noselect) "find-func" "\
Return a pair (BUFFER . POINT) pointing to the definition of FUNCTION.
-Finds the Emacs Lisp library containing the definition of FUNCTION
+Finds the source file containing the definition of FUNCTION
in a buffer and the point of the definition. The buffer is
not selected.
@@ -10164,7 +10695,7 @@ in `load-path'.
(autoload (quote find-function) "find-func" "\
Find the definition of the FUNCTION near point.
-Finds the Emacs Lisp library containing the definition of the function
+Finds the source file containing the definition of the function
near point (selected by `function-called-at-point') in a buffer and
places point before the definition.
Set mark before moving, if the buffer already existed.
@@ -10183,18 +10714,17 @@ See `find-function' for more details.
\(fn FUNCTION)" t nil)
(autoload (quote find-function-other-frame) "find-func" "\
-Find, in ananother frame, the definition of FUNCTION near point.
+Find, in another frame, the definition of FUNCTION near point.
See `find-function' for more details.
\(fn FUNCTION)" t nil)
(autoload (quote find-variable-noselect) "find-func" "\
-Return a pair `(BUFFER . POINT)' pointing to the definition of SYMBOL.
+Return a pair `(BUFFER . POINT)' pointing to the definition of VARIABLE.
-Finds the Emacs Lisp library containing the definition of SYMBOL
-in a buffer, and the point of the definition. It does not switch
-to the buffer or display it.
+Finds the library containing the definition of VARIABLE in a buffer and
+the point of the definition. The buffer is not selected.
The library where VARIABLE is defined is searched for in FILE or
`find-function-source-path', if non nil, otherwise in `load-path'.
@@ -10204,7 +10734,7 @@ The library where VARIABLE is defined is searched for in FILE or
(autoload (quote find-variable) "find-func" "\
Find the definition of the VARIABLE near point.
-Finds the Emacs Lisp library containing the definition of the variable
+Finds the library containing the definition of the variable
near point (selected by `variable-at-point') in a buffer and
places point before the definition.
@@ -10224,7 +10754,7 @@ See `find-variable' for more details.
\(fn VARIABLE)" t nil)
(autoload (quote find-variable-other-frame) "find-func" "\
-Find, in annother frame, the definition of VARIABLE near point.
+Find, in another frame, the definition of VARIABLE near point.
See `find-variable' for more details.
@@ -10232,9 +10762,9 @@ See `find-variable' for more details.
(autoload (quote find-definition-noselect) "find-func" "\
Return a pair `(BUFFER . POINT)' pointing to the definition of SYMBOL.
-TYPE says what type of definition: nil for a function,
-`defvar' or `defface' for a variable or face. This function
-does not switch to the buffer or display it.
+TYPE says what type of definition: nil for a function, `defvar' for a
+variable, `defface' for a face. This function does not switch to the
+buffer nor display it.
The library where SYMBOL is defined is searched for in FILE or
`find-function-source-path', if non nil, otherwise in `load-path'.
@@ -10268,7 +10798,7 @@ Find directly the function at point in the other window.
\(fn)" t nil)
(autoload (quote find-variable-at-point) "find-func" "\
-Find directly the function at point in the other window.
+Find directly the variable at point in the other window.
\(fn)" t nil)
@@ -10280,7 +10810,7 @@ Define some key bindings for the find-function family of functions.
;;;***
;;;### (autoloads (find-lisp-find-dired-filter find-lisp-find-dired-subdirectories
-;;;;;; find-lisp-find-dired) "find-lisp" "find-lisp.el" (17185 27434))
+;;;;;; find-lisp-find-dired) "find-lisp" "find-lisp.el" (17269 21886))
;;; Generated autoloads from find-lisp.el
(autoload (quote find-lisp-find-dired) "find-lisp" "\
@@ -10345,7 +10875,7 @@ to get the effect of a C-q.
;;;***
;;;### (autoloads (fill-flowed fill-flowed-encode) "flow-fill" "gnus/flow-fill.el"
-;;;;;; (17148 25106))
+;;;;;; (17254 33237))
;;; Generated autoloads from gnus/flow-fill.el
(autoload (quote fill-flowed-encode) "flow-fill" "\
@@ -10361,7 +10891,7 @@ Not documented
;;;***
;;;### (autoloads (flymake-mode-off flymake-mode-on flymake-mode)
-;;;;;; "flymake" "progmodes/flymake.el" (17205 6169))
+;;;;;; "flymake" "progmodes/flymake.el" (17348 7449))
;;; Generated autoloads from progmodes/flymake.el
(autoload (quote flymake-mode) "flymake" "\
@@ -10385,7 +10915,7 @@ Turn flymake mode off.
;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off
;;;;;; flyspell-mode flyspell-prog-mode) "flyspell" "textmodes/flyspell.el"
-;;;;;; (17249 49356))
+;;;;;; (17370 39824))
;;; Generated autoloads from textmodes/flyspell.el
(autoload (quote flyspell-prog-mode) "flyspell" "\
@@ -10518,200 +11048,6 @@ in your `~/.emacs' file, replacing [f7] by your favourite key:
;;;***
-;;;### (autoloads (font-lock-fontify-buffer font-lock-remove-keywords
-;;;;;; font-lock-add-keywords font-lock-mode-internal) "font-lock"
-;;;;;; "font-lock.el" (17244 43734))
-;;; Generated autoloads from font-lock.el
-
-(defvar font-lock-keywords nil "\
-A list of the keywords to highlight.
-There are two kinds of values: user-level, and compiled.
-
-A user-level keywords list is what a major mode or the user would
-set up. Normally the list would come from `font-lock-defaults'.
-through selection of a fontification level and evaluation of any
-contained expressions. You can also alter it by calling
-`font-lock-add-keywords' or `font-lock-remove-keywords' with MODE = nil.
-
-Each element in a user-level keywords list should have one of these forms:
-
- MATCHER
- (MATCHER . SUBEXP)
- (MATCHER . FACENAME)
- (MATCHER . HIGHLIGHT)
- (MATCHER HIGHLIGHT ...)
- (eval . FORM)
-
-where MATCHER can be either the regexp to search for, or the function name to
-call to make the search (called with one argument, the limit of the search;
-it should return non-nil, move point, and set `match-data' appropriately iff
-it succeeds; like `re-search-forward' would).
-MATCHER regexps can be generated via the function `regexp-opt'.
-
-FORM is an expression, whose value should be a keyword element, evaluated when
-the keyword is (first) used in a buffer. This feature can be used to provide a
-keyword that can only be generated when Font Lock mode is actually turned on.
-
-HIGHLIGHT should be either MATCH-HIGHLIGHT or MATCH-ANCHORED.
-
-For highlighting single items, for example each instance of the word \"foo\",
-typically only MATCH-HIGHLIGHT is required.
-However, if an item or (typically) items are to be highlighted following the
-instance of another item (the anchor), for example each instance of the
-word \"bar\" following the word \"anchor\" then MATCH-ANCHORED may be required.
-
-MATCH-HIGHLIGHT should be of the form:
-
- (SUBEXP FACENAME [OVERRIDE [LAXMATCH]])
-
-SUBEXP is the number of the subexpression of MATCHER to be highlighted.
-
-FACENAME is an expression whose value is the face name to use.
-Instead of a face, FACENAME can evaluate to a property list
-of the form (face FACE PROP1 VAL1 PROP2 VAL2 ...)
-in which case all the listed text-properties will be set rather than
-just FACE. In such a case, you will most likely want to put those
-properties in `font-lock-extra-managed-props' or to override
-`font-lock-unfontify-region-function'.
-
-OVERRIDE and LAXMATCH are flags. If OVERRIDE is t, existing fontification can
-be overwritten. If `keep', only parts not already fontified are highlighted.
-If `prepend' or `append', existing fontification is merged with the new, in
-which the new or existing fontification, respectively, takes precedence.
-If LAXMATCH is non-nil, that means don't signal an error if there is
-no match for SUBEXP in MATCHER.
-
-For example, an element of the form highlights (if not already highlighted):
-
- \"\\\\\\=<foo\\\\\\=>\" discrete occurrences of \"foo\" in the value of the
- variable `font-lock-keyword-face'.
- (\"fu\\\\(bar\\\\)\" . 1) substring \"bar\" within all occurrences of \"fubar\" in
- the value of `font-lock-keyword-face'.
- (\"fubar\" . fubar-face) Occurrences of \"fubar\" in the value of `fubar-face'.
- (\"foo\\\\|bar\" 0 foo-bar-face t)
- occurrences of either \"foo\" or \"bar\" in the value
- of `foo-bar-face', even if already highlighted.
- (fubar-match 1 fubar-face)
- the first subexpression within all occurrences of
- whatever the function `fubar-match' finds and matches
- in the value of `fubar-face'.
-
-MATCH-ANCHORED should be of the form:
-
- (MATCHER PRE-MATCH-FORM POST-MATCH-FORM MATCH-HIGHLIGHT ...)
-
-where MATCHER is a regexp to search for or the function name to call to make
-the search, as for MATCH-HIGHLIGHT above, but with one exception; see below.
-PRE-MATCH-FORM and POST-MATCH-FORM are evaluated before the first, and after
-the last, instance MATCH-ANCHORED's MATCHER is used. Therefore they can be
-used to initialize before, and cleanup after, MATCHER is used. Typically,
-PRE-MATCH-FORM is used to move to some position relative to the original
-MATCHER, before starting with MATCH-ANCHORED's MATCHER. POST-MATCH-FORM might
-be used to move back, before resuming with MATCH-ANCHORED's parent's MATCHER.
-
-For example, an element of the form highlights (if not already highlighted):
-
- (\"\\\\\\=<anchor\\\\\\=>\" (0 anchor-face) (\"\\\\\\=<item\\\\\\=>\" nil nil (0 item-face)))
-
- discrete occurrences of \"anchor\" in the value of `anchor-face', and subsequent
- discrete occurrences of \"item\" (on the same line) in the value of `item-face'.
- (Here PRE-MATCH-FORM and POST-MATCH-FORM are nil. Therefore \"item\" is
- initially searched for starting from the end of the match of \"anchor\", and
- searching for subsequent instances of \"anchor\" resumes from where searching
- for \"item\" concluded.)
-
-The above-mentioned exception is as follows. The limit of the MATCHER search
-defaults to the end of the line after PRE-MATCH-FORM is evaluated.
-However, if PRE-MATCH-FORM returns a position greater than the position after
-PRE-MATCH-FORM is evaluated, that position is used as the limit of the search.
-It is generally a bad idea to return a position greater than the end of the
-line, i.e., cause the MATCHER search to span lines.
-
-These regular expressions can match text which spans lines, although
-it is better to avoid it if possible since updating them while editing
-text is slower, and it is not guaranteed to be always correct when using
-support modes like jit-lock or lazy-lock.
-
-This variable is set by major modes via the variable `font-lock-defaults'.
-Be careful when composing regexps for this list; a poorly written pattern can
-dramatically slow things down!
-
-A compiled keywords list starts with t. It is produced internal
-by `font-lock-compile-keywords' from a user-level keywords list.
-Its second element is the user-level keywords list that was
-compiled. The remaining elements have the same form as
-user-level keywords, but normally their values have been
-optimized.")
-
-(autoload (quote font-lock-mode-internal) "font-lock" "\
-Not documented
-
-\(fn ARG)" nil nil)
-
-(autoload (quote font-lock-add-keywords) "font-lock" "\
-Add highlighting KEYWORDS for MODE.
-
-MODE should be a symbol, the major mode command name, such as `c-mode'
-or nil. If nil, highlighting keywords are added for the current buffer.
-KEYWORDS should be a list; see the variable `font-lock-keywords'.
-By default they are added at the beginning of the current highlighting list.
-If optional argument APPEND is `set', they are used to replace the current
-highlighting list. If APPEND is any other non-nil value, they are added at the
-end of the current highlighting list.
-
-For example:
-
- (font-lock-add-keywords 'c-mode
- '((\"\\\\\\=<\\\\(FIXME\\\\):\" 1 font-lock-warning-face prepend)
- (\"\\\\\\=<\\\\(and\\\\|or\\\\|not\\\\)\\\\\\=>\" . font-lock-keyword-face)))
-
-adds two fontification patterns for C mode, to fontify `FIXME:' words, even in
-comments, and to fontify `and', `or' and `not' words as keywords.
-
-The above procedure will only add the keywords for C mode, not
-for modes derived from C mode. To add them for derived modes too,
-pass nil for MODE and add the call to c-mode-hook.
-
-For example:
-
- (add-hook 'c-mode-hook
- (lambda ()
- (font-lock-add-keywords nil
- '((\"\\\\\\=<\\\\(FIXME\\\\):\" 1 font-lock-warning-face prepend)
- (\"\\\\\\=<\\\\(and\\\\|or\\\\|not\\\\)\\\\\\=>\" .
- font-lock-keyword-face)))))
-
-The above procedure may fail to add keywords to derived modes if
-some involved major mode does not follow the standard conventions.
-File a bug report if this happens, so the major mode can be corrected.
-
-Note that some modes have specialized support for additional patterns, e.g.,
-see the variables `c-font-lock-extra-types', `c++-font-lock-extra-types',
-`objc-font-lock-extra-types' and `java-font-lock-extra-types'.
-
-\(fn MODE KEYWORDS &optional APPEND)" nil nil)
-
-(autoload (quote font-lock-remove-keywords) "font-lock" "\
-Remove highlighting KEYWORDS for MODE.
-
-MODE should be a symbol, the major mode command name, such as `c-mode'
-or nil. If nil, highlighting keywords are removed for the current buffer.
-
-To make the removal apply to modes derived from MODE as well,
-pass nil for MODE and add the call to MODE-hook. This may fail
-for some derived modes if some involved major mode does not
-follow the standard conventions. File a bug report if this
-happens, so the major mode can be corrected.
-
-\(fn MODE KEYWORDS)" nil nil)
-
-(autoload (quote font-lock-fontify-buffer) "font-lock" "\
-Fontify the current buffer the way the function `font-lock-mode' would.
-
-\(fn)" t nil)
-
-;;;***
-
;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (17148
;;;;;; 25154))
;;; Generated autoloads from mail/footnote.el
@@ -10771,7 +11107,7 @@ Visit a file in Forms mode in other window.
;;;***
;;;### (autoloads (fortran-mode fortran-tab-mode-default) "fortran"
-;;;;;; "progmodes/fortran.el" (17239 32378))
+;;;;;; "progmodes/fortran.el" (17358 30049))
;;; Generated autoloads from progmodes/fortran.el
(defvar fortran-tab-mode-default nil "\
@@ -10978,7 +11314,7 @@ default appearance of fringes on all frames, see the command
;;;***
;;;### (autoloads (gdb-enable-debug-log gdba) "gdb-ui" "progmodes/gdb-ui.el"
-;;;;;; (17247 12425))
+;;;;;; (17331 18137))
;;; Generated autoloads from progmodes/gdb-ui.el
(autoload (quote gdba) "gdb-ui" "\
@@ -11117,7 +11453,7 @@ regular expression that can be used as an element of
;;;***
;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el"
-;;;;;; (17196 24556))
+;;;;;; (17333 17859))
;;; Generated autoloads from progmodes/glasses.el
(autoload (quote glasses-mode) "glasses" "\
@@ -11130,7 +11466,7 @@ at places they belong to.
;;;***
;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server
-;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (17205 6099))
+;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (17316 41648))
;;; Generated autoloads from gnus/gnus.el
(autoload (quote gnus-slave-no-server) "gnus" "\
@@ -11181,7 +11517,7 @@ prompt the user for the name of an NNTP server to use.
;;;;;; gnus-agent-get-undownloaded-list gnus-agent-delete-group
;;;;;; gnus-agent-rename-group gnus-agent-possibly-save-gcc gnus-agentize
;;;;;; gnus-slave-unplugged gnus-plugged gnus-unplugged) "gnus-agent"
-;;;;;; "gnus/gnus-agent.el" (17239 32296))
+;;;;;; "gnus/gnus-agent.el" (17316 41648))
;;; Generated autoloads from gnus/gnus-agent.el
(autoload (quote gnus-unplugged) "gnus-agent" "\
@@ -11218,16 +11554,20 @@ Save GCC if Gnus is unplugged.
\(fn)" nil nil)
(autoload (quote gnus-agent-rename-group) "gnus-agent" "\
-Rename fully-qualified OLD-GROUP as NEW-GROUP. Always updates the agent, even when
-disabled, as the old agent files would corrupt gnus when the agent was
-next enabled. Depends upon the caller to determine whether group renaming is supported.
+Rename fully-qualified OLD-GROUP as NEW-GROUP.
+Always updates the agent, even when disabled, as the old agent
+files would corrupt gnus when the agent was next enabled.
+Depends upon the caller to determine whether group renaming is
+supported.
\(fn OLD-GROUP NEW-GROUP)" nil nil)
(autoload (quote gnus-agent-delete-group) "gnus-agent" "\
-Delete fully-qualified GROUP. Always updates the agent, even when
-disabled, as the old agent files would corrupt gnus when the agent was
-next enabled. Depends upon the caller to determine whether group deletion is supported.
+Delete fully-qualified GROUP.
+Always updates the agent, even when disabled, as the old agent
+files would corrupt gnus when the agent was next enabled.
+Depends upon the caller to determine whether group deletion is
+supported.
\(fn GROUP)" nil nil)
@@ -11268,7 +11608,7 @@ If CLEAN, obsolete (ignore).
;;;***
;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el"
-;;;;;; (17242 24869))
+;;;;;; (17367 34952))
;;; Generated autoloads from gnus/gnus-art.el
(autoload (quote gnus-article-prepare-display) "gnus-art" "\
@@ -11291,8 +11631,8 @@ Play a sound FILE through the speaker.
;;;### (autoloads (gnus-cache-delete-group gnus-cache-rename-group
;;;;;; gnus-cache-generate-nov-databases gnus-cache-generate-active
-;;;;;; gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (17148
-;;;;;; 25111))
+;;;;;; gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (17305
+;;;;;; 44993))
;;; Generated autoloads from gnus/gnus-cache.el
(autoload (quote gnus-jog-cache) "gnus-cache" "\
@@ -11314,27 +11654,29 @@ Generate NOV files recursively starting in DIR.
\(fn DIR)" t nil)
(autoload (quote gnus-cache-rename-group) "gnus-cache" "\
-Rename OLD-GROUP as NEW-GROUP. Always updates the cache, even when
-disabled, as the old cache files would corrupt gnus when the cache was
-next enabled. Depends upon the caller to determine whether group renaming is supported.
+Rename OLD-GROUP as NEW-GROUP.
+Always updates the cache, even when disabled, as the old cache
+files would corrupt Gnus when the cache was next enabled. It
+depends on the caller to determine whether group renaming is
+supported.
\(fn OLD-GROUP NEW-GROUP)" nil nil)
(autoload (quote gnus-cache-delete-group) "gnus-cache" "\
-Delete GROUP. Always updates the cache, even when
-disabled, as the old cache files would corrupt gnus when the cache was
-next enabled. Depends upon the caller to determine whether group deletion is supported.
+Delete GROUP from the cache.
+Always updates the cache, even when disabled, as the old cache
+files would corrupt gnus when the cache was next enabled.
+Depends upon the caller to determine whether group deletion is
+supported.
\(fn GROUP)" nil nil)
;;;***
;;;### (autoloads (gnus-delay-initialize gnus-delay-send-queue gnus-delay-article)
-;;;;;; "gnus-delay" "gnus/gnus-delay.el" (17148 25112))
+;;;;;; "gnus-delay" "gnus/gnus-delay.el" (17294 14916))
;;; Generated autoloads from gnus/gnus-delay.el
-(defgroup gnus-delay nil "Arrange for sending postings later." :version "22.1" :group (quote gnus))
-
(autoload (quote gnus-delay-article) "gnus-delay" "\
Delay this article by some time.
DELAY is a string, giving the length of the time. Possible values are:
@@ -11431,7 +11773,7 @@ FILE should be a PNG file that's 48x48 and smaller than or equal to
;;;***
;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group)
-;;;;;; "gnus-group" "gnus/gnus-group.el" (17148 25115))
+;;;;;; "gnus-group" "gnus/gnus-group.el" (17356 25047))
;;; Generated autoloads from gnus/gnus-group.el
(autoload (quote gnus-fetch-group) "gnus-group" "\
@@ -11601,7 +11943,7 @@ Update the .newsrc.eld file to reflect the change of nntp server.
;;;***
;;;### (autoloads (gnus-button-reply gnus-button-mailto gnus-msg-mail)
-;;;;;; "gnus-msg" "gnus/gnus-msg.el" (17185 27515))
+;;;;;; "gnus-msg" "gnus/gnus-msg.el" (17348 27747))
;;; Generated autoloads from gnus/gnus-msg.el
(autoload (quote gnus-msg-mail) "gnus-msg" "\
@@ -11798,8 +12140,8 @@ Update the format specification near point.
;;;***
;;;### (autoloads (gnus-fixup-nnimap-unread-after-getting-new-news
-;;;;;; gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (17239
-;;;;;; 32303))
+;;;;;; gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (17356
+;;;;;; 25047))
;;; Generated autoloads from gnus/gnus-start.el
(autoload (quote gnus-declare-backend) "gnus-start" "\
@@ -11852,7 +12194,7 @@ Use \\[describe-mode] for more info.
;;;***
;;;### (autoloads (goto-address goto-address-at-point) "goto-addr"
-;;;;;; "net/goto-addr.el" (17140 20941))
+;;;;;; "net/goto-addr.el" (17333 17859))
;;; Generated autoloads from net/goto-addr.el
(define-obsolete-function-alias (quote goto-address-at-mouse) (quote goto-address-at-point) "22.1")
@@ -11869,7 +12211,8 @@ there, then load the URL at or before point.
Sets up goto-address functionality in the current buffer.
Allows user to use mouse/keyboard command to click to go to a URL
or to send e-mail.
-By default, goto-address binds to mouse-2 and C-c RET.
+By default, goto-address binds `goto-address-at-point' to mouse-2 and C-c RET
+only on URLs and e-mail addresses.
Also fontifies the buffer appropriately (see `goto-address-fontify-p' and
`goto-address-highlight-p' for more information).
@@ -12018,7 +12361,7 @@ the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful.
;;;***
;;;### (autoloads (gud-tooltip-mode gdb-script-mode bashdb jdb pdb
-;;;;;; perldb xdb dbx sdb gdb) "gud" "progmodes/gud.el" (17247 12425))
+;;;;;; perldb xdb dbx sdb gdb) "gud" "progmodes/gud.el" (17342 36761))
;;; Generated autoloads from progmodes/gud.el
(autoload (quote gdb) "gud" "\
@@ -12291,8 +12634,9 @@ different regions. With numeric argument ARG, behaves like
;;;***
;;;### (autoloads (describe-categories describe-syntax describe-variable
-;;;;;; variable-at-point describe-function-1 help-C-file-name describe-function
-;;;;;; help-with-tutorial) "help-fns" "help-fns.el" (17250 21610))
+;;;;;; variable-at-point describe-function-1 describe-simplify-lib-file-name
+;;;;;; help-C-file-name describe-function help-with-tutorial) "help-fns"
+;;;;;; "help-fns.el" (17369 18480))
;;; Generated autoloads from help-fns.el
(autoload (quote help-with-tutorial) "help-fns" "\
@@ -12315,8 +12659,10 @@ KIND should be `var' for a variable or `subr' for a subroutine.
\(fn SUBR-OR-VAR KIND)" nil nil)
-(defface help-argument-name (quote ((((supports :slant italic)) :inherit italic))) "\
-Face to highlight argument names in *Help* buffers." :group (quote help))
+(autoload (quote describe-simplify-lib-file-name) "help-fns" "\
+Simplify a library name FILE to a relative name, and make it a source file.
+
+\(fn FILE)" nil nil)
(autoload (quote describe-function-1) "help-fns" "\
Not documented
@@ -12356,7 +12702,7 @@ BUFFER should be a buffer or a buffer name.
;;;***
;;;### (autoloads (three-step-help) "help-macro" "help-macro.el"
-;;;;;; (17148 24982))
+;;;;;; (17312 51444))
;;; Generated autoloads from help-macro.el
(defvar three-step-help nil "\
@@ -12372,7 +12718,7 @@ A value of nil means skip the middle step, so that
;;;### (autoloads (help-xref-on-pp help-insert-xref-button help-xref-button
;;;;;; help-make-xrefs help-setup-xref help-mode-finish help-mode-setup
-;;;;;; help-mode) "help-mode" "help-mode.el" (17148 24983))
+;;;;;; help-mode) "help-mode" "help-mode.el" (17329 45783))
;;; Generated autoloads from help-mode.el
(autoload (quote help-mode) "help-mode" "\
@@ -12566,22 +12912,19 @@ This discards the buffer's undo information.
;;;### (autoloads (hi-lock-write-interactive-patterns hi-lock-unface-buffer
;;;;;; hi-lock-face-phrase-buffer hi-lock-face-buffer hi-lock-line-face-buffer
-;;;;;; hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el" (17205
-;;;;;; 6005))
+;;;;;; global-hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el"
+;;;;;; (17378 6213))
;;; Generated autoloads from hi-lock.el
-(defvar hi-lock-mode nil "\
-Toggle hi-lock, for interactively adding font-lock text-highlighting patterns.")
-
-(custom-autoload (quote hi-lock-mode) "hi-lock")
-
(autoload (quote hi-lock-mode) "hi-lock" "\
Toggle minor mode for interactively adding font-lock highlighting patterns.
-If ARG positive turn hi-lock on. Issuing a hi-lock command will also
-turn hi-lock on. When hi-lock is turned on, a \"Regexp Highlighting\"
-submenu is added to the \"Edit\" menu. The commands in the submenu,
-which can be called interactively, are:
+If ARG positive, turn hi-lock on. Issuing a hi-lock command will also
+turn hi-lock on. To turn hi-lock on in all buffers use
+`global-hi-lock-mode' or in your .emacs file (global-hi-lock-mode 1).
+When hi-lock is turned on, a \"Regexp Highlighting\" submenu is added
+to the \"Edit\" menu. The commands in the submenu, which can be
+called interactively, are:
\\[highlight-regexp] REGEXP FACE
Highlight matches of pattern REGEXP in current buffer with FACE.
@@ -12598,10 +12941,10 @@ which can be called interactively, are:
Remove highlighting on matches of REGEXP in current buffer.
\\[hi-lock-write-interactive-patterns]
- Write active REGEXPs into buffer as comments (if possible). They will
+ Write active REGEXPs into buffer as comments (if possible). They will
be read the next time file is loaded or when the \\[hi-lock-find-patterns] command
is issued. The inserted regexps are in the form of font lock keywords.
- (See `font-lock-keywords') They may be edited and re-loaded with \\[hi-lock-find-patterns],
+ (See `font-lock-keywords'.) They may be edited and re-loaded with \\[hi-lock-find-patterns],
any valid `font-lock-keywords' form is acceptable.
\\[hi-lock-find-patterns]
@@ -12610,12 +12953,30 @@ which can be called interactively, are:
When hi-lock is started and if the mode is not excluded, the
beginning of the buffer is searched for lines of the form:
Hi-lock: FOO
-where FOO is a list of patterns. These are added to the font lock keywords
-already present. The patterns must start before position (number
-of characters into buffer) `hi-lock-file-patterns-range'. Patterns
-will be read until
+where FOO is a list of patterns. These are added to the font lock
+keywords already present. The patterns must start before position
+\(number of characters into buffer) `hi-lock-file-patterns-range'.
+Patterns will be read until
Hi-lock: end
-is found. A mode is excluded if it's in the list `hi-lock-exclude-modes'.
+is found. A mode is excluded if it's in the list `hi-lock-exclude-modes'.
+
+\(fn &optional ARG)" t nil)
+
+(defvar global-hi-lock-mode nil "\
+Non-nil if Global-Hi-Lock mode is enabled.
+See the command `global-hi-lock-mode' for a description of this minor-mode.
+Setting this variable directly does not take effect;
+use either \\[customize] or the function `global-hi-lock-mode'.")
+
+(custom-autoload (quote global-hi-lock-mode) "hi-lock")
+
+(put (quote global-hi-lock-mode) (quote custom-set) (quote custom-set-minor-mode))
+
+(autoload (quote global-hi-lock-mode) "hi-lock" "\
+Toggle Hi-Lock mode in every buffer.
+With prefix ARG, turn Global-Hi-Lock mode on if and only if ARG is positive.
+Hi-Lock mode is actually not turned on in every buffer but only in those
+in which `turn-on-hi-lock-if-enabled' turns it on.
\(fn &optional ARG)" t nil)
@@ -12627,7 +12988,7 @@ Set face of all lines containing a match of REGEXP to FACE.
Interactively, prompt for REGEXP then FACE. Buffer-local history
list maintained for regexps, global history maintained for faces.
\\<minibuffer-local-map>Use \\[next-history-element] and \\[previous-history-element] to retrieve next or previous history item.
-\(See info node `Minibuffer History')
+\(See info node `Minibuffer History'.)
\(fn REGEXP &optional FACE)" t nil)
@@ -12639,7 +13000,7 @@ Set face of each match of REGEXP to FACE.
Interactively, prompt for REGEXP then FACE. Buffer-local history
list maintained for regexps, global history maintained for faces.
\\<minibuffer-local-map>Use \\[next-history-element] and \\[previous-history-element] to retrieve next or previous history item.
-\(See info node `Minibuffer History')
+\(See info node `Minibuffer History'.)
\(fn REGEXP &optional FACE)" t nil)
@@ -12791,7 +13152,7 @@ Key bindings:
;;;;;; highlight-compare-buffers highlight-changes-rotate-faces
;;;;;; highlight-changes-previous-change highlight-changes-next-change
;;;;;; highlight-changes-mode highlight-changes-remove-highlight)
-;;;;;; "hilit-chg" "hilit-chg.el" (17148 24984))
+;;;;;; "hilit-chg" "hilit-chg.el" (17376 48878))
;;; Generated autoloads from hilit-chg.el
(autoload (quote highlight-changes-remove-highlight) "hilit-chg" "\
@@ -12899,7 +13260,7 @@ Turn on or off global Highlight Changes mode.
When called interactively:
- if no prefix, toggle global Highlight Changes mode on or off
- if called with a positive prefix (or just C-u) turn it on in active mode
-- if called with a zero prefix turn it on in passive mode
+- if called with a zero prefix turn it on in passive mode
- if called with a negative prefix turn it off
When called from a program:
@@ -12994,7 +13355,7 @@ argument VERBOSE non-nil makes the function verbose.
;;;***
;;;### (autoloads (global-hl-line-mode hl-line-mode) "hl-line" "hl-line.el"
-;;;;;; (17148 24985))
+;;;;;; (17363 41687))
;;; Generated autoloads from hl-line.el
(autoload (quote hl-line-mode) "hl-line" "\
@@ -13036,7 +13397,7 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and
;;;***
;;;### (autoloads (list-holidays holidays) "holidays" "calendar/holidays.el"
-;;;;;; (17239 32269))
+;;;;;; (17307 14150))
;;; Generated autoloads from calendar/holidays.el
(autoload (quote holidays) "holidays" "\
@@ -13098,10 +13459,11 @@ Convert HTML to plain text in the current buffer.
;;;***
;;;### (autoloads (ibuffer-do-occur ibuffer-mark-dired-buffers ibuffer-mark-read-only-buffers
-;;;;;; ibuffer-mark-special-buffers ibuffer-mark-old-buffers ibuffer-mark-help-buffers
-;;;;;; ibuffer-mark-dissociated-buffers ibuffer-mark-unsaved-buffers
-;;;;;; ibuffer-mark-modified-buffers ibuffer-mark-by-mode ibuffer-mark-by-file-name-regexp
-;;;;;; ibuffer-mark-by-mode-regexp ibuffer-mark-by-name-regexp ibuffer-copy-filename-as-kill
+;;;;;; ibuffer-mark-special-buffers ibuffer-mark-old-buffers ibuffer-mark-compressed-file-buffers
+;;;;;; ibuffer-mark-help-buffers ibuffer-mark-dissociated-buffers
+;;;;;; ibuffer-mark-unsaved-buffers ibuffer-mark-modified-buffers
+;;;;;; ibuffer-mark-by-mode ibuffer-mark-by-file-name-regexp ibuffer-mark-by-mode-regexp
+;;;;;; ibuffer-mark-by-name-regexp ibuffer-copy-filename-as-kill
;;;;;; ibuffer-diff-with-file ibuffer-jump-to-buffer ibuffer-do-kill-lines
;;;;;; ibuffer-backwards-next-marked ibuffer-forward-next-marked
;;;;;; ibuffer-add-to-tmp-show ibuffer-add-to-tmp-hide ibuffer-bs-show
@@ -13118,7 +13480,7 @@ Convert HTML to plain text in the current buffer.
;;;;;; ibuffer-backward-filter-group ibuffer-forward-filter-group
;;;;;; ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group
;;;;;; ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode
-;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" (17239 32209))
+;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" (17378 33493))
;;; Generated autoloads from ibuf-ext.el
(autoload (quote ibuffer-auto-mode) "ibuf-ext" "\
@@ -13449,6 +13811,11 @@ Mark buffers like *Help*, *Apropos*, *Info*.
\(fn)" t nil)
+(autoload (quote ibuffer-mark-compressed-file-buffers) "ibuf-ext" "\
+Mark buffers whose associated file is compressed.
+
+\(fn)" t nil)
+
(autoload (quote ibuffer-mark-old-buffers) "ibuf-ext" "\
Mark buffers which have not been viewed in `ibuffer-old-time' days.
@@ -13566,7 +13933,7 @@ bound to the current value of the filter.
;;;***
;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers)
-;;;;;; "ibuffer" "ibuffer.el" (17167 2779))
+;;;;;; "ibuffer" "ibuffer.el" (17378 33493))
;;; Generated autoloads from ibuffer.el
(autoload (quote ibuffer-list-buffers) "ibuffer" "\
@@ -13607,7 +13974,7 @@ FORMATS is the value to use for `ibuffer-formats'.
;;;### (autoloads (icalendar-import-buffer icalendar-import-file
;;;;;; icalendar-export-region icalendar-export-file) "icalendar"
-;;;;;; "calendar/icalendar.el" (17244 46363))
+;;;;;; "calendar/icalendar.el" (17244 54746))
;;; Generated autoloads from calendar/icalendar.el
(autoload (quote icalendar-export-file) "icalendar" "\
@@ -13681,7 +14048,7 @@ With a numeric argument, turn Icomplete mode on iff ARG is positive.
;;;***
-;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (17140 20972))
+;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (17276 44726))
;;; Generated autoloads from progmodes/icon.el
(autoload (quote icon-mode) "icon" "\
@@ -13722,7 +14089,7 @@ with no args, if that value is non-nil.
;;;***
;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el"
-;;;;;; (17239 32385))
+;;;;;; (17298 27296))
;;; Generated autoloads from progmodes/idlw-shell.el
(autoload (quote idlwave-shell) "idlw-shell" "\
@@ -13748,7 +14115,7 @@ See also the variable `idlwave-shell-prompt-pattern'.
;;;***
;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el"
-;;;;;; (17205 6190))
+;;;;;; (17276 44726))
;;; Generated autoloads from progmodes/idlwave.el
(autoload (quote idlwave-mode) "idlwave" "\
@@ -13884,8 +14251,8 @@ The main features of this mode are
;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file
;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer
;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window
-;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17239
-;;;;;; 32211))
+;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17304
+;;;;;; 41554))
;;; Generated autoloads from ido.el
(defvar ido-mode nil "\
@@ -13924,7 +14291,7 @@ As you type in a string, all of the buffers matching the string are
displayed if substring-matching is used (default). Look at
`ido-enable-prefix' and `ido-toggle-prefix'. When you have found the
buffer you want, it can then be selected. As you type, most keys have
-their normal keybindings, except for the following: \\<ido-mode-map>
+their normal keybindings, except for the following: \\<ido-buffer-completion-map>
RET Select the buffer at the front of the list of matches. If the
list is empty, possibly prompt to create new buffer.
@@ -14001,7 +14368,7 @@ type in a string, all of the filenames matching the string are displayed
if substring-matching is used (default). Look at `ido-enable-prefix' and
`ido-toggle-prefix'. When you have found the filename you want, it can
then be selected. As you type, most keys have their normal keybindings,
-except for the following: \\<ido-mode-map>
+except for the following: \\<ido-file-completion-map>
RET Select the file at the front of the list of matches. If the
list is empty, possibly prompt to create new file.
@@ -14020,7 +14387,7 @@ in a separate window.
\\[ido-merge-work-directories] search for file in the work directory history.
\\[ido-forget-work-directory] removes current directory from the work directory history.
\\[ido-prev-work-file] or \\[ido-next-work-file] cycle through the work file history.
-\\[ido-wide-find-file] and \\[ido-wide-find-dir] prompts and uses find to locate files or directories.
+\\[ido-wide-find-file-or-pop-dir] and \\[ido-wide-find-dir-or-delete-dir] prompts and uses find to locate files or directories.
\\[ido-make-directory] prompts for a directory to create in current directory.
\\[ido-fallback-command] Fallback to non-ido version of current command.
\\[ido-toggle-regexp] Toggle regexp searching.
@@ -14177,7 +14544,7 @@ Toggle inline image minor mode.
;;;### (autoloads (defimage find-image remove-images insert-sliced-image
;;;;;; insert-image put-image create-image image-type-available-p
;;;;;; image-type-from-file-name image-type-from-file-header image-type-from-buffer
-;;;;;; image-type-from-data) "image" "image.el" (17245 4868))
+;;;;;; image-type-from-data) "image" "image.el" (17245 16456))
;;; Generated autoloads from image.el
(autoload (quote image-type-from-data) "image" "\
@@ -14391,7 +14758,7 @@ Image files are those whose name has an extension in
;;;***
;;;### (autoloads (image-mode-maybe image-minor-mode image-mode)
-;;;;;; "image-mode" "image-mode.el" (17205 6006))
+;;;;;; "image-mode" "image-mode.el" (17374 39346))
;;; Generated autoloads from image-mode.el
(push '("\\.jpe?g\\'" . image-mode) auto-mode-alist)
(push '("\\.png\\'" . image-mode) auto-mode-alist)
@@ -14549,11 +14916,11 @@ for more information.
;;;### (autoloads (indian-char-glyph indian-glyph-char in-is13194-pre-write-conversion
;;;;;; in-is13194-post-read-conversion indian-compose-string indian-compose-region)
-;;;;;; "ind-util" "language/ind-util.el" (17102 18773))
+;;;;;; "ind-util" "language/ind-util.el" (17339 56590))
;;; Generated autoloads from language/ind-util.el
(autoload (quote indian-compose-region) "ind-util" "\
-Compose the region according to `composition-function-table'.
+Compose the region according to `composition-function-table'.
\(fn FROM TO)" t nil)
@@ -14658,22 +15025,22 @@ of `inferior-lisp-program'). Runs the hooks from
;;;### (autoloads (Info-speedbar-browser Info-goto-emacs-key-command-node
;;;;;; Info-goto-emacs-command-node Info-mode info-apropos Info-index
-;;;;;; Info-directory info-standalone info-emacs-manual info info-other-window)
-;;;;;; "info" "info.el" (17248 29269))
+;;;;;; Info-directory Info-on-current-buffer info-standalone info-emacs-manual
+;;;;;; info info-other-window) "info" "info.el" (17380 50980))
;;; Generated autoloads from info.el
(autoload (quote info-other-window) "info" "\
Like `info' but show the Info buffer in another window.
-\(fn &optional FILE)" t nil)
+\(fn &optional FILE-OR-NODE)" t nil)
(add-hook 'same-window-regexps "\\*info\\*\\(\\|<[0-9]+>\\)")
(put 'info 'info-file "emacs")
(autoload (quote info) "info" "\
Enter Info, the documentation browser.
-Optional argument FILE specifies the file to examine;
+Optional argument FILE-OR-NODE specifies the file to examine;
the default is the top-level directory of Info.
-Called from a program, FILE may specify an Info node of the form
+Called from a program, FILE-OR-NODE may specify an Info node of the form
`(FILENAME)NODENAME'.
Optional argument BUFFER specifies the Info buffer name;
the default buffer name is *info*. If BUFFER exists,
@@ -14689,7 +15056,7 @@ The search path for Info files is in the variable `Info-directory-list'.
The top-level Info directory is made by combining all the files named `dir'
in all the directories in that path.
-\(fn &optional FILE BUFFER)" t nil)
+\(fn &optional FILE-OR-NODE BUFFER)" t nil)
(autoload (quote info-emacs-manual) "info" "\
Display the Emacs manual in Info mode.
@@ -14703,17 +15070,24 @@ In standalone mode, \\<Info-mode-map>\\[Info-exit] exits Emacs itself.
\(fn)" nil nil)
+(autoload (quote Info-on-current-buffer) "info" "\
+Use Info mode to browse the current Info buffer.
+With a prefix arg, this queries for the node name to visit first;
+otherwise, that defaults to `Top'.
+
+\(fn &optional NODENAME)" t nil)
+
(autoload (quote Info-directory) "info" "\
Go to the Info directory node.
\(fn)" t nil)
(autoload (quote Info-index) "info" "\
-Look up a string TOPIC in the index for this file.
+Look up a string TOPIC in the index for this manual and go to that entry.
If there are no exact matches to the specified topic, this chooses
the first match which is a case-insensitive substring of a topic.
Use the \\<Info-mode-map>\\[Info-index-next] command to see the other matches.
-Give a blank topic name to go to the Index node itself.
+Give an empty topic name to go to the Index node itself.
\(fn TOPIC)" t nil)
@@ -14773,7 +15147,7 @@ Advanced commands:
\\[Info-search-case-sensitively] Search through this Info file for specified regexp case-sensitively.
\\[Info-search-next] Search for another occurrence of regexp
from a previous \\<Info-mode-map>\\[Info-search] command.
-\\[Info-index] Look up a topic in this file's Index and move to that node.
+\\[Info-index] Look up a topic in this manual's Index and move to that index entry.
\\[Info-index-next] (comma) Move to the next match from a previous \\<Info-mode-map>\\[Info-index] command.
\\[info-apropos] Look for a string in the indices of all manuals.
\\[Info-goto-node] Move to node specified by name.
@@ -14866,7 +15240,7 @@ Perform completion on file preceding point.
;;;***
;;;### (autoloads (info-xref-check-all-custom info-xref-check-all
-;;;;;; info-xref-check) "info-xref" "info-xref.el" (17167 2781))
+;;;;;; info-xref-check) "info-xref" "info-xref.el" (17167 2962))
;;; Generated autoloads from info-xref.el
(autoload (quote info-xref-check) "info-xref" "\
@@ -15099,7 +15473,7 @@ Add submenus to the File menu, to convert to and from various formats.
;;;;;; ispell-region ispell-change-dictionary ispell-kill-ispell
;;;;;; ispell-help ispell-pdict-save ispell-word ispell-local-dictionary-alist
;;;;;; ispell-personal-dictionary) "ispell" "textmodes/ispell.el"
-;;;;;; (17244 43761))
+;;;;;; (17370 39824))
;;; Generated autoloads from textmodes/ispell.el
(defvar ispell-personal-dictionary nil "\
@@ -15123,11 +15497,11 @@ re-start emacs.")
(setq ispell-dictionary-alist-2 (quote (("czech" "[A-Za-z\301\311\314\315\323\332\331\335\256\251\310\330\317\253\322\341\351\354\355\363\372\371\375\276\271\350\370\357\273\362]" "[^A-Za-z\301\311\314\315\323\332\331\335\256\251\310\330\317\253\322\341\351\354\355\363\372\371\375\276\271\350\370\357\273\362]" "" nil ("-B") nil iso-8859-2) ("dansk" "[A-Z\306\330\305a-z\346\370\345]" "[^A-Z\306\330\305a-z\346\370\345]" "[']" nil ("-C") nil iso-8859-1) ("deutsch" "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1) ("deutsch8" "[a-zA-Z\304\326\334\344\366\337\374]" "[^a-zA-Z\304\326\334\344\366\337\374]" "[']" t ("-C" "-d" "deutsch") "~latin1" iso-8859-1) ("english" "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1))))
-(setq ispell-dictionary-alist-3 (quote (("esperanto" "[A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" "[^A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" "[-']" t ("-C") "~latin3" iso-8859-1) ("esperanto-tex" "[A-Za-z^\\]" "[^A-Za-z^\\]" "[-'`\"]" t ("-C" "-d" "esperanto") "~tex" iso-8859-1) ("francais7" "[A-Za-z]" "[^A-Za-z]" "[`'^---]" t nil nil iso-8859-1) ("francais" "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" "[-']" t nil "~list" iso-8859-1) ("francais-tex" "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" "[-'^`\"]" t nil "~tex" iso-8859-1))))
+(setq ispell-dictionary-alist-3 (quote (("esperanto" "[A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" "[^A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" "[-']" t ("-C") "~latin3" iso-8859-1) ("esperanto-tex" "[A-Za-z^\\]" "[^A-Za-z^\\]" "[-'`\"]" t ("-C" "-d" "esperanto") "~tex" iso-8859-1) ("francais7" "[A-Za-z]" "[^A-Za-z]" "[`'^---]" t nil nil iso-8859-1) ("francais" "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" "[-'.@]" t nil "~list" iso-8859-1) ("francais-tex" "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" "[-'^`\".@]" t nil "~tex" iso-8859-1))))
-(setq ispell-dictionary-alist-4 (quote (("german" "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1) ("german8" "[a-zA-Z\304\326\334\344\366\337\374]" "[^a-zA-Z\304\326\334\344\366\337\374]" "[']" t ("-C" "-d" "german") "~latin1" iso-8859-1) ("italiano" "[A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]" "[^A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]" "[-]" nil ("-B" "-d" "italian") "~tex" iso-8859-1) ("nederlands" "[A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[^A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[']" t ("-C") nil iso-8859-1) ("nederlands8" "[A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[^A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[']" t ("-C") nil iso-8859-1))))
+(setq ispell-dictionary-alist-4 (quote (("german" "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1) ("german8" "[a-zA-Z\304\326\334\344\366\337\374]" "[^a-zA-Z\304\326\334\344\366\337\374]" "[']" t ("-C" "-d" "german") "~latin1" iso-8859-1) ("italiano" "[A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]" "[^A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]" "[-.]" nil ("-B" "-d" "italian") "~tex" iso-8859-1) ("nederlands" "[A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[^A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[']" t ("-C") nil iso-8859-1) ("nederlands8" "[A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[^A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[']" t ("-C") nil iso-8859-1))))
-(setq ispell-dictionary-alist-5 (quote (("norsk" "[A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]" "[^A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]" "[\"]" nil nil "~list" iso-8859-1) ("norsk7-tex" "[A-Za-z{}\\'^`]" "[^A-Za-z{}\\'^`]" "[\"]" nil ("-d" "norsk") "~plaintex" iso-8859-1) ("polish" "[A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" "[^A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" "" nil nil nil iso-8859-2) ("portugues" "[a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" "[^a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" "[']" t ("-C") "~latin1" iso-8859-1))))
+(setq ispell-dictionary-alist-5 (quote (("norsk" "[A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]" "[^A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]" "[\"]" nil nil "~list" iso-8859-1) ("norsk7-tex" "[A-Za-z{}\\'^`]" "[^A-Za-z{}\\'^`]" "[\"]" nil ("-d" "norsk") "~plaintex" iso-8859-1) ("polish" "[A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" "[^A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" "." nil nil nil iso-8859-2) ("portugues" "[a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" "[^a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" "[']" t ("-C") "~latin1" iso-8859-1))))
(setq ispell-dictionary-alist-6 (quote (("russian" "[\341\342\367\347\344\345\263\366\372\351\352\353\354\355\356\357\360\362\363\364\365\346\350\343\376\373\375\370\371\377\374\340\361\301\302\327\307\304\305\243\326\332\311\312\313\314\315\316\317\320\322\323\324\325\306\310\303\336\333\335\330\331\337\334\300\321]" "[^\341\342\367\347\344\345\263\366\372\351\352\353\354\355\356\357\360\362\363\364\365\346\350\343\376\373\375\370\371\377\374\340\361\301\302\327\307\304\305\243\326\332\311\312\313\314\315\316\317\320\322\323\324\325\306\310\303\336\333\335\330\331\337\334\300\321]" "" nil nil nil koi8-r) ("russianw" "[\300\301\302\303\304\305\250\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\334\333\332\335\336\337\340\341\342\343\344\345\270\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\374\373\372\375\376\377]" "[^\300\301\302\303\304\305\250\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\334\333\332\335\336\337\340\341\342\343\344\345\270\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\374\373\372\375\376\377]" "" nil nil nil windows-1251) ("slovak" "[A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]" "[^A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]" "" nil ("-B") nil iso-8859-2) ("slovenian" "[A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]" "[^A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]" "" nil ("-B" "-d" "slovenian") nil iso-8859-2) ("svenska" "[A-Za-z\345\344\366\351\340\374\350\346\370\347\305\304\326\311\300\334\310\306\330\307]" "[^A-Za-z\345\344\366\351\340\374\350\346\370\347\305\304\326\311\300\334\310\306\330\307]" "[']" nil ("-C") "~list" iso-8859-1))))
@@ -15385,8 +15759,8 @@ You can bind this to the key C-c i in GNUS or mail by adding to
;;;***
-;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (17239
-;;;;;; 32217))
+;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (17354
+;;;;;; 62493))
;;; Generated autoloads from iswitchb.el
(defvar iswitchb-mode nil "\
@@ -15489,22 +15863,8 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading.
;;;***
-;;;### (autoloads (jit-lock-register) "jit-lock" "jit-lock.el" (17246
-;;;;;; 24773))
-;;; Generated autoloads from jit-lock.el
-
-(autoload (quote jit-lock-register) "jit-lock" "\
-Register FUN as a fontification function to be called in this buffer.
-FUN will be called with two arguments START and END indicating the region
-that needs to be (re)fontified.
-If non-nil, CONTEXTUAL means that a contextual fontification would be useful.
-
-\(fn FUN &optional CONTEXTUAL)" nil nil)
-
-;;;***
-
;;;### (autoloads (jka-compr-uninstall jka-compr-handler) "jka-compr"
-;;;;;; "jka-compr.el" (17148 24997))
+;;;;;; "jka-compr.el" (17355 64266))
;;; Generated autoloads from jka-compr.el
(defvar jka-compr-inhibit nil "\
@@ -15585,7 +15945,7 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.'
;;;***
;;;### (autoloads (kinsoku) "kinsoku" "international/kinsoku.el"
-;;;;;; (17102 18716))
+;;;;;; (17301 53989))
;;; Generated autoloads from international/kinsoku.el
(autoload (quote kinsoku) "kinsoku" "\
@@ -15861,11 +16221,12 @@ Not documented
;;;### (autoloads (latexenc-find-file-coding-system latexenc-coding-system-to-inputenc
;;;;;; latexenc-inputenc-to-coding-system latex-inputenc-coding-alist)
-;;;;;; "latexenc" "international/latexenc.el" (17102 18717))
+;;;;;; "latexenc" "international/latexenc.el" (17370 39824))
;;; Generated autoloads from international/latexenc.el
(defvar latex-inputenc-coding-alist (quote (("ansinew" . windows-1252) ("applemac" . mac-roman) ("ascii" . us-ascii) ("cp1250" . windows-1250) ("cp1252" . windows-1252) ("cp1257" . cp1257) ("cp437de" . cp437) ("cp437" . cp437) ("cp850" . cp850) ("cp852" . cp852) ("cp865" . cp865) ("latin1" . iso-8859-1) ("latin2" . iso-8859-2) ("latin3" . iso-8859-3) ("latin4" . iso-8859-4) ("latin5" . iso-8859-5) ("latin9" . iso-8859-15) ("next" . next) ("utf8" . utf-8) ("utf8x" . utf-8))) "\
-Mapping from encoding names used by LaTeX's \"inputenc.sty\" to Emacs coding systems.
+Mapping from LaTeX encodings in \"inputenc.sty\" to Emacs coding systems.
+LaTeX encodings are specified with \"\\usepackage[encoding]{inputenc}\".
Used by the function `latexenc-find-file-coding-system'.")
(custom-autoload (quote latex-inputenc-coding-alist) "latexenc")
@@ -16004,10 +16365,12 @@ Unconditionally turn on Lazy Lock mode.
;;;***
;;;### (autoloads (ld-script-mode) "ld-script" "progmodes/ld-script.el"
-;;;;;; (17159 1485))
+;;;;;; (17352 9346))
;;; Generated autoloads from progmodes/ld-script.el
-(add-to-list (quote auto-mode-alist) (quote ("\\.lds" . ld-script-mode)))
+(add-to-list (quote auto-mode-alist) (quote ("\\.ld[si]?\\>" . ld-script-mode)))
+
+(add-to-list (quote auto-mode-alist) (quote ("\\.x[bdsru]?[cn]?\\'" . ld-script-mode)))
(autoload (quote ld-script-mode) "ld-script" "\
A major mode to edit GNU ld script files
@@ -16088,7 +16451,7 @@ such as redefining an Emacs function.
;;;***
;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches)
-;;;;;; "locate" "locate.el" (17244 43734))
+;;;;;; "locate" "locate.el" (17333 17859))
;;; Generated autoloads from locate.el
(defvar locate-ls-subdir-switches "-al" "\
@@ -16113,7 +16476,7 @@ shown; this is often useful to constrain a big search.
;;;***
-;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (17239 32218))
+;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (17291 34530))
;;; Generated autoloads from log-edit.el
(autoload (quote log-edit) "log-edit" "\
@@ -16134,8 +16497,8 @@ If BUFFER is non-nil `log-edit' will jump to that buffer, use it to edit the
;;;***
-;;;### (autoloads (log-view-mode) "log-view" "log-view.el" (17185
-;;;;;; 27447))
+;;;### (autoloads (log-view-mode) "log-view" "log-view.el" (17366
+;;;;;; 32173))
;;; Generated autoloads from log-view.el
(autoload (quote log-view-mode) "log-view" "\
@@ -16145,8 +16508,8 @@ Major mode for browsing CVS log output.
;;;***
-;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (17248
-;;;;;; 29269))
+;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (17320
+;;;;;; 32463))
;;; Generated autoloads from longlines.el
(autoload (quote longlines-mode) "longlines" "\
@@ -16262,7 +16625,7 @@ for further customization of the printer command.
;;;***
;;;### (autoloads (ls-lisp-support-shell-wildcards) "ls-lisp" "ls-lisp.el"
-;;;;;; (17148 25015))
+;;;;;; (17283 35537))
;;; Generated autoloads from ls-lisp.el
(defvar ls-lisp-support-shell-wildcards t "\
@@ -16273,8 +16636,8 @@ Otherwise they are treated as Emacs regexps (for backward compatibility).")
;;;***
-;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17167
-;;;;;; 2792))
+;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17307
+;;;;;; 14150))
;;; Generated autoloads from calendar/lunar.el
(autoload (quote phases-of-moon) "lunar" "\
@@ -16287,8 +16650,8 @@ This function is suitable for execution in a .emacs file.
;;;***
-;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17140
-;;;;;; 20977))
+;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17276
+;;;;;; 44726))
;;; Generated autoloads from progmodes/m4-mode.el
(autoload (quote m4-mode) "m4-mode" "\
@@ -16403,14 +16766,15 @@ and then select the region of un-tablified names and use
;;;***
;;;### (autoloads (what-domain mail-extract-address-components) "mail-extr"
-;;;;;; "mail/mail-extr.el" (17148 25155))
+;;;;;; "mail/mail-extr.el" (17306 5314))
;;; Generated autoloads from mail/mail-extr.el
(autoload (quote mail-extract-address-components) "mail-extr" "\
Given an RFC-822 address ADDRESS, extract full name and canonical address.
-Returns a list of the form (FULL-NAME CANONICAL-ADDRESS).
-If no name can be extracted, FULL-NAME will be nil. Also see
-`mail-extr-ignore-single-names' and `mail-extr-ignore-realname-equals-mailbox-name'.
+Returns a list of the form (FULL-NAME CANONICAL-ADDRESS). If no
+name can be extracted, FULL-NAME will be nil. Also see
+`mail-extr-ignore-single-names' and
+`mail-extr-ignore-realname-equals-mailbox-name'.
If the optional argument ALL is non-nil, then ADDRESS can contain zero
or more recipients, separated by commas, and we return a list of
@@ -16588,7 +16952,7 @@ current header, calls `mail-complete-function' and passes prefix arg if any.
;;;***
;;;### (autoloads (mailclient-send-it) "mailclient" "mail/mailclient.el"
-;;;;;; (17239 32330))
+;;;;;; (17378 6213))
;;; Generated autoloads from mail/mailclient.el
(autoload (quote mailclient-send-it) "mailclient" "\
@@ -16600,9 +16964,9 @@ The mail client is taken to be the handler of mailto URLs.
;;;***
-;;;### (autoloads (makefile-bsdmake-mode makefile-makepp-mode makefile-gmake-mode
-;;;;;; makefile-automake-mode makefile-mode) "make-mode" "progmodes/make-mode.el"
-;;;;;; (17239 32386))
+;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode
+;;;;;; makefile-gmake-mode makefile-automake-mode makefile-mode)
+;;;;;; "make-mode" "progmodes/make-mode.el" (17357 13476))
;;; Generated autoloads from progmodes/make-mode.el
(autoload (quote makefile-mode) "make-mode" "\
@@ -16610,7 +16974,8 @@ Major mode for editing standard Makefiles.
If you are editing a file for a different make, try one of the
variants `makefile-automake-mode', `makefile-gmake-mode',
-`makefile-makepp-mode' or `makefile-bsdmake-mode'. All but the
+`makefile-makepp-mode', `makefile-bsdmake-mode' or,
+`makefile-imake-mode'All but the
last should be correctly chosen based on the file name, except if
it is *.mk. This function ends by invoking the function(s)
`makefile-mode-hook'.
@@ -16712,6 +17077,11 @@ An adapted `makefile-mode' that knows about BSD make.
\(fn)" t nil)
+(autoload (quote makefile-imake-mode) "make-mode" "\
+An adapted `makefile-mode' that knows about imake.
+
+\(fn)" t nil)
+
;;;***
;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (17148
@@ -16726,7 +17096,7 @@ Previous contents of that buffer are killed first.
;;;***
-;;;### (autoloads (man-follow man) "man" "man.el" (17239 32219))
+;;;### (autoloads (man-follow man) "man" "man.el" (17356 16925))
;;; Generated autoloads from man.el
(defalias (quote manual-entry) (quote man))
@@ -16775,8 +17145,8 @@ yourself the value of `master-of' by calling `master-show-slave'.
;;;***
-;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17246
-;;;;;; 34622))
+;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17324
+;;;;;; 9268))
;;; Generated autoloads from menu-bar.el
(put (quote menu-bar-mode) (quote standard-value) (quote (t)))
@@ -16812,7 +17182,7 @@ turn on menu bars; otherwise, turn off menu bars.
;;;;;; message-cite-function message-yank-prefix message-citation-line-function
;;;;;; message-send-mail-function message-user-organization-file
;;;;;; message-signature-separator message-from-style) "message"
-;;;;;; "gnus/message.el" (17242 24871))
+;;;;;; "gnus/message.el" (17376 48878))
;;; Generated autoloads from gnus/message.el
(defvar message-from-style (quote default) "\
@@ -17066,7 +17436,7 @@ which specify the range to operate on.
;;;***
;;;### (autoloads (metapost-mode metafont-mode) "meta-mode" "progmodes/meta-mode.el"
-;;;;;; (17239 32386))
+;;;;;; (17276 44726))
;;; Generated autoloads from progmodes/meta-mode.el
(autoload (quote metafont-mode) "meta-mode" "\
@@ -17136,151 +17506,179 @@ redisplayed as output is inserted.
;;;***
-;;;### (autoloads (mh-letter-mode mh-smail-other-window mh-user-agent-compose
-;;;;;; mh-smail-batch mh-smail) "mh-comp" "mh-e/mh-comp.el" (17249
-;;;;;; 49352))
+;;;### (autoloads (mh-fully-kill-draft mh-send-letter mh-user-agent-compose
+;;;;;; mh-smail-batch mh-smail-other-window mh-smail) "mh-comp"
+;;;;;; "mh-e/mh-comp.el" (17377 23328))
;;; Generated autoloads from mh-e/mh-comp.el
(autoload (quote mh-smail) "mh-comp" "\
-Compose and send mail with the MH mail system.
-This function is an entry point to MH-E, the Emacs interface to the MH mail
-system.
+Compose a message with the MH mail system.
+See `mh-send' for more details on composing mail.
+\(fn)" t nil)
+
+(autoload (quote mh-smail-other-window) "mh-comp" "\
+Compose a message with the MH mail system in other window.
See `mh-send' for more details on composing mail.
\(fn)" t nil)
(autoload (quote mh-smail-batch) "mh-comp" "\
-Set up a mail composition draft with the MH mail system.
-This function is an entry point to MH-E, the Emacs interface to the MH mail
-system. This function does not prompt the user for any header fields, and thus
-is suitable for use by programs that want to create a mail buffer. Users
-should use `mh-smail' to compose mail.
+Compose a message with the MH mail system.
+
+This function does not prompt the user for any header fields, and
+thus is suitable for use by programs that want to create a mail
+buffer. Users should use \\[mh-smail] to compose mail.
-Optional arguments for setting certain fields include TO, SUBJECT, and
-OTHER-HEADERS. Additional arguments are IGNORED.
+Optional arguments for setting certain fields include TO,
+SUBJECT, and OTHER-HEADERS. Additional arguments are IGNORED.
+
+This function remains for Emacs 21 compatibility. New
+applications should use `mh-user-agent-compose'.
\(fn &optional TO SUBJECT OTHER-HEADERS &rest IGNORED)" nil nil)
+(define-mail-user-agent (quote mh-e-user-agent) (quote mh-user-agent-compose) (quote mh-send-letter) (quote mh-fully-kill-draft) (quote mh-before-send-letter-hook))
+
(autoload (quote mh-user-agent-compose) "mh-comp" "\
Set up mail composition draft with the MH mail system.
-This is `mail-user-agent' entry point to MH-E.
+This is the `mail-user-agent' entry point to MH-E. This function
+conforms to the contract specified by `define-mail-user-agent'
+which means that this function should accept the same arguments
+as `compose-mail'.
The optional arguments TO and SUBJECT specify recipients and the
initial Subject field, respectively.
-OTHER-HEADERS is an alist specifying additional
-header fields. Elements look like (HEADER . VALUE) where both
-HEADER and VALUE are strings.
+OTHER-HEADERS is an alist specifying additional header fields.
+Elements look like (HEADER . VALUE) where both HEADER and VALUE
+are strings.
-CONTINUE, SWITCH-FUNCTION, YANK-ACTION and SEND-ACTIONS are ignored.
+CONTINUE, SWITCH-FUNCTION, YANK-ACTION and SEND-ACTIONS are
+ignored.
\(fn &optional TO SUBJECT OTHER-HEADERS CONTINUE SWITCH-FUNCTION YANK-ACTION SEND-ACTIONS)" nil nil)
-(autoload (quote mh-smail-other-window) "mh-comp" "\
-Compose and send mail in other window with the MH mail system.
-This function is an entry point to MH-E, the Emacs interface to the MH mail
-system.
-
-See `mh-send' for more details on composing mail.
+(autoload (quote mh-send-letter) "mh-comp" "\
+Save draft and send message.
-\(fn)" t nil)
+When you are all through editing a message, you send it with this
+command. You can give a prefix argument ARG to monitor the first stage
+of the delivery; this output can be found in a buffer called \"*MH-E
+Mail Delivery*\".
-(autoload (quote mh-letter-mode) "mh-comp" "\
-Mode for composing letters in MH-E.\\<mh-letter-mode-map>
+The hook `mh-before-send-letter-hook' is run at the beginning of
+this command. For example, if you want to check your spelling in
+your message before sending, add the function `ispell-message'.
-When you have finished composing, type \\[mh-send-letter] to send the message
-using the MH mail handling system.
+In case the MH \"send\" program is installed under a different name,
+use `mh-send-prog' to tell MH-E the name.
-There are two types of tags used by MH-E when composing MIME messages: MML and
-MH. The option `mh-compose-insertion' controls what type of tags are inserted
-by MH-E commands. These tags can be converted to MIME body parts by running
-\\[mh-mh-to-mime] for MH-style directives or \\[mh-mml-to-mime] for MML tags.
-
-Options that control this mode can be changed with \\[customize-group];
-specify the \"mh-compose\" group.
+\(fn &optional ARG)" t nil)
-When a message is composed, the hooks `text-mode-hook' and
-`mh-letter-mode-hook' are run.
+(autoload (quote mh-fully-kill-draft) "mh-comp" "\
+Quit editing and delete draft message.
-\\{mh-letter-mode-map}
+If for some reason you are not happy with the draft, you can use
+this command to kill the draft buffer and delete the draft
+message. Use the command \\[kill-buffer] if you don't want to
+delete the draft message.
\(fn)" t nil)
;;;***
-;;;### (autoloads (mh-folder-mode mh-version mh-nmail mh-rmail) "mh-e"
-;;;;;; "mh-e/mh-e.el" (17249 49352))
+;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (17379 60196))
;;; Generated autoloads from mh-e/mh-e.el
-(autoload (quote mh-rmail) "mh-e" "\
-Inc(orporate) new mail with MH.
-Scan an MH folder if ARG is non-nil. This function is an entry point to MH-E,
-the Emacs interface to the MH mail system.
-
-\(fn &optional ARG)" t nil)
+(put (quote mh-progs) (quote risky-local-variable) t)
-(autoload (quote mh-nmail) "mh-e" "\
-Check for new mail in inbox folder.
-Scan an MH folder if ARG is non-nil. This function is an entry point to MH-E,
-the Emacs interface to the MH mail system.
+(put (quote mh-lib) (quote risky-local-variable) t)
-\(fn &optional ARG)" t nil)
+(put (quote mh-lib-progs) (quote risky-local-variable) t)
(autoload (quote mh-version) "mh-e" "\
Display version information about MH-E and the MH mail handling system.
\(fn)" t nil)
-(autoload (quote mh-folder-mode) "mh-e" "\
+;;;***
+
+;;;### (autoloads (mh-folder-mode mh-nmail mh-rmail) "mh-folder"
+;;;;;; "mh-e/mh-folder.el" (17377 23328))
+;;; Generated autoloads from mh-e/mh-folder.el
+
+(autoload (quote mh-rmail) "mh-folder" "\
+Incorporate new mail with MH.
+Scan an MH folder if ARG is non-nil.
+
+This function is an entry point to MH-E, the Emacs interface to
+the MH mail system.
+
+\(fn &optional ARG)" t nil)
+
+(autoload (quote mh-nmail) "mh-folder" "\
+Check for new mail in inbox folder.
+Scan an MH folder if ARG is non-nil.
+
+This function is an entry point to MH-E, the Emacs interface to
+the MH mail system.
+
+\(fn &optional ARG)" t nil)
+
+(autoload (quote mh-folder-mode) "mh-folder" "\
Major MH-E mode for \"editing\" an MH folder scan listing.\\<mh-folder-mode-map>
-You can show the message the cursor is pointing to, and step through the
-messages. Messages can be marked for deletion or refiling into another
-folder; these commands are executed all at once with a separate command.
+You can show the message the cursor is pointing to, and step through
+the messages. Messages can be marked for deletion or refiling into
+another folder; these commands are executed all at once with a
+separate command.
-Options that control this mode can be changed with \\[customize-group];
-specify the \"mh\" group. In particular, please see the `mh-scan-format-file'
-option if you wish to modify scan's format.
+Options that control this mode can be changed with
+\\[customize-group]; specify the \"mh\" group. In particular, please
+see the `mh-scan-format-file' option if you wish to modify scan's
+format.
When a folder is visited, the hook `mh-folder-mode-hook' is run.
Ranges
======
-Many commands that operate on individual messages, such as `mh-forward' or
-`mh-refile-msg' take a RANGE argument. This argument can be used in several
-ways.
+Many commands that operate on individual messages, such as
+`mh-forward' or `mh-refile-msg' take a RANGE argument. This argument
+can be used in several ways.
-If you provide the prefix argument (\\[universal-argument]) to these commands,
-then you will be prompted for the message range. This can be any valid MH
-range which can include messages, sequences, and the abbreviations (described
-in the mh(1) man page):
+If you provide the prefix argument (\\[universal-argument]) to
+these commands, then you will be prompted for the message range.
+This can be any valid MH range which can include messages,
+sequences, and the abbreviations (described in the mh(1) man
+page):
<num1>-<num2>
- Indicates all messages in the range <num1> to <num2>, inclusive. The range
- must be nonempty.
-
-`<num>:N'
-`<num>:+N'
-`<num>:-N'
- Up to N messages beginning with (or ending with) message num. Num may be
- any of the pre-defined symbols: first, prev, cur, next or last.
-
-`first:N'
-`prev:N'
-`next:N'
-`last:N'
+ Indicates all messages in the range <num1> to <num2>, inclusive.
+ The range must be nonempty.
+
+<num>:N
+<num>:+N
+<num>:-N
+ Up to N messages beginning with (or ending with) message num. Num
+ may be any of the predefined symbols: first, prev, cur, next or
+ last.
+
+first:N
+prev:N
+next:N
+last:N
The first, previous, next or last messages, if they exist.
-`all'
+all
All of the messages.
-For example, a range that shows all of these things is `1 2 3 5-10 last:5
-unseen'.
+For example, a range that shows all of these things is `1 2 3
+5-10 last:5 unseen'.
-If the option `transient-mark-mode' is set to t and you set a region in the
-MH-Folder buffer, then the MH-E command will perform the operation on all
-messages in that region.
+If the option `transient-mark-mode' is set to t and you set a
+region in the MH-Folder buffer, then the MH-E command will
+perform the operation on all messages in that region.
\\{mh-folder-mode-map}
@@ -17288,17 +17686,6 @@ messages in that region.
;;;***
-;;;### (autoloads nil "mh-init" "mh-e/mh-init.el" (17239 32348))
-;;; Generated autoloads from mh-e/mh-init.el
-
-(put (quote mh-progs) (quote risky-local-variable) t)
-
-(put (quote mh-lib) (quote risky-local-variable) t)
-
-(put (quote mh-lib-progs) (quote risky-local-variable) t)
-
-;;;***
-
;;;### (autoloads (midnight-delay-set clean-buffer-list) "midnight"
;;;;;; "midnight.el" (17148 25017))
;;; Generated autoloads from midnight.el
@@ -17371,7 +17758,7 @@ Major mode for the mixal asm language.
;;;### (autoloads (malayalam-composition-function malayalam-post-read-conversion
;;;;;; malayalam-compose-region) "mlm-util" "language/mlm-util.el"
-;;;;;; (17102 18776))
+;;;;;; (17339 56590))
;;; Generated autoloads from language/mlm-util.el
(autoload (quote malayalam-compose-region) "mlm-util" "\
@@ -17386,7 +17773,7 @@ Not documented
(autoload (quote malayalam-composition-function) "mlm-util" "\
Compose Malayalam characters in REGION, or STRING if specified.
-Assume that the REGION or STRING must fully match the composable
+Assume that the REGION or STRING must fully match the composable
PATTERN regexp.
\(fn FROM TO PATTERN &optional STRING)" nil nil)
@@ -17422,7 +17809,7 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing.
;;;***
;;;### (autoloads (mm-url-insert-file-contents-external mm-url-insert-file-contents)
-;;;;;; "mm-url" "gnus/mm-url.el" (17239 32315))
+;;;;;; "mm-url" "gnus/mm-url.el" (17310 14064))
;;; Generated autoloads from gnus/mm-url.el
(autoload (quote mm-url-insert-file-contents) "mm-url" "\
@@ -17438,14 +17825,23 @@ Insert file contents of URL using `mm-url-program'.
;;;***
-;;;### (autoloads (mm-uu-dissect) "mm-uu" "gnus/mm-uu.el" (17239
-;;;;;; 32316))
+;;;### (autoloads (mm-uu-dissect-text-parts mm-uu-dissect) "mm-uu"
+;;;;;; "gnus/mm-uu.el" (17376 48878))
;;; Generated autoloads from gnus/mm-uu.el
(autoload (quote mm-uu-dissect) "mm-uu" "\
Dissect the current buffer and return a list of uu handles.
+The optional NOHEADER means there's no header in the buffer.
+MIME-TYPE specifies a MIME type and parameters, which defaults to the
+value of `mm-uu-text-plain-type'.
-\(fn)" nil nil)
+\(fn &optional NOHEADER MIME-TYPE)" nil nil)
+
+(autoload (quote mm-uu-dissect-text-parts) "mm-uu" "\
+Dissect text parts and put uu handles into HANDLE.
+Assume text has been decoded if DECODED is non-nil.
+
+\(fn HANDLE &optional DECODED)" nil nil)
;;;***
@@ -17508,7 +17904,7 @@ Not documented
;;;***
;;;### (autoloads (modula-2-mode) "modula2" "progmodes/modula2.el"
-;;;;;; (17075 55530))
+;;;;;; (17276 44726))
;;; Generated autoloads from progmodes/modula2.el
(autoload (quote modula-2-mode) "modula2" "\
@@ -17949,7 +18345,7 @@ basis, this may not be accurate.
;;;***
;;;### (autoloads (mwheel-install mouse-wheel-mode) "mwheel" "mwheel.el"
-;;;;;; (17148 25020))
+;;;;;; (17258 50746))
;;; Generated autoloads from mwheel.el
(defvar mouse-wheel-mode nil "\
@@ -18075,7 +18471,7 @@ Open a network connection to HOST on PORT.
;;;;;; comment-kill comment-set-column comment-indent comment-indent-default
;;;;;; comment-normalize-vars comment-multi-line comment-padding
;;;;;; comment-style comment-column) "newcomment" "newcomment.el"
-;;;;;; (17148 25021))
+;;;;;; (17379 35991))
;;; Generated autoloads from newcomment.el
(defalias (quote indent-for-comment) (quote comment-indent))
@@ -18094,7 +18490,7 @@ to understand comments or not in the given buffer.
Major modes should set this variable.")
(defvar comment-column 32 "\
-*Column to indent right-margin comments to.
+Column to indent right-margin comments to.
Each mode establishes a different default value for this variable; you
can set the value for a particular mode using that mode's hook.
Comments might be indented to a value smaller than this in order
@@ -18132,7 +18528,7 @@ Applicable at least in modes for languages like fixed-format Fortran where
comments always start in column zero.")
(defvar comment-style (quote plain) "\
-*Style to be used for `comment-region'.
+Style to be used for `comment-region'.
See `comment-styles' for a list of available styles.")
(custom-autoload (quote comment-style) "newcomment")
@@ -18148,7 +18544,7 @@ makes the comment easier to read. Default is 1. nil means 0.")
(custom-autoload (quote comment-padding) "newcomment")
(defvar comment-multi-line nil "\
-*Non-nil means `comment-indent-new-line' continues comments.
+Non-nil means `comment-indent-new-line' continues comments.
That is, it inserts no new terminator or starter.
This affects `auto-fill-mode', which is the main reason to
customize this variable.
@@ -18228,6 +18624,7 @@ If the region is active and `transient-mark-mode' is on, call
Else, if the current line is empty, insert a comment and indent it.
Else if a prefix ARG is specified, call `comment-kill'.
Else, call `comment-indent'.
+You can configure `comment-style' to change the way regions are commented.
\(fn ARG)" t nil)
@@ -18256,10 +18653,26 @@ unless optional argument SOFT is non-nil.
;;;***
-;;;### (autoloads (newsticker-show-news newsticker-start) "newsticker"
-;;;;;; "net/newsticker.el" (17239 32359))
+;;;### (autoloads (newsticker-show-news newsticker-start-ticker newsticker-start
+;;;;;; newsticker-ticker-running-p newsticker-running-p) "newsticker"
+;;;;;; "net/newsticker.el" (17378 16858))
;;; Generated autoloads from net/newsticker.el
+(autoload (quote newsticker-running-p) "newsticker" "\
+Check whether newsticker is running.
+Return t if newsticker is running, nil otherwise. Newsticker is
+considered to be running if the newsticker timer list is not empty.
+
+\(fn)" nil nil)
+
+(autoload (quote newsticker-ticker-running-p) "newsticker" "\
+Check whether newsticker's actual ticker is running.
+Return t if ticker is running, nil otherwise. Newsticker is
+considered to be running if the newsticker timer list is not
+empty.
+
+\(fn)" nil nil)
+
(autoload (quote newsticker-start) "newsticker" "\
Start the newsticker.
Start the timers for display and retrieval. If the newsticker, i.e. the
@@ -18269,6 +18682,13 @@ Run `newsticker-start-hook' if newsticker was not running already.
\(fn &optional DO-NOT-COMPLAIN-IF-RUNNING)" t nil)
+(autoload (quote newsticker-start-ticker) "newsticker" "\
+Start newsticker's ticker (but not the news retrieval).
+Start display timer for the actual ticker if wanted and not
+running already.
+
+\(fn)" t nil)
+
(autoload (quote newsticker-show-news) "newsticker" "\
Switch to newsticker buffer. You may want to bind this to a key.
@@ -18392,7 +18812,7 @@ to future sessions.
;;;***
;;;### (autoloads (nroff-mode) "nroff-mode" "textmodes/nroff-mode.el"
-;;;;;; (17148 25209))
+;;;;;; (17379 56088))
;;; Generated autoloads from textmodes/nroff-mode.el
(autoload (quote nroff-mode) "nroff-mode" "\
@@ -18407,7 +18827,7 @@ closing requests for requests that are used in matched pairs.
;;;***
;;;### (autoloads (octave-help) "octave-hlp" "progmodes/octave-hlp.el"
-;;;;;; (17167 7196))
+;;;;;; (17167 26278))
;;; Generated autoloads from progmodes/octave-hlp.el
(autoload (quote octave-help) "octave-hlp" "\
@@ -18421,7 +18841,7 @@ If KEY is not a string, prompt for it with completion.
;;;***
;;;### (autoloads (inferior-octave) "octave-inf" "progmodes/octave-inf.el"
-;;;;;; (17186 62981))
+;;;;;; (17288 31060))
;;; Generated autoloads from progmodes/octave-inf.el
(autoload (quote inferior-octave) "octave-inf" "\
@@ -18444,7 +18864,7 @@ startup file, `~/.emacs-octave'.
;;;***
;;;### (autoloads (octave-mode) "octave-mod" "progmodes/octave-mod.el"
-;;;;;; (17239 32387))
+;;;;;; (17307 14151))
;;; Generated autoloads from progmodes/octave-mod.el
(autoload (quote octave-mode) "octave-mod" "\
@@ -18566,13 +18986,14 @@ The Custom feature is intended to make this obsolete.
;;;### (autoloads (org-export-icalendar-combine-agenda-files org-export-icalendar-all-agenda-files
;;;;;; orgtbl-mode turn-on-orgtbl org-remember-handler org-remember-annotation
-;;;;;; org-store-link org-diary org-agenda org-agenda-mode org-mode)
-;;;;;; "org" "textmodes/org.el" (17245 51610))
+;;;;;; org-store-link org-tags-view org-diary org-todo-list org-agenda-list
+;;;;;; org-agenda org-agenda-mode org-mode) "org" "textmodes/org.el"
+;;;;;; (17373 32426))
;;; Generated autoloads from textmodes/org.el
(autoload (quote org-mode) "org" "\
Outline-based notes management and organizer, alias
-\"Carstens outline-mode for keeping track of everything.\"
+\"Carsten's outline-mode for keeping track of everything.\"
Org-mode develops organizational tasks around a NOTES file which
contains information about projects as plain text. Org-mode is
@@ -18601,16 +19022,51 @@ The following commands are available:
\(fn)" t nil)
(autoload (quote org-agenda) "org" "\
+Dispatch agenda commands to collect entries to the agenda buffer.
+Prompts for a character to select a command. Any prefix arg will be passed
+on to the selected command. The default selections are:
+
+a Call `org-agenda' to display the agenda for the current day or week.
+t Call `org-todo-list' to display the global todo list.
+T Call `org-todo-list' to display the global todo list, select only
+ entries with a specific TODO keyword (the user gets a prompt).
+m Call `org-tags-view' to display headlines with tags matching
+ a condition (the user is prompted for the condition).
+M Like `m', but select only TODO entries, no ordinary headlines.
+
+More commands can be added by configuring the variable
+`org-agenda-custom-commands'. In particular, specific tags and TODO keyword
+searches can be pre-defined in this way.
+
+If the current buffer is in Org-mode and visiting a file, you can also
+first press `1' to indicate that the agenda should be temporarily (until the
+next use of \\[org-agenda]) restricted to the current file.
+
+\(fn ARG)" t nil)
+
+(autoload (quote org-agenda-list) "org" "\
Produce a weekly view from all files in variable `org-agenda-files'.
The view will be for the current week, but from the overview buffer you
will be able to go to other weeks.
With one \\[universal-argument] prefix argument INCLUDE-ALL, all unfinished TODO items will
also be shown, under the current date.
+With two \\[universal-argument] prefix argument INCLUDE-ALL, all TODO entries marked DONE
+on the days are also shown. See the variable `org-log-done' for how
+to turn on logging.
START-DAY defaults to TODAY, or to the most recent match for the weekday
given in `org-agenda-start-on-weekday'.
NDAYS defaults to `org-agenda-ndays'.
-\(fn &optional INCLUDE-ALL START-DAY NDAYS)" t nil)
+\(fn &optional INCLUDE-ALL START-DAY NDAYS KEEP-MODES)" t nil)
+
+(autoload (quote org-todo-list) "org" "\
+Show all TODO entries from all agenda file in a single list.
+The prefix arg can be used to select a specific TODO keyword and limit
+the list to these. When using \\[universal-argument], you will be prompted
+for a keyword. A numeric prefix directly selects the Nth keyword in
+`org-todo-keywords'.
+
+\(fn ARG &optional KEEP-MODES)" t nil)
(autoload (quote org-diary) "org" "\
Return diary information from org-files.
@@ -18658,13 +19114,19 @@ function from a program - use `org-agenda-get-day-entries' instead.
\(fn &rest ARGS)" nil nil)
+(autoload (quote org-tags-view) "org" "\
+Show all headlines for all `org-agenda-files' matching a TAGS criterion.
+The prefix arg TODO-ONLY limits the search to TODO entries.
+
+\(fn &optional TODO-ONLY MATCH KEEP-MODES)" t nil)
+
(autoload (quote org-store-link) "org" "\
\\<org-mode-map>Store an org-link to the current location.
This link can later be inserted into an org-buffer with
\\[org-insert-link].
For some link types, a prefix arg is interpreted:
For links to usenet articles, arg negates `org-usenet-links-prefer-google'.
-For file links, arg negates `org-line-numbers-in-file-links'.
+For file links, arg negates `org-context-in-file-links'.
\(fn ARG)" t nil)
@@ -18683,7 +19145,7 @@ of `org-default-notes-file' is used.
Then the command offers the headings tree of the selected file in order to
file the text at a specific location.
You can either immediately press RET to get the note appended to the
-file. Or you can use vertical cursor motion and visibility cycling (TAB) to
+file, or you can use vertical cursor motion and visibility cycling (TAB) to
find a better place. Then press RET or <left> or <right> in insert the note.
Key Cursor position Note gets inserted
@@ -18738,7 +19200,7 @@ The file is stored under the name `org-combined-agenda-icalendar-file'.
;;;***
;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el"
-;;;;;; (17239 32223))
+;;;;;; (17360 15348))
;;; Generated autoloads from outline.el
(autoload (quote outline-mode) "outline" "\
@@ -18793,7 +19255,7 @@ See the command `outline-mode' for more information on this mode.
;;;***
-;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17148 25021))
+;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17333 17859))
;;; Generated autoloads from paren.el
(defvar show-paren-mode nil "\
@@ -18819,7 +19281,7 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time.
;;;***
;;;### (autoloads (parse-time-string) "parse-time" "calendar/parse-time.el"
-;;;;;; (17102 18474))
+;;;;;; (17307 14150))
;;; Generated autoloads from calendar/parse-time.el
(autoload (quote parse-time-string) "parse-time" "\
@@ -18831,8 +19293,8 @@ unknown are returned as nil.
;;;***
-;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (17239
-;;;;;; 32388))
+;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (17276
+;;;;;; 44726))
;;; Generated autoloads from progmodes/pascal.el
(autoload (quote pascal-mode) "pascal" "\
@@ -19163,7 +19625,7 @@ Setup shell-mode to use pcomplete.
;;;### (autoloads (cvs-dired-use-hook cvs-dired-action cvs-status
;;;;;; cvs-update cvs-examine cvs-quickdir cvs-checkout) "pcvs"
-;;;;;; "pcvs.el" (17239 32224))
+;;;;;; "pcvs.el" (17304 41554))
;;; Generated autoloads from pcvs.el
(autoload (quote cvs-checkout) "pcvs" "\
@@ -19248,7 +19710,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d
;;;***
;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el"
-;;;;;; (17185 27660))
+;;;;;; (17276 44726))
;;; Generated autoloads from progmodes/perl-mode.el
(autoload (quote perl-mode) "perl-mode" "\
@@ -19305,55 +19767,101 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'.
;;;### (autoloads (pgg-snarf-keys pgg-snarf-keys-region pgg-insert-key
;;;;;; pgg-verify pgg-verify-region pgg-sign pgg-sign-region pgg-decrypt
-;;;;;; pgg-decrypt-region pgg-encrypt pgg-encrypt-region) "pgg"
-;;;;;; "pgg.el" (17244 47844))
+;;;;;; pgg-decrypt-region pgg-encrypt pgg-encrypt-symmetric pgg-encrypt-symmetric-region
+;;;;;; pgg-encrypt-region) "pgg" "pgg.el" (17251 37236))
;;; Generated autoloads from pgg.el
(autoload (quote pgg-encrypt-region) "pgg" "\
Encrypt the current region between START and END for RCPTS.
+
If optional argument SIGN is non-nil, do a combined sign and encrypt.
-\(fn START END RCPTS &optional SIGN)" t nil)
+If optional PASSPHRASE is not specified, it will be obtained from the
+passphrase cache or user.
+
+\(fn START END RCPTS &optional SIGN PASSPHRASE)" t nil)
+
+(autoload (quote pgg-encrypt-symmetric-region) "pgg" "\
+Encrypt the current region between START and END symmetric with passphrase.
+
+If optional PASSPHRASE is not specified, it will be obtained from the
+cache or user.
+
+\(fn START END &optional PASSPHRASE)" t nil)
+
+(autoload (quote pgg-encrypt-symmetric) "pgg" "\
+Encrypt the current buffer using a symmetric, rather than key-pair, cipher.
+
+If optional arguments START and END are specified, only encrypt within
+the region.
+
+If optional PASSPHRASE is not specified, it will be obtained from the
+passphrase cache or user.
+
+\(fn &optional START END PASSPHRASE)" t nil)
(autoload (quote pgg-encrypt) "pgg" "\
Encrypt the current buffer for RCPTS.
+
If optional argument SIGN is non-nil, do a combined sign and encrypt.
+
If optional arguments START and END are specified, only encrypt within
the region.
-\(fn RCPTS &optional SIGN START END)" t nil)
+If optional PASSPHRASE is not specified, it will be obtained from the
+passphrase cache or user.
+
+\(fn RCPTS &optional SIGN START END PASSPHRASE)" t nil)
(autoload (quote pgg-decrypt-region) "pgg" "\
Decrypt the current region between START and END.
-\(fn START END)" t nil)
+If optional PASSPHRASE is not specified, it will be obtained from the
+passphrase cache or user.
+
+\(fn START END &optional PASSPHRASE)" t nil)
(autoload (quote pgg-decrypt) "pgg" "\
Decrypt the current buffer.
+
If optional arguments START and END are specified, only decrypt within
the region.
-\(fn &optional START END)" t nil)
+If optional PASSPHRASE is not specified, it will be obtained from the
+passphrase cache or user.
+
+\(fn &optional START END PASSPHRASE)" t nil)
(autoload (quote pgg-sign-region) "pgg" "\
Make the signature from text between START and END.
+
If the optional 3rd argument CLEARTEXT is non-nil, it does not create
a detached signature.
+
If this function is called interactively, CLEARTEXT is enabled
and the the output is displayed.
-\(fn START END &optional CLEARTEXT)" t nil)
+If optional PASSPHRASE is not specified, it will be obtained from the
+passphrase cache or user.
+
+\(fn START END &optional CLEARTEXT PASSPHRASE)" t nil)
(autoload (quote pgg-sign) "pgg" "\
Sign the current buffer.
+
If the optional argument CLEARTEXT is non-nil, it does not create a
detached signature.
+
If optional arguments START and END are specified, only sign data
within the region.
+
If this function is called interactively, CLEARTEXT is enabled
and the the output is displayed.
-\(fn &optional CLEARTEXT START END)" t nil)
+If optional PASSPHRASE is not specified, it will be obtained from the
+passphrase cache or user.
+
+\(fn &optional CLEARTEXT START END PASSPHRASE)" t nil)
(autoload (quote pgg-verify-region) "pgg" "\
Verify the current region between START and END.
@@ -19393,66 +19901,86 @@ Import public keys in the current buffer.
;;;***
+;;;### (autoloads (pgg-gpg-symmetric-key-p) "pgg-gpg" "pgg-gpg.el"
+;;;;;; (17251 37235))
+;;; Generated autoloads from pgg-gpg.el
+
+(autoload (quote pgg-gpg-symmetric-key-p) "pgg-gpg" "\
+True if decoded armor MESSAGE-KEYS has symmetric encryption indicator.
+
+\(fn MESSAGE-KEYS)" nil nil)
+
+;;;***
+
;;;### (autoloads (picture-mode) "picture" "textmodes/picture.el"
-;;;;;; (17148 25215))
+;;;;;; (17316 61871))
;;; Generated autoloads from textmodes/picture.el
(autoload (quote picture-mode) "picture" "\
Switch to Picture mode, in which a quarter-plane screen model is used.
+\\<picture-mode-map>
Printing characters replace instead of inserting themselves with motion
afterwards settable by these commands:
- C-c < Move left after insertion.
- C-c > Move right after insertion.
- C-c ^ Move up after insertion.
- C-c . Move down after insertion.
- C-c ` Move northwest (nw) after insertion.
- C-c ' Move northeast (ne) after insertion.
- C-c / Move southwest (sw) after insertion.
- C-c \\ Move southeast (se) after insertion.
- C-u C-c ` Move westnorthwest (wnw) after insertion.
- C-u C-c ' Move eastnortheast (ene) after insertion.
- C-u C-c / Move westsouthwest (wsw) after insertion.
- C-u C-c \\ Move eastsoutheast (ese) after insertion.
+
+ Move left after insertion: \\[picture-movement-left]
+ Move right after insertion: \\[picture-movement-right]
+ Move up after insertion: \\[picture-movement-up]
+ Move down after insertion: \\[picture-movement-down]
+
+ Move northwest (nw) after insertion: \\[picture-movement-nw]
+ Move northeast (ne) after insertion: \\[picture-movement-ne]
+ Move southwest (sw) after insertion: \\[picture-movement-sw]
+ Move southeast (se) after insertion: \\[picture-movement-se]
+
+ Move westnorthwest (wnw) after insertion: C-u \\[picture-movement-nw]
+ Move eastnortheast (ene) after insertion: C-u \\[picture-movement-ne]
+ Move westsouthwest (wsw) after insertion: C-u \\[picture-movement-sw]
+ Move eastsoutheast (ese) after insertion: C-u \\[picture-movement-se]
+
The current direction is displayed in the mode line. The initial
direction is right. Whitespace is inserted and tabs are changed to
spaces when required by movement. You can move around in the buffer
with these commands:
- \\[picture-move-down] Move vertically to SAME column in previous line.
- \\[picture-move-up] Move vertically to SAME column in next line.
- \\[picture-end-of-line] Move to column following last non-whitespace character.
- \\[picture-forward-column] Move right inserting spaces if required.
- \\[picture-backward-column] Move left changing tabs to spaces if required.
- C-c C-f Move in direction of current picture motion.
- C-c C-b Move in opposite direction of current picture motion.
- Return Move to beginning of next line.
+
+ Move vertically to SAME column in previous line: \\[picture-move-down]
+ Move vertically to SAME column in next line: \\[picture-move-up]
+ Move to column following last
+ non-whitespace character: \\[picture-end-of-line]
+ Move right, inserting spaces if required: \\[picture-forward-column]
+ Move left changing tabs to spaces if required: \\[picture-backward-column]
+ Move in direction of current picture motion: \\[picture-motion]
+ Move opposite to current picture motion: \\[picture-motion-reverse]
+ Move to beginning of next line: \\[next-line]
+
You can edit tabular text with these commands:
- M-Tab Move to column beneath (or at) next interesting character.
- `Indents' relative to a previous line.
- Tab Move to next stop in tab stop list.
- C-c Tab Set tab stops according to context of this line.
- With ARG resets tab stops to default (global) value.
- See also documentation of variable picture-tab-chars
- which defines \"interesting character\". You can manually
- change the tab stop list with command \\[edit-tab-stops].
+
+ Move to column beneath (or at) next interesting
+ character (see variable `picture-tab-chars'): \\[picture-tab-search]
+ Move to next stop in tab stop list: \\[picture-tab]
+ Set tab stops according to context of this line: \\[picture-set-tab-stops]
+ (With ARG, resets tab stops to default value.)
+ Change the tab stop list: \\[edit-tab-stops]
+
You can manipulate text with these commands:
- C-d Clear (replace) ARG columns after point without moving.
- C-c C-d Delete char at point - the command normally assigned to C-d.
- \\[picture-backward-clear-column] Clear (replace) ARG columns before point, moving back over them.
- \\[picture-clear-line] Clear ARG lines, advancing over them. The cleared
- text is saved in the kill ring.
- \\[picture-open-line] Open blank line(s) beneath current line.
+ Clear ARG columns after point without moving: \\[picture-clear-column]
+ Delete char at point: \\[delete-char]
+ Clear ARG columns backward: \\[picture-backward-clear-column]
+ Clear ARG lines, advancing over them: \\[picture-clear-line]
+ (the cleared text is saved in the kill ring)
+ Open blank line(s) beneath current line: \\[picture-open-line]
+
You can manipulate rectangles with these commands:
- C-c C-k Clear (or kill) a rectangle and save it.
- C-c C-w Like C-c C-k except rectangle is saved in named register.
- C-c C-y Overlay (or insert) currently saved rectangle at point.
- C-c C-x Like C-c C-y except rectangle is taken from named register.
- C-c C-r Draw a rectangular box around mark and point.
- \\[copy-rectangle-to-register] Copies a rectangle to a register.
- \\[advertised-undo] Can undo effects of rectangle overlay commands
- if invoked soon enough.
-You can return to the previous mode with:
- C-c C-c Which also strips trailing whitespace from every line.
- Stripping is suppressed by supplying an argument.
+ Clear a rectangle and save it: \\[picture-clear-rectangle]
+ Clear a rectangle, saving in a named register: \\[picture-clear-rectangle-to-register]
+ Insert currently saved rectangle at point: \\[picture-yank-rectangle]
+ Insert rectangle from named register: \\[picture-yank-rectangle-from-register]
+ Draw a rectangular box around mark and point: \\[picture-draw-rectangle]
+ Copies a rectangle to a register: \\[copy-rectangle-to-register]
+ Undo effects of rectangle overlay commands: \\[advertised-undo]
+
+You can return to the previous mode with \\[picture-mode-exit], which
+also strips trailing whitespace from every line. Stripping is suppressed
+by supplying an argument.
Entry to this mode calls the value of `picture-mode-hook' if non-nil.
@@ -19552,7 +20080,7 @@ Ignores leading comment characters.
;;;;;; pr-ps-buffer-print pr-ps-buffer-using-ghostscript pr-ps-buffer-preview
;;;;;; pr-ps-directory-ps-print pr-ps-directory-print pr-ps-directory-using-ghostscript
;;;;;; pr-ps-directory-preview pr-interface) "printing" "printing.el"
-;;;;;; (17239 32228))
+;;;;;; (17275 51551))
;;; Generated autoloads from printing.el
(autoload (quote pr-interface) "printing" "\
@@ -20140,7 +20668,7 @@ are both set to t.
;;;***
;;;### (autoloads (run-prolog prolog-mode) "prolog" "progmodes/prolog.el"
-;;;;;; (17185 27661))
+;;;;;; (17276 44726))
;;; Generated autoloads from progmodes/prolog.el
(autoload (quote prolog-mode) "prolog" "\
@@ -20160,7 +20688,7 @@ Run an inferior Prolog process, input and output via buffer *prolog*.
;;;***
-;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17131 20680))
+;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17318 56744))
;;; Generated autoloads from ps-bdf.el
(defvar bdf-directory-list (if (memq system-type (quote (ms-dos windows-nt))) (list (expand-file-name "fonts/bdf" installation-directory)) (quote ("/usr/local/share/emacs/fonts/bdf"))) "\
@@ -20169,8 +20697,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").")
;;;***
-;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (17205
-;;;;;; 6191))
+;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (17276
+;;;;;; 44727))
;;; Generated autoloads from progmodes/ps-mode.el
(autoload (quote ps-mode) "ps-mode" "\
@@ -20538,7 +21066,7 @@ If EXTENSION is any other symbol, it is ignored.
;;;***
;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el"
-;;;;;; (17239 32390))
+;;;;;; (17362 20185))
;;; Generated autoloads from progmodes/python.el
(add-to-list (quote interpreter-mode-alist) (quote ("jython" . jython-mode)))
@@ -20625,7 +21153,7 @@ them into characters should be done separately.
;;;;;; quail-defrule quail-install-decode-map quail-install-map
;;;;;; quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout
;;;;;; quail-define-package quail-use-package quail-title) "quail"
-;;;;;; "international/quail.el" (17249 49351))
+;;;;;; "international/quail.el" (17250 28362))
;;; Generated autoloads from international/quail.el
(autoload (quote quail-title) "quail" "\
@@ -20928,7 +21456,7 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'.
;;;***
-;;;### (autoloads (rcirc) "rcirc" "net/rcirc.el" (17240 44365))
+;;;### (autoloads (rcirc) "rcirc" "net/rcirc.el" (17378 16858))
;;; Generated autoloads from net/rcirc.el
(autoload (quote rcirc) "rcirc" "\
@@ -20936,7 +21464,7 @@ Connect to IRC.
If any of the the optional SERVER, PORT, NICK or CHANNELS are not
supplied, they are taken from the variables `rcirc-server',
-`rcirc-port', `rcirc-nick', and `rcirc-startup-channels',
+`rcirc-port', `rcirc-nick', and `rcirc-startup-channels-alist',
respectively.
\(fn &optional SERVER PORT NICK CHANNELS)" t nil)
@@ -20970,7 +21498,7 @@ Construct a regexp interactively.
;;;***
-;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17239 32234))
+;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17314 3338))
;;; Generated autoloads from recentf.el
(defvar recentf-mode nil "\
@@ -21140,7 +21668,7 @@ refilling if they would cause auto-filling.
;;;***
;;;### (autoloads (reftex-reset-scanning-information reftex-mode
-;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (17205 6264))
+;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (17275 15964))
;;; Generated autoloads from textmodes/reftex.el
(autoload (quote turn-on-reftex) "reftex" "\
@@ -21399,7 +21927,7 @@ Clear out the file used for transmitting args when Emacs resumes.
;;;***
;;;### (autoloads (global-reveal-mode reveal-mode) "reveal" "reveal.el"
-;;;;;; (17148 25035))
+;;;;;; (17349 36484))
;;; Generated autoloads from reveal.el
(autoload (quote reveal-mode) "reveal" "\
@@ -21434,52 +21962,6 @@ With zero or negative ARG turn mode off.
;;;***
-;;;### (autoloads (file-name-shadow-mode file-name-shadow-tty-properties
-;;;;;; file-name-shadow-properties) "rfn-eshadow" "rfn-eshadow.el"
-;;;;;; (17148 25035))
-;;; Generated autoloads from rfn-eshadow.el
-
-(defvar file-name-shadow-properties (quote (face file-name-shadow field shadow)) "\
-Properties given to the `shadowed' part of a filename in the minibuffer.
-Only used when `file-name-shadow-mode' is active.
-If emacs is not running under a window system,
-`file-name-shadow-tty-properties' is used instead.")
-
-(custom-autoload (quote file-name-shadow-properties) "rfn-eshadow")
-
-(defvar file-name-shadow-tty-properties (quote (before-string "{" after-string "} " field shadow)) "\
-Properties given to the `shadowed' part of a filename in the minibuffer.
-Only used when `file-name-shadow-mode' is active and emacs
-is not running under a window-system; if emacs is running under a window
-system, `file-name-shadow-properties' is used instead.")
-
-(custom-autoload (quote file-name-shadow-tty-properties) "rfn-eshadow")
-
-(defvar file-name-shadow-mode nil "\
-Non-nil if File-Name-Shadow mode is enabled.
-See the command `file-name-shadow-mode' for a description of this minor-mode.
-Setting this variable directly does not take effect;
-use either \\[customize] or the function `file-name-shadow-mode'.")
-
-(custom-autoload (quote file-name-shadow-mode) "rfn-eshadow")
-
-(put (quote file-name-shadow-mode) (quote custom-set) (quote custom-set-minor-mode))
-
-(autoload (quote file-name-shadow-mode) "rfn-eshadow" "\
-Toggle File-Name Shadow mode.
-When active, any part of a filename being read in the minibuffer
-that would be ignored (because the result is passed through
-`substitute-in-file-name') is given the properties in
-`file-name-shadow-properties', which can be used to make
-that portion dim, invisible, or otherwise less visually noticeable.
-
-With prefix argument ARG, turn on if positive, otherwise off.
-Returns non-nil if the new state is enabled.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
;;;### (autoloads (make-ring ring-p) "ring" "emacs-lisp/ring.el"
;;;;;; (17148 25098))
;;; Generated autoloads from emacs-lisp/ring.el
@@ -21547,8 +22029,8 @@ variable.
;;;;;; rmail-mail-new-frame rmail-primary-inbox-list rmail-delete-after-output
;;;;;; rmail-highlight-face rmail-highlighted-headers rmail-retry-ignored-headers
;;;;;; rmail-displayed-headers rmail-ignored-headers rmail-dont-reply-to-names
-;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17239
-;;;;;; 32332))
+;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17359
+;;;;;; 40965))
;;; Generated autoloads from mail/rmail.el
(autoload (quote rmail-movemail-variant-p) "rmail" "\
@@ -21670,7 +22152,11 @@ This is set to nil by default.")
*If non-nil, RMAIL uses MIME feature.
If the value is t, RMAIL automatically shows MIME decoded message.
If the value is neither t nor nil, RMAIL does not show MIME decoded message
-until a user explicitly requires it.")
+until a user explicitly requires it.
+
+Even if the value is non-nil, you can't use MIME feature
+if the feature specified by `rmail-mime-feature' is not available
+in your session.")
(custom-autoload (quote rmail-enable-mime) "rmail")
@@ -21711,7 +22197,10 @@ LIMIT is the position specifying the end of header.")
(defvar rmail-mime-feature (quote rmail-mime) "\
Feature to require to load MIME support in Rmail.
When starting Rmail, if `rmail-enable-mime' is non-nil,
-this feature is required with `require'.")
+this feature is required with `require'.
+
+The default value is `rmail-mime'. This feature is provided by
+the rmail-mime package available at <http://www.m17n.org/rmail-mime/>.")
(defvar rmail-decode-mime-charset t "\
*Non-nil means a message is decoded by MIME's charset specification.
@@ -21871,7 +22360,7 @@ If FILE-NAME is empty, remove any existing inbox list.
;;;### (autoloads (rmail-output-body-to-file rmail-output rmail-fields-not-to-output
;;;;;; rmail-output-to-rmail-file rmail-output-file-alist) "rmailout"
-;;;;;; "mail/rmailout.el" (17239 32332))
+;;;;;; "mail/rmailout.el" (17362 20183))
;;; Generated autoloads from mail/rmailout.el
(defvar rmail-output-file-alist nil "\
@@ -21895,11 +22384,11 @@ appended in inbox format, the same way `rmail-output' does it.
The default file name comes from `rmail-default-rmail-file',
which is updated to the name you use in this command.
-A prefix argument N says to output N consecutive messages
+A prefix argument COUNT says to output that many consecutive messages,
starting with the current one. Deleted messages are skipped and don't count.
-If optional argument STAY is non-nil, then leave the last filed
-mesasge up instead of moving forward to the next non-deleted message.
+If the optional argument STAY is non-nil, then leave the last filed
+message up instead of moving forward to the next non-deleted message.
\(fn FILE-NAME &optional COUNT STAY)" t nil)
@@ -21910,9 +22399,9 @@ mesasge up instead of moving forward to the next non-deleted message.
(autoload (quote rmail-output) "rmailout" "\
Append this message to system-inbox-format mail file named FILE-NAME.
-A prefix argument N says to output N consecutive messages
+A prefix argument COUNT says to output that many consecutive messages,
starting with the current one. Deleted messages are skipped and don't count.
-When called from lisp code, N may be omitted.
+When called from lisp code, COUNT may be omitted and defaults to 1.
If the pruned message header is shown on the current message, then
messages will be appended with pruned headers; otherwise, messages
@@ -21991,7 +22480,7 @@ KEYWORDS is a comma-separated list of labels.
;;;;;; rmail-summary-by-senders rmail-summary-by-topic rmail-summary-by-regexp
;;;;;; rmail-summary-by-recipients rmail-summary-by-labels rmail-summary
;;;;;; rmail-summary-line-count-flag rmail-summary-scroll-between-messages)
-;;;;;; "rmailsum" "mail/rmailsum.el" (17239 32333))
+;;;;;; "rmailsum" "mail/rmailsum.el" (17369 18495))
;;; Generated autoloads from mail/rmailsum.el
(defvar rmail-summary-scroll-between-messages t "\
@@ -22486,34 +22975,34 @@ enclosed in `(and ...)'.
;;;***
-;;;### (autoloads (savehist-save savehist-load) "savehist" "savehist.el"
-;;;;;; (17245 9380))
+;;;### (autoloads (savehist-mode savehist-mode) "savehist" "savehist.el"
+;;;;;; (17378 6213))
;;; Generated autoloads from savehist.el
-(autoload (quote savehist-load) "savehist" "\
-Load the minibuffer histories from `savehist-file'.
-Unless NO-INSTALL is present and non-nil, the function will also install
-`savehist-autosave' in `kill-emacs-hook' and on a timer, ensuring that
-history is saved before leaving Emacs.
+(defvar savehist-mode nil "\
+Mode for automatic saving of minibuffer history.
+Set this by calling the `savehist-mode' function or using the customize
+interface.")
-This function should be normally used from your Emacs init file. Since
-it removes your current minibuffer histories, it is unwise to call it at
-any other time.
+(custom-autoload (quote savehist-mode) "savehist")
-\(fn &optional NO-INSTALL)" t nil)
+(autoload (quote savehist-mode) "savehist" "\
+Toggle savehist-mode.
+Positive ARG turns on `savehist-mode'. When on, savehist-mode causes
+minibuffer history to be saved periodically and when exiting Emacs.
+When turned on for the first time in an Emacs session, it causes the
+previous minibuffer history to be loaded from `savehist-file'.
-(autoload (quote savehist-save) "savehist" "\
-Save the values of minibuffer history variables.
-Unbound symbols referenced in `savehist-additional-variables' are ignored.
-If AUTO-SAVE is non-nil, compare the saved contents to the one last saved,
- and don't save the buffer if they are the same.
+This mode should normally be turned on from your Emacs init file.
+Calling it at any other time replaces your current minibuffer histories,
+which is probably undesirable.
-\(fn &optional AUTO-SAVE)" t nil)
+\(fn ARG)" t nil)
;;;***
;;;### (autoloads (dsssl-mode scheme-mode) "scheme" "progmodes/scheme.el"
-;;;;;; (17239 32390))
+;;;;;; (17276 44727))
;;; Generated autoloads from progmodes/scheme.el
(autoload (quote scheme-mode) "scheme" "\
@@ -22638,13 +23127,13 @@ during scrolling.
;;;;;; mail-citation-prefix-regexp mail-citation-hook mail-indentation-spaces
;;;;;; mail-yank-prefix mail-setup-hook mail-personal-alias-file
;;;;;; mail-alias-file mail-default-reply-to mail-archive-file-name
-;;;;;; mail-header-separator send-mail-function mail-yank-ignored-headers
-;;;;;; mail-interactive mail-self-blind mail-specify-envelope-from
-;;;;;; mail-from-style) "sendmail" "mail/sendmail.el" (17239 43866))
+;;;;;; mail-header-separator send-mail-function mail-interactive
+;;;;;; mail-self-blind mail-specify-envelope-from mail-from-style)
+;;;;;; "sendmail" "mail/sendmail.el" (17330 49619))
;;; Generated autoloads from mail/sendmail.el
(defvar mail-from-style (quote angles) "\
-*Specifies how \"From:\" fields look.
+Specifies how \"From:\" fields look.
If `nil', they contain just the return address like:
king@grassland.com
@@ -22663,7 +23152,7 @@ controlled by a separate variable, `mail-specify-envelope-from'.")
(custom-autoload (quote mail-from-style) "sendmail")
(defvar mail-specify-envelope-from nil "\
-*If non-nil, specify the envelope-from address when sending mail.
+If non-nil, specify the envelope-from address when sending mail.
The value used to specify it is whatever is found in
the variable `mail-envelope-from', with `user-mail-address' as fallback.
@@ -22675,22 +23164,19 @@ variable `feedmail-deduce-envelope-from'.")
(custom-autoload (quote mail-specify-envelope-from) "sendmail")
(defvar mail-self-blind nil "\
-*Non-nil means insert BCC to self in messages to be sent.
+Non-nil means insert BCC to self in messages to be sent.
This is done when the message is initialized,
so you can remove or alter the BCC field to override the default.")
(custom-autoload (quote mail-self-blind) "sendmail")
(defvar mail-interactive nil "\
-*Non-nil means when sending a message wait for and display errors.
+Non-nil means when sending a message wait for and display errors.
nil means let mailer mail back a message to report errors.")
(custom-autoload (quote mail-interactive) "sendmail")
-(defvar mail-yank-ignored-headers "^via:\\|^mail-from:\\|^origin:\\|^status:\\|^remailed\\|^received:\\|^message-id:\\|^summary-line:\\|^to:\\|^subject:\\|^in-reply-to:\\|^return-path:\\|^mail-reply-to:\\|^mail-followup-to:" "\
-*Delete these headers from old message when it's inserted in a reply.")
-
-(custom-autoload (quote mail-yank-ignored-headers) "sendmail")
+(put (quote send-mail-function) (quote standard-value) (quote ((if (and window-system (memq system-type (quote (darwin windows-nt)))) (quote mailclient-send-it) (quote sendmail-send-it)))))
(defvar send-mail-function (if (and window-system (memq system-type (quote (darwin windows-nt)))) (quote mailclient-send-it) (quote sendmail-send-it)) "\
Function to call to send the current buffer as mail.
@@ -22703,25 +23189,25 @@ This is used by the default mail-sending commands. See also
(custom-autoload (quote send-mail-function) "sendmail")
(defvar mail-header-separator "--text follows this line--" "\
-*Line used to separate headers from text in messages being composed.")
+Line used to separate headers from text in messages being composed.")
(custom-autoload (quote mail-header-separator) "sendmail")
(defvar mail-archive-file-name nil "\
-*Name of file to write all outgoing messages in, or nil for none.
+Name of file to write all outgoing messages in, or nil for none.
This can be an inbox file or an Rmail file.")
(custom-autoload (quote mail-archive-file-name) "sendmail")
(defvar mail-default-reply-to nil "\
-*Address to insert as default Reply-to field of outgoing messages.
+Address to insert as default Reply-to field of outgoing messages.
If nil, it will be initialized from the REPLYTO environment variable
when you first send mail.")
(custom-autoload (quote mail-default-reply-to) "sendmail")
(defvar mail-alias-file nil "\
-*If non-nil, the name of a file to use instead of `/usr/lib/aliases'.
+If non-nil, the name of a file to use instead of `/usr/lib/aliases'.
This file defines aliases to be expanded by the mailer; this is a different
feature from that of defining aliases in `.mailrc' to be expanded in Emacs.
This variable has no effect unless your system uses sendmail as its mailer.")
@@ -22729,7 +23215,7 @@ This variable has no effect unless your system uses sendmail as its mailer.")
(custom-autoload (quote mail-alias-file) "sendmail")
(defvar mail-personal-alias-file "~/.mailrc" "\
-*If non-nil, the name of the user's personal mail alias file.
+If non-nil, the name of the user's personal mail alias file.
This file typically should be in same format as the `.mailrc' file used by
the `Mail' or `mailx' program.
This file need not actually exist.")
@@ -22751,19 +23237,19 @@ The alias definitions in the file have this form:
alias ALIAS MEANING")
(defvar mail-yank-prefix nil "\
-*Prefix insert on lines of yanked message being replied to.
+Prefix insert on lines of yanked message being replied to.
nil means use indentation.")
(custom-autoload (quote mail-yank-prefix) "sendmail")
(defvar mail-indentation-spaces 3 "\
-*Number of spaces to insert at the beginning of each cited line.
+Number of spaces to insert at the beginning of each cited line.
Used by `mail-yank-original' via `mail-indent-citation'.")
(custom-autoload (quote mail-indentation-spaces) "sendmail")
(defvar mail-citation-hook nil "\
-*Hook for modifying a citation just inserted in the mail buffer.
+Hook for modifying a citation just inserted in the mail buffer.
Each hook function can find the citation between (point) and (mark t),
and should leave point and mark around the citation text as modified.
The hook functions can find the header of the cited message
@@ -22776,7 +23262,7 @@ instead of no action.")
(custom-autoload (quote mail-citation-hook) "sendmail")
(defvar mail-citation-prefix-regexp "[ ]*[-a-z0-9A-Z]*>+[ ]*\\|[ ]*" "\
-*Regular expression to match a citation prefix plus whitespace.
+Regular expression to match a citation prefix plus whitespace.
It should match whatever sort of citation prefixes you want to handle,
with whitespace before and after; it should also match just whitespace.
The default value matches citations like `foo-bar>' plus whitespace.")
@@ -22784,7 +23270,7 @@ The default value matches citations like `foo-bar>' plus whitespace.")
(custom-autoload (quote mail-citation-prefix-regexp) "sendmail")
(defvar mail-signature nil "\
-*Text inserted at end of mail buffer when a message is initialized.
+Text inserted at end of mail buffer when a message is initialized.
If t, it means to insert the contents of the file `mail-signature-file'.
If a string, that string is inserted.
(To make a proper signature, the string should begin with \\n\\n-- \\n,
@@ -22795,26 +23281,26 @@ and should insert whatever you want to insert.")
(custom-autoload (quote mail-signature) "sendmail")
(defvar mail-signature-file "~/.signature" "\
-*File containing the text inserted at end of mail buffer.")
+File containing the text inserted at end of mail buffer.")
(custom-autoload (quote mail-signature-file) "sendmail")
(defvar mail-default-directory "~/" "\
-*Directory for mail buffers.
+Directory for mail buffers.
Value of `default-directory' for mail buffers.
This directory is used for auto-save files of mail buffers.")
(custom-autoload (quote mail-default-directory) "sendmail")
(defvar mail-default-headers nil "\
-*A string containing header lines, to be inserted in outgoing messages.
+A string containing header lines, to be inserted in outgoing messages.
It is inserted before you edit the message,
so you can edit or delete these lines.")
(custom-autoload (quote mail-default-headers) "sendmail")
(defvar mail-bury-selects-summary t "\
-*If non-nil, try to show RMAIL summary buffer after returning from mail.
+If non-nil, try to show RMAIL summary buffer after returning from mail.
The functions \\[mail-send-on-exit] or \\[mail-dont-send] select
the RMAIL summary buffer before returning, if it exists and this variable
is non-nil.")
@@ -22822,7 +23308,7 @@ is non-nil.")
(custom-autoload (quote mail-bury-selects-summary) "sendmail")
(defvar mail-send-nonascii (quote mime) "\
-*Specify whether to allow sending non-ASCII characters in mail.
+Specify whether to allow sending non-ASCII characters in mail.
If t, that means do allow it. nil means don't allow it.
`query' means ask the user each time.
`mime' means add an appropriate MIME header if none already present.
@@ -22835,7 +23321,10 @@ for the recipient, who may not know how to decode them properly.")
(autoload (quote mail-mode) "sendmail" "\
Major mode for editing mail to be sent.
Like Text Mode but with these additional commands:
-\\[mail-send] mail-send (send the message) \\[mail-send-and-exit] mail-send-and-exit
+
+\\[mail-send] mail-send (send the message)
+\\[mail-send-and-exit] mail-send-and-exit (send the message and exit)
+
Here are commands that move to a header field (and create it if there isn't):
\\[mail-to] move to To: \\[mail-subject] move to Subject:
\\[mail-cc] move to CC: \\[mail-bcc] move to BCC:
@@ -22941,7 +23430,7 @@ Like `mail' command, but display mail buffer in another frame.
;;;***
;;;### (autoloads (server-mode server-start) "server" "server.el"
-;;;;;; (17244 48630))
+;;;;;; (17244 54745))
;;; Generated autoloads from server.el
(autoload (quote server-start) "server" "\
@@ -22975,7 +23464,7 @@ Server mode runs a process that accepts commands from the
;;;***
-;;;### (autoloads (ses-mode) "ses" "ses.el" (17239 32237))
+;;;### (autoloads (ses-mode) "ses" "ses.el" (17365 22702))
;;; Generated autoloads from ses.el
(autoload (quote ses-mode) "ses" "\
@@ -22994,7 +23483,7 @@ These are active only in the minibuffer, when entering or editing a formula:
;;;***
;;;### (autoloads (html-mode sgml-mode) "sgml-mode" "textmodes/sgml-mode.el"
-;;;;;; (17185 27753))
+;;;;;; (17356 16925))
;;; Generated autoloads from textmodes/sgml-mode.el
(autoload (quote sgml-mode) "sgml-mode" "\
@@ -23062,7 +23551,7 @@ To work around that, do:
;;;***
;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el"
-;;;;;; (17242 7322))
+;;;;;; (17316 61871))
;;; Generated autoloads from progmodes/sh-script.el
(autoload (quote sh-mode) "sh-script" "\
@@ -23080,7 +23569,7 @@ shell-specific features.
The default style of this mode is that of Rosenblatt's Korn shell book.
The syntax of the statements varies with the shell being used. The
following commands are available, based on the current shell's syntax:
-
+\\<sh-mode-map>
\\[sh-case] case statement
\\[sh-for] for loop
\\[sh-function] function definition
@@ -23140,7 +23629,7 @@ If BINARY is non-nil, return a string in binary form.
;;;***
;;;### (autoloads (list-load-path-shadows) "shadow" "emacs-lisp/shadow.el"
-;;;;;; (17148 25098))
+;;;;;; (17279 31149))
;;; Generated autoloads from emacs-lisp/shadow.el
(autoload (quote list-load-path-shadows) "shadow" "\
@@ -23310,8 +23799,8 @@ Turning on Sieve mode runs `sieve-mode-hook'.
;;;***
-;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17140
-;;;;;; 20980))
+;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17276
+;;;;;; 44727))
;;; Generated autoloads from progmodes/simula.el
(autoload (quote simula-mode) "simula" "\
@@ -23470,7 +23959,7 @@ symmetrical ones, and the same character twice for the others.
;;;***
;;;### (autoloads (smerge-mode smerge-ediff) "smerge-mode" "smerge-mode.el"
-;;;;;; (17247 15785))
+;;;;;; (17248 650))
;;; Generated autoloads from smerge-mode.el
(autoload (quote smerge-ediff) "smerge-mode" "\
@@ -23507,7 +23996,7 @@ interactively. If there's no argument, do it at the current buffer
;;;***
;;;### (autoloads (smtpmail-send-queued-mail smtpmail-send-it) "smtpmail"
-;;;;;; "mail/smtpmail.el" (17120 44799))
+;;;;;; "mail/smtpmail.el" (17358 48216))
;;; Generated autoloads from mail/smtpmail.el
(autoload (quote smtpmail-send-it) "smtpmail" "\
@@ -23577,7 +24066,7 @@ then `snmpv2-mode-hook'.
;;;### (autoloads (solar-equinoxes-solstices sunrise-sunset calendar-location-name
;;;;;; calendar-longitude calendar-latitude calendar-time-display-form)
-;;;;;; "solar" "calendar/solar.el" (17239 32270))
+;;;;;; "solar" "calendar/solar.el" (17307 14150))
;;; Generated autoloads from calendar/solar.el
(defvar calendar-time-display-form (quote (12-hours ":" minutes am-pm (if time-zone " (") time-zone (if time-zone ")"))) "\
@@ -23868,8 +24357,8 @@ From a program takes two point or marker arguments, BEG and END.
;;;***
-;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17148
-;;;;;; 25153))
+;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17360
+;;;;;; 3380))
;;; Generated autoloads from gnus/spam.el
(autoload (quote spam-initialize) "spam" "\
@@ -23924,7 +24413,7 @@ Spam reports will be queued with the method used when
;;;***
;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar"
-;;;;;; "speedbar.el" (17239 32244))
+;;;;;; "speedbar.el" (17294 14915))
;;; Generated autoloads from speedbar.el
(defalias (quote speedbar) (quote speedbar-frame-mode))
@@ -24568,7 +25057,7 @@ Studlify-case the current buffer.
;;;***
-;;;### (autoloads (locate-library) "subr" "subr.el" (17250 21630))
+;;;### (autoloads (locate-library) "subr" "subr.el" (17374 39354))
;;; Generated autoloads from subr.el
(autoload (quote locate-library) "subr" "\
@@ -24622,20 +25111,6 @@ before, and `sc-post-hook' is run after the guts of this function.
;;;***
-;;;### (autoloads (syntax-ppss) "syntax" "emacs-lisp/syntax.el" (17242
-;;;;;; 7313))
-;;; Generated autoloads from emacs-lisp/syntax.el
-
-(autoload (quote syntax-ppss) "syntax" "\
-Parse-Partial-Sexp State at POS.
-The returned value is the same as `parse-partial-sexp' except that
-the 2nd and 6th values of the returned state cannot be relied upon.
-Point is at POS when this function returns.
-
-\(fn &optional POS)" nil nil)
-
-;;;***
-
;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (17148 25050))
;;; Generated autoloads from tabify.el
@@ -24671,7 +25146,7 @@ The variable `tab-width' controls the spacing of tab stops.
;;;;;; table-recognize table-insert-row-column table-insert-column
;;;;;; table-insert-row table-insert table-point-left-cell-hook
;;;;;; table-point-entered-cell-hook table-load-hook table-cell-map-hook)
-;;;;;; "table" "textmodes/table.el" (17159 1496))
+;;;;;; "table" "textmodes/table.el" (17378 11759))
;;; Generated autoloads from textmodes/table.el
(defvar table-cell-map-hook nil "\
@@ -25269,7 +25744,7 @@ Connect to display DISPLAY for the Emacs talk group.
;;;***
-;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (17242 7312))
+;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (17267 37747))
;;; Generated autoloads from tar-mode.el
(autoload (quote tar-mode) "tar-mode" "\
@@ -25281,7 +25756,7 @@ or click mouse-2 on the file's line in the Tar mode buffer.
Type `c' to copy an entry from the tar file into another file on disk.
If you edit a sub-file of this archive (as with the `e' command) and
-save it with Control-x Control-s, the contents of that buffer will be
+save it with \\[save-buffer], the contents of that buffer will be
saved back into the tar-file buffer; in this way you can edit a file
inside of a tar archive without extracting it and re-archiving it.
@@ -25293,7 +25768,7 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'.
;;;***
;;;### (autoloads (tcl-help-on-word inferior-tcl tcl-mode) "tcl"
-;;;;;; "progmodes/tcl.el" (17102 19053))
+;;;;;; "progmodes/tcl.el" (17348 7449))
;;; Generated autoloads from progmodes/tcl.el
(autoload (quote tcl-mode) "tcl" "\
@@ -25371,8 +25846,8 @@ Normally input is edited in Emacs and sent a line at a time.
;;;***
-;;;### (autoloads (ansi-term term make-term) "term" "term.el" (17248
-;;;;;; 29270))
+;;;### (autoloads (ansi-term term make-term) "term" "term.el" (17354
+;;;;;; 44750))
;;; Generated autoloads from term.el
(autoload (quote make-term) "term" "\
@@ -25781,7 +26256,7 @@ Major mode to edit DocTeX files.
;;;***
;;;### (autoloads (texi2info texinfo-format-region texinfo-format-buffer)
-;;;;;; "texinfmt" "textmodes/texinfmt.el" (17148 25229))
+;;;;;; "texinfmt" "textmodes/texinfmt.el" (17312 51446))
;;; Generated autoloads from textmodes/texinfmt.el
(autoload (quote texinfo-format-buffer) "texinfmt" "\
@@ -25821,7 +26296,7 @@ if large. You can use Info-split to do this manually.
;;;***
;;;### (autoloads (texinfo-mode texinfo-close-quote texinfo-open-quote)
-;;;;;; "texinfo" "textmodes/texinfo.el" (17246 24773))
+;;;;;; "texinfo" "textmodes/texinfo.el" (17276 44727))
;;; Generated autoloads from textmodes/texinfo.el
(defvar texinfo-open-quote "``" "\
@@ -26007,9 +26482,9 @@ Not documented
;;;***
-;;;### (autoloads (thumbs-dired-setroot thumbs-dired-show-all thumbs-dired-show-marked
-;;;;;; thumbs-show-all-from-dir thumbs-find-thumb) "thumbs" "thumbs.el"
-;;;;;; (17245 51608))
+;;;### (autoloads (thumbs-dired-setroot thumbs-dired-show thumbs-dired-show-marked
+;;;;;; thumbs-show-from-dir thumbs-find-thumb) "thumbs" "thumbs.el"
+;;;;;; (17374 9567))
;;; Generated autoloads from thumbs.el
(autoload (quote thumbs-find-thumb) "thumbs" "\
@@ -26017,7 +26492,7 @@ Display the thumbnail for IMG.
\(fn IMG)" t nil)
-(autoload (quote thumbs-show-all-from-dir) "thumbs" "\
+(autoload (quote thumbs-show-from-dir) "thumbs" "\
Make a preview buffer for all images in DIR.
Optional argument REG to select file matching a regexp,
and SAME-WINDOW to show thumbs in the same window.
@@ -26025,16 +26500,16 @@ and SAME-WINDOW to show thumbs in the same window.
\(fn DIR &optional REG SAME-WINDOW)" t nil)
(autoload (quote thumbs-dired-show-marked) "thumbs" "\
-In dired, make a thumbs buffer with all marked files.
+In dired, make a thumbs buffer with marked files.
\(fn)" t nil)
-(autoload (quote thumbs-dired-show-all) "thumbs" "\
+(autoload (quote thumbs-dired-show) "thumbs" "\
In dired, make a thumbs buffer with all files in current directory.
\(fn)" t nil)
-(defalias (quote thumbs) (quote thumbs-show-all-from-dir))
+(defalias (quote thumbs) (quote thumbs-show-from-dir))
(autoload (quote thumbs-dired-setroot) "thumbs" "\
In dired, call the setroot program on the image at point.
@@ -26127,7 +26602,7 @@ Not documented
;;;***
;;;### (autoloads (tildify-buffer tildify-region) "tildify" "textmodes/tildify.el"
-;;;;;; (17205 6265))
+;;;;;; (17342 36761))
;;; Generated autoloads from textmodes/tildify.el
(autoload (quote tildify-region) "tildify" "\
@@ -26151,7 +26626,7 @@ This function performs no refilling of the changed text.
;;;***
;;;### (autoloads (display-time-mode display-time display-time-day-and-date)
-;;;;;; "time" "time.el" (17148 25057))
+;;;;;; "time" "time.el" (17356 14847))
;;; Generated autoloads from time.el
(defvar display-time-day-and-date nil "\
@@ -26194,8 +26669,8 @@ This runs the normal hook `display-time-hook' after each update.
;;;### (autoloads (safe-date-to-time time-to-days time-to-day-in-year
;;;;;; date-leap-year-p days-between date-to-day time-add time-subtract
;;;;;; time-since days-to-time time-less-p seconds-to-time time-to-seconds
-;;;;;; date-to-time) "time-date" "calendar/time-date.el" (17239
-;;;;;; 32270))
+;;;;;; date-to-time) "time-date" "calendar/time-date.el" (17307
+;;;;;; 14150))
;;; Generated autoloads from calendar/time-date.el
(autoload (quote date-to-time) "time-date" "\
@@ -26317,7 +26792,7 @@ With ARG, turn time stamping on if and only if arg is positive.
;;;;;; timeclock-workday-remaining-string timeclock-reread-log timeclock-query-out
;;;;;; timeclock-change timeclock-status-string timeclock-out timeclock-in
;;;;;; timeclock-modeline-display) "timeclock" "calendar/timeclock.el"
-;;;;;; (17239 32271))
+;;;;;; (17307 14150))
;;; Generated autoloads from calendar/timeclock.el
(autoload (quote timeclock-modeline-display) "timeclock" "\
@@ -26418,7 +26893,7 @@ relative only to the time worked today, and not to past time.
;;;### (autoloads (with-timeout run-with-idle-timer add-timeout run-with-timer
;;;;;; run-at-time cancel-function-timers cancel-timer) "timer"
-;;;;;; "emacs-lisp/timer.el" (17148 25099))
+;;;;;; "emacs-lisp/timer.el" (17251 53836))
;;; Generated autoloads from emacs-lisp/timer.el
(defalias (quote disable-timeout) (quote cancel-timer))
@@ -26577,7 +27052,7 @@ Its value should be an event that has a binding in MENU.
;;;### (autoloads (todo-show todo-cp todo-mode todo-print todo-top-priorities
;;;;;; todo-insert-item todo-add-item-non-interactively todo-add-category)
-;;;;;; "todo-mode" "calendar/todo-mode.el" (17102 18477))
+;;;;;; "todo-mode" "calendar/todo-mode.el" (17307 14150))
;;; Generated autoloads from calendar/todo-mode.el
(autoload (quote todo-add-category) "todo-mode" "\
@@ -26638,7 +27113,7 @@ Show TODO list.
;;;### (autoloads (tool-bar-local-item-from-menu tool-bar-add-item-from-menu
;;;;;; tool-bar-local-item tool-bar-add-item) "tool-bar" "tool-bar.el"
-;;;;;; (17250 21105))
+;;;;;; (17324 9268))
;;; Generated autoloads from tool-bar.el
(put (quote tool-bar-mode) (quote standard-value) (quote (t)))
@@ -26675,7 +27150,7 @@ ICON.xbm, using `find-image'.
\(fn ICON DEF KEY MAP &rest PROPS)" nil nil)
(autoload (quote tool-bar-add-item-from-menu) "tool-bar" "\
-Define tool bar binding for COMMAND using the given ICON in keymap MAP.
+Define tool bar binding for COMMAND in keymap MAP using the given ICON.
This makes a binding for COMMAND in `tool-bar-map', copying its
binding from the menu bar in MAP (which defaults to `global-map'), but
modifies the binding by adding an image specification for ICON. It
@@ -26685,19 +27160,20 @@ properties to add to the binding.
MAP must contain appropriate binding for `[menu-bar]' which holds a keymap.
Use this function only to make bindings in the global value of `tool-bar-map'.
-To define items in any other map, use `tool-bar-local-item'.
+To define items in any other map, use `tool-bar-local-item-from-menu'.
\(fn COMMAND ICON &optional MAP &rest PROPS)" nil nil)
(autoload (quote tool-bar-local-item-from-menu) "tool-bar" "\
-Define tool bar binding for COMMAND using the given ICON in keymap MAP.
+Define local tool bar binding for COMMAND using the given ICON.
This makes a binding for COMMAND in IN-MAP, copying its binding from
the menu bar in FROM-MAP (which defaults to `global-map'), but
modifies the binding by adding an image specification for ICON. It
finds ICON just like `tool-bar-add-item'. PROPS are additional
properties to add to the binding.
-MAP must contain appropriate binding for `[menu-bar]' which holds a keymap.
+FROM-MAP must contain appropriate binding for `[menu-bar]' which
+holds a keymap.
\(fn COMMAND ICON IN-MAP &optional FROM-MAP &rest PROPS)" nil nil)
@@ -26797,9 +27273,10 @@ the window or buffer configuration at all.
;;;***
-;;;### (autoloads (tramp-completion-file-name-handler tramp-file-name-handler
+;;;### (autoloads (tramp-unload-tramp tramp-unload-file-name-handler-alist
+;;;;;; tramp-completion-file-name-handler tramp-file-name-handler
;;;;;; tramp-completion-file-name-regexp tramp-file-name-regexp)
-;;;;;; "tramp" "net/tramp.el" (17250 21105))
+;;;;;; "tramp" "net/tramp.el" (17377 15371))
;;; Generated autoloads from net/tramp.el
(defvar tramp-unified-filenames (not (featurep (quote xemacs))) "\
@@ -26873,6 +27350,53 @@ Falls back to normal file name handler if no tramp file name handler exists.
(add-to-list (quote file-name-handler-alist) (cons tramp-file-name-regexp (quote tramp-file-name-handler)))
+(autoload (quote tramp-unload-file-name-handler-alist) "tramp" "\
+Not documented
+
+\(fn)" nil nil)
+
+(autoload (quote tramp-unload-tramp) "tramp" "\
+Not documented
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (tramp-ftp-enable-ange-ftp) "tramp-ftp" "net/tramp-ftp.el"
+;;;;;; (17364 3828))
+;;; Generated autoloads from net/tramp-ftp.el
+
+(autoload (quote tramp-ftp-enable-ange-ftp) "tramp-ftp" "\
+Not documented
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads (tumme-setup-dired-keybindings tumme-dired) "tumme"
+;;;;;; "tumme.el" (17369 18495))
+;;; Generated autoloads from tumme.el
+
+(autoload (quote tumme-dired) "tumme" "\
+Open directory DIR and create a default window configuration.
+
+Convenience command that:
+
+ - Opens dired in folder DIR
+ - Splits windows in most useful (?) way
+ - Set `truncate-lines' to t
+
+If called with prefix argument ARG, skip splitting of windows.
+
+\(fn DIR &optional ARG)" t nil)
+
+(autoload (quote tumme-setup-dired-keybindings) "tumme" "\
+Setup easy-to-use keybindings for the commands to be used in dired mode.
+Note that n, p and <down> and <up> will be hijacked and bound to
+`tumme-dired-x-line'.
+
+\(fn)" t nil)
+
;;;***
;;;### (autoloads (2C-split 2C-associate-buffer 2C-two-columns) "two-column"
@@ -27169,8 +27693,8 @@ Convert Rmail file FILE to system inbox format file TO-FILE.
;;;***
-;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (17148
-;;;;;; 25100))
+;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (17376
+;;;;;; 60055))
;;; Generated autoloads from emacs-lisp/unsafep.el
(autoload (quote unsafep) "unsafep" "\
@@ -27182,10 +27706,33 @@ of symbols with local bindings.
;;;***
-;;;### (autoloads nil "url" "url/url.el" (17239 32426))
+;;;### (autoloads (url-retrieve-synchronously url-retrieve) "url"
+;;;;;; "url/url.el" (17348 7449))
;;; Generated autoloads from url/url.el
-(defvar url-configuration-directory "~/.url")
+(autoload (quote url-retrieve) "url" "\
+Retrieve URL asynchronously and call CALLBACK with CBARGS when finished.
+URL is either a string or a parsed URL.
+
+CALLBACK is called when the object has been completely retrieved, with
+the current buffer containing the object, and any MIME headers associated
+with it. Normally it gets the arguments in the list CBARGS.
+However, if what we find is a redirect, CALLBACK is given
+two additional args, `:redirect' and the redirected URL,
+followed by CBARGS.
+
+Return the buffer URL will load into, or nil if the process has
+already completed.
+
+\(fn URL CALLBACK &optional CBARGS)" nil nil)
+
+(autoload (quote url-retrieve-synchronously) "url" "\
+Retrieve URL synchronously.
+Return the buffer containing the data, or nil if there are no data
+associated with it (the case for dired, info, or mailto URLs that need
+no further processing). URL is either a string or a parsed URL.
+
+\(fn URL)" nil nil)
;;;***
@@ -27232,8 +27779,8 @@ RATING a rating between 1 and 10 of the strength of the authentication.
;;;***
;;;### (autoloads (url-cache-expired url-cache-extract url-is-cached
-;;;;;; url-store-in-cache) "url-cache" "url/url-cache.el" (17141
-;;;;;; 252))
+;;;;;; url-store-in-cache) "url-cache" "url/url-cache.el" (17337
+;;;;;; 11067))
;;; Generated autoloads from url/url-cache.el
(autoload (quote url-store-in-cache) "url-cache" "\
@@ -27268,44 +27815,6 @@ Not documented
;;;***
-;;;### (autoloads (url-cookie-setup-save-timer url-cookie-handle-set-cookie
-;;;;;; url-cookie-generate-header-lines url-cookie-retrieve url-cookie-write-file
-;;;;;; url-cookie-parse-file) "url-cookie" "url/url-cookie.el" (17141
-;;;;;; 252))
-;;; Generated autoloads from url/url-cookie.el
-
-(autoload (quote url-cookie-parse-file) "url-cookie" "\
-Not documented
-
-\(fn &optional FNAME)" nil nil)
-
-(autoload (quote url-cookie-write-file) "url-cookie" "\
-Not documented
-
-\(fn &optional FNAME)" nil nil)
-
-(autoload (quote url-cookie-retrieve) "url-cookie" "\
-Retrieve all the netscape-style cookies for a specified HOST and LOCALPART.
-
-\(fn HOST LOCALPART &optional SECURE)" nil nil)
-
-(autoload (quote url-cookie-generate-header-lines) "url-cookie" "\
-Not documented
-
-\(fn HOST LOCALPART SECURE)" nil nil)
-
-(autoload (quote url-cookie-handle-set-cookie) "url-cookie" "\
-Not documented
-
-\(fn STR)" nil nil)
-
-(autoload (quote url-cookie-setup-save-timer) "url-cookie" "\
-Reset the cookie saver timer.
-
-\(fn)" t nil)
-
-;;;***
-
;;;### (autoloads (url-dav-vc-registered url-dav-supported-p) "url-dav"
;;;;;; "url/url-dav.el" (17141 254))
;;; Generated autoloads from url/url-dav.el
@@ -27322,8 +27831,8 @@ Not documented
;;;***
-;;;### (autoloads (url-file) "url-file" "url/url-file.el" (17239
-;;;;;; 43869))
+;;;### (autoloads (url-file) "url-file" "url/url-file.el" (17240
+;;;;;; 1916))
;;; Generated autoloads from url/url-file.el
(autoload (quote url-file) "url-file" "\
@@ -27352,8 +27861,8 @@ Will not make a connection if `url-gateway-unplugged' is non-nil.
;;;***
;;;### (autoloads (url-insert-file-contents url-file-local-copy url-copy-file
-;;;;;; url-handler-mode) "url-handlers" "url/url-handlers.el" (17239
-;;;;;; 43869))
+;;;;;; url-handler-mode) "url-handlers" "url/url-handlers.el" (17337
+;;;;;; 11067))
;;; Generated autoloads from url/url-handlers.el
(defvar url-handler-mode nil "\
@@ -27397,33 +27906,8 @@ Not documented
;;;***
-;;;### (autoloads (url-history-save-history url-history-parse-history
-;;;;;; url-history-setup-save-timer) "url-history" "url/url-history.el"
-;;;;;; (17141 258))
-;;; Generated autoloads from url/url-history.el
-
-(autoload (quote url-history-setup-save-timer) "url-history" "\
-Reset the history list timer.
-
-\(fn)" t nil)
-
-(autoload (quote url-history-parse-history) "url-history" "\
-Parse a history file stored in FNAME.
-
-\(fn &optional FNAME)" nil nil)
-
-(autoload (quote url-history-save-history) "url-history" "\
-Write the global history file into `url-history-file'.
-The type of data written is determined by what is in the file to begin
-with. If the type of storage cannot be determined, then prompt the
-user for what type to save as.
-
-\(fn &optional FNAME)" t nil)
-
-;;;***
-
;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p
-;;;;;; url-http) "url-http" "url/url-http.el" (17239 43869))
+;;;;;; url-http) "url-http" "url/url-http.el" (17278 11297))
;;; Generated autoloads from url/url-http.el
(autoload (quote url-http) "url-http" "\
@@ -27501,7 +27985,7 @@ URL can be a URL string, or a URL vector of the type returned by
;;;***
;;;### (autoloads (url-mailto url-mail) "url-mailto" "url/url-mailto.el"
-;;;;;; (17195 54695))
+;;;;;; (17196 9351))
;;; Generated autoloads from url/url-mailto.el
(autoload (quote url-mail) "url-mailto" "\
@@ -27549,7 +28033,7 @@ Fetch a data URL (RFC 2397).
;;;***
;;;### (autoloads (url-snews url-news) "url-news" "url/url-news.el"
-;;;;;; (17167 2802))
+;;;;;; (17358 30050))
;;; Generated autoloads from url/url-news.el
(autoload (quote url-news) "url-news" "\
@@ -27625,11 +28109,11 @@ Format is:
;;;***
;;;### (autoloads (url-setup-privacy-info) "url-privacy" "url/url-privacy.el"
-;;;;;; (17141 263))
+;;;;;; (17348 7449))
;;; Generated autoloads from url/url-privacy.el
(autoload (quote url-setup-privacy-info) "url-privacy" "\
-Not documented
+Setup variables that expose info about you and your system.
\(fn)" t nil)
@@ -27832,23 +28316,23 @@ If FILE-NAME is non-nil, save the result to FILE-NAME.
;;;;;; vc-directory vc-merge vc-insert-headers vc-version-other-window
;;;;;; vc-diff vc-register vc-next-action vc-do-command edit-vc-file
;;;;;; with-vc-file vc-branch-part vc-trunk-p vc-before-checkin-hook
-;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc.el" (17245 51609))
+;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc.el" (17367 53073))
;;; Generated autoloads from vc.el
(defvar vc-checkout-hook nil "\
-*Normal hook (list of functions) run after checking out a file.
+Normal hook (list of functions) run after checking out a file.
See `run-hooks'.")
(custom-autoload (quote vc-checkout-hook) "vc")
(defvar vc-checkin-hook nil "\
-*Normal hook (list of functions) run after a checkin is done.
+Normal hook (list of functions) run after a checkin is done.
See also `log-edit-done-hook'.")
(custom-autoload (quote vc-checkin-hook) "vc")
(defvar vc-before-checkin-hook nil "\
-*Normal hook (list of functions) run before a file is checked in.
+Normal hook (list of functions) run before a file is checked in.
See `run-hooks'.")
(custom-autoload (quote vc-before-checkin-hook) "vc")
@@ -27886,8 +28370,9 @@ Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil or the
current buffer if BUFFER is t. If the destination buffer is not
already current, set it up properly and erase it. The command is
considered successful if its exit status does not exceed OKSTATUS (if
-OKSTATUS is nil, that means to ignore errors, if it is 'async, that
-means not to wait for termination of the subprocess). FILE is the
+OKSTATUS is nil, that means to ignore error status, if it is `async', that
+means not to wait for termination of the subprocess; if it is t it means to
+ignore all execution errors). FILE is the
name of the working file (may also be nil, to execute commands that
don't expect a file name). If an optional list of FLAGS is present,
that is inserted into the command line before the filename.
@@ -28115,7 +28600,7 @@ mode-specific menu. `vc-annotate-color-map' and
`vc-annotate-very-old-color' defines the mapping of time to
colors. `vc-annotate-background' specifies the background color.
-\(fn PREFIX &optional REVISION DISPLAY-MODE)" t nil)
+\(fn FILE REV &optional DISPLAY-MODE BUF)" t nil)
;;;***
@@ -28129,7 +28614,7 @@ colors. `vc-annotate-background' specifies the background color.
;;;***
-;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (17148 25060))
+;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (17252 55237))
;;; Generated autoloads from vc-cvs.el
(defun vc-cvs-registered (f)
(when (file-readable-p (expand-file-name
@@ -28139,7 +28624,7 @@ colors. `vc-annotate-background' specifies the background color.
;;;***
-;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (17239 32248))
+;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (17312 51444))
;;; Generated autoloads from vc-mcvs.el
(defun vc-mcvs-registered (file)
(if (vc-find-root file "MCVS/CVS")
@@ -28150,7 +28635,7 @@ colors. `vc-annotate-background' specifies the background color.
;;;***
;;;### (autoloads (vc-rcs-master-templates) "vc-rcs" "vc-rcs.el"
-;;;;;; (17148 25062))
+;;;;;; (17370 39824))
;;; Generated autoloads from vc-rcs.el
(defvar vc-rcs-master-templates (quote ("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\
@@ -28163,7 +28648,7 @@ For a description of possible values, see `vc-check-master-templates'.")
;;;***
;;;### (autoloads (vc-sccs-master-templates) "vc-sccs" "vc-sccs.el"
-;;;;;; (17148 25063))
+;;;;;; (17370 39824))
;;; Generated autoloads from vc-sccs.el
(defvar vc-sccs-master-templates (quote ("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\
@@ -28180,7 +28665,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
;;;***
-;;;### (autoloads nil "vc-svn" "vc-svn.el" (17148 25063))
+;;;### (autoloads nil "vc-svn" "vc-svn.el" (17311 21875))
;;; Generated autoloads from vc-svn.el
(defun vc-svn-registered (f)
(when (file-readable-p (expand-file-name
@@ -28835,8 +29320,8 @@ Not documented
;;;### (autoloads (View-exit-and-edit view-mode-enter view-mode view-buffer-other-frame
;;;;;; view-buffer-other-window view-buffer view-file-other-frame
-;;;;;; view-file-other-window view-file) "view" "view.el" (17250
-;;;;;; 21105))
+;;;;;; view-file-other-window view-file) "view" "view.el" (17297
+;;;;;; 52533))
;;; Generated autoloads from view.el
(defvar view-mode nil "\
@@ -29000,12 +29485,14 @@ p searches backward for last regular expression.
\\[View-kill-and-leave] quit View mode, kill current buffer and go back to other buffer.
The effect of \\[View-leave] , \\[View-quit] and \\[View-kill-and-leave] depends on how view-mode was entered. If it was
-entered by view-file, view-file-other-window or view-file-other-frame
-\(\\[view-file], \\[view-file-other-window], \\[view-file-other-frame] or the dired mode v command), then \\[View-quit] will
-try to kill the current buffer. If view-mode was entered from another buffer
-as is done by View-buffer, View-buffer-other-window, View-buffer-other frame,
-View-file, View-file-other-window or View-file-other-frame then \\[View-leave] , \\[View-quit] and \\[View-kill-and-leave]
-will return to that buffer.
+entered by view-file, view-file-other-window, view-file-other-frame, or
+\\[dired-view-file] (\\[view-file], \\[view-file-other-window],
+\\[view-file-other-frame], or the Dired mode v command),
+then \\[View-quit] will try to kill the current buffer.
+If view-mode was entered from another buffer, by \\[view-buffer],
+\\[view-buffer-other-window], \\[view-buffer-other frame], \\[view-file],
+\\[view-file-other-window], or \\[view-file-other-frame],
+then \\[View-leave] , \\[View-quit] and \\[View-kill-and-leave] will return to that buffer.
Entry to view-mode runs the normal hook `view-mode-hook'.
@@ -29060,7 +29547,7 @@ Turn on VIP emulation of VI.
;;;***
;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el"
-;;;;;; (17244 43743))
+;;;;;; (17373 34254))
;;; Generated autoloads from emulation/viper.el
(autoload (quote toggle-viper-mode) "viper" "\
@@ -29165,7 +29652,7 @@ this is equivalent to `display-warning', using
;;;***
;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el"
-;;;;;; (17205 6053))
+;;;;;; (17350 52783))
;;; Generated autoloads from wdired.el
(autoload (quote wdired-change-to-wdired-mode) "wdired" "\
@@ -29181,7 +29668,7 @@ See `wdired-mode'.
;;;***
-;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17140 20945))
+;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17333 17859))
;;; Generated autoloads from net/webjump.el
(autoload (quote webjump) "webjump" "\
@@ -29349,8 +29836,8 @@ With arg, turn widget mode on if and only if arg is positive.
;;;***
;;;### (autoloads (widget-setup widget-insert widget-delete widget-create
-;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (17244
-;;;;;; 43741))
+;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (17369
+;;;;;; 18495))
;;; Generated autoloads from wid-edit.el
(autoload (quote widgetp) "wid-edit" "\
@@ -29380,7 +29867,9 @@ Call `insert' with ARGS even if surrounding text is read only.
\(fn &rest ARGS)" nil nil)
-(defvar widget-keymap (let ((map (make-sparse-keymap))) (define-key map " " (quote widget-forward)) (define-key map [(shift tab)] (quote widget-backward)) (define-key map [backtab] (quote widget-backward)) (define-key map [down-mouse-2] (quote widget-button-click)) (define-key map " " (quote widget-button-press)) map) "\
+(defalias (quote advertised-widget-backward) (quote widget-backward))
+
+(defvar widget-keymap (let ((map (make-sparse-keymap))) (define-key map " " (quote widget-forward)) (define-key map " " (quote widget-backward)) (define-key map [(shift tab)] (quote advertised-widget-backward)) (define-key map [backtab] (quote widget-backward)) (define-key map [down-mouse-2] (quote widget-button-click)) (define-key map " " (quote widget-button-press)) map) "\
Keymap containing useful binding for buffers containing widgets.
Recommended as a parent keymap for modes using widgets.")
@@ -29614,7 +30103,7 @@ The key bindings are:
;;;***
;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el"
-;;;;;; (17148 25076))
+;;;;;; (17377 27370))
;;; Generated autoloads from xml.el
(autoload (quote xml-parse-file) "xml" "\
@@ -29639,8 +30128,8 @@ If PARSE-NS is non-nil, then QNAMES are expanded.
;;;***
-;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17148
-;;;;;; 25076))
+;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17332
+;;;;;; 49142))
;;; Generated autoloads from xt-mouse.el
(defvar xterm-mouse-mode nil "\
@@ -29685,7 +30174,7 @@ Extract file name from an yenc header.
;;;***
;;;### (autoloads (psychoanalyze-pinhead apropos-zippy insert-zippyism
-;;;;;; yow) "yow" "play/yow.el" (17140 20949))
+;;;;;; yow) "yow" "play/yow.el" (17297 52533))
;;; Generated autoloads from play/yow.el
(autoload (quote yow) "yow" "\
@@ -29763,10 +30252,10 @@ Zone-mode does two things:
;;;;;; "calendar/cal-iso.el" "calendar/cal-julian.el" "calendar/cal-mayan.el"
;;;;;; "calendar/cal-menu.el" "calendar/cal-move.el" "calendar/cal-persia.el"
;;;;;; "calendar/cal-tex.el" "calendar/cal-x.el" "case-table.el"
-;;;;;; "cdl.el" "cus-dep.el" "cus-load.el" "cus-start.el" "custom.el"
-;;;;;; "dframe.el" "dos-fns.el" "dos-vars.el" "dos-w32.el" "ediff-diff.el"
-;;;;;; "ediff-init.el" "ediff-merg.el" "ediff-ptch.el" "ediff-vers.el"
-;;;;;; "ediff-wind.el" "electric.el" "emacs-lisp/assoc.el" "emacs-lisp/authors.el"
+;;;;;; "cdl.el" "cus-dep.el" "cus-start.el" "custom.el" "dframe.el"
+;;;;;; "dos-fns.el" "dos-vars.el" "dos-w32.el" "ediff-diff.el" "ediff-init.el"
+;;;;;; "ediff-merg.el" "ediff-ptch.el" "ediff-vers.el" "ediff-wind.el"
+;;;;;; "electric.el" "emacs-lisp/assoc.el" "emacs-lisp/authors.el"
;;;;;; "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el" "emacs-lisp/byte-run.el"
;;;;;; "emacs-lisp/cl-compat.el" "emacs-lisp/cl-extra.el" "emacs-lisp/cl-macs.el"
;;;;;; "emacs-lisp/cl-seq.el" "emacs-lisp/cl-specs.el" "emacs-lisp/cust-print.el"
@@ -29780,17 +30269,19 @@ Zone-mode does two things:
;;;;;; "emulation/edt-pc.el" "emulation/edt-vt100.el" "emulation/tpu-mapper.el"
;;;;;; "emulation/viper-cmd.el" "emulation/viper-ex.el" "emulation/viper-init.el"
;;;;;; "emulation/viper-keym.el" "emulation/viper-macs.el" "emulation/viper-mous.el"
-;;;;;; "emulation/viper-util.el" "env.el" "eshell/em-alias.el" "eshell/em-banner.el"
-;;;;;; "eshell/em-basic.el" "eshell/em-cmpl.el" "eshell/em-dirs.el"
-;;;;;; "eshell/em-glob.el" "eshell/em-hist.el" "eshell/em-ls.el"
-;;;;;; "eshell/em-pred.el" "eshell/em-prompt.el" "eshell/em-rebind.el"
-;;;;;; "eshell/em-script.el" "eshell/em-smart.el" "eshell/em-term.el"
-;;;;;; "eshell/em-unix.el" "eshell/em-xtra.el" "eshell/esh-arg.el"
-;;;;;; "eshell/esh-cmd.el" "eshell/esh-ext.el" "eshell/esh-groups.el"
+;;;;;; "emulation/viper-util.el" "env.el" "erc/erc-backend.el" "erc/erc-goodies.el"
+;;;;;; "erc/erc-ibuffer.el" "erc/erc-identd.el" "erc/erc-lang.el"
+;;;;;; "erc/erc-menu.el" "erc/erc-nicklist.el" "eshell/em-alias.el"
+;;;;;; "eshell/em-banner.el" "eshell/em-basic.el" "eshell/em-cmpl.el"
+;;;;;; "eshell/em-dirs.el" "eshell/em-glob.el" "eshell/em-hist.el"
+;;;;;; "eshell/em-ls.el" "eshell/em-pred.el" "eshell/em-prompt.el"
+;;;;;; "eshell/em-rebind.el" "eshell/em-script.el" "eshell/em-smart.el"
+;;;;;; "eshell/em-term.el" "eshell/em-unix.el" "eshell/em-xtra.el"
+;;;;;; "eshell/esh-arg.el" "eshell/esh-cmd.el" "eshell/esh-ext.el"
;;;;;; "eshell/esh-io.el" "eshell/esh-maint.el" "eshell/esh-module.el"
;;;;;; "eshell/esh-opt.el" "eshell/esh-proc.el" "eshell/esh-util.el"
-;;;;;; "eshell/esh-var.el" "ezimage.el" "faces.el" "files.el" "finder-inf.el"
-;;;;;; "foldout.el" "font-core.el" "format.el" "forms-d2.el" "forms-pass.el"
+;;;;;; "eshell/esh-var.el" "ezimage.el" "faces.el" "files.el" "foldout.el"
+;;;;;; "font-core.el" "format.el" "forms-d2.el" "forms-pass.el"
;;;;;; "frame.el" "generic-x.el" "gnus/compface.el" "gnus/dig.el"
;;;;;; "gnus/dns.el" "gnus/format-spec.el" "gnus/gnus-async.el"
;;;;;; "gnus/gnus-bcklg.el" "gnus/gnus-cite.el" "gnus/gnus-cus.el"
@@ -29837,15 +30328,17 @@ Zone-mode does two things:
;;;;;; "loadup.el" "mail/blessmail.el" "mail/mailheader.el" "mail/mailpost.el"
;;;;;; "mail/mspools.el" "mail/rfc2368.el" "mail/rfc822.el" "mail/rmail-spam-filter.el"
;;;;;; "mail/uce.el" "mail/vms-pmail.el" "mh-e/mh-acros.el" "mh-e/mh-alias.el"
-;;;;;; "mh-e/mh-customize.el" "mh-e/mh-funcs.el" "mh-e/mh-gnus.el"
-;;;;;; "mh-e/mh-identity.el" "mh-e/mh-inc.el" "mh-e/mh-index.el"
-;;;;;; "mh-e/mh-junk.el" "mh-e/mh-loaddefs.el" "mh-e/mh-mime.el"
-;;;;;; "mh-e/mh-pick.el" "mh-e/mh-print.el" "mh-e/mh-seq.el" "mh-e/mh-speed.el"
-;;;;;; "mh-e/mh-utils.el" "misc.el" "mouse-copy.el" "mouse-drag.el"
-;;;;;; "mouse.el" "net/eudc-vars.el" "net/eudcb-bbdb.el" "net/eudcb-ldap.el"
+;;;;;; "mh-e/mh-buffers.el" "mh-e/mh-compat.el" "mh-e/mh-funcs.el"
+;;;;;; "mh-e/mh-gnus.el" "mh-e/mh-identity.el" "mh-e/mh-inc.el"
+;;;;;; "mh-e/mh-junk.el" "mh-e/mh-letter.el" "mh-e/mh-limit.el"
+;;;;;; "mh-e/mh-mime.el" "mh-e/mh-print.el" "mh-e/mh-scan.el" "mh-e/mh-search.el"
+;;;;;; "mh-e/mh-seq.el" "mh-e/mh-show.el" "mh-e/mh-speed.el" "mh-e/mh-thread.el"
+;;;;;; "mh-e/mh-tool-bar.el" "mh-e/mh-utils.el" "mh-e/mh-xface.el"
+;;;;;; "misc.el" "mouse-copy.el" "mouse-drag.el" "mouse.el" "net/eudc-vars.el"
+;;;;;; "net/eudcb-bbdb.el" "net/eudcb-ldap.el" "net/eudcb-mab.el"
;;;;;; "net/eudcb-ph.el" "net/ldap.el" "net/netrc.el" "net/tls.el"
-;;;;;; "net/tramp-ftp.el" "net/tramp-smb.el" "net/tramp-util.el"
-;;;;;; "net/tramp-uu.el" "net/tramp-vc.el" "net/trampver.el" "obsolete/awk-mode.el"
+;;;;;; "net/tramp-smb.el" "net/tramp-util.el" "net/tramp-uu.el"
+;;;;;; "net/tramp-vc.el" "net/trampver.el" "obsolete/awk-mode.el"
;;;;;; "obsolete/bg-mouse.el" "obsolete/float.el" "obsolete/hilit19.el"
;;;;;; "obsolete/iso-insert.el" "obsolete/iso-swed.el" "obsolete/keyswap.el"
;;;;;; "obsolete/mlsupport.el" "obsolete/ooutline.el" "obsolete/profile.el"
@@ -29853,8 +30346,8 @@ Zone-mode does two things:
;;;;;; "obsolete/sun-fns.el" "obsolete/swedish.el" "obsolete/uncompress.el"
;;;;;; "obsolete/x-apollo.el" "obsolete/x-menu.el" "patcomp.el"
;;;;;; "paths.el" "pcvs-info.el" "pcvs-parse.el" "pcvs-util.el"
-;;;;;; "pgg-def.el" "pgg-gpg.el" "pgg-parse.el" "pgg-pgp.el" "pgg-pgp5.el"
-;;;;;; "play/gamegrid.el" "play/gametree.el" "play/meese.el" "progmodes/ada-prj.el"
+;;;;;; "pgg-def.el" "pgg-parse.el" "pgg-pgp.el" "pgg-pgp5.el" "play/gamegrid.el"
+;;;;;; "play/gametree.el" "play/meese.el" "progmodes/ada-prj.el"
;;;;;; "progmodes/cc-align.el" "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el"
;;;;;; "progmodes/cc-cmds.el" "progmodes/cc-compat.el" "progmodes/cc-defs.el"
;;;;;; "progmodes/cc-fonts.el" "progmodes/cc-langs.el" "progmodes/cc-menus.el"
@@ -29885,7 +30378,7 @@ Zone-mode does two things:
;;;;;; "url/url-vars.el" "url/vc-dav.el" "vc-hooks.el" "vcursor.el"
;;;;;; "version.el" "vms-patch.el" "vmsproc.el" "vt-control.el"
;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "widget.el" "window.el"
-;;;;;; "x-dnd.el") (17250 22703 990875))
+;;;;;; "x-dnd.el") (17381 36573 585655))
;;;***
diff --git a/lisp/ledit.el b/lisp/ledit.el
index bf17f3cad4f..6aafdcfea4b 100644
--- a/lisp/ledit.el
+++ b/lisp/ledit.el
@@ -1,6 +1,7 @@
;;; ledit.el --- Emacs side of ledit interface
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: languages
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index f23715f3825..81dc8ebe3df 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -1,7 +1,7 @@
;;; loadhist.el --- lisp functions for working with feature groups
;; Copyright (C) 1995, 1998, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Maintainer: FSF
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 9767c33d61b..58219104e40 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -1,7 +1,7 @@
;;; loadup.el --- load up standardly loaded Lisp files for Emacs
;; Copyright (C) 1985, 1986, 1992, 1994, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/locate.el b/lisp/locate.el
index 9676c84f80c..bca53a32152 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -1,7 +1,7 @@
;;; locate.el --- interface to the locate command
;; Copyright (C) 1996, 1998, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Peter Breton <pbreton@cs.umb.edu>
;; Keywords: unix files
diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index 4c66f7f280b..0c7a655a237 100644
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -1,7 +1,7 @@
;;; log-edit.el --- Major mode for editing CVS commit messages
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: pcl-cvs cvs commit log
diff --git a/lisp/log-view.el b/lisp/log-view.el
index e7a58dad8b7..8a6f88650d2 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -1,7 +1,7 @@
;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: rcs sccs cvs log version-control
diff --git a/lisp/longlines.el b/lisp/longlines.el
index dadd8a5d58f..b11d4e6faba 100644
--- a/lisp/longlines.el
+++ b/lisp/longlines.el
@@ -1,6 +1,6 @@
;;; longlines.el --- automatically wrap long lines
-;; Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Authors: Kai Grossjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
;; Alex Schroeder <alex@gnu.org>
diff --git a/lisp/lpr.el b/lisp/lpr.el
index c44971e4f30..14d1049f074 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -1,7 +1,7 @@
;;; lpr.el --- print Emacs buffer on line printer
;; Copyright (C) 1985, 1988, 1992, 1994, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: unix
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 0da64128118..3a18442ef13 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -1,7 +1,7 @@
;;; ls-lisp.el --- emulate insert-directory completely in Emacs Lisp
;; Copyright (C) 1992, 1994, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
;; Modified by: Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>
diff --git a/lisp/macros.el b/lisp/macros.el
index 7075300ba18..55916ba80d6 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -1,7 +1,7 @@
;;; macros.el --- non-primitive commands for keyboard macros
;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1995, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: abbrev
diff --git a/lisp/mail/blessmail.el b/lisp/mail/blessmail.el
index 01c52f82046..41bad17d70e 100644
--- a/lisp/mail/blessmail.el
+++ b/lisp/mail/blessmail.el
@@ -1,6 +1,7 @@
;;; blessmail.el --- decide whether movemail needs special privileges -*- no-byte-compile: t -*-
-;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 47b7f1c3a1b..c58411c1e56 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -1,7 +1,7 @@
;;; emacsbug.el --- command to report Emacs bugs to appropriate mailing list
;; Copyright (C) 1985, 1994, 1997, 1998, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: K. Shane Hartman
;; Maintainer: FSF
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index 58b6be4f5fc..e831b89ef84 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -1,7 +1,7 @@
;;; footnote.el --- footnote support for message mode -*- coding: iso-latin-1;-*-
;; Copyright (C) 1997, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Steven L Baur <steve@xemacs.org>
;; Keywords: mail, news
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 0f5aa1e18f7..d891a031e59 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -1,7 +1,7 @@
;;; mail-extr.el --- extract full name and address from RFC 822 mail header -*- coding: utf-8 -*-
;; Copyright (C) 1991, 1992, 1993, 1994, 1997, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Joe Wells <jbw@cs.bu.edu>
;; Maintainer: FSF
diff --git a/lisp/mail/mail-hist.el b/lisp/mail/mail-hist.el
index 3010e85d31b..a2d7b0aab0f 100644
--- a/lisp/mail/mail-hist.el
+++ b/lisp/mail/mail-hist.el
@@ -1,6 +1,7 @@
;;; mail-hist.el --- headers and message body history for outgoing mail
-;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Karl Fogel <kfogel@red-bean.com>
;; Created: March, 1994
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index e76da171fbc..a6b774fc0c9 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -1,7 +1,7 @@
;;; mail-utils.el --- utility functions used both by rmail and rnews
;; Copyright (C) 1985, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: mail, news
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index 587b7d0187e..eab55bdef25 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -1,7 +1,7 @@
;;; mailabbrev.el --- abbrev-expansion of mail aliases
;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1996, 1997, 2000, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Jamie Zawinski <jwz@lucid.com>, now <jwz@jwz.org>
;; Maintainer: FSF
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index 48f3494a0e6..7d60ed27e5c 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -1,7 +1,7 @@
;;; mailalias.el --- expand and complete mailing address aliases
;; Copyright (C) 1985, 1987, 1995, 1996, 1997, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: mail
diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el
index 45afbd782d9..408527be8eb 100644
--- a/lisp/mail/mailclient.el
+++ b/lisp/mail/mailclient.el
@@ -1,6 +1,6 @@
;;; mailclient.el --- mail sending via system's mail client. -*- byte-compile-dynamic: t -*-
-;; Copyright (C) 2005 Free Software Foundation
+;; Copyright (C) 2005, 2006 Free Software Foundation
;; Author: David Reitter <david.reitter@gmail.com>
;; Keywords: mail
diff --git a/lisp/mail/mailheader.el b/lisp/mail/mailheader.el
index 1e9a24da341..377144f7d68 100644
--- a/lisp/mail/mailheader.el
+++ b/lisp/mail/mailheader.el
@@ -1,6 +1,7 @@
;;; mailheader.el --- mail header parsing, merging, formatting
-;; Copyright (C) 1996, 2002, 2003, 2004, 2005 by Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Erik Naggum <erik@naggum.no>
;; Keywords: tools, mail, news
diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el
index 6d13bda9823..2388ab87971 100644
--- a/lisp/mail/metamail.el
+++ b/lisp/mail/metamail.el
@@ -1,7 +1,7 @@
;;; metamail.el --- Metamail interface for GNU Emacs
;; Copyright (C) 1993, 1996, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
;; Keywords: mail, news, mime, multimedia
diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el
index 7a01a5e5361..a2f460d13a0 100644
--- a/lisp/mail/mspools.el
+++ b/lisp/mail/mspools.el
@@ -1,6 +1,7 @@
;;; mspools.el --- show mail spools waiting to be read
-;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Stephen Eglen <stephen@gnu.org>
;; Maintainer: Stephen Eglen <stephen@gnu.org>
diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 058d0a83f23..fa6c1c5e307 100644
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -1,7 +1,7 @@
;;; reporter.el --- customizable bug reporting of lisp programs
;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: 1993-1998 Barry A. Warsaw
;; Maintainer: FSF
diff --git a/lisp/mail/rfc2368.el b/lisp/mail/rfc2368.el
index a21deb394cf..ef20ac0398d 100644
--- a/lisp/mail/rfc2368.el
+++ b/lisp/mail/rfc2368.el
@@ -4,7 +4,7 @@
;; Keywords: mail
;; Copyright (C) 1998, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el
index 9e57226d7c2..97a47f56f99 100644
--- a/lisp/mail/rfc822.el
+++ b/lisp/mail/rfc822.el
@@ -1,7 +1,7 @@
;;; rfc822.el --- hairy rfc822 parser for mail and news and suchlike
;; Copyright (C) 1986, 1987, 1990, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Richard Mlynarik <mly@eddie.mit.edu>
;; Maintainer: FSF
diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el
index 525bcd4096b..933e1f6c8a2 100644
--- a/lisp/mail/rmail-spam-filter.el
+++ b/lisp/mail/rmail-spam-filter.el
@@ -1,6 +1,6 @@
;;; rmail-spam-filter.el --- spam filter for rmail, the emacs mail reader.
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Keywords: email, spam, filter, rmail
;; Author: Eli Tziperman <eli AT deas.harvard.edu>
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 7319589d9f0..9cf7bccdb35 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1,7 +1,7 @@
;;; rmail.el --- main code of "RMAIL" mail reader for Emacs
;; Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998,
-;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: mail
diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index 75de9810a37..fe288bb2904 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -1,7 +1,7 @@
;;; rmailedit.el --- "RMAIL edit mode" Edit the current message
;; Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: mail
diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index 843c6fc80a3..e4583574ede 100644
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -1,7 +1,7 @@
;;; rmailkwd.el --- part of the "RMAIL" mail reader for Emacs
;; Copyright (C) 1985, 1988, 1994, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: mail
diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index 26d61b56837..3502c0a7c57 100644
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -1,6 +1,7 @@
;;; rmailmsc.el --- miscellaneous support functions for the RMAIL mail reader
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: mail
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index bd37a41aef8..e09e1ebe1c8 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -1,7 +1,7 @@
;;; rmailout.el --- "RMAIL" mail reader for Emacs: output message to a file
;; Copyright (C) 1985, 1987, 1993, 1994, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: mail
diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index 8bb8ab69278..c3f7362b18a 100644
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -1,7 +1,7 @@
;;; rmailsort.el --- Rmail: sort messages
;; Copyright (C) 1990, 1993, 1994, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
;; Maintainer: FSF
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 47602885f92..539a1769386 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -1,7 +1,7 @@
;;; rmailsum.el --- make summary buffers for the mail reader
;; Copyright (C) 1985, 1993, 1994, 1995, 1996, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: mail
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 3276adf31bb..3fa7eda968c 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1,7 +1,7 @@
;;; sendmail.el --- mail sending commands for Emacs. -*- byte-compile-dynamic: t -*-
;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1998, 2000,
-;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: mail
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 6cbd3e3b8f8..ff38cd25ff8 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -1,7 +1,7 @@
;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail
-;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp>
;; Maintainer: Simon Josefsson <simon@josefsson.org>
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index b4ded1335b8..cdb917701f7 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -1,7 +1,7 @@
;;; supercite.el --- minor mode for citing mail and news replies
;; Copyright (C) 1993, 1997, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: 1993 Barry A. Warsaw <bwarsaw@python.org>
;; Maintainer: Glenn Morris <rgm@gnu.org>
diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el
index 07c09765971..4d48f467b59 100644
--- a/lisp/mail/uce.el
+++ b/lisp/mail/uce.el
@@ -1,7 +1,7 @@
;;; uce.el --- facilitate reply to unsolicited commercial email
;; Copyright (C) 1996, 1998, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: stanislav shalunov <shalunov@mccme.ru>
;; Created: 10 Dec 1996
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index 5588ecf9108..210a1d254f3 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -1,7 +1,7 @@
;;; undigest.el --- digest-cracking support for the RMAIL mail reader
;; Copyright (C) 1985, 1986, 1994, 1996, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: mail
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 76764d21ed7..cf12472fb0e 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -1,6 +1,7 @@
;;; unrmail.el --- convert Rmail files to mailbox files
-;;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: mail
diff --git a/lisp/mail/vms-pmail.el b/lisp/mail/vms-pmail.el
index b53b32be71a..3126f813000 100644
--- a/lisp/mail/vms-pmail.el
+++ b/lisp/mail/vms-pmail.el
@@ -1,6 +1,7 @@
;;; vms-pmail.el --- use Emacs as the editor within VMS mail
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Roland B Roberts <roberts@panix.com>
;; Maintainer: FSF
diff --git a/lisp/makesum.el b/lisp/makesum.el
index 41ecb630f96..3e43d75191b 100644
--- a/lisp/makesum.el
+++ b/lisp/makesum.el
@@ -1,6 +1,7 @@
;;; makesum.el --- generate key binding summary for Emacs
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: help
diff --git a/lisp/man.el b/lisp/man.el
index acd3decdc61..706961b0450 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1,7 +1,7 @@
;;; man.el --- browse UNIX manual pages -*- coding: iso-8859-1 -*-
;; Copyright (C) 1993, 1994, 1996, 1997, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Barry A. Warsaw <bwarsaw@cen.com>
;; Maintainer: FSF
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index e005fc09df6..9e2184eba1b 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1,7 +1,7 @@
;;; menu-bar.el --- define a default menu bar
;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: RMS
;; Maintainer: FSF
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 8d8b64c75fb..47c7808f192 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-04 Bill Wohler <wohler@newt.com>
+
+ * mh-e.el (mh-inc-spool-list): Update example for Emacs 22 which
+ has an emacsclient command that supports --eval. I had read that
+ gnudoit was deprecated in favor of gnuclient anyway.
+
+2006-02-04 Eric Ding <ericding@alum.mit.edu>
+
+ * mh-mime.el (mh-file-mime-type-substitutions): Added entries to
+ handle OpenOffice documents.
+
2006-02-03 Bill Wohler <wohler@newt.com>
* mh-e.el (Version, mh-version): Add +cvs to version.
@@ -19,7 +30,7 @@
88) with (min-colors 64) in face specifications so that MH-E still
looks good on systems with fewer colors (such as Eric Ding's).
-2006-02-03 Peter Galbraith <psg@debian.org>
+2006-02-03 Peter S Galbraith <psg@debian.org>
* mh-utils.el (mh-image-load-path): New variable to optionally
hold the directory where MH-E images are stored. If nil, then
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 9be827a8071..8012eab5c8a 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -1521,14 +1521,17 @@ on the \"INS\" button. Enter a \"Spool File\" of \"~/mail/mh-e\", a
\"Folder\" of \"mh-e\", and a \"Key Binding\" of \"m\".
You can use \"xbuffy\" to automate the incorporation of this mail
-using the \"gnudoit\" command in the \"gnuserv\" package as follows:
+using the Emacs 22 command \"emacsclient\" as follows:
box ~/mail/mh-e
title mh-e
origMode
polltime 10
headertime 0
- command gnudoit -q '(mh-inc-spool-mh-e)'"
+ command emacsclient --eval '(mh-inc-spool-mh-e)'
+
+In XEmacs, the command \"gnuclient\" is used in a similar
+fashion."
:type '(repeat (list (file :tag "Spool File")
(string :tag "Folder")
(character :tag "Key Binding")))
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index 787f5c371fe..b35b1e6aace 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -1733,7 +1733,19 @@ Returns nil if file command not on system."
(defvar mh-file-mime-type-substitutions
'(("application/msword" "\.xls" "application/ms-excel")
("application/msword" "\.ppt" "application/ms-powerpoint")
- ("text/plain" "\.vcf" "text/x-vcard"))
+ ("text/plain" "\.vcf" "text/x-vcard")
+ ("text/rtf" "\.rtf" "application/rtf")
+ ("application/x-zip" "\.sxc" "application/vnd.sun.xml.calc")
+ ("application/x-zip" "\.sxd" "application/vnd.sun.xml.draw")
+ ("application/x-zip" "\.sxi" "application/vnd.sun.xml.impress")
+ ("application/x-zip" "\.sxw" "application/vnd.sun.xml.writer")
+ ("application/x-zip" "\.odg" "application/vnd.oasis.opendocument.graphics")
+ ("application/x-zip" "\.odi" "application/vnd.oasis.opendocument.image")
+ ("application/x-zip" "\.odp"
+ "application/vnd.oasis.opendocument.presentation")
+ ("application/x-zip" "\.ods"
+ "application/vnd.oasis.opendocument.spreadsheet")
+ ("application/x-zip" "\.odt" "application/vnd.oasis.opendocument.text"))
"Substitutions to make for Content-Type returned from file command.
The first element is the Content-Type returned by the file command.
The second element is a regexp matching the file name, usually the
diff --git a/lisp/midnight.el b/lisp/midnight.el
index aa93c1b5bab..1d5974f686f 100644
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -1,6 +1,7 @@
;;; midnight.el --- run something every midnight, e.g., kill old buffers
-;;; Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Sam Steingold <sds@usa.net>
;; Maintainer: Sam Steingold <sds@usa.net>
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el
index 0657baedd5f..d1c407c6eca 100644
--- a/lisp/minibuf-eldef.el
+++ b/lisp/minibuf-eldef.el
@@ -1,7 +1,7 @@
;;; minibuf-eldef.el --- Only show defaults in prompts when applicable
;;
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Miles Bader <miles@gnu.org>
;; Keywords: convenience
diff --git a/lisp/misc.el b/lisp/misc.el
index f906fb0db7b..e4c54092a49 100644
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -1,6 +1,7 @@
;;; misc.el --- some nonstandard basic editing commands for Emacs
-;; Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: convenience
diff --git a/lisp/mouse-copy.el b/lisp/mouse-copy.el
index f5034a1dac1..445b64ecb26 100644
--- a/lisp/mouse-copy.el
+++ b/lisp/mouse-copy.el
@@ -1,6 +1,7 @@
;;; mouse-copy.el --- one-click text copy and move
-;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: John Heidemann <johnh@ISI.EDU>
;; Keywords: mouse
diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el
index 11bacd6b8a2..446ef27a030 100644
--- a/lisp/mouse-drag.el
+++ b/lisp/mouse-drag.el
@@ -1,7 +1,7 @@
;;; mouse-drag.el --- use mouse-2 to do a new style of scrolling
;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Heidemann <johnh@ISI.EDU>
;; Keywords: mouse
diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el
index ccd469200be..a64dabaec81 100644
--- a/lisp/mouse-sel.el
+++ b/lisp/mouse-sel.el
@@ -1,7 +1,7 @@
;;; mouse-sel.el --- multi-click selection support for Emacs 19
;; Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Mike Williams <mdub@bigfoot.com>
;; Keywords: mouse
diff --git a/lisp/mouse.el b/lisp/mouse.el
index e772858b3c7..4b3b098543c 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -1,7 +1,7 @@
;;; mouse.el --- window system-independent mouse support
;; Copyright (C) 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: hardware, mouse
diff --git a/lisp/msb.el b/lisp/msb.el
index 94a1599371f..95cbfc85df4 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -1,7 +1,7 @@
;;; msb.el --- customizable buffer-selection with multiple menus
;; Copyright (C) 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Lindberg <lars.lindberg@home.se>
;; Maintainer: FSF
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 391ce3a5e04..6e70136ad5c 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -1,7 +1,7 @@
;;; mwheel.el --- Wheel mouse support
;; Copyright (C) 1998, 2000, 2001, 2002, 2002, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: William M. Perry <wmperry@gnu.org>
;; Keywords: mouse
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 758346e3647..c77dbbd64b3 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1,7 +1,7 @@
;;; ange-ftp.el --- transparent FTP support for GNU Emacs
;; Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998,
-;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Andy Norman (ange@hplb.hpl.hp.com)
;; Maintainer: FSF
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 8d57bb30c11..101b9cf210d 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -1,7 +1,7 @@
;;; browse-url.el --- pass a URL to a WWW browser
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Denis Howe <dbh@doc.ic.ac.uk>
;; Maintainer: FSF
diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el
index 668b9edfcda..c6506fddb93 100644
--- a/lisp/net/eudc-bob.el
+++ b/lisp/net/eudc-bob.el
@@ -1,7 +1,7 @@
;;; eudc-bob.el --- Binary Objects Support for EUDC
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Oscar Figueiredo <oscar@cpe.fr>
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el
index 214481ce7fa..c5f31c6b2f9 100644
--- a/lisp/net/eudc-export.el
+++ b/lisp/net/eudc-export.el
@@ -1,7 +1,7 @@
;;; eudc-export.el --- functions to export EUDC query results
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Oscar Figueiredo <oscar@cpe.fr>
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el
index a8e7f6e328f..1e43e88dff4 100644
--- a/lisp/net/eudc-hotlist.el
+++ b/lisp/net/eudc-hotlist.el
@@ -1,7 +1,7 @@
;;; eudc-hotlist.el --- hotlist management for EUDC
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Oscar Figueiredo <oscar@cpe.fr>
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el
index ecff0564192..987b71f3613 100644
--- a/lisp/net/eudc-vars.el
+++ b/lisp/net/eudc-vars.el
@@ -1,7 +1,7 @@
;;; eudc-vars.el --- Emacs Unified Directory Client
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Oscar Figueiredo <oscar@cpe.fr>
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 6c877df6ea4..2d5d8f6978d 100644
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -1,7 +1,7 @@
;;; eudc.el --- Emacs Unified Directory Client
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Oscar Figueiredo <oscar@cpe.fr>
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el
index 8081cb1aacd..0fee937758e 100644
--- a/lisp/net/eudcb-bbdb.el
+++ b/lisp/net/eudcb-bbdb.el
@@ -1,7 +1,7 @@
;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Oscar Figueiredo <oscar@cpe.fr>
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el
index 93f7c24d077..9b6a77dd2e1 100644
--- a/lisp/net/eudcb-ldap.el
+++ b/lisp/net/eudcb-ldap.el
@@ -1,7 +1,7 @@
;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Oscar Figueiredo <oscar@cpe.fr>
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff --git a/lisp/net/eudcb-mab.el b/lisp/net/eudcb-mab.el
index 4d4fb423ff3..a734b90ecaf 100644
--- a/lisp/net/eudcb-mab.el
+++ b/lisp/net/eudcb-mab.el
@@ -1,6 +1,6 @@
;;; eudcb-mab.el --- Emacs Unified Directory Client - AddressBook backend
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@newartisans.com>
;; Keywords: comm
diff --git a/lisp/net/eudcb-ph.el b/lisp/net/eudcb-ph.el
index 30a8efbbae3..9edfc4870e5 100644
--- a/lisp/net/eudcb-ph.el
+++ b/lisp/net/eudcb-ph.el
@@ -1,7 +1,7 @@
;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Oscar Figueiredo <oscar@cpe.fr>
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index e1ae498923b..89695b61b36 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -1,7 +1,7 @@
;;; goto-addr.el --- click to browse URL or to send to e-mail address
;; Copyright (C) 1995, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Eric Ding <ericding@alum.mit.edu>
;; Maintainer: FSF
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index f8e99abd182..180e14fcc20 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -1,7 +1,7 @@
;;; ldap.el --- client interface to LDAP for Emacs
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Oscar Figueiredo <oscar@cpe.fr>
;; Maintainer: FSF
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index 043c18fc0df..f6a8c2c2157 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -1,7 +1,7 @@
;;; net-utils.el --- network functions
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Peter Breton <pbreton@cs.umb.edu>
;; Created: Sun Mar 16 1997
diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el
index 228e02bf3a6..b386fde7994 100644
--- a/lisp/net/netrc.el
+++ b/lisp/net/netrc.el
@@ -1,6 +1,6 @@
;;; netrc.el --- .netrc parsing functionality
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el
index c07faa4ca63..f812cf01c65 100644
--- a/lisp/net/newsticker.el
+++ b/lisp/net/newsticker.el
@@ -1,6 +1,6 @@
;;; newsticker.el --- A Newsticker for Emacs.
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 81a2e8a09a5..48c3cf3cbaf 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -1,7 +1,7 @@
;;; quickurl.el --- insert an URL based on text at point in buffer
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Dave Pearson <davep@davep.org>
;; Maintainer: Dave Pearson <davep@davep.org>
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 2e512ae4e19..fc7399ee631 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -1,6 +1,6 @@
;;; rcirc.el --- default, simple IRC client.
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
;; Author: Ryan Yeske
;; URL: http://www.nongnu.org/rcirc
diff --git a/lisp/net/rcompile.el b/lisp/net/rcompile.el
index c643d72da97..469f268fb9c 100644
--- a/lisp/net/rcompile.el
+++ b/lisp/net/rcompile.el
@@ -1,7 +1,7 @@
;;; rcompile.el --- run a compilation on a remote machine
;; Copyright (C) 1993, 1994, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Albert <alon@milcse.rtsg.mot.com>
;; Maintainer: FSF
diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el
index 693113203ba..74b9e034f9a 100644
--- a/lisp/net/rlogin.el
+++ b/lisp/net/rlogin.el
@@ -1,7 +1,7 @@
;;; rlogin.el --- remote login interface
;; Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Noah Friedman
;; Maintainer: Noah Friedman <friedman@splode.com>
diff --git a/lisp/net/snmp-mode.el b/lisp/net/snmp-mode.el
index 31c600a2804..62f6bb87b69 100644
--- a/lisp/net/snmp-mode.el
+++ b/lisp/net/snmp-mode.el
@@ -1,7 +1,7 @@
;;; snmp-mode.el --- SNMP & SNMPv2 MIB major mode
;; Copyright (C) 1995, 1998, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Paul D. Smith <psmith@BayNetworks.com>
;; Keywords: data
diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index e4f91351c25..28bc552551b 100644
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -1,7 +1,7 @@
;;; telnet.el --- run a telnet session from within an Emacs buffer
;; Copyright (C) 1985, 1988, 1992, 1994, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: William F. Schelter
;; Maintainer: FSF
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index e46c98b6f6a..fe089decad0 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -1,7 +1,7 @@
;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: comm, tls, gnutls, ssl
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 5644e081e6c..04fbd3636f8 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -1,6 +1,6 @@
;;; tramp-smb.el --- Tramp access functions for SMB servers -*- coding: iso-8859-1; -*-
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Albinus <michael.albinus@gmx.de>
;; Keywords: comm, processes
diff --git a/lisp/net/tramp-uu.el b/lisp/net/tramp-uu.el
index e1e22af3cab..c33e8175315 100644
--- a/lisp/net/tramp-uu.el
+++ b/lisp/net/tramp-uu.el
@@ -1,7 +1,7 @@
;;; -*- coding: iso-2022-7bit; -*-
;;; tramp-uu.el --- uuencode in Lisp
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Kai Gro,A_(Bjohann <kai.grossjohann@gmx.net>
;; Keywords: comm, terminals
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 5ff8a0832bc..2fdf63ce351 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1735,7 +1735,7 @@ on the remote host.")
(defvar tramp-perl-encode
"%s -e '
# This script contributed by Juanma Barranquero <lektu@terra.es>.
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2006 Free Software Foundation, Inc.
use strict;
my %%trans = do {
@@ -1777,7 +1777,7 @@ This string is passed to `format', so percent characters need to be doubled.")
(defvar tramp-perl-decode
"%s -e '
# This script contributed by Juanma Barranquero <lektu@terra.es>.
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2006 Free Software Foundation, Inc.
use strict;
my %%trans = do {
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 632d958249d..a71667291da 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -2,7 +2,7 @@
;;; trampver.el --- Transparent Remote Access, Multiple Protocol
;;; lisp/trampver.el. Generated from trampver.el.in by configure.
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Kai Gro,A_(Bjohann <kai.grossjohann@gmx.net>
;; Keywords: comm, processes
diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el
index 4a3baea4f41..e24ce702397 100644
--- a/lisp/net/webjump.el
+++ b/lisp/net/webjump.el
@@ -1,7 +1,7 @@
;;; webjump.el --- programmable Web hotlist
;; Copyright (C) 1996, 1997, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Neil W. Van Dyke <nwv@acm.org>
;; Created: 09-Aug-1996
diff --git a/lisp/net/zone-mode.el b/lisp/net/zone-mode.el
index 9f6c9d1c778..441ef143f9c 100644
--- a/lisp/net/zone-mode.el
+++ b/lisp/net/zone-mode.el
@@ -1,6 +1,7 @@
;;; zone-mode.el --- major mode for editing DNS zone files
-;; Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: John Heidemann <johnh@isi.edu>
;; Keywords: DNS, languages
diff --git a/lisp/novice.el b/lisp/novice.el
index dfaf0b6c6d3..97e27da5e5e 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -1,7 +1,7 @@
;;; novice.el --- handling of disabled commands ("novice mode") for Emacs
;; Copyright (C) 1985, 1986, 1987, 1994, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal, help
diff --git a/lisp/obsolete/awk-mode.el b/lisp/obsolete/awk-mode.el
index 166986fd34e..95c3a0582b7 100644
--- a/lisp/obsolete/awk-mode.el
+++ b/lisp/obsolete/awk-mode.el
@@ -1,7 +1,7 @@
;;; awk-mode.el --- AWK code editing commands for Emacs
;; Copyright (C) 1988, 1994, 1996, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: unix, languages
diff --git a/lisp/obsolete/bg-mouse.el b/lisp/obsolete/bg-mouse.el
index 687619a051b..abb0b9560ce 100644
--- a/lisp/obsolete/bg-mouse.el
+++ b/lisp/obsolete/bg-mouse.el
@@ -1,6 +1,7 @@
;;; bg-mouse.el --- GNU Emacs code for BBN Bitgraph mouse
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: John Robinson <jr@bbn-unix.arpa>
;; Stephen Gildea <gildea@bbn.com>
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index 0d8fcfadc58..60c7988a66b 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -1,7 +1,7 @@
;;; fast-lock.el --- automagic text properties caching for fast Font Lock mode
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Marshall <simon@gnu.org>
;; Maintainer: FSF
diff --git a/lisp/obsolete/float.el b/lisp/obsolete/float.el
index 400956ea232..32f0ef6a412 100644
--- a/lisp/obsolete/float.el
+++ b/lisp/obsolete/float.el
@@ -1,6 +1,7 @@
;;; float.el --- obsolete floating point arithmetic package
-;; Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Bill Rosenblatt
;; Maintainer: FSF
diff --git a/lisp/obsolete/hilit19.el b/lisp/obsolete/hilit19.el
index 666c580098f..adb4f7701dc 100644
--- a/lisp/obsolete/hilit19.el
+++ b/lisp/obsolete/hilit19.el
@@ -1,7 +1,7 @@
;;; hilit19.el --- customizable highlighting for Emacs 19
;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Jonathan Stigelman <stig@hackvan.com>
;; Maintainer: FSF
diff --git a/lisp/obsolete/hscroll.el b/lisp/obsolete/hscroll.el
index 5e3d141f73b..0659c47c199 100644
--- a/lisp/obsolete/hscroll.el
+++ b/lisp/obsolete/hscroll.el
@@ -1,7 +1,7 @@
;;; hscroll.el --- automatically scroll truncated lines horizontally
;; Copyright (C) 1992, 1993, 1995, 1996, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Wayne Mesard <wmesard@esd.sgi.com>
;; Keywords: display
diff --git a/lisp/obsolete/iso-acc.el b/lisp/obsolete/iso-acc.el
index 6ff9e31d7fd..756833fec4b 100644
--- a/lisp/obsolete/iso-acc.el
+++ b/lisp/obsolete/iso-acc.el
@@ -1,7 +1,7 @@
;;; iso-acc.el --- minor mode providing electric accent keys
;; Copyright (C) 1993, 1994, 1996, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Johan Vromans
;; Maintainer: FSF
diff --git a/lisp/obsolete/iso-swed.el b/lisp/obsolete/iso-swed.el
index ab5287bc97a..510efd32016 100644
--- a/lisp/obsolete/iso-swed.el
+++ b/lisp/obsolete/iso-swed.el
@@ -1,6 +1,7 @@
;;; iso-swed.el --- set up char tables for ISO 8859/1 for Swedish/Finnish ttys
-;; Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Howard Gayle
;; Maintainer: FSF
diff --git a/lisp/obsolete/keyswap.el b/lisp/obsolete/keyswap.el
index 0ed70d61dee..61b5bbeb171 100644
--- a/lisp/obsolete/keyswap.el
+++ b/lisp/obsolete/keyswap.el
@@ -1,6 +1,7 @@
;;; keyswap.el --- swap BS and DEL keys -*- no-byte-compile: t -*-
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Keywords: terminals
diff --git a/lisp/obsolete/lazy-lock.el b/lisp/obsolete/lazy-lock.el
index eaef84a6ab4..6dc9f31c066 100644
--- a/lisp/obsolete/lazy-lock.el
+++ b/lisp/obsolete/lazy-lock.el
@@ -1,7 +1,7 @@
;;; lazy-lock.el --- lazy demand-driven fontification for fast Font Lock mode
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Marshall <simon@gnu.org>
;; Maintainer: FSF
diff --git a/lisp/obsolete/mlsupport.el b/lisp/obsolete/mlsupport.el
index 22356f1df64..68ee625cd8f 100644
--- a/lisp/obsolete/mlsupport.el
+++ b/lisp/obsolete/mlsupport.el
@@ -1,6 +1,7 @@
;;; mlsupport.el --- run-time support for mocklisp code
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: extensions
diff --git a/lisp/obsolete/ooutline.el b/lisp/obsolete/ooutline.el
index 17374ba1781..83f6fa69f30 100644
--- a/lisp/obsolete/ooutline.el
+++ b/lisp/obsolete/ooutline.el
@@ -1,7 +1,7 @@
;;; ooutline.el --- outline mode commands for Emacs
;; Copyright (C) 1986, 1993, 1994, 1997, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: outlines
diff --git a/lisp/obsolete/options.el b/lisp/obsolete/options.el
index 733e3740dc0..1383666a9b1 100644
--- a/lisp/obsolete/options.el
+++ b/lisp/obsolete/options.el
@@ -1,6 +1,7 @@
;;; options.el --- edit Options command for Emacs
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
diff --git a/lisp/obsolete/profile.el b/lisp/obsolete/profile.el
index 3d5ea982b86..80b27063dbc 100644
--- a/lisp/obsolete/profile.el
+++ b/lisp/obsolete/profile.el
@@ -1,7 +1,7 @@
;;; profile.el --- Emacs profiler (OBSOLETE; use elp.el instead)
;; Copyright (C) 1992, 1994, 1998, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
;; Created: 07 Feb 1992
diff --git a/lisp/obsolete/rnews.el b/lisp/obsolete/rnews.el
index e6ab3e8c872..89c74dd7993 100644
--- a/lisp/obsolete/rnews.el
+++ b/lisp/obsolete/rnews.el
@@ -1,7 +1,7 @@
;;; rnews.el --- USENET news reader for GNU Emacs
;; Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: news
diff --git a/lisp/obsolete/rnewspost.el b/lisp/obsolete/rnewspost.el
index 221f1a0e675..f07ce703db8 100644
--- a/lisp/obsolete/rnewspost.el
+++ b/lisp/obsolete/rnewspost.el
@@ -1,7 +1,7 @@
;;; rnewspost.el --- USENET news poster/mailer for GNU Emacs
;; Copyright (C) 1985, 1986, 1987, 1995, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: mail, news
diff --git a/lisp/obsolete/rsz-mini.el b/lisp/obsolete/rsz-mini.el
index 94b7e212279..a9e4b007dd8 100644
--- a/lisp/obsolete/rsz-mini.el
+++ b/lisp/obsolete/rsz-mini.el
@@ -1,7 +1,7 @@
;;; rsz-mini.el --- dynamically resize minibuffer to display entire contents
;; Copyright (C) 1990, 1993, 1994, 1995, 1997, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Noah Friedman <friedman@splode.com>
;; Roland McGrath <roland@gnu.org>
diff --git a/lisp/obsolete/scribe.el b/lisp/obsolete/scribe.el
index 1be01ebc5bb..905e63ea1c5 100644
--- a/lisp/obsolete/scribe.el
+++ b/lisp/obsolete/scribe.el
@@ -1,6 +1,7 @@
;;; scribe.el --- scribe mode, and its idiosyncratic commands
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: wp
diff --git a/lisp/obsolete/sun-curs.el b/lisp/obsolete/sun-curs.el
index 769d4de868f..faa55fb8dd5 100644
--- a/lisp/obsolete/sun-curs.el
+++ b/lisp/obsolete/sun-curs.el
@@ -1,6 +1,7 @@
;;; sun-curs.el --- cursor definitions for Sun windows
-;; Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Jeff Peck <peck@sun.com>
;; Keywords: hardware
diff --git a/lisp/obsolete/sun-fns.el b/lisp/obsolete/sun-fns.el
index 614b352ad3a..532d28462c9 100644
--- a/lisp/obsolete/sun-fns.el
+++ b/lisp/obsolete/sun-fns.el
@@ -1,6 +1,7 @@
;;; sun-fns.el --- subroutines of Mouse handling for Sun windows
-;; Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Jeff Peck <peck@sun.com>
;; Maintainer: none
diff --git a/lisp/obsolete/uncompress.el b/lisp/obsolete/uncompress.el
index 7ee25992218..7c1ab59fd87 100644
--- a/lisp/obsolete/uncompress.el
+++ b/lisp/obsolete/uncompress.el
@@ -1,7 +1,7 @@
;;; uncompress.el --- auto-decompression hook for visiting .Z files
;; Copyright (C) 1992, 1994, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: files
diff --git a/lisp/obsolete/x-apollo.el b/lisp/obsolete/x-apollo.el
index edf3436aa96..869f63481ee 100644
--- a/lisp/obsolete/x-apollo.el
+++ b/lisp/obsolete/x-apollo.el
@@ -1,6 +1,7 @@
;;; x-apollo.el --- Apollo support functions
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
diff --git a/lisp/obsolete/x-menu.el b/lisp/obsolete/x-menu.el
index 12427f803cc..c13c9c1865b 100644
--- a/lisp/obsolete/x-menu.el
+++ b/lisp/obsolete/x-menu.el
@@ -1,6 +1,7 @@
;;; x-menu.el --- menu support for X
-;; Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
diff --git a/lisp/outline.el b/lisp/outline.el
index eed84bd61c7..fdbad00ada3 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -1,7 +1,7 @@
;;; outline.el --- outline mode commands for Emacs
;; Copyright (C) 1986, 1993, 1994, 1995, 1997, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: outlines
diff --git a/lisp/paren.el b/lisp/paren.el
index 8b5a134d2d4..29506174c6b 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -1,7 +1,7 @@
;;; paren.el --- highlight matching paren
;; Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: rms@gnu.org
;; Maintainer: FSF
diff --git a/lisp/paths.el b/lisp/paths.el
index f248eac9242..846f91793d1 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -1,7 +1,7 @@
;;; paths.el --- define pathnames for use by various Emacs commands -*- no-byte-compile: t -*-
;; Copyright (C) 1986, 1988, 1994, 1999, 2000, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el
index 628ad8399ce..5915b5f5a9d 100644
--- a/lisp/pcmpl-cvs.el
+++ b/lisp/pcmpl-cvs.el
@@ -1,7 +1,7 @@
;;; pcmpl-cvs.el --- functions for dealing with cvs completions
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el
index bf7653618b8..7dc7808404f 100644
--- a/lisp/pcmpl-gnu.el
+++ b/lisp/pcmpl-gnu.el
@@ -1,7 +1,7 @@
;;; pcmpl-gnu.el --- completions for GNU project tools
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
diff --git a/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el
index 02f840bee30..bd68d00ce76 100644
--- a/lisp/pcmpl-linux.el
+++ b/lisp/pcmpl-linux.el
@@ -1,7 +1,7 @@
;;; pcmpl-linux.el --- functions for dealing with GNU/Linux completions
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el
index 5e9afcf51cb..5855a3e5d15 100644
--- a/lisp/pcmpl-rpm.el
+++ b/lisp/pcmpl-rpm.el
@@ -1,7 +1,7 @@
;;; pcmpl-rpm.el --- functions for dealing with rpm completions
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el
index de9c143ae6f..35637c01363 100644
--- a/lisp/pcmpl-unix.el
+++ b/lisp/pcmpl-unix.el
@@ -1,7 +1,7 @@
;;; pcmpl-unix.el --- standard UNIX completions
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index c8d0ac19bd6..36878d2dff9 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -1,7 +1,7 @@
;;; pcomplete.el --- programmable completion
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-;; 2005 Free Sofware Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
;; Keywords: processes abbrev
diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el
index cd981581711..8f7de913261 100644
--- a/lisp/pcvs-defs.el
+++ b/lisp/pcvs-defs.el
@@ -1,7 +1,7 @@
;;; pcvs-defs.el --- variable definitions for PCL-CVS
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: pcl-cvs
diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el
index 291e4ae85c4..7d1a11ccb68 100644
--- a/lisp/pcvs-info.el
+++ b/lisp/pcvs-info.el
@@ -1,7 +1,7 @@
;;; pcvs-info.el --- internal representation of a fileinfo entry
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: pcl-cvs
diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el
index 66c791db51c..2053d8f5bd5 100644
--- a/lisp/pcvs-parse.el
+++ b/lisp/pcvs-parse.el
@@ -1,7 +1,7 @@
;;; pcvs-parse.el --- the CVS output parser
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: pcl-cvs
diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index 1c4896435db..9ff40d09494 100644
--- a/lisp/pcvs-util.el
+++ b/lisp/pcvs-util.el
@@ -1,7 +1,7 @@
;;; pcvs-util.el --- utility functions for PCL-CVS -*- byte-compile-dynamic: t -*-
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: pcl-cvs
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 0f0ff76ed0c..b9d04522181 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -1,7 +1,7 @@
;;; pcvs.el --- a front-end to CVS
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: (The PCL-CVS Trust) pcl-cvs@cyclic.com
;; (Per Cederqvist) ceder@lysator.liu.se
diff --git a/lisp/pgg-def.el b/lisp/pgg-def.el
index c6197db447d..0b356461d6c 100644
--- a/lisp/pgg-def.el
+++ b/lisp/pgg-def.el
@@ -1,6 +1,7 @@
;;; pgg-def.el --- functions/macros for defining PGG functions
-;; Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Created: 1999/11/02
diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index c1ab5104c4c..be9b8bf9e77 100644
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -1,7 +1,7 @@
;;; pgg-gpg.el --- GnuPG support for PGG.
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Symmetric encryption added by: Sascha Wilde <wilde@sha-bang.de>
diff --git a/lisp/pgg-parse.el b/lisp/pgg-parse.el
index 422ccc6ac23..40ebcd9b195 100644
--- a/lisp/pgg-parse.el
+++ b/lisp/pgg-parse.el
@@ -1,6 +1,7 @@
;;; pgg-parse.el --- OpenPGP packet parsing
-;; Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Created: 1999/10/28
diff --git a/lisp/pgg-pgp.el b/lisp/pgg-pgp.el
index 19668f23c01..f58fd0d3c6d 100644
--- a/lisp/pgg-pgp.el
+++ b/lisp/pgg-pgp.el
@@ -1,7 +1,7 @@
;;; pgg-pgp.el --- PGP 2.* and 6.* support for PGG.
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Created: 1999/11/02
diff --git a/lisp/pgg-pgp5.el b/lisp/pgg-pgp5.el
index 6cb5331ed55..3cba59916e5 100644
--- a/lisp/pgg-pgp5.el
+++ b/lisp/pgg-pgp5.el
@@ -1,7 +1,7 @@
;;; pgg-pgp5.el --- PGP 5.* support for PGG.
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Created: 1999/11/02
diff --git a/lisp/pgg.el b/lisp/pgg.el
index 70aa27b8536..7a30dafce8d 100644
--- a/lisp/pgg.el
+++ b/lisp/pgg.el
@@ -1,7 +1,7 @@
;;; pgg.el --- glue for the various PGP implementations.
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Symmetric encryption added by: Sascha Wilde <wilde@sha-bang.de>
diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el
index 855de92ffc0..db76fbb7725 100644
--- a/lisp/play/5x5.el
+++ b/lisp/play/5x5.el
@@ -1,7 +1,7 @@
;;; 5x5.el --- simple little puzzle game
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Dave Pearson <davep@davep.org>
;; Maintainer: Dave Pearson <davep@davep.org>
diff --git a/lisp/play/animate.el b/lisp/play/animate.el
index 47f08a8b098..8664023c230 100644
--- a/lisp/play/animate.el
+++ b/lisp/play/animate.el
@@ -1,6 +1,7 @@
;;; animate.el --- make text dance
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: Richard Stallman <rms@gnu.org>
;; Keywords: games
diff --git a/lisp/play/blackbox.el b/lisp/play/blackbox.el
index fb0474d1460..10a7c231b30 100644
--- a/lisp/play/blackbox.el
+++ b/lisp/play/blackbox.el
@@ -1,7 +1,7 @@
;;; blackbox.el --- blackbox game in Emacs Lisp
;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: F. Thomas May <uw-nsr!uw-warp!tom@beaver.cs.washington.edu>
;; Adapted-By: ESR
diff --git a/lisp/play/bruce.el b/lisp/play/bruce.el
index 7774e29f2a4..98294884ebd 100644
--- a/lisp/play/bruce.el
+++ b/lisp/play/bruce.el
@@ -2,7 +2,7 @@
;;; Decency Act snoops, if any.
;; Copyright (C) 1988, 1993, 1997, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: games
diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el
index 7f17274a68d..bc4ee84da2f 100644
--- a/lisp/play/cookie1.el
+++ b/lisp/play/cookie1.el
@@ -1,6 +1,7 @@
;;; cookie1.el --- retrieve random phrases from fortune cookie files
-;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Maintainer: FSF
diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el
index e8850e6fdf4..88b5f2ace46 100644
--- a/lisp/play/decipher.el
+++ b/lisp/play/decipher.el
@@ -1,7 +1,7 @@
;;; decipher.el --- cryptanalyze monoalphabetic substitution ciphers
;;
;; Copyright (C) 1995, 1996, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Christopher J. Madsen <chris_madsen@geocities.com>
;; Keywords: games
diff --git a/lisp/play/dissociate.el b/lisp/play/dissociate.el
index cd19a716864..ce1f8b55432 100644
--- a/lisp/play/dissociate.el
+++ b/lisp/play/dissociate.el
@@ -1,6 +1,7 @@
;;; dissociate.el --- scramble text amusingly for Emacs
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: games
diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el
index 62a30d34191..2c6a75da03e 100644
--- a/lisp/play/dunnet.el
+++ b/lisp/play/dunnet.el
@@ -1,7 +1,7 @@
;;; dunnet.el --- text adventure for Emacs
;; Copyright (C) 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Ron Schnell <ronnie@driver-aces.com>
;; Created: 25 Jul 1992
diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el
index 3524eeb5294..12692292d3a 100644
--- a/lisp/play/fortune.el
+++ b/lisp/play/fortune.el
@@ -1,7 +1,7 @@
;;; fortune.el --- use fortune to create signatures
;; Copyright (C) 1999, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Holger Schauer <Holger.Schauer@gmx.de>
;; Keywords: games utils mail
diff --git a/lisp/play/gamegrid.el b/lisp/play/gamegrid.el
index ee64c178414..3cc91226fe8 100644
--- a/lisp/play/gamegrid.el
+++ b/lisp/play/gamegrid.el
@@ -1,7 +1,7 @@
;;; gamegrid.el --- library for implementing grid-based games on Emacs
;; Copyright (C) 1997, 1998, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Glynn Clements <glynn@sensei.co.uk>
;; Version: 1.02
diff --git a/lisp/play/gametree.el b/lisp/play/gametree.el
index 9e80024c90b..82eef652f52 100644
--- a/lisp/play/gametree.el
+++ b/lisp/play/gametree.el
@@ -1,7 +1,7 @@
;;; gametree.el --- manage game analysis trees in Emacs
;; Copyright (C) 1997, 1999, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Ian T Zimmerman <itz@rahul.net>
;; Created: Wed Dec 10 07:41:46 PST 1997
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index c7089ddd7f7..ee321b44d31 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -1,7 +1,7 @@
;;; gomoku.el --- Gomoku game between you and Emacs
;; Copyright (C) 1988, 1994, 1996, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Philippe Schnoebelen <phs@lsv.ens-cachan.fr>
;; Maintainer: FSF
diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el
index 066832e7eb3..5e9ba975607 100644
--- a/lisp/play/handwrite.el
+++ b/lisp/play/handwrite.el
@@ -1,6 +1,7 @@
;;; handwrite.el --- turns your emacs buffer into a handwritten document -*- coding: iso-latin-1; -*-
-;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Danny Roozendaal (was: <danny@tvs.kun.nl>)
;; Created: October 21 1996
diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el
index 48b614ea111..ed4181e5b8d 100644
--- a/lisp/play/landmark.el
+++ b/lisp/play/landmark.el
@@ -1,7 +1,7 @@
;;; landmark.el --- neural-network robot that learns landmarks
;; Copyright (C) 1996, 1997, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Terrence Brannon (was: <brannon@rana.usc.edu>)
;; Created: December 16, 1996 - first release to usenet
diff --git a/lisp/play/life.el b/lisp/play/life.el
index 56f10ff2581..263c4450c9d 100644
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -1,7 +1,7 @@
;;; life.el --- John Horton Conway's `Life' game for GNU Emacs
;; Copyright (C) 1988, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Kyle Jones <kyleuunet.uu.net>
;; Maintainer: FSF
diff --git a/lisp/play/morse.el b/lisp/play/morse.el
index ae3533227e4..bf5abdfbd4c 100644
--- a/lisp/play/morse.el
+++ b/lisp/play/morse.el
@@ -1,6 +1,7 @@
;;; morse.el --- convert text to morse code and back -*- coding: utf-8 -*-
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Rick Farnbach <rick_farnbach@MENTORG.COM>
;; Keywords: games
diff --git a/lisp/play/mpuz.el b/lisp/play/mpuz.el
index 6f2c9200928..ebeeb3159f8 100644
--- a/lisp/play/mpuz.el
+++ b/lisp/play/mpuz.el
@@ -1,6 +1,7 @@
;;; mpuz.el --- multiplication puzzle for GNU Emacs
-;; Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Philippe Schnoebelen <phs@lsv.ens-cachan.fr>
;; Overhauled: Daniel Pfeiffer <occitan@esperanto.org>
diff --git a/lisp/play/pong.el b/lisp/play/pong.el
index e4931c63088..d73d789d0d3 100644
--- a/lisp/play/pong.el
+++ b/lisp/play/pong.el
@@ -1,7 +1,7 @@
;;; pong.el --- classical implementation of pong
;; Copyright 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Benjamin Drieu <bdrieu@april.org>
;; Keywords: games
diff --git a/lisp/play/snake.el b/lisp/play/snake.el
index 9f2f9c62098..ae942212a18 100644
--- a/lisp/play/snake.el
+++ b/lisp/play/snake.el
@@ -1,6 +1,7 @@
;;; snake.el --- implementation of Snake for Emacs
-;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Glynn Clements <glynn@sensei.co.uk>
;; Created: 1997-09-10
diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el
index 2e20a737e08..d6faeb5e5ad 100644
--- a/lisp/play/solitaire.el
+++ b/lisp/play/solitaire.el
@@ -1,6 +1,7 @@
;;; solitaire.el --- game of solitaire in Emacs Lisp
-;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Jan Schormann <Jan.Schormann@rechen-gilde.de>
;; Created: Fri afternoon, Jun 3, 1994
diff --git a/lisp/play/spook.el b/lisp/play/spook.el
index 0979f6a0043..fbad9ab0f13 100644
--- a/lisp/play/spook.el
+++ b/lisp/play/spook.el
@@ -1,7 +1,7 @@
;;; spook.el --- spook phrase utility for overloading the NSA line eater
;; Copyright (C) 1988, 1993, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: games
diff --git a/lisp/play/tetris.el b/lisp/play/tetris.el
index 839046a9613..531d61e20e6 100644
--- a/lisp/play/tetris.el
+++ b/lisp/play/tetris.el
@@ -1,6 +1,7 @@
;;; tetris.el --- implementation of Tetris for Emacs
-;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Glynn Clements <glynn@sensei.co.uk>
;; Version: 2.01
diff --git a/lisp/play/yow.el b/lisp/play/yow.el
index 74a30d6ac9d..b86ad9d4c66 100644
--- a/lisp/play/yow.el
+++ b/lisp/play/yow.el
@@ -1,7 +1,7 @@
;;; yow.el --- quote random zippyisms
;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Author: Richard Mlynarik
diff --git a/lisp/play/zone.el b/lisp/play/zone.el
index b914d1ba887..0f04a043c8e 100644
--- a/lisp/play/zone.el
+++ b/lisp/play/zone.el
@@ -1,7 +1,7 @@
;;; zone.el --- idle display hacks
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Victor Zandy <zandy@cs.wisc.edu>
;; Maintainer: Thien-Thi Nguyen <ttn@gnu.org>
diff --git a/lisp/printing.el b/lisp/printing.el
index c199dcacc28..94be3dfbfab 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -1,10 +1,11 @@
;;; printing.el --- printing utilities
-;; Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2005-09-18 05:57:14 deego>
+;; Time-stamp: <2006-02-06 15:06:40 ttn>
;; Keywords: wp, print, PostScript
;; Version: 6.8.4
;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index e7bda34e080..5f58a3c2ec0 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -77,16 +77,9 @@
;;; TODO:
;; 1) Use MI command -data-read-memory for memory window.
-;; 2) Highlight changed register values (use MI commands
-;; -data-list-register-values and -data-list-changed-registers instead
-;; of 'info registers' after release of 22.1.
-;; 3) Use tree-widget.el instead of the speedbar for watch-expressions?
-;; 4) Mark breakpoint locations on scroll-bar of source buffer?
-;; 5) After release of 22.1, use "-var-list-children --all-values"
-;; and "-stack-list-locals --simple-values" which need GDB 6.1 onwards.
-;; 6) After release of 22.1, use "-var-update --all-values" which needs
-;; GDB 6.4 onwards.
-;; 7) With gud-print and gud-pstar, print the variable name in the GUD
+;; 2) Use tree-widget.el instead of the speedbar for watch-expressions?
+;; 3) Mark breakpoint locations on scroll-bar of source buffer?
+;; 4) With gud-print and gud-pstar, print the variable name in the GUD
;; buffer instead of the value's history number.
;;; Code:
@@ -1192,6 +1185,8 @@ happens to be appropriate."
(unless (or gdb-pending-triggers gdb-first-post-prompt)
(gdb-get-selected-frame)
(gdb-invalidate-frames)
+ ;; Regenerate breakpoints buffer in case it has been inadvertantly deleted.
+ (gdb-get-create-buffer 'gdb-breakpoints-buffer)
(gdb-invalidate-breakpoints)
;; Do this through gdb-get-selected-frame -> gdb-frame-handler
;; so gdb-frame-address is updated.
@@ -1645,12 +1640,19 @@ static char *magick[] = {
(define-key map [menu-bar breakpoints] (cons "Breakpoints" menu))
(define-key map " " 'gdb-toggle-breakpoint)
(define-key map "D" 'gdb-delete-breakpoint)
- (define-key map "q" 'kill-this-buffer)
+ ;; Don't bind "q" to kill-this-buffer as we need it for breakpoint icons.
+ (define-key map "q" 'gdb-delete-frame-or-window)
(define-key map "\r" 'gdb-goto-breakpoint)
(define-key map [mouse-2] 'gdb-goto-breakpoint)
(define-key map [follow-link] 'mouse-face)
map))
+(defun gdb-delete-frame-or-window ()
+ "Delete frame if there is only one window. Otherwise delete the window."
+ (interactive)
+ (if (one-window-p) (delete-frame)
+ (delete-window)))
+
(defun gdb-breakpoints-mode ()
"Major mode for gdb breakpoints.
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 92c3eb55884..7a8745f0e9c 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -3231,7 +3231,6 @@ Treats actions as defuns."
;;; Customizable settings
-;;;###autoload
(define-minor-mode gud-tooltip-mode
"Toggle the display of GUD tooltips."
:global t
diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index 44a1223dc42..9597d4afa4e 100644
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -1,6 +1,7 @@
;;; ps-bdf.el --- BDF font file handler for ps-print
-;; Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2006
+;; Free Software Foundation, Inc.
;; Copyright (C) 1998, 1999, 2001, 2003
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index 76b9100f59a..7833394479e 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -1,7 +1,7 @@
;;; ps-mule.el --- provide multi-byte character facility to ps-print
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Vinicius Jose Latorre <vinicius@cpqd.com.br>
;; Kenichi Handa <handa@etl.go.jp> (multi-byte characters)
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 2c528ff2f84..59605c22c5b 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1,7 +1,7 @@
;;; ps-print.el --- print text from the buffer as PostScript
;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Jim Thompson (was <thompson@wg2.waii.com>)
;; Jacques Duthen (was <duthen@cegelec-red.fr>)
diff --git a/lisp/recentf.el b/lisp/recentf.el
index 1106fea18b6..2afb0955c46 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -1,7 +1,7 @@
;;; recentf.el --- setup a menu of recently opened files
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Ponce <david@dponce.com>
;; Created: July 19 1999
diff --git a/lisp/rect.el b/lisp/rect.el
index a7a863e204b..63979cb967c 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -1,7 +1,7 @@
;;; rect.el --- rectangle functions for GNU Emacs
;; Copyright (C) 1985, 1999, 2000, 2001, 2002, 2003, 2004
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: Didier Verna <didier@xemacs.org>
;; Keywords: internal
diff --git a/lisp/register.el b/lisp/register.el
index 14d7494633a..8dea532410c 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -1,7 +1,7 @@
;;; register.el --- register commands for Emacs
;; Copyright (C) 1985, 1993, 1994, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/repeat.el b/lisp/repeat.el
index adaf8a4bb9a..b225b729def 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -1,6 +1,7 @@
;;; repeat.el --- convenient way to repeat the previous command
-;; Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Will Mengarini <seldon@eskimo.com>
;; Created: Mo 02 Mar 98
diff --git a/lisp/replace.el b/lisp/replace.el
index 92b4be7fd7b..3187bbbbd36 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1,7 +1,7 @@
;;; replace.el --- replace commands for Emacs
;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1996, 1997, 2000, 2001,
-;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
diff --git a/lisp/reposition.el b/lisp/reposition.el
index 7a6ea277b02..a87b72443df 100644
--- a/lisp/reposition.el
+++ b/lisp/reposition.el
@@ -1,7 +1,7 @@
;;; reposition.el --- center a Lisp function or comment on the screen
;; Copyright (C) 1991, 1994, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael D. Ernst <mernst@theory.lcs.mit.edu>
;; Created: Jan 1991
diff --git a/lisp/resume.el b/lisp/resume.el
index 29ce253e4a2..0a719278266 100644
--- a/lisp/resume.el
+++ b/lisp/resume.el
@@ -1,6 +1,7 @@
;;; resume.el --- process command line args from within a suspended Emacs job
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Joe Wells <jbw@bucsf.bu.edu>
;; Adapted-By: ESR
diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el
index a9f55ced0e4..e8f0ab74caa 100644
--- a/lisp/rfn-eshadow.el
+++ b/lisp/rfn-eshadow.el
@@ -1,7 +1,7 @@
;;; rfn-eshadow.el --- Highlight `shadowed' part of read-file-name input text
;;
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Miles Bader <miles@gnu.org>
;; Keywords: convenience minibuffer
diff --git a/lisp/rot13.el b/lisp/rot13.el
index 664e2cfadc6..449583ab8dd 100644
--- a/lisp/rot13.el
+++ b/lisp/rot13.el
@@ -1,6 +1,7 @@
;;; rot13.el --- display a buffer in rot13
-;; Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Howard Gayle
;; Maintainer: FSF
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index 6bb93b93cc8..67af1c13d91 100644
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -1,6 +1,7 @@
;;; ruler-mode.el --- display a ruler in the header line
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: David Ponce <david@dponce.com>
;; Maintainer: David Ponce <david@dponce.com>
diff --git a/lisp/s-region.el b/lisp/s-region.el
index 06b5bb3f926..6bc4b481d7b 100644
--- a/lisp/s-region.el
+++ b/lisp/s-region.el
@@ -1,7 +1,7 @@
;;; s-region.el --- set region using shift key
;; Copyright (C) 1994, 1995, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Morten Welinder <terra@diku.dk>
;; Keywords: terminals
diff --git a/lisp/savehist.el b/lisp/savehist.el
index 6c6d936af6a..8b8ca9c0f8a 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -1,6 +1,6 @@
;;; savehist.el --- Save minibuffer history.
-;; Copyright (C) 1997, 2005 Free Software Foundation
+;; Copyright (C) 1997, 2005, 2006 Free Software Foundation
;; Author: Hrvoje Niksic <hniksic@xemacs.org>
;; Keywords: minibuffer
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 645b298ee66..a2bc18e9de1 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -1,7 +1,7 @@
;;; saveplace.el --- automatically save place in files
;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Karl Fogel <kfogel@red-bean.com>
;; Maintainer: FSF
diff --git a/lisp/sb-image.el b/lisp/sb-image.el
index e1ed8d06a86..c608346cd02 100644
--- a/lisp/sb-image.el
+++ b/lisp/sb-image.el
@@ -1,6 +1,7 @@
;;; sb-image --- Image management for speedbar
-;;; Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003,
+;; 2006 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Keywords: file, tags, tools
diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el
index f2a953f7a21..9e816480f38 100644
--- a/lisp/scroll-all.el
+++ b/lisp/scroll-all.el
@@ -1,6 +1,7 @@
;;; scroll-all.el --- scroll all buffers together minor mode
-;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Gary D. Foster <Gary.Foster@corp.sun.com>
;; Keywords: scroll crisp brief lock
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index 1fabb78dc49..69d696f7741 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -1,7 +1,7 @@
;;; scroll-bar.el --- window system-independent scroll bar support
;; Copyright (C) 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: hardware
diff --git a/lisp/scroll-lock.el b/lisp/scroll-lock.el
index e5fca2d1c6e..8eb3977752f 100644
--- a/lisp/scroll-lock.el
+++ b/lisp/scroll-lock.el
@@ -1,6 +1,6 @@
;;; scroll-lock.el --- Scroll lock scrolling.
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
;; Maintainer: FSF
diff --git a/lisp/select.el b/lisp/select.el
index 1d8d13208fa..01d1af6edf1 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -4,7 +4,7 @@
;; Keywords: internal
;; Copyright (C) 1993, 1994, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Based partially on earlier release by Lucid.
;; This file is part of GNU Emacs.
diff --git a/lisp/server.el b/lisp/server.el
index ef8a3d18355..4d461876e30 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1,7 +1,7 @@
;;; server.el --- Lisp code for GNU Emacs running as server process
;; Copyright (C) 1986, 1987, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: William Sommerfeld <wesommer@athena.mit.edu>
;; Maintainer: FSF
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index 8dd5f375daa..f5f8bac7edc 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -1,7 +1,7 @@
;;; shadowfile.el --- automatic file copying
;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Boris Goldowsky <boris@gnu.org>
;; Keywords: comm files
diff --git a/lisp/shell.el b/lisp/shell.el
index 84de8efd8df..f7eaeb84341 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -1,7 +1,7 @@
;;; shell.el --- specialized comint.el for running the shell
;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000,
-;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Olin Shivers <shivers@cs.cmu.edu>
;; Simon Marshall <simon@gnu.org>
diff --git a/lisp/simple.el b/lisp/simple.el
index 67225f07f94..ab4700281b6 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1901,11 +1901,14 @@ the contents are inserted into the buffer anyway.
Optional arguments NOT-THIS-WINDOW and FRAME are as for `display-buffer',
and only used if a buffer is displayed."
- (cond ((and (stringp message) (not (string-match "\n" message)))
+ (cond ((and (stringp message)
+ (not (string-match "\n" message))
+ (<= (length message) (frame-width)))
;; Trivial case where we can use the echo area
(message "%s" message))
((and (stringp message)
- (= (string-match "\n" message) (1- (length message))))
+ (= (string-match "\n" message) (1- (length message)))
+ (<= (1- (length message)) (frame-width)))
;; Trivial case where we can just remove single trailing newline
(message "%s" (substring message 0 (1- (length message)))))
(t
@@ -1922,7 +1925,7 @@ and only used if a buffer is displayed."
(let ((lines
(if (= (buffer-size) 0)
0
- (count-lines (point-min) (point-max)))))
+ (count-screen-lines nil nil nil (minibuffer-window)))))
(cond ((= lines 0))
((and (or (<= lines 1)
(<= lines
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index 26d6613d1bf..0b3fc82f025 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -1,7 +1,7 @@
;;; skeleton.el --- Lisp language extension for writing statement skeletons
;; Copyright (C) 1993, 1994, 1995, 1996, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Daniel Pfeiffer <occitan@esperanto.org>
;; Maintainer: FSF
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 87c572372b0..9fddc4b1a05 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -1,7 +1,7 @@
;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts
;; Copyright (C) 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: tools revision-control merge diff3 cvs conflict
diff --git a/lisp/sort.el b/lisp/sort.el
index 6a008b82425..174a8531786 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -1,7 +1,7 @@
;;; sort.el --- commands to sort text in an Emacs buffer
;; Copyright (C) 1986, 1987, 1994, 1995, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Howie Kaye
;; Maintainer: FSF
diff --git a/lisp/soundex.el b/lisp/soundex.el
index 58ba1872503..e48dbcf3bd6 100644
--- a/lisp/soundex.el
+++ b/lisp/soundex.el
@@ -1,6 +1,7 @@
;;; soundex.el --- implement Soundex algorithm
-;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Christian Plaunt <chris@bliss.berkeley.edu>
;; Maintainer: FSF
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index a48f480a756..c3f949ead37 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -1,6 +1,7 @@
;;; speedbar --- quick access to files and tags in a frame
-;;; Copyright (C) 1996, 97, 98, 99, 00, 01, 02, 03, 04, 05 Free Software Foundation
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Keywords: file, tags, tools
diff --git a/lisp/strokes.el b/lisp/strokes.el
index 84bff1b6ba0..bcf7656347e 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -1,7 +1,7 @@
;;; strokes.el --- control Emacs through mouse strokes
;; Copyright (C) 1997, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David Bakhash <cadet@alum.mit.edu>
;; Maintainer: FSF
diff --git a/lisp/subr.el b/lisp/subr.el
index 59b46341d6e..2c7b3ab9af0 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1,7 +1,7 @@
;;; subr.el --- basic lisp subroutines for Emacs
;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/tabify.el b/lisp/tabify.el
index 84809839883..6e12270bf47 100644
--- a/lisp/tabify.el
+++ b/lisp/tabify.el
@@ -1,7 +1,7 @@
;;; tabify.el --- tab conversion commands for Emacs
;; Copyright (C) 1985, 1994, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
diff --git a/lisp/talk.el b/lisp/talk.el
index 6ef86736cae..ef1a78f0ae5 100644
--- a/lisp/talk.el
+++ b/lisp/talk.el
@@ -1,6 +1,7 @@
;;; talk.el --- allow several users to talk to each other through Emacs
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: comm, frames
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index 0ca201b3ce6..00d9da4d89b 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -1,7 +1,7 @@
;;; tar-mode.el --- simple editing of tar files from GNU emacs
;; Copyright (C) 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Jamie Zawinski <jwz@lucid.com>
;; Maintainer: FSF
diff --git a/lisp/tempo.el b/lisp/tempo.el
index 62ba3c9acae..e65a8179518 100644
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -1,7 +1,7 @@
;;; tempo.el --- Flexible template insertion
;; Copyright (C) 1994, 1995, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: David K}gedal <davidk@lysator.liu.se>
;; Created: 16 Feb 1994
diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el
index 22768730e70..4afc076df0d 100644
--- a/lisp/term/AT386.el
+++ b/lisp/term/AT386.el
@@ -3,7 +3,8 @@
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Keywords: terminals
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
diff --git a/lisp/term/internal.el b/lisp/term/internal.el
index 1a266b0706f..a242528bd03 100644
--- a/lisp/term/internal.el
+++ b/lisp/term/internal.el
@@ -1,7 +1,7 @@
;;; internal.el --- support for PC internal terminal -*- coding: raw-text; no-byte-compile: t -*-
;; Copyright (C) 1993, 1994, 1998, 1999, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Morten Welinder <terra@diku.dk>
diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el
index e62434d2865..267b11b30f3 100644
--- a/lisp/term/iris-ansi.el
+++ b/lisp/term/iris-ansi.el
@@ -1,6 +1,7 @@
;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps -*- no-byte-compile: t -*-
-;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Dan Nicolaescu <dann@ics.uci.edu>
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index bbbb2902aa2..1917af59942 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1,7 +1,7 @@
;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: utf-8
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Andrew Choi <akochoi@mac.com>
;; Keywords: terminals
diff --git a/lisp/term/news.el b/lisp/term/news.el
index 014ecb1cc13..a0082566dd5 100644
--- a/lisp/term/news.el
+++ b/lisp/term/news.el
@@ -1,7 +1,7 @@
;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard -*- no-byte-compile: t -*-
;; Copyright (C) 1989, 1993, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: FSF
;; Keywords: terminals
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index bdaef8813e7..fd63e5a1db9 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -1,7 +1,7 @@
;;; pc-win.el --- setup support for `PC windows' (whatever that is)
;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Morten Welinder <terra@diku.dk>
;; Maintainer: FSF
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el
index 7cd02570d84..e99fc941b0c 100644
--- a/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@ -1,6 +1,6 @@
;;; rxvt.el --- define function key sequences and standard colors for rxvt
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Eli Zaretskii
;; Keywords: terminals
diff --git a/lisp/term/sun-mouse.el b/lisp/term/sun-mouse.el
index a55c8902320..329e88e23e6 100644
--- a/lisp/term/sun-mouse.el
+++ b/lisp/term/sun-mouse.el
@@ -1,6 +1,7 @@
;;; sun-mouse.el --- mouse handling for Sun windows
-;; Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Jeff Peck
;; Maintainer: FSF
diff --git a/lisp/term/sun.el b/lisp/term/sun.el
index 3963a18efdb..0d264f247ec 100644
--- a/lisp/term/sun.el
+++ b/lisp/term/sun.el
@@ -1,7 +1,7 @@
;;; sun.el --- keybinding for standard default sunterm keys
;; Copyright (C) 1987, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Jeff Peck <peck@sun.com>
;; Keywords: terminals
diff --git a/lisp/term/sup-mouse.el b/lisp/term/sup-mouse.el
index 54da5b34505..ebc406d8206 100644
--- a/lisp/term/sup-mouse.el
+++ b/lisp/term/sup-mouse.el
@@ -1,7 +1,7 @@
;;; sup-mouse.el --- supdup mouse support for lisp machines
;; Copyright (C) 1985, 1986, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Wolfgang Rupprecht
;; Maintainer: FSF
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
index 6fcf5d3edba..c03aebf4068 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -1,7 +1,7 @@
;;; tty-colors.el --- color support for character terminals
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Eli Zaretskii
;; Maintainer: FSF
diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el
index 23eea911b79..ffcce0f209c 100644
--- a/lisp/term/tvi970.el
+++ b/lisp/term/tvi970.el
@@ -3,7 +3,8 @@
;; Author: Jim Blandy <jimb@occs.cs.oberlin.edu>, January 1992
;; Keywords: terminals
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el
index 3f744a5212a..c5732a2aefe 100644
--- a/lisp/term/vt100.el
+++ b/lisp/term/vt100.el
@@ -1,7 +1,7 @@
;;; vt100.el --- define VT100 function key sequences in function-key-map
;; Copyright (C) 1989, 1993, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: FSF
;; Keywords: terminals
diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el
index 75f43420013..40e70c8469a 100644
--- a/lisp/term/wyse50.el
+++ b/lisp/term/wyse50.el
@@ -1,7 +1,7 @@
;;; wyse50.el --- terminal support code for Wyse 50 -*- no-byte-compile: t -*-
;; Copyright (C) 1989, 1993, 1994, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Daniel Pfeiffer <occitan@esperanto.org>,
;; Jim Blandy <jimb@occs.cs.oberlin.edu>
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index d3dc9b2f72c..5bc93b47fe9 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1,7 +1,7 @@
;;; x-win.el --- parse relevant switches and set up for X -*-coding: iso-2022-7bit;-*-
;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: FSF
;; Keywords: terminals, i18n
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 60b85a4522a..9cb7253b642 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -1,6 +1,7 @@
;;; xterm.el --- define function key sequences and standard colors for xterm
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: FSF
;; Keywords: terminals
diff --git a/lisp/terminal.el b/lisp/terminal.el
index 645d7a6bd6a..63092e3caea 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -1,7 +1,7 @@
;;; terminal.el --- terminal emulator for GNU Emacs
;; Copyright (C) 1986, 1987, 1988, 1989, 1993, 1994, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Richard Mlynarik <mly@eddie.mit.edu>
;; Maintainer: FSF
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index b13b080cf79..9305bdbf9bc 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -1,7 +1,7 @@
;;; artist.el --- draw ascii graphics with your mouse
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Tomas Abrahamsson <tab@lysator.liu.se>
;; Maintainer: Tomas Abrahamsson <tab@lysator.liu.se>
diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el
index 6609673289b..1c4dacf71d8 100644
--- a/lisp/textmodes/bib-mode.el
+++ b/lisp/textmodes/bib-mode.el
@@ -1,6 +1,7 @@
;;; bib-mode.el --- major mode for editing bib files
-;; Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: bib
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index c708355ce7e..f1e055594b7 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -1,7 +1,7 @@
;;; bibtex.el --- BibTeX mode for GNU Emacs
;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Stefan Schoef <schoef@offis.uni-oldenburg.de>
;; Bengt Martensson <bengt@mathematik.uni-Bremen.de>
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index 764c831d1b3..e762f87f328 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -1,6 +1,6 @@
;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Daniel Pfeiffer <occitan@esperanto.org>
;; Keywords: conf ini windows java
diff --git a/lisp/textmodes/dns-mode.el b/lisp/textmodes/dns-mode.el
index 12f99ba090e..a323d4c4468 100644
--- a/lisp/textmodes/dns-mode.el
+++ b/lisp/textmodes/dns-mode.el
@@ -1,6 +1,6 @@
;;; dns-mode.el --- a mode for viewing/editing Domain Name System master files
-;; Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: DNS master zone file SOA
diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index dc8d4c96b2b..1c81b5cf25e 100644
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -1,7 +1,7 @@
;;; enriched.el --- read and save files in text/enriched format
;; Copyright (C) 1994, 1995, 1996, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Boris Goldowsky <boris@gnu.org>
;; Keywords: wp, faces
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 48defb7d786..f472743ef16 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -1,7 +1,7 @@
;;; fill.el --- fill commands for Emacs -*- coding: iso-2022-7bit -*-
;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1999, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: wp
diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el
index 542c4829e9c..26a47a65e84 100644
--- a/lisp/textmodes/makeinfo.el
+++ b/lisp/textmodes/makeinfo.el
@@ -1,7 +1,7 @@
;;; makeinfo.el --- run makeinfo conveniently
;; Copyright (C) 1991, 1993, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Robert J. Chassell
;; Maintainer: FSF
diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index ababc041099..4a07b091e2a 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -42,8 +42,9 @@
:group 'wp
:prefix "nroff-")
+
(defcustom nroff-electric-mode nil
- "*Non-nil means automatically closing requests when you insert an open."
+ "Non-nil means automatically closing requests when you insert an open."
:group 'nroff
:type 'boolean)
@@ -51,10 +52,10 @@
(let ((map (make-sparse-keymap)))
(define-key map "\t" 'tab-to-tab-stop)
(define-key map "\es" 'center-line)
- (define-key map "\e?" 'count-text-lines)
- (define-key map "\n" 'electric-nroff-newline)
- (define-key map "\en" 'forward-text-line)
- (define-key map "\ep" 'backward-text-line)
+ (define-key map "\e?" 'nroff-count-text-lines)
+ (define-key map "\n" 'nroff-electric-newline)
+ (define-key map "\en" 'nroff-forward-text-line)
+ (define-key map "\ep" 'nroff-backward-text-line)
map)
"Major mode keymap for `nroff-mode'.")
@@ -66,7 +67,7 @@
(modify-syntax-entry ?\" "\" 2" st)
;; Comments are delimited by \" and newline.
(modify-syntax-entry ?\\ "\\ 1" st)
- (modify-syntax-entry ?\n "> 1" st)
+ (modify-syntax-entry ?\n ">" st)
st)
"Syntax table used while in `nroff-mode'.")
@@ -116,7 +117,6 @@ closing requests for requests that are used in matched pairs."
;; near the end of large buffers due to searching to buffer's
;; beginning.
'(nroff-font-lock-keywords nil t nil backward-paragraph))
- (set (make-local-variable 'nroff-electric-mode) nil)
(set (make-local-variable 'outline-regexp) "\\.H[ ]+[1-7]+ ")
(set (make-local-variable 'outline-level) 'nroff-outline-level)
;; now define a bunch of variables for use by commands in this mode
@@ -138,8 +138,8 @@ closing requests for requests that are used in matched pairs."
(skip-chars-forward ".H ")
(string-to-number (buffer-substring (point) (+ 1 (point))))))
-;;; Compute how much to indent a comment in nroff/troff source.
-;;; By mit-erl!gildea April 86
+;; Compute how much to indent a comment in nroff/troff source.
+;; By mit-erl!gildea April 86
(defun nroff-comment-indent ()
"Compute indent for an nroff/troff comment.
Puts a full-stop before comments on a line by themselves."
@@ -161,21 +161,21 @@ Puts a full-stop before comments on a line by themselves."
9) 8)))))) ; add 9 to ensure at least two blanks
(goto-char pt))))
-(defun count-text-lines (start end &optional print)
+(defun nroff-count-text-lines (start end &optional print)
"Count lines in region, except for nroff request lines.
All lines not starting with a period are counted up.
Interactively, print result in echo area.
Noninteractively, return number of non-request lines from START to END."
(interactive "r\np")
(if print
- (message "Region has %d text lines" (count-text-lines start end))
+ (message "Region has %d text lines" (nroff-count-text-lines start end))
(save-excursion
(save-restriction
(narrow-to-region start end)
(goto-char (point-min))
(- (buffer-size) (forward-text-line (buffer-size)))))))
-(defun forward-text-line (&optional cnt)
+(defun nroff-forward-text-line (&optional cnt)
"Go forward one nroff text line, skipping lines of nroff requests.
An argument is a repeat count; if negative, move backward."
(interactive "p")
@@ -193,11 +193,11 @@ An argument is a repeat count; if negative, move backward."
(setq cnt (+ cnt 1)))
cnt)
-(defun backward-text-line (&optional cnt)
+(defun nroff-backward-text-line (&optional cnt)
"Go backward one nroff text line, skipping lines of nroff requests.
An argument is a repeat count; negative means move forward."
(interactive "p")
- (forward-text-line (- cnt)))
+ (nroff-forward-text-line (- cnt)))
(defconst nroff-brace-table
'((".(b" . ".)b")
@@ -235,7 +235,7 @@ An argument is a repeat count; negative means move forward."
(".nf" . ".fi")
(".de" . "..")))
-(defun electric-nroff-newline (arg)
+(defun nroff-electric-newline (arg)
"Insert newline for nroff mode; special if electric-nroff mode.
In `electric-nroff-mode', if ending a line containing an nroff opening request,
automatically inserts the matching closing request after point."
@@ -256,23 +256,23 @@ automatically inserts the matching closing request after point."
(if needs-nl (insert "\n")))
(forward-char 1))))
-(defun electric-nroff-mode (&optional arg)
+(define-minor-mode nroff-electric-mode
"Toggle `nroff-electric-newline' minor mode.
`nroff-electric-newline' forces Emacs to check for an nroff request at the
beginning of the line, and insert the matching closing request if necessary.
This command toggles that mode (off->on, on->off), with an argument,
turns it on iff arg is positive, otherwise off."
- (interactive "P")
- (or (eq major-mode 'nroff-mode) (error "Must be in nroff mode"))
- (or (assq 'nroff-electric-mode minor-mode-alist)
- (setq minor-mode-alist (append minor-mode-alist
- (list '(nroff-electric-mode
- " Electric")))))
- (setq nroff-electric-mode
- (cond ((null arg) (null nroff-electric-mode))
- (t (> (prefix-numeric-value arg) 0)))))
+ :lighter " Electric"
+ (or (derived-mode-p 'nroff-mode) (error "Must be in nroff mode")))
+
+;; Old names that were not namespace clean.
+(define-obsolete-function-alias 'count-text-lines 'nroff-count-text-lines "22.1")
+(define-obsolete-function-alias 'forward-text-line 'nroff-forward-text-line "22.1")
+(define-obsolete-function-alias 'backward-text-line 'nroff-backward-text-line "22.1")
+(define-obsolete-function-alias 'electric-nroff-newline 'nroff-electric-newline "22.1")
+(define-obsolete-function-alias 'electric-nroff-mode 'nroff-electric-mode "22.1")
(provide 'nroff-mode)
-;;; arch-tag: 6e276340-6c65-4f65-b4e3-0ca431ddfb6c
+;; arch-tag: 6e276340-6c65-4f65-b4e3-0ca431ddfb6c
;;; nroff-mode.el ends here
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 0381854542a..3c70314703b 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -1,6 +1,6 @@
;;; org.el --- Outline-based notes management and organize
;; Carstens outline-mode for keeping track of everything.
-;; Copyright (c) 2004, 2005, 2006 Free Software Foundation
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Carsten Dominik <dominik at science dot uva dot nl>
;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el
index 365ed19d9ce..280a8d28020 100644
--- a/lisp/textmodes/page-ext.el
+++ b/lisp/textmodes/page-ext.el
@@ -1,7 +1,7 @@
;;; page-ext.el --- extended page handling commands
;; Copyright (C) 1990, 1991, 1993, 1994, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: Robert J. Chassell <bob@gnu.org>
;; Keywords: wp data
diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el
index 3ec1eca1fb7..20458491808 100644
--- a/lisp/textmodes/page.el
+++ b/lisp/textmodes/page.el
@@ -1,6 +1,7 @@
;;; page.el --- page motion commands for Emacs
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: wp convenience
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index b196001c799..927fa644b9d 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -1,7 +1,7 @@
;;; paragraphs.el --- paragraph and sentence parsing
;; Copyright (C) 1985, 1986, 1987, 1991, 1994, 1995, 1996, 1997, 1999, 2000,
-;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: wp
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index 78741065100..1c3e1baa9b1 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -1,7 +1,7 @@
;;; picture.el --- "Picture mode" -- editing using quarter-plane screen model
;; Copyright (C) 1985, 1994, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: K. Shane Hartman
;; Maintainer: FSF
diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el
index c9af801bef0..07b9ba1a2b1 100644
--- a/lisp/textmodes/po.el
+++ b/lisp/textmodes/po.el
@@ -1,7 +1,7 @@
;;; po.el --- basic support of PO translation files -*- coding: latin-1; -*-
;; Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Authors: François Pinard <pinard@iro.umontreal.ca>,
;; Greg McGary <gkm@magilla.cichlid.com>,
diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el
index 99e2b780999..25613cff8ca 100644
--- a/lisp/textmodes/refbib.el
+++ b/lisp/textmodes/refbib.el
@@ -1,6 +1,7 @@
;;; refbib.el --- convert refer-style references to ones usable by Latex bib
-;; Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Henry Kautz <kautz@research.att.com>
;; Maintainer: FSF
diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el
index 9fa0afe2046..ce0f96956df 100644
--- a/lisp/textmodes/refer.el
+++ b/lisp/textmodes/refer.el
@@ -1,7 +1,7 @@
;;; refer.el --- look up references in bibliography files
;; Copyright (C) 1992, 1996, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Ashwin Ram <ashwin@cc.gatech.edu>
;; Maintainer: Gernot Heiser <gernot@acm.org>
diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el
index bf8938a7ec5..28ecd3bb4fe 100644
--- a/lisp/textmodes/refill.el
+++ b/lisp/textmodes/refill.el
@@ -1,6 +1,7 @@
;;; refill.el --- `auto-fill' by refilling paragraphs on changes
-;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Dave Love <fx@gnu.org>
;; Maintainer: Miles Bader <miles@gnu.org>
diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el
index 65815dd2885..ff044230803 100644
--- a/lisp/textmodes/reftex-auc.el
+++ b/lisp/textmodes/reftex-auc.el
@@ -1,6 +1,6 @@
;;; reftex-auc.el --- RefTeX's interface to AUCTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Carsten Dominik <dominik@science.uva.nl>
;; Version: VERSIONTAG
@@ -75,7 +75,7 @@ What is being used depends upon `reftex-plug-into-AUCTeX'."
(defun reftex-arg-index-tag (optional &optional prompt &rest args)
- "Prompt for an index tag with completion.
+ "Prompt for an index tag with completion.
This is the name of an index, not the entry."
(let (tag taglist)
(setq prompt (concat (if optional "(Optional) " "")
@@ -85,8 +85,8 @@ This is the name of an index, not the entry."
;; Use RefTeX completion
(progn
(reftex-access-scan-info nil)
- (setq taglist
- (cdr (assoc 'index-tags
+ (setq taglist
+ (cdr (assoc 'index-tags
(symbol-value reftex-docstruct-symbol)))
tag (completing-read prompt (mapcar 'list taglist))))
;; Just ask like AUCTeX does.
@@ -131,7 +131,7 @@ argument identify one of multiple indices."
;; Replace AUCTeX functions with RefTeX functions.
;; Which functions are replaced is controlled by the variable
;; `reftex-plug-into-AUCTeX'.
-
+
(if (reftex-plug-flag 0)
(setq LaTeX-label-function 'reftex-label)
(setq LaTeX-label-function nil))
@@ -143,11 +143,11 @@ argument identify one of multiple indices."
(and (reftex-plug-flag 3)
(fboundp 'TeX-arg-cite)
(fset 'TeX-arg-cite 'reftex-arg-cite))
-
- (and (reftex-plug-flag 4)
+
+ (and (reftex-plug-flag 4)
(fboundp 'TeX-arg-index-tag)
(fset 'TeX-arg-index-tag 'reftex-arg-index-tag))
- (and (reftex-plug-flag 4)
+ (and (reftex-plug-flag 4)
(fboundp 'TeX-arg-index)
(fset 'TeX-arg-index 'reftex-arg-index)))
diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el
index cb85ea201fa..c6f43a07d26 100644
--- a/lisp/textmodes/reftex-cite.el
+++ b/lisp/textmodes/reftex-cite.el
@@ -1,6 +1,6 @@
;;; reftex-cite.el --- creating citations with RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Carsten Dominik <dominik@science.uva.nl>
;; Version: VERSIONTAG
diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el
index 56adf2956c6..7546c654f70 100644
--- a/lisp/textmodes/reftex-dcr.el
+++ b/lisp/textmodes/reftex-dcr.el
@@ -1,6 +1,6 @@
;;; reftex-dcr.el --- viewing cross references and citations with RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Carsten Dominik <dominik@science.uva.nl>
;; Version: VERSIONTAG
diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el
index 580a0c8e314..fafc1a30998 100644
--- a/lisp/textmodes/reftex-global.el
+++ b/lisp/textmodes/reftex-global.el
@@ -1,6 +1,6 @@
;;; reftex-global.el --- operations on entire documents with RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Carsten Dominik <dominik@science.uva.nl>
;; Version: VERSIONTAG
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index 65025645c0d..a7e7203a639 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -1,6 +1,6 @@
;;; reftex-index.el --- index support with RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Carsten Dominik <dominik@science.uva.nl>
;; Version: VERSIONTAG
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el
index 032bcba7dc9..ce43840c888 100644
--- a/lisp/textmodes/reftex-parse.el
+++ b/lisp/textmodes/reftex-parse.el
@@ -1,6 +1,6 @@
;;; reftex-parse.el --- parser functions for RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Carsten Dominik <dominik@science.uva.nl>
;; Version: VERSIONTAG
diff --git a/lisp/textmodes/reftex-ref.el b/lisp/textmodes/reftex-ref.el
index c250806c118..f1a8d6d3965 100644
--- a/lisp/textmodes/reftex-ref.el
+++ b/lisp/textmodes/reftex-ref.el
@@ -1,6 +1,6 @@
;;; reftex-ref.el --- code to create labels and references with RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Carsten Dominik <dominik@science.uva.nl>
;; Version: VERSIONTAG
diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el
index f4fc8368a50..9aa7edbf438 100644
--- a/lisp/textmodes/reftex-sel.el
+++ b/lisp/textmodes/reftex-sel.el
@@ -1,6 +1,6 @@
;;; reftex-sel.el --- the selection modes for RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2440, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2440, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Carsten Dominik <dominik@science.uva.nl>
;; Version: VERSIONTAG
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el
index 541b3091af0..f9eb3cfef82 100644
--- a/lisp/textmodes/reftex-toc.el
+++ b/lisp/textmodes/reftex-toc.el
@@ -1,6 +1,6 @@
;;; reftex-toc.el --- RefTeX's table of contents mode
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Carsten Dominik <dominik@science.uva.nl>
;; Version: VERSIONTAG
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index 01e8a1b4ddf..b8eddcd0386 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -1,6 +1,6 @@
;;; reftex-vars.el --- configuration variables for RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2003, 2004, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Carsten Dominik <dominik@science.uva.nl>
;; Version: VERSIONTAG
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index 386f19f1797..cb2e960225d 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -1,6 +1,6 @@
;;; reftex.el --- minor mode for doing \label, \ref, \cite, \index in LaTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Carsten Dominik <dominik@science.uva.nl>
;; Version: VERSIONTAG
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 9d422a8e085..416a3efb684 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1,7 +1,7 @@
;;; sgml-mode.el --- SGML- and HTML-editing modes -*- coding: iso-2022-7bit -*-
;; Copyright (C) 1992, 1995, 1996, 1998, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: James Clark <jjc@jclark.com>
;; Maintainer: FSF
diff --git a/lisp/textmodes/spell.el b/lisp/textmodes/spell.el
index 077e9b0fd35..ddc6788123d 100644
--- a/lisp/textmodes/spell.el
+++ b/lisp/textmodes/spell.el
@@ -1,6 +1,7 @@
;;; spell.el --- spelling correction interface for Emacs
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: wp, unix
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index bdd4e659a0e..97153e31a25 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1,7 +1,7 @@
;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands -*- coding: utf-8 -*-
;; Copyright (C) 1985, 1986, 1989, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: tex
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 15a15eb37fb..8794ebddc15 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -2,7 +2,7 @@
;; Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993,
;; 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: Robert J. Chassell <bug-texinfo@gnu.org>
;; Keywords: maint, tex, docs
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 8392e56dc00..36603174948 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -1,7 +1,7 @@
;;; texinfo.el --- major mode for editing Texinfo files -*- coding: iso-2022-7bit -*-
;; Copyright (C) 1985, 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997,
-;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Robert J. Chassell
;; Date: [See date below for texinfo-version]
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index 110981d33b0..29af72162d0 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -1,7 +1,7 @@
;;; texnfo-upd.el --- utilities for updating nodes and menus in Texinfo files
;; Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Robert J. Chassell
;; Maintainer: bug-texinfo@gnu.org
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index 5e4cfc88471..a4b67057676 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -1,7 +1,7 @@
;;; text-mode.el --- text mode, and its idiosyncratic commands
;; Copyright (C) 1985, 1992, 1994, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: wp
diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el
index 1810e41cbca..bf6edac230c 100644
--- a/lisp/textmodes/tildify.el
+++ b/lisp/textmodes/tildify.el
@@ -1,7 +1,7 @@
;;; tildify.el --- adding hard spaces into texts
;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Milan Zamazal <pdm@zamazal.org>
;; Version: 4.5
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index 1e83b7a725b..b8ab100c19d 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -1,7 +1,7 @@
;;; two-column.el --- minor mode for editing of two-column text
;; Copyright (C) 1992, 1993, 1994, 1995, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Daniel Pfeiffer <occitan@esperanto.org>
;; Adapted-By: ESR, Daniel Pfeiffer
diff --git a/lisp/textmodes/underline.el b/lisp/textmodes/underline.el
index 3c67307da51..8e8ef3b399e 100644
--- a/lisp/textmodes/underline.el
+++ b/lisp/textmodes/underline.el
@@ -1,6 +1,7 @@
;;; underline.el --- insert/remove underlining (done by overstriking) in Emacs
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: wp
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index c76a3bf2d70..27fecacdd36 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -1,7 +1,7 @@
;;; thingatpt.el --- get the `thing' at point
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000
-;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Mike Williams <mikew@gopher.dosli.govt.nz>
;; Maintainer: FSF
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index bcab502b0f4..ff5fcf2b33c 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -1,6 +1,6 @@
;;; thumbs.el --- Thumbnails previewer for images files
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Jean-Philippe Theberge <jphiltheberge@videotron.ca>
;; Maintainer: FSF
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index af3528aa11d..76373980be2 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -1,11 +1,11 @@
;;; time-stamp.el --- Maintain last change time stamps in files edited by Emacs
;; Copyright (C) 1989, 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
-;; Maintainer's Time-stamp: <2004-09-25 20:55:35 gildea>
+;; Maintainer's Time-stamp: <2006-02-06 15:11:58 ttn>
;; Maintainer: Stephen Gildea <gildea@stop.mail-abuse.org>
;; Keywords: tools
diff --git a/lisp/time.el b/lisp/time.el
index 614bb055b25..115681c1b58 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -1,7 +1,7 @@
;;; time.el --- display time, load and mail indicator in mode line of Emacs -*-coding: utf-8 -*-
;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1996, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
diff --git a/lisp/timezone.el b/lisp/timezone.el
index 7093aec22a4..2529f7da865 100644
--- a/lisp/timezone.el
+++ b/lisp/timezone.el
@@ -1,7 +1,7 @@
;;; timezone.el --- time zone package for GNU Emacs
;; Copyright (C) 1990, 1991, 1992, 1993, 1996, 1999, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu Umeda
;; Maintainer: umerin@mse.kyutech.ac.jp
diff --git a/lisp/tmm.el b/lisp/tmm.el
index f73e3fa0980..86c326616aa 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -1,7 +1,7 @@
;;; tmm.el --- text mode access to menu-bar
;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Ilya Zakharevich <ilya@math.mps.ohio-state.edu>
;; Maintainer: FSF
diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el
index 15321a4ffd8..0a1d706a694 100644
--- a/lisp/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -1,7 +1,7 @@
;;; tool-bar.el --- setting up the tool bar
;;
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Dave Love <fx@gnu.org>
;; Keywords: mouse frames
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 5d19e8cfba4..8dc811c09e6 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -1,7 +1,7 @@
;;; tooltip.el --- show tooltip windows
;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Gerd Moellmann <gerd@acm.org>
;; Keywords: help c mouse tools
diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el
index 8ee1d5f9ed9..55385d42e95 100644
--- a/lisp/tree-widget.el
+++ b/lisp/tree-widget.el
@@ -1,6 +1,6 @@
;;; tree-widget.el --- Tree widget
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: David Ponce <david@dponce.com>
;; Maintainer: David Ponce <david@dponce.com>
diff --git a/lisp/tumme.el b/lisp/tumme.el
index 91d7f72b5b9..005258790c2 100644
--- a/lisp/tumme.el
+++ b/lisp/tumme.el
@@ -1,8 +1,8 @@
;;; tumme.el --- use dired to browse and manipulate your images
;;
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
;;
-;; Version: 0.4.10
+;; Version: 0.4.11
;; Keywords: multimedia
;; Author: Mathias Dahl <mathias.rem0veth1s.dahl@gmail.com>
@@ -128,11 +128,6 @@
;; LIMITATIONS
;; ===========
;;
-;; * In order to work well, `tumme' require that all your images have
-;; unique names. The reason is the way thumbnail file names are
-;; generated. I will probably not fix this problem as my images all
-;; have unique names.
-;;
;; * Supports all image formats that Emacs and convert supports, but
;; the thumbnails are hard-coded to JPEG format.
;;
@@ -489,6 +484,29 @@
;; * To be included in Emacs 22.
;;
;;
+;; Version 0.4.11, 2006-MM-DD
+;;
+;; * Changed `tumme-display-thumbs' so that it calls `display-buffer'
+;; after generating the thumbnails and changed
+;; `tumme-display-thumbnail-original-image' to display the image
+;; buffer. These small changes should make it easier for a user to
+;; start using tumme.
+;;
+;; * Added `tumme-show-all-from-dir' to mimic thumbs.el's easy-to-use
+;; `thumbs' command. A new customize option,
+;; `tumme-show-all-from-dir-max-files' was added too.
+;;
+;; * Renamed `tumme-dired' to `tumme-dired-with-window-configuration'
+;; and added code to save the window configuration before messing it
+;; up. The saved window configuration can be restored using the new
+;; command `tumme-restore-window-configuration'.
+;;
+;; * Added `tumme-get-thumbnail-image', created by Chong Yidong. His
+;; own comments: ..., that just takes the original filename and
+;; returns a thumbnail image descriptor. Then third-party libraries
+;; won't have to muck around with tumme.el's internal functions like
+;; `thumme-thumb-name', `tumme-create-thumb', etc. His code to get
+;; speedbar display tumme thumbnails, might be integrated soon.
;;
;; TODO
;; ====
@@ -667,7 +685,7 @@ Available options are %p which is replaced by
number of (positive) degrees to rotate the image, normally 90 or
270 \(for 90 degrees right and left), %o which is replaced by the
original image file name and %t which is replaced by
-`tumme-temp-image-file'"
+`tumme-temp-image-file'."
:type 'string
:group 'tumme)
@@ -760,7 +778,7 @@ line-up means that no automatic line-up will be done."
:group 'tumme)
(defcustom tumme-display-window-width-correction 1
- "*Number to be used to correct image display window height.
+ "*Number to be used to correct image display window width.
Change if the default (1) does not work (i.e. if the image does not
completely fit)."
:type 'integer
@@ -768,7 +786,7 @@ completely fit)."
(defcustom tumme-display-window-height-correction 0
"*Number to be used to correct image display window height.
-Use if the default (0) does not work (i.e. if the image does not
+Change if the default (0) does not work (i.e. if the image does not
completely fit)."
:type 'integer
:group 'tumme)
@@ -801,7 +819,7 @@ dired and you might want to turn it off."
:group 'tumme)
(defcustom tumme-display-properties-format "%b: %f (%t): %c"
- "* Display format for thumbnail properties.
+ "*Display format for thumbnail properties.
%b is replaced with associated dired buffer name, %f with file name
\(without path) of original image file, %t with the list of tags and %c
with the comment."
@@ -821,6 +839,12 @@ Used by `tumme-copy-with-exif-file-name'."
:type 'string
:group 'tumme)
+(defcustom tumme-show-all-from-dir-max-files 50
+ "*Maximum number of files to show using`tumme-show-all-from-dir'.
+ before warning the user."
+ :type 'integer
+ :group 'tumme)
+
(defun tumme-insert-image (file type relief margin)
"Insert image FILE of image TYPE, using RELIEF and MARGIN, at point."
@@ -830,6 +854,18 @@ Used by `tumme-copy-with-exif-file-name'."
:margin ,margin)))
(insert-image i)))
+(defun tumme-get-thumbnail-image (file)
+ "Return the image descriptor for a thumbnail of image file FILE."
+ (unless (string-match (image-file-name-regexp) file)
+ (error "%s is not a valid image file" file))
+ (let ((thumb-file (tumme-thumb-name file)))
+ (unless (and (file-exists-p thumb-file)
+ (<= (float-time (nth 5 (file-attributes file)))
+ (float-time (nth 5 (file-attributes thumb-file)))))
+ (tumme-create-thumb file thumb-file))
+ (list 'image :type 'jpeg :file thumb-file
+ :relief tumme-thumb-relief :margin tumme-thumb-margin)))
+
(defun tumme-insert-thumbnail (file original-file-name
associated-dired-buffer)
"Insert thumbnail image FILE.
@@ -969,8 +1005,11 @@ add a subdirectory."
(tumme-display-image-mode)))
buf))
+(defvar tumme-saved-window-configuration nil
+ "Saved window configuration.")
+
;;;###autoload
-(defun tumme-dired (dir &optional arg)
+(defun tumme-dired-with-window-configuration (dir &optional arg)
"Open directory DIR and create a default window configuration.
Convenience command that:
@@ -979,11 +1018,21 @@ Convenience command that:
- Splits windows in most useful (?) way
- Set `truncate-lines' to t
-If called with prefix argument ARG, skip splitting of windows."
+After the command has finished, you would typically mark some
+image files in dired and call `tumme-display-thumbs' (by default
+bound to C-t d).
+
+If called with prefix argument ARG, skip splitting of windows.
+
+The current window configuration is saved and can be restored by
+calling `tumme-restore-window-configuration'."
(interactive "DDirectory: \nP")
(let ((buf (tumme-create-thumbnail-buffer))
(buf2 (tumme-create-display-image-buffer)))
+ (setq tumme-saved-window-configuration
+ (current-window-configuration))
(dired dir)
+ (delete-other-windows)
(when (not arg)
(split-window-horizontally)
(setq truncate-lines t)
@@ -995,6 +1044,16 @@ If called with prefix argument ARG, skip splitting of windows."
(switch-to-buffer buf2)
(other-window -2)))))
+(defun tumme-restore-window-configuration ()
+ "Restore window configuration.
+Restore any changes to the window configuration made by calling
+`tumme-dired-with-window-configuration'."
+ (interactive)
+ (if tumme-saved-window-configuration
+ (set-window-configuration tumme-saved-window-configuration)
+ (message "No saved window configuration")))
+
+;;;###autoload
(defun tumme-display-thumbs (&optional arg append)
"Display thumbnails of all marked files, in `tumme-thumbnail-buffer'.
If a thumbnail image does not exist for a file, it is created on the
@@ -1038,7 +1097,31 @@ instead of erasing it first."
((eq 'none tumme-line-up-method)
nil)
(t
- (tumme-line-up-dynamic))))))
+ (tumme-line-up-dynamic))))
+ (pop-to-buffer tumme-thumbnail-buffer)))
+
+(defun tumme-show-all-from-dir (dir)
+ "Make a preview buffer for all images in DIR and display it.
+If the number of files in DIR matching `image-file-name-regexp'
+exceeds `tumme-show-all-from-dir-max-files', a warning will be
+displayed."
+ (interactive "DDir: ")
+ (dired dir)
+ (dired-mark-files-regexp (image-file-name-regexp))
+ (let ((files (dired-get-marked-files)))
+ (if (or (<= (length files) tumme-show-all-from-dir-max-files)
+ (and (> (length files) tumme-show-all-from-dir-max-files)
+ (y-or-n-p
+ (format
+ "Directory contains more than %d image files. Proceed? "
+ tumme-show-all-from-dir-max-files))))
+ (progn
+ (tumme-display-thumbs)
+ (pop-to-buffer tumme-thumbnail-buffer))
+ (message "Cancelled."))))
+
+;;;###autoload
+(defalias 'tumme 'tumme-show-all-from-dir)
(defun tumme-write-tag (files tag)
"For all FILES, writes TAG to the image database."
@@ -1125,6 +1208,7 @@ instead of erasing it first."
(kill-buffer buf)
(split-string tags ";"))))
+;;;###autoload
(defun tumme-tag-files (arg)
"Tag marked file(s) in dired. With prefix ARG, tag file at point."
(interactive "P")
@@ -1143,6 +1227,7 @@ instead of erasing it first."
(tumme-update-property
'tags (tumme-list-tags (tumme-original-file-name))))
+;;;###autoload
(defun tumme-tag-remove (arg)
"Remove tag for selected file(s).
With prefix argument ARG, remove tag from file at point."
@@ -1310,7 +1395,7 @@ move ARG lines."
(defun tumme-format-properties-string (buf file props comment)
"Format display properties.
BUF is the associated dired buffer, FILE is the original image file
-name, PROPS is a list of tags and COMMENT is the images files's
+name, PROPS is a list of tags and COMMENT is the image files's
comment."
(format-spec
tumme-display-properties-format
@@ -1406,6 +1491,7 @@ You probably want to use this together with
(select-window window))
(message "Associated dired buffer not visible"))))
+;;;###autoload
(defun tumme-jump-thumbnail-buffer ()
"Jump to thumbnail buffer."
(interactive)
@@ -1740,7 +1826,7 @@ Note that n, p and <down> and <up> will be hijacked and bound to
(defun tumme-create-thumbs (&optional arg)
"Create thumbnail images for all marked files in dired.
With prefix argument ARG, create thumbnails even if they already exist
-\(i.e. use this to refresh your thumbnails)."
+\(i.e. use this to refresh your thumbnails)."
(interactive "P")
(let (curr-file thumb-name files count)
(setq files (dired-get-marked-files))
@@ -1804,11 +1890,13 @@ Ask user for number of images to show and the delay in between."
(if (looking-at " ")
(delete-char 1))))
+;;;###autoload
(defun tumme-display-thumbs-append ()
"Append thumbnails to `tumme-thumbnail-buffer'."
(interactive)
(tumme-display-thumbs nil t))
+;;;###autoload
(defun tumme-display-thumb ()
"Shorthard for `tumme-display-thumbs' with prefix argument."
(interactive)
@@ -1845,7 +1933,7 @@ See also `tumme-line-up-dynamic'."
(defun tumme-line-up-dynamic ()
"Line up thumbnails images dynamically.
-Calculate how many thumbnails that fits."
+Calculate how many thumbnails fit."
(interactive)
(let* ((char-width (frame-char-width))
(width (tumme-window-width-pixels (tumme-thumbnail-window)))
@@ -1858,7 +1946,7 @@ Calculate how many thumbnails that fits."
(defun tumme-line-up-interactive ()
"Line up thumbnails interactively.
-Ask user how many thumbnails that should be displayed per row."
+Ask user how many thumbnails should be displayed per row."
(interactive)
(let ((tumme-thumbs-per-row
(string-to-number (read-string "How many thumbs per row: "))))
@@ -1879,6 +1967,7 @@ Ask user how many thumbnails that should be displayed per row."
tumme-external-viewer
file))))))
+;;;###autoload
(defun tumme-dired-display-external ()
"Display file at point using an external viewer."
(interactive)
@@ -1984,8 +2073,10 @@ With prefix argument ARG, display image in its original size."
(message "No thumbnail at point")
(if (not file)
(message "No original file name found")
- (tumme-display-image file arg))))))
+ (tumme-display-image file arg)
+ (display-buffer tumme-display-image-buffer))))))
+;;;###autoload
(defun tumme-display-dired-image (&optional arg)
"Display current image file.
See documentation for `tumme-display-image' for more information.
@@ -2187,7 +2278,7 @@ browse and tag them using rest of the functionality in `tumme'."
(tumme-display-thumbnail-original-image))
(defun tumme-display-previous-thumbnail-original ()
- "Move to previous thumbnail and display image."
+ "Move to previous thumbnail and display image."
(interactive)
(tumme-backward-char)
@@ -2236,6 +2327,7 @@ browse and tag them using rest of the functionality in `tumme'."
prop
value)))
+;;;###autoload
(defun tumme-dired-comment-files ()
"Add comment to current or marked files in dired."
(interactive)
@@ -2286,6 +2378,7 @@ browse and tag them using rest of the functionality in `tumme'."
(kill-buffer buf)
comment)))
+;;;###autoload
(defun tumme-mark-tagged-files ()
"Use regexp to mark files with matching tag."
(interactive)
@@ -2506,7 +2599,7 @@ when using per-directory thumbnail file storage"))
;; Make sure gallery root exist
(if (file-exists-p tumme-gallery-dir)
(if (not (file-directory-p tumme-gallery-dir))
- (error "Tumme-gallery-dir is not a directory"))
+ (error "tumme-gallery-dir is not a directory"))
(make-directory tumme-gallery-dir))
;; Open index file
(setq index-buf (find-file
@@ -2555,7 +2648,7 @@ when using per-directory thumbnail file storage"))
;; Insert thumbnail with link to full image
(insert
(format "<a href=\"%s/%s\"><img src=\"%s/%s\"%s></a>\n"
- tumme-gallery-image-root-url file
+ tumme-gallery-image-root-url (file-name-nondirectory file)
tumme-gallery-thumb-image-root-url
(file-name-nondirectory (tumme-thumb-name file)) file))
;; Insert comment, if any
@@ -2597,38 +2690,53 @@ when using per-directory thumbnail file storage"))
(error nil))
(kill-buffer buffer)))
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;; TEST-SECTION ;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defvar tumme-dir-max-size 12300000)
-
-(defun tumme-test ()
- "Clean `tumme-dir' from old thumbnail files.
-\"Oldness\" measured using last access time. If the total size of all
-thumbnail files in `tumme-dir' is larger than 'tumme-dir-max-size',
-old files are deleted until the max size is reached."
- (let* ((files
- (sort
- (mapcar
- (lambda (f)
- (let ((fattribs (file-attributes f)))
- ;; Get last access time and file size
- `(,(nth 4 fattribs) ,(nth 7 fattribs) ,f)))
- (directory-files tumme-dir t ".+\.thumb\..+$"))
- ;; Sort function. Compare time between two files.
- '(lambda (l1 l2)
- (time-less-p (car l1) (car l2)))))
- (dirsize (apply '+ (mapcar (lambda (x) (cadr x)) files))))
- (while (> dirsize tumme-dir-max-size)
- (y-or-n-p
- (format "Size of thumbnail directory: %d, delete old file %s? "
- dirsize (cadr (cdar files))))
- (delete-file (cadr (cdar files)))
- (setq dirsize (- dirsize (car (cdar files))))
- (setq files (cdr files)))))
+;; (defvar tumme-dir-max-size 12300000)
+
+;; (defun tumme-test-clean-old-files ()
+;; "Clean `tumme-dir' from old thumbnail files.
+;; \"Oldness\" measured using last access time. If the total size of all
+;; thumbnail files in `tumme-dir' is larger than 'tumme-dir-max-size',
+;; old files are deleted until the max size is reached."
+;; (let* ((files
+;; (sort
+;; (mapcar
+;; (lambda (f)
+;; (let ((fattribs (file-attributes f)))
+;; ;; Get last access time and file size
+;; `(,(nth 4 fattribs) ,(nth 7 fattribs) ,f)))
+;; (directory-files tumme-dir t ".+\.thumb\..+$"))
+;; ;; Sort function. Compare time between two files.
+;; '(lambda (l1 l2)
+;; (time-less-p (car l1) (car l2)))))
+;; (dirsize (apply '+ (mapcar (lambda (x) (cadr x)) files))))
+;; (while (> dirsize tumme-dir-max-size)
+;; (y-or-n-p
+;; (format "Size of thumbnail directory: %d, delete old file %s? "
+;; dirsize (cadr (cdar files))))
+;; (delete-file (cadr (cdar files)))
+;; (setq dirsize (- dirsize (car (cdar files))))
+;; (setq files (cdr files)))))
+
+;;;;;;;;;;;;;;;;;;;;;;,
+
+;; (defun dired-speedbar-buttons (dired-buffer)
+;; (when (and (boundp 'tumme-use-speedbar)
+;; tumme-use-speedbar)
+;; (let ((filename (with-current-buffer dired-buffer
+;; (dired-get-filename))))
+;; (when (and (not (string-equal filename (buffer-string)))
+;; (string-match (image-file-name-regexp) filename))
+;; (erase-buffer)
+;; (insert (propertize
+;; filename
+;; 'display
+;; (tumme-get-thumbnail-image filename)))))))
+
+;; (setq tumme-use-speedbar t)
(provide 'tumme)
diff --git a/lisp/type-break.el b/lisp/type-break.el
index 9c49a5b6672..beb7e6f3725 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -1,7 +1,7 @@
;;; type-break.el --- encourage rests from typing at appropriate intervals
;; Copyright (C) 1994, 1995, 1997, 2000, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Noah Friedman
;; Maintainer: Noah Friedman <friedman@splode.com>
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index cc08ab70836..24b49a983ad 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -1,7 +1,7 @@
;;; uniquify.el --- unique buffer names dependent on file name
;; Copyright (C) 1989, 1995, 1996, 1997, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Dick King <king@reasoning.com>
;; Maintainer: FSF
diff --git a/lisp/url/url-about.el b/lisp/url/url-about.el
index c305bb31f7a..d0dcc6dc905 100644
--- a/lisp/url/url-about.el
+++ b/lisp/url/url-about.el
@@ -1,6 +1,6 @@
;;; url-about.el --- Show internal URLs
-;; Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Keywords: comm, data, processes, hypermedia
diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index 317f91c9a13..5845b9d660e 100644
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -1,7 +1,7 @@
;;; url-auth.el --- Uniform Resource Locator authorization modules
;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Keywords: comm, data, processes, hypermedia
diff --git a/lisp/url/url-cid.el b/lisp/url/url-cid.el
index abaf8dd9e76..f6e569a4b2f 100644
--- a/lisp/url/url-cid.el
+++ b/lisp/url/url-cid.el
@@ -1,6 +1,6 @@
;;; url-cid.el --- Content-ID URL loader
-;; Copyright (C) 1998, 1999, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Keywords: comm, data, processes
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index 2a6b28b9b3c..449d8a510b5 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -1,6 +1,6 @@
;;; url-dav.el --- WebDAV support
-;; Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Bill Perry <wmperry@gnu.org>
;; Maintainer: Bill Perry <wmperry@gnu.org>
diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el
index b5ff892721e..28f86560942 100644
--- a/lisp/url/url-dired.el
+++ b/lisp/url/url-dired.el
@@ -1,7 +1,7 @@
;;; url-dired.el --- URL Dired minor mode
;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Keywords: comm, files
diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el
index ca4b8c72ab8..4f422e5cc5f 100644
--- a/lisp/url/url-expand.el
+++ b/lisp/url/url-expand.el
@@ -1,6 +1,6 @@
;;; url-expand.el --- expand-file-name for URLs
-;; Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Keywords: comm, data, processes
diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index 64766930c43..c9bbebdfddb 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -1,7 +1,7 @@
;;; url-file.el --- File retrieval code
;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Keywords: comm, data, processes
diff --git a/lisp/url/url-ftp.el b/lisp/url/url-ftp.el
index 633f4ed40d1..8ff43ff57a5 100644
--- a/lisp/url/url-ftp.el
+++ b/lisp/url/url-ftp.el
@@ -1,7 +1,7 @@
;;; url-ftp.el --- FTP wrapper
;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Keywords: comm, data, processes
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index 66ac39612fd..0cd2e6f9a50 100644
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -1,6 +1,6 @@
;;; url-gw.el --- Gateway munging for URL loading
-;; Copyright (C) 1997, 1998, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Bill Perry <wmperry@gnu.org>
;; Keywords: comm, data, processes
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 725f4bc1c8a..ac8f490f3e8 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1,6 +1,6 @@
;;; url-http.el --- HTTP retrieval routines
-;; Copyright (C) 1999, 2001, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Bill Perry <wmperry@gnu.org>
;; Keywords: comm, data, processes
diff --git a/lisp/url/url-https.el b/lisp/url/url-https.el
index 1777da0b6b9..a7440a76535 100644
--- a/lisp/url/url-https.el
+++ b/lisp/url/url-https.el
@@ -1,6 +1,6 @@
;;; url-https.el --- HTTP over SSL/TLS routines
-;; Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Keywords: comm, data, processes
diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el
index 8d1b9b3877b..a10db8e7445 100644
--- a/lisp/url/url-imap.el
+++ b/lisp/url/url-imap.el
@@ -1,6 +1,6 @@
;;; url-imap.el --- IMAP retrieval routines
-;; Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Simon Josefsson <jas@pdc.kth.se>
;; Keywords: comm, data, processes
diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el
index a06bdff5bfd..a876657d393 100644
--- a/lisp/url/url-irc.el
+++ b/lisp/url/url-irc.el
@@ -1,7 +1,7 @@
;;; url-irc.el --- IRC URL interface
;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Keywords: comm, data, processes
diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el
index ce7b7a9bab1..64471bae5b1 100644
--- a/lisp/url/url-ldap.el
+++ b/lisp/url/url-ldap.el
@@ -1,6 +1,6 @@
;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code
-;; Copyright (C) 1998, 1999, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Keywords: comm, data, processes
diff --git a/lisp/url/url-mailto.el b/lisp/url/url-mailto.el
index e9d5ff6fc15..d9d6e22cd05 100644
--- a/lisp/url/url-mailto.el
+++ b/lisp/url/url-mailto.el
@@ -1,7 +1,7 @@
;;; url-mail.el --- Mail Uniform Resource Locator retrieval code
;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Keywords: comm, data, processes
diff --git a/lisp/url/url-methods.el b/lisp/url/url-methods.el
index e39ffa1eb5b..6854d62af03 100644
--- a/lisp/url/url-methods.el
+++ b/lisp/url/url-methods.el
@@ -1,7 +1,7 @@
;;; url-methods.el --- Load URL schemes as needed
;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Keywords: comm, data, processes, hypermedia
diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el
index 5041a407420..f7f9bcd439c 100644
--- a/lisp/url/url-misc.el
+++ b/lisp/url/url-misc.el
@@ -1,7 +1,7 @@
;;; url-misc.el --- Misc Uniform Resource Locator retrieval code
;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Keywords: comm, data, processes
diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el
index e6822efc242..d6bc8417631 100644
--- a/lisp/url/url-nfs.el
+++ b/lisp/url/url-nfs.el
@@ -1,7 +1,7 @@
;;; url-nfs.el --- NFS URL interface
;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Keywords: comm, data, processes
diff --git a/lisp/url/url-ns.el b/lisp/url/url-ns.el
index 3edbf2c84d4..6b017b83ca9 100644
--- a/lisp/url/url-ns.el
+++ b/lisp/url/url-ns.el
@@ -1,6 +1,7 @@
;;; url-ns.el --- Various netscape-ish functions for proxy definitions
-;; Copyright (C) 1997, 1998, 1999, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Keywords: comm, data, processes, hypermedia
diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el
index bbe7f112cea..f84bf1a7ba2 100644
--- a/lisp/url/url-parse.el
+++ b/lisp/url/url-parse.el
@@ -1,7 +1,7 @@
;;; url-parse.el --- Uniform Resource Locator parser
;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Keywords: comm, data, processes
diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el
index c5d7753daf5..c3bfb1e0c4b 100644
--- a/lisp/url/url-proxy.el
+++ b/lisp/url/url-proxy.el
@@ -1,6 +1,6 @@
;;; url-proxy.el --- Proxy server support
-;; Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Keywords: comm, data, processes, hypermedia
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index 538eb3eca45..f33a58950fc 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -1,7 +1,7 @@
;;; url-util.el --- Miscellaneous helper routines for URL library
;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Bill Perry <wmperry@gnu.org>
;; Keywords: comm, data, processes
diff --git a/lisp/url/vc-dav.el b/lisp/url/vc-dav.el
index 926b90d5f31..8181788a05c 100644
--- a/lisp/url/vc-dav.el
+++ b/lisp/url/vc-dav.el
@@ -1,6 +1,6 @@
;;; vc-dav.el --- vc.el support for WebDAV
-;; Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Bill Perry <wmperry@gnu.org>
;; Maintainer: Bill Perry <wmperry@gnu.org>
diff --git a/lisp/userlock.el b/lisp/userlock.el
index 37ff1f13ba2..8a539daace8 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -1,7 +1,7 @@
;;; userlock.el --- handle file access contention between multiple users
;; Copyright (C) 1985, 1986, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el
index 79056c4c947..a0fc8af8345 100644
--- a/lisp/vc-arch.el
+++ b/lisp/vc-arch.el
@@ -1,6 +1,6 @@
;;; vc-arch.el --- VC backend for the Arch version-control system
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Stefan Monnier <monnier@gnu.org>
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 51d4174b40f..94fd3d0acd9 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -1,7 +1,7 @@
;;; vc-cvs.el --- non-resident support for CVS version-control
;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 1c1f0844303..13425391647 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -1,7 +1,7 @@
;;; vc-hooks.el --- resident support for version-control
;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el
index 4394dd510f5..4075ffc3649 100644
--- a/lisp/vc-mcvs.el
+++ b/lisp/vc-mcvs.el
@@ -1,6 +1,6 @@
;;; vc-mcvs.el --- VC backend for the Meta-CVS version-control system
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Stefan Monnier <monnier@gnu.org>
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el
index bfb66e8a5cf..00700c5a652 100644
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -1,7 +1,7 @@
;;; vc-rcs.el --- support for RCS version-control
;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el
index ef2c8b34ff1..ae349f57f32 100644
--- a/lisp/vc-sccs.el
+++ b/lisp/vc-sccs.el
@@ -1,7 +1,7 @@
;;; vc-sccs.el --- support for SCCS version-control
;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index b08765b89a3..82942f78358 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -1,6 +1,6 @@
;;; vc-svn.el --- non-resident support for Subversion version-control
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Stefan Monnier <monnier@gnu.org>
@@ -114,7 +114,7 @@ This is only meaningful if you don't use the implicit checkout model
(file-name-directory file)))
(with-temp-buffer
(cd (file-name-directory file))
- (let ((status
+ (let ((status
(condition-case nil
;; Ignore all errors.
(vc-svn-command t t file "status" "-v")
@@ -176,6 +176,23 @@ This is only meaningful if you don't use the implicit checkout model
((eq svn-state 'needs-patch) "(patch)")
((eq svn-state 'needs-merge) "(merge)"))))
+(defun vc-svn-previous-version (file rev)
+ (let ((newrev (1- (string-to-number rev))))
+ (when (< 0 newrev)
+ (number-to-string newrev))))
+
+(defun vc-svn-next-version (file rev)
+ (let ((newrev (1+ (string-to-number rev))))
+ ;; The "workfile version" is an uneasy conceptual fit under Subversion;
+ ;; we use it as the upper bound until a better idea comes along. If the
+ ;; workfile version W coincides with the tree's latest revision R, then
+ ;; this check prevents a "no such revision: R+1" error. Otherwise, it
+ ;; inhibits showing of W+1 through R, which could be considered anywhere
+ ;; from gracious to impolite.
+ (unless (< (string-to-number (vc-file-getprop file 'vc-workfile-version))
+ newrev)
+ (number-to-string newrev))))
+
;;;
;;; State-changing functions
diff --git a/lisp/vc.el b/lisp/vc.el
index 6fa31fa6502..b130aadb085 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1,7 +1,7 @@
;;; vc.el --- drive a version-control system from within Emacs
;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
-;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: FSF (see below for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
@@ -2800,9 +2800,6 @@ backend to NEW-BACKEND, and unregister FILE from the current backend.
(vc-mode-line new)
(set-buffer-modified-p nil)))))
-;; Only defined in very recent Emacsen
-(defvar small-temporary-file-directory nil)
-
;;;###autoload
(defun vc-update-change-log (&rest args)
"Find change log file and add entries from recent version control logs.
diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index 11ac28ae14a..a9d3fd68d74 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -1,7 +1,7 @@
;;; vcursor.el --- manipulate an alternative ("virtual") cursor
;; Copyright (C) 1994, 1996, 1998, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Peter Stephenson <pws@ibmth.df.unipi.it>
;; Maintainer: FSF
diff --git a/lisp/version.el b/lisp/version.el
index d83702da234..6ee89e3c200 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -1,7 +1,7 @@
;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*-
;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/view.el b/lisp/view.el
index ea7762cb7d1..457d5efc1c1 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -1,7 +1,7 @@
;;; view.el --- peruse file or buffer without editing
;; Copyright (C) 1985, 1989, 1994, 1995, 1997, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: K. Shane Hartman
;; Maintainer: Inge Frick <inge@nada.kth.se>
diff --git a/lisp/vms-patch.el b/lisp/vms-patch.el
index b591c0d56f2..eb365c3b580 100644
--- a/lisp/vms-patch.el
+++ b/lisp/vms-patch.el
@@ -1,7 +1,7 @@
;;; vms-patch.el --- override parts of files.el for VMS
;; Copyright (C) 1986, 1992, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: vms
diff --git a/lisp/vmsproc.el b/lisp/vmsproc.el
index aa96560ee48..649d3a22534 100644
--- a/lisp/vmsproc.el
+++ b/lisp/vmsproc.el
@@ -1,6 +1,7 @@
;;; vmsproc.el --- run asynchronous VMS subprocesses under Emacs
-;; Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Mukesh Prasad
;; Maintainer: FSF
diff --git a/lisp/vt-control.el b/lisp/vt-control.el
index 61d8ec32a7b..d5bc90044b1 100644
--- a/lisp/vt-control.el
+++ b/lisp/vt-control.el
@@ -1,7 +1,7 @@
;;; vt-control.el --- Common VTxxx control functions
;; Copyright (C) 1993, 1994, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Rob Riepel <riepel@networking.stanford.edu>
;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
diff --git a/lisp/vt100-led.el b/lisp/vt100-led.el
index 0238962082e..541f06ef471 100644
--- a/lisp/vt100-led.el
+++ b/lisp/vt100-led.el
@@ -1,6 +1,7 @@
;;; vt100-led.el --- functions for LED control on VT-100 terminals & clones
-;; Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Howard Gayle
;; Maintainer: FSF
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index ec3f4a79f71..7ee88d9ba22 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -1,7 +1,7 @@
;;; w32-fns.el --- Lisp routines for Windows NT
;; Copyright (C) 1994, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Geoff Voelker <voelker@cs.washington.edu>
;; Keywords: internal
diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index 1b4ea8ee60b..0918ed4c569 100644
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -1,6 +1,6 @@
;;; w32-vars.el --- MS-Windows specific user options
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Jason Rumney <jasonr@gnu.org>
;; Keywords: internal
diff --git a/lisp/wdired.el b/lisp/wdired.el
index 298d20a370d..2471ab909c6 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -1,6 +1,6 @@
;;; wdired.el --- Rename files editing their names in dired buffers
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
;; Filename: wdired.el
;; Author: Juan León Lahoz García <juanleon1@gmail.com>
@@ -30,10 +30,10 @@
;; renaming files.
;;
;; Have you ever wished to use C-x r t (string-rectangle), M-%
-;; (query-replace), M-c (capitalize-word), etc. to change the name of
+;; (query-replace), M-c (capitalize-word), etc... to change the name of
;; the files in a "dired" buffer? Now you can do this. All the power
;; of Emacs commands are available to renaming files!
-;;
+;;
;; This package provides a function that makes the filenames of a a
;; dired buffer editable, by changing the buffer mode (which inhibits
;; all of the commands of dired mode). Here you can edit the names of
@@ -102,20 +102,17 @@
;;; Code:
(defvar dired-backup-overwrite) ; Only in Emacs 20.x this is a custom var
-(eval-when-compile
- (set (make-local-variable 'byte-compile-dynamic) t))
-(eval-and-compile
- (require 'dired)
- (autoload 'dired-do-create-files-regexp "dired-aux")
- (autoload 'dired-call-process "dired-aux"))
+(require 'dired)
+(autoload 'dired-do-create-files-regexp "dired-aux")
+(autoload 'dired-call-process "dired-aux")
(defgroup wdired nil
"Mode to rename files by editing their names in dired buffers."
:group 'dired)
(defcustom wdired-use-interactive-rename nil
- "*If non-nil, WDired requires confirmation before actually renaming files.
+ "If non-nil, WDired requires confirmation before actually renaming files.
If nil, WDired doesn't require confirmation to change the file names,
and the variable `wdired-confirm-overwrite' controls whether it is ok
to overwrite files without asking."
@@ -123,14 +120,14 @@ to overwrite files without asking."
:group 'wdired)
(defcustom wdired-confirm-overwrite t
- "*If nil the renames can overwrite files without asking.
+ "If nil the renames can overwrite files without asking.
This variable has no effect at all if `wdired-use-interactive-rename'
is not nil."
:type 'boolean
:group 'wdired)
(defcustom wdired-use-dired-vertical-movement nil
- "*If t, the \"up\" and \"down\" movement works as in Dired mode.
+ "If t, the \"up\" and \"down\" movement works as in Dired mode.
That is, always move the point to the beginning of the filename at line.
If `sometimes, only move to the beginning of filename if the point is
@@ -144,14 +141,14 @@ If nil, \"up\" and \"down\" movement is done as in any other buffer."
:group 'wdired)
(defcustom wdired-allow-to-redirect-links t
- "*If non-nil, the target of the symbolic links are editable.
+ "If non-nil, the target of the symbolic links are editable.
In systems without symbolic links support, this variable has no effect
at all."
:type 'boolean
:group 'wdired)
(defcustom wdired-allow-to-change-permissions nil
- "*If non-nil, the permissions bits of the files are editable.
+ "If non-nil, the permissions bits of the files are editable.
If t, to change a single bit, put the cursor over it and press the
space bar, or left click over it. You can also hit the letter you want
@@ -197,13 +194,11 @@ program `dired-chmod-program', which must exist."
:help "Abort changes and return to dired mode"))
(define-key map [menu-bar wdired wdired-finish-edit]
'("Commit Changes" . wdired-finish-edit))
- ;; FIXME: Use the new remap trick.
- (substitute-key-definition 'upcase-word 'wdired-upcase-word
- map global-map)
- (substitute-key-definition 'capitalize-word 'wdired-capitalize-word
- map global-map)
- (substitute-key-definition 'downcase-word 'wdired-downcase-word
- map global-map)
+
+ (define-key map [remap upcase-word] 'wdired-upcase-word)
+ (define-key map [remap capitalize-word] 'wdired-capitalize-word)
+ (define-key map [remap downcase-word] 'wdired-downcase-word)
+
map))
(defvar wdired-mode-hook nil
@@ -314,21 +309,20 @@ relies on WDired buffer's properties. Optional arg NO-DIR with value
non-nil means don't include directory. Optional arg OLD with value
non-nil means return old filename."
;; FIXME: Use dired-get-filename's new properties.
- (let (beg end file)
- (save-excursion
- (setq end (progn (end-of-line) (point)))
- (beginning-of-line)
- (setq beg (next-single-property-change (point) 'old-name nil end))
- (unless (eq beg end)
- (if old
- (setq file (get-text-property beg 'old-name))
- (setq end (next-single-property-change (1+ beg) 'end-name))
- (setq file (buffer-substring-no-properties (+ 2 beg) end)))
- (and file (setq file (wdired-normalize-filename file))))
- (if (or no-dir old)
- file
- (and file (> (length file) 0)
- (concat (dired-current-directory) file))))))
+ (let* ((end (line-end-position))
+ (beg (next-single-property-change
+ (line-beginning-position) 'old-name nil end)))
+ (unless (eq beg end)
+ (let ((file
+ (if old
+ (get-text-property beg 'old-name)
+ (wdired-normalize-filename
+ (buffer-substring-no-properties
+ (+ 2 beg) (next-single-property-change (1+ beg) 'end-name))))))
+ (if (or no-dir old)
+ file
+ (and file (> (length file) 0)
+ (concat (dired-current-directory) file)))))))
(defun wdired-change-to-dired-mode ()
@@ -344,7 +338,7 @@ non-nil means return old filename."
(setq mode-name "Dired")
(dired-advertise)
(remove-hook 'kill-buffer-hook 'wdired-check-kill-buffer t)
- (setq revert-buffer-function 'dired-revert))
+ (set (make-local-variable 'revert-buffer-function) 'dired-revert))
(defun wdired-abort-changes ()
@@ -412,7 +406,7 @@ non-nil means return old filename."
(forward-line -1)))
(if changes
(revert-buffer) ;The "revert" is necessary to re-sort the buffer
- (let ((buffer-read-only nil))
+ (let ((inhibit-read-only t))
(remove-text-properties (point-min) (point-max)
'(old-name nil end-name nil old-link nil
end-link nil end-perm nil
@@ -425,9 +419,9 @@ non-nil means return old filename."
(set-buffer-modified-p nil)
(setq buffer-undo-list nil))
-;; Renames a file, searching it in a modified dired buffer, in order
+;; Rename a file, searching it in a modified dired buffer, in order
;; to be able to use `dired-do-create-files-regexp' and get its
-;; "benefits"
+;; "benefits".
(defun wdired-search-and-rename (filename-ori filename-new)
(save-excursion
(goto-char (point-max))
@@ -528,21 +522,18 @@ says how many lines to move; default is one line."
(defun wdired-get-previous-link (&optional old move)
"Return the next symlink target.
If OLD, return the old target. If MOVE, move point before it."
- (let (beg end target)
- (setq beg (previous-single-property-change (point) 'old-link nil))
- (if beg
- (progn
- (if old
- (setq target (get-text-property (1- beg) 'old-link))
- (setq end (next-single-property-change beg 'end-link))
- (setq target (buffer-substring-no-properties (1+ beg) end)))
- (if move (goto-char (1- beg)))))
- (and target (wdired-normalize-filename target))))
-
-
+ (let ((beg (previous-single-property-change (point) 'old-link nil)))
+ (when beg
+ (let ((target
+ (if old
+ (get-text-property (1- beg) 'old-link)
+ (buffer-substring-no-properties
+ (1+ beg) (next-single-property-change beg 'end-link)))))
+ (if move (goto-char (1- beg)))
+ (and target (wdired-normalize-filename target))))))
;; Perform the changes in the target of the changed links.
-(defun wdired-do-symlink-changes()
+(defun wdired-do-symlink-changes ()
(let ((changes nil)
(errors 0)
link-to-ori link-to-new link-from)
@@ -550,36 +541,34 @@ If OLD, return the old target. If MOVE, move point before it."
(while (setq link-to-new (wdired-get-previous-link))
(setq link-to-ori (wdired-get-previous-link t t))
(setq link-from (wdired-get-filename nil t))
- (if (not (equal link-to-new link-to-ori))
- (progn
- (setq changes t)
- (if (equal link-to-new "") ;empty filename!
- (setq link-to-new "/dev/null"))
- (condition-case err
- (progn
- (delete-file link-from)
- (make-symbolic-link
- (substitute-in-file-name link-to-new) link-from))
- (error
- (setq errors (1+ errors))
- (dired-log (concat "Link `" link-from "' to `"
- link-to-new "' failed:\n%s\n")
- err))))))
+ (unless (equal link-to-new link-to-ori)
+ (setq changes t)
+ (if (equal link-to-new "") ;empty filename!
+ (setq link-to-new "/dev/null"))
+ (condition-case err
+ (progn
+ (delete-file link-from)
+ (make-symbolic-link
+ (substitute-in-file-name link-to-new) link-from))
+ (error
+ (setq errors (1+ errors))
+ (dired-log (concat "Link `" link-from "' to `"
+ link-to-new "' failed:\n%s\n")
+ err)))))
(cons changes errors)))
;; Perform a "case command" skipping read-only words.
(defun wdired-xcase-word (command arg)
(if (< arg 0)
(funcall command arg)
- (progn
- (while (> arg 0)
- (condition-case err
- (progn
- (funcall command 1)
- (setq arg (1- arg)))
- (error
- (if (not (forward-word 1))
- (setq arg 0))))))))
+ (while (> arg 0)
+ (condition-case err
+ (progn
+ (funcall command 1)
+ (setq arg (1- arg)))
+ (error
+ (if (not (forward-word 1))
+ (setq arg 0)))))))
(defun wdired-downcase-word (arg)
"WDired version of `downcase-word'.
@@ -603,25 +592,25 @@ Like original function but it skips read-only words."
;; The following code deals with changing the access bits (or
;; permissions) of the files.
-(defvar wdired-perm-mode-map nil)
-(unless wdired-perm-mode-map
- (setq wdired-perm-mode-map (copy-keymap wdired-mode-map))
- (define-key wdired-perm-mode-map " " 'wdired-toggle-bit)
- (define-key wdired-perm-mode-map "r" 'wdired-set-bit)
- (define-key wdired-perm-mode-map "w" 'wdired-set-bit)
- (define-key wdired-perm-mode-map "x" 'wdired-set-bit)
- (define-key wdired-perm-mode-map "-" 'wdired-set-bit)
- (define-key wdired-perm-mode-map "S" 'wdired-set-bit)
- (define-key wdired-perm-mode-map "s" 'wdired-set-bit)
- (define-key wdired-perm-mode-map "T" 'wdired-set-bit)
- (define-key wdired-perm-mode-map "t" 'wdired-set-bit)
- (define-key wdired-perm-mode-map "s" 'wdired-set-bit)
- (define-key wdired-perm-mode-map "l" 'wdired-set-bit)
- (define-key wdired-perm-mode-map [down-mouse-1] 'wdired-mouse-toggle-bit))
+(defvar wdired-perm-mode-map
+ (let ((map (make-sparse-keymap)))
+ (define-key map " " 'wdired-toggle-bit)
+ (define-key map "r" 'wdired-set-bit)
+ (define-key map "w" 'wdired-set-bit)
+ (define-key map "x" 'wdired-set-bit)
+ (define-key map "-" 'wdired-set-bit)
+ (define-key map "S" 'wdired-set-bit)
+ (define-key map "s" 'wdired-set-bit)
+ (define-key map "T" 'wdired-set-bit)
+ (define-key map "t" 'wdired-set-bit)
+ (define-key map "s" 'wdired-set-bit)
+ (define-key map "l" 'wdired-set-bit)
+ (define-key map [down-mouse-1] 'wdired-mouse-toggle-bit)
+ map))
;; Put a local-map to the permission bits of the files, and store the
;; original name and permissions as a property
-(defun wdired-preprocess-perms()
+(defun wdired-preprocess-perms ()
(let ((inhibit-read-only t)
filename)
(set (make-local-variable 'wdired-col-perm) nil)
@@ -638,7 +627,7 @@ Like original function but it skips read-only words."
(put-text-property (match-beginning 0) (match-end 0)
'read-only nil)
(put-text-property (1+ (match-beginning 0)) (match-end 0)
- 'local-map wdired-perm-mode-map))
+ 'keymap wdired-perm-mode-map))
(put-text-property (match-end 0) (1+ (match-end 0)) 'end-perm t)
(put-text-property (match-beginning 0) (1+ (match-beginning 0))
'old-perm (match-string-no-properties 0))))
@@ -663,25 +652,24 @@ Like original function but it skips read-only words."
(let ((new-bit (char-to-string last-command-char))
(inhibit-read-only t)
(pos-prop (- (point) (- (current-column) wdired-col-perm))))
- (put-text-property 0 1 'local-map wdired-perm-mode-map new-bit)
+ (put-text-property 0 1 'keymap wdired-perm-mode-map new-bit)
(put-text-property 0 1 'read-only t new-bit)
(insert new-bit)
(delete-char 1)
(put-text-property pos-prop (1- pos-prop) 'perm-changed t))
(forward-char 1)))
-(defun wdired-toggle-bit()
+(defun wdired-toggle-bit ()
"Toggle the permission bit at point."
(interactive)
(let ((inhibit-read-only t)
- (new-bit "-")
+ (new-bit (cond
+ ((not (eq (char-after (point)) ?-)) "-")
+ ((= (% (- (current-column) wdired-col-perm) 3) 0) "r")
+ ((= (% (- (current-column) wdired-col-perm) 3) 1) "w")
+ (t "x")))
(pos-prop (- (point) (- (current-column) wdired-col-perm))))
- (if (eq (char-after (point)) ?-)
- (setq new-bit
- (if (= (% (- (current-column) wdired-col-perm) 3) 0) "r"
- (if (= (% (- (current-column) wdired-col-perm) 3) 1) "w"
- "x"))))
- (put-text-property 0 1 'local-map wdired-perm-mode-map new-bit)
+ (put-text-property 0 1 'keymap wdired-perm-mode-map new-bit)
(put-text-property 0 1 'read-only t new-bit)
(insert new-bit)
(delete-char 1)
@@ -697,23 +685,28 @@ Like original function but it skips read-only words."
;; Allowed chars for 2000 bit are Ssl in position 6
;; Allowed chars for 1000 bit are Tt in position 9
(defun wdired-perms-to-number (perms)
- (let ((nperm 0777))
- (if (= (elt perms 1) ?-) (setq nperm (- nperm 400)))
- (if (= (elt perms 2) ?-) (setq nperm (- nperm 200)))
- (let ((p-bit (elt perms 3)))
- (if (memq p-bit '(?- ?S)) (setq nperm (- nperm 100)))
- (if (memq p-bit '(?s ?S)) (setq nperm (+ nperm 4000))))
- (if (= (elt perms 4) ?-) (setq nperm (- nperm 40)))
- (if (= (elt perms 5) ?-) (setq nperm (- nperm 20)))
- (let ((p-bit (elt perms 6)))
- (if (memq p-bit '(?- ?S ?l)) (setq nperm (- nperm 10)))
- (if (memq p-bit '(?s ?S ?l)) (setq nperm (+ nperm 2000))))
- (if (= (elt perms 7) ?-) (setq nperm (- nperm 4)))
- (if (= (elt perms 8) ?-) (setq nperm (- nperm 2)))
- (let ((p-bit (elt perms 9)))
- (if (memq p-bit '(?- ?T)) (setq nperm (- nperm 1)))
- (if (memq p-bit '(?t ?T)) (setq nperm (+ nperm 1000))))
- nperm))
+ (+
+ (if (= (elt perms 1) ?-) 0 400)
+ (if (= (elt perms 2) ?-) 0 200)
+ (case (elt perms 3)
+ (?- 0)
+ (?S 4000)
+ (?s 4100)
+ (t 100))
+ (if (= (elt perms 4) ?-) 0 40)
+ (if (= (elt perms 5) ?-) 0 20)
+ (case (elt perms 6)
+ (?- 0)
+ (?S 2000)
+ (?s 2010)
+ (t 10))
+ (if (= (elt perms 7) ?-) 0 4)
+ (if (= (elt perms 8) ?-) 0 2)
+ (case (elt perms 9)
+ (?- 0)
+ (?T 1000)
+ (?t 1001)
+ (t 1))))
;; Perform the changes in the permissions of the files that have
;; changed.
@@ -729,28 +722,31 @@ Like original function but it skips read-only words."
(setq perms-ori (get-text-property (point) 'old-perm))
(setq perms-new (buffer-substring-no-properties
(point) (next-single-property-change (point) 'end-perm)))
- (if (not (equal perms-ori perms-new))
- (progn
- (setq changes t)
- (setq filename (wdired-get-filename nil t))
- (if (= (length perms-new) 10)
- (progn
- (setq perm-tmp
- (int-to-string (wdired-perms-to-number perms-new)))
- (if (not (equal 0 (dired-call-process dired-chmod-program
- t perm-tmp filename)))
- (progn
- (setq errors (1+ errors))
- (dired-log (concat dired-chmod-program " " perm-tmp
- " `" filename "' failed\n\n")))))
- (setq errors (1+ errors))
- (dired-log (concat "Cannot parse permission `" perms-new
- "' for file `" filename "'\n\n")))))
+ (unless (equal perms-ori perms-new)
+ (setq changes t)
+ (setq filename (wdired-get-filename nil t))
+ (if (= (length perms-new) 10)
+ (progn
+ (setq perm-tmp
+ (int-to-string (wdired-perms-to-number perms-new)))
+ (unless (equal 0 (dired-call-process dired-chmod-program
+ t perm-tmp filename))
+ (setq errors (1+ errors))
+ (dired-log (concat dired-chmod-program " " perm-tmp
+ " `" filename "' failed\n\n"))))
+ (setq errors (1+ errors))
+ (dired-log (concat "Cannot parse permission `" perms-new
+ "' for file `" filename "'\n\n"))))
(goto-char (next-single-property-change (1+ (point)) prop-wanted
nil (point-max))))
(cons changes errors)))
(provide 'wdired)
+;; Local Variables:
+;; coding: latin-1
+;; byte-compile-dynamic: t
+;; End:
+
;; arch-tag: bc00902e-526f-4305-bc7f-8862a559184f
;;; wdired.el ends here
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 8ef4d449e01..7f3cbd913ca 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -1,7 +1,7 @@
;;; whitespace.el --- warn about and clean bogus whitespaces in the file
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Rajesh Vaidheeswarran <rv@gnu.org>
;; Keywords: convenience
diff --git a/lisp/wid-browse.el b/lisp/wid-browse.el
index c8a34140f69..887f6553592 100644
--- a/lisp/wid-browse.el
+++ b/lisp/wid-browse.el
@@ -1,6 +1,7 @@
;;; wid-browse.el --- functions for browsing widgets
;;
-;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;;
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Keywords: extensions
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index f40f8929f18..8cd784ccf39 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -1,7 +1,7 @@
;;; wid-edit.el --- Functions for creating and using widgets -*-byte-compile-dynamic: t;-*-
;;
;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Maintainer: FSF
diff --git a/lisp/widget.el b/lisp/widget.el
index f99429b5910..6acfdfd48d8 100644
--- a/lisp/widget.el
+++ b/lisp/widget.el
@@ -1,7 +1,7 @@
;;; widget.el --- a library of user interface components
;;
;; Copyright (C) 1996, 1997, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Keywords: help, extensions, faces, hypermedia
diff --git a/lisp/windmove.el b/lisp/windmove.el
index b3aacf62d51..3b62437e280 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -1,7 +1,7 @@
;;; windmove.el --- directional window-selection routines
;;
;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Hovav Shacham (hovav@cs.stanford.edu)
;; Created: 17 October 1998
diff --git a/lisp/window.el b/lisp/window.el
index 917edaac57f..4d02390be16 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1,7 +1,7 @@
;;; window.el --- GNU Emacs window commands aside from those written in C
;; Copyright (C) 1985, 1989, 1992, 1993, 1994, 2000, 2001, 2002,
-;; 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/winner.el b/lisp/winner.el
index 0fbd0221e49..de0dcde6b06 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -1,11 +1,11 @@
;;; winner.el --- Restore old window configurations
;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation. Inc.
+;; 2005, 2006 Free Software Foundation. Inc.
;; Author: Ivar Rummelhoff <ivarru@math.uio.no>
;; Created: 27 Feb 1997
-;; Time-stamp: <2002-02-20 22:06:58 ivarru>
+;; Time-stamp: <2006-02-06 15:13:57 ttn>
;; Keywords: convenience frames
;; This file is part of GNU Emacs.
diff --git a/lisp/woman.el b/lisp/woman.el
index 5e8aff75e7f..22fcc0e3f62 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1,6 +1,7 @@
;;; woman.el --- browse UN*X manual pages `wo (without) man'
-;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: Francis J. Wright <F.J.Wright@qmul.ac.uk>
;; Maintainer: FSF
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 88a39ea679e..a5b6d409b87 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -1,6 +1,6 @@
;;; x-dnd.el --- drag and drop support for X.
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
;; Maintainer: FSF
diff --git a/lisp/xml.el b/lisp/xml.el
index c97c8052148..2ce3ec7b4f9 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -1,7 +1,7 @@
;;; xml.el --- XML parser
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Emmanuel Briot <briot@gnat.com>
;; Maintainer: Mark A. Hershberger <mah@everybody.org>
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index 7b069df2cbf..96990ee8ebe 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -1,7 +1,7 @@
;;; xt-mouse.el --- support the mouse when emacs run in an xterm
;; Copyright (C) 1994, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Keywords: mouse, terminals
diff --git a/lispintro/ChangeLog b/lispintro/ChangeLog
index 380dd66ec10..753aec71d80 100644
--- a/lispintro/ChangeLog
+++ b/lispintro/ChangeLog
@@ -58,8 +58,8 @@
;; coding: iso-2022-7bit
;; End:
- Copyright (C) 2001, 2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.
diff --git a/lispintro/Makefile.in b/lispintro/Makefile.in
index 0f912d61487..8d902f41a64 100644
--- a/lispintro/Makefile.in
+++ b/lispintro/Makefile.in
@@ -1,7 +1,7 @@
#### Makefile for the Emacs Lisp Introduction manual
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
diff --git a/lispintro/aclocal.m4 b/lispintro/aclocal.m4
index e446f25337a..2568263f93b 100644
--- a/lispintro/aclocal.m4
+++ b/lispintro/aclocal.m4
@@ -1,7 +1,7 @@
dnl aclocal.m4 generated automatically by aclocal 1.4-p4
dnl Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003,
-dnl 2004, 2005 Free Software Foundation, Inc.
+dnl 2004, 2005, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/lispintro/emacs-lisp-intro.texi b/lispintro/emacs-lisp-intro.texi
index e0338fb3cbc..b5719a4d214 100644
--- a/lispintro/emacs-lisp-intro.texi
+++ b/lispintro/emacs-lisp-intro.texi
@@ -183,7 +183,7 @@ people who are not programmers.
Edition @value{edition-number}, @value{update-date}
@sp 1
Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1997, 2001,
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@sp 1
@iftex
diff --git a/lispintro/makefile.w32-in b/lispintro/makefile.w32-in
index 09acbb699ab..c0b4b2a7b69 100644
--- a/lispintro/makefile.w32-in
+++ b/lispintro/makefile.w32-in
@@ -1,6 +1,6 @@
#### -*- Makefile -*- for the Emacs Lisp Introduction manual.
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 2700e2f2261..c1cc71f0d8b 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,27 @@
+2006-02-07 Richard M. Stallman <rms@gnu.org>
+
+ * commands.texi (Prefix Command Arguments): Minor cleanup.
+
+ * display.texi: "Graphical display", not window system.
+
+ * functions.texi (What Is a Function): Fix xref.
+
+ * keymaps.texi (Key Lookup): Clarify wrt commands vs other functions.
+ (Changing Key Bindings): Clarify when remapping is better than
+ substitute-key-definition.
+
+2006-02-02 Richard M. Stallman <rms@gnu.org>
+
+ * minibuf.texi (Basic Completion): Completion alists are risky.
+
+ * keymaps.texi (Active Keymaps): Clarifications.
+ (Searching Keymaps): New node.
+ (Keymaps): Update menu.
+
+ * frames.texi (Layout Parameters): Minor clarification.
+ (Drag and Drop): New node.
+ (Frames): Update menu.
+
2006-01-29 Chong Yidong <cyd@stupidchicken.com>
* display.texi (Other Display Specs, Image Descriptors): Image
@@ -21,6 +45,15 @@
* markers.texi (Overview of Markers): Count insertion type
as one of a marker's attributes.
+ * keymaps.texi (Controlling Active Maps): New node, split out of
+ Active Keymaps.
+ (Keymaps): Menu updated.
+ (Active Keymaps): Give pseudocode to explain how the active
+ maps are searched. current-active-maps and key-binding moved here.
+ (Functions for Key Lookup): current-active-maps and key-binding moved.
+ Clarifications.
+ (Searching the Keymaps): New subnode.
+
* elisp.texi (Top): Menu clarification.
* display.texi (Other Display Specs): Delete duplicate entry for
@@ -4213,7 +4246,7 @@ Tue Apr 11 12:23:28 1989 Robert J. Chassell (bob@rice-chex.ai.mit.edu)
;; End:
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.
diff --git a/lispref/Makefile.in b/lispref/Makefile.in
index 7d5ce02714d..e3d09fe2c6f 100644
--- a/lispref/Makefile.in
+++ b/lispref/Makefile.in
@@ -1,7 +1,7 @@
# Makefile for the GNU Emacs Lisp Reference Manual.
# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
-# 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
diff --git a/lispref/abbrevs.texi b/lispref/abbrevs.texi
index 38c5854adc6..52b3dfe1ad6 100644
--- a/lispref/abbrevs.texi
+++ b/lispref/abbrevs.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1999, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/abbrevs
@node Abbrevs, Processes, Syntax Tables, Top
diff --git a/lispref/advice.texi b/lispref/advice.texi
index 595649303ed..a21bce33448 100644
--- a/lispref/advice.texi
+++ b/lispref/advice.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1998, 1999, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/advising
@node Advising Functions, Debugging, Byte Compilation, Top
diff --git a/lispref/anti.texi b/lispref/anti.texi
index d6ae30f2106..6cebff7ece9 100644
--- a/lispref/anti.texi
+++ b/lispref/anti.texi
@@ -1,6 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c Copyright (C) 1999, 2002, 2003, 2004, 2005,
+@c 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@c This node must have no pointers.
diff --git a/lispref/backups.texi b/lispref/backups.texi
index 3b5363f64a3..39e3d908f7e 100644
--- a/lispref/backups.texi
+++ b/lispref/backups.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/backups
@node Backups and Auto-Saving, Buffers, Files, Top
diff --git a/lispref/buffers.texi b/lispref/buffers.texi
index 30031a10d6e..c0eb2ee6664 100644
--- a/lispref/buffers.texi
+++ b/lispref/buffers.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/buffers
@node Buffers, Windows, Backups and Auto-Saving, Top
diff --git a/lispref/commands.texi b/lispref/commands.texi
index 0d5e8b232ff..7a2cdb8edf9 100644
--- a/lispref/commands.texi
+++ b/lispref/commands.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/commands
@node Command Loop, Keymaps, Minibuffers, Top
@@ -2780,7 +2780,7 @@ command, so setting it has no effect on the prefix arguments for future
commands.
Normally, commands specify which representation to use for the prefix
-argument, either numeric or raw, in the @code{interactive} declaration.
+argument, either numeric or raw, in the @code{interactive} specification.
(@xref{Using Interactive}.) Alternatively, functions may look at the
value of the prefix argument directly in the variable
@code{current-prefix-arg}, but this is less clean.
diff --git a/lispref/compile.texi b/lispref/compile.texi
index 46afbad2b0b..1d8823a48c5 100644
--- a/lispref/compile.texi
+++ b/lispref/compile.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/compile
@node Byte Compilation, Advising Functions, Loading, Top
diff --git a/lispref/control.texi b/lispref/control.texi
index 8dae3d46484..b6df04810b7 100644
--- a/lispref/control.texi
+++ b/lispref/control.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/control
@node Control Structures, Variables, Evaluation, Top
diff --git a/lispref/customize.texi b/lispref/customize.texi
index d899e1be042..1ae3b5b5132 100644
--- a/lispref/customize.texi
+++ b/lispref/customize.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/customize
@node Customization, Loading, Macros, Top
diff --git a/lispref/debugging.texi b/lispref/debugging.texi
index 9c0fa9bc865..854e0ef1ca2 100644
--- a/lispref/debugging.texi
+++ b/lispref/debugging.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/debugging
@node Debugging, Read and Print, Advising Functions, Top
diff --git a/lispref/display.texi b/lispref/display.texi
index 0bb68bd4166..c6bc63d2ff9 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/display
@node Display, System Interface, Processes, Top
@@ -126,7 +126,7 @@ the rightmost column indicates a line that ``wraps'' onto the next line,
which is also called @dfn{continuing} the line. (The display table can
specify alternative indicators; see @ref{Display Tables}.)
- On a window system display, the @samp{$} and @samp{\} indicators are
+ On a graphical display, the @samp{$} and @samp{\} indicators are
replaced with arrow images displayed in the window fringes
(@pxref{Fringes}).
@@ -1651,13 +1651,13 @@ parts of Emacs text.
However, if the variable @code{default-line-spacing} is
non-@code{nil}, it overrides the frame's @code{line-spacing}
parameter. An integer value specifies the number of pixels put below
-lines on window systems. A floating point number specifies the
+lines on graphical displays. A floating point number specifies the
spacing relative to the frame's default line height.
@vindex line-spacing
You can specify the line spacing for all lines in a buffer via the
buffer-local @code{line-spacing} variable. An integer value specifies
-the number of pixels put below lines on window systems. A floating
+the number of pixels put below lines on graphical displays. A floating
point number specifies the spacing relative to the default frame line
height. This overrides line spacings specified for the frame.
@@ -4603,9 +4603,9 @@ command @code{tab-to-tab-stop}. @xref{Indent Tabs}.
@tindex indicate-empty-lines
@cindex fringes, and empty line indication
When this is non-@code{nil}, Emacs displays a special glyph in the
-fringe of each empty line at the end of the buffer, on terminals that
-support it (window systems). @xref{Fringes}.
-This variable is automatically buffer-local in every buffer.
+fringe of each empty line at the end of the buffer, on graphical
+displays. @xref{Fringes}. This variable is automatically
+buffer-local in every buffer.
@end defopt
@defvar indicate-buffer-boundaries
@@ -4854,7 +4854,7 @@ on character terminals. On graphical displays, all glyphs are simple.
@item @var{string}
Send the characters in @var{string} to the terminal to output
this glyph. This alternative is available on character terminals,
-but not under a window system.
+but not on graphical displays.
@item @var{integer}
Define this glyph code as an alias for glyph code @var{integer}. You
@@ -4896,7 +4896,7 @@ This is a synonym for @code{ding}.
@defopt visible-bell
This variable determines whether Emacs should flash the screen to
represent a bell. Non-@code{nil} means yes, @code{nil} means no. This
-is effective on a window system, and on a character-only terminal
+is effective on graphical displays, and on text-only terminals
provided the terminal's Termcap entry defines the visible bell
capability (@samp{vb}).
@end defopt
diff --git a/lispref/edebug.texi b/lispref/edebug.texi
index a32c5e9189c..4257f77f384 100644
--- a/lispref/edebug.texi
+++ b/lispref/edebug.texi
@@ -1,7 +1,7 @@
@comment -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1992, 1993, 1994, 1998, 1999, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@c This file can also be used by an independent Edebug User
diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index 1a300c3dd9a..4dd1c854a83 100644
--- a/lispref/elisp.texi
+++ b/lispref/elisp.texi
@@ -30,8 +30,8 @@
This is edition @value{VERSION} of the GNU Emacs Lisp
Reference Manual, corresponding to Emacs version @value{EMACSVER}.
-Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999,
- 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/lispref/errors.texi b/lispref/errors.texi
index 9906a691eea..092a2662e5b 100644
--- a/lispref/errors.texi
+++ b/lispref/errors.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/errors
@node Standard Errors, Standard Buffer-Local Variables, GNU Emacs Internals, Top
diff --git a/lispref/eval.texi b/lispref/eval.texi
index 36bc941f26b..d898e08850b 100644
--- a/lispref/eval.texi
+++ b/lispref/eval.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/eval
@node Evaluation, Control Structures, Symbols, Top
diff --git a/lispref/files.texi b/lispref/files.texi
index a681756632b..36cdfa5d2bd 100644
--- a/lispref/files.texi
+++ b/lispref/files.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/files
@node Files, Backups and Auto-Saving, Documentation, Top
diff --git a/lispref/frames.texi b/lispref/frames.texi
index 8212e9325f9..2c2b8e10641 100644
--- a/lispref/frames.texi
+++ b/lispref/frames.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/frames
@node Frames, Positions, Windows, Top
diff --git a/lispref/functions.texi b/lispref/functions.texi
index 17a96734b10..9c7381b80d7 100644
--- a/lispref/functions.texi
+++ b/lispref/functions.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/functions
@node Functions, Macros, Variables, Top
@@ -99,7 +99,7 @@ Keyboard macros (strings and vectors) are commands also, even though
they are not functions. A symbol is a command if its function
definition is a command; such symbols can be invoked with @kbd{M-x}.
The symbol is a function as well if the definition is a function.
-@xref{Command Overview}.
+@xref{Interactive Call}.
@item keystroke command
@cindex keystroke command
diff --git a/lispref/hash.texi b/lispref/hash.texi
index 7b4c8c67711..66420476d42 100644
--- a/lispref/hash.texi
+++ b/lispref/hash.texi
@@ -1,6 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c Copyright (C) 1999, 2002, 2003, 2004, 2005,
+@c 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/hash
@node Hash Tables, Symbols, Sequences Arrays Vectors, Top
diff --git a/lispref/help.texi b/lispref/help.texi
index 664e8c69c18..0fe996dfd7c 100644
--- a/lispref/help.texi
+++ b/lispref/help.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/help
@node Documentation, Files, Modes, Top
diff --git a/lispref/hooks.texi b/lispref/hooks.texi
index ce671a8499a..2ba06a2b19a 100644
--- a/lispref/hooks.texi
+++ b/lispref/hooks.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1998, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/hooks
@node Standard Hooks, Index, Standard Keymaps, Top
diff --git a/lispref/internals.texi b/lispref/internals.texi
index 8c367f63ebd..ee6423ef37b 100644
--- a/lispref/internals.texi
+++ b/lispref/internals.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1998, 1999, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/internals
@node GNU Emacs Internals, Standard Errors, Tips, Top
diff --git a/lispref/intro.texi b/lispref/intro.texi
index 8c3501c823b..b2294be4c2d 100644
--- a/lispref/intro.texi
+++ b/lispref/intro.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/intro
diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi
index 5a732af4ebb..b7bc34ece84 100644
--- a/lispref/keymaps.texi
+++ b/lispref/keymaps.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2000, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/keymaps
@node Keymaps, Modes, Command Loop, Top
@@ -933,8 +933,10 @@ is a keymap, and is treated as a keymap (see above).
@item
@cindex @code{lambda} in keymap
If the @sc{car} of @var{list} is @code{lambda}, then the list is a
-lambda expression. This is presumed to be a command, and is treated as
-such (see above).
+lambda expression. This is presumed to be a function, and is treated
+as such (see above). In order to execute properly as a key binding,
+this function must be a command---it must have an @code{interactive}
+specification. @xref{Defining Commands}.
@item
If the @sc{car} of @var{list} is a keymap and the @sc{cdr} is an event
@@ -1282,9 +1284,9 @@ default global map.
The function @code{substitute-key-definition} scans a keymap for
keys that have a certain binding and rebinds them with a different
-binding. Another feature you can use for similar effects, but which
-is often cleaner, is to add a binding that remaps a command
-(@pxref{Remapping Commands}).
+binding. Another feature which is cleaner and can often produce the
+same results to remap one command into another (@pxref{Remapping
+Commands}).
@defun substitute-key-definition olddef newdef keymap &optional oldmap
@cindex replace bindings
diff --git a/lispref/lists.texi b/lispref/lists.texi
index ef9220d2411..5cefce9da7c 100644
--- a/lispref/lists.texi
+++ b/lispref/lists.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/lists
@node Lists, Sequences Arrays Vectors, Strings and Characters, Top
diff --git a/lispref/loading.texi b/lispref/loading.texi
index 260b96f6ccf..b78fb92ad82 100644
--- a/lispref/loading.texi
+++ b/lispref/loading.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/loading
@node Loading, Byte Compilation, Customization, Top
diff --git a/lispref/locals.texi b/lispref/locals.texi
index e24117270a5..10a41bf5cca 100644
--- a/lispref/locals.texi
+++ b/lispref/locals.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/locals
@node Standard Buffer-Local Variables, Standard Keymaps, Standard Errors, Top
diff --git a/lispref/macros.texi b/lispref/macros.texi
index dc822352ab3..01805f6655b 100644
--- a/lispref/macros.texi
+++ b/lispref/macros.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/macros
@node Macros, Customization, Functions, Top
diff --git a/lispref/makefile.w32-in b/lispref/makefile.w32-in
index 038c05db7c3..0b4c080b956 100644
--- a/lispref/makefile.w32-in
+++ b/lispref/makefile.w32-in
@@ -1,6 +1,6 @@
# -*- Makefile -*- for the GNU Emacs Lisp Reference Manual.
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
diff --git a/lispref/maps.texi b/lispref/maps.texi
index ef5984cc32f..9ee1b52fa59 100644
--- a/lispref/maps.texi
+++ b/lispref/maps.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/maps
@node Standard Keymaps, Standard Hooks, Standard Buffer-Local Variables, Top
diff --git a/lispref/markers.texi b/lispref/markers.texi
index aa26a0aa030..1ad54c63e91 100644
--- a/lispref/markers.texi
+++ b/lispref/markers.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/markers
@node Markers, Text, Positions, Top
diff --git a/lispref/minibuf.texi b/lispref/minibuf.texi
index c0990bae3ee..65887c4c172 100644
--- a/lispref/minibuf.texi
+++ b/lispref/minibuf.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002,
-@c 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/minibuf
@node Minibuffers, Command Loop, Read and Print, Top
diff --git a/lispref/modes.texi b/lispref/modes.texi
index ed6f0bc7f82..0c7d249fb87 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002,
-@c 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/modes
@node Modes, Documentation, Keymaps, Top
diff --git a/lispref/nonascii.texi b/lispref/nonascii.texi
index 6e41a462934..b09a3fc78a3 100644
--- a/lispref/nonascii.texi
+++ b/lispref/nonascii.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1998, 1999, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/characters
@node Non-ASCII Characters, Searching and Matching, Text, Top
diff --git a/lispref/numbers.texi b/lispref/numbers.texi
index db28a2850a6..3cbc1a7ae16 100644
--- a/lispref/numbers.texi
+++ b/lispref/numbers.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/numbers
@node Numbers, Strings and Characters, Lisp Data Types, Top
diff --git a/lispref/objects.texi b/lispref/objects.texi
index f8a093656b9..93848cffe09 100644
--- a/lispref/objects.texi
+++ b/lispref/objects.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/objects
@node Lisp Data Types, Numbers, Introduction, Top
diff --git a/lispref/os.texi b/lispref/os.texi
index 3761620c7d0..475a8bd8687 100644
--- a/lispref/os.texi
+++ b/lispref/os.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/os
@node System Interface, Antinews, Display, Top
diff --git a/lispref/positions.texi b/lispref/positions.texi
index 83ac383ddae..f56e1a6a389 100644
--- a/lispref/positions.texi
+++ b/lispref/positions.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/positions
@node Positions, Markers, Frames, Top
diff --git a/lispref/processes.texi b/lispref/processes.texi
index 14fd069dc01..4cbc4b72e33 100644
--- a/lispref/processes.texi
+++ b/lispref/processes.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/processes
@node Processes, Display, Abbrevs, Top
diff --git a/lispref/searching.texi b/lispref/searching.texi
index 84de54984ae..7c10ed6881b 100644
--- a/lispref/searching.texi
+++ b/lispref/searching.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/searching
@node Searching and Matching, Syntax Tables, Non-ASCII Characters, Top
diff --git a/lispref/sequences.texi b/lispref/sequences.texi
index eade483bda3..9efd38e3abe 100644
--- a/lispref/sequences.texi
+++ b/lispref/sequences.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/sequences
@node Sequences Arrays Vectors, Hash Tables, Lists, Top
diff --git a/lispref/streams.texi b/lispref/streams.texi
index cb8a7fcf297..34dbc584e2c 100644
--- a/lispref/streams.texi
+++ b/lispref/streams.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/streams
@node Read and Print, Minibuffers, Debugging, Top
diff --git a/lispref/strings.texi b/lispref/strings.texi
index 18c516041d6..e722b74e54c 100644
--- a/lispref/strings.texi
+++ b/lispref/strings.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/strings
@node Strings and Characters, Lists, Numbers, Top
diff --git a/lispref/symbols.texi b/lispref/symbols.texi
index 9e4b482cfa0..f95fca9740b 100644
--- a/lispref/symbols.texi
+++ b/lispref/symbols.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/symbols
@node Symbols, Evaluation, Hash Tables, Top
diff --git a/lispref/syntax.texi b/lispref/syntax.texi
index 7de2cee2f81..7297f6b9104 100644
--- a/lispref/syntax.texi
+++ b/lispref/syntax.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/syntax
@node Syntax Tables, Abbrevs, Searching and Matching, Top
diff --git a/lispref/text.texi b/lispref/text.texi
index 8e269cbbd56..7b384033c11 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/text
@node Text, Non-ASCII Characters, Markers, Top
diff --git a/lispref/tindex.pl b/lispref/tindex.pl
index 68931bc9ed6..6d9be40dfcb 100755
--- a/lispref/tindex.pl
+++ b/lispref/tindex.pl
@@ -1,6 +1,7 @@
#! /usr/bin/perl
-# Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2002, 2003, 2004, 2005,
+# 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/lispref/tips.texi b/lispref/tips.texi
index 165c4a9f084..07689b4c9a4 100644
--- a/lispref/tips.texi
+++ b/lispref/tips.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/tips
@node Tips, GNU Emacs Internals, GPL, Top
diff --git a/lispref/variables.texi b/lispref/variables.texi
index 1b527864d2c..32a6e9b7873 100644
--- a/lispref/variables.texi
+++ b/lispref/variables.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2002,
-@c 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/variables
@node Variables, Functions, Control Structures, Top
diff --git a/lispref/vol1.texi b/lispref/vol1.texi
index e0a1f02df8d..b6b071bf444 100644
--- a/lispref/vol1.texi
+++ b/lispref/vol1.texi
@@ -3,7 +3,7 @@ It is still present in CVS in case we ever want to use some of it again.
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
\input texinfo @c -*-texinfo-*-
diff --git a/lispref/vol2.texi b/lispref/vol2.texi
index 40ec8c4904f..e5da029db1a 100644
--- a/lispref/vol2.texi
+++ b/lispref/vol2.texi
@@ -3,7 +3,7 @@ It is still present in CVS in case we ever want to use some of it again.
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
diff --git a/lispref/windows.texi b/lispref/windows.texi
index 15517c1128b..fe1d6212df0 100644
--- a/lispref/windows.texi
+++ b/lispref/windows.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/windows
@node Windows, Frames, Buffers, Top
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index de7c73e0d05..0bd79a323c7 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1298,7 +1298,7 @@
;; coding: iso-2022-7bit-unix
;; End:
- Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002
+ Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2006
Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.
diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c
index 40091e7b69b..4799b1dbd9d 100644
--- a/lwlib/lwlib-Xlw.c
+++ b/lwlib/lwlib-Xlw.c
@@ -1,7 +1,7 @@
/* The lwlib interface to "xlwmenu" menus.
Copyright (C) 1992 Lucid, Inc.
Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of the Lucid Widget Library.
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index 32abbca7601..78ad165ef0e 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -1,6 +1,6 @@
/* The lwlib interface to Motif widgets.
Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 Free Software Foundation, Inc.
Copyright (C) 1992 Lucid, Inc.
This file is part of the Lucid Widget Library.
diff --git a/lwlib/lwlib-Xm.h b/lwlib/lwlib-Xm.h
index d6069fad2d8..74eea3d4d79 100644
--- a/lwlib/lwlib-Xm.h
+++ b/lwlib/lwlib-Xm.h
@@ -1,6 +1,6 @@
/* The lwlib interface to Motif widgets.
Copyright (C) 1994, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Copyright (C) 1992 Lucid, Inc.
This file is part of the Lucid Widget Library.
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 1f6cad8d3f2..0a5d82c4671 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -1,6 +1,6 @@
/* Implements a lightweight menubar widget.
Copyright (C) 1992 Lucid, Inc.
- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of the Lucid Widget Library.
diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h
index 93703358ccb..fa5dc887330 100644
--- a/lwlib/xlwmenu.h
+++ b/lwlib/xlwmenu.h
@@ -1,5 +1,6 @@
/* Interface of a lightweight menubar widget.
- Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of the Lucid Widget Library.
diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index ca2b7dc6a1a..ce170d7bfe4 100644
--- a/lwlib/xlwmenuP.h
+++ b/lwlib/xlwmenuP.h
@@ -1,6 +1,6 @@
/* Internals of a lightweight menubar widget.
Copyright (C) 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of the Lucid Widget Library.
diff --git a/m4/getopt.m4 b/m4/getopt.m4
index dbcc44d9095..a0c6ea38cf5 100644
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -1,5 +1,5 @@
# getopt.m4 serial 10
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2002,2003,2004,2005,2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/mac/ChangeLog b/mac/ChangeLog
index 5f538eb09e0..eb58386a167 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -805,7 +805,8 @@
;; coding: iso-2022-7bit-unix
;; End:
- Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.
diff --git a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
index 8aa3d82c261..db6b39880e2 100644
--- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
+++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
@@ -2,4 +2,4 @@
CFBundleName = "Emacs";
CFBundleShortVersionString = "22.0.50";
-CFBundleGetInfoString = "22.0.50, Copyright (C) 2005 Free Software Foundation, Inc.";
+CFBundleGetInfoString = "22.0.50, Copyright (C) 2006 Free Software Foundation, Inc.";
diff --git a/mac/INSTALL b/mac/INSTALL
index 9162ae6f08b..e887537354b 100644
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -1,6 +1,7 @@
* BUILDING EMACS ON MAC OS Classic AND MAC OS X -*- outline -*-
-Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim
copies of this document as received, in any medium, provided that
diff --git a/mac/README b/mac/README
index e63086050f4..63ff2e76dd1 100644
--- a/mac/README
+++ b/mac/README
@@ -1,6 +1,7 @@
Emacs for Mac OS Classic and Mac OS X
-Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim
copies of this document as received, in any medium, provided that
diff --git a/mac/cw6-mcp.xml b/mac/cw6-mcp.xml
index 54bfc4be7e9..c05a57d0b53 100644
--- a/mac/cw6-mcp.xml
+++ b/mac/cw6-mcp.xml
@@ -1,5 +1,6 @@
<!--
-Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/alloca.h b/mac/inc/alloca.h
index 216af944738..851089b3dac 100644
--- a/mac/inc/alloca.h
+++ b/mac/inc/alloca.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/config.h b/mac/inc/config.h
index 24fe3b30c98..cdb7fd5b0e8 100644
--- a/mac/inc/config.h
+++ b/mac/inc/config.h
@@ -2,7 +2,7 @@
/* GNU Emacs site configuration template file. -*- C -*-
Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/defs-cw6.h b/mac/inc/defs-cw6.h
index 5073d8059a7..d4e309ebea7 100644
--- a/mac/inc/defs-cw6.h
+++ b/mac/inc/defs-cw6.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/dirent.h b/mac/inc/dirent.h
index 17bbb60b8f4..da7b30085dc 100644
--- a/mac/inc/dirent.h
+++ b/mac/inc/dirent.h
@@ -1,6 +1,6 @@
/* Replacement dirent.h file for building GNU Emacs on the Macintosh.
Copyright (C) 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/epaths.h b/mac/inc/epaths.h
index c65f8589c6e..8d0539404f4 100644
--- a/mac/inc/epaths.h
+++ b/mac/inc/epaths.h
@@ -2,7 +2,7 @@
/* Handcrafted epaths.h file for building GNU Emacs on the Macintosh.
Copyright (C) 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/grp.h b/mac/inc/grp.h
index 058bc657016..90bb12a4078 100755
--- a/mac/inc/grp.h
+++ b/mac/inc/grp.h
@@ -1,5 +1,5 @@
/* Replacement grp.h file for building GNU Emacs on the Macintosh.
- Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/m-mac.h b/mac/inc/m-mac.h
index 5e1f7db8112..a9a3fc3cd17 100644
--- a/mac/inc/m-mac.h
+++ b/mac/inc/m-mac.h
@@ -1,6 +1,6 @@
/* Handcrafted m-mac.h file for building GNU Emacs on the Macintosh.
Copyright (C) 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/pwd.h b/mac/inc/pwd.h
index df452f30d97..17fcc8ff6ba 100644
--- a/mac/inc/pwd.h
+++ b/mac/inc/pwd.h
@@ -1,6 +1,6 @@
/* Replacement pwd.h file for building GNU Emacs on the Macintosh.
Copyright (C) 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/s-mac.h b/mac/inc/s-mac.h
index d0f00ed6c13..de1f573438a 100644
--- a/mac/inc/s-mac.h
+++ b/mac/inc/s-mac.h
@@ -1,6 +1,6 @@
/* Handcrafted s-mac.h file for building GNU Emacs on Mac OS 9.
Copyright (C) 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/sys/file.h b/mac/inc/sys/file.h
index f2686a5cc13..508a89869a6 100644
--- a/mac/inc/sys/file.h
+++ b/mac/inc/sys/file.h
@@ -1,6 +1,6 @@
/* Replacement sys/file.h file for building GNU Emacs on the Macintosh.
Copyright (C) 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/sys/ioctl.h b/mac/inc/sys/ioctl.h
index bdf68b97357..22335db7c38 100644
--- a/mac/inc/sys/ioctl.h
+++ b/mac/inc/sys/ioctl.h
@@ -1,6 +1,6 @@
/* Replacement sys/ioctl.h file for building GNU Emacs on the Macintosh.
Copyright (C) 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/sys/param.h b/mac/inc/sys/param.h
index 8849489f7c6..28f8f1e9d2c 100644
--- a/mac/inc/sys/param.h
+++ b/mac/inc/sys/param.h
@@ -1,6 +1,6 @@
/* Replacement sys/param.h file for building GNU Emacs on the Macintosh.
Copyright (C) 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/sys/stat.h b/mac/inc/sys/stat.h
index 2b8f9bfce79..dd99df5fda2 100644
--- a/mac/inc/sys/stat.h
+++ b/mac/inc/sys/stat.h
@@ -1,6 +1,6 @@
/* Replacement sys/stat.h file for building GNU Emacs on the Macintosh.
Copyright (C) 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/sys/time.h b/mac/inc/sys/time.h
index b28a87e7d32..e584cb89ff7 100644
--- a/mac/inc/sys/time.h
+++ b/mac/inc/sys/time.h
@@ -1,5 +1,6 @@
/* Replacement sys/time.h file for building GNU Emacs on the Macintosh.
- Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/sys/types.h b/mac/inc/sys/types.h
index bdc4f6c5be2..34f3cbca87f 100644
--- a/mac/inc/sys/types.h
+++ b/mac/inc/sys/types.h
@@ -1,6 +1,6 @@
/* Replacement sys/types.h file for building GNU Emacs on the Macintosh.
Copyright (C) 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/termio.h b/mac/inc/termio.h
index 596d6342177..fe1dd8ed945 100644
--- a/mac/inc/termio.h
+++ b/mac/inc/termio.h
@@ -1,6 +1,6 @@
/* Replacement termio.h file for building GNU Emacs on the Macintosh.
Copyright (C) 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/utime.h b/mac/inc/utime.h
index 43281d40bfa..3a7456ee78e 100644
--- a/mac/inc/utime.h
+++ b/mac/inc/utime.h
@@ -1,5 +1,6 @@
/* Replacement utime.h file for building GNU Emacs on the Macintosh.
- Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/inc/utsname.h b/mac/inc/utsname.h
index fc120b014d7..e0c32e1c1ae 100644
--- a/mac/inc/utsname.h
+++ b/mac/inc/utsname.h
@@ -1,5 +1,6 @@
/* Replacement utsname.h file for building GNU Emacs on the Macintosh.
- Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/make-package b/mac/make-package
index 85c6646c5da..26663f8eccf 100755
--- a/mac/make-package
+++ b/mac/make-package
@@ -18,7 +18,7 @@
#### files inside /usr. This will replace the default version of
#### emacs included with Mac OS X.
-# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/mac/makefile.MPW b/mac/makefile.MPW
index 45ef6103daf..35818f5e91b 100644
--- a/mac/makefile.MPW
+++ b/mac/makefile.MPW
@@ -1,6 +1,6 @@
# Make file for building GNU Emacs on the Macintosh.
# Copyright (C) 1999, 2000, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# Author: Andrew Choi <akochoi@users.sourceforge.net>
#
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index 4984704f9fc..138afca2ead 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -1,6 +1,6 @@
/* Resource definitions for GNU Emacs on the Macintosh.
Copyright (C) 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -222,7 +222,7 @@ resource 'vers' (1) {
50, /* Non-final release # */
0, /* Region code */
"22.0.50", /* Short version number */
- "22.0.50, Copyright \0xa9 2005 "
+ "22.0.50, Copyright \0xa9 2006 "
"Free Software Foundation, Inc." /* Long version number */
};
diff --git a/mac/src/EmacsMPW.r b/mac/src/EmacsMPW.r
index 16866de9574..113524e6d3f 100644
--- a/mac/src/EmacsMPW.r
+++ b/mac/src/EmacsMPW.r
@@ -2,7 +2,7 @@
under MPW.
Copyright (C) 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/mac/src/chdir.c b/mac/src/chdir.c
index 61d0b63a78e..324fdd801b2 100644
--- a/mac/src/chdir.c
+++ b/mac/src/chdir.c
@@ -1,6 +1,6 @@
/* Implementation of chdir on the Mac for use with make-docfile.
Copyright (C) 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/man/ChangeLog b/man/ChangeLog
index d4923434daf..edd9592722c 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,123 @@
+2006-02-07 Luc Teirlinck <teirllm@auburn.edu>
+
+ * mule.texi (International):
+ * programs.texi (Basic Indent): Fix typos.
+
+ * faq.texi (Meta key does not work in xterm)
+ (Emacs does not display 8-bit characters)
+ (Inputting eight-bit characters):
+ * custom.texi (Minor Modes):
+ * display.texi (Text Display):
+ * commands.texi (Text Characters): Update xrefs.
+
+2006-02-07 Richard M. Stallman <rms@gnu.org>
+
+ * emacs.texi (Top): Update subnode menu.
+ Update info on old Emacs papers.
+ (Intro): "Graphical display", not window system.
+
+ * xresources.texi (GTK styles): Minor clarifications.
+
+ * trouble.texi: "Graphical display", not window system.
+ (Stuck Recursive): Minor clarification.
+
+ * text.texi: Minor clarifications.
+ (Sentences): Explain why two-space convention is better.
+ Explain sentence-end-without-period here.
+ (Fill Commands): Not here.
+ (Refill): Node moved down.
+ (Filling): Update menu.
+ (Table Creation, Cell Justification, Column Commands): Clarify.
+
+ * sending.texi: Minor clarifications.
+
+ * search.texi (Regexp Backslash): Clarification.
+
+ * rmail.texi: Minor cleanups.
+ (Rmail): Delete digression about `rmail-mode'.
+ (Rmail Inbox): Delete false advice wrt rmail-primary-inbox-list.
+ (Rmail Files): Mention C-u M-x rmail.
+ (Rmail Reply): Mention References.
+ (Rmail Display): Mention rmail-nonignored-headers.
+
+ * programs.texi: Minor cleanups.
+ (Comment Commands): Mention momentary Transient Mark mode.
+ (Matching): Be more specific about customizing show-paren-mode.
+ (Info Lookup): Don't list the modes that support C-h S.
+ Just say what it does in an unsupported mode.
+ (Man Page): Delete excessive info on customizing woman.
+ (Motion in C): Don't mention c-for/backward-into-nomenclature.
+
+ * abbrevs.texi: Minor clarifications.
+ (Dabbrev Customization): Talk about "dynamic abbrev expansion",
+ not "dynamic abbrevs" as if they were a kind of abbrev.
+
+ * picture.texi (Picture): Minor cleanup.
+
+ * mule.texi (Communication Coding): Say "other applications".
+ (Fontsets): Not specific to X. Add xref to X Resources.
+ (Unibyte Mode): Renamed from Single-Byte Character Support.
+ "Graphical display", not window system.
+ (International): Update menu.
+
+ * maintaining.texi (Format of ChangeLog):
+ New node, split out from ChangeLog.
+ (ChangeLog): Clarifications in the remaining text.
+ (Create Tags Table, Etags Regexps, Select Tags Table): Cleanups.
+ (Find Tag): Add @w.
+ (Tags Search): Explain tag table order here. Simplify grep ref.
+ (List Tags): tags-tag-face is a variable, not a face.
+ (Emerge): Cleanups.
+
+ * kmacro.texi (Keyboard Macro Counter): Rewrite for clarity.
+ (Keyboard Macros): Avoid "the user".
+
+ * killing.texi: "Graphical display", not window system.
+
+ * help.texi (Help Echo): "Graphical display", not window system.
+
+ * glossary.texi: Say "you", not "the user". Say "graphical display".
+
+ * frames.texi: Minor cleanups. "Graphical display", not window system.
+
+ * files.texi (Visiting): Make drag-and-drop not X-specific.
+
+ * custom.texi: Minor cleanups. "Graphical display", not window system.
+
+ * cmdargs.texi: Minor cleanups.
+
+ * building.texi (Compilation): Move and split kill-compilation para.
+ Add para about multiple compilers.
+ (Compilation Mode): Commands also available in grep mode and others.
+ Mention C-u C-x ` more tutorially. Clarify C-x `.
+ (Compilation Shell): Clarify. Put Bash example first.
+ (Grep Searching): Minor cleanups; add @w.
+ (Debuggers): Minor cleanups.
+ (Starting GUD): Make GDB xgraphical mode issue clearer.
+ (Debugger Operation): Lots of clarifications including
+ GDB tooltip side-effect issue.
+ (Commands of GUD): Clarify.
+ (GUD Customization): Add bashdb-mode-hook.
+ (GDB Graphical Interface): Rewrite for clarity.
+ (GDB User Interface Layout): Rewrite for clarity.
+ (Stack Buffer, Watch Expressions): Likewise.
+ (Other GDB User Interface Buffers): Cleanups.
+ (Lisp Libraries, External Lisp): Cleanup.
+
+ * basic.texi (Position Info): "Graphical displays", rather than
+ window systems.
+
+ * anti.texi: Minor cleanup.
+
+2006-02-06 Romain Francoise <romain@orebokech.com>
+
+ * faq.texi (VM): VM now at version 7.19.
+ Set myself as maintainer of this file.
+
+2006-02-04 Michael Olson <mwolson@gnu.org>
+
+ * erc.texi (History): Note that ERC is now included with Emacs.
+
2006-02-03 Eli Zaretskii <eliz@gnu.org>
* custom.texi (Init File, Find Init): Add cross-references to
@@ -5123,7 +5243,7 @@
;; End:
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
- 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.
diff --git a/man/Makefile.in b/man/Makefile.in
index 78e282b6563..854d3213272 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,7 +1,7 @@
#### Makefile for the Emacs Manual and other documentation.
# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2005 Free Software Foundation, Inc.
+# 2004, 2005, 2006 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
diff --git a/man/abbrevs.texi b/man/abbrevs.texi
index 2272b2ba133..683da2204c1 100644
--- a/man/abbrevs.texi
+++ b/man/abbrevs.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Abbrevs, Picture, Maintaining, Top
@chapter Abbrevs
@@ -10,7 +10,7 @@
A defined @dfn{abbrev} is a word which @dfn{expands}, if you insert
it, into some different text. Abbrevs are defined by the user to expand
in specific ways. For example, you might define @samp{foo} as an abbrev
-expanding to @samp{find outer otter}. Then you would be able to insert
+expanding to @samp{find outer otter}. Then you could insert
@samp{find outer otter } into the buffer by typing @kbd{f o o
@key{SPC}}.
@@ -20,9 +20,9 @@ to expand the letters in the buffer before point by looking for other
words in the buffer that start with those letters. @xref{Dynamic
Abbrevs}.
-``Hippie'' expansion generalizes abbreviation expansion. @xref{Hippie
-Expand, , Hippie Expansion, autotype, Features for Automatic
-Typing}.
+ ``Hippie'' expansion generalizes abbreviation expansion.
+@xref{Hippie Expand, , Hippie Expansion, autotype, Features for
+Automatic Typing}.
@menu
* Abbrev Concepts:: Fundamentals of defined abbrevs.
@@ -57,16 +57,16 @@ turns Abbrev mode on if the argument is positive, off otherwise.
on when the variable is non-@code{nil}. The variable @code{abbrev-mode}
automatically becomes local to the current buffer when it is set.
- Abbrev definitions can be @dfn{mode-specific}---active only in one major
+ Abbrevs can have @dfn{mode-specific} definitions, active only in one major
mode. Abbrevs can also have @dfn{global} definitions that are active in
all major modes. The same abbrev can have a global definition and various
mode-specific definitions for different major modes. A mode-specific
definition for the current major mode overrides a global definition.
- Abbrevs can be defined interactively during the editing session. Lists
-of abbrev definitions can also be saved in files and reloaded in later
-sessions. Some users keep extensive lists of abbrevs that they load in
-every session.
+ Yu can define abbrevs interactively during the editing session. You
+can also save lists of abbrev definitions in files for use in later
+sessions. Some users keep extensive lists of abbrevs that they load
+in every session.
@node Defining Abbrevs
@section Defining Abbrevs
@@ -88,8 +88,7 @@ Define @var{abbrev} as an abbrev expanding into @var{exp}.
@item M-x define-mode-abbrev @key{RET} @var{abbrev} @key{RET} @var{exp} @key{RET}
Define @var{abbrev} as a mode-specific abbrev expanding into @var{exp}.
@item M-x kill-all-abbrevs
-This command discards all abbrev definitions currently in effect,
-leaving a blank slate.
+Discard all abbrev definitions, leaving a blank slate.
@end table
@kindex C-x a g
@@ -118,13 +117,13 @@ as for @kbd{C-x a g}.
@findex inverse-add-global-abbrev
@kindex C-x a i l
@findex inverse-add-mode-abbrev
- If the text already in the buffer is the abbrev, rather than its
-expansion, use command @kbd{C-x a i g}
-(@code{inverse-add-global-abbrev}) instead of @kbd{C-x a g}, or use
-@kbd{C-x a i l} (@code{inverse-add-mode-abbrev}) instead of @kbd{C-x a
-l}. These commands are called ``inverse'' because they invert the
-meaning of the two text strings they use (one from the buffer and one
-read with the minibuffer).
+ If the abbrev text itself is already in the buffer, you can use the
+commands @kbd{C-x a i g} (@code{inverse-add-global-abbrev}) and
+@kbd{C-x a i l} (@code{inverse-add-mode-abbrev}) to define it as an
+abbrev by specify the expansion in the minibuffer. These commands are
+called ``inverse'' because they invert the meaning of the two text
+strings they use (one from the buffer and one read with the
+minibuffer).
@findex define-mode-abbrev
@findex define-global-abbrev
@@ -137,14 +136,12 @@ It reads two arguments---the abbrev, and its expansion. The command
When the abbrev has a prior definition, the abbrev definition commands
ask for confirmation before replacing it.
- To remove an abbrev definition, give a negative argument to the abbrev
-definition command: @kbd{C-u - C-x a g} or @kbd{C-u - C-x a l}. The
-former removes a global definition, while the latter removes a
-mode-specific definition.
-
@findex kill-all-abbrevs
- @kbd{M-x kill-all-abbrevs} removes all the abbrev definitions there
-are, both global and local.
+ To remove an abbrev definition, give a negative argument to the
+abbrev definition command: @kbd{C-u - C-x a g} or @kbd{C-u - C-x a l}.
+The former removes a global definition, while the latter removes a
+mode-specific definition. @kbd{M-x kill-all-abbrevs} removes all
+abbrev definitions, both global and local.
@node Expanding Abbrevs
@section Controlling Abbrev Expansion
@@ -179,9 +176,9 @@ Expand some or all abbrevs found in the region.
@kindex M-'
@findex abbrev-prefix-mark
- You may wish to expand an abbrev with a prefix attached; for example,
-if @samp{cnst} expands into @samp{construction}, you might want to use
-it to enter @samp{reconstruction}. It does not work to type
+ You may wish to expand an abbrev and attach a prefix to the expansion;
+for example, if @samp{cnst} expands into @samp{construction}, you might want
+to use it to enter @samp{reconstruction}. It does not work to type
@kbd{recnst}, because that is not necessarily a defined abbrev. What
you can do is use the command @kbd{M-'} (@code{abbrev-prefix-mark}) in
between the prefix @samp{re} and the abbrev @samp{cnst}. First, insert
@@ -195,7 +192,7 @@ used. The result is the desired @samp{reconstruction}.
If you actually want the text of the abbrev in the buffer, rather than
its expansion, you can accomplish this by inserting the following
punctuation with @kbd{C-q}. Thus, @kbd{foo C-q ,} leaves @samp{foo,} in
-the buffer.
+the buffer, not expanding it.
@findex unexpand-abbrev
If you expand an abbrev by mistake, you can undo the expansion and
@@ -234,6 +231,7 @@ Edit a list of abbrevs; you can add, alter or remove definitions.
The output from @kbd{M-x list-abbrevs} looks like this:
@example
+@var{various other tables@dots{}}
(lisp-mode-abbrev-table)
"dk" 0 "define-key"
(global-abbrev-table)
@@ -322,16 +320,16 @@ variable @code{save-abbrevs} to @code{nil}.
similar to the previous commands but work on text in an Emacs buffer.
@kbd{M-x insert-abbrevs} inserts text into the current buffer after point,
describing all current abbrev definitions; @kbd{M-x define-abbrevs} parses
-the entire current buffer and defines abbrevs accordingly.@refill
+the entire current buffer and defines abbrevs accordingly.
@node Dynamic Abbrevs
@section Dynamic Abbrev Expansion
- The abbrev facility described above operates automatically as you insert
-text, but all abbrevs must be defined explicitly. By contrast,
-@dfn{dynamic abbrevs} allow the meanings of abbrevs to be determined
-automatically from the contents of the buffer, but dynamic abbrev expansion
-happens only when you request it explicitly.
+ The abbrev facility described above operates automatically as you
+insert text, but all abbrevs must be defined explicitly. By contrast,
+@dfn{dynamic abbrevs} allow the meanings of abbreviations to be
+determined automatically from the contents of the buffer, but dynamic
+abbrev expansion happens only when you request it explicitly.
@kindex M-/
@kindex C-M-/
@@ -357,7 +355,7 @@ expansion found looking backward from point. Repeating @kbd{M-/}
searches for an alternative expansion by looking farther back. After
scanning all the text before point, it searches the text after point.
The variable @code{dabbrev-limit}, if non-@code{nil}, specifies how far
-in the buffer to search for an expansion.
+away in the buffer to search for an expansion.
@vindex dabbrev-check-all-buffers
After scanning the current buffer, @kbd{M-/} normally searches other
@@ -372,21 +370,20 @@ expressions, dynamic abbrev expansion skips that buffer.
A negative argument to @kbd{M-/}, as in @kbd{C-u - M-/}, says to
search first for expansions after point, then other buffers, and
-consider expansions before point only as a last resort.
-
- If you repeat the @kbd{M-/} to look for another expansion, do not
-specify an argument. This tries all the expansions after point and
-then the expansions before point.
+consider expansions before point only as a last resort. If you repeat
+the @kbd{M-/} to look for another expansion, do not specify an
+argument. Repeating @kbd{M-/} cycles through all the expansions after
+point and then the expansions before point.
After you have expanded a dynamic abbrev, you can copy additional
words that follow the expansion in its original context. Simply type
-@kbd{@key{SPC} M-/} for each word you want to copy. The spacing and
-punctuation between words is copied along with the words.
+@kbd{@key{SPC} M-/} for each additional word you want to copy. The
+spacing and punctuation between words is copied along with the words.
The command @kbd{C-M-/} (@code{dabbrev-completion}) performs
-completion of a dynamic abbreviation. Instead of trying the possible
-expansions one by one, it finds all of them, then inserts the text that
-they have in common. If they have nothing in common, @kbd{C-M-/}
+completion of a dynamic abbrev. Instead of trying the possible
+expansions one by one, it finds all of them, then inserts the text
+that they have in common. If they have nothing in common, @kbd{C-M-/}
displays a list of completions, from which you can select a choice in
the usual manner. @xref{Completion}.
@@ -411,24 +408,25 @@ in case. If the value of @code{dabbrev-case-fold-search} is
for expansions.
@vindex dabbrev-case-replace
- Normally, dynamic abbrev expansion preserves the case pattern @emph{of
-the abbrev you have typed}, by converting the expansion to that case
-pattern.
+ Normally, dynamic abbrev expansion preserves the case pattern
+@emph{of the dynamic abbrev you are expanding}, by converting the
+expansion to that case pattern.
@vindex dabbrev-case-fold-search
- The variable @code{dabbrev-case-replace} controls whether to preserve
-the case pattern of the abbrev. If it is @code{t}, the abbrev's case
-pattern is preserved in most cases; if it is @code{nil}, the expansion is
-always copied verbatim. If the value of @code{dabbrev-case-replace} is
-@code{case-replace}, which is true by default, then the variable
-@code{case-replace} controls whether to copy the expansion verbatim.
+ The variable @code{dabbrev-case-replace} controls whether to
+preserve the case pattern of the dynamic abbrev. If it is @code{t},
+the dynamic abbrev's case pattern is preserved in most cases; if it is
+@code{nil}, the expansion is always copied verbatim. If the value of
+@code{dabbrev-case-replace} is @code{case-replace}, which is true by
+default, then the variable @code{case-replace} controls whether to
+copy the expansion verbatim.
However, if the expansion contains a complex mixed case pattern, and
-the abbrev matches this pattern as far as it goes, then the expansion is
-always copied verbatim, regardless of those variables. Thus, for
-example, if the buffer contains @code{variableWithSillyCasePattern}, and
-you type @kbd{v a M-/}, it copies the expansion verbatim including its
-case pattern.
+the dynamic abbrev matches this pattern as far as it goes, then the
+expansion is always copied verbatim, regardless of those variables.
+Thus, for example, if the buffer contains
+@code{variableWithSillyCasePattern}, and you type @kbd{v a M-/}, it
+copies the expansion verbatim including its case pattern.
@vindex dabbrev-abbrev-char-regexp
The variable @code{dabbrev-abbrev-char-regexp}, if non-@code{nil},
@@ -436,16 +434,16 @@ controls which characters are considered part of a word, for dynamic expansion
purposes. The regular expression must match just one character, never
two or more. The same regular expression also determines which
characters are part of an expansion. The value @code{nil} has a special
-meaning: abbreviations are made of word characters, but expansions are
+meaning: dynamic abbrevs are made of word characters, but expansions are
made of word and symbol characters.
@vindex dabbrev-abbrev-skip-leading-regexp
In shell scripts and makefiles, a variable name is sometimes prefixed
with @samp{$} and sometimes not. Major modes for this kind of text can
-customize dynamic abbreviation to handle optional prefixes by setting
+customize dynamic abbrev expansion to handle optional prefixes by setting
the variable @code{dabbrev-abbrev-skip-leading-regexp}. Its value
should be a regular expression that matches the optional prefix that
-dynamic abbreviation should ignore.
+dynamic abbrev expression should ignore.
@ignore
arch-tag: 638e0079-9540-48ec-9166-414083e16445
diff --git a/man/ack.texi b/man/ack.texi
index 206b2cbc268..0874cfa9c52 100644
--- a/man/ack.texi
+++ b/man/ack.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@node Acknowledgments, Screen, Concept Index, Top
diff --git a/man/ada-mode.texi b/man/ada-mode.texi
index 7cac9261690..73896132886 100644
--- a/man/ada-mode.texi
+++ b/man/ada-mode.texi
@@ -9,7 +9,7 @@
@copying
Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/anti.texi b/man/anti.texi
index 4e0e96d346d..bfcd8badae0 100644
--- a/man/anti.texi
+++ b/man/anti.texi
@@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
-@c Copyright (C) 2005 Free Software Foundation, Inc.
+@c Copyright (C) 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Antinews, Mac OS, X Resources, Top
@@ -107,7 +107,7 @@ source code, grep for it.
@item
The apropos commands will not accept a list of words to match, in
-order to encourage users to be more specific. Also, the user option
+order to encourage you to be more specific. Also, the user option
@code{apropos-sort-by-scores} has been removed.
@item
diff --git a/man/autotype.texi b/man/autotype.texi
index 106d89f52e4..ad29f4295ee 100644
--- a/man/autotype.texi
+++ b/man/autotype.texi
@@ -1,7 +1,7 @@
\input texinfo
@c This is an annex of the Emacs manual.
@c Copyright (C) 1994, 1995, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c Author: Daniel.Pfeiffer@Informatik.START.dbp.de, fax (+49 69) 7588-2389
@setfilename ../info/autotype
@c @node Autotypist, Picture, Abbrevs, Top
@@ -13,7 +13,7 @@
@copying
Copyright @copyright{} 1994, 1995, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/basic.texi b/man/basic.texi
index 5f2b8c4793b..f4d15f9171b 100644
--- a/man/basic.texi
+++ b/man/basic.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Basic, Minibuffer, Exiting, Top
@chapter Basic Editing Commands
@@ -618,9 +618,9 @@ What to type to input the character in the current input method
(if it supports the character).
@item
-If you are running Emacs on a window system, the font name and glyph
-code for the character. If you are running Emacs on a terminal, the
-code(s) sent to the terminal.
+If you are running Emacs on a graphical display, the font name and
+glyph code for the character. If you are running Emacs on a text-only
+terminal, the code(s) sent to the terminal.
@item
The character's text properties (@pxref{Text Properties,,,
diff --git a/man/buffers.texi b/man/buffers.texi
index a8e23086f79..3b3afc2eb92 100644
--- a/man/buffers.texi
+++ b/man/buffers.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Buffers, Windows, Files, Top
@chapter Using Multiple Buffers
diff --git a/man/building.texi b/man/building.texi
index 62e80c2cde3..e3e3b5ac5a2 100644
--- a/man/building.texi
+++ b/man/building.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Building, Maintaining, Programs, Top
@chapter Compiling and Testing Programs
@@ -90,23 +90,12 @@ above point, which remains at the end. If point is not at the end of
the buffer, it remains fixed while more compilation output is added at
the end of the buffer.
-@cindex compilation buffer, keeping current position at the end
+@cindex compilation buffer, keeping point at end
@vindex compilation-scroll-output
If you set the variable @code{compilation-scroll-output} to a
non-@code{nil} value, then the compilation buffer always scrolls to
follow output as it comes in.
-@findex kill-compilation
- When the compiler process terminates, for whatever reason, the mode
-line of the @samp{*compilation*} buffer changes to say @samp{exit}
-(followed by the exit code, @samp{[0]} for a normal exit), or
-@samp{signal} (if a signal terminated the process), instead of
-@samp{run}. Starting a new compilation also kills any running
-compilation, as only one can exist at any time. However, @kbd{M-x
-compile} asks for confirmation before actually killing a compilation
-that is running. You can also kill the compilation process with
-@kbd{M-x kill-compilation}.
-
@findex recompile
To rerun the last compilation with the same command, type @kbd{M-x
recompile}. This automatically reuses the compilation command from
@@ -115,6 +104,25 @@ the last invocation of @kbd{M-x compile}. It also reuses the
directory, which is the directory in which the previous compilation
was started.
+ When the compiler process terminates, for whatever reason, the mode
+line of the @samp{*compilation*} buffer changes to say @samp{exit}
+(followed by the exit code, @samp{[0]} for a normal exit), or
+@samp{signal} (if a signal terminated the process), instead of
+@samp{run}.
+
+@findex kill-compilation
+ Starting a new compilation also kills any compilation
+running in @samp{*compilation*}, as the buffer can only handle one
+compilation at any time. However, @kbd{M-x compile} asks for
+confirmation before actually killing a compilation that is running.
+You can also kill the compilation process with @kbd{M-x
+kill-compilation}.
+
+ If you want to run two compilations at once, you should start the
+first one, then rename the @samp{*compilation*} buffer (perhaps using
+@code{rename-uniquely}; @pxref{Misc Buffer}), and start the other
+compilation. That will create a new @samp{*compilation*} buffer.
+
Emacs does not expect a compiler process to launch asynchronous
subprocesses; if it does, and they keep running after the main
compiler process has terminated, Emacs may kill them or their output
@@ -146,21 +154,23 @@ variable settings override the usual ones.
@node Compilation Mode
@section Compilation Mode
-@findex compile-goto-error
@cindex Compilation mode
@cindex mode, Compilation
- The @samp{*compilation*} buffer uses a special major mode, Compilation
-mode, whose main feature is to provide a convenient way to look at the
-source line where the error happened.
+ The @samp{*compilation*} buffer uses a special major mode,
+Compilation mode, whose main feature is to provide a convenient way to
+visit the source line corresponding to an error message. These
+commands are also available in other special buffers that list
+locations in files, including those made by @kbd{M-x grep} and
+@kbd{M-x occur}.
@table @kbd
@item M-g M-n
@itemx M-g n
@itemx C-x `
-Visit the locus of the next compiler error message or @code{grep} match.
+Visit the locus of the next error message or match.
@item M-g M-p
@itemx M-g p
-Visit the locus of the previous compiler error message or @code{grep} match.
+Visit the locus of the previous error message or match.
@item @key{RET}
Visit the locus of the error message that point is on.
This command is used in the compilation buffer.
@@ -183,16 +193,17 @@ Toggle Next Error Follow minor mode, which makes cursor motion in the
compilation buffer produce automatic source display.
@end table
-@kindex M-g M-n
-@kindex M-g n
-@kindex C-x `
-@findex next-error
+@findex compile-goto-error
You can visit the source for any particular error message by moving
point in the @samp{*compilation*} buffer to that error message and
typing @key{RET} (@code{compile-goto-error}). Alternatively, you can
click @kbd{Mouse-2} on the error message; you need not switch to the
@samp{*compilation*} buffer first.
+@kindex M-g M-n
+@kindex M-g n
+@kindex C-x `
+@findex next-error
@vindex next-error-highlight
To parse the compiler error messages sequentially, type @kbd{C-x `}
(@code{next-error}). The character following the @kbd{C-x} is the
@@ -203,27 +214,30 @@ location of the error in another window. It also momentarily
highlights the relevant source line. You can change the behavior of
this highlighting with the variable @code{next-error-highlight}.
- The first time @kbd{C-x `} is used after the start of a compilation,
-it moves to the first error's location. Subsequent uses of @kbd{C-x `}
-advance down to subsequent errors. If you visit a specific error
-message with @key{RET} or @kbd{Mouse-2}, subsequent @kbd{C-x `}
-commands advance from there. When @kbd{C-x `} gets to the end of the
+ The first time @w{@kbd{C-x `}} is used after the start of a compilation,
+it moves to the first error's location. Subsequent uses of @kbd{C-x
+`} advance down to subsequent errors. If you visit a specific error
+message with @key{RET} or @kbd{Mouse-2}, subsequent @w{@kbd{C-x `}}
+commands advance from there. When @w{@kbd{C-x `}} gets to the end of the
buffer and finds no more error messages to visit, it fails and signals
-an Emacs error.
+an Emacs error. @w{@kbd{C-u C-x `}} starts scanning from the beginning of
+the compilation buffer, and goes to the first error's location.
@vindex compilation-skip-threshold
- By default, @kbd{C-x `} skips less important messages. The variable
+ By default, @w{@kbd{C-x `}} skips less important messages. The variable
@code{compilation-skip-threshold} controls this. If its value is 2,
-@kbd{C-x `} skips anything less than error, 1 skips anything less
-than warning, and 0 doesn't skip any messages.
+@w{@kbd{C-x `}} skips anything less than error, 1 skips anything less
+than warning, and 0 doesn't skip any messages. The default is 1.
-When the left fringe is displayed, an arrow points to the
-current message in the compilation buffer. The variable
+ When the window has a left fringe, an arrow in the fringe points to
+the current message in the compilation buffer. The variable
@code{compilation-context-lines} controls the number of lines of
-leading context in the window before the current message. If it is
-@code{nil} and the left fringe is displayed, the window doesn't
-scroll. If there is no left fringe, no arrow is displayed and a value
-of @code{nil} means display the message at the top of the window.
+leading context to display before the current message. Going to an
+error message location scrolls the @samp{*compilation*} buffer to put
+the message that far down from the top. The value @code{nil} is
+special: if there's a left fringe, the window doesn't scroll at all
+if the message is already visible. If there is no left fringe,
+@code{nil} means display the message at the top of the window.
If you're not in the compilation buffer when you run
@code{next-error}, Emacs will look for a buffer that contains error
@@ -233,9 +247,6 @@ then at the current buffer. Finally, Emacs looks at all the remaining
buffers. @code{next-error} signals an error if it can't find any such
buffer.
- @kbd{C-u C-x `} starts scanning from the beginning of the compilation
-buffer. This is one way to process the same set of errors again.
-
@vindex compilation-error-regexp-alist
@vindex grep-regexp-alist
To parse messages from the compiler, Compilation mode uses the
@@ -280,28 +291,28 @@ files by FTP (@pxref{File Names}).
@node Compilation Shell
@section Subshells for Compilation
- Emacs uses a shell to run the compilation command, but specifies
-the option for a noninteractive shell. This means, in particular, that
+ Emacs uses a shell to run the compilation command, but specifies the
+option for a noninteractive shell. This means, in particular, that
the shell should start with no prompt. If you find your usual shell
prompt making an unsightly appearance in the @samp{*compilation*}
buffer, it means you have made a mistake in your shell's init file by
setting the prompt unconditionally. (This init file's name may be
-@file{.bashrc}, @file{.profile}, @file{.cshrc}, @file{.shrc}, or various
-other things, depending on the shell you use.) The shell init file
-should set the prompt only if there already is a prompt. In csh, here
-is how to do it:
+@file{.bashrc}, @file{.profile}, @file{.cshrc}, @file{.shrc}, or
+various other things, depending on the shell you use.) The shell init
+file should set the prompt only if there already is a prompt. Here's
+how to do it in bash:
@example
-if ($?prompt) set prompt = @dots{}
+if [ "$@{PS1+set@}" = set ]
+then PS1=@dots{}
+fi
@end example
@noindent
-And here's how to do it in bash:
+And here's how to do it in csh:
@example
-if [ "$@{PS1+set@}" = set ]
-then PS1=@dots{}
-fi
+if ($?prompt) set prompt = @dots{}
@end example
There may well be other things that your shell's init file
@@ -335,18 +346,18 @@ Kill the running @code{grep} subprocess.
@end table
@findex grep
- To run @code{grep}, type @kbd{M-x grep}, then enter a command line that
-specifies how to run @code{grep}. Use the same arguments you would give
-@code{grep} when running it normally: a @code{grep}-style regexp
-(usually in single-quotes to quote the shell's special characters)
-followed by file names, which may use wildcards. If you specify a
-prefix argument for @kbd{M-x grep}, it figures out the tag
+ To run @code{grep}, type @kbd{M-x grep}, then enter a command line
+that specifies how to run @code{grep}. Use the same arguments you
+would give @code{grep} when running it normally: a @code{grep}-style
+regexp (usually in single-quotes to quote the shell's special
+characters) followed by file names, which may use wildcards. If you
+specify a prefix argument for @kbd{M-x grep}, it detects the tag
(@pxref{Tags}) around point, and puts that into the default
@code{grep} command.
The output from @code{grep} goes in the @samp{*grep*} buffer. You
-can find the corresponding lines in the original files using @kbd{C-x
-`}, @key{RET}, and so forth, just like compilation errors.
+can find the corresponding lines in the original files using @w{@kbd{C-x
+`}}, @key{RET}, and so forth, just like compilation errors.
Some grep programs accept a @samp{--color} option to output special
markers around matches for the purpose of highlighting. You can make
@@ -403,12 +414,11 @@ Flymake, flymake, The Flymake Manual}.
@c Do you believe in GUD?
The GUD (Grand Unified Debugger) library provides an interface to
various symbolic debuggers from within Emacs. We recommend the
-debugger GDB, which is free software, but you can also run DBX, SDB or
-XDB if you have them. GUD can also serve as an interface to Perl's
-debugging mode, the Python debugger PDB, the bash debugger, and to
-JDB, the Java Debugger. @xref{Debugging,, The Lisp Debugger, elisp,
-the Emacs Lisp Reference Manual}, for information on debugging Emacs
-Lisp programs.
+debugger GDB, which is free software, but GUD can also run DBX, SDB or
+XDB. GUD can also serve as an interface to Perl's debugging mode, the
+Python debugger PDB, the Bash debugger, and to JDB, the Java Debugger.
+@xref{Debugging,, The Lisp Debugger, elisp, the Emacs Lisp Reference
+Manual}, for information on debugging Emacs Lisp programs.
@menu
* Starting GUD:: How to start a debugger subprocess.
@@ -429,24 +439,27 @@ to a particular debugger program.
@table @kbd
@item M-x gdb @key{RET} @var{file} @key{RET}
@findex gdb
-Run GDB as a subprocess of Emacs. By default, this operates in
-graphical mode; @xref{GDB Graphical Interface}. Graphical mode
-does not support any other debuggers.
+Run GDB as a subprocess of Emacs. By default, this uses an IDE-like
+graphical interface; see @ref{GDB Graphical Interface}. Only GDB
+works with the graphical interface.
@item M-x dbx @key{RET} @var{file} @key{RET}
@findex dbx
-Similar, but run DBX instead of GDB.
+Run DBX as a subprocess of Emacs. Since Emacs does not implement a
+graphical interface for DBX, communication with DBX works by typing
+commands in the GUD interaction buffer. The same is true for all
+the other supported debuggers.
@item M-x xdb @key{RET} @var{file} @key{RET}
@findex xdb
@vindex gud-xdb-directories
-Similar, but run XDB instead of GDB. Use the variable
+Similar, but run XDB. Use the variable
@code{gud-xdb-directories} to specify directories to search for source
files.
@item M-x sdb @key{RET} @var{file} @key{RET}
@findex sdb
-Similar, but run SDB instead of GDB.
+Similar, but run SDB.
Some versions of SDB do not mention source file names in their
messages. When you use them, you need to have a valid tags table
@@ -484,27 +497,25 @@ allowed. GUD assumes that the first argument not starting with a
@subsection Debugger Operation
@cindex fringes, and current execution line in GUD
- When you run a debugger with GUD, the debugger uses an Emacs buffer
-for its ordinary input and output. This is called the GUD buffer. The
-debugger displays the source files of the program by visiting them in
-Emacs buffers. An arrow (@samp{=>}) in one of these buffers indicates
-the current execution line.@footnote{Under a window system, the arrow
-appears in the left fringe of the Emacs window.} Moving point in this
-buffer does not move the arrow.
+ When you run a debugger with GUD using the textual interface, the
+debugger uses an Emacs buffer for its ordinary input and output. This
+is called the GUD buffer. Input and output from the program you are
+debugging also use this buffer.
+
+ The debugger displays the source files of the program by visiting
+them in Emacs buffers. An arrow in the left fringe indicates the
+current execution line.@footnote{On a text-only terminal, the arrow
+appears as @samp{=>} and overlays the first two text columns.} Moving
+point in this buffer does not move the arrow. The arrow is not part
+of the file's text; it appears only on the screen.
You can start editing these source files at any time in the buffers
-that display them. The arrow is not part of the file's
-text; it appears only on the screen. If you do modify a source file,
-keep in mind that inserting or deleting lines will throw off the arrow's
-positioning; GUD has no way of figuring out which line corresponded
-before your changes to the line number in a debugger message. Also,
-you'll typically have to recompile and restart the program for your
-changes to be reflected in the debugger's tables.
-
- If you wish, you can control your debugger process entirely through the
-debugger buffer, which uses a variant of Shell mode. All the usual
-commands for your debugger are available, and you can use the Shell mode
-history commands to repeat them. @xref{Shell Mode}.
+that display them. If you do modify a source file, keep in mind that
+inserting or deleting lines will throw off the arrow's positioning;
+GUD has no way of figuring out which line corresponded before your
+changes to the line number in a debugger message. Also, you'll
+typically have to recompile and restart the program for your changes
+to be reflected in the debugger's tables.
@cindex tooltips with GUD
@vindex tooltip-gud-modes
@@ -521,23 +532,30 @@ the list @code{gud-tooltip-modes}. If the variable
@code{gud-tooltip-echo-area} is non-@code{nil} then the variable's
value is displayed in the echo area.
-With GDB in text command mode (@pxref{GDB Graphical Interface}),
-it is possible that use of GUD tooltips can cause a function to be
-called with harmful side-effects. In this case, Emacs disables
-them.
+ GUD tooltips are disabled when you use GDB in text command mode
+(@pxref{GDB Graphical Interface}), because displaying an expression's
+value in GDB can sometimes expand a macro and result in a side effect
+that interferes with the program's operation. The GDB graphical
+interface supports GUD tooltips and assures they will not cause side
+effects.
@node Commands of GUD
@subsection Commands of GUD
The GUD interaction buffer uses a variant of Shell mode, so the
-commands of Shell mode are available (@pxref{Shell Mode}). GUD mode
-also provides commands for setting and clearing breakpoints, for
-selecting stack frames, and for stepping through the program. These
-commands are available both in the GUD buffer and globally, but with
-different key bindings. It also has its own tool bar from which you
-can invoke the more common commands by clicking on the appropriate
-icon. This is particularly useful for repetitive commands like
-gud-next and gud-step and allows the user to hide the GUD buffer.
+Emacs commands of Shell mode are available (@pxref{Shell Mode}). All
+the usual commands for your debugger are available, and you can use
+the Shell mode history commands to repeat them. If you wish, you can
+control your debugger process entirely through this buffer.
+
+ GUD mode also provides commands for setting and clearing
+breakpoints, for selecting stack frames, and for stepping through the
+program. These commands are available both in the GUD buffer and
+globally, but with different key bindings. It also has its own tool
+bar from which you can invoke the more common commands by clicking on
+the appropriate icon. This is particularly useful for repetitive
+commands like @code{gud-next} and @code{gud-step}, and allows you to
+keep the GUD buffer hidden.
The breakpoint commands are normally used in source file buffers,
because that is the easiest way to specify where to set or clear the
@@ -550,7 +568,7 @@ Set a breakpoint on the source line that point is on.
@end table
@kindex C-x C-a @r{(GUD)}
- Here are the other special commands provided by GUD. The keys
+ Here are the other special commands provided by GUD@. The keys
starting with @kbd{C-c} are available only in the GUD interaction
buffer. The key bindings that start with @kbd{C-x C-a} are available in
the GUD interaction buffer and also in source files.
@@ -606,9 +624,9 @@ buffer, it applies to the line where the program last stopped.
@kindex C-c C-t @r{(GUD)}
@itemx C-x C-a C-t
@findex gud-tbreak
-Set a temporary breakpoint on the current source line, if any.
-If you use this command in the GUD interaction buffer,
-it applies to the line where the program last stopped.
+Set a temporary breakpoint on the current source line, if any
+(@code{gud-tbreak}). If you use this command in the GUD interaction
+buffer, it applies to the line where the program last stopped.
@end table
The above commands are common to all supported debuggers. If you are
@@ -620,14 +638,14 @@ using GDB or (some versions of) DBX, these additional commands are available:
@itemx C-x C-a <
@findex gud-up
Select the next enclosing stack frame (@code{gud-up}). This is
-equivalent to the @samp{up} command.
+equivalent to the GDB command @samp{up}.
@item C-c >
@kindex C-c > @r{(GUD)}
@itemx C-x C-a >
@findex gud-down
Select the next inner stack frame (@code{gud-down}). This is
-equivalent to the @samp{down} command.
+equivalent to the GDB command @samp{down}.
@end table
If you are using GDB, these additional key bindings are available:
@@ -643,29 +661,28 @@ Start execution of the program (@code{gud-run}).
@kindex C-c C-u @r{(GUD)}
@itemx C-x C-a C-u
@findex gud-until
-Continue execution to the current line. The program will run until
-it hits a breakpoint, terminates, gets a signal that the debugger is
-checking for, or reaches the line on which the cursor currently sits
-(@code{gud-until}).
+Continue execution to the current line (@code{gud-until}). The
+program will run until it hits a breakpoint, terminates, gets a signal
+that the debugger is checking for, or reaches the line on which the
+cursor currently sits.
@item @key{TAB}
@kindex TAB @r{(GUD)}
@findex gud-gdb-complete-command
With GDB, complete a symbol name (@code{gud-gdb-complete-command}).
-This key is available only in the GUD interaction buffer, and requires
-GDB versions 4.13 and later.
+This key is available only in the GUD interaction buffer.
@item C-c C-f
@kindex C-c C-f @r{(GUD)}
@itemx C-x C-a C-f
@findex gud-finish
-Run the program until the selected stack frame returns (or until it
-stops for some other reason).
+Run the program until the selected stack frame returns or
+stops for some other reason (@code{gud-finish}).
@item C-x C-a C-j
@kindex C-x C-a C-j @r{(GUD)}
@findex gud-jump
-Only useful in a source buffer, (@code{gud-jump}) transfers the
+Only useful in a source buffer, @code{gud-jump} transfers the
program's execution point to the current line. In other words, the
next line that the program executes will be the one where you gave the
command. If the new execution line is in a different function from
@@ -691,11 +708,13 @@ Instead, type @kbd{C-q @key{TAB}} to enter a tab.
@vindex perldb-mode-hook
@vindex pdb-mode-hook
@vindex jdb-mode-hook
+@vindex bashdb-mode-hook
On startup, GUD runs one of the following hooks: @code{gdb-mode-hook},
if you are using GDB; @code{dbx-mode-hook}, if you are using DBX;
@code{sdb-mode-hook}, if you are using SDB; @code{xdb-mode-hook}, if you
are using XDB; @code{perldb-mode-hook}, for Perl debugging mode;
-@code{pdb-mode-hook}, for PDB; @code{jdb-mode-hook}, for JDB. You can
+@code{pdb-mode-hook}, for PDB; @code{jdb-mode-hook}, for JDB;
+@code{bashdb-mode-hook}, for the Bash debugger. You can
use these hooks to define custom key bindings for the debugger
interaction buffer. @xref{Hooks}.
@@ -750,37 +769,37 @@ ignores any numeric argument.
@node GDB Graphical Interface
@subsection GDB Graphical Interface
-@findex gdb-mouse-set-clear-breakpoint
-@findex gdb-mouse-toggle-breakpoint
By default, the command @code{gdb} starts GDB using a graphical
-interface where you view and control the program's data using Emacs
-windows. You can still interact with GDB through the GUD buffer, but
-the point of this mode is that you can do it through menus and clicks,
-without needing to know GDB commands. For example, you can click
-@kbd{Mouse-1} in the fringe or display margin of a source buffer to
-set a breakpoint there and, on a graphical display, a red bullet will
-appear. If a breakpoint already exists on that line, this action will
-remove it. You can also enable or disable a breakpoint by clicking
-@kbd{Mouse-3} on the bullet. If you drag the debugger arrow in the
-fringe with @kbd{Mouse-1}, execution will continue to the line where
-you release the button, provided it is still in the same frame
-(@code{gdb-mouse-until}). Alternatively, you can click @kbd{Mouse-2}
-at some point in the fringe of this buffer and execution will advance
-to there.
-
-This mode requires that GDB think that the screen size is unlimited,
-and sets the height and width accordingly. For correct operation it
-is important that you don't change these values during the session.
+interface, using Emacs windows for display program state information.
+In effect, this makes Emacs into an IDE (interactive development
+environment). With it, you do not need to use textual GDB commands;
+you can control the debugging session with the mouse.
+
+@c @findex gdb-mouse-set-clear-breakpoint
+@c @findex gdb-mouse-toggle-breakpoint
+ For example, you can click @kbd{Mouse-1} in the fringe or display
+margin of a source buffer to set a breakpoint there and, on a
+graphical display, a red bullet will appear on that line. If a
+breakpoint already exists on that line, the same click will remove it.
+You can also enable or disable a breakpoint by clicking @kbd{Mouse-3}
+on the bullet. If you drag the debugger arrow in the fringe with
+@kbd{Mouse-1} (@code{gdb-mouse-until}), execution will continue to the
+line where you release the button, provided it is still in the same
+frame. Alternatively, you can click @kbd{Mouse-2} at some point in
+the fringe of this buffer and execution will advance to there.
+
+ This mode requires telling GDB that its ``screen size'' is
+unlimited, so it sets the height and width accordingly. For correct
+operation you must not change these values during the GDB session.
@vindex gud-gdb-command-name
@findex gdba
- You can also run GDB in text command mode, which creates a buffer
-for input and output to GDB. To do this, set
-@code{gud-gdb-command-name} to @code{"gdb --fullname"} or edit the
-startup command in the minibuffer to say that. You need to do use
-text command mode to run multiple debugging sessions within one Emacs
-session. If you have customized @code{gud-gdb-command-name} in that
-way, then you can use @kbd{M-x gdba} to invoke GDB in graphical mode.
+ You can also run GDB in text command mode, like other debuggers. To
+do this, set @code{gud-gdb-command-name} to @code{"gdb --fullname"} or
+edit the startup command in the minibuffer to say that. You need to
+do use text command mode to run multiple debugging sessions within one
+Emacs session. If you have customized @code{gud-gdb-command-name} in
+that way, you can use @kbd{M-x gdba} to invoke GDB in graphical mode.
@menu
* GDB User Interface Layout:: Control the number of displayed buffers.
@@ -795,19 +814,16 @@ way, then you can use @kbd{M-x gdba} to invoke GDB in graphical mode.
@subsubsection GDB User Interface Layout
@cindex GDB User Interface layout
-@findex gdb-many-windows
@vindex gdb-many-windows
+ If the variable @code{gdb-many-windows} is @code{nil} (the default
+value) then @kbd{M-x gdb} normally displays only the GUD buffer.
+However, if the variable @code{gdb-show-main} is also non-@code{nil},
+it starts with two windows: one displaying the GUD buffer, and the
+other showing the source for the @code{main} function of the program
+you are debugging.
-If the variable @code{gdb-many-windows} is @code{nil} (the default
-value) then gdb just pops up the GUD buffer unless the variable
-@code{gdb-show-main} is non-@code{nil}. In this case it starts with
-two windows: one displaying the GUD buffer and the other with the
-source file with the main routine of the inferior.
-
-If @code{gdb-many-windows} is non-@code{nil}, regardless of the value of
-@code{gdb-show-main}, the layout below will appear unless
-@code{gdb-use-inferior-io-buffer} is @code{nil}. In this case the
-source buffer occupies the full width of the frame.
+ If @code{gdb-many-windows} is non-@code{nil}, then @kbd{M-x gdb}
+displays the following frame layout:
@example
+--------------------------------+--------------------------------+
@@ -825,121 +841,131 @@ source buffer occupies the full width of the frame.
+--------------------------------+--------------------------------+
@end example
-To toggle this layout, do @kbd{M-x gdb-many-windows}.
+ However, if @code{gdb-use-inferior-io-buffer} is @code{nil}, the I/O
+buffer does not appear and the source buffer occupies the full width
+of the frame.
@findex gdb-restore-windows
-If you change the window layout, for example, while editing and
-re-compiling your program, then you can restore it with the command
-@code{gdb-restore-windows}.
-
-You may also choose which additional buffers you want to display,
-either in the same frame or a different one. Select them from
-@samp{GUD->GDB-windows} or @samp{GUD->GDB-Frames} sub-menu
-respectively. If the menu-bar is unavailable, type @code{M-x
+ If you change the window layout, for example, while editing and
+re-compiling your program, then you can restore this standard window
+layout with the command @code{gdb-restore-windows}.
+
+@findex gdb-many-windows
+ To switch between this standard layout and a simple layout
+containing just the GUD buffer and a source file, type @kbd{M-x
+gdb-many-windows}.
+
+ You may also specify additional GUD-related buffers to display,
+either in the same frame or a different one. Select the buffers you
+want with the @samp{GUD->GDB-windows} and @samp{GUD->GDB-Frames}
+sub-menus. If the menu-bar is unavailable, type @code{M-x
gdb-display-@var{buffertype}-buffer} or @code{M-x
gdb-frame-@var{buffertype}-buffer} respectively, where
-@var{buffertype} is the relevant buffer type e.g breakpoints.
-Most of these buffers are read-only and be killed by simply
-pressing @kbd{q} in them.
+@var{buffertype} is the relevant buffer type, such as
+@samp{breakpoints}. Most of these buffers are read-only, and typing
+@kbd{q} in them kills them.
-When you finish debugging then kill the GUD buffer with @kbd{C-x k},
+ When you finish debugging, kill the GUD buffer with @kbd{C-x k},
which will also kill all the buffers associated with the session.
However you need not do this if, after editing and re-compiling your
source code within Emacs, you wish continue debugging. When you
restart execution, GDB will automatically find your new executable.
Keeping the GUD buffer has the advantage of keeping the shell history
-as well as GDB's breakpoints. You need to check, however, that the
-breakpoints in the recently edited code are still where you want them.
+as well as GDB's breakpoints. You do need to check that the
+breakpoints in recently edited source files are still in the right
+places.
@node Breakpoints Buffer
@subsubsection Breakpoints Buffer
-The breakpoints buffer shows the existing breakpoints and watchpoints
-(@pxref{Breakpoints,,, gdb, The GNU debugger}). It has three special
-commands:
+ The breakpoints buffer shows the existing breakpoints and
+watchpoints (@pxref{Breakpoints,,, gdb, The GNU debugger}). It has
+these special commands, which mostly apply to the @dfn{current
+breakpoint}, the breakpoint which point is on.
@table @kbd
@item @key{SPC}
@kindex SPC @r{(GDB breakpoints buffer)}
@findex gdb-toggle-breakpoint
-Enable/disable the breakpoint at the current line
-(@code{gdb-toggle-breakpoint}). On a graphical display, this changes
-the color of a bullet in the margin of the source buffer at the
-relevant line. This is red when the breakpoint is enabled and grey
-when it is disabled. Text-only terminals correspondingly display
-a @samp{B} or @samp{b}.
+Enable/disable the current breakpoint (@code{gdb-toggle-breakpoint}).
+On a graphical display, this changes the color of a bullet in the
+margin of the source buffer at the relevant line. This is red when
+the breakpoint is enabled and grey when it is disabled. Text-only
+terminals correspondingly display a @samp{B} or @samp{b}.
@item D
@kindex D @r{(GDB breakpoints buffer)}
@findex gdb-delete-breakpoint
-Delete the breakpoint at the current line (@code{gdb-delete-breakpoint}).
+Delete the current breakpoint (@code{gdb-delete-breakpoint}).
@item @key{RET}
@kindex RET @r{(GDB breakpoints buffer)}
@findex gdb-goto-breakpoint
-Display the file in the source buffer at the breakpoint specified at
-the current line (@code{gdb-goto-breakpoint}). Alternatively, click
-@kbd{Mouse-2} on the breakpoint that you wish to visit.
+Visit the source line for the current breakpoint
+(@code{gdb-goto-breakpoint}).
+
+@item Mouse-2
+@kindex Mouse-2 @r{(GDB breakpoints buffer)}
+Visit the source line for the breakpoint you click on.
@end table
@node Stack Buffer
@subsubsection Stack Buffer
-The stack buffer displays a @dfn{call stack}, with one line for each
+ The stack buffer displays a @dfn{call stack}, with one line for each
of the nested subroutine calls (@dfn{stack frames}) now active in the
program. @xref{Backtrace,, Backtraces, gdb, The GNU debugger}.
@findex gdb-frames-select
-The selected frame number is displayed in reverse contrast. Move
-point to any frame in the stack and type @key{RET} to select it
-(@code{gdb-frames-select}) and display the associated source in the
-source buffer. Alternatively, click @kbd{Mouse-2} on a frame to
-select it. If the locals buffer is displayed then its contents update
-to display the variables that are local to the new frame.
+ The selected frame number is displayed in reverse contrast. To
+select a frame in GDB, move point in the stack buffer to that stack
+frame and type @key{RET} (@code{gdb-frames-select}), or click
+@kbd{Mouse-2} on a stack frame. If the locals buffer is visible,
+selecting a stack frame updates it to display the local variables of
+the new frame.
@node Watch Expressions
@subsubsection Watch Expressions
@cindex Watching expressions in GDB
@findex gud-watch
-If you want to see how a variable changes each time your program stops
-then place the cursor over the variable name and click on the watch
-icon in the tool bar (@code{gud-watch}).
+ If you want to see how a variable changes each time your program
+stops, move point into the variable name and click on the watch icon
+in the tool bar (@code{gud-watch}).
-Each watch expression is displayed in the speedbar. Complex data
+ Each watch expression is displayed in the speedbar. Complex data
types, such as arrays, structures and unions are represented in a tree
format. Leaves and simple data types show the name of the expression
and its value, and display the type as a tooltip. Higher levels show
the name, type and address value for pointers and just the name and
type otherwise.
-To expand or contract a complex data type, click @kbd{Mouse-2}
+ To expand or contract a complex data type, click @kbd{Mouse-2}
on the tag to the left of the expression.
@findex gdb-var-delete
-With the cursor over the root expression of a complex data type, type
-@kbd{D} to delete it from the speedbar
-(@code{gdb-var-delete}).
+ To delete a complex watch expression, move point to the root
+expression in the speedbar and type @kbd{D} (@code{gdb-var-delete}).
@kindex RET @r{(GDB speedbar)}
@findex gdb-edit-value
-With the cursor over a simple data type or an element of a complex
-data type which holds a value, type @key{RET} or click @kbd{Mouse-2} to edit
-its value. A prompt for a new value appears in the mini-buffer
-(@code{gdb-edit-value}).
+ To edit a variable with a simple data type, or a simple element of a
+complex data type, move point there in the speedbar and type @key{RET}
+(@code{gdb-edit-value}). Or you can click @kbd{Mouse-2} on a value to
+edit it. Either way, this reads the new value using the minibuffer.
@vindex gdb-show-changed-values
-If you set the variable @code{gdb-show-changed-values} to
-non-@code{nil} (the default value), Emacs will use
-font-lock-warning-face to display values that have recently changed in
-the speedbar.
+ If you set the variable @code{gdb-show-changed-values} to
+non-@code{nil} (the default value), Emacs uses
+@code{font-lock-warning-face} to highlight values that have recently
+changed.
@vindex gdb-use-colon-colon-notation
-If you set the variable @code{gdb-use-colon-colon-notation} to a
-non-@code{nil} value then, in C, Emacs will use the
-@var{function}::@var{variable} format to display variables in the
-speedbar. Since this does not work for variables defined in compound
-statements, the default value is @code{nil}.
+ If the variable @code{gdb-use-colon-colon-notation} is
+non-@code{nil}, Emacs uses the @samp{@var{function}::@var{variable}}
+format to display variables in the speedbar. Since this does not work
+for variables defined in compound statements, the default value is
+@code{nil}.
@node Other GDB User Interface Buffers
@subsubsection Other Buffers
@@ -949,8 +975,9 @@ statements, the default value is @code{nil}.
@vindex gdb-use-inferior-io-buffer
If the variable @code{gdb-use-inferior-io-buffer} is non-@code{nil},
the executable program that is being debugged takes its input and
-displays its output here, otherwise it uses the GUD buffer. To toggle
-the use of this buffer, do @kbd{M-x gdb-use-inferior-io-buffer}.
+displays its output here. Otherwise it uses the GUD buffer for that.
+To toggle the use of this buffer, do @kbd{M-x
+gdb-use-inferior-io-buffer}.
Some of the commands from shell mode are available here. @xref{Shell
Mode}.
@@ -972,15 +999,15 @@ The registers buffer displays the values held by the registers
(@pxref{Registers,,, gdb, The GNU debugger}). Press @key{RET} or
click @kbd{Mouse-2} on a register if you want to change its value.
With GDB 6.4 or later, recently changed register values display with
-font-lock-warning-face. With earlier versions of GDB, you can press
-@key{SPC} to toggle the display of floating point registers
+@code{font-lock-warning-face}. With earlier versions of GDB, you can
+press @key{SPC} to toggle the display of floating point registers
(@code{toggle-gdb-all-registers}).
@item Assembler Buffer
The assembler buffer displays the current frame as machine code. An
-overlay arrow points to the current instruction and you can set and
-remove breakpoints as with the source buffer. Breakpoint icons also
-appear in the fringe or margin.
+arrow points to the current instruction, and you can set and remove
+breakpoints as in a source buffer. Breakpoint icons also appear in
+the fringe or margin.
@item Threads Buffer
@findex gdb-threads-select
@@ -990,15 +1017,15 @@ threads, gdb, The GNU debugger}). Move point to any thread in the
list and press @key{RET} to select it (@code{gdb-threads-select}) and
display the associated source in the source buffer. Alternatively,
click @kbd{Mouse-2} on a thread to select it. If the locals buffer is
-displayed then its contents update to display the variables that are
-local to the new thread.
+visible, its contents update to display the variables that are local
+in the new thread.
@item Memory Buffer
-The memory buffer allows the user to examine sections of program
-memory (@pxref{Memory, Memory, Examining memory, gdb, The GNU
-debugger}). Click @kbd{Mouse-1} on the appropriate part of the header
-line to change the starting address or number of data items that the
-buffer displays. Click @kbd{Mouse-3} on the header line to select the
+The memory buffer lets you examine sections of program memory
+(@pxref{Memory, Memory, Examining memory, gdb, The GNU debugger}).
+Click @kbd{Mouse-1} on the appropriate part of the header line to
+change the starting address or number of data items that the buffer
+displays. Click @kbd{Mouse-3} on the header line to select the
display format or unit size for these data items.
@end table
@@ -1045,6 +1072,14 @@ available globally. @xref{Programs}.
conventionally end in @file{.el}. This ending tells Emacs to edit them in
Emacs-Lisp mode (@pxref{Executing Lisp}).
+@cindex byte code
+ Emacs Lisp code can be compiled into byte-code, which loads faster,
+takes up less space, and executes faster. @xref{Byte Compilation,,
+Byte Compilation, elisp, the Emacs Lisp Reference Manual}. By
+convention, the compiled code for a library goes in a separate file
+whose name ends in @samp{.elc}. Thus, the compiled code for
+@file{foo.el} goes in @file{foo.elc}.
+
@findex load-file
To execute a file of Emacs Lisp code, use @kbd{M-x load-file}. This
command reads a file name using the minibuffer and then executes the
@@ -1055,9 +1090,9 @@ not text in an Emacs buffer.
@findex load
@findex load-library
Once a file of Lisp code is installed in the Emacs Lisp library
-directories, users can load it using @kbd{M-x load-library}. Programs can
-load it by calling @code{load-library}, or with @code{load}, a more primitive
-function that is similar but accepts some additional arguments.
+directories, users can load it using @kbd{M-x load-library}. Programs
+can load it by calling @code{load}, a more primitive function that is
+similar but accepts some additional arguments.
@kbd{M-x load-library} differs from @kbd{M-x load-file} in that it
searches a sequence of directories and tries three file names in each
@@ -1068,9 +1103,11 @@ the result of compiling @file{@var{lib}.el}; it is better to load the
compiled file, since it will load and run faster.
If @code{load-library} finds that @file{@var{lib}.el} is newer than
-@file{@var{lib}.elc} file, it issues a warning, because it's likely that
-somebody made changes to the @file{.el} file and forgot to recompile
-it.
+@file{@var{lib}.elc} file, it issues a warning, because it's likely
+that somebody made changes to the @file{.el} file and forgot to
+recompile it. Nonetheless, it loads @file{@var{lib}.elc}. This is
+because people often leave unfinished edits the source file, and don't
+recompile it until they think it is ready to use.
Because the argument to @code{load-library} is usually not in itself
a valid file name, file name completion is not available. Indeed, when
@@ -1080,7 +1117,7 @@ will be used.
@vindex load-path
The sequence of directories searched by @kbd{M-x load-library} is
specified by the variable @code{load-path}, a list of strings that are
-directory names. The default value of the list contains the directory where
+directory names. The default value of the list contains the directories where
the Lisp code for Emacs itself is stored. If you have libraries of
your own, put them in a single directory and add that directory
to @code{load-path}. @code{nil} in this list stands for the current default
@@ -1096,15 +1133,6 @@ library. Trying to run any of those commands calls @code{load} to load
the library; this replaces the autoload definitions with the real ones
from the library.
-@cindex byte code
- Emacs Lisp code can be compiled into byte-code which loads faster,
-takes up less space when loaded, and executes faster. @xref{Byte
-Compilation,, Byte Compilation, elisp, the Emacs Lisp Reference Manual}.
-By convention, the compiled code for a library goes in a separate file
-whose name consists of the library source file with @samp{c} appended.
-Thus, the compiled code for @file{foo.el} goes in @file{foo.elc}.
-That's why @code{load-library} searches for @samp{.elc} files first.
-
@vindex load-dangerous-libraries
@cindex Lisp files byte-compiled by XEmacs
By default, Emacs refuses to load compiled Lisp files which were
@@ -1217,7 +1245,7 @@ The customizable variables @code{eval-expression-print-level} and
of lists to print in the result of the evaluation commands before
abbreviating them. @code{eval-expression-debug-on-error} controls
whether evaluation errors invoke the debugger when these commands are
-used.
+used; its default is @code{t}.
@node Lisp Interaction
@section Lisp Interaction Buffers
@@ -1279,9 +1307,9 @@ mode.
@findex lisp-mode
For the source files of programs to run in external Lisps, use Lisp
-mode. This mode can be selected with @kbd{M-x lisp-mode}, and is used
-automatically for files whose names end in @file{.l}, @file{.lsp}, or
-@file{.lisp}, as most Lisp systems usually expect.
+mode. You can switch to this mode with @kbd{M-x lisp-mode}, and it is
+used automatically for files whose names end in @file{.l},
+@file{.lsp}, or @file{.lisp}.
@kindex C-M-x @r{(Lisp mode)}
@findex lisp-eval-defun
@@ -1292,12 +1320,13 @@ which finds the defun around or following point and sends it as input to
the Lisp process. (Emacs can send input to any inferior process regardless
of what buffer is current.)
- Contrast the meanings of @kbd{C-M-x} in Lisp mode (for editing programs
-to be run in another Lisp system) and Emacs-Lisp mode (for editing Lisp
-programs to be run in Emacs): in both modes it has the effect of installing
-the function definition that point is in, but the way of doing so is
-different according to where the relevant Lisp environment is found.
-@xref{Executing Lisp}.
+ Contrast the meanings of @kbd{C-M-x} in Lisp mode (for editing
+programs to be run in another Lisp system) and Emacs-Lisp mode (for
+editing Lisp programs to be run in Emacs; see @pxref{Lisp Eval}): in
+both modes it has the effect of installing the function definition
+that point is in, but the way of doing so is different according to
+where the relevant Lisp environment is found.
+
@ignore
arch-tag: 9c3c2f71-b332-4144-8500-3ff9945a50ed
diff --git a/man/calc.texi b/man/calc.texi
index 5eab5322fca..02a542ca761 100644
--- a/man/calc.texi
+++ b/man/calc.texi
@@ -84,7 +84,7 @@
This file documents Calc, the GNU Emacs calculator.
Copyright (C) 1990, 1991, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -120,7 +120,7 @@ Software Foundation raise funds for GNU development.''
@vskip 0pt plus 1filll
Copyright @copyright{} 1990, 1991, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
@insertcopying
@end titlepage
diff --git a/man/calendar.texi b/man/calendar.texi
index e5ddaa28e1b..988a509ca02 100644
--- a/man/calendar.texi
+++ b/man/calendar.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Calendar/Diary, Gnus, Dired, Top
@chapter The Calendar and the Diary
diff --git a/man/cc-mode.texi b/man/cc-mode.texi
index 1bed04d1dda..00bd427f5dd 100644
--- a/man/cc-mode.texi
+++ b/man/cc-mode.texi
@@ -160,7 +160,7 @@ CC Mode
This manual is for CC Mode in Emacs.
Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/cl.texi b/man/cl.texi
index 92c93c487bf..c6c0a329cde 100644
--- a/man/cl.texi
+++ b/man/cl.texi
@@ -5,7 +5,7 @@
@copying
This file documents the GNU Emacs Common Lisp emulation package.
-Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 1993, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/cmdargs.texi b/man/cmdargs.texi
index 74de707cd2c..f266913d266 100644
--- a/man/cmdargs.texi
+++ b/man/cmdargs.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Emacs Invocation, X Resources, GNU Free Documentation License, Top
@appendix Command Line Arguments for Emacs Invocation
@@ -477,7 +477,7 @@ This variable defaults to @file{~/.bash_history} if you use Bash, to
@file{~/.sh_history} if you use ksh, and to @file{~/.history}
otherwise.
@item HOME
-The location of the user's files in the directory tree; used for
+The location of your files in the directory tree; used for
expansion of file names starting with a tilde (@file{~}). On MS-DOS,
it defaults to the directory from which Emacs was started, with
@samp{/bin} removed from the end if it was present. On Windows, the
@@ -525,11 +525,11 @@ environment and coding system. @xref{Language Environments}.
@item LOGNAME
The user's login name. See also @env{USER}.
@item MAIL
-The name of the user's system mail inbox.
+The name of your system mail inbox.
@item MH
Name of setup file for the mh system. (The default is @file{~/.mh_profile}.)
@item NAME
-The real-world name of the user.
+Your real-world name.
@item NNTPSERVER
The name of the news server. Used by the mh and Gnus packages.
@item ORGANIZATION
@@ -987,7 +987,7 @@ emacs -ms coral -cr 'slate blue' &
@samp{-rv} option or with the X resource @samp{reverseVideo}.
The @samp{-fg}, @samp{-bg}, and @samp{-rv} options function on
-text-only terminals as well as on window systems.
+text-only terminals as well as on graphical displays.
@node Window Size X
@appendixsec Options for Window Size and Position
@@ -1165,7 +1165,7 @@ for the initial Emacs frame.
@appendixsec Icons
@cindex icons (X Window System)
- Most window managers allow the user to ``iconify'' a frame, removing
+ Most window managers allow you to ``iconify'' a frame, removing
it from sight, and leaving a small, distinctive ``icon'' window in its
place. Clicking on the icon window makes the frame itself appear again.
If you have many clients running at once, you can avoid cluttering up
diff --git a/man/commands.texi b/man/commands.texi
index 7830433676c..eba539c15b7 100644
--- a/man/commands.texi
+++ b/man/commands.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@iftex
@chapter Characters, Keys and Commands
@@ -268,7 +268,7 @@ with codes 128 through 255 can also appear in multibyte buffers.
If you disable multibyte characters, then you can use only one
alphabet of non-@acronym{ASCII} characters, but they all fit in one byte. They
-use codes 0200 through 0377. @xref{Single-Byte Character Support}.
+use codes 0200 through 0377. @xref{Unibyte Mode}.
@ifnottex
@lowersections
diff --git a/man/custom.texi b/man/custom.texi
index d10c8aeca2e..2efbdd81398 100644
--- a/man/custom.texi
+++ b/man/custom.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Customization, Quitting, Amusements, Top
@chapter Customization
@@ -117,14 +117,14 @@ system crash. @xref{Auto Save}.
Font-Lock mode automatically highlights certain textual units found in
programs, such as comments, strings, and function names being defined.
-This requires a window system that can display multiple fonts.
+This requires a graphical display that can show multiple fonts.
@xref{Faces}.
ISO Accents mode makes the characters @samp{`}, @samp{'}, @samp{"},
@samp{^}, @samp{/} and @samp{~} combine with the following letter, to
produce an accented letter in the ISO Latin-1 character set. The
newer and more general feature of input methods more or less
-supersedes ISO Accents mode. @xref{Single-Byte Character Support}.
+supersedes ISO Accents mode. @xref{Unibyte Mode}.
Outline minor mode provides the same facilities as the major mode
called Outline mode; but since it is a minor mode instead, you can
@@ -201,7 +201,7 @@ and set their values, and to save settings permanently in your
@file{~/.emacs} file (@pxref{Init File}).
The appearance of the example buffers in this section is typically
-different under a window system, since faces are then used to indicate
+different under a graphical display, since faces are then used to indicate
buttons, links and editable fields.
@menu
@@ -2030,7 +2030,7 @@ Reference Manual}.
When Emacs is started, it normally loads a Lisp program from the
file @file{.emacs} or @file{.emacs.el} in your home directory
-(see @ref{General Variables, HOME} if you don't know where that is).
+(see @ref{General Variables, HOME}, if you don't know where that is).
We call this file your @dfn{init file} because it specifies how to
initialize Emacs for you. You can use the command line switch
@samp{-q} to prevent loading your init file, and @samp{-u} (or
@@ -2456,7 +2456,7 @@ currently pretending to be. The idea is that you should get your own
editor customizations even if you are running as the super user.
More precisely, Emacs first determines which user's init file to use.
-It gets the user name from the environment variables @env{LOGNAME} and
+It gets your user name from the environment variables @env{LOGNAME} and
@env{USER}; if neither of those exists, it uses effective user-ID.
If that user name matches the real user-ID, then Emacs uses @env{HOME};
otherwise, it looks up the home directory corresponding to that user
diff --git a/man/dired-x.texi b/man/dired-x.texi
index dc02be52003..184d25b363a 100644
--- a/man/dired-x.texi
+++ b/man/dired-x.texi
@@ -29,7 +29,7 @@ This documents the ``extra'' features for Dired Mode for GNU Emacs found in
the file @file{dired-x.el}.
Copyright @copyright{} 1993, 1994, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to make and distribute verbatim copies of this
diff --git a/man/dired.texi b/man/dired.texi
index 051c735f996..a432d681918 100644
--- a/man/dired.texi
+++ b/man/dired.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Dired, Calendar/Diary, Rmail, Top
@chapter Dired, the Directory Editor
diff --git a/man/display.texi b/man/display.texi
index 1f359f9e5aa..9c653e2ca56 100644
--- a/man/display.texi
+++ b/man/display.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Display, Search, Registers, Top
@chapter Controlling the Display
@@ -985,7 +985,7 @@ either as escape sequences or as graphics. They do not normally occur
in multibyte buffers, but if they do, they are displayed as Latin-1
graphics. In unibyte mode, if you enable European display they are
displayed using their graphics (assuming your terminal supports them),
-otherwise as escape sequences. @xref{Single-Byte Character Support}.
+otherwise as escape sequences. @xref{Unibyte Mode}.
@vindex nobreak-char-display
@cindex no-break space, display
diff --git a/man/ebrowse.texi b/man/ebrowse.texi
index 77e4ad07b45..db58c819922 100644
--- a/man/ebrowse.texi
+++ b/man/ebrowse.texi
@@ -11,7 +11,7 @@
This file documents Ebrowse, a C++ class browser for GNU Emacs.
Copyright @copyright{} 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/ediff.texi b/man/ediff.texi
index 823219f4a63..67e822049cb 100644
--- a/man/ediff.texi
+++ b/man/ediff.texi
@@ -26,7 +26,7 @@ This file documents Ediff, a comprehensive visual interface to Unix diff
and patch utilities.
Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/emacs-mime.texi b/man/emacs-mime.texi
index 9df33969bec..3e9f2b5f283 100644
--- a/man/emacs-mime.texi
+++ b/man/emacs-mime.texi
@@ -9,7 +9,7 @@
@copying
This file documents the Emacs MIME interface functionality.
-Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
@quotation
diff --git a/man/emacs-xtra.texi b/man/emacs-xtra.texi
index 0c7cea886f8..a352bc913c2 100644
--- a/man/emacs-xtra.texi
+++ b/man/emacs-xtra.texi
@@ -10,7 +10,7 @@
@copying
This manual describes specialized features of Emacs.
-Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/emacs.texi b/man/emacs.texi
index 5fb9af71c43..59e95e13446 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -12,7 +12,7 @@ This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},
updated for Emacs version @value{EMACSVER}.
Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -469,7 +469,7 @@ International Character Set Support
that cover the whole spectrum of characters.
* Defining Fontsets:: Defining a new fontset.
* Undisplayable Characters::When characters don't display.
-* Single-Byte Character Support:: You can pick one European character set
+* Unibyte Mode:: You can pick one European character set
to use without multibyte characters.
* Charsets:: How Emacs groups its internal character codes.
@@ -612,9 +612,7 @@ Running Debuggers Under Emacs
Maintaining Programs
* Change Log:: Maintaining a change history for your program.
-@ignore
-* Authors:: Maintaining the Emacs @file{AUTHORS} file.
-@end ignore
+* Format of ChangeLog:: What the change log file looks like.
* Tags:: Go direct to any function in your program in one
command. Tags remembers which file it is in.
* Emerge:: A convenient way of merging two versions of a program.
@@ -956,12 +954,11 @@ files, which are also distributed along with GNU Emacs.
editors, all sharing common principles of organization. For information on
the underlying philosophy of Emacs and the lessons learned from its
development, write for a copy of AI memo 519a, @cite{Emacs, the Extensible,
-Customizable Self-Documenting Display Editor}, to Publications Department,
-Artificial Intelligence Lab, 545 Tech Square, Cambridge, MA 02139, USA@. At
-last report they charge $2.25 per copy. Another useful publication is LCS
-TM-165, @cite{A Cookbook for an Emacs}, by Craig Finseth, available from
-Publications Department, Laboratory for Computer Science, 545 Tech Square,
-Cambridge, MA 02139, USA@. The price today is $3.
+Customizable Self-Documenting Display Editor}, is available from
+@url{ftp://publications.ai.mit.edu/ai-publications/pdf/AIM-519A.pdf}.
+Another useful publication is LCS TM-165, @cite{A Cookbook for an
+Emacs}, by Craig Finseth, is available from the MIT libraries in some
+fashion.
This edition of the manual is intended for use with GNU Emacs
installed on GNU and Unix systems. GNU Emacs can also be used on VMS,
@@ -1152,11 +1149,12 @@ can write an extension, anybody can use it afterward. @xref{Top,
Emacs Lisp Intro, Preface, eintr, An Introduction to Programming in
Emacs Lisp}, if you want to learn Emacs Lisp programming.
- When running on a graphics terminal, Emacs provides its own menus
+ When running on a graphical display, Emacs provides its own menus
and convenient handling of mouse buttons. But Emacs provides many of
-the benefits of a window system even on a text-only terminal. For
-instance, you can look at or edit several files at once, move text
-between files, and edit files while running shell commands.
+the benefits of a graphical display even on a text-only terminal. For
+instance, it can highlight parts of a file, display and edit several
+files at once, move text between files, and edit files while running
+shell commands.
@include screen.texi
@include commands.texi
diff --git a/man/entering.texi b/man/entering.texi
index 5d1003e82fb..6a9ac0e8347 100644
--- a/man/entering.texi
+++ b/man/entering.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Entering Emacs, Exiting, Text Characters, Top
@chapter Entering and Exiting Emacs
diff --git a/man/erc.texi b/man/erc.texi
index d4053e5e737..fb9c60d635d 100644
--- a/man/erc.texi
+++ b/man/erc.texi
@@ -12,7 +12,7 @@
@syncodeindex fn cp
@copying
-This manual is for ERC version 5.1.
+This manual is for ERC version 5.1.1.
Copyright @copyright{} 2005, 2006 Free Software Foundation, Inc.
@@ -607,7 +607,7 @@ decided to include ERC in Emacs.
@item 2006
-ERC 5.1 is released.
+ERC 5.1 is released. It is subsequently included in Emacs 22.
@end itemize
diff --git a/man/eshell.texi b/man/eshell.texi
index a9ec167ea6a..e0a59774b42 100644
--- a/man/eshell.texi
+++ b/man/eshell.texi
@@ -9,7 +9,7 @@
This manual is for Eshell, the Emacs shell.
Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/eudc.texi b/man/eudc.texi
index beec0e01a70..f402cc31d38 100644
--- a/man/eudc.texi
+++ b/man/eudc.texi
@@ -13,7 +13,7 @@ directory servers using various protocols such as LDAP or the CCSO white
pages directory system (PH/QI)
Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/faq.texi b/man/faq.texi
index 95b79a86af6..77955d9c1ce 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -9,8 +9,12 @@
@c This is used in many places
@set VER 22.1
+@c This file is maintained by Romain Francoise <rfrancoise@gnu.org>.
+@c Feel free to install changes without prior permission (but I'd
+@c appreciate a notice if you do).
+
@copying
-Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
Copyright 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner@*
Copyright 1992,1993 Steven Byrnes@*
Copyright 1990,1991,1992 Joseph Brian Wells@*
@@ -3754,7 +3758,7 @@ Java code. It is distributed with Emacs, but has
@email{kyle_jones@@wonderworks.com, Kyle Jones}
@item Latest version
-7.15
+7.19
@item Distribution
@uref{ftp://ftp.wonderworks.com/pub/vm/vm.tar.gz}
@@ -4675,8 +4679,7 @@ terminals. Non-@acronym{ASCII} keys and mouse events (e.g. @kbd{C-=} and
@cindex @key{Meta} key and @code{xterm}
@cindex Xterm and @key{Meta} key
-@inforef{Single-Byte Character Support, Single-Byte Character Set
-Support, emacs}.
+@inforef{Unibyte Mode, Single-Byte Character Set Support, emacs}.
If the advice in the Emacs manual fails, try all of these methods before
asking for further help:
@@ -4776,10 +4779,10 @@ You can get the old behavior by binding @kbd{SPC} to
@code{minibuffer-complete-word} in the minibuffer, as follows:
@lisp
-(define-key minibuffer-local-filename-completion-map (kbd "SPC")
+(define-key minibuffer-local-filename-completion-map (kbd "SPC")
'minibuffer-complete-word)
-(define-key minibuffer-local-must-match-filename-map (kbd "SPC")
+(define-key minibuffer-local-must-match-filename-map (kbd "SPC")
'minibuffer-complete-word)
@end lisp
@@ -4800,7 +4803,7 @@ You can get the old behavior by binding @kbd{SPC} to
@cindex Displaying eight-bit characters
@cindex Eight-bit characters, displaying
-@inforef{Single-Byte Character Support, Single-byte Character Set
+@inforef{Unibyte Mode, Single-byte Character Set
Support, emacs}. On a Unix, when Emacs runs on a text-only terminal
display or is invoked with @samp{emacs -nw}, you typically need to use
@code{set-terminal-coding-system} to tell Emacs what the terminal can
@@ -4817,7 +4820,7 @@ terminal coding system automatically.
@cindex Input, 8-bit characters
Various methods are available for input of eight-bit characters. See
-@inforef{Single-Byte Character Support, Single-byte Character Set
+@inforef{Unibyte Mode, Single-byte Character Set
Support, emacs}. For more sophisticated methods, @inforef{Input
Methods, Input Methods, emacs}.
diff --git a/man/files.texi b/man/files.texi
index 6edf938261a..4bafc9b736c 100644
--- a/man/files.texi
+++ b/man/files.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000,
-@c 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Files, Buffers, Keyboard Macros, Top
@chapter File Handling
@@ -242,12 +242,11 @@ GNU/Linux platforms, Emacs does that when built with GTK, LessTif, and
Motif toolkits; on MS-Windows, the GUI version does that by default.
For information on how to customize this, see @ref{Dialog Boxes}.
- Secondly, Emacs supports the ``drag and drop'' protocol on the X
-window system. Dropping a file into an ordinary Emacs window visits
-the file using that window. However, dropping a file into a window
-displaying a Dired buffer moves or copies the file into the displayed
-directory. For details, see @ref{Drag and Drop}, @ref{Misc Dired
-Features}.
+ Secondly, Emacs supports ``drag and drop''; dropping a file into an
+ordinary Emacs window visits the file using that window. However,
+dropping a file into a window displaying a Dired buffer moves or
+copies the file into the displayed directory. For details, see
+@ref{Drag and Drop}, and @ref{Misc Dired Features}.
@cindex creating files
What if you want to create a new file? Just visit it. Emacs displays
diff --git a/man/fixit.texi b/man/fixit.texi
index d552c66f733..fed37ce9705 100644
--- a/man/fixit.texi
+++ b/man/fixit.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Fixit, Keyboard Macros, Search, Top
@chapter Commands for Fixing Typos
diff --git a/man/forms.texi b/man/forms.texi
index c18987602b5..efd9368fdb0 100644
--- a/man/forms.texi
+++ b/man/forms.texi
@@ -19,7 +19,7 @@
This file documents Forms mode, a form-editing major mode for GNU Emacs.
Copyright (C) 1989, 1997, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/frames.texi b/man/frames.texi
index 3561bd89b2d..f25399e071b 100644
--- a/man/frames.texi
+++ b/man/frames.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000,
-@c 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Frames, International, Windows, Top
@chapter Frames and Graphical Displays
@@ -510,8 +510,10 @@ Here's a similar example for specifying a foreground color:
@kindex C-z @r{(X windows)}
@findex iconify-or-deiconify-frame
Iconify the selected Emacs frame (@code{iconify-or-deiconify-frame}).
-The normal meaning of @kbd{C-z}, to suspend Emacs, is not useful under a
-window system, so it has a different binding in that case.
+The normal meaning of @kbd{C-z}, to suspend Emacs, is not useful under
+a graphical display that allows multiple applications to operate
+simultaneously in their own windies, so Emacs gives @kbd{C-z} a
+different binding in that case.
If you type this command on an Emacs frame's icon, it deiconifies the frame.
@@ -967,8 +969,8 @@ customizing the windows that display tooltips.
@cindex mouse avoidance
@vindex mouse-avoidance-mode
-Mouse Avoidance mode keeps the window system mouse pointer away from
-point, to avoid obscuring text. Whenever it moves the mouse, it also
+Mouse Avoidance mode keeps the mouse pointer away from point, to avoid
+obscuring text you want to edit. Whenever it moves the mouse, it also
raises the frame. To use Mouse Avoidance mode, customize the variable
@code{mouse-avoidance-mode}. You can set this to various values to
move the mouse in several ways:
diff --git a/man/glossary.texi b/man/glossary.texi
index 19939b72ffd..9d86a8d12cc 100644
--- a/man/glossary.texi
+++ b/man/glossary.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Glossary, Key Index, Intro, Top
@unnumbered Glossary
@@ -367,7 +367,7 @@ Buttons}.
@item Dribble File
A dribble file is a file into which Emacs writes all the characters that
-the user types on the keyboard. Dribble files are used to make a record
+you type on the keyboard. Dribble files are used to make a record
for debugging Emacs bugs. Emacs does not make a dribble file unless you
tell it to. @xref{Bugs}.
@@ -506,7 +506,7 @@ into Emacs windows (q.v.@:). When you are using a window system
but in Emacs a window means something else.
@item Fringe
-On a graphical terminal (q.v.@:), there's a narrow portion of the
+On a graphical display (q.v.@:), there's a narrow portion of the
frame (q.v.@:) between the text area and the window's border. Emacs
displays the fringe using a special face (q.v.@:) called
@code{fringe}. @xref{Faces,fringe}.
@@ -557,8 +557,8 @@ letters, digits, punctuation, and spaces; they do not include
@key{RET} or @key{ESC}. In Emacs, typing a graphic character inserts
that character (in ordinary editing modes). @xref{Inserting Text}.
-@item Graphical Terminal
-A graphical terminal is one that can display images and multiple fonts.
+@item Graphical Display
+A graphical display is one that can display images and multiple fonts.
Usually it also has a window system (q.v.@:).
@item Highlighting
@@ -869,7 +869,7 @@ location in text so that you can move point to that location.
@item Narrowing
Narrowing means creating a restriction (q.v.@:) that limits editing in
the current buffer to only a part of the text in the buffer. Text
-outside that part is inaccessible to the user until the boundaries are
+outside that part is inaccessible for editing until the boundaries are
widened again, but it is still there, and saving the file saves it
all. @xref{Narrowing}.
@@ -982,7 +982,7 @@ one corner and putting the mark at the diagonally opposite corner.
@item Recursive Editing Level
A recursive editing level is a state in which part of the execution of
-a command involves asking the user to edit some text. This text may
+a command involves asking you to edit some text. This text may
or may not be the same as the text to which the command was applied.
The mode line indicates recursive editing levels with square brackets
(@samp{[} and @samp{]}). @xref{Recursive Edit}.
@@ -1289,8 +1289,10 @@ other editors use the term ``window'' for what we call a `frame'
(q.v.@:) in Emacs.
@item Window System
-A window system is a graphical terminal (q.v.@:) that can display multiple
-windows for different programs at the same time.
+A window system is software that operates on a graphical display
+(q.v.@:), to subdivide the screen so that multiple applications can
+have their] own windows at the same time. All modern operating systems
+include a window system.
@item Word Abbrev
See `abbrev.'
diff --git a/man/gnu.texi b/man/gnu.texi
index 0f216152b11..758814979d1 100644
--- a/man/gnu.texi
+++ b/man/gnu.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1995, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@ifclear justgnu
@node Manifesto,, MS-DOS, Top
@unnumbered The GNU Manifesto
diff --git a/man/help.texi b/man/help.texi
index f523b015cb7..634dca792f0 100644
--- a/man/help.texi
+++ b/man/help.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Help, Mark, M-x, Top
@chapter Help
@@ -644,7 +644,7 @@ Emacs (@code{describe-no-warranty}).
@cindex balloon help
When a region of text is ``active,'' so that you can select it with
the mouse or a key like @kbd{RET}, it often has associated help text.
-Areas of the mode line are examples. On most window systems, the help
+Areas of the mode line are examples. On graphical displays, the help
text is displayed as a ``tooltip'' (sometimes known as ``balloon
help''), when you move the mouse over the active text. @xref{Tooltips}.
On some systems, it is shown in the echo area. On text-only
diff --git a/man/idlwave.texi b/man/idlwave.texi
index d628f7ae4eb..7e9e19bb1c8 100644
--- a/man/idlwave.texi
+++ b/man/idlwave.texi
@@ -30,7 +30,7 @@ This is edition @value{EDITION} of the IDLWAVE User Manual for IDLWAVE
@value{VERSION}
Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 or
@@ -61,7 +61,7 @@ This is edition @value{EDITION} of the @cite{IDLWAVE User Manual} for
IDLWAVE version @value{VERSION}, @value{DATE}.
@sp 2
Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
@sp 2
@cindex Copyright, of IDLWAVE
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/indent.texi b/man/indent.texi
index ad0ef315fe8..319244bface 100644
--- a/man/indent.texi
+++ b/man/indent.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Indentation, Text, Major Modes, Top
@chapter Indentation
diff --git a/man/info.texi b/man/info.texi
index ce8bc6a2bf4..76586e5db4e 100644
--- a/man/info.texi
+++ b/man/info.texi
@@ -15,7 +15,7 @@ This file describes how to use Info, the on-line, menu-driven GNU
documentation system.
Copyright (C) 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/killing.texi b/man/killing.texi
index 219f2329c38..449197e4eef 100644
--- a/man/killing.texi
+++ b/man/killing.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Killing, Yanking, Mark, Top
@@ -125,7 +125,7 @@ character backwards.
should be.
Why do we say ``or it should be''? When Emacs starts up using a
-window system, it determines automatically which key or keys should be
+graphical display, it determines automatically which key or keys should be
equivalent to @key{DEL}. As a result, @key{BACKSPACE} and/or @key{DELETE}
keys normally do the right things. But in some unusual cases Emacs
gets the wrong information from the system. If these keys don't do
@@ -264,7 +264,7 @@ them into Emacs.
@cindex Delete Selection mode
@cindex mode, Delete Selection
@findex delete-selection-mode
- Many window systems follow the convention that insertion while text
+ Many graphical applications follow the convention that insertion while text
is selected deletes the selected text. You can make Emacs behave this
way by enabling Delete Selection mode---with @kbd{M-x
delete-selection-mode} or using Custom. Another effect of this mode
diff --git a/man/kmacro.texi b/man/kmacro.texi
index 89cd8f9e54b..7f14c40a95b 100644
--- a/man/kmacro.texi
+++ b/man/kmacro.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Keyboard Macros, Files, Fixit, Top
@chapter Keyboard Macros
@@ -10,7 +10,7 @@
In this chapter we describe how to record a sequence of editing
commands so you can repeat it conveniently later.
- A @dfn{keyboard macro} is a command defined by the user to stand for
+ A @dfn{keyboard macro} is a command defined by an Emacs user to stand for
another sequence of keys. For example, if you discover that you are
about to type @kbd{C-n M-d C-d} forty times, you can speed your work by
defining a keyboard macro to do @kbd{C-n M-d C-d}, and then executing
@@ -303,54 +303,43 @@ macro, the counter will increase by 2 on each repetition of the macro.
@findex kmacro-insert-counter
@kindex C-x C-k C-i
The command @kbd{C-x C-k C-i} (@code{kmacro-insert-counter}) inserts
-the current value of the keyboard macro counter and increments the
-counter by 1. You can use a numeric prefix argument to specify a
-different increment. If you just specify a @kbd{C-u} prefix, the last
-inserted counter value is repeated and the counter is not incremented.
-For example, if you enter the following sequence while defining a macro
+the current value of the current keyboard macro's counter, and
+increments the counter by 1. You can use a numeric prefix argument to
+specify a different increment. If you just specify a @kbd{C-u}
+prefix, then the increment is zero, so it repeats the last inserted
+counter value. For example, if you enter the following sequence while
+defining a macro
@example
C-x C-k C-i C-x C-k C-i C-u C-x C-k C-i C-x C-k C-i
@end example
@noindent
-the text @samp{0112} is inserted in the buffer, and for the first and
-second execution of the macro @samp{3445} and @samp{6778} are
-inserted.
+it inserts @samp{0112} in the buffer. The next two iterations
+of the macro will insert @samp{3445} and @samp{6778}.
- This command usually only makes sense while defining a keyboard macro.
-But its behavior when no keyboard macro is being defined or executed
-is predictable: it inserts and increments the counter of the head of
-the keyboard macro ring.
+ This command usually only makes sense while defining a keyboard
+macro. But its behavior when no keyboard macro is being defined or
+executed is predictable: it inserts and increments the counter of the
+macro at the head of the keyboard macro ring.
@findex kmacro-set-counter
@kindex C-x C-k C-c
- The command @kbd{C-x C-k C-c} (@code{kmacro-set-counter}) prompts
-for the initial value of the keyboard macro counter if you use it
-before you define a keyboard macro. If you use it before executing a
-keyboard macro, it resets that macro's counter. If you use it while
-defining a keyboard macro, then the macro counter gets reset to that same
-value on each repetition of the macro. Rather than having the command
-prompt for a value, you can also specify the value with a numeric
-prefix argument. If you just specify a @kbd{C-u} prefix, the counter
-is reset to the value it had prior to the current repetition of the
-macro (undoing any increments so far in this repetition). If you just
-specify a @kbd{C-u} prefix while no macro is being defined or executed,
-then the new value of the counter is essentially unpredictable.
+ The command @kbd{C-x C-k C-c} (@code{kmacro-set-counter}) sets the
+current macro counter to the value of the numeric argument. If you use
+it inside the macro, it operates on each repetition of the macro. If
+you specify just @kbd{C-u} as the prefix, while executing the macro,
+that resets the counter to the value it had at the beginning of the
+current repetition of the macro (undoing any increments so far in this
+repetition).
@findex kmacro-add-counter
@kindex C-x C-k C-a
- The command @kbd{C-x C-k C-a} (@code{kmacro-add-counter}) prompts
-for a value to add to the macro counter. You can also specify the
-value with a numeric prefix argument. If you just specify a @kbd{C-u}
-prefix, the counter is reset to the last value inserted by any
-keyboard macro. Usually, this will only make sense if that value was
-inserted during the current macro definition or repetition.
-
- This command normally only makes sense while defining a keyboard macro.
-But its behavior when no keyboard macro is being defined or executed
-is predictable: it affects the counter of the head of the keyboard
-macro ring.
+ The command @kbd{C-x C-k C-a} (@code{kmacro-add-counter}) adds the
+prefix argument to the current macro counter. With just @kbd{C-u} as
+argument, it resets the counter to the last value inserted by any
+keyboard macro. (Normally, when you use this, the last insertion
+will be in the same macro and it will be the same counter.)
@findex kmacro-set-format
@kindex C-x C-k C-f
@@ -364,7 +353,7 @@ integer extra argument (@pxref{Formatting Strings,,, elisp, The Emacs
Lisp Reference Manual}). Do not put the format string inside double
quotes when you insert it in the minibuffer.
-If you use this command while no keyboard macro is being defined or
+ If you use this command while no keyboard macro is being defined or
executed, the new format affects all subsequent macro definitions.
Existing macros continue to use the format in effect when they were
defined. If you set the format while defining a keyboard macro, this
@@ -375,7 +364,7 @@ to the macro format during execution of a macro, like the
corresponding changes during its definition, have no effect on
subsequent macros.
-The format set by @kbd{C-x C-k C-f} does not affect insertion of
+ The format set by @kbd{C-x C-k C-f} does not affect insertion of
numbers stored in registers.
@node Keyboard Macro Query
diff --git a/man/m-x.texi b/man/m-x.texi
index 761bba414df..9030f809cc3 100644
--- a/man/m-x.texi
+++ b/man/m-x.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node M-x, Help, Minibuffer, Top
@chapter Running Commands by Name
diff --git a/man/macos.texi b/man/macos.texi
index b4c09217092..76a11ea92e7 100644
--- a/man/macos.texi
+++ b/man/macos.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2000, 2001, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Mac OS, MS-DOS, Antinews, Top
@appendix Emacs and Mac OS
diff --git a/man/maintaining.texi b/man/maintaining.texi
index 2af47f6ecaf..66a235ae119 100644
--- a/man/maintaining.texi
+++ b/man/maintaining.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000,
-@c 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Maintaining, Abbrevs, Building, Top
@chapter Maintaining Programs
@@ -14,6 +14,7 @@ useful for this purpose.
@menu
* Change Log:: Maintaining a change history for your program.
+* Format of ChangeLog:: What the change log file looks like.
* Tags:: Go direct to any function in your program in one
command. Tags remembers which file it is in.
* Emerge:: A convenient way of merging two versions of a program.
@@ -22,6 +23,14 @@ useful for this purpose.
@node Change Log
@section Change Logs
+ A change log file contains a chronological record of when and why you
+have changed a program, consisting of a sequence of entries describing
+individual changes. Normally it is kept in a file called
+@file{ChangeLog} in the same directory as the file you are editing, or
+one of its parent directories. A single @file{ChangeLog} file can
+record changes for all the files in its directory and all its
+subdirectories.
+
@cindex change log
@kindex C-x 4 a
@findex add-change-log-entry-other-window
@@ -32,58 +41,6 @@ a backup file, it makes an entry appropriate for the file's
parent---that is useful for making log entries for functions that
have been deleted in the current version.
- A change log file contains a chronological record of when and why you
-have changed a program, consisting of a sequence of entries describing
-individual changes. Normally it is kept in a file called
-@file{ChangeLog} in the same directory as the file you are editing, or
-one of its parent directories. A single @file{ChangeLog} file can
-record changes for all the files in its directory and all its
-subdirectories.
-
- You should put a copyright notice and permission notice at the
-end of the change log file. Here is an example:
-
-@example
-Copyright 1997, 1998 Free Software Foundation, Inc.
-Copying and distribution of this file, with or without modification, are
-permitted provided the copyright notice and this notice are preserved.
-@end example
-
-@noindent
-Of course, you should substitute the proper years and copyright holder.
-
- A change log entry starts with a header line that contains the current
-date, your name, and your email address (taken from the variable
-@code{add-log-mailing-address}). Aside from these header lines, every
-line in the change log starts with a space or a tab. The bulk of the
-entry consists of @dfn{items}, each of which starts with a line starting
-with whitespace and a star. Here are two entries, both dated in May
-1993, with two items and one item respectively.
-
-@iftex
-@medbreak
-@end iftex
-@smallexample
-1993-05-25 Richard Stallman <rms@@gnu.org>
-
- * man.el: Rename symbols `man-*' to `Man-*'.
- (manual-entry): Make prompt string clearer.
-
- * simple.el (blink-matching-paren-distance):
- Change default to 12,000.
-
-1993-05-24 Richard Stallman <rms@@gnu.org>
-
- * vc.el (minor-mode-map-alist): Don't use it if it's void.
- (vc-cancel-version): Doc fix.
-@end smallexample
-
- One entry can describe several changes; each change should have its
-own item, or its own line in an item. Normally there should be a
-blank line between items. When items are related (parts of the same
-change, in different places), group them by leaving no blank line
-between them.
-
@kbd{C-x 4 a} visits the change log file and creates a new entry
unless the most recent entry is for today's date and your name. It
also creates a new item for the current file. For many languages, it
@@ -95,6 +52,11 @@ changed.
non-@code{nil}, @kbd{C-x 4 a} adds to any existing item for the file
rather than starting a new item.
+@vindex add-log-always-start-new-record
+ If @code{add-log-always-start-new-record} is non-@code{nil},
+@kbd{C-x 4 a} always makes a new entry, even if the last entry
+was made by you and on the same date.
+
@vindex change-log-version-info-enabled
@vindex change-log-version-number-regexp-list
@cindex file version in change log entries
@@ -104,11 +66,6 @@ change log entry. It finds the version number by searching the first
ten percent of the file, using regular expressions from the variable
@code{change-log-version-number-regexp-list}.
-@vindex add-log-always-start-new-record
- If @code{add-log-always-start-new-record} is non-@code{nil},
-@kbd{C-x 4 a} always makes a new entry, even if the last entry
-was made by you and on the same date.
-
@cindex Change Log mode
@findex change-log-mode
The change log file is visited in Change Log mode. In this major
@@ -122,52 +79,55 @@ this is convenient for entering the contents of an entry.
log files into a buffer in Change Log Mode, preserving the date
ordering of entries.
-@findex change-log-redate
-@cindex converting change log date style
- Versions of Emacs before 20.1 used a different format for the time of
-the change log entry:
+ Version control systems are another way to keep track of changes in your
+program and keep a change log. @xref{Log Buffer}.
+
+@node Format of ChangeLog
+@section Format of ChangeLog
+ A change log entry starts with a header line that contains the current
+date, your name, and your email address (taken from the variable
+@code{add-log-mailing-address}). Aside from these header lines, every
+line in the change log starts with a space or a tab. The bulk of the
+entry consists of @dfn{items}, each of which starts with a line starting
+with whitespace and a star. Here are two entries, both dated in May
+1993, with two items and one item respectively.
+
+@iftex
+@medbreak
+@end iftex
@smallexample
-Fri May 25 11:23:23 1993 Richard Stallman <rms@@gnu.org>
+1993-05-25 Richard Stallman <rms@@gnu.org>
+
+ * man.el: Rename symbols `man-*' to `Man-*'.
+ (manual-entry): Make prompt string clearer.
+
+ * simple.el (blink-matching-paren-distance):
+ Change default to 12,000.
+
+1993-05-24 Richard Stallman <rms@@gnu.org>
+
+ * vc.el (minor-mode-map-alist): Don't use it if it's void.
+ (vc-cancel-version): Doc fix.
@end smallexample
-@noindent
-The @kbd{M-x change-log-redate} command converts all the old-style
-date entries in the change log file visited in the current buffer to
-the new format, to make the file uniform in style. This is handy when
-entries are contributed by many different people, some of whom use old
-versions of Emacs.
+ One entry can describe several changes; each change should have its
+own item, or its own line in an item. Normally there should be a
+blank line between items. When items are related (parts of the same
+change, in different places), group them by leaving no blank line
+between them.
- Version control systems are another way to keep track of changes in your
-program and keep a change log. @xref{Log Buffer}.
+ You should put a copyright notice and permission notice at the
+end of the change log file. Here is an example:
-@ignore
-@c This is commented out because the command is specific
-@c to maintenance of Emacs itself.
-
-@node Authors
-@section @file{AUTHORS} files
-@cindex @file{AUTHORS} file
-
- Programs which have many contributors usually include a file named
-@file{AUTHORS} in their distribution, which lists the individual
-contributions. Emacs has a special command for maintaining the
-@file{AUTHORS} file that is part of the Emacs distribution.
-
-@findex authors
- The @kbd{M-x authors} command prompts for the name of the root of the
-Emacs source directory. It then scans @file{ChangeLog} files and Lisp
-source files under that directory for information about authors of
-individual packages, and people who made changes in source files, and
-puts the information it gleans into a buffer named @samp{*Authors*}.
-You can then edit the contents of that buffer and merge it with the
-existing @file{AUTHORS} file.
-
- Do not assume that this command finds all the contributors; don't
-assume that a person not listed in the output was not a contributor.
-If you merged in someone's contribution and did not put his name
-in the change log, he won't show up in @kbd{M-x authors} either.
-@end ignore
+@example
+Copyright 1997, 1998 Free Software Foundation, Inc.
+Copying and distribution of this file, with or without modification, are
+permitted provided the copyright notice and this notice are preserved.
+@end example
+
+@noindent
+Of course, you should substitute the proper years and copyright holder.
@node Tags
@section Tags Tables
@@ -425,15 +385,15 @@ way it was made in the first place. If the tags table fails to record
a tag, or records it for the wrong file, then Emacs cannot possibly
find its definition until you update the tags table. However, if the
position recorded in the tags table becomes a little bit wrong (due to
-other editing), the only consequence is a slight delay in finding the
+other editing), the worst consequence is a slight delay in finding the
tag. Even if the stored position is very far wrong, Emacs will still
-find the tag, after searching most of the file for it. Even that
-delay is hardly noticeable with today's computers.
+find the tag, after searching most of the file for it. That delay is
+hardly noticeable with today's computers.
- So you should update a tags table when you define new tags that you want
-to have listed, or when you move tag definitions from one file to another,
-or when changes become substantial. Normally there is no need to update
-the tags table after each edit, or even every day.
+ Thus, there is no need to update the tags table after each edit.
+You should update a tags table when you define new tags that you want
+to have listed, or when you move tag definitions from one file to
+another, or when changes become substantial.
One tags table can virtually include another. Specify the included
tags file name with the @samp{--include=@var{file}} option when
@@ -480,21 +440,21 @@ place of a file name on the command line. @code{Etags} will read from
standard input and mark the produced tags as belonging to the file
@var{file}.
- @samp{etags --help} prints the list of the languages @code{etags}
+ @samp{etags --help} outputs the list of the languages @code{etags}
knows, and the file name rules for guessing the language. It also prints
a list of all the available @code{etags} options, together with a short
explanation. If followed by one or more @samp{--language=@var{lang}}
-options, prints detailed information about how tags are generated for
+options, it outputs detailed information about how tags are generated for
@var{lang}.
@node Etags Regexps
@subsection Etags Regexps
The @samp{--regex} option provides a general way of recognizing tags
-based on regexp matching. You can freely intermix it with file names.
+based on regexp matching. You can freely intermix this option with
+file names, and each one applies to the source files that follow it.
If you specify multiple @samp{--regex} options, all of them are used
-in parallel, but each one applies only to the source files that follow
-it. The syntax is:
+in parallel. The syntax is:
@smallexample
--regex=[@var{@{language@}}]/@var{tagregexp}/[@var{nameregexp}/]@var{modifiers}
@@ -537,8 +497,8 @@ Match this regular expression against the whole file, and allow
@end table
The @samp{-R} option cancels all the regexps defined by preceding
-@samp{--regex} options. It applies to the file names following it, as
-you can see from the following example:
+@samp{--regex} options. It too applies to the file names following
+it. Here's an example:
@smallexample
etags --regex=/@var{reg1}/i voo.doo --regex=/@var{reg2}/m \
@@ -647,30 +607,25 @@ etags --language=none \
@vindex tags-file-name
@findex visit-tags-table
- Emacs has at any time one @dfn{selected} tags table, and all the commands
-for working with tags tables use the selected one. To select a tags table,
-type @kbd{M-x visit-tags-table}, which reads the tags table file name as an
-argument. The name @file{TAGS} in the default directory is used as the
-default file name.
-
- All this command does is store the file name in the variable
-@code{tags-file-name}. Emacs does not actually read in the tags table
-contents until you try to use them. Setting this variable yourself is just
-as good as using @code{visit-tags-table}. The variable's initial value is
-@code{nil}; that value tells all the commands for working with tags tables
-that they must ask for a tags table file name to use.
+ Emacs has at any time one @dfn{selected} tags table, and all the
+commands for working with tags tables use the selected one. To select
+a tags table, type @kbd{M-x visit-tags-table}, which reads the tags
+table file name as an argument, with @file{TAGS} in the default
+directory as the default.
+
+ Emacs does not actually read in the tags table contents until you
+try to use them; all @code{visit-tags-table} does is store the file
+name in the variable @code{tags-file-name}, and setting the variable
+yourself is just as good. The variable's initial value is @code{nil};
+that value tells all the commands for working with tags tables that
+they must ask for a tags table file name to use.
Using @code{visit-tags-table} when a tags table is already loaded
gives you a choice: you can add the new tags table to the current list
of tags tables, or start a new list. The tags commands use all the tags
tables in the current list. If you start a new list, the new tags table
is used @emph{instead} of others. If you add the new table to the
-current list, it is used @emph{as well as} the others. When the tags
-commands scan the list of tags tables, they don't always start at the
-beginning of the list; they start with the first tags table (if any)
-that describes the current file, proceed from there to the end of the
-list, and then scan from the beginning of the list until they have
-covered all the tables in the list.
+current list, it is used @emph{as well as} the others.
@vindex tags-table-list
You can specify a precise list of tags tables by setting the variable
@@ -749,13 +704,13 @@ alternative to @kbd{C-u M-.}.
@findex find-tag-other-frame
Like most commands that can switch buffers, @code{find-tag} has a
variant that displays the new buffer in another window, and one that
-makes a new frame for it. The former is @kbd{C-x 4 .}, which invokes
-the command @code{find-tag-other-window}. The latter is @kbd{C-x 5 .},
+makes a new frame for it. The former is @w{@kbd{C-x 4 .}}, which invokes
+the command @code{find-tag-other-window}. The latter is @w{@kbd{C-x 5 .}},
which invokes @code{find-tag-other-frame}.
To move back to places you've found tags recently, use @kbd{C-u -
M-.}; more generally, @kbd{M-.} with a negative numeric argument. This
-command can take you to another buffer. @kbd{C-x 4 .} with a negative
+command can take you to another buffer. @w{@kbd{C-x 4 .}} with a negative
argument finds the previous tag location in another window.
@kindex M-*
@@ -781,9 +736,13 @@ that it does regexp matching instead of substring matching.
@cindex search and replace in multiple files
@cindex multiple-file search and replace
- The commands in this section visit and search all the files listed in the
-selected tags table, one by one. For these commands, the tags table serves
-only to specify a sequence of files to search.
+ The commands in this section visit and search all the files listed
+in the selected tags table, one by one. For these commands, the tags
+table serves only to specify a sequence of files to search. These
+commands scan the list of tags tables starting with the first tags
+table (if any) that describes the current file, proceed from there to
+the end of the list, and then scan from the beginning of the list
+until they have covered all the tables in the list.
@table @kbd
@item M-x tags-search @key{RET} @var{regexp} @key{RET}
@@ -846,9 +805,7 @@ continue to exist.
It may have struck you that @code{tags-search} is a lot like
@code{grep}. You can also run @code{grep} itself as an inferior of
-Emacs and have Emacs show you the matching lines one by one. This works
-much like running a compilation; finding the source locations of the
-@code{grep} matches works like finding the compilation errors.
+Emacs and have Emacs show you the matching lines one by one.
@xref{Grep Searching}.
@node List Tags
@@ -882,9 +839,9 @@ of the tags files together with the tag names.
@vindex tags-tag-face
@vindex tags-apropos-additional-actions
-You can customize the appearance of the output with the face
-@code{tags-tag-face}. You can display additional output with @kbd{M-x
-tags-apropos} by customizing the variable
+ You can customize the appearance of the output by setting the
+variable @code{tags-tag-face} to a face. You can display additional
+output with @kbd{M-x tags-apropos} by customizing the variable
@code{tags-apropos-additional-actions}---see its documentation for
details.
@@ -896,11 +853,11 @@ name in the buffer. @xref{Symbol Completion}.
@cindex Emerge
@cindex merging files
-It's not unusual for programmers to get their signals crossed and modify
-the same program in two different directions. To recover from this
-confusion, you need to merge the two versions. Emerge makes this
-easier. See also @ref{Comparing Files}, for commands to compare
-in a more manual fashion, and @ref{Top, Ediff,, ediff, The Ediff Manual}.
+ It's not unusual for programmers to get their signals crossed and
+modify the same program in two different directions. To recover from
+this confusion, you need to merge the two versions. Emerge makes this
+easier. See also @ref{Comparing Files}, for other ways to compare
+files, and @ref{Top, Ediff,, ediff, The Ediff Manual}.
@menu
* Overview of Emerge:: How to start Emerge. Basic concepts.
@@ -918,7 +875,7 @@ in a more manual fashion, and @ref{Top, Ediff,, ediff, The Ediff Manual}.
@node Overview of Emerge
@subsection Overview of Emerge
-To start Emerge, run one of these four commands:
+ To start Emerge, run one of these four commands:
@table @kbd
@item M-x emerge-files
diff --git a/man/major.texi b/man/major.texi
index 5bff7146ebe..d1f3fbaeebf 100644
--- a/man/major.texi
+++ b/man/major.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Major Modes, Indentation, International, Top
@chapter Major Modes
diff --git a/man/makefile.w32-in b/man/makefile.w32-in
index 63ecdadc102..34bb5fe6435 100644
--- a/man/makefile.w32-in
+++ b/man/makefile.w32-in
@@ -1,6 +1,6 @@
#### -*- Makefile -*- for the Emacs Manual and other documentation.
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
diff --git a/man/mark.texi b/man/mark.texi
index f4308835e96..cf7b87366e8 100644
--- a/man/mark.texi
+++ b/man/mark.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Mark, Killing, Help, Top
@chapter The Mark and the Region
diff --git a/man/mh-e.texi b/man/mh-e.texi
index 8530c31ce9d..36dfd9fd939 100644
--- a/man/mh-e.texi
+++ b/man/mh-e.texi
@@ -16,7 +16,7 @@ This is Edition @value{EDITION}, last updated @value{UPDATED}, of
@value{VERSION}.
Copyright (C) 1995, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -59,7 +59,7 @@ license to the document, as described in section 6 of the license.
@page
@vskip 0pt plus 1filll
-Copyright @copyright{} 1995, 2001, 2002 Free Software Foundation, Inc.
+Copyright @copyright{} 1995, 2001, 2002, 2006 Free Software Foundation, Inc.
@insertcopying
@end titlepage
diff --git a/man/mini.texi b/man/mini.texi
index e46a4f2db9b..f88adf01f9f 100644
--- a/man/mini.texi
+++ b/man/mini.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Minibuffer, M-x, Basic, Top
@chapter The Minibuffer
diff --git a/man/misc.texi b/man/misc.texi
index cae58a9c7f4..d5b69eebf26 100644
--- a/man/misc.texi
+++ b/man/misc.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@iftex
@chapter Miscellaneous Commands
diff --git a/man/msdog.texi b/man/msdog.texi
index 58ce170a738..434427b49b4 100644
--- a/man/msdog.texi
+++ b/man/msdog.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node MS-DOS, Manifesto, Mac OS, Top
@appendix Emacs and Microsoft Systems
diff --git a/man/mule.texi b/man/mule.texi
index 86f7bec0b9b..4b63fb90d4e 100644
--- a/man/mule.texi
+++ b/man/mule.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-@c 2005 Free Software Foundation, Inc.
+@c 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node International, Major Modes, Frames, Top
@chapter International Character Set Support
@@ -72,8 +72,7 @@ your language environment. If
your keyboard can produce non-@acronym{ASCII} characters, you can select an
appropriate keyboard coding system (@pxref{Terminal Coding}), and Emacs
will accept those characters. Latin-1 characters can also be input by
-using the @kbd{C-x 8} prefix, see @ref{Single-Byte Character Support,
-C-x 8}.
+using the @kbd{C-x 8} prefix, see @ref{Unibyte Mode}.
On X Window systems, your locale should be set to an appropriate value
to make sure Emacs interprets keyboard input correctly; see
@@ -101,7 +100,7 @@ to make sure Emacs interprets keyboard input correctly; see
that cover the whole spectrum of characters.
* Defining Fontsets:: Defining a new fontset.
* Undisplayable Characters:: When characters don't display.
-* Single-Byte Character Support:: You can pick one European character set
+* Unibyte Mode:: You can pick one European character set
to use without multibyte characters.
* Charsets:: How Emacs groups its internal character codes.
@end menu
@@ -1000,11 +999,11 @@ in communication with other processes.
@table @kbd
@item C-x @key{RET} x @var{coding} @key{RET}
Use coding system @var{coding} for transferring selections to and from
-other programs through the window system.
+other window-based applications.
@item C-x @key{RET} X @var{coding} @key{RET}
Use coding system @var{coding} for transferring @emph{one}
-selection---the next one---to or from the window system.
+selection---the next one---to or from another window-based application.
@item C-x @key{RET} p @var{input-coding} @key{RET} @var{output-coding} @key{RET}
Use coding systems @var{input-coding} and @var{output-coding} for
@@ -1166,34 +1165,39 @@ non-graphic characters.
@section Fontsets
@cindex fontsets
- A font for X Windows typically defines shapes for a single alphabet
-or script. Therefore, displaying the entire range of scripts that
-Emacs supports requires a collection of many fonts. In Emacs, such a
-collection is called a @dfn{fontset}. A fontset is defined by a list
-of fonts, each assigned to handle a range of character codes.
-
- Each fontset has a name, like a font. The available X fonts are
-defined by the X server; fontsets, however, are defined within Emacs
-itself. Once you have defined a fontset, you can use it within Emacs by
-specifying its name, anywhere that you could use a single font. Of
-course, Emacs fontsets can use only the fonts that the X server
-supports; if certain characters appear on the screen as hollow boxes,
-this means that the fontset in use for them has no font for those
-characters.@footnote{The Emacs installation instructions have information on
-additional font support.}
+ A font typically defines shapes for a single alphabet or script.
+Therefore, displaying the entire range of scripts that Emacs supports
+requires a collection of many fonts. In Emacs, such a collection is
+called a @dfn{fontset}. A fontset is defined by a list of fonts, each
+assigned to handle a range of character codes.
+
+ Each fontset has a name, like a font. However, while fonts are
+stored in the system and the available font names are defined by the
+system, fontsets are defined within Emacs itself. Once you have
+defined a fontset, you can use it within Emacs by specifying its name,
+anywhere that you could use a single font. Of course, Emacs fontsets
+can use only the fonts that the system supports; if certain characters
+appear on the screen as hollow boxes, this means that the fontset in
+use for them has no font for those characters.@footnote{The Emacs
+installation instructions have information on additional font
+support.}
Emacs creates two fontsets automatically: the @dfn{standard fontset}
and the @dfn{startup fontset}. The standard fontset is most likely to
have fonts for a wide variety of non-@acronym{ASCII} characters;
however, this is not the default for Emacs to use. (By default, Emacs
tries to find a font that has bold and italic variants.) You can
-specify use of the standard fontset with the @samp{-fn} option, or
-with the @samp{Font} X resource (@pxref{Font X}). For example,
+specify use of the standard fontset with the @samp{-fn} option. For
+example,
@example
emacs -fn fontset-standard
@end example
+@noindent
+You can also specify a fontset with the @samp{Font} resource (@pxref{X
+Resources}).
+
A fontset does not necessarily specify a font for every character
code. If a fontset specifies no font for a certain character, or if it
specifies a font that does not exist on your system, then it cannot
@@ -1353,8 +1357,8 @@ Latin-1 characters and @acronym{ASCII} mnemonics. Customize the variable
@code{latin1-display} to enable this. The mnemonic @acronym{ASCII}
sequences mostly correspond to those of the prefix input methods.
-@node Single-Byte Character Support
-@section Single-byte Character Set Support
+@node Unibyte Mode
+@section Unibyte Editing Mode
@cindex European character sets
@cindex accented characters
@@ -1376,8 +1380,8 @@ non-@acronym{ASCII} characters.
@vindex unibyte-display-via-language-environment
Emacs can also display those characters, provided the terminal or font
-in use supports them. This works automatically. Alternatively, if you
-are using a window system, Emacs can also display single-byte characters
+in use supports them. This works automatically. Alternatively, on a
+graphical display, Emacs can also display single-byte characters
through fontsets, in effect by displaying the equivalent multibyte
characters according to the current language environment. To request
this, set the variable @code{unibyte-display-via-language-environment}
diff --git a/man/newsticker.texi b/man/newsticker.texi
index 74bf298a585..ed753147e22 100644
--- a/man/newsticker.texi
+++ b/man/newsticker.texi
@@ -13,7 +13,7 @@
This manual is for Newsticker (version @value{VERSION}, @value{UPDATED}).
@noindent
-Copyright @copyright{} 2004, 2005 Free Software Foundation, Inc.
+Copyright @copyright{} 2004, 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/org.texi b/man/org.texi
index cf096504f40..cf0881ff3ff 100644
--- a/man/org.texi
+++ b/man/org.texi
@@ -35,7 +35,7 @@
@copying
This manual is for Org-mode (version @value{VERSION}).
-Copyright @copyright{} 2004, 2005, 2006 Free Software Foundation
+Copyright @copyright{} 2004, 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/pcl-cvs.texi b/man/pcl-cvs.texi
index 3331590fcbf..dcef68de976 100644
--- a/man/pcl-cvs.texi
+++ b/man/pcl-cvs.texi
@@ -7,7 +7,7 @@
@copying
Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/pgg.texi b/man/pgg.texi
index 46785f3c1a7..025420abd4d 100644
--- a/man/pgg.texi
+++ b/man/pgg.texi
@@ -8,7 +8,7 @@
@copying
This file describes the PGG.
-Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
Copyright (C) 2001 Daiki Ueno.
@quotation
diff --git a/man/picture.texi b/man/picture.texi
index 46a735122df..2e162c04057 100644
--- a/man/picture.texi
+++ b/man/picture.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Picture, Sending Mail, Abbrevs, Top
@chapter Editing Pictures
@@ -29,7 +29,7 @@ to do essentially the same thing but in a quarter-plane way. In addition,
Picture mode defines various keys starting with the @kbd{C-c} prefix to
run special picture editing commands.
- One of these keys, @kbd{C-c C-c}, is pretty important. Often a
+ One of these keys, @kbd{C-c C-c}, is particularly important. Often a
picture is part of a larger file that is usually edited in some other
major mode. @kbd{M-x edit-picture} records the name of the previous
major mode so you can use the @kbd{C-c C-c} command
diff --git a/man/programs.texi b/man/programs.texi
index dfb1e9c0d85..f4df93a0d43 100644
--- a/man/programs.texi
+++ b/man/programs.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000,
-@c 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Programs, Building, Text, Top
@chapter Editing Programs
@@ -259,8 +259,8 @@ defun. This is the easiest way to get ready to kill the defun in
order to move it to a different place in the file. If you use the
command while point is between defuns, it uses the following defun.
Successive uses of @kbd{C-M-h}, or using it in Transient Mark mode
-when the mark is active, includes an additional defun in the region
-each time.
+when the mark is active, extends the end of the region to include one
+more defun each time.
In C mode, @kbd{C-M-h} runs the function @code{c-mark-function},
which is almost the same as @code{mark-defun}; the difference is that
@@ -296,9 +296,9 @@ name. You can also add the buffer's index to the menu bar by calling
@code{imenu-add-menubar-index}. If you want to have this menu bar
item available for all buffers in a certain major mode, you can do
this by adding @code{imenu-add-menubar-index} to its mode hook. But
-if you have done that, you will have to wait each time you visit a
-file in that mode, while Emacs finds all the definitions in that
-buffer.
+if you have done that, you will have to wait a little while each time
+you visit a file in that mode, while Emacs finds all the definitions
+in that buffer.
@vindex imenu-auto-rescan
When you change the contents of a buffer, if you add or delete
@@ -374,8 +374,6 @@ usual conventions of the language you are editing.
Adjust indentation of current line.
@item C-j
Equivalent to @key{RET} followed by @key{TAB} (@code{newline-and-indent}).
-@item @key{LINEFEED}
-This key, if the keyboard has it, is another way to enter @kbd{C-j}.
@end table
@kindex TAB @r{(programming modes)}
@@ -400,8 +398,8 @@ the characters around it.
@kindex C-j
@findex newline-and-indent
When entering lines of new code, use @kbd{C-j}
-(@code{newline-and-indent}), which is equivalent to a @key{RET}
-followed by a @key{TAB}. @kbd{C-j} at the end of a line creates a
+(@code{newline-and-indent}), which is equivalent to @key{RET}
+followed by @key{TAB}. @kbd{C-j} at the end of a line creates a
blank line and then gives it the appropriate indentation.
@key{TAB} indents a line that starts within a parenthetical grouping
@@ -412,7 +410,7 @@ behavior is convenient in cases where you have overridden the standard
result of @key{TAB} because you find it unaesthetic for a particular
line.
- By default, an open-parenthesis, open-brace or other opening
+ In some modes, an open-parenthesis, open-brace or other opening
delimiter at the left margin is assumed by Emacs (including the
indentation routines) to be the start of a function. This speeds up
indentation commands. If you will be editing text which contains
@@ -422,7 +420,7 @@ functions, even inside strings or comments, you must set
Paren}, for more information on this.
Normally, lines are indented with tabs and spaces. If you want Emacs
-to use spaces only, see @ref{Just Spaces}.
+to use spaces only, set @code{indent-tabs-mode} (@pxref{Just Spaces}).
@node Multi-line Indent
@subsection Indenting Several Lines
@@ -587,8 +585,8 @@ typing @key{C-M-q} at the start of a function definition.
@kindex C-c . @r{(C mode)}
@findex c-set-style
- To choose a style for the current buffer, use the command @kbd{C-c
-.}. Specify a style name as an argument (case is not significant).
+ To choose a style for the current buffer, use the command @w{@kbd{C-c
+.}}. Specify a style name as an argument (case is not significant).
This command affects the current buffer only, and it affects only
future invocations of the indentation commands; it does not reindent
the code already in the buffer. To reindent the whole buffer in the
@@ -740,7 +738,7 @@ that @kbd{C-M-f} would move to. @kbd{C-M-@@} takes arguments like
the mark at the beginning of the previous balanced expression. The
alias @kbd{C-M-@key{SPC}} is equivalent to @kbd{C-M-@@}. When you
repeat this command, or use it in Transient Mark mode when the mark is
-active, it extends the region by one sexp each time.
+active, it extends the end of the region by one sexp each time.
In languages that use infix operators, such as C, it is not possible
to recognize all balanced expressions as such because there can be
@@ -791,9 +789,7 @@ parenthetical groupings, skipping blithely over any amount of text
that doesn't include meaningful parentheses (symbols, strings, etc.).
@kindex C-M-u
-@kindex C-M-d
@findex backward-up-list
-@findex down-list
@kbd{C-M-n} and @kbd{C-M-p} try to stay at the same level in the
parenthesis structure. To move @emph{up} one (or @var{n}) levels, use
@kbd{C-M-u} (@code{backward-up-list}). @kbd{C-M-u} moves backward up
@@ -801,6 +797,8 @@ past one unmatched opening delimiter. A positive argument serves as a
repeat count; a negative argument reverses the direction of motion, so
that the command moves forward and up one or more levels.
+@kindex C-M-d
+@findex down-list
To move @emph{down} in the parenthesis structure, use @kbd{C-M-d}
(@code{down-list}). In Lisp mode, where @samp{(} is the only opening
delimiter, this is nearly the same as searching for a @samp{(}. An
@@ -852,11 +850,9 @@ highlighted. (There is no need to highlight the opening delimiter in
that case, because the cursor appears on top of that character.) Use
the command @kbd{M-x show-paren-mode} to enable or disable this mode.
- By default, @code{show-paren-mode} uses colors to highlight the
-parentheses. However, if your display doesn't support colors, you can
-customize the faces @code{show-paren-match-face} and
-@code{show-paren-mismatch-face} to use other attributes, such as bold or
-underline. @xref{Face Customization}.
+ Show Paren mode uses the faces @code{show-paren-match} and
+@code{show-paren-mismatch} to highlight parentheses; you can customize
+them to control how highlighting looks. @xref{Face Customization}.
@node Comments
@section Manipulating Comments
@@ -911,11 +907,11 @@ The new comment begins with the string Emacs thinks comments should
start with (the value of @code{comment-start}; see below). Point is
after that string, so you can insert the text of the comment right
away. If the major mode has specified a string to terminate comments,
-@kbd{M-;} inserts that too, to keep the syntax valid.
+@kbd{M-;} inserts that after point, to keep the syntax valid.
- If the text of the line extends past the comment column, then the
-comment start string is indented to a suitable boundary (usually, at
-least one space is inserted).
+ If the text of the line extends past the comment column, this
+command indents the comment start string to a suitable boundary
+(usually, at least one space is inserted).
You can also use @kbd{M-;} to align an existing comment. If a line
already contains the comment-start string, @kbd{M-;} reindents it to
@@ -943,7 +939,8 @@ removes comment delimiters on each line of the region. (If every line
is a comment, it removes comment delimiters from each; otherwise, it
adds comment delimiters to each.) If you are not using Transient Mark
mode, then you should use the commands @code{comment-region} and
-@code{uncomment-region} to do these jobs (@pxref{Multi-Line Comments}).
+@code{uncomment-region} to do these jobs (@pxref{Multi-Line Comments}),
+or else enable Transient Mark mode momentarily (@pxref{Momentary Mark}).
A prefix argument used in these circumstances specifies how many
comment delimiters to add or how many to delete.
@@ -964,8 +961,8 @@ and by not changing the indentation of a triple-semicolon comment at all.
(1+ x)) ; This line adds one.
@end example
- For C-like buffers, you can configure the exact effect of @kbd{M-;}
-more flexibly than for most buffers by setting the user options
+ For C-like modes, you can configure the exact effect of @kbd{M-;}
+more flexibly than for most buffers by setting the variables
@code{c-indent-comment-alist} and
@code{c-indent-comments-syntactically-p}. For example, on a line
ending in a closing brace, @kbd{M-;} puts the comment one space after
@@ -992,7 +989,7 @@ in just this fashion.
@kindex C-c C-c (C mode)
@findex comment-region
To turn existing lines into comment lines, use the @kbd{M-x
-comment-region} command (or type @kbd{C-c C-c} in C-like buffers). It
+comment-region} command (or type @kbd{C-c C-c} in C-like modes). It
adds comment delimiters to the lines that start in the region, thus
commenting them out. With a negative argument, it does the
opposite---it deletes comment delimiters from the lines in the region.
@@ -1103,29 +1100,31 @@ use in your program.
@findex info-lookup-symbol
@findex info-lookup-file
@kindex C-h S
- For C, Lisp, and other languages that have documentation in Info,
-you can use @kbd{C-h S} (@code{info-lookup-symbol}) to view the Info
-documentation for a symbol used in the program. You specify the
-symbol with the minibuffer; the default is the symbol appearing in the
-buffer at point. For example, in C mode this looks for the symbol in
-the C Library Manual.
+ For many major modes, that apply to languages that have
+documentation in Info, you can use @kbd{C-h S}
+(@code{info-lookup-symbol}) to view the Info documentation for a
+symbol used in the program. You specify the symbol with the
+minibuffer; the default is the symbol appearing in the buffer at
+point. For example, in C mode this looks for the symbol in the C
+Library Manual. The command only works if the appropriate manual's
+Info files are installed.
The major mode determines where to look for documentation for the
symbol---which Info files to look in, and which indices to search.
You can also use @kbd{M-x info-lookup-file} to look for documentation
for a file name.
- This feature currently supports the modes AWK, Autoconf, Bison, C,
-Emacs Lisp, LaTeX, M4, Makefile, Octave, Perl, Scheme, and Texinfo,
-provided you have installed the relevant Info files, which are
-typically available with the appropriate GNU package.
+ If you use @kbd{C-h S} in a major mode that does not support it,
+it asks you to specify the ``symbol help mode''. You should enter
+a command such as @code{c-mode} that would select a major
+mode which @kbd{C-h S} does support.
@node Man Page
@subsection Man Page Lookup
@cindex manual page
On Unix, the main form of on-line documentation was the @dfn{manual
-page} or @dfn{man page}. In the GNU operating system, we hope to
+page} or @dfn{man page}. In the GNU operating system, we aim to
replace man pages with better-organized manuals that you can browse
with Info (@pxref{Misc Help}). This process is not finished, so it is
still useful to read manual pages.
@@ -1151,8 +1150,8 @@ a man page from a specific section, type
when @kbd{M-x manual-entry} prompts for the topic. For example, to
read the man page for the C library function @code{chmod} (as opposed
to a command of the same name), type @kbd{M-x manual-entry @key{RET}
-chmod(2) @key{RET}} (@code{chmod} is a system call, so it is in
-section @samp{2}).
+chmod(2) @key{RET}}. (@code{chmod} is a system call, so it is in
+section @samp{2}.)
@vindex Man-switches
If you do not specify a section, the results depend on how the
@@ -1203,42 +1202,6 @@ several manual pages by the same name exist in different sections, it
pops up a window with possible candidates asking you to choose one of
them.
-@vindex woman-manpath
- By default, @kbd{M-x woman} looks for manual pages in the
-directories specified in the @code{MANPATH} environment variable. (If
-@code{MANPATH} is not set, @code{woman} uses a suitable default value,
-which can be customized.) More precisely, @code{woman} looks for
-subdirectories that match the shell wildcard pattern @file{man*} in each one
-of these directories, and tries to find the manual pages in those
-subdirectories. When first invoked, @kbd{M-x woman} converts the
-value of @code{MANPATH} to a list of directory names and stores that
-list in the @code{woman-manpath} variable. Changing the value of this
-variable is another way to control the list of directories used.
-
-@vindex woman-path
- You can also augment the list of directories searched by
-@code{woman} by setting the value of the @code{woman-path} variable.
-This variable should hold a list of specific directories which
-@code{woman} should search, in addition to those in
-@code{woman-manpath}. Unlike @code{woman-manpath}, the directories in
-@code{woman-path} are searched for the manual pages, not for
-@file{man*} subdirectories.
-
-@findex woman-find-file
- Occasionally, you might need to display manual pages that are not in
-any of the directories listed by @code{woman-manpath} and
-@code{woman-path}. The @kbd{M-x woman-find-file} command prompts for a
-name of a manual page file, with completion, and then formats and
-displays that file like @kbd{M-x woman} does.
-
-@vindex woman-dired-keys
- The first time you invoke @kbd{M-x woman}, it defines the Dired
-@kbd{W} key to run the @code{woman-find-file} command on the current
-line's file. You can disable this by setting the variable
-@code{woman-dired-keys} to @code{nil}. @xref{Dired}. In addition,
-the Tar-mode @kbd{w} key is define to invoke @code{woman-find-file} on
-the current line's archive member.
-
For more information about setting up and using @kbd{M-x woman}, see
@ref{Top, WoMan, Browse UN*X Manual Pages WithOut Man, woman, The WoMan
Manual}.
@@ -1325,8 +1288,8 @@ Hide all blocks @var{n} levels below this block
Non-@code{nil} says that @kbd{hs-hide-all} should hide comments too.
@item hs-isearch-open
-Specifies what kind of hidden blocks to open in Isearch mode.
-The value should be one of these four symbols:
+Specifies what kind of hidden blocks incremental search should make
+visible. The value should be one of these four symbols:
@table @code
@item code
@@ -1533,24 +1496,6 @@ moves by sentences instead of statements.
Move point to the end of the innermost C statement or sentence; like
@kbd{M-a} except that it moves in the other direction
(@code{c-end-of-statement}).
-
-@item M-x c-backward-into-nomenclature
-@findex c-backward-into-nomenclature
-Move point backward to beginning of a C++ nomenclature section or
-word. With prefix argument @var{n}, move @var{n} times. If @var{n}
-is negative, move forward. C++ nomenclature means a symbol name in
-the style of NamingSymbolsWithMixedCaseAndNoUnderlines; each capital
-letter begins a section or word. Rather than this command, you might
-well prefer the newer ``Subword Mode'', which does the same thing
-better. @xref{Other C Commands}.
-
-In the GNU project, we recommend using underscores to separate words
-within an identifier in C or C++, rather than using case distinctions.
-
-@item M-x c-forward-into-nomenclature
-@findex c-forward-into-nomenclature
-Move point forward to end of a C++ nomenclature section or word.
-With prefix argument @var{n}, move @var{n} times.
@end table
@node Electric C
@@ -1661,6 +1606,9 @@ the flag @samp{/w} on the mode line after the mode name
(e.g. @samp{C/law}). You can even use @kbd{M-x c-subword-mode} in
non-CC Mode buffers.
+In the GNU project, we recommend using underscores to separate words
+within an identifier in C or C++, rather than using case distinctions.
+
@item M-x c-context-line-break
@findex c-context-line-break
This command inserts a line break and indents the new line in a manner
diff --git a/man/reftex.texi b/man/reftex.texi
index 845190981e2..890d5b5064d 100644
--- a/man/reftex.texi
+++ b/man/reftex.texi
@@ -25,7 +25,8 @@ citations and indices for LaTeX documents with Emacs.
This is edition @value{EDITION} of the @b{Ref@TeX{}} User Manual for
@b{Ref@TeX{}} @value{VERSION}
-Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/regs.texi b/man/regs.texi
index 0ed83f2bf54..8b31a992ea3 100644
--- a/man/regs.texi
+++ b/man/regs.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Registers, Display, CUA Bindings, Top
@chapter Registers
diff --git a/man/rmail.texi b/man/rmail.texi
index f2646bbe52e..3ad50ff3b71 100644
--- a/man/rmail.texi
+++ b/man/rmail.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Rmail, Dired, Sending Mail, Top
@chapter Reading Mail with Rmail
@@ -10,15 +10,11 @@
@findex rmail-mode
@vindex rmail-mode-hook
- Rmail is an Emacs subsystem for reading and disposing of mail that you
-receive. Rmail stores mail messages in files called Rmail files.
-Reading the message in an Rmail file is done in a special major mode,
-Rmail mode, which redefines most letters to run commands for managing
-mail. The command @code{rmail-mode} is used to switch into Rmail mode,
-and it runs the hook @code{rmail-mode-hook} as usual, but don't run this
-command by hand; it can't do a reasonable job unless the buffer is
-visiting a proper Rmail file.
-
+ Rmail is an Emacs subsystem for reading and disposing of mail that
+you receive. Rmail stores mail messages in files called Rmail files
+which use a special format. Reading the message in an Rmail file is
+done in a special major mode, Rmail mode, which redefines most letters
+to run commands for managing mail.
@menu
* Basic: Rmail Basics. Basic concepts of Rmail, and simple use.
* Scroll: Rmail Scrolling. Scrolling through a message.
@@ -66,16 +62,16 @@ messages between them.
@cindex message number
Within the Rmail file, messages are normally arranged sequentially in
order of receipt; you can specify other ways to sort them. Messages are
-assigned consecutive integers as their @dfn{message numbers}. The
-number of the current message is displayed in Rmail's mode line,
-followed by the total number of messages in the file. You can move to a
-message by specifying its message number with the @kbd{j} key
+identified by consecutive integers which are their @dfn{message numbers}.
+The number of the current message is displayed in Rmail's mode line,
+followed by the total number of messages in the file. You can move to
+a message by specifying its message number with the @kbd{j} key
(@pxref{Rmail Motion}).
@kindex s @r{(Rmail)}
@findex rmail-expunge-and-save
Following the usual conventions of Emacs, changes in an Rmail file
-become permanent only when the file is saved. You can save it with
+become permanent only when you save the file. You can save it with
@kbd{s} (@code{rmail-expunge-and-save}), which also expunges deleted
messages from the file first (@pxref{Rmail Deletion}). To save the
file without expunging, use @kbd{C-x C-s}. Rmail also saves the Rmail
@@ -89,12 +85,12 @@ file after merging new mail from an inbox file (@pxref{Rmail Inbox}).
and saves the Rmail file, then buries the Rmail buffer as well as its
summary buffer, if present (@pxref{Rmail Summary}). But there is no
need to ``exit'' formally. If you switch from Rmail to editing in
-other buffers, and never happen to switch back, you have exited. Just
-make sure to save the Rmail file eventually (like any other file you
-have changed). @kbd{C-x s} is a good enough way to do this
-(@pxref{Save Commands}). The Rmail command @kbd{b}, @code{rmail-bury},
-buries the Rmail buffer and its summary buffer without expunging and
-saving the Rmail file.
+other buffers, and never switch back, you have exited. Just make sure
+to save the Rmail file eventually (like any other file you have
+changed). @kbd{C-x s} is a suitable way to do this (@pxref{Save
+Commands}). The Rmail command @kbd{b}, @code{rmail-bury}, buries the
+Rmail buffer and its summary buffer without expunging and saving the
+Rmail file.
@node Rmail Scrolling
@section Scrolling Within a Message
@@ -102,7 +98,7 @@ saving the Rmail file.
When Rmail displays a message that does not fit on the screen, you
must scroll through it to read the rest. You could do this with
@kbd{C-v}, @kbd{M-v} and @kbd{M-<}, but in Rmail scrolling is so
-frequent that it deserves to be easier to type.
+frequent that it deserves to be easier.
@table @kbd
@item @key{SPC}
@@ -184,7 +180,7 @@ deleted messages---for example, if you want to move to a message to
undelete it---use the variants @kbd{M-n} and @kbd{M-p}
(@code{rmail-next-message} and @code{rmail-previous-message}). A
numeric argument to any of these commands serves as a repeat
-count.@refill
+count.
In Rmail, you can specify a numeric argument by typing just the
digits. You don't need to type @kbd{C-u} first.
@@ -315,14 +311,13 @@ any time in Rmail by typing @kbd{g}.
files which are inboxes for your primary Rmail file. If you don't set
this variable explicitly, it is initialized from the @env{MAIL}
environment variable, or, as a last resort, set to @code{nil}, which
-means to use the default inbox. The default inbox is
-@file{/var/mail/@var{username}}, @file{/usr/spool/mail/@var{username}},
-or @file{/usr/mail/@var{username}}, depending on your operating system.
+means to use the default inbox. The default inbox file depends on
+your operating system; often it is @file{/var/mail/@var{username}},
+@file{/usr/spool/mail/@var{username}}, or
+@file{/usr/mail/@var{username}}.
- To see what the default is on your system, use @kbd{C-h v
-rmail-primary-inbox-list @key{RET}}. You can specify the inbox file(s) for
-any Rmail file with the command @code{set-rmail-inbox-list}; see
-@ref{Rmail Files}.
+ You can specify the inbox file(s) for any Rmail file with the
+command @code{set-rmail-inbox-list}; see @ref{Rmail Files}.
There are two reasons for having separate Rmail files and inboxes.
@@ -346,18 +341,18 @@ the rest of Rmail, since only Rmail operates on the Rmail file.
then, we have recognized that the usual inbox format on Unix and GNU
systems is adequate for the job, and we plan to change Rmail to use that
as its internal format. However, the Rmail file will still be separate
-from the inbox file, even on systems where their format is the same.
+from the inbox file, even when their format is the same.
@vindex rmail-preserve-inbox
- When getting new mail, Rmail first copies the new mail from the inbox
-file to the Rmail file; then it saves the Rmail file; then it truncates
-the inbox file. This way, a system crash may cause duplication of mail
-between the inbox and the Rmail file, but cannot lose mail. If
-@code{rmail-preserve-inbox} is non-@code{nil}, then Rmail will copy new
-mail from the inbox file to the Rmail file without truncating the inbox
-file. You may wish to set this, for example, on a portable computer you
-use to check your mail via POP while traveling, so that your mail will
-remain on the server and you can save it later on your workstation.
+ When getting new mail, Rmail first copies the new mail from the
+inbox file to the Rmail file; then it saves the Rmail file; then it
+clears out the inbox file. This way, a system crash may cause
+duplication of mail between the inbox and the Rmail file, but cannot
+lose mail. If @code{rmail-preserve-inbox} is non-@code{nil}, then
+Rmail does not clear out the inbox file when it gets new mail. You
+may wish to set this, for example, on a portable computer you use to
+check your mail via POP while traveling, so that your mail will remain
+on the server and you can save it later on your workstation.
In some cases, Rmail copies the new mail from the inbox file
indirectly. First it runs the @code{movemail} program to move the mail
@@ -403,10 +398,11 @@ Merge new mail from inbox file @var{file}.
@kindex i @r{(Rmail)}
@findex rmail-input
- To run Rmail on a file other than your primary Rmail file, you may use
+ To run Rmail on a file other than your primary Rmail file, you can use
the @kbd{i} (@code{rmail-input}) command in Rmail. This visits the file
in Rmail mode. You can use @kbd{M-x rmail-input} even when not in
-Rmail.
+Rmail, but it is easier to type @kbd{C-u M-x rmail}, which does the
+same thing.
The file you read with @kbd{i} should normally be a valid Rmail file.
If it is not, Rmail tries to decompose it into a stream of messages in
@@ -416,23 +412,22 @@ initializes a new buffer for creating a new Rmail file.
@vindex rmail-secondary-file-directory
@vindex rmail-secondary-file-regexp
- You can also select an Rmail file from a menu. Choose first the menu
-bar Classify item, then from the Classify menu choose the Input Rmail
-File item; then choose the Rmail file you want. The variables
-@code{rmail-secondary-file-directory} and
+ You can also select an Rmail file from a menu. In the Classify menu,
+choose the Input Rmail File item; then choose the Rmail file you want.
+The variables @code{rmail-secondary-file-directory} and
@code{rmail-secondary-file-regexp} specify which files to offer in the
menu: the first variable says which directory to find them in; the
-second says which files in that directory to offer (all those that match
-the regular expression). These variables also apply to choosing a file
-for output (@pxref{Rmail Output}).
+second says which files in that directory to offer (all those that
+match the regular expression). These variables also apply to choosing
+a file for output (@pxref{Rmail Output}).
@findex set-rmail-inbox-list
Each Rmail file can contain a list of inbox file names; you can specify
this list with @kbd{M-x set-rmail-inbox-list @key{RET} @var{files}
@key{RET}}. The argument can contain any number of file names, separated
by commas. It can also be empty, which specifies that this file should
-have no inboxes. Once a list of inboxes is specified, the Rmail file
-remembers it permanently until you specify a different list.
+have no inboxes. Once you specify a list of inboxes in an Rmail file,
+the Rmail file remembers it permanently until you specify a different list.
As a special exception, if your primary Rmail file does not specify any
inbox files, it uses your standard system inbox.
@@ -440,9 +435,9 @@ inbox files, it uses your standard system inbox.
@kindex g @r{(Rmail)}
@findex rmail-get-new-mail
The @kbd{g} command (@code{rmail-get-new-mail}) merges mail into the
-current Rmail file from its specified inboxes. If the Rmail file
-has no inboxes, @kbd{g} does nothing. The command @kbd{M-x rmail}
-also merges new mail into your primary Rmail file.
+current Rmail file from its inboxes. If the Rmail file has no
+inboxes, @kbd{g} does nothing. The command @kbd{M-x rmail} also
+merges new mail into your primary Rmail file.
To merge mail from a file that is not the usual inbox, give the
@kbd{g} key a numeric argument, as in @kbd{C-u g}. Then it reads a file
@@ -501,14 +496,14 @@ default for the output file name. However, the file name is read using
the minibuffer, so you can specify a different name if you wish.
You can also output a message to an Rmail file chosen with a menu.
-Choose first the menu bar Classify item, then from the Classify menu
-choose the Output Rmail File menu item; then choose the Rmail file you want.
-This outputs the current message to that file, like the @kbd{o} command.
-The variables @code{rmail-secondary-file-directory} and
+In the Classify menu, choose the Output Rmail File menu item; then
+choose the Rmail file you want. This outputs the current message to
+that file, like the @kbd{o} command. The variables
+@code{rmail-secondary-file-directory} and
@code{rmail-secondary-file-regexp} specify which files to offer in the
menu: the first variable says which directory to find them in; the
-second says which files in that directory to offer (all those that match
-the regular expression).
+second says which files in that directory to offer (all those that
+match the regular expression).
@vindex rmail-delete-after-output
Copying a message with @kbd{o} or @kbd{C-o} gives the original copy
@@ -606,7 +601,7 @@ repeat count.
(@code{rmail-summary-by-labels}) displays a summary containing only the
messages that have at least one of a specified set of labels. The
argument @var{labels} is one or more label names, separated by commas.
-@xref{Rmail Summary}, for information on summaries.@refill
+@xref{Rmail Summary}, for information on summaries.
If the @var{labels} argument to @kbd{C-M-n}, @kbd{C-M-p} or
@kbd{C-M-l} is empty, it means to use the last set of labels specified
@@ -616,9 +611,9 @@ for any of these commands.
@section Rmail Attributes
Some labels such as @samp{deleted} and @samp{filed} have built-in
-meanings and are assigned to or removed from messages automatically at
-appropriate times; these labels are called @dfn{attributes}. Here is a
-list of Rmail attributes:
+meanings, and Rmail assigns them to messages automatically at
+appropriate times; these labels are called @dfn{attributes}. Here is
+a list of Rmail attributes:
@table @samp
@item unseen
@@ -648,7 +643,7 @@ Means you have resent the message. Assigned by the command @kbd{M-x
rmail-resend}. @xref{Rmail Reply}.
@end table
- All other labels are assigned or removed only by the user, and have no
+ All other labels are assigned or removed only by users, and have no
standard meaning.
@node Rmail Reply
@@ -659,7 +654,7 @@ standard meaning.
certain features meant to work with Rmail. What this section documents
are the special commands of Rmail for entering Mail mode. Note that the
usual keys for sending mail---@kbd{C-x m}, @kbd{C-x 4 m}, and @kbd{C-x 5
-m}---are available in Rmail mode and work just as they usually do.
+m}---also work normally in Rmail mode.
@table @kbd
@item m
@@ -679,15 +674,15 @@ Try sending a bounced message a second time (@code{rmail-retry-failure}).
@kindex r @r{(Rmail)}
@findex rmail-reply
@cindex reply to a message
- The most common reason to send a message while in Rmail is to reply to
-the message you are reading. To do this, type @kbd{r}
-(@code{rmail-reply}). This displays the @samp{*mail*} buffer in another
-window, much like @kbd{C-x 4 m}, but preinitializes the @samp{Subject},
-@samp{To}, @samp{CC} and @samp{In-reply-to} header fields based on the
-message you are replying to. The @samp{To} field starts out as the
-address of the person who sent the message you received, and the
-@samp{CC} field starts out with all the other recipients of that
-message.
+ The most common reason to send a message while in Rmail is to reply
+to the message you are reading. To do this, type @kbd{r}
+(@code{rmail-reply}). This displays the @samp{*mail*} buffer in
+another window, much like @kbd{C-x 4 m}, but preinitializes the
+@samp{Subject}, @samp{To}, @samp{CC}, @samp{In-reply-to} and
+@samp{References} header fields based on the message you are replying
+to. The @samp{To} field starts out as the address of the person who
+sent the message you received, and the @samp{CC} field starts out with
+all the other recipients of that message.
@vindex rmail-dont-reply-to-names
You can exclude certain recipients from being placed automatically in
@@ -700,13 +695,14 @@ of using them for large mailing lists to broadcast announcements.)
To omit the @samp{CC} field completely for a particular reply, enter
the reply command with a numeric argument: @kbd{C-u r} or @kbd{1 r}.
+This means to reply only to the sender of the original message.
Once the @samp{*mail*} buffer has been initialized, editing and
sending the mail goes as usual (@pxref{Sending Mail}). You can edit the
-presupplied header fields if they are not right for you. You can also
+presupplied header fields if they are not what you want. You can also
use the commands of Mail mode (@pxref{Mail Mode}), including @kbd{C-c
C-y} which yanks in the message that you are replying to. You can
-switch to the Rmail buffer, select a different message there, switch
+also switch to the Rmail buffer, select a different message there, switch
back, and yank the new current message.
@kindex M-m @r{(Rmail)}
@@ -764,13 +760,13 @@ outgoing message that is not a reply. It leaves the header fields empty.
Its only difference from @kbd{C-x 4 m} is that it makes the Rmail buffer
accessible for @kbd{C-c C-y}, just as @kbd{r} does. Thus, @kbd{m} can be
used to reply to or forward a message; it can do anything @kbd{r} or @kbd{f}
-can do.@refill
+can do.
@kindex c @r{(Rmail)}
@findex rmail-continue
The @kbd{c} (@code{rmail-continue}) command resumes editing the
@samp{*mail*} buffer, to finish editing an outgoing message you were
-already composing, or to alter a message you have sent.@refill
+already composing, or to alter a message you have sent.
@vindex rmail-mail-new-frame
If you set the variable @code{rmail-mail-new-frame} to a
@@ -845,14 +841,14 @@ It then displays and selects the summary buffer in another window.
@kbd{C-M-l @var{labels} @key{RET}} (@code{rmail-summary-by-labels}) makes
a partial summary mentioning only the messages that have one or more of the
labels @var{labels}. @var{labels} should contain label names separated by
-commas.@refill
+commas.
@kindex C-M-r @r{(Rmail)}
@findex rmail-summary-by-recipients
@kbd{C-M-r @var{rcpts} @key{RET}} (@code{rmail-summary-by-recipients})
makes a partial summary mentioning only the messages that have one or more
of the recipients @var{rcpts}. @var{rcpts} should contain mailing
-addresses separated by commas.@refill
+addresses separated by commas.
@kindex C-M-t @r{(Rmail)}
@findex rmail-summary-by-topic
@@ -867,8 +863,8 @@ makes a partial summary which mentions only the messages whose headers
(including the date and the subject lines) match the regular
expression @var{regexp}.
- Note that there is only one summary buffer for any Rmail file; making one
-kind of summary discards any previously made summary.
+ Note that there is only one summary buffer for any Rmail file;
+making any kind of summary discards any previous summary.
@vindex rmail-summary-window-size
@vindex rmail-summary-line-count-flag
@@ -1007,19 +1003,25 @@ Toggle display of complete header (@code{rmail-toggle-header}).
@end table
@vindex rmail-ignored-headers
+@vindex rmail-nonignored-headers
Reformatting the header involves deleting most header fields, on the
grounds that they are not interesting. The variable
@code{rmail-ignored-headers} holds a regular expression that specifies
-which header fields to hide in this way---if it matches the beginning of
-a header field, that whole field is hidden.
+which header fields to hide in this way---if it matches the beginning
+of a header field, that whole field is hidden. However, the variable
+@code{rmail-nonignored-headers} provides a further override: a header
+matching that regular expression is shown even if it matches
+@code{rmail-ignored-headers} too.
@kindex t @r{(Rmail)}
@findex rmail-toggle-header
Rmail saves the complete original header before reformatting; to see
it, use the @kbd{t} command (@code{rmail-toggle-header}). This
-discards the reformatted headers of the current message and displays it
-with the original header. Repeating @kbd{t} reformats the message
-again. Selecting the message again also reformats.
+discards the reformatted headers of the current message and displays
+it with the original header. Repeating @kbd{t} reformats the message
+again, which shows only the interesting headers according to the
+current values of those variable. Selecting the message again also
+reformats it if necessary.
One consequence of this is that if you edit the reformatted header
(using @kbd{e}; @pxref{Rmail Editing}), subsequent use of @kbd{t} will
@@ -1041,10 +1043,10 @@ of a header field, that whole field is highlighted.
If you specify unusual colors for your text foreground and
background, the colors used for highlighting may not go well with
-them. If so, specify different colors for the face
-@code{rmail-highlight-face}. @xref{Faces}, for how to do this. To
-turn off highlighting entirely in Rmail, set
-@code{rmail-highlighted-headers} to @code{nil}.
+them. If so, specify different colors by setting the variable
+@code{rmail-highlight-face} to a suitable face. To turn off
+highlighting entirely in Rmail, set @code{rmail-highlighted-headers}
+to @code{nil}.
You can highlight and activate URLs in incoming messages by adding
the function @code{goto-address} to the hook
diff --git a/man/sc.texi b/man/sc.texi
index 7beb4aa88df..a26625b3392 100644
--- a/man/sc.texi
+++ b/man/sc.texi
@@ -16,7 +16,7 @@ attributing the replies for various GNU Emacs mail and news reading
subsystems.
Copyright @copyright{} 1993, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/screen.texi b/man/screen.texi
index 9499e3dfc77..72ed3261f01 100644
--- a/man/screen.texi
+++ b/man/screen.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Screen, User Input, Acknowledgments, Top
@chapter The Organization of the Screen
diff --git a/man/search.texi b/man/search.texi
index b1593559c85..443de66cbf5 100644
--- a/man/search.texi
+++ b/man/search.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, 2002,
-@c 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Search, Fixit, Display, Top
@chapter Searching and Replacement
@@ -737,7 +737,7 @@ specifies a ``shy'' group that does not record the matched substring;
you can't refer back to it with @samp{\@var{d}}. This is useful
in mechanically combining regular expressions, so that you
can add groups for syntactic purposes without interfering with
-the numbering of the groups that were written by the user.
+the numbering of the groups that are meant to be referred to.
@item \@var{d}
matches the same text that matched the @var{d}th occurrence of a
diff --git a/man/sending.texi b/man/sending.texi
index 6fa5c1b0485..2fbf9a189c7 100644
--- a/man/sending.texi
+++ b/man/sending.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, 2002,
-@c 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Sending Mail, Rmail, Picture, Top
@chapter Sending Mail
@@ -93,9 +93,10 @@ header fields, such as @samp{Date} and @samp{Sender}, are created
automatically when you send the message. Others, such as the recipient
names, must be specified by you in order to send the message properly.
- Mail mode provides a few commands to help you edit some header fields,
-and some are preinitialized in the buffer automatically at times. You can
-insert and edit header fields using ordinary editing commands.
+ In the mail buffer, you can insert and edit header fields using
+ordinary editing commands. Mail mode provides a commands to help you
+edit some header fields, and some are preinitialized in the buffer
+automatically when appropriate.
The line in the buffer that says
@@ -110,7 +111,7 @@ headers precede it. The delimiter line itself does not appear in the
message actually sent. The text used for the delimiter line is controlled
by the variable @code{mail-header-separator}.
-Here is an example of what the headers and text in the mail buffer
+ Here is an example of what the headers and text in the mail buffer
might look like.
@example
@@ -221,7 +222,7 @@ of places to send the message. These fields can also have
continuation lines: one or more lines starting with whitespace,
following the starting line of the field, are considered part of the
field. Here's an example of a @samp{To} field with a continuation
-line:@refill
+line:
@example
@group
@@ -433,9 +434,8 @@ lowest priority for reselection by default, since you are finished with
using it. This is the usual way to send the message.
In a file-visiting buffer, sending the message does not clear the
-modified flag, because only saving the file should do that. As a
-result, you don't get a warning if you try to send the same message
-twice.
+modified flag, because only saving the file should do that. Also, you
+don't get a warning if you try to send the same message twice.
@c This is indexed in mule.texi, node "Recognize Coding".
@c @vindex sendmail-coding-system
diff --git a/man/ses.texi b/man/ses.texi
index 38caa7c830a..c1d7737a09b 100644
--- a/man/ses.texi
+++ b/man/ses.texi
@@ -11,7 +11,8 @@
@copying
This file documents SES: the Simple Emacs Spreadsheet.
-Copyright @copyright{} 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright @copyright{} 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/sieve.texi b/man/sieve.texi
index 0d94f293fc2..7f99cd2cd57 100644
--- a/man/sieve.texi
+++ b/man/sieve.texi
@@ -9,7 +9,7 @@
@copying
This file documents the Emacs Sieve package.
-Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/smtpmail.texi b/man/smtpmail.texi
index d35d364ff53..792a7934f95 100644
--- a/man/smtpmail.texi
+++ b/man/smtpmail.texi
@@ -3,7 +3,7 @@
@settitle Emacs SMTP Library
@syncodeindex vr fn
@copying
-Copyright @copyright{} 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright @copyright{} 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/speedbar.texi b/man/speedbar.texi
index 4dc2bcea7d2..8a30751d479 100644
--- a/man/speedbar.texi
+++ b/man/speedbar.texi
@@ -6,7 +6,7 @@
@copying
Copyright @copyright{} 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/texinfo.tex b/man/texinfo.tex
index eb7ea101e61..80a6d085f5d 100644
--- a/man/texinfo.tex
+++ b/man/texinfo.tex
@@ -3,11 +3,11 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2005-08-10.17}
+\def\texinfoversion{2006-02-05.23}
%
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994,
% 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-% 2005 Free Software Foundation, Inc.
+% 2005, 2006 Free Software Foundation, Inc.
%
% This texinfo.tex file is free software; you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
diff --git a/man/text.texi b/man/text.texi
index 4470e494daf..4fb5ee9cc1e 100644
--- a/man/text.texi
+++ b/man/text.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Text, Programs, Indentation, Top
@chapter Commands for Human Languages
@@ -12,7 +12,8 @@ computer field. One is data that is a sequence of characters. Any file
that you edit with Emacs is text, in this sense of the word. The other
meaning is more restrictive: a sequence of characters in a human language
for humans to read (possibly after processing by a text formatter), as
-opposed to a program or commands for a program.
+opposed to a program or binary data. This chapter is concerned with
+editing text in the narrower sense.
Human languages have syntactic/stylistic conventions that can be
supported or used to advantage by editor commands: conventions involving
@@ -41,7 +42,7 @@ mode (@pxref{TeX Mode}).
@ifinfo
mode.
@end ifinfo
-For input to nroff, use Nroff mode.
+For input to groff or nroff, use Nroff mode.
Instead of using a text formatter, you can edit formatted text in
WYSIWYG style (``what you see is what you get''), with Enriched mode.
@@ -113,7 +114,7 @@ in the text. The analogy extends to numeric arguments, which serve as
repeat counts. @kbd{M-f} with a negative argument moves backward, and
@kbd{M-b} with a negative argument moves forward. Forward motion
stops right after the last letter of the word, while backward motion
-stops right before the first letter.@refill
+stops right before the first letter.
@kindex M-d
@findex kill-word
@@ -130,10 +131,10 @@ the end, and kill the word backwards with @kbd{M-@key{DEL}}.)
@kindex M-DEL
@kbd{M-@key{DEL}} (@code{backward-kill-word}) kills the word before
point. It kills everything from point back to where @kbd{M-b} would
-move to. If point is after the space in @w{@samp{FOO, BAR}}, then
-@w{@samp{FOO, }} is killed. (If you wish to kill just @samp{FOO}, and
-not the comma and the space, use @kbd{M-b M-d} instead of
-@kbd{M-@key{DEL}}.)
+move to. For instance, if point is after the space in @w{@samp{FOO,
+BAR}}, it kills @w{@samp{FOO, }}. If you wish to kill just
+@samp{FOO}, and not the comma and the space, use @kbd{M-b M-d} instead
+of @kbd{M-@key{DEL}}.
@c Don't index M-t and transpose-words here, they are indexed in
@c fixit.texi, in the node "Transpose".
@@ -155,9 +156,9 @@ to. @kbd{M-@@} accepts a numeric argument that says how many words to
scan for the place to put the mark. In Transient Mark mode, this command
activates the mark.
- The word commands' understanding of syntax is completely controlled by
-the syntax table. Any character can, for example, be declared to be a word
-delimiter. @xref{Syntax}.
+ The word commands' understanding of word boundaries is controlled
+by the syntax table. Any character can, for example, be declared to
+be a word delimiter. @xref{Syntax}.
@node Sentences
@section Sentences
@@ -206,7 +207,7 @@ beginning of the sentence. Larger arguments serve as a repeat count.
There is also a command, @kbd{C-x @key{DEL}}
(@code{backward-kill-sentence}), for killing back to the beginning of a
sentence. This command is useful when you change your mind in the
-middle of composing text.@refill
+middle of composing text.
The sentence commands assume that you follow the American typist's
convention of putting two spaces at the end of a sentence; they consider
@@ -214,34 +215,36 @@ a sentence to end wherever there is a @samp{.}, @samp{?} or @samp{!}
followed by the end of a line or two spaces, with any number of
@samp{)}, @samp{]}, @samp{'}, or @samp{"} characters allowed in between.
A sentence also begins or ends wherever a paragraph begins or ends.
+It is useful to follow this convention, because it makes a distinction
+between periods that end a sentence and periods that indicate
+abbreviations; that enables the Emacs sentence commands to distinguish,
+too. These commands to not stop for periods that indicate abbreviations.
-@vindex sentence-end
- The variable @code{sentence-end} controls recognition of the end of
-a sentence. If non-@code{nil}, it is a regexp that matches the last
-few characters of a sentence, together with the whitespace following
-the sentence. If the value is @code{nil}, the default, then Emacs
-computes the regexp according to various criteria. The result is
-normally similar to the following regexp:
-
-@example
-"[.?!][]\"')]*\\($\\| $\\|\t\\| \\)[ \t\n]*"
-@end example
-
-@noindent
-This example is explained in the section on regexps. @xref{Regexp Example}.
-
- If you want to use just one space between sentences, you should
-set @code{sentence-end} to this value:
+@vindex sentence-end-double-space
+ If you want to use just one space between sentences, you can set the
+variable @code{sentence-end-double-space} to @code{nil} to make the
+sentence commands stop for single spaces. However, this mode has a
+drawback: there is no way to distinguish between periods that end
+sentences and those that indicate abbreviations. For convenient and
+reliable editing, we therefore recommend you follow the two-space
+convention. The variable @code{sentence-end-double-space} also
+affects filling (@pxref{Fill Commands}) in related ways.
-@example
-"[.?!][]\"')]*\\($\\|\t\\| \\)[ \t\n]*"
-@end example
+@vindex sentence-end
+ The variable @code{sentence-end} controls how to recognize the end
+of a sentence. If non-@code{nil}, it is a regexp that matches the
+last few characters of a sentence, together with the whitespace
+following the sentence. If the value is @code{nil}, the default, then
+Emacs computes the regexp according to various criteria such as the
+value of @code{sentence-end-double-space}. @xref{Regexp Example}, for
+a detailed explanation of one of the regular expressions Emacs uses
+for this purpose.
-@noindent
-This is what setting the variable @code{sentence-end-double-space} to
-@code{nil} automatically does. But note that this makes it impossible
-to distinguish between periods that end sentences and those that
-indicate abbreviations.
+@vindex sentence-end-without-period
+ Some languages do not use period to indicate end of sentence. For
+example, a sentence in Thai text ends with double space but without a
+period. Set the variable @code{sentence-end-without-period} to
+@code{t} to tell the sentence commands that a period is not necessary.
@node Paragraphs
@section Paragraphs
@@ -266,18 +269,20 @@ Put point and mark around this or next paragraph (@code{mark-paragraph}).
@kbd{M-@{} moves to the beginning of the current or previous
paragraph, while @kbd{M-@}} moves to the end of the current or next
paragraph. Blank lines and text-formatter command lines separate
-paragraphs and are not considered part of any paragraph. In
-Paragraph-Indent Text mode, but not in Text mode, an indented line
-also starts a new paragraph. If there is a blank line before the
-paragraph, @kbd{M-@{} moves to the blank line, because that is
-convenient in practice.
+paragraphs and are not considered part of any paragraph. If there is
+a blank line before the paragraph, @kbd{M-@{} moves to the blank line,
+because that is convenient in practice.
+
+ In Text mode, an indented line is not a paragraph break. If you
+want indented lines to have this effect, use Paragraph-Indent Text
+mode instead. @xref{Text Mode}.
In major modes for programs, paragraphs begin and end only at blank
-lines. This makes the paragraph commands continue to be useful even
-though there are no paragraphs per se.
+lines. This makes the paragraph commands useful, even though there
+are no paragraphs as such in a program.
- When there is a fill prefix, then paragraphs are delimited by all lines
-which don't start with the fill prefix. @xref{Filling}.
+ When you have set a fill prefix, then paragraphs are delimited by
+all lines which don't start with the fill prefix. @xref{Filling}.
@kindex M-h
@findex mark-paragraph
@@ -399,11 +404,11 @@ Text}).
@menu
* Auto Fill:: Auto Fill mode breaks long lines automatically.
-* Refill:: Keeping paragraphs filled.
* Fill Commands:: Commands to refill paragraphs and center lines.
* Fill Prefix:: Filling paragraphs that are indented
or in a comment, etc.
* Adaptive Fill:: How Emacs can determine the fill prefix automatically.
+* Refill:: Keeping paragraphs filled.
* Longlines:: Editing text with very long lines.
@end menu
@@ -464,31 +469,6 @@ paragraph properly filled again is usually with the explicit fill commands.
The section on init files says how to arrange this permanently for yourself.
@xref{Init File}.
-@node Refill
-@subsection Refill Mode
-@cindex refilling text, word processor style
-@cindex modes, Refill
-@cindex Refill minor mode
-
- Refill minor mode provides support for keeping paragraphs filled as
-you type or modify them in other ways. It provides an effect similar
-to typical word processor behavior. This works by running a
-paragraph-filling command at suitable times.
-
- To toggle the use of Refill mode in the current buffer, type
-@kbd{M-x refill-mode}. When you are typing text, only characters
-which normally trigger auto filling, like the space character, will
-trigger refilling. This is to avoid making it too slow. Apart from
-self-inserting characters, other commands which modify the text cause
-refilling.
-
- The current implementation is preliminary and not robust. You can
-get better ``line wrapping'' behavior using Longlines mode.
-@xref{Longlines}. However, Longlines mode has an important
-side-effect: the newlines that it inserts for you are not saved to
-disk, so the files that you make with Longlines mode will appear to be
-completely unfilled if you edit them without Longlines mode.
-
@node Fill Commands
@subsection Explicit Fill Commands
@@ -515,24 +495,24 @@ where necessary.
@findex fill-region
To refill many paragraphs, use @kbd{M-x fill-region}, which
-divides the region into paragraphs and fills each of them.
+finds the paragraphs in the region and fills each of them.
@findex fill-region-as-paragraph
@kbd{M-q} and @code{fill-region} use the same criteria as @kbd{M-h}
for finding paragraph boundaries (@pxref{Paragraphs}). For more
control, you can use @kbd{M-x fill-region-as-paragraph}, which refills
-everything between point and mark. This command deletes any blank lines
-within the region, so separate blocks of text end up combined into one
-block.@refill
+everything between point and mark as a single paragraph. This command
+deletes any blank lines within the region, so separate blocks of text
+end up combined into one block.
@cindex justification
- A numeric argument to @kbd{M-q} causes it to @dfn{justify} the text as
-well as filling it. This means that extra spaces are inserted to make
-the right margin line up exactly at the fill column. To remove the
-extra spaces, use @kbd{M-q} with no argument. (Likewise for
+ A numeric argument to @kbd{M-q} tells it to @dfn{justify} the text
+as well as filling it. This means that extra spaces are inserted to
+make the right margin line up exactly at the fill column. To remove
+the extra spaces, use @kbd{M-q} with no argument. (Likewise for
@code{fill-region}.) Another way to control justification, and choose
-other styles of filling, is with the @code{justification} text property;
-see @ref{Format Justification}.
+other styles of filling, is with the @code{justification} text
+property; see @ref{Format Justification}.
@kindex M-s @r{(Text mode)}
@cindex centering
@@ -561,7 +541,6 @@ indicates an abbreviation and not the end of a sentence. To preserve
the distinction between these two ways of using a period, the fill
commands do not break a line after a period followed by just one space.
-@vindex sentence-end-double-space
If the variable @code{sentence-end-double-space} is @code{nil}, the
fill commands expect and leave just one space at the end of a sentence.
Ordinarily this variable is @code{t}, so the fill commands insist on
@@ -571,18 +550,13 @@ two spaces for the end of a sentence, as explained above. @xref{Sentences}.
If the variable @code{colon-double-space} is non-@code{nil}, the
fill commands put two spaces after a colon.
-@vindex sentence-end-without-period
- Some languages do not use period to indicate end of sentence. For
-example, a sentence in Thai text ends with double space but without a
-period. Set the variable @code{sentence-end-without-period} to
-@code{t} to tell the sentence commands that a period is not necessary.
-
@vindex fill-nobreak-predicate
The variable @code{fill-nobreak-predicate} specifies additional
conditions for where line-breaking is allowed. Its value is either
@code{nil} or a Lisp function; the function is called with no
-arguments, and if it returns a non-@code{nil} value, then point is not
-a good place to break the line. Two standard functions you can use are
+arguments, with point at a place where Emacs is considering breaking
+the line. If the function returns a non-@code{nil} value, then that's
+a bad place to break the line. Two standard functions you can use are
@code{fill-single-word-nobreak-p} (don't break after the first word of
a sentence or before the last) and @code{fill-french-nobreak-p} (don't
break after @samp{(} or before @samp{)}, @samp{:} or @samp{?}).
@@ -615,20 +589,20 @@ a new paragraph.
@findex set-fill-prefix
To specify a fill prefix for the current buffer, move to a line that
starts with the desired prefix, put point at the end of the prefix,
-and give the command @w{@kbd{C-x .}}@: (@code{set-fill-prefix}).
-That's a period after the @kbd{C-x}. To turn off the fill prefix,
-specify an empty prefix: type @w{@kbd{C-x .}}@: with point at the
-beginning of a line.@refill
+and type @w{@kbd{C-x .}}@: (@code{set-fill-prefix}). (That's a period
+after the @kbd{C-x}.) To turn off the fill prefix, specify an empty
+prefix: type @w{@kbd{C-x .}}@: with point at the beginning of a line.
When a fill prefix is in effect, the fill commands remove the fill
-prefix from each line before filling and insert it on each line after
-filling. (The beginning of the first line is left unchanged, since
-often that is intentionally different.) Auto Fill mode also inserts
-the fill prefix automatically when it makes a new line. The @kbd{C-o}
-command inserts the fill prefix on new lines it creates, when you use
-it at the beginning of a line (@pxref{Blank Lines}). Conversely, the
-command @kbd{M-^} deletes the prefix (if it occurs) after the newline
-that it deletes (@pxref{Indentation}).
+prefix from each line of the paragraph before filling and insert it on
+each line after filling. (The beginning of the first line of the
+paragraph is left unchanged, since often that is intentionally
+different.) Auto Fill mode also inserts the fill prefix automatically
+when it makes a new line. The @kbd{C-o} command inserts the fill
+prefix on new lines it creates, when you use it at the beginning of a
+line (@pxref{Blank Lines}). Conversely, the command @kbd{M-^} deletes
+the prefix (if it occurs) after the newline that it deletes
+(@pxref{Indentation}).
For example, if @code{fill-column} is 40 and you set the fill prefix
to @samp{;; }, then @kbd{M-q} in the following text
@@ -749,6 +723,31 @@ line, and it should return the appropriate fill prefix based on that
line. If it returns @code{nil}, @code{adaptive-fill-regexp} gets
a chance to find a prefix.
+@node Refill
+@subsection Refill Mode
+@cindex refilling text, word processor style
+@cindex modes, Refill
+@cindex Refill minor mode
+
+ Refill minor mode provides support for keeping paragraphs filled as
+you type or modify them in other ways. It provides an effect similar
+to typical word processor behavior. This works by running a
+paragraph-filling command at suitable times.
+
+ To toggle the use of Refill mode in the current buffer, type
+@kbd{M-x refill-mode}. When you are typing text, only characters
+which normally trigger auto filling, like the space character, will
+trigger refilling. This is to avoid making it too slow. Apart from
+self-inserting characters, other commands which modify the text cause
+refilling.
+
+ The current implementation is preliminary and not robust. You can
+get better ``line wrapping'' behavior using Longlines mode.
+@xref{Longlines}. However, Longlines mode has an important
+side-effect: the newlines that it inserts for you are not saved to
+disk, so the files that you make with Longlines mode will appear to be
+completely unfilled if you edit them without Longlines mode.
+
@node Longlines
@subsection Long Lines Mode
@cindex refilling text, word processor style
@@ -786,11 +785,11 @@ line wrapping, with @kbd{C-u M-x longlines-auto-wrap}. To turn
automatic line wrapping back on, type @kbd{M-x longlines-auto-wrap}.
@findex longlines-show-hard-newlines
- Whenever you type @kbd{RET}, you are inserting a hard newline. If
-you want to see where all the hard newlines are, type @kbd{M-x
-longlines-show-hard-newlines}. This will mark each hard newline with
-a special symbol. The same command with a prefix argument turns this
-display off.
+ Type @kbd{RET} to insert a hard newline, one which automatic
+refilling will not remove. If you want to see where all the hard
+newlines are, type @kbd{M-x longlines-show-hard-newlines}. This will
+mark each hard newline with a special symbol. The same command with a
+prefix argument turns this display off.
Long Lines mode does not change normal text files that are already
filled, since the existing newlines are considered hard newlines.
@@ -845,10 +844,11 @@ to the appropriate number of words before point, but do not move point.
This is convenient when you have just typed a word in the wrong case: you
can give the case conversion command and continue typing.
- If a word case conversion command is given in the middle of a word, it
-applies only to the part of the word which follows point. This is just
-like what @kbd{M-d} (@code{kill-word}) does. With a negative argument,
-case conversion applies only to the part of the word before point.
+ If a word case conversion command is given in the middle of a word,
+it applies only to the part of the word which follows point. (This is
+comparable to what @kbd{M-d} (@code{kill-word}) does.) With a
+negative argument, case conversion applies only to the part of the
+word before point.
@kindex C-x C-l
@kindex C-x C-u
@@ -888,22 +888,23 @@ the previous line.
Text mode turns off the features concerned with comments except when
you explicitly invoke them. It changes the syntax table so that
single-quotes are considered part of words. However, if a word starts
-with single-quotes, then these are treated as a prefix for purposes
-such as capitalization. That is, @kbd{M-c} will convert
-@samp{'hello'} into @samp{'Hello'}, as expected.
+with single-quotes, these are treated as a prefix for purposes such as
+capitalization. That is, @kbd{M-c} will convert @samp{'hello'} into
+@samp{'Hello'}, as expected.
@cindex Paragraph-Indent Text mode
@cindex mode, Paragraph-Indent Text
@findex paragraph-indent-text-mode
@findex paragraph-indent-minor-mode
If you indent the first lines of paragraphs, then you should use
-Paragraph-Indent Text mode rather than Text mode. In this mode, you do
-not need to have blank lines between paragraphs, because the first-line
-indentation is sufficient to start a paragraph; however paragraphs in
-which every line is indented are not supported. Use @kbd{M-x
-paragraph-indent-text-mode} to enter this mode. Use @kbd{M-x
-paragraph-indent-minor-mode} to enter an equivalent minor mode, for
-instance during mail composition.
+Paragraph-Indent Text mode rather than Text mode. In this mode, you
+do not need to have blank lines between paragraphs, because the
+first-line indentation is sufficient to start a paragraph; however
+paragraphs in which every line is indented are not supported. Use
+@kbd{M-x paragraph-indent-text-mode} to enter this mode. Use @kbd{M-x
+paragraph-indent-minor-mode} to enable an equivalent minor mode in
+situations where you can't change the major mode---in mail
+composition, for instance.
@kindex M-TAB @r{(Text mode)}
Text mode, and all the modes based on it, define @kbd{M-@key{TAB}}
@@ -1083,7 +1084,7 @@ heading line. @kbd{C-c C-p} (@code{outline-previous-visible-heading}) moves
similarly backward. Both accept numeric arguments as repeat counts. The
names emphasize that invisible headings are skipped, but this is not really
a special feature. All editing commands that look for lines ignore the
-invisible lines automatically.@refill
+invisible lines automatically.
@findex outline-up-heading
@findex outline-forward-same-level
@@ -1164,7 +1165,7 @@ and @kbd{C-c C-s} (@code{show-subtree}). Both apply to the current
heading line's @dfn{subtree}: its body, all its subheadings, both
direct and indirect, and all of their bodies. In other words, the
subtree contains everything following the current heading line, up to
-and not including the next heading of the same or higher rank.@refill
+and not including the next heading of the same or higher rank.
@findex hide-leaves
@findex show-branches
@@ -1181,7 +1182,7 @@ bodies or make the subheadings visible. They are @kbd{C-c C-l}
A little weaker than @code{show-branches} is @kbd{C-c C-i}
(@code{show-children}). It makes just the direct subheadings
visible---those one level down. Deeper subheadings remain invisible, if
-they were invisible.@refill
+they were invisible.
@findex hide-body
@findex show-all
@@ -1356,13 +1357,14 @@ automatically by putting this in your @file{.emacs} file:
@findex slitex-mode
@findex doctex-mode
- @TeX{} is a powerful text formatter written by Donald Knuth; it is also
-free, like GNU Emacs. La@TeX{} is a simplified input format for @TeX{},
-implemented by @TeX{} macros; it comes with @TeX{}. Sli@TeX{} is a special
-form of La@TeX{}.@footnote{Sli@TeX{} is obsoleted by the @samp{slides}
-document class in recent La@TeX{} versions.} Doc@TeX{} (@file{.dtx})
-is a special file format in which the La@TeX{} sources are written,
-combining sources with documentation.
+ @TeX{} is a powerful text formatter written by Donald Knuth; it is
+also free software, like GNU Emacs. La@TeX{} is a simplified input
+format for @TeX{}, implemented by @TeX{} macros; it comes with @TeX{}.
+Sli@TeX{} is a special form of La@TeX{}.@footnote{Sli@TeX{} is
+obsoleted by the @samp{slides} document class in recent La@TeX{}
+versions.} Doc@TeX{} (@file{.dtx}) is a special file format in which
+the La@TeX{} sources are written, combining sources with
+documentation.
Emacs has a special @TeX{} mode for editing @TeX{} input files.
It provides facilities for checking the balance of delimiters and for
@@ -1611,7 +1613,7 @@ C-l}.
Type @kbd{C-c C-k} (@code{tex-kill-job}) to kill the @TeX{} process if
you see that its output is no longer useful. Using @kbd{C-c C-b} or
-@kbd{C-c C-r} also kills any @TeX{} process still running.@refill
+@kbd{C-c C-r} also kills any @TeX{} process still running.
@findex tex-region
@kindex C-c C-r @r{(@TeX{} mode)}
@@ -1838,7 +1840,7 @@ used as a cheap preview.
@vindex sgml-xml-mode
SGML mode and HTML mode support XML also. In XML, every opening tag
must have an explicit closing tag. When @code{sgml-xml-mode} is
-non-@code{nil}, SGML mode (and HTML mode) always insert explicit
+non-@code{nil}, SGML mode and HTML mode always insert explicit
closing tags. When you visit a file, these modes determine from the
file contents whether it is XML or not, and set @code{sgml-xml-mode}
accordingly, so that they do the right thing for the file in either
@@ -2380,7 +2382,7 @@ appropriate, use @code{format-find-file} with suitable arguments.
@cindex table mode
@cindex text-based tables
- Table Mode provides an easy and intuitive way to create and edit WYSIWYG
+ Table mode provides an easy and intuitive way to create and edit WYSIWYG
text-based tables. Here is an example of such a table:
@smallexample
@@ -2402,7 +2404,7 @@ text-based tables. Here is an example of such a table:
+-----------------+--------------------------------+-----------------+
@end smallexample
- Table Mode allows the contents of the table such as this one to be
+ Table mode allows the contents of the table such as this one to be
easily manipulated by inserting or deleting characters inside a cell.
A cell is effectively a localized rectangular edit region and edits to
a cell do not affect the contents of the surrounding cells. If the
@@ -2428,8 +2430,8 @@ growth of the cell.
@node Table Definition
@subsection What is a Text-based Table?
- Look at the following examples of valid tables as a reference while
-you read this section:
+ Keep the following examples of valid tables in mind as a reference
+while you read this section:
@example
+--+----+---+ +-+ +--+-----+
@@ -2441,15 +2443,13 @@ you read this section:
+-----+--+
@end example
- A table consists of a rectangular frame and the contents inside the
-frame. A table's cells must be at least one character wide and one
-character high with two adjacent cells sharing a boarder line. A cell
-can be subdivided into multiple rectangular cells but cannot nest or
-overlap.
+ A table consists of a rectangular frame whose inside is divided into
+cells. Each cell must be at least one character wide and one
+character high, not counting its border lines. A cell can be
+subdivided into multiple rectangular cells, but cells cannot overlap.
- Both the table frame and cell border lines must consist of one of
-three special characters. The variables that hold these characters
-are described below:
+ The table frame and cell border lines are made of three special
+characters. These variables specify those characters:
@table @code
@vindex table-cell-vertical-char
@@ -2487,10 +2487,10 @@ From left to right:
@enumerate a
@item
-Nested cells are not allowed.
-@item
Overlapped cells or non-rectangular cells are not allowed.
@item
+Same as a.
+@item
The border must be rectangular.
@item
Cells must have a minimum width/height of one character.
@@ -2506,16 +2506,15 @@ Same as d.
@findex table-insert
The command to create a table is @code{table-insert}. When called
interactively, it asks for the number of columns, number of rows, cell
-width and cell height. The number of columns is a number of cells
-within the table's width. The number of rows is the number of cells
-within the table's height. The cell width is a number of characters
-that fit within a cell width. The cell height is a number of lines
-within cell height. While the number of columns and number of rows
-must be an integer number, the cell width and the cell height can be
-either an integer number (when the value is constant across the table)
-or a series of integer numbers, separated by spaces or commas, where
-each number corresponds to each cell width within a row from left to
-right or each cell height within a column from top to bottom.
+width and cell height. The number of columns is the number of cells
+horizontally side by side. The number of rows is the number of cells
+vertically within the table's height. The cell width is a number of
+characters that each cell holds, left to right. The cell height is a
+number of lines each cell holds. The cell width and the cell height
+can be either an integer (when the value is constant across the table)
+or a series of integer, separated by spaces or commas, where each
+number corresponds to the next cell within a row from left to right,
+or the next cell within a column from top to bottom.
@node Table Recognition
@subsection Table Recognition
@@ -2523,7 +2522,7 @@ right or each cell height within a column from top to bottom.
@findex table-recognize
@findex table-unrecognize
- Table Mode maintains special text properties in the buffer to allow
+ Table mode maintains special text properties in the buffer to allow
editing in a convenient fashion. When a buffer with tables is saved
to its file, these text properties are lost, so when you visit this
file again later, Emacs does not see a table, but just formatted text.
@@ -2531,15 +2530,10 @@ To resurrect the table text properties, issue the @kbd{M-x
table-recognize} command. It scans the current buffer, recognizes
valid table cells, and attaches appropriate text properties to allow
for table editing. The converse command, @code{table-unrecognize}, is
-used to remove the special text properties and revert the buffer back
+used to remove the special text properties and convert the buffer back
to plain text.
- An optional numeric prefix argument can precede the
-@code{table-recognize} command. If the argument is negative, tables
-in the buffer become inactive. This is equivalent to invoking
-@code{table-unrecognize}.
-
- Similar functions exist to enable or disable tables within a region,
+ Special commands exist to enable or disable tables within a region,
enable or disable individual tables, and enable/disable individual
cells. These commands are:
@@ -2575,10 +2569,10 @@ Conversion}.
The commands @code{table-forward-cell} and
@code{table-backward-cell} move point from the current cell to an
adjacent cell forward and backward respectively. The order of the
-cell is wrapped. When point is positioned in the last cell of a
-table, typing @kbd{M-x table-forward-cell} moves point to the first
-cell in the table. Likewise @kbd{M-x table-backward-cell} from the
-first cell in a table moves point to the last cell in the table.
+cells is cyclic: when point is in the last cell of a table, typing
+@kbd{M-x table-forward-cell} moves to the first cell in the table.
+Likewise @kbd{M-x table-backward-cell} from the first cell in a table
+moves to the last cell.
@findex table-span-cell
The command @code{table-span-cell} spans the current cell into one
@@ -2602,18 +2596,17 @@ point is located. The content in the original cell is split as well.
@findex table-split-cell-horizontally
The command @code{table-split-cell-horizontally} splits the current
cell horizontally and creates a pair of cells right and left of where
-point is located. If the subject cell to split is not empty the user
-is asked how to handle the cell contents. The three options are:
-@code{split}, @code{left}, or @code{right}. @code{split} splits the
-contents at point literally while the @code{left} and @code{right}
-options move the entire contents into the left or right cell
-respectively.
+point is located. If the cell being split is not empty, this asks you
+how to handle the cell contents. The three options are: @code{split},
+@code{left}, or @code{right}. @code{split} splits the contents at
+point literally, while the @code{left} and @code{right} options move
+the entire contents into the left or right cell respectively.
@cindex enlarge a table cell
@cindex shrink a table cell
- The next four commands enlarge or shrink a cell. These commands
-accept numeric arguments (@pxref{Arguments}) to specify how many
-columns or rows to enlarge or shrink a particular table.
+ The next four commands enlarge or shrink a cell. They use numeric
+arguments (@pxref{Arguments}) to specify how many columns or rows to
+enlarge or shrink a particular table.
@table @kbd
@findex table-heighten-cell
@@ -2639,21 +2632,20 @@ is remembered independently for each cell and the subsequent editing
of cell contents is subject to the specified justification.
@findex table-justify
- The command @code{table-justify} requests the user to specify what
-to justify: a cell,a column, or a row. If you select cell
-justification, this command sets the justification only to the current
-cell. Selecting column or row justification set the justification to
-all the cells within a column or row respectively. The command then
-requests the user to enter which justification to apply: @code{left},
-@code{center}, @code{right}, @code{top}, @code{middle}, @code{bottom},
-or @code{none}. The options @code{left}, @code{center}, and
+ The command @code{table-justify} ask you to specify what to justify:
+a cell, a column, or a row. If you select cell justification, this
+command sets the justification only for the current cell. Selecting
+column or row justification sets the justification for all the cells
+within a column or row respectively. The command then ask you which
+kind of justification to apply: @code{left}, @code{center},
+@code{right}, @code{top}, @code{middle}, @code{bottom}, or
+@code{none}. Horizontal justification and vertical justification are
+specified independently. The options @code{left}, @code{center}, and
@code{right} specify horizontal justification while the options
@code{top}, @code{middle}, @code{bottom}, and @code{none} specify
vertical justification. The vertical justification @code{none}
-effectively removes vertical justification while horizontal
-justification must be one of @code{left}, @code{center}, or
-@code{right}. Horizontal justification and vertical justification are
-specified independently.
+effectively removes vertical justification. Horizontal justification
+must be one of @code{left}, @code{center}, or @code{right}.
@vindex table-detect-cell-alignment
Justification information is stored in the buffer as a part of text
@@ -2667,8 +2659,8 @@ the contents of a cell are examined to determine which justification
was originally applied to the cell and then applies this justification
to the cell. This is a speculative algorithm and is therefore not
perfect, however, the justification is deduced correctly most of the
-time. If you desire to disable this feature, customize the variable
-@code{table-detect-cell-alignment} to set it to @code{nil}.
+time. To disable this feature, customize the variable
+@code{table-detect-cell-alignment} and set it to @code{nil}.
@node Row Commands
@subsection Commands for Table Rows
@@ -2681,7 +2673,7 @@ the current row in a table. The current row where point is located is
pushed down after the newly inserted row. A numeric prefix argument
specifies the number of rows to insert. Note that in order to insert
rows @emph{after} the last row at the bottom of a table, you must
-place point below the table, i.e.@: outside the table, prior to
+place point below the table---that is, outside the table---prior to
invoking this command.
@cindex delete row in table
@@ -2696,12 +2688,11 @@ A numeric prefix argument specifies the number of rows to delete.
@cindex insert column in table
@findex table-insert-column
The command @code{table-insert-column} inserts a column of cells to
-the left of the current row in a table. The current column where
-point is located at is pushed right of the newly inserted column. To
-insert a column to the right side of the right most column, place
-point to the right of the rightmost column, which is outside of the
-table, prior to invoking this command. A numeric prefix argument
-specifies the number of columns to insert.
+the left of the current row in a table. This pushes the current
+column to the right. To insert a column to the right side of the
+rightmost column, place point to the right of the rightmost column,
+which is outside of the table, prior to invoking this command. A
+numeric prefix argument specifies the number of columns to insert.
@cindex delete column in table
A command @code{table-delete-column} deletes a column of cells at
@@ -2714,11 +2705,10 @@ delete.
@findex table-fixed-width-mode
The command @code{table-fixed-width-mode} toggles fixed width mode
-on and off. When the fixed width mode is turned on, editing inside a
+on and off. When fixed width mode is turned on, editing inside a
cell never changes the cell width; when it is off, the cell width
expands automatically in order to prevent a word from being folded
-into multiple lines. By default, the fixed width mode is turned off.
-
+into multiple lines. By default, fixed width mode is disabled.
@node Table Conversion
@subsection Conversion Between Plain Text and Tables
@@ -2731,9 +2721,11 @@ turns it into a table. Unlike @code{table-recognize} (@pxref{Table
Recognition}), the original text does not have a table appearance but
may hold a logical table structure. For example, some elements
separated by known patterns form a two dimensional structure which can
-be turned into a table. Look at the numbers below. The numbers are
-horizontally separated by a comma and vertically separated by a
-newline character.
+be turned into a table.
+
+ Here's an example of data that @code{table-capture} can operate on.
+The numbers are horizontally separated by a comma and vertically
+separated by a newline character.
@example
1, 2, 3, 4
@@ -2742,8 +2734,7 @@ newline character.
@end example
@noindent
-When you invoke @kbd{M-x table-capture} on the above three-line
-region, the region can be turned into the next table:
+Invoking @kbd{M-x table-capture} on that text produces this table:
@example
+-----+-----+-----+-----+
@@ -2756,9 +2747,9 @@ region, the region can be turned into the next table:
@end example
@noindent
-where @samp{,} is used for a column delimiter regexp, a newline is
-used for a row delimiter regexp, cells are left justified, and minimum
-cell width is 5.
+The conversion uses @samp{,} for the column delimiter and newline for
+a row delimiter, cells are left justified, and minimum cell width is
+5.
@findex table-release
The command @code{table-release} does the opposite of
@@ -2771,7 +2762,7 @@ lines):
@example
@samp{table-capture} is a powerful command however mastering its power
-requires some practice. Here is a list of items what it can do.
+requires some practice. Here are some things it can do:
Parse Cell Items By using column delimiter regular
expression and raw delimiter regular
@@ -2797,9 +2788,8 @@ following one.
@c produced output!!
@example
+-----------------------------------------------------------------+
-|@samp{table-capture} is a powerful command however mastering its |
-|power requires some practice. Here is a list of items what it |
-|can do. |
+|@samp{table-capture} is a powerful command, but mastering its |
+|power requires some practice. Here are some things it can do: |
| |
|Parse Cell Items By using column delimiter regular |
| expression and raw delimiter regular |
@@ -2822,9 +2812,8 @@ independently without affecting the layout of other cells.
@example
+-----------------------------------------------------------------+
-|@samp{table-capture} is a powerful command however mastering its |
-|power requires some practice. Here is a list of items what it |
-|can do. |
+|@samp{table-capture} is a powerful command, but mastering its |
+|power requires some practice. Here are some things it can do: |
+---------------------+-------------------------------------------+
|Parse Cell Items |By using column delimiter regular |
| |expression and raw delimiter regular |
@@ -2877,7 +2866,7 @@ increasing integer numbers.
@cindex table in language format
@cindex table for HTML and LaTeX
@findex table-generate-source
-The command @code{table-generate-source} generates a table formatted
+ The command @code{table-generate-source} generates a table formatted
for a specific markup language. It asks for a language (which must be
one of @code{html}, @code{latex}, or @code{cals}), a destination
buffer where to put the result, and the table caption (a string), and
diff --git a/man/trouble.texi b/man/trouble.texi
index 37ced330225..a6b1e8e564a 100644
--- a/man/trouble.texi
+++ b/man/trouble.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@iftex
@chapter Dealing with Common Problems
@@ -158,14 +158,14 @@ erasure key}. In Emacs, it is supposed to be equivalent to @key{DEL},
and when Emacs is properly configured for your terminal, it translates
that key into the character @key{DEL}.
- When Emacs starts up using a window system, it determines
+ When Emacs starts up on a graphical display, it determines
automatically which key should be @key{DEL}. In some unusual cases
Emacs gets the wrong information from the system. If the usual
erasure key deletes forwards instead of backwards, that is probably
what happened---Emacs ought to be treating the @key{DELETE} key as
@key{DEL}, but it isn't.
- With a window system, if the usual erasure key is labeled
+ On a graphical display, if the usual erasure key is labeled
@key{BACKSPACE} and there is a @key{DELETE} key elsewhere, but the
@key{DELETE} key deletes backward instead of forward, that too
suggests Emacs got the wrong information---but in the opposite sense.
@@ -213,7 +213,7 @@ customize the variable @code{normal-erase-is-backspace}: the value
@key{DEL}, and @code{nil} specifies the other mode. @xref{Easy
Customization}.
- With a window system, it can also happen that the usual erasure key
+ On a graphical display, it can also happen that the usual erasure key
is labeled @key{BACKSPACE}, there is a @key{DELETE} key elsewhere, and
both keys delete forward. This probably means that someone has
redefined your @key{BACKSPACE} key as a @key{DELETE} key. With X,
@@ -226,7 +226,7 @@ you simply remove it now.
@subsection Recursive Editing Levels
Recursive editing levels are important and useful features of Emacs, but
-they can seem like malfunctions to the user who does not understand them.
+they can seem like malfunctions if you do not understand them.
If the mode line has square brackets @samp{[@dots{}]} around the parentheses
that contain the names of the major and minor modes, you have entered a
diff --git a/man/url.texi b/man/url.texi
index cfc62fe0739..afbc96994c8 100644
--- a/man/url.texi
+++ b/man/url.texi
@@ -22,7 +22,7 @@
This file documents the URL loading package.
Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Copyright (C) 1993, 1994, 1995, 1996 William M. Perry
Permission is granted to copy, distribute and/or modify this document
@@ -52,7 +52,7 @@ License.''
@vskip 0pt plus 1filll
Copyright @copyright{} 1993, 1994, 1995, 1996 William M. Perry@*
Copyright @copyright{} 1996, 1997, 1998, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 or
diff --git a/man/vip.texi b/man/vip.texi
index 96d04ef0913..b76003b655d 100644
--- a/man/vip.texi
+++ b/man/vip.texi
@@ -5,7 +5,7 @@
@copying
Copyright @copyright{} 1987, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/viper.texi b/man/viper.texi
index 572a3296d52..4ad437a762d 100644
--- a/man/viper.texi
+++ b/man/viper.texi
@@ -8,7 +8,7 @@
@copying
Copyright @copyright{} 1995, 1996, 1997, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/widget.texi b/man/widget.texi
index cf10e5980b7..6ce78a9c3cd 100644
--- a/man/widget.texi
+++ b/man/widget.texi
@@ -10,7 +10,8 @@
@c %**end of header
@copying
-Copyright @copyright{} 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/windows.texi b/man/windows.texi
index 53cef3d3cbc..a000892ad09 100644
--- a/man/windows.texi
+++ b/man/windows.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Windows, Frames, Buffers, Top
@chapter Multiple Windows
diff --git a/man/woman.texi b/man/woman.texi
index 8ba04675acf..a1b6250ef37 100644
--- a/man/woman.texi
+++ b/man/woman.texi
@@ -3,7 +3,7 @@
@setfilename ../info/woman
@settitle WoMan: Browse Unix Manual Pages ``W.O. (without) Man''
@c Manual last updated:
-@set UPDATED Time-stamp: <2002-12-10 14:08:15 pavel>
+@set UPDATED Time-stamp: <2006-02-05 23:30:17 ttn>
@c Software version:
@set VERSION 0.54 (beta)
@afourpaper
@@ -18,7 +18,7 @@ This file documents WoMan: A program to browse Unix manual pages `W.O.
(without) man'.
Copyright @copyright{} 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/man/xresources.texi b/man/xresources.texi
index 1e0783eac61..f7947edda17 100644
--- a/man/xresources.texi
+++ b/man/xresources.texi
@@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1987, 1993, 1994, 1995, 1997, 2001, 2002, 2003,
-@c 2004, 2005 Free Software Foundation, Inc.
+@c 2004, 2005, 2006 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node X Resources, Antinews, Emacs Invocation, Top
@appendix X Options and Resources
@@ -877,14 +877,14 @@ also for the trough of a scroll bar, i.e. @code{bg[ACTIVE] = "red"}
sets the scroll bar trough to red. Buttons that have been pressed but
not released yet (``armed'') are in this state.
@item PRELIGHT
-This is the state when widgets that can be manipulated have the mouse
-pointer over them. For example when the mouse is over the thumb in the
-scroll bar or over a menu item. When the mouse is over a button that
-is not pressed, the button is in this state.
+This is the state for a widget that can be manipulated, when the mouse
+pointer is over it---for example when the mouse is over the thumb in
+the scroll bar or over a menu item. When the mouse is over a button
+that is not pressed, the button is in this state.
@item SELECTED
-This is the state when some data has been selected by the user. It can
-be selected text or items selected in a list.
-There is no place in Emacs where this setting has any effect.
+This is the state for data that has been selected by the user. It can
+be selected text or items selected in a list. This state is not used
+in Emacs.
@item INSENSITIVE
This is the state for widgets that are visible, but they can not be
manipulated in the usual way---for example, buttons that can't be
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 7846f90c508..988f073cb53 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -615,7 +615,7 @@
;; End:
Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.
diff --git a/msdos/README b/msdos/README
index 3827d2944d7..40f579cf49f 100644
--- a/msdos/README
+++ b/msdos/README
@@ -6,7 +6,8 @@ The files emacs.ico and emacs.pif are for using the DJGPP version on
Windows 3.X. Since these are binary files, their copyright notice is
reproduced here:
-# Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1993, 2002, 2003, 2004, 2005,
+# 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/msdos/mainmake b/msdos/mainmake
index d09f11b4e40..1b69bfd24e6 100644
--- a/msdos/mainmake
+++ b/msdos/mainmake
@@ -1,5 +1,5 @@
# Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index b31dcb8905c..d46651e3253 100644
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -1,7 +1,7 @@
# Top-level Makefile for Emacs under MS-DOS/DJGPP v2.0 or higher. -*-makefile-*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
diff --git a/msdos/sed1.inp b/msdos/sed1.inp
index 2efbde37a6f..b13a7ae08ac 100644
--- a/msdos/sed1.inp
+++ b/msdos/sed1.inp
@@ -3,7 +3,7 @@
# ----------------------------------------------------------------------
#
# Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 358faa24dc4..63f62985f52 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -3,7 +3,7 @@
# ----------------------------------------------------------------------
#
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/msdos/sed2.inp b/msdos/sed2.inp
index 945b753d01d..3f5852e6c59 100644
--- a/msdos/sed2.inp
+++ b/msdos/sed2.inp
@@ -3,7 +3,7 @@
# ----------------------------------------------------------------------
#
# Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2003,
-# 2004, 2005 Free Software Foundation, Inc.
+# 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index 3beb48650e7..89fae6d7a41 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -3,7 +3,7 @@
# ----------------------------------------------------------------------
#
# Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2003,
-# 2004, 2005 Free Software Foundation, Inc.
+# 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/msdos/sed2x.inp b/msdos/sed2x.inp
index b1cbd696030..b31d1361ace 100644
--- a/msdos/sed2x.inp
+++ b/msdos/sed2x.inp
@@ -2,7 +2,8 @@
# Extra configuration script for src/config.h for DesqView/X
# ----------------------------------------------------------------------
#
-# Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2002, 2003, 2004, 2005,
+# 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/msdos/sed3.inp b/msdos/sed3.inp
index efbe448d0d1..299e44fe6df 100644
--- a/msdos/sed3.inp
+++ b/msdos/sed3.inp
@@ -3,7 +3,7 @@
# ----------------------------------------------------------------------
#
# Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp
index fb6b67cc422..39d644999fa 100644
--- a/msdos/sed3v2.inp
+++ b/msdos/sed3v2.inp
@@ -3,7 +3,7 @@
# ----------------------------------------------------------------------
#
# Copyright (C) 1996, 1998, 2000, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/msdos/sed4.inp b/msdos/sed4.inp
index 23883bc8e2d..fcdf6cef47d 100644
--- a/msdos/sed4.inp
+++ b/msdos/sed4.inp
@@ -2,7 +2,8 @@
# Configuration script for src/paths.h
# ----------------------------------------------------------------------
#
-# Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2002, 2003, 2004, 2005,
+# 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/msdos/sed5x.inp b/msdos/sed5x.inp
index c9a3ac998ce..54d56825bef 100644
--- a/msdos/sed5x.inp
+++ b/msdos/sed5x.inp
@@ -2,7 +2,8 @@
# Configuration script for oldxmenu/makefile for DesqView/X
# ----------------------------------------------------------------------
#
-# Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2002, 2003, 2004, 2005,
+# 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/msdos/sed6.inp b/msdos/sed6.inp
index 2aae6aa441c..b74d2aa3a54 100644
--- a/msdos/sed6.inp
+++ b/msdos/sed6.inp
@@ -4,7 +4,7 @@
# ---------------------------------------------------------------------------
#
# Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/msdos/sedleim.inp b/msdos/sedleim.inp
index 287dfad7c44..c5d2e1daded 100644
--- a/msdos/sedleim.inp
+++ b/msdos/sedleim.inp
@@ -3,7 +3,7 @@
# ----------------------------------------------------------------------
#
# Copyright (C) 1999, 2000, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/msdos/sedlisp.inp b/msdos/sedlisp.inp
index bb7d8b8e620..49dcabc588a 100644
--- a/msdos/sedlisp.inp
+++ b/msdos/sedlisp.inp
@@ -2,7 +2,8 @@
# Configuration script for lisp/Makefile under DJGPP v2.x
# ----------------------------------------------------------------------
#
-# Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2002, 2003, 2004, 2005,
+# 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/nt/ChangeLog b/nt/ChangeLog
index cc161f830e6..097f1f1e2af 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1204,7 +1204,7 @@
;; End:
Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.
diff --git a/nt/INSTALL b/nt/INSTALL
index d756585ce20..c0706e3dadf 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -1,7 +1,8 @@
Building and Installing Emacs
on Windows NT/2K/XP and Windows 95/98/ME
- Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
See the end of the file for copying permissions.
If you used WinZip to unpack the distribution, we suggest to
diff --git a/nt/README b/nt/README
index 0bb1625fecd..b1d7cb5ae57 100644
--- a/nt/README
+++ b/nt/README
@@ -1,6 +1,7 @@
Emacs for Windows NT/2000 and Windows 95/98/ME
- Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
See the end of the INSTALL file in this directory for copying permissions.
This directory contains support for compiling and running GNU Emacs on
diff --git a/nt/addpm.c b/nt/addpm.c
index 0827d2453c0..65a403b7eaf 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -1,5 +1,6 @@
/* Add entries to the GNU Emacs Program Manager folder.
- Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nt/addsection.c b/nt/addsection.c
index 5a58f3e1c07..b6d119fe6a8 100644
--- a/nt/addsection.c
+++ b/nt/addsection.c
@@ -1,5 +1,6 @@
/* Add an uninitialized data section to an executable.
- Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index be7c7531bf6..0b47ecd52b9 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -1,5 +1,6 @@
/* Proxy shell designed for use with Emacs on Windows 95 and NT.
- Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Accepts subset of Unix sh(1) command-line options, for compatability
with elisp code written for Unix. When possible, executes external
diff --git a/nt/config.nt b/nt/config.nt
index 0f66a441c7b..482d2e6052b 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1,6 +1,6 @@
/* GNU Emacs site configuration template file. -*- C -*-
Copyright (C) 1988, 1993, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nt/configure.bat b/nt/configure.bat
index b5f78f2ab51..ffc11542ce0 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -1,8 +1,8 @@
@echo off
rem ----------------------------------------------------------------------
rem Configuration script for MS Windows 95/98/Me and NT/2000/XP
-rem Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-rem Free Software Foundation, Inc.
+rem Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+rem 2006 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index 540cac24ebf..bd192c61f47 100644
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -1,5 +1,6 @@
/* Simple client interface to DDE servers.
- Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nt/emacs.rc b/nt/emacs.rc
index fd75506b97f..486b1eecf23 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -26,7 +26,7 @@ BEGIN
VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0"
VALUE "FileVersion", "22, 0, 50, 0\0"
VALUE "InternalName", "Emacs\0"
- VALUE "LegalCopyright", "Copyright (C) 2002, 2003, 2004, 2005\0"
+ VALUE "LegalCopyright", "Copyright (C) 2002, 2003, 2004, 2005, 2006\0"
VALUE "OriginalFilename", "emacs.exe"
VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0"
VALUE "ProductVersion", "22, 0, 50, 0\0"
diff --git a/nt/envadd.bat b/nt/envadd.bat
index d48e6cc8bf1..ece62f971bd 100644
--- a/nt/envadd.bat
+++ b/nt/envadd.bat
@@ -1,7 +1,7 @@
rem Hack to change/add environment variables in the makefiles for the
rem Windows platform.
rem
-rem Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+rem Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
rem
rem This file is part of GNU Emacs.
rem
diff --git a/nt/gmake.defs b/nt/gmake.defs
index 9b93aa92074..56799f783e1 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -1,6 +1,6 @@
# -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
-# Copyright (c) 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
#
# 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
diff --git a/nt/inc/grp.h b/nt/inc/grp.h
index 39f98d31cdc..04c2982086b 100755
--- a/nt/inc/grp.h
+++ b/nt/inc/grp.h
@@ -1,5 +1,5 @@
/* Replacement grp.h file for building GNU Emacs on Windows.
- Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index 19b8a65adda..c0a3bc26ec4 100644
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index fb1ea246663..ca1e22b93bb 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -1,6 +1,6 @@
# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
# Copyright (C) 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# Top level makefile for building GNU Emacs on Windows NT
#
diff --git a/nt/multi-install-info.bat b/nt/multi-install-info.bat
index f06f94c9ca4..0b21962a458 100644
--- a/nt/multi-install-info.bat
+++ b/nt/multi-install-info.bat
@@ -3,7 +3,7 @@
rem Hack to run install-info with multiple info files on the command
rem line on the Windows platform.
rem
-rem Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+rem Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
rem
rem This file is part of GNU Emacs.
rem
diff --git a/nt/nmake.defs b/nt/nmake.defs
index 76a3462969e..94fa9f431e9 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -1,6 +1,6 @@
# -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
# Copyright (C) 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# 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
diff --git a/nt/paths.h b/nt/paths.h
index 0bb883067c3..f3d272da350 100644
--- a/nt/paths.h
+++ b/nt/paths.h
@@ -1,5 +1,5 @@
/* Copyright (C) 1993, 1995, 1997, 1999, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nt/preprep.c b/nt/preprep.c
index e99fe38a484..fb686f42b96 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -1,5 +1,6 @@
/* Pro-process emacs.exe for profiling by MSVC.
- Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nt/runemacs.c b/nt/runemacs.c
index 709389deb8f..a998134ec72 100644
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index d03534e144a..6809607c3dc 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -1,5 +1,6 @@
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
#include "copyright.h"
diff --git a/oldXMenu/AddPane.c b/oldXMenu/AddPane.c
index 4bb16c8d573..2e122ea0ae3 100644
--- a/oldXMenu/AddPane.c
+++ b/oldXMenu/AddPane.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/AddSel.c b/oldXMenu/AddSel.c
index a063b63f557..6ddec57a525 100644
--- a/oldXMenu/AddSel.c
+++ b/oldXMenu/AddSel.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index afe7607115a..a9d7c9b1279 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -444,7 +444,7 @@
;; End:
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.
diff --git a/oldXMenu/ChgPane.c b/oldXMenu/ChgPane.c
index 7c8ff91f88c..20b0a949d9a 100644
--- a/oldXMenu/ChgPane.c
+++ b/oldXMenu/ChgPane.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/ChgSel.c b/oldXMenu/ChgSel.c
index e0fcb224f3e..b34a22574f2 100644
--- a/oldXMenu/ChgSel.c
+++ b/oldXMenu/ChgSel.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c
index d4b32f2e937..77115b20835 100644
--- a/oldXMenu/Create.c
+++ b/oldXMenu/Create.c
@@ -1,5 +1,6 @@
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
#include "copyright.h"
diff --git a/oldXMenu/DelPane.c b/oldXMenu/DelPane.c
index 6d042e757f8..e824b539cf1 100644
--- a/oldXMenu/DelPane.c
+++ b/oldXMenu/DelPane.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/DelSel.c b/oldXMenu/DelSel.c
index 7f14aa74fa6..c8b39eb03a1 100644
--- a/oldXMenu/DelSel.c
+++ b/oldXMenu/DelSel.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Destroy.c b/oldXMenu/Destroy.c
index b0b9ed77569..52ab5028546 100644
--- a/oldXMenu/Destroy.c
+++ b/oldXMenu/Destroy.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Error.c b/oldXMenu/Error.c
index 0bd4fcc8782..51d5b8fa6cb 100644
--- a/oldXMenu/Error.c
+++ b/oldXMenu/Error.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/EvHand.c b/oldXMenu/EvHand.c
index c9e8b36c873..457609f4c2a 100644
--- a/oldXMenu/EvHand.c
+++ b/oldXMenu/EvHand.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/FindPane.c b/oldXMenu/FindPane.c
index c886d6f7b7a..6c0be73f0fb 100644
--- a/oldXMenu/FindPane.c
+++ b/oldXMenu/FindPane.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/FindSel.c b/oldXMenu/FindSel.c
index 5a91faf0f8f..777770a4706 100644
--- a/oldXMenu/FindSel.c
+++ b/oldXMenu/FindSel.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/InsPane.c b/oldXMenu/InsPane.c
index 805a978bb74..5f8f334f184 100644
--- a/oldXMenu/InsPane.c
+++ b/oldXMenu/InsPane.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/InsSel.c b/oldXMenu/InsSel.c
index 103081ac446..30e0756d8e4 100644
--- a/oldXMenu/InsSel.c
+++ b/oldXMenu/InsSel.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c
index 0fea995a899..ec11cc7d156 100644
--- a/oldXMenu/Internal.c
+++ b/oldXMenu/Internal.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Locate.c b/oldXMenu/Locate.c
index 90fad2c7b2a..59916eee979 100644
--- a/oldXMenu/Locate.c
+++ b/oldXMenu/Locate.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Post.c b/oldXMenu/Post.c
index 2be31aebe39..ca6bb5752ab 100644
--- a/oldXMenu/Post.c
+++ b/oldXMenu/Post.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Recomp.c b/oldXMenu/Recomp.c
index a10c380427e..e955323c825 100644
--- a/oldXMenu/Recomp.c
+++ b/oldXMenu/Recomp.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/SetAEQ.c b/oldXMenu/SetAEQ.c
index 9124561dcbe..437f5e2d721 100644
--- a/oldXMenu/SetAEQ.c
+++ b/oldXMenu/SetAEQ.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/SetFrz.c b/oldXMenu/SetFrz.c
index 8e778a66760..7a75dddfd59 100644
--- a/oldXMenu/SetFrz.c
+++ b/oldXMenu/SetFrz.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/SetPane.c b/oldXMenu/SetPane.c
index 907dba3b233..e76b75902c3 100644
--- a/oldXMenu/SetPane.c
+++ b/oldXMenu/SetPane.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/SetSel.c b/oldXMenu/SetSel.c
index 06e2c76069f..5910354b966 100644
--- a/oldXMenu/SetSel.c
+++ b/oldXMenu/SetSel.c
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/X10.h b/oldXMenu/X10.h
index 63bf90f38d2..4d7d84e8c03 100644
--- a/oldXMenu/X10.h
+++ b/oldXMenu/X10.h
@@ -15,7 +15,8 @@
*
*/
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* X10.h - Header definition and support file for the C subroutine
diff --git a/oldXMenu/XCrAssoc.c b/oldXMenu/XCrAssoc.c
index 0c8203579e8..0596b9fcee1 100644
--- a/oldXMenu/XCrAssoc.c
+++ b/oldXMenu/XCrAssoc.c
@@ -1,5 +1,6 @@
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/oldXMenu/XDelAssoc.c b/oldXMenu/XDelAssoc.c
index 286353f46cf..772e9fa1b40 100644
--- a/oldXMenu/XDelAssoc.c
+++ b/oldXMenu/XDelAssoc.c
@@ -1,5 +1,6 @@
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/oldXMenu/XDestAssoc.c b/oldXMenu/XDestAssoc.c
index eab0511bb66..1772321ad27 100644
--- a/oldXMenu/XDestAssoc.c
+++ b/oldXMenu/XDestAssoc.c
@@ -1,5 +1,6 @@
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/oldXMenu/XLookAssoc.c b/oldXMenu/XLookAssoc.c
index b1b53d9dd6a..7e72570e2ba 100644
--- a/oldXMenu/XLookAssoc.c
+++ b/oldXMenu/XLookAssoc.c
@@ -1,5 +1,6 @@
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c
index d749ec8d04c..db020c4884b 100644
--- a/oldXMenu/XMakeAssoc.c
+++ b/oldXMenu/XMakeAssoc.c
@@ -1,5 +1,6 @@
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/oldXMenu/XMenu.h b/oldXMenu/XMenu.h
index 84bf72a5df9..858e4a64f7b 100644
--- a/oldXMenu/XMenu.h
+++ b/oldXMenu/XMenu.h
@@ -1,7 +1,8 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/XMenuInt.h b/oldXMenu/XMenuInt.h
index fd272300c60..a2e6f56e89b 100644
--- a/oldXMenu/XMenuInt.h
+++ b/oldXMenu/XMenuInt.h
@@ -1,6 +1,6 @@
-
/* Copyright Massachusetts Institute of Technology 1985 */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/copyright.h b/oldXMenu/copyright.h
index dffc63ac63e..05062d856df 100644
--- a/oldXMenu/copyright.h
+++ b/oldXMenu/copyright.h
@@ -16,7 +16,8 @@ without express or implied warranty.
*/
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/* arch-tag: c689b1bc-a3ba-41a1-baa0-a3622b5445b2
(do not change this comment) */
diff --git a/oldXMenu/insque.c b/oldXMenu/insque.c
index 2395e4ea2d3..fef750484a3 100644
--- a/oldXMenu/insque.c
+++ b/oldXMenu/insque.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc. */
/* This file implements the emacs_insque and emacs_remque functions,
copies of the insque and remque functions of BSD. They and all
diff --git a/src/.gdbinit b/src/.gdbinit
index 7c04aae8a78..3f5565aee40 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -1,5 +1,5 @@
-# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998, 2000, 01, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001,
+# 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/src/ChangeLog b/src/ChangeLog
index dc6a1641ac5..73436b217a1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,38 @@
+2006-02-08 Miles Bader <miles@gnu.org>
+
+ * editfns.c (Fconstrain_to_field): Use Fget_char_property instead
+ of Fget_text_property (other field functions word with overlays as
+ well as text-properties).
+
+2006-02-07 Kenichi Handa <handa@m17n.org>
+
+ * dispextern.h (unibyte_display_via_language_environment): Extern it.
+
+ * xterm.h (unibyte_display_via_language_environment):
+ * w32term.h (unibyte_display_via_language_environment):
+ * macterm.h (unibyte_display_via_language_environment): Delete extern.
+
+2006-02-07 Kenichi Handa <handa@m17n.org>
+
+ * term.c (append_glyph): Refer to it->char_to_display instead of it->c.
+ (produce_glyphs): Set the character to print in
+ it->char_to_display. Handle unibyte-display-via-language-environment.
+ (produce_stretch_glyph): Set character to print in it->char_to_display.
+
+2006-02-06 Kenichi Handa <handa@m17n.org>
+
+ * lread.c (openp): Initialize encoded_fn before GCPRO it.
+
+2006-02-05 Ken Raeburn <raeburn@raeburn.org>
+
+ * editfns.c (Fconstrain_to_field): Fix int/Lisp_Object mixup.
+
+ * lisp.h (XPNTR) [!NO_UNION_TYPE && !HAVE_SHM && !DATA_SEG_BITS]:
+ Cast bitfield value to EMACS_INT, to suppress gcc warning.
+
+ * xrdb.c (malloc, realloc, free) [emacs]: Undefine macros before
+ defining.
+
2006-02-03 Kim F. Storm <storm@cua.dk>
* xdisp.c: Cache last merged escape glyph face.
@@ -22394,7 +22429,8 @@ See ChangeLog.9 for earlier changes.
;; coding: iso-2022-7bit
;; End:
- Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.
diff --git a/src/Makefile.in b/src/Makefile.in
index fafd930a972..3be09cac3ea 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,6 +1,6 @@
# Makefile for GNU Emacs.
# Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
diff --git a/src/abbrev.c b/src/abbrev.c
index a62a3a23037..13da66f5801 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -1,6 +1,6 @@
/* Primitives for word-abbrev mode.
Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/atimer.c b/src/atimer.c
index d260f67d24d..8b092270d7b 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -1,5 +1,6 @@
/* Asynchronous timers.
- Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/atimer.h b/src/atimer.h
index d5ad9c674d5..84b1383ffdf 100644
--- a/src/atimer.h
+++ b/src/atimer.h
@@ -1,5 +1,6 @@
/* Asynchronous timers.
- Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/blockinput.h b/src/blockinput.h
index 0eaebbe34df..78dce69fe1f 100644
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -1,6 +1,6 @@
/* blockinput.h - interface to blocking complicated interrupt-driven input.
Copyright (C) 1989, 1993, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/buffer.c b/src/buffer.c
index adcd03127da..4dce7c40686 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,7 +1,7 @@
/* Buffer manipulation primitives for GNU Emacs.
Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994,
1995, 1997, 1998, 1999, 2000, 2001, 2002,
- 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/buffer.h b/src/buffer.h
index 3250967c5a8..a82f9578ff9 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1,6 +1,6 @@
/* Header file for the buffer manipulation primitives.
Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/bytecode.c b/src/bytecode.c
index 4a10d6091e7..e6f84cc6c2b 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -1,6 +1,6 @@
/* Execution of byte code produced by bytecomp.el.
Copyright (C) 1985, 1986, 1987, 1988, 1993, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/callint.c b/src/callint.c
index 5979e495ac3..4789fb5582d 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -1,6 +1,6 @@
/* Call a Lisp function interactively.
Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 2000, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/callproc.c b/src/callproc.c
index 9e7ab915a97..54ebf53979e 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1,6 +1,6 @@
/* Synchronous subprocess invocation for GNU Emacs.
Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 04ec1d32284..ba9b3e3adf4 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -1,6 +1,6 @@
/* GNU Emacs case conversion functions.
Copyright (C) 1985, 1994, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/casetab.c b/src/casetab.c
index cccc7d24084..89f9287c75f 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -1,6 +1,6 @@
/* GNU Emacs routines to deal with case tables.
Copyright (C) 1993, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/category.c b/src/category.c
index 3f4a9dd83f4..9b47e6c00e9 100644
--- a/src/category.c
+++ b/src/category.c
@@ -1,5 +1,5 @@
/* GNU Emacs routines to deal with category tables.
- Copyright (C) 1998, 2001, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
Copyright (C) 1995, 1997, 1998, 1999
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H14PRO021
diff --git a/src/ccl.c b/src/ccl.c
index 301cf010ba1..743fbae21e5 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -1,5 +1,6 @@
/* CCL (Code Conversion Language) interpreter.
- Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H14PRO021
diff --git a/src/charset.c b/src/charset.c
index 15a5d75ecbd..3e1bebdd68f 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1,5 +1,6 @@
/* Basic character set support.
- Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H14PRO021
diff --git a/src/charset.h b/src/charset.h
index 782e92799ff..25ccaf9d324 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -1,5 +1,6 @@
/* Header for charset handler.
- Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Copyright (C) 1995, 1997, 1998, 2003
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H14PRO021
diff --git a/src/cm.c b/src/cm.c
index 354097b39e4..dd25c112630 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -1,6 +1,6 @@
/* Cursor motion subroutines for GNU Emacs.
Copyright (C) 1985, 1995, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
based primarily on public domain code written by Chris Torek
This file is part of GNU Emacs.
diff --git a/src/cm.h b/src/cm.h
index a2ae6116e5d..c94c0d43597 100644
--- a/src/cm.h
+++ b/src/cm.h
@@ -1,6 +1,6 @@
/* Cursor motion calculation definitions for GNU Emacs
Copyright (C) 1985, 1989, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/cmds.c b/src/cmds.c
index c8e7881a9fc..e035ef7fd68 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -1,6 +1,6 @@
/* Simple built-in editing commands.
Copyright (C) 1985, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002,
- 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/coding.c b/src/coding.c
index 6ec0804353f..92194df6a6c 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -1,5 +1,6 @@
/* Coding system handler (conversion, detection, etc).
- Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Copyright (C) 1995, 1997, 1998, 2002, 2003, 2004, 2005
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H14PRO021
diff --git a/src/coding.h b/src/coding.h
index 89ceb7cad3b..41f4aab509c 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -1,5 +1,6 @@
/* Header for coding system handler.
- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Copyright (C) 1995, 1997, 1998, 2000
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H14PRO021
diff --git a/src/commands.h b/src/commands.h
index ed46141bf11..5c7cad37407 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -1,6 +1,6 @@
/* Definitions needed by most editing commands.
Copyright (C) 1985, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/composite.c b/src/composite.c
index 3b3743b6b2e..a17a52bd15e 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1,5 +1,6 @@
/* Composite sequence support.
- Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Copyright (C) 1999
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H14PRO021
diff --git a/src/composite.h b/src/composite.h
index ecfa4db3a56..47a86310413 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -1,5 +1,6 @@
/* Header for composite sequence handler.
- Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Copyright (C) 1997
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H14PRO021
diff --git a/src/config.in b/src/config.in
index b5b700c69bf..11b842c3d00 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1,8 +1,8 @@
/* src/config.in. Generated from configure.in by autoheader. */
/* GNU Emacs site configuration template file.
- Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004
- Free Software Foundation, Inc.
+ Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/cxux-crt0.s b/src/cxux-crt0.s
index 71076eb8b5f..b05faf57b8e 100644
--- a/src/cxux-crt0.s
+++ b/src/cxux-crt0.s
@@ -1,6 +1,7 @@
/*
* External symbol setup file for GNU Emacs on CX/UX
- * Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ * Copyright (C) 1990, 2002, 2003, 2004, 2005,
+ * 2006 Free Software Foundation, Inc.
*
* This file is part of GNU Emacs.
*
diff --git a/src/data.c b/src/data.c
index 472aff990b1..fbfbb141d48 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1,6 +1,6 @@
/* Primitive operations on Lisp data types for GNU Emacs Lisp interpreter.
Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/dired.c b/src/dired.c
index f735c8189d6..4075f9b7b79 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -1,6 +1,6 @@
/* Lisp functions for making directory listings.
Copyright (C) 1985, 1986, 1993, 1994, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/dispextern.h b/src/dispextern.h
index 52033a3e5f4..806b675de73 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1,6 +1,6 @@
/* Interface definitions for display code.
Copyright (C) 1985, 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002,
- 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -2651,6 +2651,8 @@ extern int help_echo_pos;
extern struct frame *last_mouse_frame;
extern int last_tool_bar_item;
extern int mouse_autoselect_window;
+extern int unibyte_display_via_language_environment;
+
extern void reseat_at_previous_visible_line_start P_ ((struct it *));
extern int calc_pixel_width_or_height P_ ((double *, struct it *, Lisp_Object,
diff --git a/src/dispnew.c b/src/dispnew.c
index d0a1ba6c7ff..18f949ebe2d 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1,7 +1,7 @@
/* Updating of data structures for redisplay.
Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
1997, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/disptab.h b/src/disptab.h
index ed7ec8597a9..0d7a03c43ba 100644
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -1,5 +1,6 @@
/* Things for GLYPHS and glyph tables.
- Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1993, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/doc.c b/src/doc.c
index 596bb0bfeec..32c74b71eeb 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -1,6 +1,6 @@
/* Record indices of function doc strings stored in a file.
Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/doprnt.c b/src/doprnt.c
index c67d20f1950..6e71e261788 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -1,7 +1,8 @@
/* Output like sprintf to a buffer of specified size.
Also takes args differently: pass one pointer to an array of strings
in addition to the format string which is separate.
- Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1985, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/dosfns.c b/src/dosfns.c
index c4b5747ab7d..2d5169dcf27 100644
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -1,7 +1,7 @@
/* MS-DOS specific Lisp utilities. Coded by Manabu Higashida, 1991.
Major changes May-July 1993 Morten Welinder (only 10% original code left)
Copyright (C) 1991, 1993, 1996, 1997, 1998, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/dosfns.h b/src/dosfns.h
index 40aaf524e23..4f1cfd83d22 100644
--- a/src/dosfns.h
+++ b/src/dosfns.h
@@ -3,7 +3,7 @@
Modified by Morten Welinder, 1993-1994.
Copyright (C) 1991, 1994, 1995, 1997, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/ecrt0.c b/src/ecrt0.c
index 5ee24dfae8c..a9b993d360e 100644
--- a/src/ecrt0.c
+++ b/src/ecrt0.c
@@ -1,6 +1,6 @@
/* C code startup routine.
Copyright (C) 1985, 1986, 1992, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/editfns.c b/src/editfns.c
index 073ee4bff80..7c2c2a8edd0 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1,7 +1,7 @@
/* Lisp functions pertaining to editing.
Copyright (C) 1985, 1986, 1987, 1989, 1993, 1994, 1995, 1996,
1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -717,7 +717,8 @@ Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil. */)
{
/* If non-zero, then the original point, before re-positioning. */
int orig_point = 0;
- int fwd, prev_old, prev_new;
+ int fwd;
+ Lisp_Object prev_old, prev_new;
if (NILP (new_pos))
/* Use the current point, and afterwards, set it. */
@@ -736,24 +737,24 @@ Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil. */)
if (NILP (Vinhibit_field_text_motion)
&& !EQ (new_pos, old_pos)
- && (!NILP (Fget_text_property (new_pos, Qfield, Qnil))
- || !NILP (Fget_text_property (old_pos, Qfield, Qnil))
+ && (!NILP (Fget_char_property (new_pos, Qfield, Qnil))
+ || !NILP (Fget_char_property (old_pos, Qfield, Qnil))
/* To recognize field boundaries, we must also look at the
previous positions; we could use `get_pos_property'
instead, but in itself that would fail inside non-sticky
fields (like comint prompts). */
|| (XFASTINT (new_pos) > BEGV
- && !NILP (Fget_text_property (prev_new, Qfield, Qnil)))
+ && !NILP (Fget_char_property (prev_new, Qfield, Qnil)))
|| (XFASTINT (old_pos) > BEGV
- && !NILP (Fget_text_property (prev_old, Qfield, Qnil))))
+ && !NILP (Fget_char_property (prev_old, Qfield, Qnil))))
&& (NILP (inhibit_capture_property)
/* Field boundaries are again a problem; but now we must
decide the case exactly, so we need to call
`get_pos_property' as well. */
|| (NILP (get_pos_property (old_pos, inhibit_capture_property, Qnil))
&& (XFASTINT (old_pos) <= BEGV
- || NILP (Fget_text_property (old_pos, inhibit_capture_property, Qnil))
- || NILP (Fget_text_property (prev_old, inhibit_capture_property, Qnil))))))
+ || NILP (Fget_char_property (old_pos, inhibit_capture_property, Qnil))
+ || NILP (Fget_char_property (prev_old, inhibit_capture_property, Qnil))))))
/* It is possible that NEW_POS is not within the same field as
OLD_POS; try to move NEW_POS so that it is. */
{
diff --git a/src/epaths.in b/src/epaths.in
index ee965cb7615..d494d85139c 100644
--- a/src/epaths.in
+++ b/src/epaths.in
@@ -1,6 +1,6 @@
/* Hey Emacs, this is -*- C -*- code! */
/* Copyright (C) 1993, 1995, 1997, 1999, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/eval.c b/src/eval.c
index a6c58bc2425..2f89e515f8d 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1,6 +1,6 @@
/* Evaluator for GNU Emacs Lisp interpreter.
Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/filelock.c b/src/filelock.c
index 33e3bcd5732..6a3972dad42 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -1,6 +1,6 @@
/* Lock files for editing.
Copyright (C) 1985, 1986, 1987, 1993, 1994, 1996, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/filemode.c b/src/filemode.c
index 6257c6a7664..835a8a3778e 100644
--- a/src/filemode.c
+++ b/src/filemode.c
@@ -1,6 +1,6 @@
/* filemode.c -- make a string describing file modes
Copyright (C) 1985, 1990, 1993, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/src/firstfile.c b/src/firstfile.c
index b16f3a3dc44..06e7022d89a 100644
--- a/src/firstfile.c
+++ b/src/firstfile.c
@@ -1,5 +1,6 @@
/* Mark beginning of data space to dump as pure, for GNU Emacs.
- Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/floatfns.c b/src/floatfns.c
index 71f53542283..d5ca50f9165 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -1,6 +1,6 @@
/* Primitive operations on floating point for GNU Emacs Lisp interpreter.
Copyright (C) 1988, 1993, 1994, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/fns.c b/src/fns.c
index e260c46d4de..c83f9fb0a9f 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1,7 +1,7 @@
/* Random utility Lisp functions.
Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997,
1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/fontset.c b/src/fontset.c
index e5d1f4c0b03..9cebcfe1160 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1,5 +1,5 @@
/* Fontset handler.
- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
Copyright (C) 1995, 1997, 1998, 2000, 2003, 2004, 2005
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H14PRO021
diff --git a/src/fontset.h b/src/fontset.h
index c3ef769d1ea..ec9552ef436 100644
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -1,5 +1,6 @@
/* Header for fontset handler.
- Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Copyright (C) 1995, 1997, 2000
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H14PRO021
diff --git a/src/frame.c b/src/frame.c
index 9a442b6289f..b84eee01ae3 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1,6 +1,6 @@
/* Generic frame functions.
Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/frame.h b/src/frame.h
index 48cf61d3040..51530ee2dbf 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1,6 +1,6 @@
/* Define frame-object for GNU Emacs.
Copyright (C) 1993, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/fringe.c b/src/fringe.c
index 7a042ad200e..bbb35b305ca 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1,7 +1,7 @@
/* Fringe handling (split from xdisp.c).
Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997,
1998, 1999, 2000, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/getloadavg.c b/src/getloadavg.c
index a2ae9bc310b..3f616b47116 100644
--- a/src/getloadavg.c
+++ b/src/getloadavg.c
@@ -1,6 +1,6 @@
/* Get the system load averages.
Copyright (C) 1985, 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994, 1995,
- 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 1997, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
NOTE: The canonical source of this file is maintained with gnulib.
Bugs can be reported to bug-gnulib@gnu.org.
diff --git a/src/getpagesize.h b/src/getpagesize.h
index ed47f80b0e0..f38409da452 100644
--- a/src/getpagesize.h
+++ b/src/getpagesize.h
@@ -1,6 +1,6 @@
/* Emulate getpagesize on systems that lack it.
Copyright (C) 1986, 1992, 1995, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/gmalloc.c b/src/gmalloc.c
index 55aedb7801b..71df287a6b6 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -6,7 +6,7 @@
/* Declarations for `malloc' and friends.
Copyright (C) 1990, 1991, 1992, 1993, 1995, 1996, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Written May 1989 by Mike Haertel.
This library is free software; you can redistribute it and/or
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 67288cab33f..3efc96cfe5d 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1,5 +1,5 @@
/* Functions for creating and updating GTK widgets.
- Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/gtkutil.h b/src/gtkutil.h
index 6b9fd179ec5..742e3ecb1e5 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -1,5 +1,5 @@
/* Definitions and headers for GTK widgets.
- Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/image.c b/src/image.c
index 579c04e6f46..879bbf745a3 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1,6 +1,6 @@
/* Functions for image support on window system.
Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/indent.c b/src/indent.c
index 62ef3766682..22b6fc37669 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1,6 +1,6 @@
/* Indentation functions.
Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 2000, 2001,
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/indent.h b/src/indent.h
index 6026be827e8..ddfd16a16de 100644
--- a/src/indent.h
+++ b/src/indent.h
@@ -1,6 +1,6 @@
/* Definitions for interface to indent.c
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/insdel.c b/src/insdel.c
index 174c0c6a153..6decf7b3f27 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -1,6 +1,6 @@
/* Buffer insertion/deletion and gap motion for GNU Emacs.
Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/intervals.c b/src/intervals.c
index e054c6ca429..77971ace2a7 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1,6 +1,6 @@
/* Code for doing intervals.
Copyright (C) 1993, 1994, 1995, 1997, 1998, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/intervals.h b/src/intervals.h
index 5d7ee470751..5aec706afea 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -1,6 +1,6 @@
/* Definitions and global variables for intervals.
Copyright (C) 1993, 1994, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/keyboard.c b/src/keyboard.c
index 8434dbe1d7a..f50b456feb4 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1,7 +1,7 @@
/* Keyboard and mouse input; editor command loop.
Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995,
1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/keyboard.h b/src/keyboard.h
index 913f48ee64e..c0c941a0646 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -1,6 +1,6 @@
/* Declarations useful when processing input.
Copyright (C) 1985, 1986, 1987, 1993, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/keymap.c b/src/keymap.c
index 41e58973033..01c637132eb 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1,7 +1,7 @@
/* Manipulation of keymaps
Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/keymap.h b/src/keymap.h
index bcf14abcd89..cbd14cf9ba4 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -1,5 +1,6 @@
/* Functions to manipulate keymaps.
- Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/lastfile.c b/src/lastfile.c
index a229d94fd6a..7c5e067dd02 100644
--- a/src/lastfile.c
+++ b/src/lastfile.c
@@ -1,5 +1,6 @@
/* Mark end of data space to dump as pure, for GNU Emacs.
- Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1985, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/lisp.h b/src/lisp.h
index a80f76ddd8e..60bf01ab5a1 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1,6 +1,6 @@
/* Fundamental definitions for GNU Emacs Lisp interpreter.
Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -485,7 +485,11 @@ extern size_t pure_size;
in a Lisp object whose data type says it points to something. */
#define XPNTR(a) (XUINT (a) | DATA_SEG_BITS)
#else
-#define XPNTR(a) XUINT (a)
+/* Some versions of gcc seem to consider the bitfield width when
+ issuing the "cast to pointer from integer of different size"
+ warning, so the cast is here to widen the value back to its natural
+ size. */
+#define XPNTR(a) ((EMACS_INT) XUINT (a))
#endif
#endif /* not HAVE_SHM */
#endif /* no XPNTR */
diff --git a/src/lread.c b/src/lread.c
index c035b529ce2..ef45f4663ea 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1,7 +1,7 @@
/* Lisp parsing and input streams.
Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995,
1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -1273,7 +1273,7 @@ openp (path, str, suffixes, storeptr, predicate)
SBYTES (XCAR (tail)));
}
- string = filename = Qnil;
+ string = filename = encoded_fn = Qnil;
GCPRO6 (str, string, filename, path, suffixes, encoded_fn);
if (storeptr)
diff --git a/src/m/7300.h b/src/m/7300.h
index bb261c9188a..a8751efa52a 100644
--- a/src/m/7300.h
+++ b/src/m/7300.h
@@ -1,5 +1,6 @@
/* machine description file for AT&T UNIX PC model 7300
- Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1986, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Modified for this machine by mtxinu!rtech!gonzo!daveb
This file is part of GNU Emacs.
diff --git a/src/m/acorn.h b/src/m/acorn.h
index 399fb7c9249..326fb7760ae 100644
--- a/src/m/acorn.h
+++ b/src/m/acorn.h
@@ -1,5 +1,6 @@
/* Machine description file for Acorn RISCiX machines.
- Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1994, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/alliant-2800.h b/src/m/alliant-2800.h
index b59322e3d0c..d56624a1eac 100644
--- a/src/m/alliant-2800.h
+++ b/src/m/alliant-2800.h
@@ -1,5 +1,6 @@
/* alliant-2800.h - Alliant FX/2800 machine running Concentrix 2800.
- Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1990, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/alliant.h b/src/m/alliant.h
index cbc5734ab31..49459c0b7f7 100644
--- a/src/m/alliant.h
+++ b/src/m/alliant.h
@@ -1,6 +1,6 @@
/* alliant.h Alliant machine running system version 2 or 3.
Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Note that for version 1 of the Alliant system
you should use alliant1.h instead of this file.
Use alliant4.h for version 4.
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 41fefaf20fd..47003400846 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -1,6 +1,6 @@
/* machine description file For the alpha chip.
Copyright (C) 1994, 1997, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/altos.h b/src/m/altos.h
index 743752d99ec..16e7fb7ce06 100644
--- a/src/m/altos.h
+++ b/src/m/altos.h
@@ -1,6 +1,6 @@
/* altos machine description file Altos 3068 Unix System V Release 2
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/amdahl.h b/src/m/amdahl.h
index 89d4b6cb6f7..e418e3a43bf 100644
--- a/src/m/amdahl.h
+++ b/src/m/amdahl.h
@@ -1,6 +1,6 @@
/* amdahl machine description file
Copyright (C) 1987, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 14ddd16406e..3a1ace91b41 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -1,5 +1,5 @@
/* machine description file for AMD x86-64.
- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/apollo.h b/src/m/apollo.h
index 4aa62b0b209..d9b3cffdb6d 100644
--- a/src/m/apollo.h
+++ b/src/m/apollo.h
@@ -1,6 +1,6 @@
/* machine description file for Apollo machine.
Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/arm.h b/src/m/arm.h
index 358445e0649..0a49f0cbd4b 100644
--- a/src/m/arm.h
+++ b/src/m/arm.h
@@ -1,5 +1,6 @@
/* Machine description file for ARM-based non-RISCiX machines.
- Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1994, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/att3b.h b/src/m/att3b.h
index 757b47d3f37..049593ebcf4 100644
--- a/src/m/att3b.h
+++ b/src/m/att3b.h
@@ -1,5 +1,6 @@
/* Machine-dependent configuration for GNU Emacs for AT&T 3b machines.
- Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1986, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Modified by David Robinson (daver@csvax.caltech.edu) 6/6/86
diff --git a/src/m/aviion.h b/src/m/aviion.h
index b9a2932ef07..50355b25bd6 100644
--- a/src/m/aviion.h
+++ b/src/m/aviion.h
@@ -1,6 +1,6 @@
/* machine description file for Data General AViiON.
Copyright (C) 1985, 1986, 1991, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/celerity.h b/src/m/celerity.h
index 639d680afdb..10d38e14c6c 100644
--- a/src/m/celerity.h
+++ b/src/m/celerity.h
@@ -1,6 +1,6 @@
/* machine description file for Celerity.
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/clipper.h b/src/m/clipper.h
index af9f67d8a37..0dfa13382b3 100644
--- a/src/m/clipper.h
+++ b/src/m/clipper.h
@@ -1,6 +1,6 @@
/* machine description file for clipper
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h
index 48727bedbe3..f8df583657a 100644
--- a/src/m/cnvrgnt.h
+++ b/src/m/cnvrgnt.h
@@ -1,5 +1,6 @@
/* machine description file for convergent S series.
- Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1989, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/convex.h b/src/m/convex.h
index b7fcc71b1c3..fa87d89e3d3 100644
--- a/src/m/convex.h
+++ b/src/m/convex.h
@@ -1,6 +1,6 @@
/* machine description file for Convex (all models).
Copyright (C) 1987, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/cydra5.h b/src/m/cydra5.h
index 9806fc30a47..a64f4761c25 100644
--- a/src/m/cydra5.h
+++ b/src/m/cydra5.h
@@ -1,6 +1,6 @@
/* machine description file for Cydrome's CYDRA 5 mini super computer
Copyright (C) 1988, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/delta88k.h b/src/m/delta88k.h
index 517a0f1744b..86e416e887d 100644
--- a/src/m/delta88k.h
+++ b/src/m/delta88k.h
@@ -1,6 +1,6 @@
/* Machine description file for Motorola System V/88 machines
Copyright (C) 1985, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/dpx2.h b/src/m/dpx2.h
index 8d1ceb3db06..2a90ff46284 100644
--- a/src/m/dpx2.h
+++ b/src/m/dpx2.h
@@ -1,6 +1,6 @@
/* machine description for Bull DPX/2 range
Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/dual.h b/src/m/dual.h
index 134a5e7720e..d02ac5bc38e 100644
--- a/src/m/dual.h
+++ b/src/m/dual.h
@@ -1,6 +1,6 @@
/* machine description file for Dual machines using unisoft port.
Copyright (C) 1985, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/elxsi.h b/src/m/elxsi.h
index f702dcf0de2..0cb0c5513bf 100644
--- a/src/m/elxsi.h
+++ b/src/m/elxsi.h
@@ -1,6 +1,6 @@
/* machine description file for Elxsi machine (running enix).
Copyright (C) 1986, 1992, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Adapted by John Salmon
This file is part of GNU Emacs.
diff --git a/src/m/ews4800.h b/src/m/ews4800.h
index b377bdeddaa..9db133ba682 100644
--- a/src/m/ews4800.h
+++ b/src/m/ews4800.h
@@ -1,6 +1,6 @@
/* m- file for NEC EWS4800 RISC series.
Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/gould-np1.h b/src/m/gould-np1.h
index 1c784f28f4e..272a06cf305 100644
--- a/src/m/gould-np1.h
+++ b/src/m/gould-np1.h
@@ -1,5 +1,6 @@
/* machine description file for Gould NP1 with UTX/32 3.0 (first release for NP1)
- Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1986, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/gould.h b/src/m/gould.h
index a9168009d47..3b5f1494e78 100644
--- a/src/m/gould.h
+++ b/src/m/gould.h
@@ -5,7 +5,8 @@
* RELEASE2_1 in config.h. This may also be necessary with un-updated
* official releases of 2.1
- Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1986, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/hp800.h b/src/m/hp800.h
index 2f661989a15..01146e52359 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -1,5 +1,6 @@
/* machine description file for hp9000 series 800 machines.
- Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1987, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h
index e0b3a5ce5c3..9760b9bd2ed 100644
--- a/src/m/hp9000s300.h
+++ b/src/m/hp9000s300.h
@@ -1,5 +1,6 @@
/* machine description file for hp9000 series 200 or 300 on either HPUX or BSD.
- Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1985, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/i860.h b/src/m/i860.h
index 0ecf9e62087..d74a01a889c 100644
--- a/src/m/i860.h
+++ b/src/m/i860.h
@@ -1,6 +1,6 @@
/* machine description file for i860.
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/ia64.h b/src/m/ia64.h
index af790946afa..560cd30f599 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -1,5 +1,6 @@
/* machine description file for the IA-64 architecture.
- Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Contributed by David Mosberger <davidm@hpl.hp.com>
This file is part of GNU Emacs.
diff --git a/src/m/ibm370aix.h b/src/m/ibm370aix.h
index 3d954ae9d19..1a9ed6efe11 100644
--- a/src/m/ibm370aix.h
+++ b/src/m/ibm370aix.h
@@ -1,6 +1,6 @@
/* m/ file for IBM 370 running AIX.
Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h
index 539de924d17..ea895cd4fd8 100644
--- a/src/m/ibmps2-aix.h
+++ b/src/m/ibmps2-aix.h
@@ -1,5 +1,6 @@
/* machine description file for ibm ps/2 aix386.
- Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1989, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 0ff702d090d..3d3e45eda81 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -1,5 +1,6 @@
/* R2 AIX machine/system dependent defines
- Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1988, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/ibmrt-aix.h b/src/m/ibmrt-aix.h
index 44bfd77c1d0..43e11b36428 100644
--- a/src/m/ibmrt-aix.h
+++ b/src/m/ibmrt-aix.h
@@ -1,6 +1,6 @@
/* RTPC AIX machine/system dependent defines
Copyright (C) 1988, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h
index f6c23d9d919..e78d182940c 100644
--- a/src/m/ibmrt.h
+++ b/src/m/ibmrt.h
@@ -1,5 +1,6 @@
/* RTPC machine dependent defines
- Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1986, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/ibms390.h b/src/m/ibms390.h
index 323ef33f633..d60b33fdd04 100644
--- a/src/m/ibms390.h
+++ b/src/m/ibms390.h
@@ -1,6 +1,6 @@
/* machine description file template.
Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 238015fd345..0d2aacf8d19 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -1,5 +1,6 @@
/* Machine description file for intel 386.
- Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1987, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 93fe2062674..bc8d1242710 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -1,5 +1,6 @@
/* machine description file for Iris-4D machines. Use with s/irix*.h.
- Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1987, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/irist.h b/src/m/irist.h
index b40ffb5dff9..a366b521a9a 100644
--- a/src/m/irist.h
+++ b/src/m/irist.h
@@ -1,7 +1,7 @@
/* machine description file for Silicon Graphics Iris 2500 Turbos;
also possibly for non-turbo Irises with system release 2.5.
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/isi-ov.h b/src/m/isi-ov.h
index 416335d1bff..5b6c3cd0214 100644
--- a/src/m/isi-ov.h
+++ b/src/m/isi-ov.h
@@ -1,6 +1,6 @@
/* machine description file for ISI 68000's
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/m68k.h b/src/m/m68k.h
index 7b2ffa81351..31307ffa499 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -1,6 +1,6 @@
/* Machine description file for generic Motorola 68k.
Copyright (C) 1985, 1995, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/macppc.h b/src/m/macppc.h
index 9e4297df3b7..25005888c77 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -1,6 +1,6 @@
/* machine description file For the powerpc Macintosh.
Copyright (C) 1994, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/masscomp.h b/src/m/masscomp.h
index 01fddc751f1..df0d9a1aa1a 100644
--- a/src/m/masscomp.h
+++ b/src/m/masscomp.h
@@ -1,5 +1,6 @@
/* machine description file for Masscomp 5000 series running RTU, ucb universe.
- Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1986, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/mega68.h b/src/m/mega68.h
index ef1623ca460..7db67fa0cca 100644
--- a/src/m/mega68.h
+++ b/src/m/mega68.h
@@ -1,5 +1,6 @@
/* machine description file for Megatest 68000's.
- Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1985, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/mg1.h b/src/m/mg1.h
index 4e4b3525d6e..92e358837c4 100644
--- a/src/m/mg1.h
+++ b/src/m/mg1.h
@@ -1,5 +1,6 @@
/* machine description file for Whitechapel Computer Works MG1 (ns16000 based).
- Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1985, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
MG-1 version by L.M.McLoughlin
This file is part of GNU Emacs.
diff --git a/src/m/mips-siemens.h b/src/m/mips-siemens.h
index fc1a8a2e0d6..27274c8b527 100644
--- a/src/m/mips-siemens.h
+++ b/src/m/mips-siemens.h
@@ -1,6 +1,6 @@
/* m- file for Mips machines.
Copyright (C) 1987, 1992, 1993, 1995, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file contains some changes for our SVR4 based SINIX-Mips 5.4.
I hope this is helpful to port the emacs to our RM?00 series and
diff --git a/src/m/mips.h b/src/m/mips.h
index 28a35e02677..dc45a99d06b 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -1,6 +1,6 @@
/* m- file for Mips machines.
Copyright (C) 1987, 1992, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/news.h b/src/m/news.h
index dec413c3f9e..5ac2cd6b6dc 100644
--- a/src/m/news.h
+++ b/src/m/news.h
@@ -1,6 +1,6 @@
/* machine description file for Sony's NEWS workstations, NEWS-OS 3.0.
Copyright (C) 1985, 1986, 1989, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/next.h b/src/m/next.h
index dfb3cd11cbf..b519e41920d 100644
--- a/src/m/next.h
+++ b/src/m/next.h
@@ -1,5 +1,6 @@
/* Configuration file for the NeXT machine.
- Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1990, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/nh3000.h b/src/m/nh3000.h
index 42255473020..ad2d8dd1340 100644
--- a/src/m/nh3000.h
+++ b/src/m/nh3000.h
@@ -1,7 +1,8 @@
/* machine description for Harris Night Hawk Series 1200 and Series 3000
MC68030-based systems (FPP on these is custom). These systems are
also known as "ecx" and "gcx".
- Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1994, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/nh4000.h b/src/m/nh4000.h
index 04068f0c065..1c0bc51c896 100644
--- a/src/m/nh4000.h
+++ b/src/m/nh4000.h
@@ -1,6 +1,7 @@
/* machine description for Harris NightHawk 88k based machines
(includes nh4000 and nh5000 machines).
- Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1994, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/ns16000.h b/src/m/ns16000.h
index 49f514ced06..5e9793a44b8 100644
--- a/src/m/ns16000.h
+++ b/src/m/ns16000.h
@@ -1,5 +1,6 @@
/* machine description file for ns16000.
- Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1985, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/ns32000.h b/src/m/ns32000.h
index 858630b74ab..33e48d297bc 100644
--- a/src/m/ns32000.h
+++ b/src/m/ns32000.h
@@ -1,6 +1,6 @@
/* machine description file for National Semiconductor 32000, running Genix.
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/nu.h b/src/m/nu.h
index 1e5518e451f..ec051150bdf 100644
--- a/src/m/nu.h
+++ b/src/m/nu.h
@@ -1,5 +1,6 @@
/* machine description file for TI Nu machines using system V.
- Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1986, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/orion.h b/src/m/orion.h
index a73b357d50f..3db485dd3f1 100644
--- a/src/m/orion.h
+++ b/src/m/orion.h
@@ -1,5 +1,6 @@
/* machine description file for HLH Orion.
- Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1985, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/orion105.h b/src/m/orion105.h
index e75a8e67a84..66f87748099 100644
--- a/src/m/orion105.h
+++ b/src/m/orion105.h
@@ -1,5 +1,6 @@
/* machine description file for HLH Orion 1/05 (Clipper).
- Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1985, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Lee McLoughlin <lmjm%doc.imperial.ac.uk@nss.cs.ucl.ac.uk>
This file is part of GNU Emacs.
diff --git a/src/m/pfa50.h b/src/m/pfa50.h
index 50e79b623ca..85d281073f1 100644
--- a/src/m/pfa50.h
+++ b/src/m/pfa50.h
@@ -1,6 +1,6 @@
/* Machine description file for PFU A-series.
Copyright (C) 1988, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/plexus.h b/src/m/plexus.h
index 10826a70bc2..8b3e9be7849 100644
--- a/src/m/plexus.h
+++ b/src/m/plexus.h
@@ -1,5 +1,6 @@
/* machine description file for the Plexus running System V.2.
- Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1986, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/powermac.h b/src/m/powermac.h
index 14b2e110734..232e424da35 100644
--- a/src/m/powermac.h
+++ b/src/m/powermac.h
@@ -1,5 +1,5 @@
/* Machine description file for Apple Power Macintosh
- Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/powerpcle.h b/src/m/powerpcle.h
index 1dfd2df25b4..b4681db06bd 100644
--- a/src/m/powerpcle.h
+++ b/src/m/powerpcle.h
@@ -1,5 +1,6 @@
/* machine description file for PowerPC.
- Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1987, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/pyramid.h b/src/m/pyramid.h
index 12010087a58..2dbd713f881 100644
--- a/src/m/pyramid.h
+++ b/src/m/pyramid.h
@@ -1,6 +1,6 @@
/* machine description file for pyramid.
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/sequent-ptx.h b/src/m/sequent-ptx.h
index 3c22639e3b2..dbb0944a330 100644
--- a/src/m/sequent-ptx.h
+++ b/src/m/sequent-ptx.h
@@ -1,6 +1,6 @@
/* machine description file for SEQUENT machines running DYNIX/ptx
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/sequent.h b/src/m/sequent.h
index f082880b4fc..e970275901c 100644
--- a/src/m/sequent.h
+++ b/src/m/sequent.h
@@ -1,6 +1,6 @@
/* machine description file for SEQUENT BALANCE machines
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/sparc.h b/src/m/sparc.h
index 20ec53c1344..c9ef035653b 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -1,5 +1,6 @@
/* machine description file for Sun 4 SPARC.
- Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1987, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/sps7.h b/src/m/sps7.h
index 422d2470aaa..52edc570f92 100644
--- a/src/m/sps7.h
+++ b/src/m/sps7.h
@@ -1,6 +1,6 @@
/* machine description file for Bull SPS-7.
Copyright (C) 1986, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/sr2k.h b/src/m/sr2k.h
index 875f428dc1f..14a90c666f4 100644
--- a/src/m/sr2k.h
+++ b/src/m/sr2k.h
@@ -1,5 +1,6 @@
/* machine description file for Hitachi SR2001/SR2201 machines.
- Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1996, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/stride.h b/src/m/stride.h
index ff900d49b38..6f05b17d96e 100644
--- a/src/m/stride.h
+++ b/src/m/stride.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on Stride Micro System-V.2.2
Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/sun1.h b/src/m/sun1.h
index 810bad7fd58..5ded70a9e47 100644
--- a/src/m/sun1.h
+++ b/src/m/sun1.h
@@ -1,6 +1,6 @@
/* machine description file for Sun 68000's
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/sun2.h b/src/m/sun2.h
index 9df032049e3..1afa4a2fa63 100644
--- a/src/m/sun2.h
+++ b/src/m/sun2.h
@@ -2,7 +2,7 @@
Note that "sun2.h" refers to the operating system version, not the
CPU model number. See the MACHINES file for details.
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/sun386.h b/src/m/sun386.h
index 5970f90b98b..435c1ded6d2 100644
--- a/src/m/sun386.h
+++ b/src/m/sun386.h
@@ -1,8 +1,9 @@
/* machine description file for Sun's 386-based RoadRunner. This file borrows heavily from
- "sun2.h", but since that file is heavily cpu-specific, it was easier
- not to include it.
+ "sun2.h", but since that file is heavily cpu-specific, it was easier
+ not to include it.
- Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1988, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/symmetry.h b/src/m/symmetry.h
index 4954f596442..91209d0eb67 100644
--- a/src/m/symmetry.h
+++ b/src/m/symmetry.h
@@ -1,6 +1,6 @@
/* machine description file for SEQUENT SYMMETRY machines
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/tad68k.h b/src/m/tad68k.h
index b8b3859f407..fce223da826 100644
--- a/src/m/tad68k.h
+++ b/src/m/tad68k.h
@@ -1,5 +1,6 @@
/* Machine-dependent configuration for GNU Emacs for Tadpole 68k machines
- Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1986, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/tahoe.h b/src/m/tahoe.h
index 47db3f93deb..07ec23c7bb6 100644
--- a/src/m/tahoe.h
+++ b/src/m/tahoe.h
@@ -1,5 +1,6 @@
/* machine description file for tahoe.
- Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1985, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/targon31.h b/src/m/targon31.h
index 5ac18648387..7100e0e8705 100644
--- a/src/m/targon31.h
+++ b/src/m/targon31.h
@@ -1,6 +1,6 @@
/* targon31 machine description file
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/tek4300.h b/src/m/tek4300.h
index a84135291cb..3ff3ca4a6a0 100644
--- a/src/m/tek4300.h
+++ b/src/m/tek4300.h
@@ -1,5 +1,6 @@
/* machine description file for tek4300.
- Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1988, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h
index 4db981a8096..24c10330363 100644
--- a/src/m/tekxd88.h
+++ b/src/m/tekxd88.h
@@ -1,7 +1,8 @@
/* Configuration file for the Tektronix XD88 running UTekV 3.2e,
contributed by Kaveh Ghazi (ghazi@caip.rutgers.edu) 1/15/93.
You probably need to use gnu make (version 3.63 or higher.)
- Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1993, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/template.h b/src/m/template.h
index c7ce2c2cb1f..2b39964018a 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -1,6 +1,6 @@
/* machine description file template.
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/tower32.h b/src/m/tower32.h
index cd4ab96de11..06ed7efe5d7 100644
--- a/src/m/tower32.h
+++ b/src/m/tower32.h
@@ -1,5 +1,6 @@
/* machine description file for the NCR Tower 32 running System V.2.
- Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1986, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h
index 2c1e55c0023..8f5c60cd7c8 100644
--- a/src/m/tower32v3.h
+++ b/src/m/tower32v3.h
@@ -1,5 +1,6 @@
/* machine description file for the NCR Tower 32 running System V.3.
- Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1986, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/ustation.h b/src/m/ustation.h
index c62d37d6429..0a70df92233 100644
--- a/src/m/ustation.h
+++ b/src/m/ustation.h
@@ -1,6 +1,6 @@
/* machine description file for U-station (Nihon Unisys, SS5E; Sumitomo Denkoh, U-Station E30).
Copyright (C) 1986, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/vax.h b/src/m/vax.h
index d414d6b57e7..9332b8f494d 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -1,6 +1,6 @@
/* machine description file for vax.
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/wicat.h b/src/m/wicat.h
index 78842f32a43..24bb2acd210 100644
--- a/src/m/wicat.h
+++ b/src/m/wicat.h
@@ -1,5 +1,6 @@
/* machine description file for WICAT machines.
- Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1986, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/windowsnt.h b/src/m/windowsnt.h
index cf48ca8aa88..4351f14144f 100644
--- a/src/m/windowsnt.h
+++ b/src/m/windowsnt.h
@@ -1,7 +1,7 @@
/* Machine description file for Windows NT.
Copyright (C) 1993, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/m/xps100.h b/src/m/xps100.h
index 3a851aa9ebd..a9ac9bc5e36 100644
--- a/src/m/xps100.h
+++ b/src/m/xps100.h
@@ -2,7 +2,7 @@
Mark J. Hewitt (mjh@uk.co.kernel)
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/mac.c b/src/mac.c
index 5a56bd57817..a71194f9aee 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -1,6 +1,6 @@
/* Unix emulation routines for GNU Emacs on the Mac OS.
Copyright (C) 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/macfns.c b/src/macfns.c
index a9119cc4ab9..ae7f1d87be4 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -1,6 +1,6 @@
/* Graphical user interface functions for Mac OS.
Copyright (C) 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/macgui.h b/src/macgui.h
index 74c64bfb41d..cfe35e82945 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -1,6 +1,6 @@
/* Definitions and headers for communication on the Mac OS.
Copyright (C) 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/macmenu.c b/src/macmenu.c
index 1b132407df7..91cf28f7456 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -1,6 +1,6 @@
/* Menu support for GNU Emacs on Mac OS.
Copyright (C) 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/macros.c b/src/macros.c
index 8167e274dab..ef3ff8c0523 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -1,6 +1,6 @@
/* Keyboard macros.
Copyright (C) 1985, 1986, 1993, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/macros.h b/src/macros.h
index 7acd46dc2ed..bdd510456b0 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -1,5 +1,6 @@
/* Definitions for keyboard macro interpretation in GNU Emacs.
- Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1985, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/macterm.c b/src/macterm.c
index 4e7b0fde4e2..8e736f73124 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -1,6 +1,6 @@
/* Implementation of GUI terminal on the Mac OS.
Copyright (C) 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/macterm.h b/src/macterm.h
index 458fe63e5df..6714add1878 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -1,6 +1,6 @@
/* Display module for Mac OS.
Copyright (C) 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -206,9 +206,6 @@ extern struct mac_display_info one_mac_display_info;
FONT-LIST-CACHE records previous values returned by x-list-fonts. */
extern Lisp_Object x_display_name_list;
-/* A flag to control how to display unibyte 8-bit character. */
-extern int unibyte_display_via_language_environment;
-
extern struct x_display_info *x_display_info_for_display P_ ((Display *));
extern struct x_display_info *x_display_info_for_name P_ ((Lisp_Object));
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 2bcc736e685..ec407c883f3 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -1,6 +1,6 @@
# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
# Copyright (C) 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
diff --git a/src/marker.c b/src/marker.c
index 882054b74f9..0511debbe54 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -1,6 +1,6 @@
/* Markers: examining, setting and deleting.
Copyright (C) 1985, 1997, 1998, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/md5.c b/src/md5.c
index 4f055447eac..d3c25b04d3e 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -1,7 +1,7 @@
/* Functions to compute MD5 message digest of files or memory blocks.
according to the definition of MD5 in RFC 1321 from April 1992.
Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU Emacs.
The GNU C Library is free software; you can redistribute it and/or
diff --git a/src/md5.h b/src/md5.h
index adcc6bf48f6..09bf02ff753 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -1,7 +1,7 @@
/* Declaration of functions and data types used for MD5 sum computing
library functions.
Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
The GNU C Library is free software; you can redistribute it and/or
diff --git a/src/mem-limits.h b/src/mem-limits.h
index d7ac6a3e366..292293b2f98 100644
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -1,6 +1,6 @@
/* Includes for memory limit warnings.
Copyright (C) 1990, 1993, 1994, 1995, 1996, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/minibuf.c b/src/minibuf.c
index 79b3041c3b2..2894eb19324 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1,6 +1,7 @@
/* Minibuffer input and completion.
Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/mktime.c b/src/mktime.c
index 025f54d95c2..a85ebeb3783 100644
--- a/src/mktime.c
+++ b/src/mktime.c
@@ -1,6 +1,6 @@
/* Convert a `struct tm' to a time_t value.
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Contributed by Paul Eggert (eggert@twinsun.com).
NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/src/msdos.c b/src/msdos.c
index ee899d1bee4..026ebc572b4 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1,6 +1,6 @@
/* MS-DOS specific C utilities. -*- coding: raw-text -*-
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002,
- 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/msdos.h b/src/msdos.h
index b6c6aca1493..8bfbcf2d10c 100644
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -1,6 +1,6 @@
/* MS-DOS specific C utilities, interface.
Copyright (C) 1993, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/prefix-args.c b/src/prefix-args.c
index ee1ee7e7c7f..1a855e0e34b 100644
--- a/src/prefix-args.c
+++ b/src/prefix-args.c
@@ -1,5 +1,6 @@
/* prefix-args.c - echo each argument, prefixed by a string.
- Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1992, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/print.c b/src/print.c
index cc2902acb2b..5f41f6f7737 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1,7 +1,7 @@
/* Lisp object printing and output streams.
Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997,
1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/process.c b/src/process.c
index cde2c606d93..74922b0f57d 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,7 +1,7 @@
/* Asynchronous subprocess control for GNU Emacs.
Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
1996, 1998, 1999, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/process.h b/src/process.h
index cadc9b7031c..9625556888c 100644
--- a/src/process.h
+++ b/src/process.h
@@ -1,6 +1,6 @@
/* Definitions for asynchronous process control in GNU Emacs.
Copyright (C) 1985, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/puresize.h b/src/puresize.h
index e46ca103d7d..da81e09a345 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -1,5 +1,6 @@
/* How much read-only Lisp storage a dumped Emacs needs.
- Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1993, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/ralloc.c b/src/ralloc.c
index 35a8cb9c58a..fea9ea5d0a8 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -1,6 +1,6 @@
/* Block-relocating memory allocator.
Copyright (C) 1993, 1995, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/regex.h b/src/regex.h
index 8a669541ff1..efae7749f31 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -2,7 +2,7 @@
expression library, version 0.12.
Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 2000, 2002,
- 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/src/region-cache.c b/src/region-cache.c
index d49278eb886..cedb0017da0 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -1,6 +1,6 @@
/* Caching facts about regions of the buffer, for optimization.
Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1995, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/region-cache.h b/src/region-cache.h
index 51d2ceb1e62..40e68084cce 100644
--- a/src/region-cache.h
+++ b/src/region-cache.h
@@ -1,6 +1,6 @@
/* Header file: Caching facts about regions of the buffer, for optimization.
Copyright (C) 1985, 1986, 1993, 1995, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h
index eedfe3d15be..f77a209f0d2 100644
--- a/src/s/aix3-1.h
+++ b/src/s/aix3-1.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on IBM AIX version 3.1
Copyright (C) 1985, 1986, 1990, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h
index f36bc016ca8..3e6a44f1fab 100644
--- a/src/s/bsd4-1.h
+++ b/src/s/bsd4-1.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on bsd 4.1.
Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/bsd4-2.h b/src/s/bsd4-2.h
index f4e60b0fdbd..ace519c0d74 100644
--- a/src/s/bsd4-2.h
+++ b/src/s/bsd4-2.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on bsd 4.2
Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/bsd4-3.h b/src/s/bsd4-3.h
index 37d6a63e984..483effe71c1 100644
--- a/src/s/bsd4-3.h
+++ b/src/s/bsd4-3.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on bsd 4.3
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/cxux.h b/src/s/cxux.h
index 118d93d579c..3c4ffcd24a2 100644
--- a/src/s/cxux.h
+++ b/src/s/cxux.h
@@ -1,5 +1,6 @@
/* Header file for Harris CXUX.
- Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1994, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 921cff35bc7..749d1a38e3e 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -2,7 +2,7 @@
This file describes the parameters that system description files
should define or not.
Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 6227010e3ed..91975cd441b 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -1,5 +1,6 @@
/* System description header file for Darwin (Mac OS X).
- Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/dgux.h b/src/s/dgux.h
index 82956a900d9..d48d95709c8 100644
--- a/src/s/dgux.h
+++ b/src/s/dgux.h
@@ -1,7 +1,7 @@
/* Definitions file for GNU Emacs running on Data General's DG/UX
version 4.32 upto and including 5.4.1.
Copyright (C) 1994, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/dgux4.h b/src/s/dgux4.h
index 35834ad4da2..ee24cd65b50 100644
--- a/src/s/dgux4.h
+++ b/src/s/dgux4.h
@@ -1,6 +1,7 @@
/* Definitions file for GNU Emacs running on Data General's DG/UX
Release 4.10 and above.
- Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1996, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/dgux5-4-3.h b/src/s/dgux5-4-3.h
index 7ec88a435eb..d0f6d4f43e8 100644
--- a/src/s/dgux5-4-3.h
+++ b/src/s/dgux5-4-3.h
@@ -1,6 +1,7 @@
/* Definitions file for GNU Emacs running on Data General's DG/UX
version 5.4 Release 3.00 and above.
- Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1994, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/dgux5-4r2.h b/src/s/dgux5-4r2.h
index 3f059c32c24..be0ba73b4e0 100644
--- a/src/s/dgux5-4r2.h
+++ b/src/s/dgux5-4r2.h
@@ -1,6 +1,7 @@
/* Definitions file for GNU Emacs running on Data General's DG/UX
5.4 Release 2.xx systems.
- Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1994, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index 83949fd2819..78f314700b3 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -2,7 +2,7 @@
This file describes the parameters that system description files
should define or not.
Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index f87dcaded1b..4ef3db9f2ea 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -1,6 +1,6 @@
/* This file is the configuration file for Linux-based GNU systems
Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/gnu.h b/src/s/gnu.h
index 0da816c32d3..71f1dd34a5e 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on the GNU Hurd.
Copyright (C) 1994, 1995, 1996, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/hpux.h b/src/s/hpux.h
index 30ade71bf20..b8f9c62a893 100644
--- a/src/s/hpux.h
+++ b/src/s/hpux.h
@@ -1,7 +1,7 @@
/* Definitions file for GNU Emacs running on HPUX release 7.0.
Based on AT&T System V.2.
Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/iris3-5.h b/src/s/iris3-5.h
index a3b6c8ad0ad..6b0009c1c38 100644
--- a/src/s/iris3-5.h
+++ b/src/s/iris3-5.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on Silicon Graphics 3.5
Copyright (C) 1987, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/iris3-6.h b/src/s/iris3-6.h
index 1d8b96cc23f..d0c68bd89cb 100644
--- a/src/s/iris3-6.h
+++ b/src/s/iris3-6.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on Silicon Graphics system 3.6.
Copyright (C) 1987, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/irix3-3.h b/src/s/irix3-3.h
index a613779913a..a65242179a9 100644
--- a/src/s/irix3-3.h
+++ b/src/s/irix3-3.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on Silicon Graphics Irix system 3.3.
Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/lynxos.h b/src/s/lynxos.h
index 614735d290d..b822bad3691 100644
--- a/src/s/lynxos.h
+++ b/src/s/lynxos.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on LynxOS-3.0.1
Copyright (C) 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index b1989318fba..5c6d1d07c20 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -1,6 +1,6 @@
/* System description file for Windows NT.
Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 9469b33227f..966384ee352 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -1,7 +1,7 @@
/* System description file for MS-DOS
Copyright (C) 1993, 1996, 1997, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/newsos5.h b/src/s/newsos5.h
index d2bed2189be..0b441d74e24 100644
--- a/src/s/newsos5.h
+++ b/src/s/newsos5.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on Sony's NEWS-OS 5.0.2
Copyright (C) 1992, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/nextstep.h b/src/s/nextstep.h
index 0c0b01c10bd..8ea45e16e6e 100644
--- a/src/s/nextstep.h
+++ b/src/s/nextstep.h
@@ -1,6 +1,6 @@
/* Configuration file for the NeXTstep system.
Copyright (C) 1990, 1995, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/ptx.h b/src/s/ptx.h
index 1411dee70d8..319bbc049f2 100644
--- a/src/s/ptx.h
+++ b/src/s/ptx.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on Sequent DYNIX/ptx 1.x/2.x
Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/riscix1-1.h b/src/s/riscix1-1.h
index aee5d6ddc58..d6281d256b6 100644
--- a/src/s/riscix1-1.h
+++ b/src/s/riscix1-1.h
@@ -1,5 +1,6 @@
/* Definitions file for GNU Emacs running on RISCiX 1.1 (bsd 4.3)
- Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1994, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/riscix12.h b/src/s/riscix12.h
index 625b667d7b5..a4811877070 100644
--- a/src/s/riscix12.h
+++ b/src/s/riscix12.h
@@ -1,5 +1,6 @@
/* Definitions file for GNU Emacs running on RISCiX 1.2 (bsd 4.3)
- Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1994, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/rtu.h b/src/s/rtu.h
index b2d0c16e59a..2a9df14a14c 100644
--- a/src/s/rtu.h
+++ b/src/s/rtu.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on RTU 3.0, ucb universe.
Copyright (C) 1986, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/sco4.h b/src/s/sco4.h
index 627007e9a52..0eda0a3f728 100644
--- a/src/s/sco4.h
+++ b/src/s/sco4.h
@@ -1,6 +1,6 @@
/* System description file for SCO 3.2v4.
Copyright (C) 1993, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/sco5.h b/src/s/sco5.h
index 9fbbf072a12..06166f32fd9 100644
--- a/src/s/sco5.h
+++ b/src/s/sco5.h
@@ -1,5 +1,5 @@
/* System description file for SCO 3.2v5.
- Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1996, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/template.h b/src/s/template.h
index 0610e16473a..94b3787811f 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -2,7 +2,7 @@
This file describes the parameters that system description files
should define or not.
Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/umax.h b/src/s/umax.h
index f4923f33053..ae3b98cfcad 100644
--- a/src/s/umax.h
+++ b/src/s/umax.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on UMAX 4.2
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/unipl5-2.h b/src/s/unipl5-2.h
index cca703adb82..096096f9f7a 100644
--- a/src/s/unipl5-2.h
+++ b/src/s/unipl5-2.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on UniSoft's UniPlus 5.2
Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h
index 5f9943f8477..94389290726 100644
--- a/src/s/usg5-0.h
+++ b/src/s/usg5-0.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on AT&T's System V.0
Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h
index b090f3c32b6..a60a985856d 100644
--- a/src/s/usg5-2-2.h
+++ b/src/s/usg5-2-2.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on AT&T's System V Release 2.2
Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h
index e63bddfc060..7f1fcb92ec5 100644
--- a/src/s/usg5-2.h
+++ b/src/s/usg5-2.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on AT&T's System V Release 2.0
Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h
index 12259936928..56a448e9dba 100644
--- a/src/s/usg5-3.h
+++ b/src/s/usg5-3.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on AT&T's System V Release 3
Copyright (C) 1987, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index b8c2f8d9fa2..5e202e3edad 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running on AT&T's System V Release 4
Copyright (C) 1987, 1990, 1999, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/vms.h b/src/s/vms.h
index e3c9dc725c0..51f3ca1a531 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -1,5 +1,6 @@
/* system description header for VMS
- Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1986, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/s/xenix.h b/src/s/xenix.h
index e67b897faff..09a7b61fcd1 100644
--- a/src/s/xenix.h
+++ b/src/s/xenix.h
@@ -1,6 +1,6 @@
/* Definitions file for GNU Emacs running SCO Xenix 386 Release 2.2
Copyright (C) 1988, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/scroll.c b/src/scroll.c
index 6e633d4e60b..e8981fcfb5f 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,6 +1,6 @@
/* Calculate what line insertion or deletion to do, and do it,
Copyright (C) 1985, 1986, 1990, 1993, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/search.c b/src/search.c
index e35545f0e19..285bb92c37b 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1,6 +1,6 @@
/* String search routines for GNU Emacs.
Copyright (C) 1985, 1986, 1987, 1993, 1994, 1997, 1998, 1999, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/sheap.c b/src/sheap.c
index cc740173a24..192af4030c6 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -1,7 +1,7 @@
/* simulate `sbrk' with an array in .bss, for `unexec' support for Cygwin;
complete rewrite of xemacs Cygwin `unexec' code
- Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/sound.c b/src/sound.c
index 1e6a17d0275..c1d5c40e9bb 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1,6 +1,6 @@
/* sound.c -- sound support.
Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/strftime.c b/src/strftime.c
index 88a54b7bee4..f46b40f232a 100644
--- a/src/strftime.c
+++ b/src/strftime.c
@@ -1,5 +1,5 @@
/* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
NOTE: The canonical source of this file is maintained with gnulib.
Bugs can be reported to bug-gnulib@gnu.org.
diff --git a/src/sunfns.c b/src/sunfns.c
index 8de639b7480..1c04f1108a8 100644
--- a/src/sunfns.c
+++ b/src/sunfns.c
@@ -1,6 +1,6 @@
/* Functions for Sun Windows menus and selection buffer.
Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is probably totally obsolete. In any case, the FSF is
unwilling to support it. We agreed to include it in our distribution
diff --git a/src/syntax.c b/src/syntax.c
index 32ef35d2d55..f8d50d1e5b4 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1,6 +1,6 @@
/* GNU Emacs routines to deal with syntax tables; also word and list parsing.
Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2002,
- 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/syntax.h b/src/syntax.h
index ac449dc89e4..c7e67ebf355 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -1,6 +1,6 @@
/* Declarations having to do with GNU Emacs syntax tables.
Copyright (C) 1985, 1993, 1994, 1997, 1998, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/sysdep.c b/src/sysdep.c
index 3bc72c51193..3e06170e721 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1,6 +1,6 @@
/* Interfaces to system-dependent kernel and library entries.
Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/sysselect.h b/src/sysselect.h
index d57527f9ed1..ba204dafe3f 100644
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -1,5 +1,6 @@
/* sysselect.h - System-dependent definitions for the select function.
- Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/syssignal.h b/src/syssignal.h
index 43e8847cea5..cc2212d5e19 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -1,6 +1,6 @@
/* syssignal.h - System-dependent definitions for signals.
Copyright (C) 1993, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/systime.h b/src/systime.h
index 9851db4cf33..00373b257b3 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -1,6 +1,6 @@
/* systime.h - System-dependent definitions for time manipulations.
Copyright (C) 1993, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/systty.h b/src/systty.h
index af9f5e3aa88..6d6a6f01ea9 100644
--- a/src/systty.h
+++ b/src/systty.h
@@ -1,6 +1,6 @@
/* systty.h - System-dependent definitions for terminals.
Copyright (C) 1993, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/syswait.h b/src/syswait.h
index 37d59d68ac5..bb4937f353e 100644
--- a/src/syswait.h
+++ b/src/syswait.h
@@ -1,6 +1,6 @@
/* Define wait system call interface for Emacs.
Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/term.c b/src/term.c
index aae4f7dffdc..c12ae8937d8 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1,6 +1,6 @@
/* Terminal control module for terminals described by TERMCAP
Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1998, 2000, 2001,
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -1659,10 +1659,10 @@ static void produce_stretch_glyph P_ ((struct it *));
/* Append glyphs to IT's glyph_row. Called from produce_glyphs for
- terminal frames if IT->glyph_row != NULL. IT->c is the character
- for which to produce glyphs; IT->face_id contains the character's
- face. Padding glyphs are appended if IT->c has a IT->pixel_width >
- 1. */
+ terminal frames if IT->glyph_row != NULL. IT->char_to_display is
+ the character for which to produce glyphs; IT->face_id contains the
+ character's face. Padding glyphs are appended if IT->c has a
+ IT->pixel_width > 1. */
static void
append_glyph (it)
@@ -1682,7 +1682,7 @@ append_glyph (it)
{
glyph->type = CHAR_GLYPH;
glyph->pixel_width = 1;
- glyph->u.ch = it->c;
+ glyph->u.ch = it->char_to_display;
glyph->face_id = it->face_id;
glyph->padding_p = i > 0;
glyph->charpos = CHARPOS (it->position);
@@ -1733,6 +1733,9 @@ produce_glyphs (it)
xassert (it->what == IT_CHARACTER
|| it->what == IT_COMPOSITION);
+ /* Maybe translate single-byte characters to multibyte. */
+ it->char_to_display = it->c;
+
if (it->c >= 040 && it->c < 0177)
{
it->pixel_width = it->nglyphs = 1;
@@ -1762,13 +1765,11 @@ produce_glyphs (it)
{
int n = nspaces;
- it->c = ' ';
+ it->char_to_display = ' ';
it->pixel_width = it->len = 1;
while (n--)
append_glyph (it);
-
- it->c = '\t';
}
it->pixel_width = nspaces;
@@ -1861,17 +1862,15 @@ produce_stretch_glyph (it)
Lisp_Object o_object = it->object;
Lisp_Object object = it->stack[it->sp - 1].string;
int n = width;
- int c = it->c;
if (!STRINGP (object))
object = it->w->buffer;
it->object = object;
- it->c = ' ';
+ it->char_to_display = ' ';
it->pixel_width = it->len = 1;
while (n--)
append_glyph (it);
it->object = o_object;
- it->c = c;
}
it->pixel_width = width;
it->nglyphs = width;
diff --git a/src/termcap.c b/src/termcap.c
index 2f6f324eada..dee5465ebf9 100644
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -1,6 +1,6 @@
/* Work-alike for termcap, plus extra features.
Copyright (C) 1985, 1986, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/src/termchar.h b/src/termchar.h
index 04583b9309c..3787e338d40 100644
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -1,6 +1,6 @@
/* Flags and parameters describing terminal's characteristics.
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/termhooks.h b/src/termhooks.h
index 2f0e1089227..8405cac3b88 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -1,7 +1,7 @@
/* Hooks by which low level terminal operations
can be made to call other routines.
Copyright (C) 1985, 1986, 1993, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/terminfo.c b/src/terminfo.c
index 5c0aa1ccf05..7fccfaf1700 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -1,6 +1,6 @@
/* Interface from Emacs to terminfo.
Copyright (C) 1985, 1986, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/termopts.h b/src/termopts.h
index eaac0557cdb..5d4059babb0 100644
--- a/src/termopts.h
+++ b/src/termopts.h
@@ -1,6 +1,6 @@
/* Flags and parameters describing user options for handling the terminal.
Copyright (C) 1985, 1986, 1990, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/textprop.c b/src/textprop.c
index 029f2f41031..65823d9fa3f 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1,6 +1,6 @@
/* Interface code for dealing with text properties.
Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/tparam.c b/src/tparam.c
index e593589d5cb..ea04f7eaea1 100644
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -1,6 +1,6 @@
/* Merge parameters into a termcap entry string.
Copyright (C) 1985, 1987, 1993, 1995, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/src/uaf.h b/src/uaf.h
index 7863c41227e..05a8651b6c2 100644
--- a/src/uaf.h
+++ b/src/uaf.h
@@ -1,5 +1,6 @@
/* GNU Emacs VMS UAF definition file.
- Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1986, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/undo.c b/src/undo.c
index bf774affac5..3313c8e306c 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1,6 +1,6 @@
/* undo handling for GNU Emacs.
Copyright (C) 1990, 1993, 1994, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/unexaix.c b/src/unexaix.c
index 071f09898ed..4785aa1dcb3 100644
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -1,6 +1,6 @@
/* Dump an executable image.
Copyright (C) 1985, 1986, 1987, 1988, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/unexalpha.c b/src/unexalpha.c
index 069c39b398b..ead259437f6 100644
--- a/src/unexalpha.c
+++ b/src/unexalpha.c
@@ -1,7 +1,7 @@
/* Unexec for DEC alpha. schoepf@sc.ZIB-Berlin.DE (Rainer Schoepf).
Copyright (C) 1994, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/unexapollo.c b/src/unexapollo.c
index f1481d684a3..ace28dfa38d 100644
--- a/src/unexapollo.c
+++ b/src/unexapollo.c
@@ -1,6 +1,6 @@
/* unexapollo.c -- COFF File UNEXEC for GNU Emacs on Apollo SR10.x
Copyright (C) 1988, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/unexconvex.c b/src/unexconvex.c
index 6f05e4ae938..8409463b783 100644
--- a/src/unexconvex.c
+++ b/src/unexconvex.c
@@ -8,7 +8,7 @@
break it.
Copyright (C) 1985, 1986, 1988, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/unexcw.c b/src/unexcw.c
index cfd87781a16..aee4f58896c 100644
--- a/src/unexcw.c
+++ b/src/unexcw.c
@@ -1,7 +1,7 @@
/* unexec() support for Cygwin;
complete rewrite of xemacs Cygwin unexec() code
- Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/unexec.c b/src/unexec.c
index ebf813306da..7fe7e26568c 100644
--- a/src/unexec.c
+++ b/src/unexec.c
@@ -1,5 +1,5 @@
/* Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/unexelf.c b/src/unexelf.c
index c53974be9f2..30a35372544 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -1,5 +1,5 @@
/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/unexenix.c b/src/unexenix.c
index 159c0b2f6d8..c1ad8bbf7eb 100644
--- a/src/unexenix.c
+++ b/src/unexenix.c
@@ -7,7 +7,7 @@
maintenance might break it.
Copyright (C) 1988, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index 43e1f5e805c..db77a83cee2 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -1,5 +1,6 @@
/* Dump Emacs in Mach-O format for use on Mac OS X.
- Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/unexmips.c b/src/unexmips.c
index 212f7ed5926..86129e052cf 100644
--- a/src/unexmips.c
+++ b/src/unexmips.c
@@ -7,7 +7,7 @@
maintenance might break it.
Copyright (C) 1988, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/unexnext.c b/src/unexnext.c
index b374dd8e9b8..b453da3b023 100644
--- a/src/unexnext.c
+++ b/src/unexnext.c
@@ -1,6 +1,6 @@
/* Dump Emacs in macho format.
Copyright (C) 1990, 1993, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Written by Bradley Taylor (btaylor@next.com).
This file is part of GNU Emacs.
diff --git a/src/unexsni.c b/src/unexsni.c
index d6b3ae68969..8d72acf1a18 100644
--- a/src/unexsni.c
+++ b/src/unexsni.c
@@ -1,6 +1,6 @@
/* Unexec for Siemens machines running Sinix (modified SVR4).
Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1993, 1994, 1995, 2002,
- 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/unexsunos4.c b/src/unexsunos4.c
index 5e221050f36..19d982f6140 100644
--- a/src/unexsunos4.c
+++ b/src/unexsunos4.c
@@ -1,6 +1,6 @@
/* Unexec for Sunos 4 using shared libraries.
Copyright (C) 1990, 1994, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/unexw32.c b/src/unexw32.c
index bc462c18a10..6256062aa3f 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -1,5 +1,6 @@
/* unexec for GNU Emacs on Windows NT.
- Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1994, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/vm-limit.c b/src/vm-limit.c
index 0c12dec9b04..fb127b27b74 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -1,6 +1,6 @@
/* Functions for memory limit warnings.
Copyright (C) 1990, 1992, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w16select.c b/src/w16select.c
index c2c08666da9..50c107a0789 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -1,6 +1,6 @@
/* 16-bit Windows Selection processing for emacs on MS-Windows
Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32.c b/src/w32.c
index 9860a6cc353..799a3f6ad9b 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -1,6 +1,6 @@
/* Utility and Unix shadow routines for GNU Emacs on the Microsoft W32 API.
Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32.h b/src/w32.h
index 2981e5bb979..ecc986269fb 100644
--- a/src/w32.h
+++ b/src/w32.h
@@ -2,7 +2,8 @@
#define EMACS_W32_H
/* Support routines for the NT version of Emacs.
- Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1994, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32bdf.c b/src/w32bdf.c
index 37b892216d1..fbdb7f4c373 100644
--- a/src/w32bdf.c
+++ b/src/w32bdf.c
@@ -1,5 +1,6 @@
/* Implementation of BDF font handling on the Microsoft W32 API.
- Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32bdf.h b/src/w32bdf.h
index 9d3d306d56f..dd8cfa276bf 100644
--- a/src/w32bdf.h
+++ b/src/w32bdf.h
@@ -1,5 +1,6 @@
/* Definitions and header for handling BDF fonts on the Microsoft W32 API.
- Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32console.c b/src/w32console.c
index 4009397a060..a696534a4b6 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -1,6 +1,6 @@
/* Terminal hooks for GNU Emacs on the Microsoft W32 API.
Copyright (C) 1992, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32fns.c b/src/w32fns.c
index a9fded5525e..1bb23cf19ea 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1,6 +1,6 @@
/* Graphical user interface functions for the Microsoft W32 API.
Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32gui.h b/src/w32gui.h
index 644adcea924..2b1a11987f3 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -1,5 +1,6 @@
/* Definitions and headers for communication on the Microsoft W32 API.
- Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32heap.c b/src/w32heap.c
index a0c50da5506..f1fa196abe7 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -1,5 +1,6 @@
/* Heap management routines for GNU Emacs on the Microsoft W32 API.
- Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1994, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32heap.h b/src/w32heap.h
index 1b3b815b115..c862558b1cf 100644
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -1,5 +1,6 @@
/* Heap management routines (including unexec) for GNU Emacs on Windows NT.
- Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1994, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32inevt.c b/src/w32inevt.c
index ffa2cd0989a..0fededa6aea 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -1,6 +1,6 @@
/* Input event support for Emacs on the Microsoft W32 API.
Copyright (C) 1992, 1993, 1995, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32inevt.h b/src/w32inevt.h
index e0a9428720f..8985df1ee69 100644
--- a/src/w32inevt.h
+++ b/src/w32inevt.h
@@ -1,5 +1,6 @@
/* Input routines for GNU Emacs on the Microsoft W32 API.
- Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32menu.c b/src/w32menu.c
index dfd885eee08..57db01ac9e9 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1,6 +1,6 @@
/* Menu support for GNU Emacs on the Microsoft W32 API.
Copyright (C) 1986, 1988, 1993, 1994, 1996, 1998, 1999, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32proc.c b/src/w32proc.c
index 628a763c675..a9e0e0cb83f 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -1,6 +1,6 @@
/* Process support for GNU Emacs on the Microsoft W32 API.
Copyright (C) 1992, 1995, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32reg.c b/src/w32reg.c
index 40d84df3d14..cd2a3bdf755 100644
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -1,6 +1,6 @@
/* Emulate the X Resource Manager through the registry.
Copyright (C) 1990, 1993, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32select.c b/src/w32select.c
index 9ad9f96a4b6..7b394943434 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -1,6 +1,6 @@
/* Selection processing for Emacs on the Microsoft W32 API.
Copyright (C) 1993, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32term.c b/src/w32term.c
index 8084685cf48..5a90cb4a9ee 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1,6 +1,6 @@
/* Implementation of GUI terminal on the Microsoft W32 API.
Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32term.h b/src/w32term.h
index 721e427beec..c9d7fc375ac 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -1,6 +1,6 @@
/* Definitions and headers for communication on the Microsoft W32 API.
Copyright (C) 1995, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -248,9 +248,6 @@ extern Lisp_Object w32_display_name_list;
/* Regexp matching a font name whose width is the same as `PIXEL_SIZE'. */
extern Lisp_Object Vx_pixel_size_width_font_regexp;
-/* A flag to control how to display unibyte 8-bit character. */
-extern int unibyte_display_via_language_environment;
-
struct w32_display_info *x_display_info_for_name ();
Lisp_Object display_x_get_resource P_ ((struct w32_display_info *,
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 46a71b942c7..0e937e9950c 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -1,6 +1,6 @@
/* Functions taken directly from X sources for use with the Microsoft W32 API.
Copyright (C) 1989, 1992, 1993, 1994, 1995, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/widget.c b/src/widget.c
index 0386890d93b..35bf5631b20 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -1,6 +1,6 @@
/* The emacs frame widget.
Copyright (C) 1992, 1993, 2000, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/widget.h b/src/widget.h
index 00d743234c0..b6c5e9f0bcb 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -1,5 +1,6 @@
/* The emacs frame widget public header file.
- Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1993, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/widgetprv.h b/src/widgetprv.h
index 2027b4f602d..bde384d3b5f 100644
--- a/src/widgetprv.h
+++ b/src/widgetprv.h
@@ -1,5 +1,6 @@
/* The emacs frame widget private header file.
- Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1993, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/window.c b/src/window.c
index 289cc1628eb..f71d26f6d50 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1,7 +1,7 @@
/* Window creation, deletion and examination for GNU Emacs.
Does not include redisplay.
Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
- 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/xfaces.c b/src/xfaces.c
index ba1bbe7f1f6..0d91f433fce 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1,6 +1,6 @@
/* xfaces.c -- "Face" primitives.
Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/xfns.c b/src/xfns.c
index 48883733404..24dd26bd469 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1,6 +1,6 @@
/* Functions for the X window system.
Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/xmenu.c b/src/xmenu.c
index 816f8307850..a311a1cfa6a 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1,6 +1,6 @@
/* X Communication module for terminals which understand the X protocol.
Copyright (C) 1986, 1988, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/xrdb.c b/src/xrdb.c
index 822fb6e2624..2b7888ebe84 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -1,6 +1,6 @@
/* Deal with the X Resource Manager.
Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -88,6 +88,10 @@ extern char *get_system_name ();
/* Make sure not to #include anything after these definitions. Let's
not step on anyone's prototypes. */
#ifdef emacs
+/* darwin.h may have already defined these. */
+#undef malloc
+#undef realloc
+#undef free
#define malloc xmalloc
#define realloc xrealloc
#define free xfree
diff --git a/src/xselect.c b/src/xselect.c
index b41a05825ae..850cb058e86 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1,6 +1,6 @@
/* X Selection processing for Emacs.
Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/xsmfns.c b/src/xsmfns.c
index e7f3e6fa3e5..a862a07c8ee 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -1,6 +1,6 @@
/* Session management module for systems which understand the X Session
management protocol.
- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/xterm.h b/src/xterm.h
index d3e896e27b3..db8ae425a12 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -1,6 +1,6 @@
/* Definitions and headers for communication with X protocol.
Copyright (C) 1989, 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -419,9 +419,6 @@ extern Lisp_Object x_display_name_list;
/* Regexp matching a font name whose width is the same as `PIXEL_SIZE'. */
extern Lisp_Object Vx_pixel_size_width_font_regexp;
-/* A flag to control how to display unibyte 8-bit character. */
-extern int unibyte_display_via_language_environment;
-
extern struct x_display_info *x_display_info_for_display P_ ((Display *));
extern struct x_display_info *x_display_info_for_name P_ ((Lisp_Object));
diff --git a/vms/make-mms-derivative.el b/vms/make-mms-derivative.el
index 6b24bec9a77..f2c64df289d 100644
--- a/vms/make-mms-derivative.el
+++ b/vms/make-mms-derivative.el
@@ -1,6 +1,6 @@
;;; make-mms-derivative.el --- framework to do horrible things for VMS support
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
;; Author: Thien-Thi Nguyen <ttn@gnu.org>
;; Keywords: maint build vms mms makefile levitte autoconf war-is-a-lose