Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-53

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 302-319)

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

 * gnus--rel--5.10  (patch 69)

   - Update from CVS

267 files changed, 3037 insertions, 1793 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 766432edf98..aaaf1be4fa8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,632 @@
+2005-05-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * subr.el (send-string, send-region):
+        Remove obsolescence declaration.
+        (window-dot, set-window-dot, read-input, show-buffer)
+        (eval-current-buffer, string-to-int):
+        Add release number to obsolescence declarations.
+
+2005-05-19  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-magic-forward-char): Enter ido-find-file at end of input.
+        (ido-magic-backward-char): Enter ido-switch-buffer at start of input.
+
+2005-05-20  Matt Hodges  <MPHodges@member.fsf.org>
+
+        * faces.el (list-faces-display): Make back button respect optional
+        regexp arg.
+
+2005-05-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * calculator.el (calculator-radix-grouping-mode)
+        (calculator-radix-grouping-digits, calculator-displayer)
+        (calculator-radix-grouping-separator, calculator-copy-displayer):
+        * dabbrev.el (dabbrev-search-these-buffers-only):
+        * diff-mode.el (diff-jump-to-old-file, diff-update-on-the-fly)
+        (diff-advance-after-apply-hunk, diff-mode-hook)
+        (diff-minor-mode-prefix):
+        * imenu.el (imenu-use-popup-menu):
+        * jit-lock.el (jit-lock-context-time):
+        * newcomment.el (comment-fill-column, comment-column)
+        (comment-style, comment-padding, comment-multi-line)
+        (comment-empty-lines, comment-auto-fill-only-comments):
+        * reveal.el (reveal-around-mark):
+        * uniquify.el (uniquify-buffer-name-style)
+        (uniquify-after-kill-buffer-p)
+        (uniquify-ask-about-buffer-names-p, uniquify-ignore-buffers-re)
+        (uniquify-min-dir-content, uniquify-separator)
+        (uniquify-trailing-separator-p, uniquify-strip-common-suffix):
+        * w32-vars.el (w32-fixed-font-alist):
+        * emacs-lisp/testcover.el (testcover-potentially-1value-functions):
+        * obsolete/rsz-mini.el (resize-minibuffer-frame-max-height):
+        * progmodes/antlr-mode.el (antlr-font-lock-maximum-decoration):
+        * progmodes/perl-mode.el (perl-indent-level)
+        (perl-continued-statement-offset, perl-continued-brace-offset)
+        (perl-brace-offset, perl-brace-imaginary-offset)
+        (perl-label-offset, perl-indent-continued-arguments)
+        (perl-tab-always-indent, perl-tab-to-comment, perl-nochange):
+        * progmodes/tcl.el (tcl-indent-level)
+        (tcl-continued-indent-level, tcl-auto-newline)
+        (tcl-tab-always-indent, tcl-electric-hash-style)
+        (tcl-help-directory-list, tcl-use-smart-word-finder)
+        (tcl-application, tcl-command-switches, tcl-prompt-regexp)
+        (inferior-tcl-source-command):
+        * textmodes/fill.el (enable-kinsoku):
+        * textmodes/reftex-vars.el (reftex-index-phrases-wrap-long-lines):
+        * textmodes/table.el (table-yank-handler):
+        Specify missing group (and type, if simple) in defcustom.
+
+2005-05-19  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * progmodes/compile.el (compilation-finish-function): Fix defvar.
+
+2005-05-19  Richard M. Stallman  <rms@gnu.org>
+
+        * progmodes/make-mode.el (makefile-mode): Use run-mode-hooks.
+
+        * subr.el (event-basic-type): Don't get an error.
+        (left-fringe-p): Function deleted.
+
+        * buff-menu.el (Buffer-menu-buffer-face): In group Buffer-menu.
+
+        * dired-aux.el (dired-copy-file-recursive): Handle symlinks
+        in recursive copy.
+
+        * frame.el (show-trailing-whitespace): In group `whitespace-faces'.
+
+        * emacs-lisp/byte-run.el (eval-when-compile): Doc fix.
+
+        * emacs-lisp/bytecomp.el (byte-compile-file-form-custom-declare-variable):
+        Call byte-compile-nogroup-warn if appropriate.
+
+        * progmodes/compile.el (compilation-finish-function): Mark obsolete.
+        (compilation-set-window): Don't call left-fringe-p; do it directly.
+
+2005-05-19  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-graph.el (calc-graph-format-data): Make sure
+        var-PlotRejects is bound before trying to check its value.
+
+2005-05-19  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/reftex.el (reftex-isearch-minor-mode): Moved the
+        definition of this variable from reftex-global.el to reftex.el,
+        because it is needed in the menu.
+
+2005-05-19  Lute Kamstra  <lute@gnu.org>
+
+        * emacs-lisp/copyright.el (copyright-fix-years): Make sure all
+        years are fixed.  Don't insert a space after a dash.
+
+2005-05-19  Kim F. Storm  <storm@cua.dk>
+
+        * emulation/crisp.el (crisp-home, crisp-end): Put CUA property.
+
+2005-05-19  Daniel Pfeiffer  <occitan@esperanto.org>
+
+        * font-lock.el (lisp-font-lock-keywords-2): Do \\) only in
+        strings, because (eq ... ?\\) is fairly frequent.
+
+        * progmodes/make-mode.el (makefile-add-this-line-targets):
+        Simplify and integrate into `makefile-pickup-targets'.
+        (makefile-add-this-line-macro): Simplify and integrate into
+        `makefile-pickup-macros.
+        (makefile-pickup-filenames-as-targets): Simplify.
+        (makefile-previous-dependency, makefile-match-dependency): Don't
+        stumble over `::'.
+
+2005-05-19  Nick Roberts  <nickrob@snap.net.nz>
+
+        * subr.el (post-command-idle-hook, post-command-idle-delay):
+        Remove obsoletion of post-command-idle-hook and
+        post-command-idle-delay.
+
+        * faces.el (list-faces-display): Provide button when describe-face
+        is called to take user back to  the list of faces.
+
+        * help-fns.el (describe-variable): Remove hyperlinks in a
+        variable's value as these are quite frequently inappropriate.
+
+        * follow.el (follow-submit-feedback, follow-mode): Remove
+        references to post-command-idle-hook.
+
+2005-05-18  Daniel Pfeiffer  <occitan@esperanto.org>
+
+        * progmodes/make-mode.el (makefile-previous-dependency)
+        (makefile-match-dependency): Check for := (and in bsd mode also
+        !=) to give a better result, even when font-lock is not on.
+
+2005-05-18  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-help.el (calc-s-prefix-help): Add
+        `calc-copy-special-constant' to help string.
+
+2005-05-18  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * emacs-lisp/eldoc.el (eldoc-mode): Doc fix.
+
+2005-05-18  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-poly.el (math-factor-poly-coefs): Make sure the terms
+        in linear factors are in proper order.
+
+2005-05-18  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/reftex-vars.el (reftex-cite-format-builtin): Support
+        for jurabib.
+
+        * textmodes/reftex.el (featurep): Define aliases for overlay
+        commands, for XEmacs compatibility, and use these aliases in
+        overlay initializations.
+        (reftex-highlight): Use `reftex-move-overlay'.
+        (reftex-unhighlight): Use `reftex-delete-overlay'.
+        (reftex-uniq): Funktion removed.  Use `reftex-uniquify' instead.
+        (reftex-access-search-path): Use `reftex-uniquify' instead of
+        `reftex-uniq'
+
+        * textmodes/reftex-sel.el (reftex-select-unmark): Overlay
+        `before-string' property modification enables for Emacs as well.
+        (reftex-select-item): Use `reftex-delete-overlay'.
+        (reftex-select-mark): Use `reftex-make-overlay' and
+        `reftex-overlay-put'.
+        (reftex-select-unmark): Use `reftex-delete-overlay' and
+        `reftex-overlay-put'.
+
+2005-05-18  Lute Kamstra  <lute@gnu.org>
+
+        * emacs-lisp/lisp.el (check-parens): Fix docstring.
+
+2005-05-18  Juanma Barranquero  <lekktu@gmail.com>
+
+        * add-log.el (add-change-log-entry):
+        * array.el (array-make-template, array-reconfigure-rows)
+        (array-init-max-row, array-init-max-column)
+        (array-init-columns-per-line, array-init-field-width):
+        * replace.el (replace-match-maybe-edit, perform-replace):
+        * textmodes/spell.el (spell-region):
+        Replace `read-input' by `read-string'.
+
+        * forms.el (forms-mode):
+        * finder.el (finder-compile-keywords):
+        * shadowfile.el (shadow-read-files):
+        Replace `eval-current-buffer' by `eval-buffer'.
+
+        * terminal.el (te-pass-through):
+        * net/ange-ftp.el (ange-ftp-process-filter, ange-ftp-gwp-filter)
+        (ange-ftp-raw-send-cmd):
+        * net/telnet.el (telnet-interrupt-subjob, telnet-c-z)
+        (send-process-next-char, telnet-initial-filter, telnet):
+        Replace `send-string' by `process-send-string'.
+
+        * progmodes/prolog.el (inferior-prolog-mode): Doc fix.
+        (prolog-consult-region): Replace `send-string' by
+        `process-send-string'; replace `send-region' by
+        `process-send-region'.
+
+        * progmodes/delphi.el (delphi-log-msg):
+        Replace `set-window-dot' by `set-window-point'.
+
+        * subr.el (window-dot, set-window-dot, read-input, send-string)
+        (send-region, show-buffer, eval-current-buffer):
+        Make really obsolete, as the comment says.
+
+2005-05-17  Kim F. Storm  <storm@cua.dk>
+
+        * emulation/cua-base.el (cua-use-hyper-key): Doc fix.
+        (cua--init-keymaps): Bind C-return instead of S-return to set
+        rectangle mark.
+
+        * emulation/cua-rect.el (cua--init-rectangles): Bind C-return
+        instead of S-return to toggle/clear rectangle mark.
+
+2005-05-17  Daniel Pfeiffer  <occitan@esperanto.org>
+
+        * progmodes/make-mode.el (makefile-dependency-skip): New variable.
+        (makefile-macroassign-regex, makefile-make-font-lock-keywords):
+        Also fontify plain strings assigned to variables, mostly so that a
+        colon has a face and is thus not taken as a dependency separator.
+        (makefile-previous-dependency): Inline the new matcher, because it
+        is too complex to work in both directions.
+        (makefile-match-dependency): Eliminate `backward' arg (see above).
+        Completely reimplemented so as to not sometimes go into an endless
+        loop.  It should also be more efficient, because first it only
+        searches for `:', instead of applying the very complex regexp.
+        (makefile-mode): Cancel `font-lock-support-mode', because blocks
+        to be fontified in one piece can be too long for JIT.  Makefiles
+        are never *that* big.
+
+2005-05-17  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * dired.el (dired-mode): Simplify.
+
+2005-05-17  Lute Kamstra  <lute@gnu.org>
+
+        * emacs-lisp/easy-mmode.el (define-minor-mode): Don't generate a
+        defcustom for the mode hook variable.
+
+        * emacs-lisp/authors.el (authors): Do parse the ChangeLogs of the
+        Emacs Lisp Reference Manual.
+
+2005-05-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacs-lisp/cl.el (eql, floatp-safe, plusp, minusp, oddp)
+        (evenp, list*):
+        * emacs-lisp/cl-macs.el (macrolet, symbol-macrolet):
+        * emacs-lisp/cl-seq.el (subsetp, tree-equal): Doc fixes.
+
+        * net/tramp-smb.el (tramp-smb-open-connection):
+        Pass `tramp-chunksize' as fifth (required) argument.
+
+2005-05-16  Daniel Pfeiffer  <occitan@esperanto.org>
+
+        * font-lock.el (lisp-font-lock-keywords-1): Set
+        `font-lock-negation-char-face' for [^...] char group.
+        (lisp-font-lock-keywords-2): Highlight regexp's \\( \\| \\).
+
+        * progmodes/make-mode.el (makefile-dependency-regex): Turn it into
+        a var, and refine it to mask one more level of nested vars.
+        (makefile-rule-action-regex): Turn it into a var, and refine it so
+        it recognizes backslashed continuation lines as belonging to the
+        same command.
+        (makefile-macroassign-regex): Refine it so it recognizes
+        backslashed continuation lines as belonging to the same command.
+        (makefile-var-use-regex): Don't look at the next char, because it
+        might be the same one to be skipped by the initial [^$], leading
+        to an overlooked variable use.
+        (makefile-make-font-lock-keywords): Remove two parameters, which
+        are now variables that some of the modes set locally.  Handle
+        dependency and rule action matching through functions, because
+        regexps alone match too often.  Dependency matching now comes
+        last, so it can check, whether a colon already matched something
+        else.
+        (makefile-mode): Inform that font-lock improves makefile parsing
+        capabilities.
+        (makefile-match-dependency, makefile-match-action): New functions.
+
+2005-05-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacs-lisp/cl-extra.el (equalp): Doc fix.
+
+        * align.el (align-regexp):
+        * ansi-color.el (ansi-color-get-face):
+        * array.el (array-reconfigure-rows, array-init-max-row)
+        (array-init-max-column, array-init-columns-per-line)
+        (array-init-field-width):
+        * dired-aux.el (dired-trample-file-versions):
+        * dired-x.el (dired-mark-sexp):
+        * ediff-diff.el (ediff-extract-diffs, ediff-get-diff3-group):
+        * edmacro.el (edmacro-finish-edit, edmacro-parse-keys):
+        * emerge.el (emerge-extract-diffs, emerge-get-diff3-group):
+        * faces.el (face-read-integer):
+        * files.el (backup-extract-version, insert-directory):
+        * hexl.el (hexl-insert-decimal-char):
+        * server.el (server-process-filter):
+        * shell.el (shell-extract-num):
+        * startup.el (command-line-1):
+        * term.el (term-command-hook):
+        * time-stamp.el (time-stamp, time-stamp-string-preprocess)
+        (time-stamp-do-number):
+        * time.el (display-time-update):
+        * timezone.el (timezone-parse-date, timezone-zone-to-minute)
+        (timezone-fix-time):
+        * vms-patch.el (vms-suspend-resume-hook):
+        * calendar/appt.el (appt-convert-time):
+        * calendar/cal-bahai.el (mark-bahai-diary-entries):
+        * calendar/cal-hebrew.el (mark-hebrew-diary-entries):
+        * calendar/cal-islam.el (mark-islamic-diary-entries):
+        * calendar/calendar.el (calendar-cursor-to-date)
+        (calendar-star-date):
+        * calendar/diary-lib.el (diary-attrtype-convert)
+        (mark-diary-entries, diary-entry-time):
+        * calendar/solar.el (solar-get-number):
+        * emacs-lisp/lisp-mnt.el (lm-last-modified-date):
+        * emacs-lisp/re-builder.el (reb-display-subexp):
+        * emulation/edt.el (edt-set-scroll-margins):
+        * emulation/tpu-extras.el (tpu-set-scroll-margins):
+        * emulation/vip.el (vip-get-ex-token, vip-get-ex-buffer)
+        (vip-get-ex-count):
+        * emulation/viper-ex.el (viper-get-ex-token)
+        (viper-get-ex-buffer, viper-get-ex-count, ex-next):
+        * international/fontset.el (fontset-plain-name):
+        * mail/feedmail.el (feedmail-look-at-queue-directory):
+        * mail/mailalias.el (mail-get-names):
+        * mail/rmail.el (rmail-convert-to-babyl-format):
+        * mail/rmailsum.el (rmail-make-basic-summary-line)
+        (rmail-summary-next-same-subject, rmail-summary-rmail-update)
+        (rmail-summary-goto-msg):
+        * mail/smtpmail.el (smtpmail-read-response):
+        * net/ange-ftp.el (ange-ftp-guess-hash-mark-size)
+        (ange-ftp-vms-add-file-entry):
+        * play/gametree.el (gametree-looking-at-ply)
+        (gametree-current-branch-score):
+        * progmodes/ada-xref.el (ada-prj-find-prj-file)
+        (ada-xref-find-in-modified-ali, ada-find-in-src-path):
+        * progmodes/cperl-mode.el (condition-case):
+        * progmodes/ebrowse.el (ebrowse-set-tree-indentation)
+        (ebrowse-set-member-buffer-column-width)
+        (ebrowse-select-1st-to-9nth):
+        * progmodes/etags.el (etags-snarf-tag):
+        * progmodes/flymake.el (flymake-parse-line):
+        * progmodes/idlw-shell.el (idlwave-shell-parse-line)
+        (idlwave-shell-filter-bp, idlwave-shell-goto-next-error)
+        (idlwave-shell-menu-def):
+        * progmodes/ps-mode.el (ps-run-goto-error):
+        * progmodes/vhdl-mode.el (vhdl-read-offset, vhdl-load-cache)
+        (vhdl-speedbar-contract-level):
+        * term/mac-win.el (x-handle-numeric-switch):
+        * term/sun-mouse.el (sun-get-frame-data):
+        * term/w32-win.el (x-handle-numeric-switch):
+        * term/x-win.el (x-handle-numeric-switch):
+        * textmodes/ispell.el (ispell-parse-output):
+        * textmodes/nroff-mode.el (nroff-outline-level):
+        * textmodes/reftex-cite.el (reftex-bib-sort-year)
+        (reftex-bib-sort-year-reverse, reftex-format-citation):
+        * textmodes/reftex-parse.el (reftex-init-section-numbers)
+        (reftex-section-number):
+        * textmodes/texinfmt.el (texinfo-paragraphindent): Replace
+        `string-to-int' by `string-to-number'.
+
+        * international/latexenc.el: Add page marker to force the "Local
+        Variables:" string out of the last page.
+
+2005-05-16  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gud.el (gud-tooltip-mode): Add gud prefix to
+        tooltip-change-major-mode.
+        (gud-tooltip-print-command): Remove case where gud-minor-mode
+        is gdb ("--fullname").
+        (gud-tooltip-tips): Turn GUD tooltips off for this case and
+        explain to user.
+
+2005-05-16  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-store.el (calc-copy-special-constant): New function.
+
+        * calc/calc-ext.el (calc-init-extensions): Add binding for
+        `calc-copy-special-constant'.
+
+        * calc/calc-prog.el (calc-edit-format-macro-buffer): Add a case
+        for the `calc-copy-special-constant' command.
+
+2005-05-16  Nick Roberts  <nickrob@snap.net.nz>
+
+        * subr.el (left-fringe-p): New function.
+
+        * progmodes/compile.el (compilation-setup): Set local value of
+        overlay-arrow-string to "" always.
+        (compilation-set-window): Left fringe then don't scroll. No left
+        fringe then no arrow and scroll message to top.
+        (compilation-context-lines): Adjust doc string accordingly.
+
+2005-05-16  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-magic-forward-char, ido-magic-backward-char)
+        (ido-magic-delete-char): New commands for C-f, C-b, C-d.
+        (ido-wide-find-dir-or-delete-dir): New command for M-d.
+        (ido-define-mode-map): Bind them.  Add C-x prefix to fallback commands.
+        (ido-read-file-name): Handle commands with ido property value
+        equal to find-file as reading a file name, to allow C-d to enter dired.
+        (ibuffer-find-file): Add ido property with value find-file.
+
+2005-05-15  Kim F. Storm  <storm@cua.dk>
+
+        * subr.el (open-network-stream-nowait): Remove.
+        (open-network-stream-server): Remove.
+
+2005-05-15  Richard M. Stallman  <rms@gnu.org>
+
+        * faces.el (describe-face): Output a definition link button.
+
+        * help-mode.el (help-face-def): New button type.
+
+        * emacs-lisp/copyright.el (copyright-fix-years):
+        Match properly if the first year is 2-digit.
+        Don't mess up the whitespace after the years by filling.
+
+        * dired-aux.el (dired-mark-confirm):
+        Pass t to dired-get-marked-files for DISTINGUISH-ONE-MARKED.
+
+        * dired.el (dired-map-over-marks): New arg DISTINGUISH-ONE-MARKED.
+        (dired-get-marked-files): New arg DISTINGUISH-ONE-MARKED.
+        (dired-mark-pop-up): Handle FILES = (t FILE) specially.
+
+        * emacs-lisp/lisp-mode.el (lisp-mode-variables):
+        Set font-lock-comment-start-skip.
+
+        * font-lock.el (font-lock-comment-start-skip): New variable.
+        (font-lock-comment-end-skip): New variable.
+        (font-lock-fontify-syntactically-region): Use them if non-nil.
+
+2005-05-15  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-store.el (calc-store-value): Return a string rather
+        than display it as a message.
+        Use calc-var-name for variable name.
+        (calc-store-into): Add the result of calc-store-value to message.
+        (calc-copy-variable): Add a message.
+        (calc-store-exchange): Improve error messages.
+        (calc-store-binary, calc-store-map): Don't reset the values of
+        special constants.
+
+2005-05-14  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * emacs-lisp/derived.el (define-derived-mode): Add link to Elisp
+        manual to docstring.
+
+        * files.el (hack-local-variables-confirm): Add STRING argument.
+        Make the function handle non file visiting buffers correctly.
+        (hack-local-variables-prop-line, hack-local-variables)
+        (hack-one-local-variable): Use STRING arg of
+        `hack-local-variables-confirm'.
+
+2005-05-14  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.0.49.
+
+        * tramp.el (tramp-handle-dired-call-process)
+        (tramp-handle-insert-directory):`insert-buffer' cannot be used
+        because the contents of the Tramp buffer is changed before
+        insertion (`expand-file' and alike).
+        (tramp-handle-insert-directory): If `localname' has an empty
+        nondirectory name, it must not be quoted.
+        (tramp-pre-connection): Add parameter CHUNKSIZE.  Make local
+        variable `tramp-chunksize'.  Change callees.
+        (tramp-open-connection-setup-interactive-shell): Check remote host
+        for buggy `send-process-string' implementation.  Set
+        `tramp-chunksize' if found.  Reported by Michael Kifer
+        <kifer@cs.sunysb.edu> (and a lot of other people all the years).
+        (tramp-handle-shell-command): `insert-buffer' cannot be used
+        because the contents of the Tramp buffer is changed before
+        insertion (`expand-file' and alike).  Reported by Fr,Ai(Bd,Ai(Bric Bothamy
+        <frederic.bothamy@free.fr>.
+        (tramp-set-auto-save): Actions should be done for Tramp file name
+        handler only.  Ange-FTP has its own auto-save mechanism.  Reported
+        by Richard G. Bielawski <Richard.G.Bielawski@wellsfargo.com>.
+        (tramp-set-auto-save-file-modes): Set file modes of
+        `buffer-auto-save-file-name' to ?\600 as fallback solution.
+        Reported by Ferenc Wagner <wferi@tba.elte.hu>.
+        (tramp-bug): Remove obsolete variable.
+        (tramp-append-tramp-buffers): Rewrite partly.  More suitable check
+        for presence of `mml-mode'.  Make it running for older Emacsen as
+        well.
+
+2005-05-14  John Paul Wallington  <jpw@pobox.com>
+
+        * ibuf-ext.el (define-ibuffer-filter filename):
+        If `dired-directory' is a list, use its car.
+
+2005-05-14  Daniel Brockman  <daniel@brockman.se>  (tiny change)
+
+        * ibuffer.el (define-ibuffer-column filename):
+        If `dired-directory' is a list, use its car.
+
+2005-05-14  Richard M. Stallman  <rms@gnu.org>
+
+        * subr.el (symbol-file): Doc fix.
+
+        * emacs-lisp/bytecomp.el (byte-compile-nogroup-warn): New function.
+        (byte-compile-form): Call byte-compile-nogroup-warn.
+        (byte-compile-warning-types): Doc fix.
+
+        * eshell/esh-mode.el (eshell-find-tag): Use with-no-warnings.
+
+        * progmodes/cc-engine.el (c-literal-faces):
+        Add font-lock-comment-delimiter-face.
+
+        * net/net-utils.el (dig): Use with-no-warnings.
+
+        * mail/supercite.el (sc-cite-frame-alist, sc-uncite-frame-alist)
+        (sc-recite-frame-alist, sc-default-cite-frame)
+        (sc-default-uncite-frame, sc-default-recite-frame)
+        (sc-attrib-selection-list, sc-rewrite-header-list):
+        Mark as risky-local-variable.
+
+        * international/ogonek.el (ogonek-jak, ogonek-how):
+        Don't use beginning-of-buffer.
+
+        * emacs-lisp/eldoc.el (eldoc-documentation-function): Add autoload.
+
+        * calendar/solar.el (solar-data-list): Move definition up.
+
+        * dnd.el (dnd-protocol-alist): Add autoload.
+
+        * progmodes/sh-script.el: Many doc usage fixes.
+        (sh-indent-after-do): Change default to match common styles.
+
+2005-05-13  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * files.el (interpreter-mode-alist)
+        (auto-mode-interpreter-regexp): Doc fixes.
+
+2005-05-13  Matt Hodges  <MPHodges@member.fsf.org>
+
+        * tmm.el (tmm-get-keymap): Include only active menus and menu
+        items.
+
+        * emacs-lisp/easymenu.el (easy-menu-define): Doc fixes.
+
+2005-05-13  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * dired.el (dired-mode): make-variable-buffer-local =>
+        make-local-variable
+
+2005-05-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * term/mac-win.el (mac-select-convert-to-string): Try coding
+        systems in mac-script-code-coding-systems if specified one cannot
+        encode string for `com.apple.traditional-mac-plain-text'.
+
+2005-05-13  Daniel Pfeiffer  <occitan@esperanto.org>
+
+        * progmodes/make-mode.el (makefile-targets-face)
+        (makefile-shell-face, makefile-makepp-perl-face): New faces.
+        (makefile-dependency-regex): Fix it to not make the colon in
+        $(var:a=b) special.
+        (makefile-rule-action-regex): New regexp for highlighting embedded
+        Shell strings.
+        (makefile-macroassign-regex): Handle != for highlighting as
+        embedded Shell strings.
+        (makefile-var-use-regex): New const.
+        (makefile-statements, makefile-automake-statements)
+        (makefile-gmake-statements, makefile-makepp-statements)
+        (makefile-bsdmake-statements): New consts.
+        (makefile-make-font-lock-keywords): New function.
+        (makefile-automake-font-lock-keywords)
+        (makefile-gmake-font-lock-keywords)
+        (makefile-makepp-font-lock-keywords)
+        (makefile-bsdmake-font-lock-keywords): New consts.
+        (makefile-mode-map): Add switchers between the various submodes.
+        (makefile-mode): Document the availability of the variants.
+        (makefile-automake-mode, makefile-gmake-mode)
+        (makefile-makepp-mode, makefile-bsdmake-mode): New derived modes.
+
+        * files.el (auto-mode-alist, interpreter-mode-alist): Set up the
+        new variants of makefile-mode.
+
+2005-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * font-lock.el (font-lock-comment-delimiter-face): Fix up
+        the inheritance.
+
+2005-05-12  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * progmodes/inf-lisp.el (inferior-lisp-mode-hook)
+        (inferior-lisp-load-hook): Convert defcustoms back to defvars.
+
+        * files.el (normal-mode): Extend the scope of the
+        `enable-local-variables' binding to include the `set-auto-mode' call.
+        (magic-mode-alist): Doc fix.
+
+2005-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * font-lock.el (font-lock-comment-delimiter-face): Inherit from
+        font-lock-comment-face rather than copying its setting.
+
+2005-05-12  Andreas Schwab  <schwab@suse.de>
+
+        * eshell/esh-mode.el (eshell-send-input): Doc fix.
+
+2005-05-12  Lute Kamstra  <lute@gnu.org>
+
+        * emacs-lisp/generic.el (define-generic-mode): Don't generate a
+        defcustom for the mode hook variable.  Delete the last argument.
+        * generic-x.el: Fix callers of define-generic-mode.
+        (generic-x-modes): Delete group.
+        (show-tabs-tab-face, show-tabs-space-face): Put them in the
+        generic-x customization group.
+
+2005-05-12  Kim F. Storm  <storm@cua.dk>
+
+        * font-lock.el (font-lock-negation-char-face): Default to "off".
+
+        * progmodes/cc-fonts.el (c-basic-matchers-before): Don't apply
+        font-lock-negation-char-face to ! in !=.
+
+2005-05-12  Masatake YAMATO  <jet@gyve.org>
+
+        * add-log.el (find-change-log): Fix typos in the docstring
+        of function.
+
 2005-05-11  Arne J,Ax(Brgensen  <arne@arnested.dk>
 
         * international/latexenc.el (latexenc-find-file-coding-system):
@@ -21,6 +650,12 @@
 
 2005-05-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * font-lock.el (font-lock-fontify-syntactically-region): Don't use
+        comment-end if comment-start-skip is not set.
+        Obey the font-lock-comment-delimiter-face variables.
+
+2005-05-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
         * files.el (executable-find): Move from executable.el. Use locate-file.
         * progmodes/executable.el (executable-find): Move to files.el.
 
@@ -33,6 +668,11 @@
         (mouse-select, mouse-select-internal, mouse-extend-internal):
         Use it to implement mouse-1-click-follows-link functionality.
 
+2005-05-11  Richard M. Stallman  <rms@gnu.org>
+
+        * font-lock.el (font-lock-fontify-syntactically-region):
+        Use font-lock-comment-delimiter-face for comment delimiters.
+
 2005-05-10  Jay Belanger  <belanger@truman.edu>
 
         * calc/calc-help.el (calc-m-prefix-help): Add mention of
@@ -53,6 +693,9 @@
         * cus-edit.el (custom-file): Call file-chase-links.
 
         * files.el (read-directory-name): Fix previous change.
+        (hack-local-variables-confirm): New function.
+        (hack-local-variables-prop-line, hack-local-variables)
+        (hack-one-local-variable): Use it.
 
 2005-05-10  Lute Kamstra  <lute@gnu.org>
 
@@ -1123,7 +1766,7 @@
 
 2005-04-15  Carsten Dominik  <dominik@science.uva.nl>
 
-        * textmodes/org.el:  (org-agenda-date-prompt): Rename from
+        * textmodes/org.el (org-agenda-date-prompt): Rename from
         `org-agenda-date-today'.
         (org-evaluate-time-range): Insert at point instead of directly
         after time range.
@@ -1327,7 +1970,7 @@
         to dnd-insert-text.
         (x-dnd-protocol-alist, x-dnd-open-file-other-window)
         (x-dnd-handle-one-url, x-dnd-get-local-file-uri)
-        (x-dnd-get-local-file-name,  x-dnd-open-local-file)
+        (x-dnd-get-local-file-name, x-dnd-open-local-file)
         (x-dnd-open-file, x-dnd-insert-text): Move to dnd.el (without x-).
 
         * dnd.el (dnd-protocol-alist): New file with generic DND functions.
@@ -2374,7 +3017,7 @@
 
 2005-03-24  Jay Belanger  <belanger@truman.edu>
 
-        * calc/calc-embed.el (calc-embedded-mode-change):  Save all
+        * calc/calc-embed.el (calc-embedded-mode-change): Save all
         relevant mode settings in calc-embedded-original-modes when modes
         are permanently changed.
 
@@ -4074,7 +4717,7 @@
         (calc-set-language): Set math-expr-special-function-mapping.
 
         * calc/calc-prog.el (calc-edit-user-syntax, calc-fix-token-name)
-        (calc-write-parse-table-part):  Add LaTeX support.
+        (calc-write-parse-table-part): Add LaTeX support.
 
         * calc/calc.el (calc-language): Adjust docstring.
         (calc-set-mode-line): Add LaTeX support.
@@ -5049,7 +5692,7 @@
 
 2004-12-31  Jay Belanger  <belanger@truman.edu>
 
-        * calc/calc-store.el (calcVar-digit, calcVar-oper):  Remove the need
+        * calc/calc-store.el (calcVar-digit, calcVar-oper): Remove the need
         for "var-" at the beginning of the minibuffer.
 
 2004-12-31  Richard M. Stallman  <rms@gnu.org>
@@ -5899,7 +6542,7 @@
         * calendar/holidays.el (holiday-easter-etc): Make arguments
         optional for backwards compatibility.  Doc fix.
         Remove un-necessary local vars mandatory, output-list.
-        (holiday-advent):  Make arguments optional for backwards
+        (holiday-advent): Make arguments optional for backwards
         compatibility.  Doc fix.
 
 2004-12-06  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -7008,7 +7651,7 @@
         disp-trail by declared variable.
 
         * calc/calc-sel.el (calc-edit-disp-trail): Declare it.
-        (calc-finish-selection-edit):  Replace variable disp-trail by
+        (calc-finish-selection-edit): Replace variable disp-trail by
         declared variable.
         (calc-selection-cache-entry): Move declaration to earlier in the file.
         (calc-selection-cache-num, calc-selection-cache-comp)
@@ -7024,14 +7667,14 @@
         (calc-sel-reselect): New variable.
         (calc-auto-selection, calc-enter-selection, calc-edit-selection)
         (calc-sel-evaluate, calc-sel-expand-formula, calc-sel-expand-formula)
-        (calc-sel-mult-both-sides, calc-sel-add-both-sides):  Replace variable
+        (calc-sel-mult-both-sides, calc-sel-add-both-sides): Replace variable
         reselect with declared variable.
 
         * calc/calc-rewr.el (math-regs, math-num-regs, math-prog-last)
         (math-bound-vars, math-conds, math-copy-neg, math-rhs)
         (math-pattern, math-remembering, math-aliased-vars, math-mt-many)
         (math-import-list, math-rewrite-phase): Declare them.
-        (math-rewrite):  Use let* to declare variables.
+        (math-rewrite): Use let* to declare variables.
         (calc-rewrite-selection): Make rules a local variable.
         (calc-rewr-sel): New variable.
         (calc-rewrite-selection, calc-locate-selection-marker)
@@ -7264,15 +7907,15 @@
 
 2004-11-15  Jay Belanger  <belanger@truman.edu>
 
-        * calc/calcalg2.el (math-integrate-by-parts):  Remove unused
+        * calc/calcalg2.el (math-integrate-by-parts): Remove unused
         variable var-thing.
         (math-integ-depth, math-integ-level, math-integral-limit)
         (math-enable-subst, math-any-substs, math-integ-msg)
         (math-prev-parts-v, math-good-parts, math-max-integral-limit)
         (math-int-threshold, math-int-factors, math-double-roots)
         (math-solve-simplifying, var-IntegLimit, math-solve-sign)
-        (var-GenCount):  Declare these variables.
-        (calcFunc-integ):  Don't check if var-IntegLimit is bound.
+        (var-GenCount): Declare these variables.
+        (calcFunc-integ): Don't check if var-IntegLimit is bound.
         (math-integral-cache, math-integral-cache-state):
         Move declarations to earlier in the file.
         (math-deriv-var, math-deriv-total, math-deriv-symb)
@@ -7280,7 +7923,7 @@
         (math-so-far, math-integ-expr, math-expr-parts, calc-low)
         (calc-high, math-solve-var, math-solve-full, math-solve-vars)
         (math-try-solve-sign, math-solve-b, math-solve-system-vv)
-        (math-solve-res):  New variables
+        (math-solve-res): New variables
         (math-derivative, calcFunc-deriv, calcFunc-tderiv)
         (math-integral, math-replace-integral-parts)
         (math-integrate-by-parts, calc-dump-integral-cache)
@@ -7384,18 +8027,18 @@
 
 2004-11-12  Jay Belanger  <belanger@truman.edu>
 
-        * calc/calc-graph.el (calc-dumb-map):  Declare it.
-        (calc-graph-show-dumb):  Check if calc-dumb-map is non-nil rather
+        * calc/calc-graph.el (calc-dumb-map): Declare it.
+        (calc-graph-show-dumb): Check if calc-dumb-map is non-nil rather
         than unbound.
-        (calc-graph-name):  Made `end' a local variable.
-        (calc-graph-lookup):  Made `varname' a local variable.
+        (calc-graph-name): Made `end' a local variable.
+        (calc-graph-lookup): Made `varname' a local variable.
         (var-DUMMY, var-DUMMY2, var-PlotRejects, calc-gnuplot-trail-mark):
         Declare them.
-        (calc-graph-format-data):  Don't check if var-PlotRejects is bound.
-        (calc-graph-plot, calc-graph-compute-3d):  Remove references to
+        (calc-graph-format-data): Don't check if var-PlotRejects is bound.
+        (calc-graph-plot, calc-graph-compute-3d): Remove references to
         the unused variable y3vec.
-        (calc-graph-show-dumb):  Remove reference to unused variable found-pt.
-        (calc-graph-kill-hook, calc-graph-plot):  Remove reference to
+        (calc-graph-show-dumb): Remove reference to unused variable found-pt.
+        (calc-graph-kill-hook, calc-graph-plot): Remove reference to
         calc-graph-prev-kill-hook.
         (calc-graph-yvalue, calc-graph-yvec, calc-graph-numsteps)
         (calc-graph-numsteps3, calc-graph-xvalue, calc-graph-xvec)
@@ -7408,7 +8051,7 @@
         (calc-graph-y3step, calc-graph-y3step, calc-graph-zval)
         (calc-graph-stepcount, calc-graph-is-splot)
         (calc-graph-surprise-splot, calc-graph-blank)
-        (calc-graph-non-blank, calc-graph-curve-num):  New variables.
+        (calc-graph-non-blank, calc-graph-curve-num): New variables.
         (calc-graph-plot, calc-graph-compute-2d, calc-graph-refine-2d)
         (calc-graph-recompute-2d, calc-graph-compute-3d)
         (calc-graph-format-data): Replace undeclared variables with the
@@ -7482,28 +8125,28 @@
 
 2004-11-11  Jay Belanger  <belanger@truman.edu>
 
-        * calc/calc-comb.el (math-prime-factors-finished):  Declare it as
+        * calc/calc-comb.el (math-prime-factors-finished): Declare it as
         a variable.
-        (calcFunc-dfac):  Replace unbound max by n.
-        (math-stirling-local-cache):  New variable.
+        (calcFunc-dfac): Replace unbound max by n.
+        (math-stirling-local-cache): New variable.
         (math-stirling-number, math-stirling-1, math-stirling-2):
         Replace the variable `cache' by the declared variable
         math-stirling-local-cache.
-        (var-RandSeed):  Declare it as a variable.
-        (math-init-random-base, math-random-digit):  Don't check to see if
+        (var-RandSeed): Declare it as a variable.
+        (math-init-random-base, math-random-digit): Don't check to see if
         var-RandSeed is bound.
         (math-random-cache, math-gaussian-cache, calc-verbose-nextprime):
         Declare them instead of just setting them.
-        (math-init-random-base):  Made i a local variable.
-        (math-random-digit):  Made math-random-last a local variable.
-        (math-prime-test-cache):  Move declaration to before it is used.
+        (math-init-random-base): Made i a local variable.
+        (math-random-digit): Made math-random-last a local variable.
+        (math-prime-test-cache): Move declaration to before it is used.
         (math-prime-test-cache-k, math-prime-test-cache-q)
         (math-prime-test-cache-nm1, math-prime-factors-finished):
         Declare them as variables.
 
 2004-11-11  Jay Belanger  <belanger@truman.edu>
 
-        * calc/calc-ext.el (math-defcache):  Use defvar for the new
+        * calc/calc-ext.el (math-defcache): Use defvar for the new
         variables it creates.
 
 2004-11-11  Lars Hansen  <larsh@math.ku.dk>
@@ -7519,45 +8162,45 @@
 
 2004-11-10  Jay Belanger  <belanger@truman.edu>
 
-        * calc/calc-aent.el (calc-do-quick-calc):  Use kill-new to append
+        * calc/calc-aent.el (calc-do-quick-calc): Use kill-new to append
         string to kill-ring.
 
         * calc/calc-aent.el (calc-alg-exp, math-toks)
         (math-exp-pos,math-exp-old-pos, math-exp-token)
-        (math-exp-keep-spaces, math-exp-str):  New variables.
+        (math-exp-keep-spaces, math-exp-str): New variables.
         (calc-do-alg-entry, calcAlg-equals, calcAlg-edit)
-        (calcAlg-enter):  Use declared variable calc-alg-exp.
-        (math-build-parse-table, math-find-user-token):  Use declared
+        (calcAlg-enter): Use declared variable calc-alg-exp.
+        (math-build-parse-table, math-find-user-token): Use declared
         variable math-toks.
         (math-read-exprs, math-read-token, calc-check-user-syntax)
         (calc-match-user-syntax, match-factor-after, math-read-factor):
         Use declared variables math-exp-pos math-exp-old-pos.
         (math-read-exprs, math-read-token, math-read-expr-level)
         (calc-check-user-syntax, calc-match-user-syntax)
-        (match-factor-after, math-read-factor):  Use declared variable
+        (match-factor-after, math-read-factor): Use declared variable
         math-exp-token.
         (math-read-exprs, math-read-expr-list, math-read-token)
-        (math-read-factor):  Use declared variable math-exp-keep-spaces.
-        (math-read-exprs, math-read-token):  Use declared variable
+        (math-read-factor): Use declared variable math-exp-keep-spaces.
+        (math-read-exprs, math-read-token): Use declared variable
         math-exp-str.
-        (calc-match-user-syntax):  Make m a local variable.
+        (calc-match-user-syntax): Make m a local variable.
 
-        * calc/calc-ext.el (math-read-expr):  Use declared variables
+        * calc/calc-ext.el (math-read-expr): Use declared variables
         math-exp-pos, math-exp-old-pos, math-exp-str, math-exp-token,
         math-exp-keep-spaces.
 
-        * calc/calc-forms.el (math-read-angle-bracket):  Use declared
+        * calc/calc-forms.el (math-read-angle-bracket): Use declared
         variables math-exp-pos, math-exp-str.
 
-        * calc/calc-lang.el (math-parse-tex-sum):  Use declared variable
+        * calc/calc-lang.el (math-parse-tex-sum): Use declared variable
         math-exp-old-pos.
         (math-parse-fortran-vector, math-parse-fortran-vector-end)
-        (math-parse-eqn-prime):  Use declared variable math-exp-token.
+        (math-parse-eqn-prime): Use declared variable math-exp-token.
 
         * calc/calc-vec.el (math-read-brackets, math-check-for-commas):
         Use declared variable math-exp-pos.
-        (math-check-for-commas):  Use declared variable math-exp-str.
-        (math-read-brackets):  Use declared variables math-exp-old-pos,
+        (math-check-for-commas): Use declared variable math-exp-str.
+        (math-read-brackets): Use declared variables math-exp-old-pos,
         math-exp-keep-spaces.
         (math-read-brackets, math-read-vector, math-read-matrix):
         Use declared variable math-exp-token.
@@ -7595,42 +8238,42 @@
 
 2004-11-09  Jay Belanger  <belanger@truman.edu>
 
-        * calc/calc-ext.el (calc-init-extensions):  Remove old code.
+        * calc/calc-ext.el (calc-init-extensions): Remove old code.
 
         * calc/calc-ext.el (math-expr-data, math-mt-many, math-mt-func)
-        (calc-z-prefix-buf, calc-z-prefix-msgs):  New variables.
-        (calc-z-prefix-help, calc-user-function-list):  Use declared
+        (calc-z-prefix-buf, calc-z-prefix-msgs): New variables.
+        (calc-z-prefix-help, calc-user-function-list): Use declared
         variables calc-z-prefix-buf, calc-z-prefix-msgs.
-        (math-map-tree, math-map-tree-rec):  Use declared variables
+        (math-map-tree, math-map-tree-rec): Use declared variables
         math-mt-many, math-mt-func.
-        (math-read-expression, math-read-string):  Use declared variable
+        (math-read-expression, math-read-string): Use declared variable
         math-expr-data.
 
-        * calc/calc-ext.el (math-normalize-nonstandard):  Use declared
+        * calc/calc-ext.el (math-normalize-nonstandard): Use declared
         variable math-normalize-a.
 
-        * calc/calc.el (math-normalize-a):  New variable.
-        (math-normalize):  Use declared variable math-normalize-a.
+        * calc/calc.el (math-normalize-a): New variable.
+        (math-normalize): Use declared variable math-normalize-a.
 
-        * calc/calc-poly.el (math-expand-form):  Use declared variable
+        * calc/calc-poly.el (math-expand-form): Use declared variable
         math-mt-many.
 
         * calc/calc-rewr.el (math-rewrite, math-rewrite-phase):
         Use declared variable math-mt-many.
-        (math-rewrite):  Use declared variable math-mt-func.
+        (math-rewrite): Use declared variable math-mt-func.
 
         * calc/calc-vec.el (math-read-brackets, math-read-vector)
-        (math-read-matrix):  Use declared variable math-expr-data.
+        (math-read-matrix): Use declared variable math-expr-data.
 
         * calc/calc-lang.el (math-parse-fortran-vector)
         (math-parse-fortran-vector-end, math-parse-tex-sum)
         (math-parse-eqn-matrix, math-parse-eqn-prime)
-        (math-read-math-subscr):  Use declared variable math-expr-data.
+        (math-read-math-subscr): Use declared variable math-expr-data.
 
         * calc/calc-aent.el (math-read-exprs, math-read-expr-list)
         (math-read-expr-level, math-read-token, calc-check-user-syntax)
         (calc-match-user-syntax, math-read-if, math-factor-after)
-        (math-read-factor):  Use declared variable math-expr-data.
+        (math-read-factor): Use declared variable math-expr-data.
 
 2004-11-09  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
@@ -7663,14 +8306,14 @@
 2004-11-09  Jay Belanger  <belanger@truman.edu>
 
         * calc/calc.el (calc-mode-hook, calc-trail-mode-hook)
-        (calc-start-hook, calc-end-hook, calc-load-hook):  New variables.
+        (calc-start-hook, calc-end-hook, calc-load-hook): New variables.
 
         * calc/calc.el (calc, calc-trail-display, calc-mode):
         Remove obsolete sections.
 
-        * calc/calc.el (calc-x-paste-text):  Remove.
+        * calc/calc.el (calc-x-paste-text): Remove.
 
-        * calc/calc-ext.el (calc-init-extensions):  Bind calc-yank to
+        * calc/calc-ext.el (calc-init-extensions): Bind calc-yank to
         mouse-2.
 
 2004-11-09  Nick Roberts  <nickrob@snap.net.nz>
@@ -7716,14 +8359,14 @@
 
 2004-11-08  Jay Belanger  <belanger@truman.edu>
 
-        * calc/calcalg2.el (math-do-integral-methods):  Try linear then
+        * calc/calcalg2.el (math-do-integral-methods): Try linear then
         non-linear substitutions.
 
 2004-11-08  Jay Belanger  <belanger@truman.edu>
 
         * calc/calcalg2.el (math-linear-subst-tried): New variable.
-        (math-do-integral):  Set `math-linear-subst-tried' to nil.
-        (math-do-integral-methods):  Use `math-linear-subst-tried' to
+        (math-do-integral): Set `math-linear-subst-tried' to nil.
+        (math-do-integral-methods): Use `math-linear-subst-tried' to
         determine what type of substitution to try.
         (math-integ-try-linear-substituion):
         Set `math-linear-subst-tried' to t.
@@ -8327,7 +8970,7 @@
 2004-10-26  Jay Belanger  <belanger@truman.edu>
 
         * calc/calc.el (calc,full-calc, calc-quit, calc-keypad)
-        (full-calc-keypad, calc-trail-display):  Use an extra argument
+        (full-calc-keypad, calc-trail-display): Use an extra argument
         instead of `interactive-p'.
 
         * calc/calc-misc.el (calc-other-window): Use an extra argument
@@ -8372,7 +9015,7 @@
 
 2004-10-25  Jay Belanger  <belanger@truman.edu>
 
-        * calc/calc-incom.el (calc-digit-dots):  Inhibit read-only before
+        * calc/calc-incom.el (calc-digit-dots): Inhibit read-only before
         erasing minibuffer.
 
 2004-10-25  Simon Josefsson  <jas@extundo.com>
@@ -9358,7 +10001,7 @@
         (calc-invocation-macro, calc-show-banner): Give these values as
         part of `calc-mode-var-list's initialization after the variables
         are declared with defvar.
-        (calc-bug-address):  Change email address to send bug reports to.
+        (calc-bug-address): Change email address to send bug reports to.
         Change the maintainer address at the top.
         (calc-mode): Compare `calc-settings-file' to `user-init-file' rather
         than "\\.emacs" to determine if it is the user-init-file.
@@ -15654,7 +16297,7 @@
 
 2004-02-10  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
-        * x-dnd.el (x-dnd-types-alist): Add COMPOUND_TEXT,  FILE_NAME
+        * x-dnd.el (x-dnd-types-alist): Add COMPOUND_TEXT, FILE_NAME
         handled by x-dnd-handle-file-name.
         (x-dnd-known-types): Add COMPOUND_TEXT.
         (x-dnd-init-frame): Call x-dnd-init-motif-for-frame.
diff --git a/lisp/add-log.el b/lisp/add-log.el
index 2714df554b8..6dcbfca0c26 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -250,6 +250,9 @@ Note: The search is conducted only within 10%, at the beginning of the file."
     ;; Acknowledgements.
     ;; Don't include plain "From" because that is vague;
     ;; we want to encourage people to say something more specific.
+    ;; Note that the FSF does not use "Patches by"; our convention
+    ;; is to put the name of the author of the changes at the top
+    ;; of the change log entry.
     ("\\(^\\( +\\|\t\\)\\|  \\)\\(Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
      3 'change-log-acknowledgement-face))
   "Additional expressions to highlight in Change Log mode.")
@@ -375,10 +378,10 @@ nil, by matching `change-log-version-number-regexp-list'."
 
 Optional arg FILE-NAME specifies the file to use.
 If FILE-NAME is nil, use the value of `change-log-default-name'.
-If 'change-log-default-name' is nil, behave as though it were 'ChangeLog'
+If `change-log-default-name' is nil, behave as though it were 'ChangeLog'
 \(or whatever we use on this operating system).
 
-If 'change-log-default-name' contains a leading directory component, then
+If `change-log-default-name' contains a leading directory component, then
 simply find it in the current directory.  Otherwise, search in the current
 directory and its successive parents for a file so named.
 
@@ -489,13 +492,13 @@ non-nil, otherwise in local time."
 
     (if whoami
         (progn
-          (setq full-name (read-input "Full name: " full-name))
+          (setq full-name (read-string "Full name: " full-name))
           ;; Note that some sites have room and phone number fields in
           ;; full name which look silly when inserted.  Rather than do
           ;; anything about that here, let user give prefix argument so that
           ;; s/he can edit the full name field in prompter if s/he wants.
           (setq mailing-address
-                (read-input "Mailing address: " mailing-address))))
+                (read-string "Mailing address: " mailing-address))))
 
     (unless (equal file-name buffer-file-name)
       (if (or other-window (window-dedicated-p (selected-window)))
diff --git a/lisp/align.el b/lisp/align.el
index 5238a75807d..563e839f5fe 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -938,10 +938,10 @@ region, call `align-regexp' and type in that regular expression."
     (if current-prefix-arg
         (list (read-string "Complex align using regexp: "
                            "\\(\\s-*\\)")
-              (string-to-int
+              (string-to-number
                (read-string
                 "Parenthesis group to modify (justify if negative): " "1"))
-              (string-to-int
+              (string-to-number
                (read-string "Amount of spacing (or column if negative): "
                             (number-to-string align-default-spacing)))
               (y-or-n-p "Repeat throughout line? "))
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index e505f91e901..9b36a403b5d 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -619,7 +619,7 @@ ESCAPE-SEQ is a SGR control sequences such as \\033[34m.  The parameter
     (while (string-match ansi-color-r escape-seq i)
       (setq i (match-end 0)
             val (ansi-color-get-face-1
-                 (string-to-int (match-string 0 escape-seq) 10)))
+                 (string-to-number (match-string 0 escape-seq) 10)))
       (cond ((not val))
             ((eq val 'default)
              (setq f (list val)))
diff --git a/lisp/array.el b/lisp/array.el
index 3aa5d4bd319..f65f14ac550 100644
--- a/lisp/array.el
+++ b/lisp/array.el
@@ -607,7 +607,7 @@ If optional ARG is given, copy through ARG rows up."
   (let ((check t)
         (len))
     (while check
-      (setq array-init-field (read-input "Initial field value: "))
+      (setq array-init-field (read-string "Initial field value: "))
       (setq len (length array-init-field))
       (if (/= len array-field-width)
           (if (y-or-n-p (format "Change field width to %d? " len))
@@ -647,8 +647,8 @@ of array-rows-numbered."
                (<= new-columns-per-line array-max-column))
           (setq check nil)
         (setq new-columns-per-line
-              (string-to-int
-               (read-input
+              (string-to-number
+               (read-string
                 (format "Columns per line (1 - %d): " array-max-column)))))))
   ;; Check on new-rows-numbered.  It has to be done this way
   ;;  because interactive does not have y-or-n-p.
@@ -927,22 +927,22 @@ Entering array mode calls the function `array-mode-hook'."
 (defun array-init-max-row (&optional arg)
   "Initialize the value of `array-max-row'."
   (setq array-max-row
-        (or arg (string-to-int (read-input "Number of array rows: ")))))
+        (or arg (string-to-number (read-string "Number of array rows: ")))))
 
 (defun array-init-max-column (&optional arg)
   "Initialize the value of `array-max-column'."
   (setq array-max-column
-        (or arg (string-to-int (read-input "Number of array columns: ")))))
+        (or arg (string-to-number (read-string "Number of array columns: ")))))
 
 (defun array-init-columns-per-line (&optional arg)
   "Initialize the value of `array-columns-per-line'."
   (setq array-columns-per-line
-        (or arg (string-to-int (read-input "Array columns per line: ")))))
+        (or arg (string-to-number (read-string "Array columns per line: ")))))
 
 (defun array-init-field-width (&optional arg)
   "Initialize the value of `array-field-width'."
   (setq array-field-width
-        (or arg (string-to-int (read-input "Field width: ")))))
+        (or arg (string-to-number (read-string "Field width: ")))))
 
 (defun array-init-rows-numbered (&optional arg)
   "Initialize the value of `array-rows-numbered'."
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 7d0ac885c2f..a968d14a0a9 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -77,6 +77,7 @@
 (defface Buffer-menu-buffer-face
   '((t (:weight bold)))
   "Face used to highlight buffer name."
+  :group 'Buffer-menu
   :group 'font-lock-highlighting-faces)
 
 (defcustom Buffer-menu-buffer+size-width 26
@@ -754,7 +755,7 @@ For more information, see the function `buffer-menu'."
                                          (int-to-string (nth 3 buffer))
                                          `(buffer-name ,(nth 2 buffer)
                                            buffer ,(car buffer)
-                                           face Buffer-menu-buffer-face
+                                           font-lock-face Buffer-menu-buffer-face
                                            mouse-face highlight
                                            help-echo "mouse-2: select this buffer"))
                 "  "
diff --git a/lisp/calc/calc-comb.el b/lisp/calc/calc-comb.el
index c7bf225fe7c..b4b397c43f6 100644
--- a/lisp/calc/calc-comb.el
+++ b/lisp/calc/calc-comb.el
@@ -1,6 +1,6 @@
 ;;; calc-comb.el --- combinatoric functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 90d90e666bb..32d8a07ffc0 100644
--- a/lisp/calc/calc-cplx.el
+++ b/lisp/calc/calc-cplx.el
@@ -1,6 +1,6 @@
 ;;; calc-cplx.el --- Complex number functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 5b23dabbbf5..adbdf7a96e2 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -1,6 +1,6 @@
 ;;; calc-ext.el --- various extension functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
@@ -416,6 +416,7 @@
   (define-key calc-mode-map "sd" 'calc-declare-variable)
   (define-key calc-mode-map "se" 'calc-edit-variable)
   (define-key calc-mode-map "si" 'calc-insert-variables)
+  (define-key calc-mode-map "sk" 'calc-copy-special-constant)
   (define-key calc-mode-map "sl" 'calc-let)
   (define-key calc-mode-map "sm" 'calc-store-map)
   (define-key calc-mode-map "sn" 'calc-store-neg)
@@ -1075,7 +1076,8 @@ calc-vector-pop-covariance calc-vector-pop-sdev
 calc-vector-pop-variance calc-vector-product calc-vector-sdev
 calc-vector-sum calc-vector-variance)
 
- ("calc-store" calc-assign calc-copy-variable calc-declare-variable
+ ("calc-store" calc-assign calc-copy-special-constant
+calc-copy-variable calc-declare-variable
 calc-edit-AlgSimpRules calc-edit-Decls calc-edit-EvalRules
 calc-edit-ExtSimpRules calc-edit-FitRules calc-edit-GenCount
 calc-edit-Holidays calc-edit-IntegLimit calc-edit-LineStyles
diff --git a/lisp/calc/calc-fin.el b/lisp/calc/calc-fin.el
index 88af22746a0..c65e8341394 100644
--- a/lisp/calc/calc-fin.el
+++ b/lisp/calc/calc-fin.el
@@ -1,6 +1,6 @@
 ;;; calc-fin.el --- financial functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 10e4793c7a5..ad2ef9dbbff 100644
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -1,6 +1,6 @@
 ;;; calc-forms.el --- data format conversion functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004, 2005
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005
 ;; Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
diff --git a/lisp/calc/calc-funcs.el b/lisp/calc/calc-funcs.el
index 9a0802f0a2b..7ae9f524c90 100644
--- a/lisp/calc/calc-funcs.el
+++ b/lisp/calc/calc-funcs.el
@@ -1,6 +1,6 @@
 ;;; calc-funcs.el --- well-known functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 09bea69cf73..113cdcd33bc 100644
--- a/lisp/calc/calc-graph.el
+++ b/lisp/calc/calc-graph.el
@@ -864,6 +864,7 @@
                           "e" (int-to-string (nth 2 calc-graph-zval))))))
           (insert "\n"))
       (and (not (equal calc-graph-zval '(skip)))
+           (boundp 'var-PlotRejects)
            (eq (car-safe var-PlotRejects) 'vec)
            (nconc var-PlotRejects
                   (list (list 'vec
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index da2b8434c17..84176b36eea 100644
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -1,6 +1,6 @@
 ;;; calc-help.el --- help display functions for Calc,
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2004, 2005
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005
 ;;           Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
@@ -526,7 +526,7 @@ C-w  Describe how there is no warranty for Calc."
   (interactive)
   (calc-do-prefix-help
    '("Store, inTo, Xchg, Unstore; Recall, 0-9; : (:=); = (=>)"
-     "Let; Copy; Declare; Insert, Perm; Edit"
+     "Let; Copy, K=copy constant; Declare; Insert, Perm; Edit"
      "Negate, +, -, *, /, ^, &, |, [, ]; Map"
      "SHIFT + Decls, GenCount, TimeZone, Holidays; IntegLimit"
      "SHIFT + LineStyles, PointStyles, plotRejects; Units"
diff --git a/lisp/calc/calc-incom.el b/lisp/calc/calc-incom.el
index 691380e18fe..3fdec5a4b06 100644
--- a/lisp/calc/calc-incom.el
+++ b/lisp/calc/calc-incom.el
@@ -1,6 +1,6 @@
 ;;; calc-incom.el --- complex data type input functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 2c2a0f0f4aa..ad1e4664661 100644
--- a/lisp/calc/calc-keypd.el
+++ b/lisp/calc/calc-keypd.el
@@ -1,6 +1,6 @@
 ;;; calc-keypd.el --- mouse-capable keypad input for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 8b532a49e98..1004a8f1f56 100644
--- a/lisp/calc/calc-macs.el
+++ b/lisp/calc/calc-macs.el
@@ -1,6 +1,6 @@
 ;;; calc-macs.el --- important macros for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 726a500c10a..e636dd565fa 100644
--- a/lisp/calc/calc-map.el
+++ b/lisp/calc/calc-map.el
@@ -1,6 +1,6 @@
 ;;; calc-map.el --- higher-order functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 3b2f95d9be8..e8bdfe2fa5a 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -1,6 +1,6 @@
 ;;; calc-misc.el --- miscellaenous functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 1c5bd29e804..e0e2ccbd717 100644
--- a/lisp/calc/calc-mode.el
+++ b/lisp/calc/calc-mode.el
@@ -1,6 +1,6 @@
 ;;; calc-mode.el --- calculator modes for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 6cac30a3bb7..ea79c98252e 100644
--- a/lisp/calc/calc-mtx.el
+++ b/lisp/calc/calc-mtx.el
@@ -1,6 +1,6 @@
 ;;; calc-mtx.el --- matrix functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 e887e77030e..89d8273d6d6 100644
--- a/lisp/calc/calc-poly.el
+++ b/lisp/calc/calc-poly.el
@@ -1,6 +1,6 @@
 ;;; calc-poly.el --- polynomial functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
@@ -692,12 +692,13 @@
 
           ;; Check if linear in math-fet-x.
           ((not (cdr (cdr p)))
-           (math-add (math-factor-protect
-                      (math-sort-terms
-                       (math-factor-expr (car p))))
-                     (math-mul math-fet-x (math-factor-protect
-                                  (math-sort-terms
-                                   (math-factor-expr (nth 1 p)))))))
+           (math-sort-terms
+            (math-add (math-factor-protect
+                       (math-sort-terms
+                        (math-factor-expr (car p))))
+                      (math-mul math-fet-x (math-factor-protect
+                                            (math-sort-terms
+                                             (math-factor-expr (nth 1 p))))))))
 
           ;; If symbolic coefficients, use FactorRules.
           ((let ((pp p))
diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el
index 01ca770ba27..230b0f6a6c5 100644
--- a/lisp/calc/calc-prog.el
+++ b/lisp/calc/calc-prog.el
@@ -902,6 +902,7 @@
         (calc-edit-macro-combine-var-name))
        ((or
          (string-equal type "calc-copy-variable")
+         (string-equal type "calc-copy-special-constant")
          (string-equal type "calc-declare-variable"))
         (forward-line 1)
         (calc-edit-macro-combine-var-name)
diff --git a/lisp/calc/calc-rewr.el b/lisp/calc/calc-rewr.el
index c520c4d390c..2afb16b7535 100644
--- a/lisp/calc/calc-rewr.el
+++ b/lisp/calc/calc-rewr.el
@@ -1,6 +1,6 @@
 ;;; calc-rewr.el --- rewriting functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 7a11cfa5012..14fb59ce376 100644
--- a/lisp/calc/calc-rules.el
+++ b/lisp/calc/calc-rules.el
@@ -1,6 +1,6 @@
 ;;; calc-rules.el --- rules for simplifying algebraic expressions in Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 9fdd634027e..c1b8ebc307c 100644
--- a/lisp/calc/calc-stat.el
+++ b/lisp/calc/calc-stat.el
@@ -1,6 +1,6 @@
 ;;; calc-stat.el --- statistical functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 f59cad99802..35db6d71019 100644
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -1,6 +1,6 @@
 ;;; calc-store.el --- value storage functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
@@ -57,15 +57,20 @@
                                    ( | . calc-store-concat ) ))))
            (if found
                (funcall (cdr found))
-             (calc-store-value var (or calc-given-value (calc-top 1))
-                               "" calc-given-value-flag)
-             (message "Stored to variable \"%s\"" (calc-var-name var))))
+             (let ((msg
+                    (calc-store-value var (or calc-given-value (calc-top 1))
+                                      "" calc-given-value-flag)))
+               (message (concat "Stored to variable \"%s\"" msg)
+                        (calc-var-name var)))))
        (setq var (calc-is-assignments (calc-top 1)))
        (if var
            (while var
-             (calc-store-value (car (car var)) (cdr (car var))
-                               (if (not (cdr var)) "")
-                               (if (not (cdr var)) 1))
+             (let ((msg
+                    (calc-store-value (car (car var)) (cdr (car var))
+                                      (if (not (cdr var)) "")
+                                      (if (not (cdr var)) 1))))
+               (message (concat "Stored to variable \"%s\"" msg)
+                        (calc-var-name var)))
              (setq var (cdr var))))))))
 
 (defun calc-store-plus (&optional var)
@@ -109,22 +114,26 @@
   (calc-store-binary var "n" '- n))
 
 (defun calc-store-value (var value tag &optional pop)
-  (if var
-      (let ((old (calc-var-value var)))
-        (set var value)
-        (if pop (or calc-store-keep (calc-pop-stack pop)))
-        (calc-record-undo (list 'store (symbol-name var) old))
-        (if tag
-            (let ((calc-full-trail-vectors nil))
-              (calc-record value (format ">%s%s" tag (calc-var-name var)))))
-        (and (memq var '(var-e var-i var-pi var-phi var-gamma))
-             (eq (car-safe old) 'special-const)
-             (message "(Note: Built-in definition of %s has been lost)" var))
-        (and (memq var '(var-inf var-uinf var-nan))
-             (null old)
-             (message "(Note: %s has built-in meanings which may interfere)"
-                      var))
-        (calc-refresh-evaltos var))))
+  (let ((msg ""))
+    (if var
+        (let ((old (calc-var-value var)))
+          (set var value)
+          (if pop (or calc-store-keep (calc-pop-stack pop)))
+          (calc-record-undo (list 'store (symbol-name var) old))
+          (if tag
+              (let ((calc-full-trail-vectors nil))
+                (calc-record value (format ">%s%s" tag (calc-var-name var)))))
+          (cond
+           ((and (memq var '(var-e var-i var-pi var-phi var-gamma))
+                 (eq (car-safe old) 'special-const))
+            (setq msg (format " (Note: Built-in definition of %s has been lost)" 
+                              (calc-var-name var))))
+           ((and (memq var '(var-inf var-uinf var-nan))
+                 (null old))
+            (setq msg (format " (Note: %s has built-in meanings which may interfere)"
+                              (calc-var-name var)))))
+          (calc-refresh-evaltos var)))
+    msg))
 
 (defun calc-var-name (var)
   (if (symbolp var) (setq var (symbol-name var)))
@@ -140,8 +149,12 @@
      (or var (setq var (calc-read-var-name (format "Store %s: " tag))))
      (if var
          (let ((old (calc-var-value var)))
-           (or old
-               (error "No such variable: \"%s\"" (calc-var-name var)))
+           (if (eq (car-safe old) 'special-const)
+               (error "\"%s\" is a special constant" (calc-var-name var)))
+           (if (not old)
+               (if (memq var '(var-inf var-uinf var-nan))
+                   (error "\"%s\" is a special variable" (calc-var-name var))
+                 (error "No such variable: \"%s\"" (calc-var-name var))))
            (if (stringp old)
                (setq old (math-read-expr old)))
            (if (eq (car-safe old) 'error)
@@ -151,7 +164,7 @@
                                                  (list func value old)
                                                (list func old value)))
                              tag (and (not val) 1))
-           (message "Stored to variable \"%s\"" (calc-var-name var)))))))
+           (message "Variable \"%s\" changed" (calc-var-name var)))))))
 
 (defvar calc-var-name-map nil "Keymap for reading Calc variable names.")
 (if calc-var-name-map
@@ -228,26 +241,32 @@
      (or var (setq var (calc-read-var-name (format "Store Mapping %s: "
                                                    (nth 2 oper)))))
      (if var
-         (let ((old (or (calc-var-value var)
-                        (error "No such variable: \"%s\""
-                               (calc-var-name var))))
-               (calc-simplify-mode (if (eq calc-simplify-mode 'none)
-                                       'num calc-simplify-mode))
-               (values (and (> nargs 1)
-                            (calc-top-list (1- nargs) (1+ calc-dollar-used)))))
-           (message "Working...")
-           (calc-set-command-flag 'clear-message)
-           (if (stringp old)
-               (setq old (math-read-expr old)))
-           (if (eq (car-safe old) 'error)
-               (error "Bad format in variable contents: %s" (nth 2 old)))
-           (setq values (if (calc-is-inverse)
-                            (append values (list old))
-                          (append (list old) values)))
-           (calc-store-value var
-                             (calc-normalize (cons (nth 1 oper) values))
-                             (nth 2 oper)
-                             (+ calc-dollar-used (1- nargs))))))))
+         (let ((old (calc-var-value var)))
+           (if (eq (car-safe old) 'special-const)
+               (error "\"%s\" is a special constant" (calc-var-name var)))
+           (if (not old)
+               (if (memq var '(var-inf var-uinf var-nan))
+                   (error "\"%s\" is a special variable" (calc-var-name var))
+                 (error "No such variable: \"%s\"" (calc-var-name var))))
+           (let ((calc-simplify-mode (if (eq calc-simplify-mode 'none)
+                                         'num calc-simplify-mode))
+                 (values (and (> nargs 1)
+                              (calc-top-list (1- nargs) (1+ calc-dollar-used)))))
+             (message "Working...")
+             (calc-set-command-flag 'clear-message)
+             (if (stringp old)
+                 (setq old (math-read-expr old)))
+             (if (eq (car-safe old) 'error)
+                 (error "Bad format in variable contents: %s" (nth 2 old)))
+             (setq values (if (calc-is-inverse)
+                              (append values (list old))
+                            (append (list old) values)))
+             (calc-store-value var
+                               (calc-normalize (cons (nth 1 oper) values))
+                               (nth 2 oper)
+                               (+ calc-dollar-used (1- nargs)))
+             (message "Variable \"%s\" changed" (calc-var-name var))))))))
+
 
 (defun calc-store-exchange (&optional var)
   (interactive)
@@ -258,10 +277,12 @@
      (or var (setq var (calc-read-var-name "Exchange with: ")))
      (if var
          (let ((value (calc-var-value var)))
-           (or value
-               (error "No such variable: \"%s\"" (calc-var-name var)))
            (if (eq (car-safe value) 'special-const)
-               (error "%s is a special constant" var))
+               (error "\"%s\" is a special constant" (calc-var-name var)))
+           (if (not value)
+               (if (memq var '(var-inf var-uinf var-nan))
+                   (error "\"%s\" is a special variable" (calc-var-name var))
+                 (error "No such variable: \"%s\"" (calc-var-name var))))
            (setq top (or calc-given-value (calc-top 1)))
            (calc-store-value var top nil)
            (calc-pop-push-record calc-given-value-flag
@@ -366,6 +387,26 @@
   (interactive)
   (calc-recall (intern (format "var-q%c" last-command-char))))
 
+(defun calc-copy-special-constant (&optional sconst var)
+  (interactive)
+  (let ((sc '(("")
+              ("e" . (special-const (math-e)))
+              ("pi" . (special-const (math-pi)))
+              ("i" . (special-const (math-imaginary 1)))
+              ("phi" . (special-const (math-phi)))
+              ("gamma" . (special-const (math-gamma-const))))))
+  (calc-wrapper
+   (or sconst (setq sconst (completing-read "Special constant: " sc nil t)))
+   (unless (string= sconst "")
+     (let ((value (cdr (assoc sconst sc))))
+       (or var (setq var (calc-read-var-name
+                            (format "Copy special constant %s, to: " 
+                                    sconst))))
+       (if var
+           (let ((msg (calc-store-value var value "")))
+             (message (concat "Special constant \"%s\" copied to \"%s\"" msg)
+                      sconst (calc-var-name var)))))))))
+
 (defun calc-copy-variable (&optional var1 var2)
   (interactive)
   (calc-wrapper
@@ -378,7 +419,9 @@
                               (format "Copy variable: %s, to: " 
                                       (calc-var-name var1)))))
          (if var2
-             (calc-store-value var2 value ""))))))
+             (let ((msg (calc-store-value var2 value "")))
+               (message (concat "Variable \"%s\" copied to \"%s\"" msg)
+                        (calc-var-name var1) (calc-var-name var2))))))))
 
 (defvar calc-last-edited-variable nil)
 (defun calc-edit-variable (&optional var)
diff --git a/lisp/calc/calc-stuff.el b/lisp/calc/calc-stuff.el
index 288ec70b00e..c6e8d8bbf27 100644
--- a/lisp/calc/calc-stuff.el
+++ b/lisp/calc/calc-stuff.el
@@ -1,6 +1,6 @@
 ;;; calc-stuff.el --- miscellaneous functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 4ecc9a06651..e86117585ff 100644
--- a/lisp/calc/calc-trail.el
+++ b/lisp/calc/calc-trail.el
@@ -1,6 +1,6 @@
 ;;; calc-trail.el --- functions for manipulating the Calc "trail"
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 d946a1390d3..1837fe071f6 100644
--- a/lisp/calc/calc-undo.el
+++ b/lisp/calc/calc-undo.el
@@ -1,6 +1,6 @@
 ;;; calc-undo.el --- undo functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 efe2e30ce71..1153eabed57 100644
--- a/lisp/calc/calc-vec.el
+++ b/lisp/calc/calc-vec.el
@@ -1,6 +1,6 @@
 ;;; calc-vec.el --- vector functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 617fc1ddc89..173785dc912 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -1,6 +1,6 @@
 ;;; calc.el --- the GNU Emacs calculator
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005 
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 
 ;;           Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
diff --git a/lisp/calc/calcalg3.el b/lisp/calc/calcalg3.el
index bbba841c220..3fff729a012 100644
--- a/lisp/calc/calcalg3.el
+++ b/lisp/calc/calcalg3.el
@@ -1,6 +1,6 @@
 ;;; calcalg3.el --- more algebraic functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 20020f57468..2a322b8b74b 100644
--- a/lisp/calc/calcsel2.el
+++ b/lisp/calc/calcsel2.el
@@ -1,6 +1,6 @@
 ;;; calcsel2.el --- selection functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 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 76ff4053c7f..f11be4747b1 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -105,15 +105,21 @@ at runtime."
   "*Use digit grouping in radix output mode.
 If this is set, chunks of `calculator-radix-grouping-digits' characters
 will be separated by `calculator-radix-grouping-separator' when in radix
-output mode is active (determined by `calculator-output-radix').")
+output mode is active (determined by `calculator-output-radix')."
+  :type  'boolean
+  :group 'calculator)
 
 (defcustom calculator-radix-grouping-digits 4
   "*The number of digits used for grouping display in radix modes.
-See `calculator-radix-grouping-mode'.")
+See `calculator-radix-grouping-mode'."
+  :type  'integer
+  :group 'calculator)
 
 (defcustom calculator-radix-grouping-separator "'"
   "*The separator used in radix grouping display.
-See `calculator-radix-grouping-mode'.")
+See `calculator-radix-grouping-mode'."
+  :type  'string
+  :group 'calculator)
 
 (defcustom calculator-remove-zeros t
   "*Non-nil value means delete all redundant zero decimal digits.
@@ -140,7 +146,8 @@ of digits displayed).
 
 An exception to the above is the case of the list (std C) where C is a
 character, in this case the `calculator-standard-displayer' function
-will be used with this character for a format string.")
+will be used with this character for a format string."
+  :group 'calculator)
 
 (defcustom calculator-displayers
   '(((std ?n) "Standard display, decimal point or scientific")
@@ -169,7 +176,9 @@ floats, otherwise the Emacs reader will fail on them."
   "*If non-nil, this is any value that can be used for
 `calculator-displayer', to format a string before copying it with
 `calculator-copy'.  If nil, then `calculator-displayer's normal value is
-used.")
+used."
+  :type  'boolean
+  :group 'calculator)
 
 (defcustom calculator-2s-complement nil
   "*If non-nil, show negative numbers in 2s complement in radix modes.
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index d007e5b4546..c3f29e3d371 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -633,11 +633,11 @@ hour and minute parts."
         (min 0))
 
     (string-match "[:.]\\([0-9][0-9]\\)" time2conv)
-    (setq min (string-to-int
+    (setq min (string-to-number
                (match-string 1 time2conv)))
 
     (string-match "[0-9]?[0-9][:.]" time2conv)
-    (setq hr (string-to-int
+    (setq hr (string-to-number
               (match-string 0 time2conv)))
 
     ;; convert the time appointment time into 24 hour time
diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el
index 2bcfaf648ec..7e6149d8e94 100644
--- a/lisp/calendar/cal-bahai.el
+++ b/lisp/calendar/cal-bahai.el
@@ -340,13 +340,13 @@ nongregorian-diary-marking-hook."
                       (buffer-substring
                        (match-beginning m-name-pos)
                        (match-end m-name-pos))))
-                 (mm (string-to-int
+                 (mm (string-to-number
                       (if m-pos
                           (buffer-substring
                            (match-beginning m-pos)
                            (match-end m-pos))
                         "")))
-                 (dd (string-to-int
+                 (dd (string-to-number
                       (if d-pos
                           (buffer-substring
                            (match-beginning d-pos)
@@ -365,14 +365,14 @@ nongregorian-diary-marking-hook."
                                     (calendar-bahai-from-absolute
                                      (calendar-absolute-from-gregorian
                                       (calendar-current-date)))))
-                                  (y (+ (string-to-int y-str)
+                                  (y (+ (string-to-number y-str)
                                         (* 100 (/ current-y 100)))))
                              (if (> (- y current-y) 50)
                                  (- y 100)
                                (if (> (- current-y y) 50)
                                    (+ y 100)
                                  y)))
-                         (string-to-int y-str)))))
+                         (string-to-number y-str)))))
             (if dd-name
                 (mark-calendar-days-named
                  (cdr (assoc-string (substring dd-name 0 3)
diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el
index f66b4966e57..8f9f7723d5d 100644
--- a/lisp/calendar/cal-hebrew.el
+++ b/lisp/calendar/cal-hebrew.el
@@ -718,13 +718,13 @@ is provided for use as part of the nongregorian-diary-marking-hook."
                       (buffer-substring
                        (match-beginning m-name-pos)
                        (match-end m-name-pos))))
-                 (mm (string-to-int
+                 (mm (string-to-number
                       (if m-pos
                           (buffer-substring
                            (match-beginning m-pos)
                            (match-end m-pos))
                         "")))
-                 (dd (string-to-int
+                 (dd (string-to-number
                       (if d-pos
                           (buffer-substring
                            (match-beginning d-pos)
@@ -743,14 +743,14 @@ is provided for use as part of the nongregorian-diary-marking-hook."
                                     (calendar-hebrew-from-absolute
                                      (calendar-absolute-from-gregorian
                                       (calendar-current-date)))))
-                                  (y (+ (string-to-int y-str)
+                                  (y (+ (string-to-number y-str)
                                         (* 100 (/ current-y 100)))))
                              (if (> (- y current-y) 50)
                                  (- y 100)
                                (if (> (- current-y y) 50)
                                    (+ y 100)
                                  y)))
-                         (string-to-int y-str)))))
+                         (string-to-number y-str)))))
             (if dd-name
                 (mark-calendar-days-named
                  (cdr (assoc-string dd-name
diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el
index 1ac6f0677b1..786c71f24ce 100644
--- a/lisp/calendar/cal-islam.el
+++ b/lisp/calendar/cal-islam.el
@@ -337,13 +337,13 @@ provided for use as part of the nongregorian-diary-marking-hook."
                       (buffer-substring
                        (match-beginning m-name-pos)
                        (match-end m-name-pos))))
-                 (mm (string-to-int
+                 (mm (string-to-number
                       (if m-pos
                           (buffer-substring
                            (match-beginning m-pos)
                            (match-end m-pos))
                         "")))
-                 (dd (string-to-int
+                 (dd (string-to-number
                       (if d-pos
                           (buffer-substring
                            (match-beginning d-pos)
@@ -362,14 +362,14 @@ provided for use as part of the nongregorian-diary-marking-hook."
                                     (calendar-islamic-from-absolute
                                      (calendar-absolute-from-gregorian
                                       (calendar-current-date)))))
-                                  (y (+ (string-to-int y-str)
+                                  (y (+ (string-to-number y-str)
                                         (* 100 (/ current-y 100)))))
                              (if (> (- y current-y) 50)
                                  (- y 100)
                                (if (> (- current-y y) 50)
                                    (+ y 100)
                                  y)))
-                         (string-to-int y-str)))))
+                         (string-to-number y-str)))))
             (if dd-name
                 (mark-calendar-days-named
                  (cdr (assoc-string dd-name
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 305ecc1e9bc..45754110319 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -2574,7 +2574,7 @@ ERROR is t, otherwise just returns nil."
           (if (not (looking-at " "))
                    (re-search-backward "[^0-9]"))
           (list month
-                (string-to-int (buffer-substring (1+ (point)) (+ 4 (point))))
+                (string-to-number (buffer-substring (1+ (point)) (+ 4 (point))))
                 year))
       (if (looking-at "\\*")
           (save-excursion
@@ -2964,7 +2964,7 @@ calendar window has been prepared."
     (make-local-variable 'calendar-starred-day)
     (forward-char 1)
     (setq calendar-starred-day
-          (string-to-int
+          (string-to-number
            (buffer-substring (point) (- (point) 2))))
     (delete-char -2)
     (insert "**")
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 1832e0cd0fb..312b8841cf9 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -205,7 +205,7 @@ Valid TYPEs are: string, symbol, int, stringtnil, tnil."
   (let (ret)
     (setq ret (cond ((eq type 'string) attrvalue)
                     ((eq type 'symbol) (read attrvalue))
-                    ((eq type 'int) (string-to-int attrvalue))
+                    ((eq type 'int) (string-to-number attrvalue))
                     ((eq type 'stringtnil)
                      (cond ((string= "t" attrvalue) t)
                            ((string= "nil" attrvalue) nil)
@@ -908,13 +908,13 @@ diary entries."
                           (buffer-substring-no-properties
                            (match-beginning m-name-pos)
                            (match-end m-name-pos))))
-                     (mm (string-to-int
+                     (mm (string-to-number
                           (if m-pos
                               (buffer-substring-no-properties
                                (match-beginning m-pos)
                                (match-end m-pos))
                             "")))
-                     (dd (string-to-int
+                     (dd (string-to-number
                           (if d-pos
                               (buffer-substring-no-properties
                                (match-beginning d-pos)
@@ -931,7 +931,7 @@ diary entries."
                                (let* ((current-y
                                        (extract-calendar-year
                                         (calendar-current-date)))
-                                      (y (+ (string-to-int y-str)
+                                      (y (+ (string-to-number y-str)
                                             (* 100
                                                (/ current-y 100)))))
                                  (if (> (- y current-y) 50)
@@ -939,7 +939,7 @@ diary entries."
                                    (if (> (- current-y y) 50)
                                        (+ y 100)
                                      y)))
-                             (string-to-int y-str))))
+                             (string-to-number y-str))))
                      (save-excursion
                        (setq entry (buffer-substring-no-properties
                                     (point) (line-end-position))
@@ -1149,22 +1149,22 @@ be used instead of a colon (:) to separate the hour and minute parts."
     (cond ((string-match        ; Military time
             "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\)[:.]?\\([0-9][0-9]\\)\\(\\>\\|[^ap]\\)"
             s)
-           (+ (* 100 (string-to-int
+           (+ (* 100 (string-to-number
                       (substring s (match-beginning 1) (match-end 1))))
-              (string-to-int (substring s (match-beginning 2) (match-end 2)))))
+              (string-to-number (substring s (match-beginning 2) (match-end 2)))))
           ((string-match        ; Hour only  XXam or XXpm
             "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\)\\([ap]\\)m\\>" s)
-           (+ (* 100 (% (string-to-int
+           (+ (* 100 (% (string-to-number
                            (substring s (match-beginning 1) (match-end 1)))
                           12))
               (if (equal ?a (downcase (aref s (match-beginning 2))))
                   0 1200)))
           ((string-match        ; Hour and minute  XX:XXam or XX:XXpm
             "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\)[:.]\\([0-9][0-9]\\)\\([ap]\\)m\\>" s)
-           (+ (* 100 (% (string-to-int
+           (+ (* 100 (% (string-to-number
                            (substring s (match-beginning 1) (match-end 1)))
                           12))
-              (string-to-int (substring s (match-beginning 2) (match-end 2)))
+              (string-to-number (substring s (match-beginning 2) (match-end 2)))
               (if (equal ?a (downcase (aref s (match-beginning 3))))
                   0 1200)))
           (t diary-unknown-time)))) ; Unrecognizable
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index 5eca356af59..8401aeb9bfd 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -227,7 +227,7 @@ Needed for polar areas, in order to know whether the day lasts 0 or 24 hours.")
 Returns nil if nothing was entered."
   (let ((x (read-string prompt "")))
     (if (not (string-equal x ""))
-        (string-to-int x))))
+        (string-to-number x))))
 
 ;; The condition-case stuff is needed to catch bogus arithmetic
 ;; exceptions that occur on some machines (like Sparcs)
@@ -643,48 +643,6 @@ since January 1st, 2000, at 12 ET."
                   ; equation of time, in hours
     (list app i time-eq nut)))
 
-(defun solar-longitude (d)
-  "Longitude of sun on astronomical (Julian) day number D.
-Accurary is about 0.0006 degree (about 365.25*24*60*0.0006/360 = 1 minutes).
-
-The values of calendar-daylight-savings-starts,
-calendar-daylight-savings-starts-time, calendar-daylight-savings-ends,
-calendar-daylight-savings-ends-time, calendar-daylight-time-offset, and
-calendar-time-zone are used to interpret local time."
-  (let* ((a-d (calendar-absolute-from-astro d))
-         ;; get Universal Time
-         (date (calendar-astro-from-absolute
-                (- a-d
-                   (if (dst-in-effect a-d)
-                       (/ calendar-daylight-time-offset 24.0 60.0) 0)
-                   (/ calendar-time-zone 60.0 24.0))))
-         ;; get Ephemeris Time
-         (date (+ date (solar-ephemeris-correction
-                        (extract-calendar-year
-                         (calendar-gregorian-from-absolute
-                          (floor
-                           (calendar-absolute-from-astro
-                            date)))))))
-         (U (/ (- date 2451545) 3652500))
-         (longitude
-          (+ 4.9353929
-             (* 62833.1961680 U)
-             (* 0.0000001
-                (apply '+
-                       (mapcar '(lambda (x)
-                                  (* (car x)
-                                     (sin (mod
-                                           (+ (car (cdr x))
-                                              (* (car (cdr (cdr x))) U))
-                                           (* 2 pi)))))
-                               solar-data-list)))))
-         (aberration
-          (* 0.0000001 (- (* 17 (cos (+ 3.10 (* 62830.14 U)))) 973)))
-         (A1 (mod (+ 2.18 (* U (+ -3375.70 (* 0.36 U)))) (* 2 pi)))
-         (A2 (mod (+ 3.51 (* U (+ 125666.39 (* 0.10 U)))) (* 2 pi)))
-         (nutation (* -0.0000001 (+ (* 834 (sin A1)) (* 64 (sin A2))))))
-    (mod (radians-to-degrees (+ longitude aberration nutation)) 360.0)))
-
 (defconst solar-data-list
   '((403406 4.721964 1.621043)
     (195207 5.937458 62830.348067)
@@ -737,6 +695,48 @@ calendar-time-zone are used to interpret local time."
     (10 1.50 21463.25)
     (10 2.55 157208.40)))
 
+(defun solar-longitude (d)
+  "Longitude of sun on astronomical (Julian) day number D.
+Accurary is about 0.0006 degree (about 365.25*24*60*0.0006/360 = 1 minutes).
+
+The values of calendar-daylight-savings-starts,
+calendar-daylight-savings-starts-time, calendar-daylight-savings-ends,
+calendar-daylight-savings-ends-time, calendar-daylight-time-offset, and
+calendar-time-zone are used to interpret local time."
+  (let* ((a-d (calendar-absolute-from-astro d))
+         ;; get Universal Time
+         (date (calendar-astro-from-absolute
+                (- a-d
+                   (if (dst-in-effect a-d)
+                       (/ calendar-daylight-time-offset 24.0 60.0) 0)
+                   (/ calendar-time-zone 60.0 24.0))))
+         ;; get Ephemeris Time
+         (date (+ date (solar-ephemeris-correction
+                        (extract-calendar-year
+                         (calendar-gregorian-from-absolute
+                          (floor
+                           (calendar-absolute-from-astro
+                            date)))))))
+         (U (/ (- date 2451545) 3652500))
+         (longitude
+          (+ 4.9353929
+             (* 62833.1961680 U)
+             (* 0.0000001
+                (apply '+
+                       (mapcar '(lambda (x)
+                                  (* (car x)
+                                     (sin (mod
+                                           (+ (car (cdr x))
+                                              (* (car (cdr (cdr x))) U))
+                                           (* 2 pi)))))
+                               solar-data-list)))))
+         (aberration
+          (* 0.0000001 (- (* 17 (cos (+ 3.10 (* 62830.14 U)))) 973)))
+         (A1 (mod (+ 2.18 (* U (+ -3375.70 (* 0.36 U)))) (* 2 pi)))
+         (A2 (mod (+ 3.51 (* U (+ 125666.39 (* 0.10 U)))) (* 2 pi)))
+         (nutation (* -0.0000001 (+ (* 834 (sin A1)) (* 64 (sin A2))))))
+    (mod (radians-to-degrees (+ longitude aberration nutation)) 360.0)))
+
 (defun solar-ephemeris-correction (year)
   "Ephemeris time minus Universal Time during Gregorian year.
 Result is in days.
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 22e81db9210..5dea9892115 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -282,7 +282,8 @@ A mode setting this variable should make it buffer local."
   "If non-nil, a list of buffers which dabbrev should search.
 If this variable is non-nil, dabbrev will only look in these buffers.
 It will not even look in the current buffer if it is not a member of
-this list.")
+this list."
+  :group 'dabbrev)
 
 ;;----------------------------------------------------------------
 ;; Internal variables
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index d69685ac86f..c16738f6570 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -70,7 +70,8 @@
 (defcustom diff-jump-to-old-file nil
   "*Non-nil means `diff-goto-source' jumps to the old file.
 Else, it jumps to the new file."
-  :type '(boolean))
+  :type 'boolean
+  :group 'diff-mode)
 
 (defcustom diff-update-on-the-fly t
   "*Non-nil means hunk headers are kept up-to-date on-the-fly.
@@ -79,17 +80,20 @@ need to be kept consistent with the actual diff.  This can
 either be done on the fly (but this sometimes interacts poorly with the
 undo mechanism) or whenever the file is written (can be slow
 when editing big diffs)."
-  :type '(boolean))
+  :type 'boolean
+  :group 'diff-mode)
 
 (defcustom diff-advance-after-apply-hunk t
   "*Non-nil means `diff-apply-hunk' will move to the next hunk after applying."
-  :type 'boolean)
+  :type 'boolean
+  :group 'diff-mode)
 
 
 (defcustom diff-mode-hook nil
   "Run after setting up the `diff-mode' major mode."
   :type 'hook
-  :options '(diff-delete-empty-files diff-make-unified))
+  :options '(diff-delete-empty-files diff-make-unified)
+  :group 'diff-mode)
 
 (defvar diff-outline-regexp
   "\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)")
@@ -159,7 +163,8 @@ when editing big diffs)."
 
 (defcustom diff-minor-mode-prefix "\C-c="
   "Prefix key for `diff-minor-mode' commands."
-  :type '(choice (string "\e") (string "C-c=") string))
+  :type '(choice (string "\e") (string "C-c=") string)
+  :group 'diff-mode)
 
 (easy-mmode-defmap diff-minor-mode-map
   `((,diff-minor-mode-prefix . ,diff-mode-shared-map))
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 9a1449823ca..eec3045b53a 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -428,7 +428,7 @@ with a prefix argument."
          (setq base-version-list        ; there was a base version to which
                (assoc (substring fn 0 start-vn) ; this looks like a
                       dired-file-version-alist))        ; subversion
-         (not (memq (string-to-int (substring fn (+ 2 start-vn)))
+         (not (memq (string-to-number (substring fn (+ 2 start-vn)))
                     base-version-list)) ; this one doesn't make the cut
          (progn (beginning-of-line)
                 (delete-char 1)
@@ -760,7 +760,10 @@ Otherwise, the rule is a compression rule, and compression is done with gzip.")
   ;; The files used are determined by ARG (as in dired-get-marked-files).
   (or (eq dired-no-confirm t)
       (memq op-symbol dired-no-confirm)
-      (let ((files (dired-get-marked-files t arg))
+      ;; Pass t for DISTINGUISH-ONE-MARKED so that a single file which
+      ;; is marked pops up a window.  That will help the user see
+      ;; it isn't the current line file.
+      (let ((files (dired-get-marked-files t arg nil t))
             (string (if (eq op-symbol 'compress) "Compress or uncompress"
                       (capitalize (symbol-name op-symbol)))))
         (dired-mark-pop-up nil op-symbol files (function y-or-n-p)
@@ -1132,23 +1135,29 @@ Special value `always' suppresses confirmation."
 
 (defun dired-copy-file-recursive (from to ok-flag &optional
                                        preserve-time top recursive)
-  (if (and recursive
-           (eq t (car (file-attributes from))) ; A directory, no symbolic link.
-           (or (eq recursive 'always)
-               (yes-or-no-p (format "Recursive copies of %s " from))))
-      (let ((files (directory-files from nil dired-re-no-dot)))
-        (if (eq recursive 'top) (setq recursive 'always)) ; Don't ask any more.
-        (if (file-exists-p to)
-            (or top (dired-handle-overwrite to))
-          (make-directory to))
-        (while files
-          (dired-copy-file-recursive
-           (expand-file-name (car files) from)
-           (expand-file-name (car files) to)
-           ok-flag preserve-time nil recursive)
-          (setq files (cdr files))))
-    (or top (dired-handle-overwrite to)) ; Just a file.
-    (copy-file from to ok-flag dired-copy-preserve-time)))
+  (let ((attrs (file-attributes from)))
+    (if (and recursive
+             (eq t (car attrs))
+             (or (eq recursive 'always)
+                 (yes-or-no-p (format "Recursive copies of %s " from))))
+        ;; This is a directory.
+        (let ((files (directory-files from nil dired-re-no-dot)))
+          (if (eq recursive 'top) (setq recursive 'always)) ; Don't ask any more.
+          (if (file-exists-p to)
+              (or top (dired-handle-overwrite to))
+            (make-directory to))
+          (while files
+            (dired-copy-file-recursive
+             (expand-file-name (car files) from)
+             (expand-file-name (car files) to)
+             ok-flag preserve-time nil recursive)
+            (setq files (cdr files))))
+      ;; Not a directory.
+      (or top (dired-handle-overwrite to))
+      (if (stringp (car attrs))
+          ;; It is a symlink
+          (make-symbolic-link (car attrs) to ok-flag)
+        (copy-file from to ok-flag dired-copy-preserve-time)))))
 
 ;;;###autoload
 (defun dired-rename-file (file newname ok-if-already-exists)
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 6b44b73b170..86c955650e8 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -1501,10 +1501,10 @@ to mark all zero length files."
               (if (looking-at dired-re-inode-size)
                   (progn
                     (goto-char (match-end 0))
-                    (setq inode (string-to-int (buffer-substring (match-beginning 1)
-                                                                 (match-end 1)))
-                          s (string-to-int (buffer-substring (match-beginning 2)
-                                                             (match-end 2)))))
+                    (setq inode (string-to-number (buffer-substring (match-beginning 1)
+                                                                    (match-end 1)))
+                          s (string-to-number (buffer-substring (match-beginning 2)
+                                                                (match-end 2)))))
                 (setq inode nil
                       s nil))
               (setq mode (buffer-substring (point) (+ mode-len (point))))
@@ -1516,10 +1516,10 @@ to mark all zero length files."
               (re-search-forward dired-move-to-filename-regexp)
               (goto-char (match-beginning 1))
               (forward-char -1)
-              (setq size (string-to-int (buffer-substring (save-excursion
-                                                            (backward-word 1)
-                                                            (setq pos (point)))
-                                                          (point))))
+              (setq size (string-to-number (buffer-substring (save-excursion
+                                                               (backward-word 1)
+                                                               (setq pos (point)))
+                                                             (point))))
               (goto-char pos)
               (backward-word 1)
               ;; if no gid is displayed, gid will be set to uid
diff --git a/lisp/dired.el b/lisp/dired.el
index afea6b173a6..43f05dcf881 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -450,7 +450,8 @@ Return value is the number of files marked, or nil if none were marked."
                             "flagged" "marked"))))
     (and (> count 0) count)))
 
-(defmacro dired-map-over-marks (body arg &optional show-progress)
+(defmacro dired-map-over-marks (body arg &optional show-progress
+                                     distinguish-one-marked)
   "Eval BODY with point on each marked line.  Return a list of BODY's results.
 If no marked file could be found, execute BODY on the current line.
   If ARG is an integer, use the next ARG (or previous -ARG, if ARG<0)
@@ -465,7 +466,10 @@ No guarantee is made about the position on the marked line.
 Search starts at the beginning of the buffer, thus the car of the list
   corresponds to the line nearest to the buffer's bottom.  This
   is also true for (positive and negative) integer values of ARG.
-BODY should not be too long as it is expanded four times."
+BODY should not be too long as it is expanded four times.
+
+If DISTINGUISH-ONE-MARKED is non-nil, then if we find just one marked file,
+return (t FILENAME) instead of (FILENAME)."
   ;;
   ;;Warning: BODY must not add new lines before point - this may cause an
   ;;endless loop.
@@ -505,13 +509,15 @@ BODY should not be too long as it is expanded four times."
                  (set-marker next-position nil)
                  (setq next-position (and (re-search-forward regexp nil t)
                                           (point-marker)))))
+             (if (and ,distinguish-one-marked (= (length results) 1))
+                 (setq results (cons t results)))
              (if found
                  results
                (list ,body)))))
      ;; save-excursion loses, again
      (dired-move-to-filename)))
 
-(defun dired-get-marked-files (&optional localp arg filter)
+(defun dired-get-marked-files (&optional localp arg filter distinguish-one-marked)
   "Return the marked files' names as list of strings.
 The list is in the same order as the buffer, that is, the car is the
   first marked file.
@@ -522,13 +528,21 @@ Optional second argument ARG specifies files near point
   If ARG is otherwise non-nil, use file.  Usually ARG comes from
   the command's prefix arg.
 Optional third argument FILTER, if non-nil, is a function to select
-  some of the files--those for which (funcall FILTER FILENAME) is non-nil."
-  (let ((all-of-them
-         (save-excursion
-           (dired-map-over-marks (dired-get-filename localp) arg)))
-        result)
+  some of the files--those for which (funcall FILTER FILENAME) is non-nil.
+
+If DISTINGUISH-ONE-MARKED is non-nil, then if we find just one marked file,
+return (t FILENAME) instead of (FILENAME).
+Don't use that together with FILTER."
+  (let* ((all-of-them
+          (save-excursion
+            (dired-map-over-marks
+             (dired-get-filename localp)
+             arg nil distinguish-one-marked)))
+         result)
     (if (not filter)
-        (nreverse all-of-them)
+        (if (and distinguish-one-marked (eq (car all-of-them) t))
+            all-of-them
+          (nreverse all-of-them))
       (dolist (file all-of-them)
         (if (funcall filter file)
             (push file result)))
@@ -1535,9 +1549,8 @@ Keybindings:
   (setq dired-switches-alist nil)
   (dired-sort-other dired-actual-switches t)
   (when (featurep 'dnd)
-    (make-variable-buffer-local 'dnd-protocol-alist)
-    (setq dnd-protocol-alist
-          (append dired-dnd-protocol-alist dnd-protocol-alist)))
+    (set (make-local-variable 'dnd-protocol-alist)
+         (append dired-dnd-protocol-alist dnd-protocol-alist)))
   (run-mode-hooks 'dired-mode-hook))
 
 ;; Idiosyncratic dired commands that don't deal with marks.
@@ -2537,15 +2550,21 @@ FUNCTION should not manipulate files, just read input
  (an argument or confirmation).
 The window is not shown if there is just one file or
  OP-SYMBOL is a member of the list in `dired-no-confirm'.
-FILES is the list of marked files."
+FILES is the list of marked files.  It can also be (t FILENAME)
+in the case of one marked file, to distinguish that from using
+just the current file."
   (or bufname (setq bufname  " *Marked Files*"))
   (if (or (eq dired-no-confirm t)
           (memq op-symbol dired-no-confirm)
+          ;; If FILES defaulted to the current line's file.
           (= (length files) 1))
       (apply function args)
     (with-current-buffer (get-buffer-create bufname)
       (erase-buffer)
-      (dired-format-columns-of-files files)
+      ;; Handle (t FILE) just like (FILE), here.
+      ;; That value is used (only in some cases), to mean
+      ;; just one file that was marked, rather than the current line file.
+      (dired-format-columns-of-files (if (eq (car files) t) (cdr files) files))
       (remove-text-properties (point-min) (point-max)
                               '(mouse-face nil help-echo nil)))
     (save-window-excursion
diff --git a/lisp/dnd.el b/lisp/dnd.el
index 927f2e3bdb6..96c9e18a3f1 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -36,6 +36,7 @@
 ;;; Customizable variables
 
 
+;;;###autoload
 (defcustom dnd-protocol-alist
   '(
     ("^file:///" . dnd-open-local-file) ; XDND format.
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index c41d733aaca..4c13e6fc0e1 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -393,20 +393,20 @@ one optional arguments, diff-number to refine.")
     (ediff-with-current-buffer diff-buffer
       (goto-char (point-min))
       (while (re-search-forward ediff-match-diff-line nil t)
-       (let* ((a-begin (string-to-int (buffer-substring (match-beginning 1)
-                                                        (match-end 1))))
+       (let* ((a-begin (string-to-number (buffer-substring (match-beginning 1)
+                                                           (match-end 1))))
               (a-end  (let ((b (match-beginning 3))
                             (e (match-end 3)))
                         (if b
-                            (string-to-int (buffer-substring b e))
+                            (string-to-number (buffer-substring b e))
                           a-begin)))
               (diff-type (buffer-substring (match-beginning 4) (match-end 4)))
-              (b-begin (string-to-int (buffer-substring (match-beginning 5)
-                                                        (match-end 5))))
+              (b-begin (string-to-number (buffer-substring (match-beginning 5)
+                                                           (match-end 5))))
               (b-end (let ((b (match-beginning 7))
                            (e (match-end 7)))
                        (if b
-                           (string-to-int (buffer-substring b e))
+                           (string-to-number (buffer-substring b e))
                          b-begin)))
               a-begin-pt a-end-pt b-begin-pt b-end-pt
               c-begin c-end c-begin-pt c-end-pt)
@@ -934,16 +934,16 @@ delimiter regions"))
         ;; it is a "c" group
         (if (match-beginning 2)
             ;; it has two numbers
-            (list (string-to-int
+            (list (string-to-number
                    (buffer-substring (match-beginning 1) (match-end 1)))
-                  (1+ (string-to-int
+                  (1+ (string-to-number
                        (buffer-substring (match-beginning 3) (match-end 3)))))
           ;; it has one number
-          (let ((x (string-to-int
+          (let ((x (string-to-number
                     (buffer-substring (match-beginning 1) (match-end 1)))))
             (list x (1+ x))))
       ;; it is an "a" group
-      (let ((x (1+ (string-to-int
+      (let ((x (1+ (string-to-number
                     (buffer-substring (match-beginning 1) (match-end 1))))))
         (list x x)))))
 
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index 09872f3ef2c..a8382a7f081 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -280,7 +280,7 @@ or nil, use a compact 80-column format."
                     (let ((str (buffer-substring (match-beginning 1)
                                                  (match-end 1))))
                       (unless (equal str "")
-                        (setq mac-counter (string-to-int str))))
+                        (setq mac-counter (string-to-number str))))
                     t)
                    ((looking-at "Format:[ \t]*\"\\([^\n]*\\)\"[ \t]*$")
                     (when edmacro-store-hook
@@ -698,7 +698,7 @@ This function assumes that the events can be stored in a string."
             (times 1))
         (setq pos (match-end 0))
         (when (string-match "\\([0-9]+\\)\\*." word)
-          (setq times (string-to-int (substring word 0 (match-end 1))))
+          (setq times (string-to-number (substring word 0 (match-end 1))))
           (setq word (substring word (1+ (match-end 1)))))
         (cond ((string-match "^<<.+>>$" word)
                (setq key (vconcat (if (eq (key-binding [?\M-x])
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index 8eb177dd9ca..6280af2fb72 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -1,6 +1,6 @@
 ;;; authors.el --- utility for maintaining Emacs' AUTHORS file -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 2000, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2003, 2005 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@gnu.org>
 ;; Maintainer: Kim F. Storm <storm@cua.dk>
@@ -597,8 +597,7 @@ buffer *Authors Errors* containing references to unknown files."
     (unless (file-exists-p (expand-file-name "src/emacs.c" root))
       (error "Not the root directory of Emacs: %s" root))
     (dolist (log logs)
-      (when (and (string-match "ChangeLog\\(.[0-9]+\\)?$" log)
-                 (not (string-match "/lispref/" log)))
+      (when (string-match "ChangeLog\\(.[0-9]+\\)?$" log)
         (message "Scanning %s..." log)
         (authors-scan-change-log log table)))
     (let ((els (authors-process-lines "find" root "-name" "*.el")))
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 1472d576e49..7fc01901cfe 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -175,8 +175,9 @@ If you think you need this, you're probably making a mistake somewhere."
 ;;; byte-compile-macro-environment.
 
 (defmacro eval-when-compile (&rest body)
-  "Like `progn', but evaluates the body at compile time.
-The result of the body appears to the compiler as a quoted constant."
+  "Like `progn', but evaluates the body at compile time if you're compiling.
+Thus, the result of the body appears to the compiler as a quoted constant.
+In interpreted code, this is entirely equivalent to `progn'."
   (declare (debug t) (indent 0))
   ;; Not necessary because we have it in b-c-initial-macro-environment
   ;; (list 'quote (eval (cons 'progn body)))
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index a752f9f9b61..f1798d941bf 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -338,8 +338,8 @@ Elements of the list may be be:
 
   free-vars   references to variables not in the current lexical scope.
   unresolved  calls to unknown functions.
-  callargs    lambda calls with args that don't match the definition.
-  redefine    function cell redefined from a macro to a lambda or vice
+  callargs    function calls with args that don't match the definition.
+  redefine    function name redefined from a macro to ordinary function or vice
               versa, or redefined to take a different number of arguments.
   obsolete    obsolete variables and functions.
   noruntime   functions that may not be defined at runtime (typically
@@ -1244,6 +1244,20 @@ extra args."
 (dolist (elt '(format message error))
   (put elt 'byte-compile-format-like t))
 
+;; Warn if a custom definition fails to specify :group.
+(defun byte-compile-nogroup-warn (form)
+  (let ((keyword-args (cdr (cdr (cdr (cdr form)))))
+        (name (cadr form)))
+    (unless (plist-get keyword-args :group)
+      (byte-compile-warn
+       "%s for `%s' fails to specify containing group"
+       (cdr (assq (car form)
+                  '((custom-declare-group . defgroup)
+                    (custom-declare-face . defface)
+                    (custom-declare-variable . defcustom))))
+       (if (and (consp name) (eq (car name) 'quote))
+           (cadr name) name)))))
+
 ;; Warn if the function or macro is being redefined with a different
 ;; number of arguments.
 (defun byte-compile-arglist-warn (form macrop)
@@ -2156,6 +2170,8 @@ list that represents a doc string reference.
 (put 'custom-declare-variable 'byte-hunk-handler
      'byte-compile-file-form-custom-declare-variable)
 (defun byte-compile-file-form-custom-declare-variable (form)
+  (when (memq 'callargs byte-compile-warnings)
+    (byte-compile-nogroup-warn form))
   (when (memq 'free-vars byte-compile-warnings)
     (push (nth 1 (nth 1 form)) byte-compile-bound-variables))
   (let ((tail (nthcdr 4 form)))
@@ -2729,7 +2745,7 @@ If FORM is a lambda or a macro, byte-compile it as a function."
            (when (byte-compile-const-symbol-p fn)
              (byte-compile-warn "`%s' called as a function" fn))
            (and (memq 'interactive-only byte-compile-warnings)
-                (memq (car form) byte-compile-interactive-only-functions)
+                (memq fn byte-compile-interactive-only-functions)
                 (byte-compile-warn "`%s' used from Lisp code\n\
 That command is designed for interactive use only" fn))
            (if (and handler
@@ -2739,8 +2755,10 @@ That command is designed for interactive use only" fn))
                (progn
                  (byte-compile-set-symbol-position fn)
                  (funcall handler form))
-             (if (memq 'callargs byte-compile-warnings)
-                 (byte-compile-callargs-warn form))
+             (when (memq 'callargs byte-compile-warnings)
+               (if (memq fn '(custom-declare-group custom-declare-variable custom-declare-face))
+                   (byte-compile-nogroup-warn form))
+               (byte-compile-callargs-warn form))
              (byte-compile-normal-call form))
            (if (memq 'cl-functions byte-compile-warnings)
                (byte-compile-cl-warn form))))
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index bfd21e27d05..727e45b1289 100644
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -61,7 +61,7 @@ TYPE is a Common Lisp type specifier."
 ;;; Predicates.
 
 (defun equalp (x y)
-  "T if two Lisp objects have similar structures and contents.
+  "Return t if two Lisp objects have similar structures and contents.
 This is like `equal', except that it accepts numerically equal
 numbers of different types (float vs. integer), and also compares
 strings case-insensitively."
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 137366c1c13..8bc195bdae8 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1335,7 +1335,7 @@ Unlike `flet', this macro is fully compliant with the Common Lisp standard.
 ;; The following ought to have a better definition for use with newer
 ;; byte compilers.
 (defmacro macrolet (bindings &rest body)
-  "Make temporary macro defns.
+  "Make temporary macro definitions.
 This is like `flet', but for macros instead of functions.
 
 \(fn ((NAME ARGLIST BODY...) ...) FORM...)"
@@ -1351,7 +1351,7 @@ This is like `flet', but for macros instead of functions.
                                   cl-macro-environment))))))
 
 (defmacro symbol-macrolet (bindings &rest body)
-  "Make symbol macro defns.
+  "Make symbol macro definitions.
 Within the body FORMs, references to the variable NAME will be replaced
 by EXPANSION, and (setq NAME ...) will act like (setf EXPANSION ...).
 
diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el
index 93237f0206f..cb202700a00 100644
--- a/lisp/emacs-lisp/cl-seq.el
+++ b/lisp/emacs-lisp/cl-seq.el
@@ -800,7 +800,7 @@ Keywords supported:  :test :test-not :key"
                   (apply 'nset-difference cl-list2 cl-list1 cl-keys)))))
 
 (defun subsetp (cl-list1 cl-list2 &rest cl-keys)
-  "True if LIST1 is a subset of LIST2.
+  "Return true if LIST1 is a subset of LIST2.
 I.e., if every element of LIST1 also appears in LIST2.
 Keywords supported:  :test :test-not :key"
   (cond ((null cl-list1) t) ((null cl-list2) nil)
@@ -888,7 +888,7 @@ Keywords supported:  :test :test-not :key"
         (setq cl-tree (cdr cl-tree))))))
 
 (defun tree-equal (cl-x cl-y &rest cl-keys)
-  "T if trees X and Y have `eql' leaves.
+  "Return t if trees X and Y have `eql' leaves.
 Atoms are compared by `eql'; cons cells are compared recursively.
 Keywords supported:  :test :test-not :key"
   (cl-parsing-keywords (:test :test-not :key) ()
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index 2f6c799f528..11835629bd7 100644
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -115,7 +115,7 @@ a future Emacs interpreter will be able to use it.")
 ;;; Predicates.
 
 (defun eql (a b)    ; See compiler macro in cl-macs.el
-  "T if the two args are the same Lisp object.
+  "Return t if the two args are the same Lisp object.
 Floating-point numbers of equal value are `eql', but they may not be `eq'."
   (if (numberp a)
       (equal a b)
@@ -301,25 +301,25 @@ definitions to shadow the loaded ones for use in file byte-compilation."
 ;;; Numbers.
 
 (defun floatp-safe (x)
-  "T if OBJECT is a floating point number.
+  "Return t if OBJECT is a floating point number.
 On Emacs versions that lack floating-point support, this function
 always returns nil."
   (and (numberp x) (not (integerp x))))
 
 (defun plusp (x)
-  "T if NUMBER is positive."
+  "Return t if NUMBER is positive."
   (> x 0))
 
 (defun minusp (x)
-  "T if NUMBER is negative."
+  "Return t if NUMBER is negative."
   (< x 0))
 
 (defun oddp (x)
-  "T if INTEGER is odd."
+  "Return t if INTEGER is odd."
   (eq (logand x 1) 1))
 
 (defun evenp (x)
-  "T if INTEGER is even."
+  "Return t if INTEGER is even."
   (eq (logand x 1) 0))
 
 (defvar *random-state* (vector 'cl-random-state-tag -1 30 (cl-random-time)))
@@ -503,7 +503,7 @@ SEQ, this is like `mapcar'.  With several, it is like the Common Lisp
 ;;    x))
 
 (defun list* (arg &rest rest)   ; See compiler macro in cl-macs.el
-  "Return a new list with specified args as elements, cons'd to last arg.
+  "Return a new list with specified args as elements, consed to last arg.
 Thus, `(list* A B C D)' is equivalent to `(nconc (list A B C) D)', or to
 `(cons A (cons B (cons C D)))'."
   (cond ((not rest) arg)
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index d0ceaa96716..0b46912c8fd 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -183,32 +183,36 @@ Uses heuristic: year >= 50 means 19xx, < 50 means 20xx."
   (widen)
   (goto-char (point-min))
   (if (re-search-forward copyright-regexp (+ (point) copyright-limit) t)
-      (let ((s (match-beginning 2)) (e (make-marker))
+      (let ((s (match-beginning 2))
+            (e (copy-marker (1+ (match-end 2))))
+            (p (make-marker))
             last)
-        (set-marker e (1+ (match-end 2)))
         (goto-char s)
-        (while (and (< (point) (marker-position e))
-                    (re-search-forward "\\([^0-9]\\)\\([0-9]+\\)[^0-9]"
-                                       (marker-position e) t))
-          (let ((p (point))
-                (sep (match-string 1))
-                (year (string-to-number (match-string 2))))
-            (goto-char (1+ (match-beginning 0)))
-            (unless (= (char-syntax (string-to-char sep)) ?\s)
+        (while (re-search-forward "[0-9]+" e t)
+          (set-marker p (point))
+          (goto-char (match-beginning 0))
+          (let ((sep (char-before))
+                (year (string-to-number (match-string 0))))
+            (when (and sep
+                       (/= (char-syntax sep) ?\s)
+                       (/= sep ?-))
               (insert " "))
-            (if (< year 100)
-                (insert (if (>= year 50) "19" "20")))
-            (goto-char p)
-            (setq last p)))
+            (when (< year 100)
+              (insert (if (>= year 50) "19" "20"))))
+          (goto-char p)
+          (setq last p))
         (when last
           (goto-char last)
-          (let ((fill-prefix "     "))
-            (fill-region s last))
-          )
+          ;; Don't mess up whitespace after the years.
+          (skip-chars-backward " \t")
+          (save-restriction
+            (narrow-to-region (point-min) (point))
+            (let ((fill-prefix "     "))
+              (fill-region s last))))
         (set-marker e nil)
+        (set-marker p nil)
         (copyright-update nil t))
-    (message "No copyright message")
-    (goto-char (point-min))))
+    (message "No copyright message")))
 
 ;;;###autoload
 (define-skeleton copyright
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index a10b8546d03..c00028ad218 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -158,7 +158,9 @@ Note that if the documentation string had been left out, it would have
 been generated automatically, with a reference to the keymap.
 
 The new mode runs the hook constructed by the function
-`derived-mode-hook-name'."
+`derived-mode-hook-name'.
+
+See Info node `(elisp)Derived Modes' for more details."
   (declare (debug (&define name symbolp sexp [&optional stringp]
                            [&rest keywordp sexp] def-body)))
 
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index a02f7be7d13..0892af1bb35 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -36,7 +36,6 @@
 ;; For each mode, easy-mmode defines the following:
 ;; <mode>      : The minor mode predicate. A buffer-local variable.
 ;; <mode>-map  : The keymap possibly associated to <mode>.
-;; <mode>-hook : The hook run at the end of the toggle function.
 ;;       see `define-minor-mode' documentation
 ;;
 ;; eval
@@ -90,7 +89,7 @@ replacing its case-insensitive matches with the literal string in LIGHTER."
 (defmacro define-minor-mode (mode doc &optional init-value lighter keymap &rest body)
   "Define a new minor mode MODE.
 This function defines the associated control variable MODE, keymap MODE-map,
-toggle command MODE, and hook MODE-hook.
+and toggle command MODE.
 
 DOC is the documentation for the mode toggle command.
 Optional INIT-VALUE is the initial value of the mode's variable.
@@ -103,11 +102,11 @@ The above three arguments can be skipped if keyword arguments are
 used (see below).
 
 BODY contains code that will be executed each time the mode is (dis)activated.
-  It will be executed after any toggling but before running the hooks.
-  Before the actual body code, you can write
-  keyword arguments (alternating keywords and values).
-  These following keyword arguments are supported (other keywords
-  will be passed to `defcustom' if the minor mode is global):
+  It will be executed after any toggling but before running the hook variable
+  `mode-HOOK'.
+  Before the actual body code, you can write keyword arguments (alternating
+  keywords and values).  These following keyword arguments are supported (other
+  keywords will be passed to `defcustom' if the minor mode is global):
 :group GROUP    Custom group name to use in all generated `defcustom' forms.
                 Defaults to MODE without the possible trailing \"-mode\".
                 Don't use this default group name unless you have written a
@@ -241,12 +240,6 @@ With zero or negative ARG turn mode off.
        ;; up-to-here.
        :autoload-end
 
-       ;; The toggle's hook.
-       (defcustom ,hook nil
-         ,(format "Hook run at the end of function `%s'." mode-name)
-         ,@group
-         :type 'hook)
-
        ;; Define the minor-mode keymap.
        ,(unless (symbolp keymap)        ;nil is also a symbol.
           `(defvar ,keymap-sym
@@ -323,8 +316,8 @@ in which `%s' turns it on."
            (with-current-buffer buf
              (if ,global-mode (,turn-on) (when ,mode (,mode -1))))))
 
-       ;; Autoloading easy-mmode-define-global-mode
-       ;; autoloads everything up-to-here.
+       ;; Autoloading define-global-minor-mode autoloads everything
+       ;; up-to-here.
        :autoload-end
 
        ;; List of buffers left to process.
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 78ba1fe27bf..c9f1769ae14 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -65,7 +65,7 @@ It returns the remaining items of the displayed menu.
    :visible INCLUDE
 
 INCLUDE is an expression; this menu is only visible if this
-expression has a non-nil value.  `:include' is an alias for `:visible'.
+expression has a non-nil value.  `:included' is an alias for `:visible'.
 
    :active ENABLE
 
@@ -110,10 +110,10 @@ keyboard equivalent.
 ENABLE is an expression; the item is enabled for selection
 whenever this expression's value is non-nil.
 
-   :included INCLUDE
+   :visible INCLUDE
 
 INCLUDE is an expression; this item is only visible if this
-expression has a non-nil value.
+expression has a non-nil value.  `:included' is an alias for `:visible'.
 
    :suffix FORM
 
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index b23217151e3..bf6b601ef7a 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -141,9 +141,9 @@ truncated to make more of the arglist or documentation string visible."
   "Toggle ElDoc mode on or off.
 In ElDoc mode, the echo area displays information about a
 function or variable in the text where point is.  If point is
-on a documented variable, it displays that variable's doc string.
-Otherwise it displays the argument list of the function called
-in the expression point is on.
+on a documented variable, it displays the first line of that
+variable's doc string.  Otherwise it displays the argument list
+of the function called in the expression point is on.
 
 With prefix ARG, turn ElDoc mode on if and only if ARG is positive."
   :group 'eldoc :lighter eldoc-minor-mode-string
@@ -229,6 +229,7 @@ With prefix ARG, turn ElDoc mode on if and only if ARG is positive."
        (not (eq (selected-window) (minibuffer-window)))))
 
 
+;;;###autoload
 (defvar eldoc-documentation-function nil
   "If non-nil, function to call to return doc string.
 The function of no args should return a one-line string for displaying
diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el
index 410b1d8eaa5..e41de879846 100644
--- a/lisp/emacs-lisp/generic.el
+++ b/lisp/emacs-lisp/generic.el
@@ -117,46 +117,37 @@ instead (which see).")
 ;;;###autoload
 (defmacro define-generic-mode (mode comment-list keyword-list
                                     font-lock-list auto-mode-list
-                                    function-list &optional docstring
-                                    &rest custom-keyword-args)
+                                    function-list &optional docstring)
   "Create a new generic mode MODE.
 
-MODE is the name of the command for the generic mode; don't quote
-it.  The optional DOCSTRING is the documentation for the mode
-command.  If you do not supply it, `define-generic-mode' uses a
-default documentation string instead.
+MODE is the name of the command for the generic mode; don't quote it.
+The optional DOCSTRING is the documentation for the mode command.  If
+you do not supply it, `define-generic-mode' uses a default
+documentation string instead.
 
-COMMENT-LIST is a list in which each element is either a
-character, a string of one or two characters, or a cons cell.  A
-character or a string is set up in the mode's syntax table as a
-\"comment starter\".  If the entry is a cons cell, the `car' is
-set up as a \"comment starter\" and the `cdr' as a \"comment
-ender\".  (Use nil for the latter if you want comments to end at
-the end of the line.)  Note that the syntax table has limitations
-about what comment starters and enders are actually possible.
+COMMENT-LIST is a list in which each element is either a character, a
+string of one or two characters, or a cons cell.  A character or a
+string is set up in the mode's syntax table as a \"comment starter\".
+If the entry is a cons cell, the `car' is set up as a \"comment
+starter\" and the `cdr' as a \"comment ender\".  (Use nil for the
+latter if you want comments to end at the end of the line.)  Note that
+the syntax table has limitations about what comment starters and
+enders are actually possible.
 
 KEYWORD-LIST is a list of keywords to highlight with
 `font-lock-keyword-face'.  Each keyword should be a string.
 
-FONT-LOCK-LIST is a list of additional expressions to highlight.
-Each element of this list should have the same form as an element
-of `font-lock-keywords'.
+FONT-LOCK-LIST is a list of additional expressions to highlight.  Each
+element of this list should have the same form as an element of
+`font-lock-keywords'.
 
 AUTO-MODE-LIST is a list of regular expressions to add to
-`auto-mode-alist'.  These regular expressions are added when
-Emacs runs the macro expansion.
+`auto-mode-alist'.  These regular expressions are added when Emacs
+runs the macro expansion.
 
-FUNCTION-LIST is a list of functions to call to do some
-additional setup.  The mode command calls these functions just
-before it runs the mode hook.
-
-The optional CUSTOM-KEYWORD-ARGS are pairs of keywords and values
-to include in the generated `defcustom' form for the mode hook
-variable `MODE-hook'.  The default value for the `:group' keyword
-is MODE with the final \"-mode\" (if any) removed.  (Don't use
-this default group name unless you have written a `defgroup' to
-define that group properly.)  You can specify keyword arguments
-without specifying a docstring.
+FUNCTION-LIST is a list of functions to call to do some additional
+setup.  The mode command calls these functions just before it runs the
+mode hook `MODE-hook'.
 
 See the file generic-x.el for some examples of `define-generic-mode'."
   (declare (debug (sexp def-form def-form def-form form def-form
@@ -167,22 +158,9 @@ See the file generic-x.el for some examples of `define-generic-mode'."
   (when (eq (car-safe mode) 'quote)
     (setq mode (eval mode)))
 
-  (when (and docstring (not (stringp docstring)))
-    ;; DOCSTRING is not a string so we assume that it's actually the
-    ;; first keyword of CUSTOM-KEYWORD-ARGS.
-    (push docstring custom-keyword-args)
-    (setq docstring nil))
-
   (let* ((name (symbol-name mode))
          (pretty-name (capitalize (replace-regexp-in-string
-                                   "-mode\\'" "" name)))
-         (mode-hook (intern (concat name "-hook"))))
-
-    (unless (plist-get custom-keyword-args :group)
-      (setq custom-keyword-args
-            (plist-put custom-keyword-args
-                       :group `',(intern (replace-regexp-in-string
-                                          "-mode\\'" "" name)))))
+                                   "-mode\\'" "" name))))
 
     `(progn
        ;; Add a new entry.
@@ -192,15 +170,11 @@ See the file generic-x.el for some examples of `define-generic-mode'."
        (dolist (re ,auto-mode-list)
          (add-to-list 'auto-mode-alist (cons re ',mode)))
 
-       (defcustom ,mode-hook nil
-         ,(concat "Hook run when entering " pretty-name " mode.")
-         :type 'hook
-         ,@custom-keyword-args)
-
        (defun ,mode ()
          ,(or docstring
               (concat pretty-name " mode.\n"
-                      "This a generic mode defined with `define-generic-mode'."))
+                      "This a generic mode defined with `define-generic-mode'.\n"
+                      "It runs `" name "-hook' as the last thing it does."))
          (interactive)
          (generic-mode-internal ',mode ,comment-list ,keyword-list
                                 ,font-lock-list ,function-list)))))
diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el
index 701da1c4dec..a385a32935e 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -418,7 +418,7 @@ ISO-DATE non-nil means return the date in ISO 8601 format."
             (format "%s-%s-%s" yyyy mm dd)
           (format "%s %s %s"
                   dd
-                  (nth (string-to-int mm)
+                  (nth (string-to-number mm)
                        '("" "Jan" "Feb" "Mar" "Apr" "May" "Jun"
                          "Jul" "Aug" "Sep" "Oct" "Nov" "Dec"))
                   yyyy))))))
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 8f4245cb9a1..bb815481bf0 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -192,6 +192,9 @@
   ;; Look within the line for a ; following an even number of backslashes
   ;; after either a non-backslash or the line beginning.
   (setq comment-start-skip "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\);+ *")
+  (make-local-variable 'font-lock-comment-start-skip)
+  ;; Font lock mode uses this only when it KNOWS a comment is starting.
+  (setq font-lock-comment-start-skip ";+ *") 
   (make-local-variable 'comment-add)
   (setq comment-add 1)                  ;default to `;;' in comment-region
   (make-local-variable 'comment-column)
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index f9442bc0084..955bc4499bc 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -1,6 +1,7 @@
 ;;; lisp.el --- Lisp editing commands for Emacs
 
-;; Copyright (C) 1985, 86, 1994, 2000, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1994, 2000, 2004, 2005
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: lisp, languages
@@ -487,9 +488,9 @@ If region is active, insert enclosing characters at region boundaries."
 More accurately, check the narrowed part of the buffer for unbalanced
 expressions (\"sexps\") in general.  This is done according to the
 current syntax table and will find unbalanced brackets or quotes as
-appropriate.  (See Info node `(emacs)Lists and Sexps'.)  If imbalance
-is found, an error is signalled and point is left at the first
-unbalanced character."
+appropriate.  (See Info node `(emacs)Parentheses'.)  If imbalance is
+found, an error is signalled and point is left at the first unbalanced
+character."
   (interactive)
   (condition-case data
       ;; Buffer can't have more than (point-max) sexps.
diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index 1c8d12fef0e..a2aed39d00a 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -557,7 +557,7 @@ optional fourth argument FORCE is non-nil."
   (interactive)
 
   (setq reb-subexp-displayed
-        (or subexp (string-to-int (format "%c" last-command-char))))
+        (or subexp (string-to-number (format "%c" last-command-char))))
   (reb-update-modestring)
   (reb-do-update reb-subexp-displayed))
 
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index 23e9a54b1bb..f77b1a00e2c 100644
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -147,7 +147,8 @@ call to one of the `testcover-1value-functions'."
 (defcustom testcover-potentially-1value-functions
   '(add-hook and beep or remove-hook unless when)
   "Functions that are potentially 1-valued.  No brown splotch if actually
-1-valued, no error if actually multi-valued.")
+1-valued, no error if actually multi-valued."
+  :group 'testcover)
 
 (defface testcover-nohits-face
   '((t (:background "DeepPink2")))
diff --git a/lisp/emerge.el b/lisp/emerge.el
index f9821111e71..1f105163f46 100644
--- a/lisp/emerge.el
+++ b/lisp/emerge.el
@@ -657,20 +657,20 @@ This is *not* a user option, since Emerge uses it for its own processing.")
      diff-buffer
      (goto-char (point-min))
      (while (re-search-forward emerge-match-diff-line nil t)
-       (let* ((a-begin (string-to-int (buffer-substring (match-beginning 1)
-                                                        (match-end 1))))
+       (let* ((a-begin (string-to-number (buffer-substring (match-beginning 1)
+                                                           (match-end 1))))
               (a-end  (let ((b (match-beginning 3))
                             (e (match-end 3)))
                         (if b
-                            (string-to-int (buffer-substring b e))
+                            (string-to-number (buffer-substring b e))
                           a-begin)))
               (diff-type (buffer-substring (match-beginning 4) (match-end 4)))
-              (b-begin (string-to-int (buffer-substring (match-beginning 5)
-                                                        (match-end 5))))
+              (b-begin (string-to-number (buffer-substring (match-beginning 5)
+                                                           (match-end 5))))
               (b-end (let ((b (match-beginning 7))
                            (e (match-end 7)))
                        (if b
-                           (string-to-int (buffer-substring b e))
+                           (string-to-number (buffer-substring b e))
                          b-begin))))
          ;; fix the beginning and end numbers, because diff is somewhat
          ;; strange about how it numbers lines
@@ -862,16 +862,16 @@ This is *not* a user option, since Emerge uses it for its own processing.")
         ;; it is a "c" group
         (if (match-beginning 2)
             ;; it has two numbers
-            (list (string-to-int
+            (list (string-to-number
                    (buffer-substring (match-beginning 1) (match-end 1)))
-                  (1+ (string-to-int
+                  (1+ (string-to-number
                        (buffer-substring (match-beginning 3) (match-end 3)))))
           ;; it has one number
-          (let ((x (string-to-int
+          (let ((x (string-to-number
                     (buffer-substring (match-beginning 1) (match-end 1)))))
             (list x (1+ x))))
       ;; it is an "a" group
-      (let ((x (1+ (string-to-int
+      (let ((x (1+ (string-to-number
                     (buffer-substring (match-beginning 1) (match-end 1))))))
         (list x x)))))
 
diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el
index 2ca819c0424..97706fdfab0 100644
--- a/lisp/emulation/crisp.el
+++ b/lisp/emulation/crisp.el
@@ -1,6 +1,6 @@
 ;;; crisp.el --- CRiSP/Brief Emacs emulator
 
-;; Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2005 Free Software Foundation, Inc.
 
 ;; Author: Gary D. Foster <Gary.Foster@Corp.Sun.COM>
 ;; Keywords: emulations brief crisp
@@ -386,10 +386,8 @@ With ARG, turn CRiSP mode on if ARG is positive, off otherwise."
                                        minor-mode-map-alist))))
 
 ;; Interaction with other packages.
-(eval-after-load 'cua
-  '(progn
-     (add-to-list 'cua--standard-movement-commands 'crisp-home)
-     (add-to-list 'cua--standard-movement-commands 'crisp-end)))
+(put 'crisp-home 'CUA 'move)
+(put 'crisp-end  'CUA 'move)
 
 (run-hooks 'crisp-load-hook)
 (provide 'crisp)
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index e9679c66dd3..6ea6bfb7f3d 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1,6 +1,6 @@
 ;;; cua-base.el --- emulate CUA key bindings
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2005
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
@@ -159,13 +159,13 @@
 ;; left edge of a rectangle start in the middle of a TAB character.
 ;; Sounds strange? Try it!
 ;;
-;; To start a rectangle, use [S-return] and extend it using the normal
+;; To start a rectangle, use [C-return] and extend it using the normal
 ;; movement keys (up, down, left, right, home, end, C-home,
 ;; C-end). Once the rectangle has the desired size, you can cut or
 ;; copy it using C-x and C-c (or C-w and M-w), and you can
 ;; subsequently insert it - as a rectangle - using C-v (or C-y).  So
 ;; the only new command you need to know to work with cua-mode
-;; rectangles is S-return!
+;; rectangles is C-return!
 ;;
 ;; Normally, when you paste a rectangle using C-v (C-y), each line of
 ;; the rectangle is inserted into the existing lines in the buffer.
@@ -183,7 +183,7 @@
 ;; entire rectangle overlay (but not the contents) in the given
 ;; direction.
 ;;
-;; [S-return] cancels the rectangle
+;; [C-return] cancels the rectangle
 ;; [C-space] activates the region bounded by the rectangle
 
 ;; If you type a normal (self-inserting) character when the rectangle is
@@ -194,7 +194,7 @@
 ;; bottom of the rectangle.  So, for example, to comment out an entire
 ;; paragraph like this one, just place the cursor on the first character
 ;; of the first line, and enter the following:
-;;     S-return M-} ; ; <space>  S-return
+;;     C-return M-} ; ; <space>  C-return
 
 ;; cua-mode's rectangle support also includes all the normal rectangle
 ;; functions with easy access:
@@ -330,12 +330,12 @@ interpreted as a register number."
   :group 'cua)
 
 (defcustom cua-use-hyper-key nil
-  "*If non-nil, bind rectangle commands to H-? instead of M-?.
-If set to 'also, toggle region command is also on S-return.
+  "*If non-nil, bind rectangle commands to H-... instead of M-....
+If set to 'also, toggle region command is also on C-return.
 Must be set prior to enabling CUA."
-  :type '(choice (const :tag "Meta key and S-return" nil)
+  :type '(choice (const :tag "Meta key and C-return" nil)
                  (const :tag "Hyper key only" only)
-                 (const :tag "Hyper key and S-return" also))
+                 (const :tag "Hyper key and C-return" also))
   :group 'cua)
 
 (defcustom cua-enable-region-auto-help nil
@@ -1235,7 +1235,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
 
 (defun cua--init-keymaps ()
   (unless (eq cua-use-hyper-key 'only)
-    (define-key cua-global-keymap [(shift return)]      'cua-set-rectangle-mark))
+    (define-key cua-global-keymap [(control return)]    'cua-set-rectangle-mark))
   (when cua-use-hyper-key
     (cua--M/H-key cua-global-keymap 'space      'cua-set-rectangle-mark)
     (define-key cua-global-keymap [(hyper mouse-1)] 'cua-mouse-set-rectangle-mark))
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 5c24c2dc36f..932448079dd 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -1,6 +1,6 @@
 ;;; cua-rect.el --- CUA unified rectangle support
 
-;; Copyright (C) 1997-2002, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2002, 2005 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard emulations convenience CUA
@@ -1403,8 +1403,8 @@ With prefix arg, indent to that column."
 
 (defun cua--init-rectangles ()
   (unless (eq cua-use-hyper-key 'only)
-    (define-key cua--rectangle-keymap [(shift return)] 'cua-clear-rectangle-mark)
-    (define-key cua--region-keymap    [(shift return)] 'cua-toggle-rectangle-mark))
+    (define-key cua--rectangle-keymap [(control return)] 'cua-clear-rectangle-mark)
+    (define-key cua--region-keymap    [(control return)] 'cua-toggle-rectangle-mark))
   (when cua-use-hyper-key
     (cua--rect-M/H-key 'space                          'cua-clear-rectangle-mark)
     (cua--M/H-key cua--region-keymap 'space            'cua-toggle-rectangle-mark))
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index ff0298e9a17..01f0af6f307 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -1256,16 +1256,16 @@ Argument BOTTOM is the bottom margin in number of lines or percent of window."
   ;; set top scroll margin
   (or (string= top "")
       (if (string= "%" (substring top -1))
-          (setq edt-top-scroll-margin (string-to-int top))
+          (setq edt-top-scroll-margin (string-to-number top))
         (setq edt-top-scroll-margin
-              (/ (1- (+ (* (string-to-int top) 100) (window-height)))
+              (/ (1- (+ (* (string-to-number top) 100) (window-height)))
                  (window-height)))))
   ;; set bottom scroll margin
   (or (string= bottom "")
       (if (string= "%" (substring bottom -1))
-          (setq edt-bottom-scroll-margin (string-to-int bottom))
+          (setq edt-bottom-scroll-margin (string-to-number bottom))
         (setq edt-bottom-scroll-margin
-              (/ (1- (+ (* (string-to-int bottom) 100) (window-height)))
+              (/ (1- (+ (* (string-to-number bottom) 100) (window-height)))
                  (window-height)))))
   ;; report scroll margin settings if running interactively
   (and (interactive-p)
diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el
index 188e335687c..1221fca5199 100644
--- a/lisp/emulation/pc-select.el
+++ b/lisp/emulation/pc-select.el
@@ -2,7 +2,7 @@
 ;;;                  (or MAC GUI or MS-windoze (bah)) look-and-feel
 ;;;                  including key bindings.
 
-;; Copyright (C) 1995, 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2005 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 f8f608b01d0..ec0eef05321 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -1,6 +1,6 @@
 ;;; tpu-edt.el --- Emacs emulating TPU emulating EDT
 
-;; Copyright (C) 1993, 1994, 1995, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 2000, 2005 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 ced88ff3fdf..9c417dd3a40 100644
--- a/lisp/emulation/tpu-extras.el
+++ b/lisp/emulation/tpu-extras.el
@@ -440,16 +440,16 @@ version that respects the bottom scroll margin."
   ;; set top scroll margin
   (or (string= top "")
       (if (string= "%" (substring top -1))
-          (setq tpu-top-scroll-margin (string-to-int top))
+          (setq tpu-top-scroll-margin (string-to-number top))
         (setq tpu-top-scroll-margin
-              (/ (1- (+ (* (string-to-int top) 100) (window-height)))
+              (/ (1- (+ (* (string-to-number top) 100) (window-height)))
                  (window-height)))))
   ;; set bottom scroll margin
   (or (string= bottom "")
       (if (string= "%" (substring bottom -1))
-          (setq tpu-bottom-scroll-margin (string-to-int bottom))
+          (setq tpu-bottom-scroll-margin (string-to-number bottom))
         (setq tpu-bottom-scroll-margin
-              (/ (1- (+ (* (string-to-int bottom) 100) (window-height)))
+              (/ (1- (+ (* (string-to-number bottom) 100) (window-height)))
                  (window-height)))))
   ;; report scroll margin settings if running interactively
   (and (interactive-p)
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index af878085ba8..19f08d54989 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -2177,7 +2177,7 @@ a token has type \(command, address, end-mark\) and value."
                  (cond ((string= ex-token-type "plus") "add-number")
                        ((string= ex-token-type "minus") "sub-number")
                        (t "abs-number")))
-           (setq ex-token (string-to-int (buffer-substring (point) (mark)))))
+           (setq ex-token (string-to-number (buffer-substring (point) (mark)))))
           ((looking-at "\\$")
            (forward-char 1)
            (setq ex-token-type "end"))
@@ -2471,7 +2471,7 @@ a token has type \(command, address, end-mark\) and value."
         (progn
           (set-mark (point))
           (re-search-forward "[0-9][0-9]*")
-          (setq ex-count (string-to-int (buffer-substring (point) (mark))))
+          (setq ex-count (string-to-number (buffer-substring (point) (mark))))
           (skip-chars-forward " \t")))
     (if (looking-at "[pl#]")
         (progn
@@ -2496,7 +2496,7 @@ a token has type \(command, address, end-mark\) and value."
         (progn
           (set-mark (point))
           (re-search-forward "[0-9][0-9]*")
-          (setq ex-count (string-to-int (buffer-substring (point) (mark))))
+          (setq ex-count (string-to-number (buffer-substring (point) (mark))))
           (skip-chars-forward " \t")))
     (if (looking-at "[pl#]")
         (progn
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 8023336b18b..4593d84c6fc 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -1,6 +1,6 @@
 ;;; viper-cmd.el --- Vi command support for Viper
 
-;; Copyright (C) 1997, 98, 99, 2000, 01, 02 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 98, 99, 2000, 01, 02, 2005 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 90b006ffb65..7e8a5cbeb99 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -1,6 +1,6 @@
 ;;; viper-ex.el --- functions implementing the Ex commands for Viper
 
-;; Copyright (C) 1994, 95, 96, 97, 98, 2000, 01, 02, 04, 05 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 95, 96, 97, 98, 2000, 01, 02, 2005 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
@@ -434,7 +434,7 @@ reversed."
                          ((eq ex-token-type 'minus) 'sub-number)
                          (t 'abs-number)))
              (setq ex-token
-                   (string-to-int (buffer-substring (point) (mark t)))))
+                   (string-to-number (buffer-substring (point) (mark t)))))
             ((looking-at "\\$")
              (forward-char 1)
              (setq ex-token-type 'end))
@@ -912,7 +912,7 @@ reversed."
         (progn
           (set-mark (point))
           (re-search-forward "[0-9][0-9]*")
-          (setq ex-count (string-to-int (buffer-substring (point) (mark t))))
+          (setq ex-count (string-to-number (buffer-substring (point) (mark t))))
           (skip-chars-forward " \t")))
     (if (looking-at "[pl#]")
         (progn
@@ -938,7 +938,7 @@ reversed."
         (progn
           (set-mark (point))
           (re-search-forward "[0-9][0-9]*")
-          (setq ex-count (string-to-int (buffer-substring (point) (mark t))))
+          (setq ex-count (string-to-number (buffer-substring (point) (mark t))))
           (skip-chars-forward " \t")))
     (if (looking-at "[pl#]")
         (progn
@@ -1490,7 +1490,7 @@ reversed."
                 (progn
                   (ex-edit t)
                   (throw 'ex-edit nil))
-              (setq count (string-to-int ex-file))
+              (setq count (string-to-number ex-file))
               (if (= count 0) (setq count 1))
               (if (< count 0) (error "Usage: `next <count>' (count >= 0)"))))
         (setq count 1))
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index e5074b95838..a74ca05b3df 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -1,6 +1,6 @@
 ;;; viper-keym.el --- Viper keymaps
 
-;; Copyright (C) 1994, 95, 96, 97, 2000, 01, 02 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 95, 96, 97, 2000, 01, 02, 2005 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 df0e37e7c25..9fd73efb9b9 100644
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -1,6 +1,6 @@
 ;;; viper-macs.el --- functions implementing keyboard macros for Viper
 
-;; Copyright (C) 1994, 95, 96, 97, 2000, 01, 02 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 95, 96, 97, 2000, 01, 02, 2005 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 527a04084e2..497e4a1e559 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -1,6 +1,6 @@
 ;;; viper-util.el --- Utilities used by viper.el
 
-;; Copyright (C) 1994, 95, 96, 97, 99, 2000, 01, 02 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 95, 96, 97, 99, 2000, 01, 02, 2005 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index be5a8e3467a..e3582f2165a 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -3,7 +3,7 @@
 ;;               and a venomous VI PERil.
 ;;               Viper Is also a Package for Emacs Rebels.
 
-;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 05 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 2005 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Keywords: emulations
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index cbee9fd626e..050c82cc310 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -520,7 +520,8 @@ This is used by `eshell-watch-for-password-prompt'."
   (let ((inhibit-read-only t)
         (no-default (eobp))
         (find-tag-default-function 'ignore))
-    (setq tagname (car (find-tag-interactive "Find tag: ")))
+    (with-no-warnings
+      (setq tagname (car (find-tag-interactive "Find tag: "))))
     (find-tag tagname next-p regexp-p)))
 
 (defun eshell-move-argument (limit func property arg)
@@ -666,7 +667,7 @@ waiting for input."
   (eshell-match-result "alpha\n"))
 
 (defun eshell-send-input (&optional use-region queue-p no-newline)
-  "Send the input received to Eshell for parsing and processing..
+  "Send the input received to Eshell for parsing and processing.
 After `eshell-last-output-end', sends all text from that marker to
 point as input.  Before that marker, calls `eshell-get-old-input' to
 retrieve old input, copies it to the end of the buffer, and sends it.
diff --git a/lisp/faces.el b/lisp/faces.el
index 3b620927d10..f4522c8a155 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1014,7 +1014,7 @@ name of the attribute for prompting.  Value is the new attribute value."
           ((member new-value '("unspecified-fg" "unspecified-bg"))
            new-value)
           (t
-           (string-to-int new-value)))))
+           (string-to-number new-value)))))
 
 
 (defun read-face-attribute (face attribute &optional frame)
@@ -1184,6 +1184,7 @@ arg, prompt for a regular expression."
           (save-excursion
             (save-match-data
               (search-backward face-name)
+              (setq help-xref-stack-item `(list-faces-display ,regexp))
               (help-xref-button 0 'help-customize-face face)))
           (let ((beg (point))
                 (line-beg (line-beginning-position)))
@@ -1258,17 +1259,32 @@ If FRAME is omitted or nil, use the selected frame."
           (insert "Face: " (symbol-name f))
           (if (not (facep f))
               (insert "   undefined face.\n")
-            (let ((customize-label "customize this face"))
+            (let ((customize-label "customize this face")
+                  file-name)
               (princ (concat " (" customize-label ")\n"))
               (insert "Documentation: "
                       (or (face-documentation f)
                           "Not documented as a face.")
-                      "\n\n")
+                      "\n")
               (with-current-buffer standard-output
                 (save-excursion
                   (re-search-backward
                    (concat "\\(" customize-label "\\)") nil t)
                   (help-xref-button 1 'help-customize-face f)))
+              ;; The next 4 sexps are copied from describe-function-1
+              ;; and simplified.
+              (setq file-name (symbol-file f 'defface))
+              (when file-name
+                (princ "Defined in `")
+                (princ file-name)
+                (princ "'")
+                ;; Make a hyperlink to the library.
+                (save-excursion
+                  (re-search-backward "`\\([^`']+\\)'" nil t)
+                  (help-xref-button 1 'help-face-def f file-name))
+                (princ ".")
+                (terpri)
+                (terpri))
               (dolist (a attrs)
                 (let ((attr (face-attribute f (car a) frame)))
                   (insert (make-string (- max-width (length (cdr a))) ?\ )
@@ -2048,7 +2064,7 @@ Note: Other faces cannot inherit from the cursor face."
     (t :inverse-video t))
   "Basic face for highlighting trailing whitespace."
   :version "21.1"
-  :group 'font-lock                     ; like `show-trailing-whitespace'
+  :group 'whitespace            ; like `show-trailing-whitespace'
   :group 'basic-faces)
 
 (defface escape-glyph '((((background dark)) :foreground "cyan")
diff --git a/lisp/files.el b/lisp/files.el
index 99847b2f3fc..d519f041152 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -541,7 +541,7 @@ DIR should be an absolute directory name.  It defaults to
 the value of `default-directory'."
   (unless dir
     (setq dir default-directory))
-  (read-file-name prompt dir (or default-dirname 
+  (read-file-name prompt dir (or default-dirname
                                  (if initial (expand-file-name initial dir)
                                    dir))
                   mustmatch initial
@@ -1728,10 +1728,10 @@ or from Lisp without specifying the optional argument FIND-FILE;
 in that case, this function acts as if `enable-local-variables' were t."
   (interactive)
   (or find-file (funcall (or default-major-mode 'fundamental-mode)))
-  (report-errors "File mode specification error: %s"
-    (set-auto-mode))
-  (report-errors "File local-variables error: %s"
-    (let ((enable-local-variables (or (not find-file) enable-local-variables)))
+  (let ((enable-local-variables (or (not find-file) enable-local-variables)))
+    (report-errors "File mode specification error: %s"
+      (set-auto-mode))
+    (report-errors "File local-variables error: %s"
       (hack-local-variables)))
   (if (fboundp 'ucs-set-table-for-input) ; don't lose when building
       (ucs-set-table-for-input)))
@@ -1762,9 +1762,11 @@ in that case, this function acts as if `enable-local-variables' were t."
      ("\\.ad[abs]\\'" . ada-mode)
      ("\\.ad[bs].dg\\'" . ada-mode)
      ("\\.\\([pP]\\([Llm]\\|erl\\|od\\)\\|al\\)\\'" . perl-mode)
-     ("\\.mk\\'" . makefile-mode)
-     ("\\([Mm]\\|GNUm\\)akep*file\\'" . makefile-mode)
-     ("\\.am\\'" . makefile-mode)       ;For Automake.
+     ("\\.mk\\'" . makefile-gmake-mode) ; Might be any make, give Gnu the host advantage
+     ("[Mm]akefile\\'" . makefile-mode)
+     ("GNUmakefile\\'" . makefile-gmake-mode)
+     ("Makeppfile\\'" . makefile-makepp-mode)
+     ("\\.am\\'" . makefile-automake-mode)
      ;; Less common extensions come here
      ;; so more common ones above are found faster.
      ("\\.texinfo\\'" . texinfo-mode)
@@ -1936,13 +1938,13 @@ and `magic-mode-alist', which determines modes based on file contents.")
      ("more" . text-mode)
      ("less" . text-mode)
      ("pg" . text-mode)
-     ("make" . makefile-mode)           ; Debian uses this
+     ("make" . makefile-gmake-mode)             ; Debian uses this
      ("guile" . scheme-mode)
      ("clisp" . lisp-mode)))
   "Alist mapping interpreter names to major modes.
 This is used for files whose first lines match `auto-mode-interpreter-regexp'.
 Each element looks like (INTERPRETER . MODE).
-The car of each element is compared with
+The car of each element, a regular expression, is compared with
 the name of the interpreter specified in the first line.
 If it matches, mode MODE is selected.
 
@@ -1959,13 +1961,12 @@ from the end of the file name anything that matches one of these regexps.")
 (defvar auto-mode-interpreter-regexp
   "#![ \t]?\\([^ \t\n]*\
 /bin/env[ \t]\\)?\\([^ \t\n]+\\)"
-  "Regular expression matching interpreters, for file mode determination.
+  "Regexp matching interpreters, for file mode determination.
 This regular expression is matched against the first line of a file
-to determine the file's mode in `set-auto-mode' when Emacs can't deduce
-a mode from the file's name.  If it matches, the file is assumed to
-be interpreted by the interpreter matched by the second group of the
-regular expression.  The mode is then determined as the mode associated
-with that interpreter in `interpreter-mode-alist'.")
+to determine the file's mode in `set-auto-mode'.  If it matches, the file
+is assumed to be interpreted by the interpreter matched by the second group
+of the regular expression.  The mode is then determined as the mode
+associated with that interpreter in `interpreter-mode-alist'.")
 
 (defvar magic-mode-alist
   `(;; The < comes before the groups (but the first) to reduce backtracking.
@@ -1992,7 +1993,7 @@ if REGEXP matches the text at the beginning of the buffer,
 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.")
+\"allow `auto-mode-alist' to decide for these files.)")
 
 (defun set-auto-mode (&optional keep-mode-if-same)
   "Select major mode appropriate for current buffer.
@@ -2151,7 +2152,7 @@ Otherwise, return nil; point may be changed."
        (goto-char beg)
        end))))
 
-(defun hack-local-variables-confirm ()
+(defun hack-local-variables-confirm (string)
   (or (eq enable-local-variables t)
       (and enable-local-variables
            (save-window-excursion
@@ -2168,8 +2169,10 @@ Otherwise, return nil; point may be changed."
              (save-excursion
                (beginning-of-line)
                (set-window-start (selected-window) (point)))
-             (y-or-n-p (format "Set local variables as specified in -*- line of %s? "
-                               (file-name-nondirectory buffer-file-name)))))))
+             (y-or-n-p (format string
+                               (if buffer-file-name
+                                   (file-name-nondirectory buffer-file-name)
+                                 (concat "buffer " (buffer-name)))))))))
 
 (defun hack-local-variables-prop-line (&optional mode-only)
   "Set local variables specified in the -*- line.
@@ -2225,7 +2228,8 @@ is specified, returning t if it is specified."
       (if mode-only mode-specified
         (if (and result
                  (or mode-only
-                     (hack-local-variables-confirm)))
+                     (hack-local-variables-confirm
+                      "Set local variables as specified in -*- line of %s? ")))
             (let ((enable-local-eval enable-local-eval))
               (while result
                 (hack-one-local-variable (car (car result)) (cdr (car result)))
@@ -2255,7 +2259,8 @@ is specified, returning t if it is specified."
       (when (let ((case-fold-search t))
               (and (search-forward "Local Variables:" nil t)
                    (or mode-only
-                       (hack-local-variables-confirm))))
+                       (hack-local-variables-confirm
+                        "Set local variables as specified at end of %s? "))))
         (skip-chars-forward " \t")
         (let ((enable-local-eval enable-local-eval)
               ;; suffix is what comes after "local variables:" in its line.
@@ -2476,7 +2481,8 @@ is considered risky."
                       (hack-one-local-variable-eval-safep val))
                  ;; Permit eval if not root and user says ok.
                  (and (not (zerop (user-uid)))
-                      (hack-local-variables-confirm)))
+                      (hack-local-variables-confirm
+                       "Process `eval' or hook local variables in %s? ")))
              (if (eq var 'eval)
                  (save-excursion (eval val))
                (make-local-variable var)
@@ -2982,7 +2988,7 @@ Uses the free variable `backup-extract-version-start', whose value should be
 the index in the name where the version number begins."
   (if (and (string-match "[0-9]+~$" fn backup-extract-version-start)
            (= (match-beginning 0) backup-extract-version-start))
-      (string-to-int (substring fn backup-extract-version-start -1))
+      (string-to-number (substring fn backup-extract-version-start -1))
       0))
 
 ;; I believe there is no need to alter this behavior for VMS;
@@ -4546,7 +4552,7 @@ normally equivalent short `-D' option is just passed on to
               (if (string-match "ls (.*utils) \\([0-9.]*\\)$" version-out)
                   (let* ((version (match-string 1 version-out))
                          (split (split-string version "[.]"))
-                         (numbers (mapcar 'string-to-int split))
+                         (numbers (mapcar 'string-to-number split))
                          (min '(5 2 1))
                          comparison)
                     (while (and (not comparison) (or numbers min))
diff --git a/lisp/finder.el b/lisp/finder.el
index 7a886e5480f..fb327524793 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -182,7 +182,7 @@ no arguments compiles from `load-path'."
 ;;; End:
 ;;; " (file-name-nondirectory generated-finder-keywords-file) " ends here\n")
       (kill-buffer "*finder-scratch*")
-      (eval-current-buffer) ;; So we get the new keyword list immediately
+      (eval-buffer) ;; So we get the new keyword list immediately
       (basic-save-buffer))))
 
 (defun finder-compile-keywords-make-dist ()
diff --git a/lisp/follow.el b/lisp/follow.el
index 61517a68ff1..74dc12f8881 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -394,7 +394,6 @@ Used by `follow-window-size-change'.")
         "Anders Lindgren <andersl@andersl.com>"
         "follow.el"
         '(post-command-hook
-          post-command-idle-hook
           pre-command-hook
           window-size-change-functions
           window-scroll-functions
@@ -683,9 +682,6 @@ Keys specific to Follow mode:
                (set 'scroll-on-clipped-lines nil))
            (force-mode-line-update)
            (add-hook 'post-command-hook 'follow-post-command-hook t)
-           (if (boundp 'post-command-idle-hook)
-               (add-hook 'post-command-idle-hook
-                         'follow-avoid-tail-recenter t))
            (run-hooks 'follow-mode-hook))
 
           ((and (not follow-mode) follow-mode-orig) ; Off
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index aae73bd1e03..5065553121d 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1311,12 +1311,19 @@ START should be at the beginning of a line."
 
 ;;; Syntactic fontification functions.
 
+(defvar font-lock-comment-start-skip nil
+  "If non-nil, Font Lock mode uses this instead of `comment-start-skip'.")
+
+(defvar font-lock-comment-end-skip nil
+  "If non-nil, Font Lock mode uses this instead of `comment-end'.")
+
 (defun font-lock-fontify-syntactically-region (start end &optional loudly ppss)
   "Put proper face on each string and comment between START and END.
 START should be at the beginning of a line."
   (let ((comment-end-regexp
-         (regexp-quote
-          (replace-regexp-in-string "^ *" "" comment-end)))
+         (or font-lock-comment-end-skip
+             (regexp-quote
+              (replace-regexp-in-string "^ *" "" comment-end))))
         state face beg)
     (if loudly (message "Fontifying %s... (syntactically...)" (buffer-name)))
     (goto-char start)
@@ -1334,12 +1341,14 @@ START should be at the beginning of a line."
                                             'syntax-table))
             (when face (put-text-property beg (point) 'face face))
             (when (and (eq face 'font-lock-comment-face)
-                       comment-start-skip)
+                       (or font-lock-comment-start-skip
+                           comment-start-skip))
               ;; Find the comment delimiters
               ;; and use font-lock-comment-delimiter-face for them.
               (save-excursion
                 (goto-char beg)
-                (if (looking-at comment-start-skip)
+                (if (looking-at (or font-lock-comment-start-skip
+                                    comment-start-skip))
                     (put-text-property beg (match-end 0) 'face
                                        font-lock-comment-delimiter-face)))
               (if (looking-back comment-end-regexp (point-at-bol))
@@ -1655,27 +1664,6 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
 
 ;; But now we do it the custom way.  Note that `defface' will not overwrite any
 ;; faces declared above via `custom-declare-face'.
-(defface font-lock-comment-delimiter-face
-  '((((class grayscale) (background light))
-     (:foreground "DimGray" :weight bold :slant italic))
-    (((class grayscale) (background dark))
-     (:foreground "LightGray" :weight bold :slant italic))
-    (((class color) (min-colors 88) (background light))
-     (:foreground "Firebrick"))
-    (((class color) (min-colors 88) (background dark))
-     (:foreground "chocolate1"))
-    (((class color) (min-colors 16) (background light))
-     (:foreground "red"))
-    (((class color) (min-colors 16) (background dark))
-     (:foreground "red1"))
-    (((class color) (min-colors 8) (background light))
-     (:foreground "red"))
-    (((class color) (min-colors 8) (background dark))
-     (:foreground "red1"))
-    (t (:weight bold :slant italic)))
-  "Font Lock mode face used to highlight comment delimiters."
-  :group 'font-lock-highlighting-faces)
-
 (defface font-lock-comment-face
   '((((class grayscale) (background light))
      (:foreground "DimGray" :weight bold :slant italic))
@@ -1697,6 +1685,17 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
   "Font Lock mode face used to highlight comments."
   :group 'font-lock-highlighting-faces)
 
+(defface font-lock-comment-delimiter-face
+  '((default :inherit font-lock-comment-face)
+    (((class grayscale)))
+    (((class color) (min-colors 16)))
+    (((class color) (min-colors 8) (background light))
+     :foreground "red")
+    (((class color) (min-colors 8) (background dark))
+     :foreground "red1"))
+  "Font Lock mode face used to highlight comment delimiters."
+  :group 'font-lock-highlighting-faces)
+
 (defface font-lock-string-face
   '((((class grayscale) (background light)) (:foreground "DimGray" :slant italic))
     (((class grayscale) (background dark)) (:foreground "LightGray" :slant italic))
@@ -1798,13 +1797,8 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
   "Font Lock mode face used to highlight warnings."
   :group 'font-lock-highlighting-faces)
 
-;; Matches font-lock-builtin-face, because that is used for #ifndef and
-;; font-lock-keyword-face, which alas make-mode uses for ifndef
 (defface font-lock-negation-char-face
-  '((((class color) (min-colors 88) (background light)) (:foreground "VioletRed" :weight bold))
-    (((class color) (min-colors 88) (background dark)) (:foreground "MediumOrchid1" :weight bold))
-    (((class color) (min-colors 8)) (:foreground "red" :weight bold))
-    (t (:inverse-video t :weight bold)))
+  '((t nil))
   "Font Lock mode face used to highlight easy to overlook negation."
   :group 'font-lock-highlighting-faces)
 
@@ -1974,109 +1968,112 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
 
 (defconst lisp-font-lock-keywords-1
   (eval-when-compile
-    (list
-     ;;
-     ;; Definitions.
-     (list (concat "(\\(def\\("
-                   ;; Function declarations.
-                   "\\(advice\\|varalias\\|alias\\|generic\\|macro\\*?\\|method\\|"
-                   "setf\\|subst\\*?\\|un\\*?\\|"
-                   "ine-\\(condition\\|\\(?:derived\\|minor\\|generic\\)-mode\\|"
-                   "method-combination\\|setf-expander\\|skeleton\\|widget\\|"
-                   "function\\|\\(compiler\\|modify\\|symbol\\)-macro\\)\\)\\|"
-                   ;; Variable declarations.
-                   "\\(const\\(ant\\)?\\|custom\\|face\\|parameter\\|var\\)\\|"
-                   ;; Structure declarations.
-                   "\\(class\\|group\\|theme\\|package\\|struct\\|type\\)"
-                   "\\)\\)\\>"
-                   ;; Any whitespace and defined object.
-                   "[ \t'\(]*"
-                   "\\(setf[ \t]+\\sw+)\\|\\sw+\\)?")
-           '(1 font-lock-keyword-face)
-           '(9 (cond ((match-beginning 3) font-lock-function-name-face)
-                     ((match-beginning 6) font-lock-variable-name-face)
-                     (t font-lock-type-face))
-               nil t))
-     ;;
-     ;; Emacs Lisp autoload cookies.
-     '("^;;;###\\(autoload\\)" 1 font-lock-warning-face prepend)
-     ))
+    `(;; Definitions.
+      (,(concat "(\\(def\\("
+                ;; Function declarations.
+                "\\(advice\\|varalias\\|alias\\|generic\\|macro\\*?\\|method\\|"
+                "setf\\|subst\\*?\\|un\\*?\\|"
+                "ine-\\(condition\\|\\(?:derived\\|minor\\|generic\\)-mode\\|"
+                "method-combination\\|setf-expander\\|skeleton\\|widget\\|"
+                "function\\|\\(compiler\\|modify\\|symbol\\)-macro\\)\\)\\|"
+                ;; Variable declarations.
+                "\\(const\\(ant\\)?\\|custom\\|face\\|parameter\\|var\\)\\|"
+                ;; Structure declarations.
+                "\\(class\\|group\\|theme\\|package\\|struct\\|type\\)"
+                "\\)\\)\\>"
+                ;; Any whitespace and defined object.
+                "[ \t'\(]*"
+                "\\(setf[ \t]+\\sw+)\\|\\sw+\\)?")
+       (1 font-lock-keyword-face)
+       (9 (cond ((match-beginning 3) font-lock-function-name-face)
+                ((match-beginning 6) font-lock-variable-name-face)
+                (t font-lock-type-face))
+          nil t))
+      ;; Emacs Lisp autoload cookies.
+      ("^;;;###\\(autoload\\)" 1 font-lock-warning-face prepend)
+      ;; Regexp negated char group.
+      ("\\[\\(\\^\\)" 1 font-lock-negation-char-face prepend)))
   "Subdued level highlighting for Lisp modes.")
 
 (defconst lisp-font-lock-keywords-2
   (append lisp-font-lock-keywords-1
    (eval-when-compile
-     (list
-      ;;
-      ;; Control structures.  Emacs Lisp forms.
-      (cons (concat
-             "(" (regexp-opt
-                  '("cond" "if" "while" "let" "let*"
-                    "prog" "progn" "progv" "prog1" "prog2" "prog*"
-                    "inline" "lambda" "save-restriction" "save-excursion"
-                    "save-window-excursion" "save-selected-window"
-                    "save-match-data" "save-current-buffer" "unwind-protect"
-                    "condition-case" "track-mouse"
-                    "eval-after-load" "eval-and-compile" "eval-when-compile"
-                    "eval-when"
-                    "with-category-table"
-                    "with-current-buffer" "with-electric-help"
-                    "with-local-quit" "with-no-warnings"
-                    "with-output-to-string" "with-output-to-temp-buffer"
-                    "with-selected-window" "with-syntax-table"
-                    "with-temp-buffer" "with-temp-file" "with-temp-message"
-                    "with-timeout" "with-timeout-handler") t)
-             "\\>")
-            1)
-      ;;
-      ;; Control structures.  Common Lisp forms.
-      (cons (concat
-             "(" (regexp-opt
-                  '("when" "unless" "case" "ecase" "typecase" "etypecase"
-                    "ccase" "ctypecase" "handler-case" "handler-bind"
-                    "restart-bind" "restart-case" "in-package"
-                    "break" "ignore-errors"
-                    "loop" "do" "do*" "dotimes" "dolist" "the" "locally"
-                    "proclaim" "declaim" "declare" "symbol-macrolet"
-                    "lexical-let" "lexical-let*" "flet" "labels" "compiler-let"
-                    "destructuring-bind" "macrolet" "tagbody" "block" "go"
-                    "multiple-value-bind" "multiple-value-prog1"
-                    "return" "return-from"
-                    "with-accessors" "with-compilation-unit"
-                    "with-condition-restarts" "with-hash-table-iterator"
-                    "with-input-from-string" "with-open-file"
-                    "with-open-stream" "with-output-to-string"
-                    "with-package-iterator" "with-simple-restart"
-                    "with-slots" "with-standard-io-syntax") t)
-             "\\>")
-            1)
-      ;;
-      ;; Exit/Feature symbols as constants.
-      (list (concat "(\\(catch\\|throw\\|featurep\\|provide\\|require\\)\\>"
-                    "[ \t']*\\(\\sw+\\)?")
-            '(1 font-lock-keyword-face)
-            '(2 font-lock-constant-face nil t))
-      ;;
-      ;; Erroneous structures.
-      '("(\\(abort\\|assert\\|warn\\|check-type\\|cerror\\|error\\|signal\\)\\>" 1 font-lock-warning-face)
-      ;;
-      ;; Words inside \\[] tend to be for `substitute-command-keys'.
-      '("\\\\\\\\\\[\\(\\sw+\\)]" 1 font-lock-constant-face prepend)
-      ;;
-      ;; Words inside `' tend to be symbol names.
-      '("`\\(\\sw\\sw+\\)'" 1 font-lock-constant-face prepend)
-      ;;
-      ;; Constant values.
-      '("\\<:\\sw+\\>" 0 font-lock-builtin-face)
-      ;;
-      ;; ELisp and CLisp `&' keywords as types.
-      '("\\&\\sw+\\>" . font-lock-type-face)
-      ;;
+     `(;; Control structures.  Emacs Lisp forms.
+       (,(concat
+          "(" (regexp-opt
+               '("cond" "if" "while" "let" "let*"
+                 "prog" "progn" "progv" "prog1" "prog2" "prog*"
+                 "inline" "lambda" "save-restriction" "save-excursion"
+                 "save-window-excursion" "save-selected-window"
+                 "save-match-data" "save-current-buffer" "unwind-protect"
+                 "condition-case" "track-mouse"
+                 "eval-after-load" "eval-and-compile" "eval-when-compile"
+                 "eval-when"
+                 "with-category-table"
+                 "with-current-buffer" "with-electric-help"
+                 "with-local-quit" "with-no-warnings"
+                 "with-output-to-string" "with-output-to-temp-buffer"
+                 "with-selected-window" "with-syntax-table"
+                 "with-temp-buffer" "with-temp-file" "with-temp-message"
+                 "with-timeout" "with-timeout-handler") t)
+          "\\>")
+          .  1)
+       ;; Control structures.  Common Lisp forms.
+       (,(concat
+          "(" (regexp-opt
+               '("when" "unless" "case" "ecase" "typecase" "etypecase"
+                 "ccase" "ctypecase" "handler-case" "handler-bind"
+                 "restart-bind" "restart-case" "in-package"
+                 "break" "ignore-errors"
+                 "loop" "do" "do*" "dotimes" "dolist" "the" "locally"
+                 "proclaim" "declaim" "declare" "symbol-macrolet"
+                 "lexical-let" "lexical-let*" "flet" "labels" "compiler-let"
+                 "destructuring-bind" "macrolet" "tagbody" "block" "go"
+                 "multiple-value-bind" "multiple-value-prog1"
+                 "return" "return-from"
+                 "with-accessors" "with-compilation-unit"
+                 "with-condition-restarts" "with-hash-table-iterator"
+                 "with-input-from-string" "with-open-file"
+                 "with-open-stream" "with-output-to-string"
+                 "with-package-iterator" "with-simple-restart"
+                 "with-slots" "with-standard-io-syntax") t)
+          "\\>")
+          . 1)
+       ;; Exit/Feature symbols as constants.
+       (,(concat "(\\(catch\\|throw\\|featurep\\|provide\\|require\\)\\>"
+                 "[ \t']*\\(\\sw+\\)?")
+        (1 font-lock-keyword-face)
+        (2 font-lock-constant-face nil t))
+       ;; Erroneous structures.
+       ("(\\(abort\\|assert\\|warn\\|check-type\\|cerror\\|error\\|signal\\)\\>" 1 font-lock-warning-face)
+       ;; Words inside \\[] tend to be for `substitute-command-keys'.
+       ("\\\\\\\\\\[\\(\\sw+\\)]" 1 font-lock-constant-face prepend)
+       ;; Words inside `' tend to be symbol names.
+       ("`\\(\\sw\\sw+\\)'" 1 font-lock-constant-face prepend)
+       ;; Constant values.
+       ("\\<:\\sw+\\>" 0 font-lock-builtin-face)
+       ;; ELisp and CLisp `&' keywords as types.
+       ("\\&\\sw+\\>" . font-lock-type-face)
+       ;; Make regexp grouping constructs bold, so they stand out, but only in strings.
+       ((lambda (bound)
+          (if (re-search-forward "\\([\\][\\]\\)\\([(|)]\\)\\(\\?:\\)?" bound)
+               (let ((face (get-text-property (1- (point)) 'face)))
+                 (if (listp face)
+                     (memq 'font-lock-string-face face)
+                   (eq 'font-lock-string-face face)))))
+        (1 font-lock-comment-face prepend) ; Should we introduce a lowlight face for this?
+                                        ; Ideally that would retain the color, dimmed 50%.
+        (2 'bold prepend)
+        (3 font-lock-type-face prepend t))
+       ;; Underline innermost grouping, so that you can more easily see what belongs together.
+       ;; 2005-05-12: Font-lock can go into an unbreakable endless loop on this -- something's broken.
+       ;;("[\\][\\][(]\\(?:\\?:\\)?\\(\\(?:[^\\\"]+\\|[\\]\\(?:[^\\]\\|[\\][^(]\\)\\)+?\\)[\\][\\][)]"
+         ;;1 'underline prepend)
 ;;;  This is too general -- rms.
 ;;;  A user complained that he has functions whose names start with `do'
 ;;;  and that they get the wrong color.
 ;;;      ;; CL `with-' and `do-' constructs
-;;;      '("(\\(\\(do-\\|with-\\)\\(\\s_\\|\\w\\)*\\)" 1 font-lock-keyword-face)
+;;;      ("(\\(\\(do-\\|with-\\)\\(\\s_\\|\\w\\)*\\)" 1 font-lock-keyword-face)
       )))
   "Gaudy level highlighting for Lisp modes.")
 
diff --git a/lisp/forms.el b/lisp/forms.el
index aa0582c918a..61d2441a9ea 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -63,7 +63,7 @@
 ;; Automatic mode switching is supported if you specify
 ;; "-*- forms -*-" in the first line of the control file.
 ;;
-;; The control file is visited, evaluated using `eval-current-buffer',
+;; The control file is visited, evaluated using `eval-buffer',
 ;; and should set at least the following variables:
 ;;
 ;;      forms-file                              [string]
@@ -519,7 +519,7 @@ Commands:                        Equivalent keys in read-only mode:
                 (yes-or-no-p
                  (concat "Evaluate lisp code in buffer "
                          (buffer-name) " to display forms ")))
-            (eval-current-buffer)
+            (eval-buffer)
           (error "`enable-local-eval' inhibits buffer evaluation"))
 
         ;; Check if the mandatory variables make sense.
diff --git a/lisp/frame.el b/lisp/frame.el
index e7cf62ef708..3693295e819 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1207,7 +1207,7 @@ left untouched.  FRAME nil or omitted means use the selected frame."
 This is done in the face `trailing-whitespace'."
   :tag "Highlight trailing whitespace."
   :type 'boolean
-  :group 'font-lock)
+  :group 'whitespace-faces)
 
 
 
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index 31aa9299fbb..9ba06d42397 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -116,11 +116,6 @@
   :group 'data
   :version "20.3")
 
-(defgroup generic-x-modes nil
-  "Individual modes in the collection of generic modes."
-  :group 'generic-x
-  :version "22.1")
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Default-Generic mode
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -158,7 +153,7 @@ the regexp in `generic-find-file-regexp'.  If the value is nil,
   :type  '(choice (const :tag "Don't check file names" nil) regexp))
 
 ;; This generic mode is always defined
-(define-generic-mode default-generic-mode (list ?#) nil nil nil nil :group 'generic-x-modes)
+(define-generic-mode default-generic-mode (list ?#) nil nil nil nil)
 
 ;; A more general solution would allow us to enter generic-mode for
 ;; *any* comment character, but would require us to synthesize a new
@@ -308,8 +303,7 @@ your changes into effect."
             '((nil "^\\([-A-Za-z0-9_]+\\)" 1)
               ("*Directories*" "^\\s-*<Directory\\s-*\\([^>]+\\)>" 1)
               ("*Locations*"   "^\\s-*<Location\\s-*\\([^>]+\\)>" 1))))))
-  "Generic mode for Apache or HTTPD configuration files."
-  :group 'generic-x-modes))
+  "Generic mode for Apache or HTTPD configuration files."))
 
 (when (memq 'apache-log-generic-mode generic-extras-enable-list)
 
@@ -322,8 +316,7 @@ your changes into effect."
      (2 font-lock-variable-name-face)))
   '("access_log\\'")
   nil
-  "Mode for Apache log files"
-  :group 'generic-x-modes))
+  "Mode for Apache log files"))
 
 ;;; Samba
 (when (memq 'samba-generic-mode generic-extras-enable-list)
@@ -337,8 +330,7 @@ your changes into effect."
      (2 font-lock-type-face)))
   '("smb\\.conf\\'")
   '(generic-bracket-support)
-  "Generic mode for Samba configuration files."
-  :group 'generic-x-modes))
+  "Generic mode for Samba configuration files."))
 
 ;;; Fvwm
 ;; This is pretty basic. Also, modes for other window managers could
@@ -363,8 +355,7 @@ your changes into effect."
   nil
   '("\\.fvwmrc\\'" "\\.fvwm2rc\\'")
   nil
-  "Generic mode for FVWM configuration files."
-  :group 'generic-x-modes))
+  "Generic mode for FVWM configuration files."))
 
 ;;; X Resource
 ;; I'm pretty sure I've seen an actual mode to do this, but I don't
@@ -377,8 +368,7 @@ your changes into effect."
   '(("^\\([^:\n]+:\\)" 1 font-lock-variable-name-face))
   '("\\.Xdefaults\\'" "\\.Xresources\\'" "\\.Xenvironment\\'" "\\.ad\\'")
   nil
-  "Generic mode for X Resource configuration files."
-  :group 'generic-x-modes))
+  "Generic mode for X Resource configuration files."))
 
 ;;; Hosts
 (when (memq 'hosts-generic-mode generic-extras-enable-list)
@@ -389,8 +379,7 @@ your changes into effect."
   '(("\\([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\\)" 1 font-lock-constant-face))
   '("[hH][oO][sS][tT][sS]\\'")
   nil
-  "Generic mode for HOSTS files."
-  :group 'generic-x-modes))
+  "Generic mode for HOSTS files."))
 
 ;;; Windows INF files
 (when (memq 'inf-generic-mode generic-extras-enable-list)
@@ -401,8 +390,7 @@ your changes into effect."
   '(("^\\(\\[.*\\]\\)" 1 font-lock-constant-face))
   '("\\.[iI][nN][fF]\\'")
   '(generic-bracket-support)
-  "Generic mode for MS-Windows INF files."
-  :group 'generic-x-modes))
+  "Generic mode for MS-Windows INF files."))
 
 ;;; Windows INI files
 ;; Should define escape character as well!
@@ -424,8 +412,7 @@ your changes into effect."
               ("*Variables*" "^\\s-*\\([^=]+\\)\\s-*=" 1))))))
   "Generic mode for MS-Windows INI files.
 You can use `ini-generic-mode-find-file-hook' to enter this mode
-automatically for INI files whose names do not end in \".ini\"."
-  :group 'generic-x-modes)
+automatically for INI files whose names do not end in \".ini\".")
 
 (defun ini-generic-mode-find-file-hook ()
   "Hook function to enter Ini-Generic mode automatically for INI files.
@@ -453,8 +440,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     (lambda ()
       (setq imenu-generic-expression
             '((nil "^\\s-*\\(.*\\)\\s-*=" 1))))))
-  "Generic mode for MS-Windows Registry files."
-  :group 'generic-x-modes))
+  "Generic mode for MS-Windows Registry files."))
 
 ;;; DOS/Windows BAT files
 (when (memq 'bat-generic-mode generic-extras-enable-list)
@@ -506,7 +492,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
         "MD"        "md"         "Md"
         "PATH"      "path"       "Path"
         "PAUSE"     "pause"      "Pause"
-        "PROMPT"            "prompt"     "Prompt"
+        "PROMPT"    "prompt"     "Prompt"
         "RD"        "rd"         "Rd"
         "REN"       "ren"        "Ren"
         "SET"       "set"        "Set"
@@ -528,8 +514,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     "\\`[cC][oO][nN][fF][iI][gG]\\."
     "\\`[aA][uU][tT][oO][eE][xX][eE][cC]\\.")
   '(generic-bat-mode-setup-function)
-  "Generic mode for MS-Windows BAT files."
-  :group 'generic-x-modes)
+  "Generic mode for MS-Windows BAT files.")
 
 (defvar bat-generic-mode-syntax-table nil
   "Syntax table in use in `bat-generic-mode' buffers.")
@@ -608,8 +593,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     (lambda ()
       (setq imenu-generic-expression
             '((nil "\\s-/\\([^/]+\\)/[i, \t\n]" 1))))))
-  "Mode for Mailagent rules files."
-  :group 'generic-x-modes))
+  "Mode for Mailagent rules files."))
 
 ;; Solaris/Sys V prototype files
 (when (memq 'prototype-generic-mode generic-extras-enable-list)
@@ -632,8 +616,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
      (2 font-lock-variable-name-face)))
   '("prototype\\'")
   nil
-  "Mode for Sys V prototype files."
-  :group 'generic-x-modes))
+  "Mode for Sys V prototype files."))
 
 ;; Solaris/Sys V pkginfo files
 (when (memq 'pkginfo-generic-mode generic-extras-enable-list)
@@ -646,8 +629,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
      (2 font-lock-variable-name-face)))
   '("pkginfo\\'")
   nil
-  "Mode for Sys V pkginfo files."
-  :group 'generic-x-modes))
+  "Mode for Sys V pkginfo files."))
 
 ;; Javascript mode
 ;; Includes extra keywords from Armando Singer [asinger@MAIL.COLGATE.EDU]
@@ -726,8 +708,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
       (setq imenu-generic-expression
             '((nil "^function\\s-+\\([A-Za-z0-9_]+\\)" 1)
               ("*Variables*" "^var\\s-+\\([A-Za-z0-9_]+\\)" 1))))))
-  "Mode for JavaScript files."
-  :group 'generic-x-modes))
+  "Mode for JavaScript files."))
 
 ;; VRML files
 (when (memq 'vrml-generic-mode generic-extras-enable-list)
@@ -780,8 +761,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
               ("*Definitions*"
                "DEF\\s-+\\([-A-Za-z0-9_]+\\)\\s-+\\([A-Za-z0-9]+\\)\\s-*{"
                1))))))
-  "Generic Mode for VRML files."
-  :group 'generic-x-modes))
+  "Generic Mode for VRML files."))
 
 ;; Java Manifests
 (when (memq 'java-manifest-generic-mode generic-extras-enable-list)
@@ -802,8 +782,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
      (2 font-lock-constant-face)))
   '("[mM][aA][nN][iI][fF][eE][sS][tT]\\.[mM][fF]\\'")
   nil
-  "Mode for Java Manifest files"
-  :group 'generic-x-modes))
+  "Mode for Java Manifest files"))
 
 ;; Java properties files
 (when (memq 'java-properties-generic-mode generic-extras-enable-list)
@@ -835,8 +814,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     (lambda ()
       (setq imenu-generic-expression
             '((nil "^\\([^#! \t\n\r=:]+\\)" 1))))))
-  "Mode for Java properties files."
-  :group 'generic-x-modes))
+  "Mode for Java properties files."))
 
 ;; C shell alias definitions
 (when (memq 'alias-generic-mode generic-extras-enable-list)
@@ -854,8 +832,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     (lambda ()
       (setq imenu-generic-expression
             '((nil "^\\(alias\\|unalias\\)\\s-+\\([-a-zA-Z0-9_]+\\)" 2))))))
-  "Mode for C Shell alias files."
-  :group 'generic-x-modes))
+  "Mode for C Shell alias files."))
 
 ;;; Windows RC files
 ;; Contributed by ACorreir@pervasive-sw.com (Alfred Correira)
@@ -947,8 +924,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
        (2 font-lock-variable-name-face nil t))))
     '("\\.[rR][cC]\\'")
     nil
-    "Generic mode for MS-Windows Resource files."
-    :group 'generic-x-modes))
+    "Generic mode for MS-Windows Resource files."))
 
 ;; InstallShield RUL files
 ;; Contributed by  Alfred.Correira@Pervasive.Com
@@ -1568,8 +1544,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
       font-lock-variable-name-face "[^_]" "[^_]"))) ; is this face the best choice?
   '("\\.[rR][uU][lL]\\'")
   '(generic-rul-mode-setup-function)
-  "Generic mode for InstallShield RUL files."
-  :group 'generic-x-modes)
+  "Generic mode for InstallShield RUL files.")
 
 (define-skeleton rul-if
   "Insert an if statement."
@@ -1619,8 +1594,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
      (2 font-lock-variable-name-face)))
   '("\\.mailrc\\'")
   nil
-  "Mode for mailrc files."
-  :group 'generic-x-modes))
+  "Mode for mailrc files."))
 
 ;; Inetd.conf
 (when (memq 'inetd-conf-generic-mode generic-extras-enable-list)
@@ -1640,8 +1614,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_]+\\)" 1))))))
-  :group 'generic-x-modes))
+            '((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))))
 
 ;; Services
 (when (memq 'etc-services-generic-mode generic-extras-enable-list)
@@ -1659,8 +1632,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_]+\\)" 1))))))
-  :group 'generic-x-modes))
+            '((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))))
 
 ;; Password and Group files
 (when (memq 'etc-passwd-generic-mode generic-extras-enable-list)
@@ -1702,8 +1674,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_]+\\):" 1))))))
-  :group 'generic-x-modes))
+            '((nil "^\\([-A-Za-z0-9_]+\\):" 1))))))))
 
 ;; Fstab
 (when (memq 'etc-fstab-generic-mode generic-extras-enable-list)
@@ -1753,8 +1724,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))))))
-  :group 'generic-x-modes))
+            '((nil "^\\([/-A-Za-z0-9_]+\\)\\s-+" 1))))))))
 
 ;; From Jacques Duthen <jacques.duthen@sncf.fr>
 (when (memq 'show-tabs-generic-mode generic-extras-enable-list)
@@ -1780,7 +1750,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     (((class color))                        (:background "red"))
     (t (:weight bold)))
   "Font Lock mode face used to highlight TABs."
-  :group 'generic-x-modes)
+  :group 'generic-x)
 
 (defface show-tabs-space-face
   '((((class grayscale) (background light)) (:background "DimGray"   :weight bold))
@@ -1789,7 +1759,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     (((class color))                        (:background "yellow"))
     (t (:weight bold)))
   "Font Lock mode face used to highlight spaces."
-  :group 'generic-x-modes)
+  :group 'generic-x)
 
 (define-generic-mode show-tabs-generic-mode
   nil ;; no comment char
@@ -1798,8 +1768,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
   nil ;; no auto-mode-alist
   ;; '(show-tabs-generic-mode-hook-fun)
   nil
-  "Generic mode to show tabs and trailing spaces"
-  :group 'generic-x-modes))
+  "Generic mode to show tabs and trailing spaces"))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; DNS modes
@@ -1822,8 +1791,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
   ;; List of additional automode-alist expressions
   '("/etc/named.boot\\'")
   ;; List of set up functions to call
-  nil
-  :group 'generic-x-modes))
+  nil))
 
 (when (memq 'named-database-generic-mode generic-extras-enable-list)
 
@@ -1838,8 +1806,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
   ;; List of additional auto-mode-alist expressions
   nil
   ;; List of set up functions to call
-  nil
-  :group 'generic-x-modes)
+  nil)
 
 (defvar named-database-time-string "%Y%m%d%H"
   "Timestring for named serial numbers.")
@@ -1861,8 +1828,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
   ;; List of additional auto-mode-alist expressions
   '("/etc/resolv[e]?.conf\\'")
   ;; List of set up functions to call
-  nil
-  :group 'generic-x-modes))
+  nil))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Modes for spice and common electrical engineering circuit netlist formats
@@ -1906,8 +1872,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
    (function
     (lambda()
       (setq font-lock-defaults '(generic-font-lock-keywords nil t)))))
-  "Generic mode for SPICE circuit netlist files."
-  :group 'generic-x-modes))
+  "Generic mode for SPICE circuit netlist files."))
 
 (when (memq 'ibis-generic-mode generic-extras-enable-list)
 
@@ -1918,8 +1883,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     ("\\(\\(_\\|\\w\\)+\\)\\s-*=" 1 font-lock-variable-name-face))
   '("\\.[iI][bB][sS]\\'")
   '(generic-bracket-support)
-  "Generic mode for IBIS circuit netlist files."
-  :group 'generic-x-modes))
+  "Generic mode for IBIS circuit netlist files."))
 
 (when (memq 'astap-generic-mode generic-extras-enable-list)
 
@@ -1956,8 +1920,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
    (function
     (lambda()
       (setq font-lock-defaults '(generic-font-lock-keywords nil t)))))
-  "Generic mode for ASTAP circuit netlist files."
-  :group 'generic-x-modes))
+  "Generic mode for ASTAP circuit netlist files."))
 
 (when (memq 'etc-modules-conf-generic-mode generic-extras-enable-list)
 
@@ -2001,8 +1964,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
   ;; List of additional automode-alist expressions
   '("/etc/modules.conf" "/etc/conf.modules")
   ;; List of set up functions to call
-  nil
-  :group 'generic-x-modes))
+  nil))
 
 (provide 'generic-x)
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9f3a114adbe..14450ee3a14 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,17 @@
+2005-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el: Don't autoload mail-extract-address-components.
+
+        * gnus.el: Use eval-and-compile to autoload message-y-or-n-p.
+
+        * nndb.el: Don't declare the nndb back end two or more times; don't
+        autoload news-reply-mode, news-setup, cancel-timer and telnet.
+
+        * nntp.el: Autoload format-spec instead of format; use
+        eval-and-compile to evaluate autoload forms.
+
+        * spam-report.el (spam-report-process-queue): Use gnus-point-at-eol.
+
 2005-04-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-art.el (article-date-ut): Support converting date in
@@ -345,9 +359,6 @@
 
         * gnus-async.el: Ditto.
 
-        * dgnushack.el: No need to ignore `run-with-idle-timer', XEmacs
-        has this function now.
-
 2005-03-16  Lute Kamstra  <lute@gnu.org>
 
         * message.el (message-make-date): Require parse-time.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 55aaed15d90..b1a51d65edd 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -481,9 +481,6 @@ be fed to `format-time-string'."
   :link '(custom-manual "(gnus)Article Date")
   :group 'gnus-article-washing)
 
-(eval-and-compile
-  (autoload 'mail-extract-address-components "mail-extr"))
-
 (defcustom gnus-save-all-headers t
   "*If non-nil, don't remove any headers before saving."
   :group 'gnus-article-saving
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 3112a07cb2e..98c41de45e5 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 Free Software Foundation, Inc.
+;; 1998, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;      Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -34,7 +34,6 @@
 (require 'wid-edit)
 (require 'mm-util)
 (require 'nnheader)
-(autoload 'message-y-or-n-p "message" nil nil 'macro)
 
 (defgroup gnus nil
   "The coffee-brewing, all singing, all dancing, kitchen sink newsreader."
@@ -3925,6 +3924,9 @@ If NEWSGROUP is nil, return the global kill file name instead."
       (setq valids (cdr valids)))
     outs))
 
+(eval-and-compile
+  (autoload 'message-y-or-n-p "message" nil nil 'macro))
+
 (defun gnus-read-group (prompt &optional default)
   "Prompt the user for a group name.
 Disallow invalid group names."
diff --git a/lisp/gnus/nndb.el b/lisp/gnus/nndb.el
index bd8523f11b2..6aaf57c81e1 100644
--- a/lisp/gnus/nndb.el
+++ b/lisp/gnus/nndb.el
@@ -1,6 +1,7 @@
 ;;; nndb.el --- nndb access for Gnus
 
-;; Copyright (C) 1997, 1998, 2000, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2000, 2003, 2004, 2005
+;;        Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;         Kai Grossjohann <grossjohann@ls6.informatik.uni-dortmund.de>
@@ -50,7 +51,9 @@
 ;;-
 ;; Register nndb with known select methods.
 
-(gnus-declare-backend "nndb" 'mail 'respool 'address 'prompt-address)
+(require 'gnus-start)
+(unless (assoc "nndb" gnus-valid-select-methods)
+  (gnus-declare-backend "nndb" 'mail 'respool 'address 'prompt-address))
 
 ;;; Code:
 
@@ -59,14 +62,6 @@
 (require 'nntp)
 (eval-when-compile (require 'cl))
 
-(eval-and-compile
-  (autoload 'news-setup "rnewspost")
-  (autoload 'news-reply-mode "rnewspost")
-  (autoload 'cancel-timer "timer")
-  (autoload 'telnet "telnet" nil t)
-  (autoload 'telnet-send-input "telnet" nil t)
-  (autoload 'gnus-declare-backend "gnus-start"))
-
 ;; Declare nndb as derived from nntp
 
 (nnoo-declare nndb nntp)
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 8a10600fcb8..ab85ad25931 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1,7 +1,8 @@
 ;;; nntp.el --- nntp access for Gnus
 
 ;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, 1994, 1995, 1996,
-;; 1997, 1998, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+;; 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -1147,9 +1148,10 @@ password contained in '~/.nntp-authinfo'."
 (defun nntp-open-network-stream (buffer)
   (open-network-stream "nntpd" buffer nntp-address nntp-port-number))
 
-(autoload 'format-spec "format")
-(autoload 'format-spec-make "format")
-(autoload 'open-tls-stream "tls")
+(eval-and-compile
+  (autoload 'format-spec "format-spec")
+  (autoload 'format-spec-make "format-spec")
+  (autoload 'open-tls-stream "tls"))
 
 (defun nntp-open-ssl-stream (buffer)
   (let* ((process-connection-type nil)
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index b8283ffaaa8..59119dc5438 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -159,7 +159,7 @@ symbol `ask', query before flushing the queue file."
     (goto-char (point-min))
     (while (and (not (eobp))
                 (re-search-forward
-                 "http://\\([^/]+\\)\\(/.*\\) *$" (point-at-eol) t))
+                 "http://\\([^/]+\\)\\(/.*\\) *$" (gnus-point-at-eol) t))
       (funcall spam-report-url-ping-function (match-string 1) (match-string 2))
       (forward-line 1))
     (if (or (eq keep nil)
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 4bf0a4775a0..c11aaf6da76 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -535,7 +535,9 @@ it is displayed along with the global value."
                 (terpri)
                 (let ((from (point)))
                   (pp val)
-                  (help-xref-on-pp from (point))
+                  ;; Hyperlinks in variable's value are quite frequently
+                  ;; inappropriate e.g C-h v <RET> features <RET>
+                  ;; (help-xref-on-pp from (point))
                   (if (< (point) (+ from 20))
                       (delete-region (1- from) from)))))
             (terpri)
@@ -556,7 +558,8 @@ it is displayed along with the global value."
                     ;; sensible size before prettyprinting.  -- fx
                     (let ((from (point)))
                       (pp val)
-                      (help-xref-on-pp from (point))
+                      ;; See previous comment for this function.
+                      ;; (help-xref-on-pp from (point))
                       (if (< (point) (+ from 20))
                         (delete-region (1- from) from))))))
               (terpri))
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 8b0284089fc..d94f03200dc 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -169,6 +169,18 @@ The format is (FUNCTION ARGS...).")
                      (goto-char (cdr location))))
   'help-echo (purecopy"mouse-2, RET: find variable's definition"))
 
+(define-button-type 'help-face-def
+  :supertype 'help-xref
+  'help-function (lambda (fun file)
+                   (require 'find-func)
+                   ;; Don't use find-function-noselect because it follows
+                   ;; aliases (which fails for built-in functions).
+                   (let ((location
+                          (find-function-search-for-symbol fun 'defface file)))
+                     (pop-to-buffer (car location))
+                     (goto-char (cdr location))))
+  'help-echo (purecopy "mouse-2, RET: find face's definition"))
+
 
 ;;;###autoload
 (defun help-mode ()
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 99bbda91c6c..35674e1d10a 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -874,7 +874,7 @@ Embedded whitespace, dashes, and periods in the string are ignored."
 (defun hexl-insert-decimal-char (arg)
   "Insert a character given by its decimal code ARG times at point."
   (interactive "p")
-  (let ((num (string-to-int (read-string "Decimal Number: "))))
+  (let ((num (string-to-number (read-string "Decimal Number: "))))
     (if (< num 0)
         (error "Decimal number out of range")
       (hexl-insert-multibyte-char num arg))))
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index e2e5d251371..87d9eb707eb 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -1024,7 +1024,9 @@ currently used by buffers."
   (ibuffer-awhen (with-current-buffer buf
                    (or buffer-file-name
                        (and (boundp 'dired-directory)
-                            dired-directory
+                            (if (stringp dired-directory)
+                                dired-directory
+                              (car dired-directory))
                             (expand-file-name dired-directory))))
     (string-match qualifier it)))
 
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index f2ebb5db324..213160b6f37 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -1688,7 +1688,9 @@ If point is on a group name, this function operates on that group."
     (abbreviate-file-name
      (or buffer-file-name
          (and (boundp 'dired-directory)
-              dired-directory)
+              (if (stringp dired-directory)
+                  dired-directory
+                (car dired-directory))) 
          ""))))
 
 (define-ibuffer-column filename-and-process
diff --git a/lisp/ido.el b/lisp/ido.el
index 519d57cbb88..24b8ba34b75 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1392,10 +1392,15 @@ This function also adds a hook to the minibuffer."
     (define-key map [left] 'ido-prev-match)
     (define-key map "?" 'ido-completion-help)
 
+    ;; Magic commands.
+    (define-key map "\C-b" 'ido-magic-backward-char)
+    (define-key map "\C-f" 'ido-magic-forward-char)
+    (define-key map "\C-d" 'ido-magic-delete-char)
+
     (when (memq ido-cur-item '(file dir))
-      (define-key map "\C-b" (or ido-context-switch-command 'ido-enter-switch-buffer))
-      (define-key map "\C-d" (or (and ido-context-switch-command 'ignore) 'ido-enter-dired))
-      (define-key map "\C-f" 'ido-fallback-command)
+      (define-key map "\C-x\C-b" (or ido-context-switch-command 'ido-enter-switch-buffer))
+      (define-key map "\C-x\C-f" 'ido-fallback-command)
+      (define-key map "\C-x\C-d" (or (and ido-context-switch-command 'ignore) 'ido-enter-dired))
       (define-key map [down] 'ido-next-match-dir)
       (define-key map [up]   'ido-prev-match-dir)
       (define-key map [(meta up)] 'ido-prev-work-directory)
@@ -1405,7 +1410,7 @@ This function also adds a hook to the minibuffer."
       (define-key map [(meta backspace)] 'ido-delete-backward-word-updir)
       (define-key map [(control backspace)] 'ido-up-directory)
       (define-key map "\C-l" 'ido-reread-directory)
-      (define-key map [(meta ?d)] 'ido-wide-find-dir)
+      (define-key map [(meta ?d)] 'ido-wide-find-dir-or-delete-dir)
       (define-key map [(meta ?b)] 'ido-push-dir)
       (define-key map [(meta ?f)] 'ido-wide-find-file-or-pop-dir)
       (define-key map [(meta ?k)] 'ido-forget-work-directory)
@@ -1426,8 +1431,8 @@ This function also adds a hook to the minibuffer."
       )
 
     (when (eq ido-cur-item 'buffer)
-      (define-key map "\C-f" (or ido-context-switch-command 'ido-enter-find-file))
-      (define-key map "\C-b" 'ido-fallback-command)
+      (define-key map "\C-x\C-f" (or ido-context-switch-command 'ido-enter-find-file))
+      (define-key map "\C-x\C-b" 'ido-fallback-command)
       (define-key map "\C-k" 'ido-kill-buffer-at-head)
       )
 
@@ -2258,6 +2263,62 @@ If no merge has yet taken place, toggle automatic merging option."
    ((not ido-use-merged-list)
     (ido-merge-work-directories))))
 
+;;; Magic C-f
+
+(defun ido-magic-forward-char ()
+  "Move forward in user input or perform magic action.
+If no user input is present or at end of input, perform magic actions:
+C-x C-b ... C-f  switch to ido-find-file.
+C-x C-f ... C-f  fallback to non-ido find-file.
+C-x C-d ... C-f  fallback to non-ido brief dired.
+C-x d ... C-f    fallback to non-ido dired."
+  (interactive)
+  (cond
+   ((not (eobp))
+    (forward-char 1))
+   ((memq ido-cur-item '(file dir))
+    (ido-fallback-command))
+   (ido-context-switch-command
+    (call-interactively ido-context-switch-command))
+   ((eq ido-cur-item 'buffer)
+    (ido-enter-find-file))))
+
+;;; Magic C-b
+
+(defun ido-magic-backward-char ()
+  "Move backward in user input or perform magic action.
+If no user input is present, or at start of input, perform magic actions:
+C-x C-f C-b  switch to ido-switch-buffer.
+C-x C-d C-b  switch to ido-switch-buffer.
+C-x d C-b    switch to ido-switch-buffer.
+C-x C-b C-b  fallback to non-ido switch-to-buffer."
+  (interactive)
+  (cond
+   ((> (point) (minibuffer-prompt-end))
+    (forward-char -1))
+   ((eq ido-cur-item 'buffer)
+    (ido-fallback-command))
+   (ido-context-switch-command
+    (call-interactively ido-context-switch-command))
+   (t
+    (ido-enter-switch-buffer))))
+
+;;; Magic C-d
+
+(defun ido-magic-delete-char ()
+  "Delete following char in user input or perform magic action.
+If at end of user input, perform magic actions:
+C-x C-f ... C-d  enter dired on current directory."
+  (interactive)
+  (cond
+   ((not (eobp))
+    (delete-char 1))
+   (ido-context-switch-command
+    nil)
+   ((memq ido-cur-item '(file dir))
+    (ido-enter-dired))))
+
+
 ;;; TOGGLE FUNCTIONS
 
 (defun ido-toggle-case ()
@@ -2505,6 +2566,14 @@ If no buffer or file exactly matching the prompt exists, maybe create a new one.
     (setq ido-rotate-temp t)
     (exit-minibuffer)))
 
+(defun ido-wide-find-dir-or-delete-dir (&optional dir)
+  "Prompt for DIR to search for using find, starting from current directory.
+If input stack is non-empty, delete current directory component."
+  (interactive)
+  (if ido-input-stack
+      (ido-delete-backward-word-updir 1)
+    (ido-wide-find-dir)))
+
 (defun ido-push-dir ()
   "Move to previous directory in file name, push current input on stack."
   (interactive)
@@ -4077,6 +4146,7 @@ For details of keybindings, do `\\[describe-function] ido-find-file'."
 ;;; Helper functions for other programs
 
 (put 'dired-do-rename 'ido 'ignore)
+(put 'ibuffer-find-file 'ido 'find-file)
 
 ;;;###autoload
 (defun ido-read-buffer (prompt &optional default require-match)
@@ -4111,7 +4181,8 @@ See `read-file-name' for additional parameters."
            (not (memq this-command ido-read-file-name-non-ido))
            (or (null predicate) (eq predicate 'file-exists-p)))
       (let* (ido-saved-vc-hb
-             (ido-context-switch-command 'ignore)
+             (ido-context-switch-command
+              (if (eq (get this-command 'ido) 'find-file) nil 'ignore))
              (vc-handled-backends (and (boundp 'vc-handled-backends) vc-handled-backends))
              (ido-current-directory (ido-expand-directory dir))
              (ido-directory-nonreadable (not (file-readable-p ido-current-directory)))
@@ -4126,6 +4197,8 @@ See `read-file-name' for additional parameters."
         (cond
          ((eq ido-exit 'fallback)
           (setq filename 'fallback))
+         ((eq ido-exit 'dired)
+          (setq filename ido-current-directory))
          (filename
           (setq filename
                 (concat ido-current-directory filename))))))
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 831550bd7a3..92e00282ea0 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -119,7 +119,8 @@ If t, always use a popup menu,
 If `on-mouse' use a popup menu when `imenu' was invoked with the mouse."
   :type '(choice (const :tag "On Mouse" on-mouse)
                  (const :tag "Never" nil)
-                 (other :tag "Always" t)))
+                 (other :tag "Always" t))
+  :group 'imenu)
 
 (defcustom imenu-eager-completion-buffer
   (not (eq imenu-always-use-completion-buffer-p 'never))
diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el
index bb717ec32ae..c445d7d40e1 100644
--- a/lisp/international/ccl.el
+++ b/lisp/international/ccl.el
@@ -1,8 +1,9 @@
 ;;; ccl.el --- CCL (Code Conversion Language) compiler
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
-;; Copyright (C) 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2001, 2002  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998, 1999, 2000
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: CCL, mule, multilingual, character set, coding-system
 
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index a8eeb2e4859..1bab1bcff33 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -1,8 +1,10 @@
 ;;; characters.el --- set syntax and category for multibyte characters
 
-;; Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
-;; Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/international/codepage.el b/lisp/international/codepage.el
index b9c819b7524..7571ccf986f 100644
--- a/lisp/international/codepage.el
+++ b/lisp/international/codepage.el
@@ -1,6 +1,9 @@
 ;;; codepage.el --- MS-DOS/MS-Windows specific coding systems
 
-;; Copyright (C) 1998, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 2000
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Author: Eli Zaretskii
 ;; Maintainer: FSF
diff --git a/lisp/international/encoded-kb.el b/lisp/international/encoded-kb.el
index f016f1b9038..2354e658282 100644
--- a/lisp/international/encoded-kb.el
+++ b/lisp/international/encoded-kb.el
@@ -1,8 +1,9 @@
 ;;; encoded-kb.el --- handler to input multibyte characters encoded somehow
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
-;; Copyright (C) 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1997  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2004, 2005
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 2831db2b026..ee8e08c3956 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -1,8 +1,9 @@
 ;;; fontset.el --- commands for handling fontset
 
-;; Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/international/isearch-x.el b/lisp/international/isearch-x.el
index aad6b6e745e..31691268c9c 100644
--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@@ -1,8 +1,9 @@
 ;;; isearch-x.el --- extended isearch handling commands
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998, 2000
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: multilingual, isearch
 
diff --git a/lisp/international/iso-ascii.el b/lisp/international/iso-ascii.el
index 3bffb1795f0..0dbb4e4093a 100644
--- a/lisp/international/iso-ascii.el
+++ b/lisp/international/iso-ascii.el
@@ -1,6 +1,6 @@
 ;;; iso-ascii.el --- set up char tables for ISO 8859/1 on ASCII terminals
 
-;; Copyright (C) 1987, 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 1995, 1998, 2003  Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
diff --git a/lisp/international/iso-cvt.el b/lisp/international/iso-cvt.el
index 232fe5037ee..f7e325b0ca3 100644
--- a/lisp/international/iso-cvt.el
+++ b/lisp/international/iso-cvt.el
@@ -1,8 +1,8 @@
 ;;; iso-cvt.el --- translate ISO 8859-1 from/to various encodings -*- coding: iso-latin-1 -*-
 ;; This file was formerly called gm-lingo.el.
 
-;; Copyright (C) 1993, 1994, 1995, 1996, 1998, 2000, 2003, 2004
-;;           Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2003, 2004
+;;   Free Software Foundation, Inc.
 
 ;; Author: Michael Gschwind <mike@vlsivie.tuwien.ac.at>
 ;; Keywords: tex, iso, latin, i18n
diff --git a/lisp/international/iso-transl.el b/lisp/international/iso-transl.el
index a071b14b3d2..e0aa17b4916 100644
--- a/lisp/international/iso-transl.el
+++ b/lisp/international/iso-transl.el
@@ -1,6 +1,7 @@
 ;;; iso-transl.el --- keyboard input definitions for ISO 8859-1  -*- coding: iso-8859-1 -*-
 
-;; Copyright (C) 1987, 1993, 1994, 1995, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001
+;;   Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el
index 682a2a8f2b5..f145c602ffe 100644
--- a/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.el
@@ -1,7 +1,8 @@
 ;;; ja-dic-cnv.el --- convert a Japanese dictionary (SKK-JISYO.L) to Emacs Lisp
 
-;; Copyright (C) 1995, 2000 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 1995, 2000
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: mule, multilingual, Japanese
 
diff --git a/lisp/international/ja-dic-utl.el b/lisp/international/ja-dic-utl.el
index 07d9e1ff760..ba00977832a 100644
--- a/lisp/international/ja-dic-utl.el
+++ b/lisp/international/ja-dic-utl.el
@@ -1,7 +1,8 @@
 ;;; ja-dic-utl.el --- utilities for handling Japanese dictionary (SKK-JISYO.L)
 
-;; Copyright (C) 1995, 2000 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 1995, 2000
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: mule, multilingual, Japanese
 
diff --git a/lisp/international/kinsoku.el b/lisp/international/kinsoku.el
index 28d6409d46b..76ec5ded397 100644
--- a/lisp/international/kinsoku.el
+++ b/lisp/international/kinsoku.el
@@ -1,7 +1,9 @@
 ;;; kinsoku.el --- `Kinsoku' processing funcs -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 1997, 2003  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: mule, kinsoku
 
diff --git a/lisp/international/kkc.el b/lisp/international/kkc.el
index 972bbbfdddf..be8d242c63e 100644
--- a/lisp/international/kkc.el
+++ b/lisp/international/kkc.el
@@ -1,7 +1,9 @@
 ;;; kkc.el --- Kana Kanji converter    -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 1997, 1998  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998, 2000, 2001, 2003
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: mule, multilingual, Japanese
 
diff --git a/lisp/international/latexenc.el b/lisp/international/latexenc.el
index 39acbb33dfd..88da8ffed79 100644
--- a/lisp/international/latexenc.el
+++ b/lisp/international/latexenc.el
@@ -173,6 +173,7 @@ coding system names is determined from `latex-inputenc-coding-alist'."
               'undecided))))
     'undecided))
 
+
 (provide 'latexenc)
 
 ;; arch-tag: f971bc3e-1fec-4609-8f2f-73dd41ab22e1
diff --git a/lisp/international/latin1-disp.el b/lisp/international/latin1-disp.el
index 86f5bf7a726..12b0c22b7ab 100644
--- a/lisp/international/latin1-disp.el
+++ b/lisp/international/latin1-disp.el
@@ -1,6 +1,6 @@
 ;;; latin1-disp.el --- display tables for other ISO 8859 on Latin-1 terminals -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2003  Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 8a2c8da2665..daab87259a3 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1,8 +1,10 @@
 ;;; mule-cmds.el --- commands for mulitilingual environment -*-coding: iso-2022-7bit -*-
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
-;; Copyright (C) 1995, 2003 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 79bf4f3432a..0fb5d93af65 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -1,8 +1,10 @@
 ;;; mule-conf.el --- configure multilingual environment
 
-;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
-;; Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2005
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index a4423a67181..c79eb158695 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -1,8 +1,10 @@
 ;;; mule-diag.el --- show diagnosis of multilingual environment (Mule)
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
-;; Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1999, 2000, 2001, 2002, 2003
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el
index b85d98a1787..236a34b84ab 100644
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -1,8 +1,10 @@
 ;;; mule-util.el --- utility functions for mulitilingual environment (mule)
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
-;; Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998, 1999, 2004
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index cc7f41706d9..a583498e8b2 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1,8 +1,10 @@
 ;;; mule.el --- basic commands for multilingual environment
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
-;; Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/international/ogonek.el b/lisp/international/ogonek.el
index ebe2eaec900..112bc22cfc6 100644
--- a/lisp/international/ogonek.el
+++ b/lisp/international/ogonek.el
@@ -1,6 +1,6 @@
 ;;; ogonek.el --- change the encoding of Polish diacritics
 
-;; Copyright (C) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2001  Free Software Foundation, Inc.
 
 ;; Author: W{\l}odek Bzyl, Ryszard Kubiak
 ;; Maintainer: rysiek@ipipan.gda.pl (Ryszard Kubiak)
@@ -166,7 +166,7 @@ znak/ow diakrytycznych. Funkcje te mo/zna pogrupowa/c nast/epuj/aco.
   (set-buffer  (get-buffer-create " *ogonek-jak*"))
   (insert ogonek-informacja)
   (switch-to-buffer " *ogonek-jak*")
-  (beginning-of-buffer))
+  (goto-char (point-min)))
 
 ;; ------ A Little Info in English --------
 
@@ -264,7 +264,7 @@ The functions come in the following groups.
   (set-buffer  (get-buffer-create " *ogonek-how*"))
   (insert ogonek-information)
   (switch-to-buffer " *ogonek-how*")
-  (beginning-of-buffer))
+  (goto-char (point-min)))
 
 ;; ---- Variables keeping the suggested answers to dialogue questions -----
 (defvar ogonek-encoding-choices
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 7594923a7e9..01ec42109de 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -1,9 +1,7 @@
 ;;; quail.el --- provides simple input method for multilingual text
 
-;; Copyright (C) 1995, 2000 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
-;; Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-;; Copyright (C) 2005
+;; Copyright (C) 1997, 1998, 2000, 2001, 2002  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2003, 2004
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/swedish.el b/lisp/international/swedish.el
index b13a5e685b9..bf9fce5de65 100644
--- a/lisp/international/swedish.el
+++ b/lisp/international/swedish.el
@@ -1,6 +1,6 @@
 ;;; swedish.el --- miscellaneous functions for dealing with Swedish
 
-;; Copyright (C) 1988 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 2001  Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index e5772fdec00..46262938c68 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -1,7 +1,9 @@
 ;;; titdic-cnv.el --- convert cxterm dictionary (TIT format) to Quail package -*- coding:iso-2022-7bit; -*-
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
+;; Copyright (C) 1997, 1998, 2000, 2001  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 100eb6076db..b34e26f74d4 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -137,8 +137,9 @@ The value of this variable is used when JIT Lock mode is turned on."
 
 (defcustom jit-lock-context-time 0.5
   "Idle time after which text is contextually refontified, if applicable."
-  :type '(number :tag "seconds"))
-  
+  :type '(number :tag "seconds")
+  :group 'jit-lock)
+
 (defcustom jit-lock-defer-time nil ;; 0.25
   "Idle time after which deferred fontification should take place.
 If nil, fontification is not deferred."
diff --git a/lisp/language/china-util.el b/lisp/language/china-util.el
index d97ec4108bf..84f46c4bf2c 100644
--- a/lisp/language/china-util.el
+++ b/lisp/language/china-util.el
@@ -1,8 +1,10 @@
 ;;; china-util.el --- utilities for Chinese  -*- coding: iso-2022-7bit -*-
 
-;; Copyright (C) 1995, 2003 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
-;; Copyright (C) 1995, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001, 2003
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 2003
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index 93721b59afa..05b2405dc42 100644
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -1,7 +1,9 @@
 ;;; chinese.el --- support for Chinese -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
+;; Copyright (C) 2001, 2003  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el
index 1a5c435328d..eb19ca1aaa2 100644
--- a/lisp/language/cyril-util.el
+++ b/lisp/language/cyril-util.el
@@ -1,6 +1,6 @@
 ;;; cyril-util.el --- utilities for Cyrillic scripts
 
-;; Copyright (C) 1997, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2001, 2002  Free Software Foundation, Inc.
 
 ;; Keywords: mule, multilingual, Cyrillic
 
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index b158f626d51..c3a0bceb688 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -1,8 +1,9 @@
 ;;; cyrillic.el --- support for Cyrillic -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
-;; Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/language/devan-util.el b/lisp/language/devan-util.el
index 64dbf576af3..ba40b32db8f 100644
--- a/lisp/language/devan-util.el
+++ b/lisp/language/devan-util.el
@@ -1,6 +1,10 @@
 ;;; devan-util.el --- Support for composing Devanagari characters -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Maintainer:  KAWABATA, Taichi <kawabata@m17n.org>
 ;; Keywords: multilingual, Devanagari
diff --git a/lisp/language/devanagari.el b/lisp/language/devanagari.el
index 6b1ff46a0af..086368c15a0 100644
--- a/lisp/language/devanagari.el
+++ b/lisp/language/devanagari.el
@@ -1,6 +1,6 @@
 ;;; devanagari.el --- Support for Devanagari -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 1996, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 2001  Free Software Foundation, Inc.
 
 ;; Maintainer:  KAWABATA, Taichi <kawabata@m17n.org>
 ;; Keywords: multilingual, Indian, Devanagari
diff --git a/lisp/language/english.el b/lisp/language/english.el
index 6d135197460..db496ad7600 100644
--- a/lisp/language/english.el
+++ b/lisp/language/english.el
@@ -1,7 +1,9 @@
 ;;; english.el --- support for English -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
+;; Copyright (C) 1997  Free Software Foundation, Inc.
+;; Copyright (C) 1997
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index fb920e8f4e8..31248f1bcf3 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -1,7 +1,10 @@
 ;;; ethio-util.el --- utilities for Ethiopic    -*- coding: utf-8-emacs; -*-
 
-;; Copyright (C) 1997, 2001 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
+;; Copyright (C) 1997, 1998, 2002
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2001, 2004, 2005
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2005
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number: H15PRO 110
diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el
index 609a87191b6..e526f02291d 100644
--- a/lisp/language/ethiopic.el
+++ b/lisp/language/ethiopic.el
@@ -1,7 +1,9 @@
 ;;; ethiopic.el --- support for Ethiopic        -*- coding: utf-8-emacs; -*-
 
-;; Copyright (C) 1995, 2001 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
+;; Copyright (C) 1997  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2005
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number: H15PRO 110
diff --git a/lisp/language/european.el b/lisp/language/european.el
index 164d51c9aad..b497abfd599 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -1,8 +1,10 @@
 ;;; european.el --- support for European languages -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1995, 1997, 2001 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
-;; Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/language/greek.el b/lisp/language/greek.el
index e3625b4c7c2..27dc26f2cfc 100644
--- a/lisp/language/greek.el
+++ b/lisp/language/greek.el
@@ -1,8 +1,9 @@
 ;;; greek.el --- support for Greek -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
 ;; Copyright (C) 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1995
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el
index bc59d23b3ee..fcd9f56153d 100644
--- a/lisp/language/hebrew.el
+++ b/lisp/language/hebrew.el
@@ -1,8 +1,9 @@
 ;;; hebrew.el --- support for Hebrew -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
-;; Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+;; Copyright (C) 1995
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index e868718bfda..1307243e074 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -1,6 +1,9 @@
 ;;; indian.el --- Indian languages support -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2001  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Maintainer:  KAWABATA, Taichi <kawabata@m17n.org>
 ;; Keywords:    multilingual, i18n, Indian
diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index e9a80fc99a7..81a40a9c450 100644
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -1,8 +1,9 @@
 ;;; japan-util.el --- utilities for Japanese -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
-;; Copyright (C) 2001 Free SOftware Foundation, Inc.
+;; Copyright (C) 2001  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998, 2000, 2003
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: mule, multilingual, Japanese
 
diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index 1c48228d2db..b882cd5e62b 100644
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -1,7 +1,9 @@
 ;;; japanese.el --- support for Japanese -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
+;; Copyright (C) 1997  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/language/korea-util.el b/lisp/language/korea-util.el
index 222832022ac..de940f5317f 100644
--- a/lisp/language/korea-util.el
+++ b/lisp/language/korea-util.el
@@ -1,6 +1,9 @@
 ;;; korea-util.el --- utilities for Korean
 
-;; Copyright (C) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: mule, multilingual, Korean
 
diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index 8624264185d..1657de90f4c 100644
--- a/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@ -1,7 +1,9 @@
 ;;; korean.el --- support for Korean -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
+;; Copyright (C) 1998  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el
index ad0253648ea..9141c34f3df 100644
--- a/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.el
@@ -1,8 +1,9 @@
 ;;; lao-util.el --- utilities for Lao -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2001  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/language/lao.el b/lisp/language/lao.el
index ec5c07342e4..f400bb50931 100644
--- a/lisp/language/lao.el
+++ b/lisp/language/lao.el
@@ -1,8 +1,9 @@
 ;;; lao.el --- support for Lao -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2001  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2002
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el
index 537267ce9ba..47993e16ea5 100644
--- a/lisp/language/misc-lang.el
+++ b/lisp/language/misc-lang.el
@@ -1,7 +1,8 @@
 ;;; misc-lang.el --- support for miscellaneous languages (characters) -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 1995, 1997
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: multilingual, character set, coding system
 
diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el
index ec53d121f02..ce83add4b6f 100644
--- a/lisp/language/tibet-util.el
+++ b/lisp/language/tibet-util.el
@@ -1,7 +1,9 @@
 ;;; tibet-util.el --- utilities for Tibetan   -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 1997, 2002  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998, 2000
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: multilingual, Tibetan
 
diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index 4b580f4a81c..9ed777585db 100644
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@ -1,7 +1,9 @@
 ;;; tibetan.el --- support for Tibetan language -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
+;; Copyright (C) 1997, 2002  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2000
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/language/viet-util.el b/lisp/language/viet-util.el
index c2f1218a536..c854238b6a4 100644
--- a/lisp/language/viet-util.el
+++ b/lisp/language/viet-util.el
@@ -1,7 +1,9 @@
 ;;; viet-util.el --- utilities for Vietnamese  -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
+;; Copyright (C) 1998  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el
index a5360d781f5..9f7196c5adb 100644
--- a/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@ -1,8 +1,9 @@
 ;;; vietnamese.el --- support for Vietnamese -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;;   Licensed to the Free Software Foundation.
-;; Copyright (C) 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2002  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998, 2000
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 3d1b1951421..7c7265ac8c9 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -1835,7 +1835,7 @@ the counts."
               (setq blobbet (file-name-nondirectory blobby))
               (if (string-match "^[0-9][0-9][0-9]-" blobbet)
                   (let ((water-mark))
-                    (setq water-mark (string-to-int (substring blobbet 0 3)))
+                    (setq water-mark (string-to-number (substring blobbet 0 3)))
                     (if (> water-mark high-water) (setq high-water water-mark))))
               (setq q-cnt (1+ q-cnt)))
              (t (setq q-oth (1+ q-oth)))
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index b520841db3d..88f166707c3 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -449,7 +449,7 @@ PATTERN is the string we want to complete."
               (add-to-list 'mail-local-names
                            (cons (match-string 1)
                                  (user-full-name
-                                  (string-to-int (match-string 2))))))
+                                  (string-to-number (match-string 2))))))
           (beginning-of-line 2))
         (kill-buffer (current-buffer))))
   (if (or (eq mail-names t)
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 1feaf94317f..858eeff40bf 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1990,7 +1990,7 @@ is non-nil if the user has supplied the password interactively.
                                               header-end t)
                               (let ((beg (point))
                                     (eol (progn (end-of-line) (point))))
-                                (string-to-int (buffer-substring beg eol)))))))
+                                (string-to-number (buffer-substring beg eol)))))))
                  (and size
                       (if (and (natnump size)
                                (<= (+ header-end size) (point-max))
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index a49b47453d8..f551239907d 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -375,17 +375,17 @@ Setting this variable has an effect only before reading a mail."
               (cond ((re-search-forward "\\([^0-9:]\\)\\([0-3]?[0-9]\\)\\([- \t_]+\\)\\([adfjmnos][aceopu][bcglnprtvy]\\)"
                       (save-excursion (end-of-line) (point)) t)
                      (format "%2d-%3s"
-                             (string-to-int (buffer-substring
-                                             (match-beginning 2)
-                                             (match-end 2)))
+                             (string-to-number (buffer-substring
+                                                (match-beginning 2)
+                                                (match-end 2)))
                              (buffer-substring
                               (match-beginning 4) (match-end 4))))
                     ((re-search-forward "\\([^a-z]\\)\\([adfjmnos][acepou][bcglnprtvy]\\)\\([-a-z \t_]*\\)\\([0-9][0-9]?\\)"
                       (save-excursion (end-of-line) (point)) t)
                      (format "%2d-%3s"
-                             (string-to-int (buffer-substring
-                                             (match-beginning 4)
-                                             (match-end 4)))
+                             (string-to-number (buffer-substring
+                                                (match-beginning 4)
+                                                (match-end 4)))
                              (buffer-substring
                               (match-beginning 2) (match-end 2))))
                     ((re-search-forward "\\(19\\|20\\)\\([0-9][0-9]\\)-\\([01][0-9]\\)-\\([0-3][0-9]\\)"
@@ -580,7 +580,7 @@ If N is negative, go backwards."
             ;; Advance thru summary.
             (forward-line (if forward 1 -1))
             ;; Get msg number of this line.
-            (setq i (string-to-int
+            (setq i (string-to-number
                      (buffer-substring (point)
                                        (min (point-max) (+ 6 (point))))))
             ;; See if that msg has desired subject.
@@ -791,10 +791,10 @@ Search, the `unseen' attribute is restored.")
           (forward-line -1))
       (beginning-of-line)
       (skip-chars-forward " ")
-      (let ((msg-num (string-to-int (buffer-substring
-                                     (point)
-                                     (progn (skip-chars-forward "0-9")
-                                            (point))))))
+      (let ((msg-num (string-to-number (buffer-substring
+                                        (point)
+                                        (progn (skip-chars-forward "0-9")
+                                               (point))))))
         ;; Always leave `unseen' removed
         ;; if we get out of isearch mode.
         ;; Don't let a subsequent isearch restore that `unseen'.
@@ -1061,7 +1061,7 @@ If SKIP-RMAIL, don't do anything to the Rmail buffer."
          (buf rmail-buffer)
          (cur (point))
          message-not-found
-         (curmsg (string-to-int
+         (curmsg (string-to-number
                   (buffer-substring (point)
                                     (min (point-max) (+ 6 (point))))))
          (total (save-excursion (set-buffer buf) rmail-total-messages)))
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 605af6cdbe7..3cf17f8968d 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -822,7 +822,7 @@ This is relative to `smtpmail-queue-dir'.")
                   nil
                 (setq response-continue nil)
                 (setq return-value
-                      (cons (string-to-int
+                      (cons (string-to-number
                              (buffer-substring begin end))
                             (nreverse response-strings)))))
 
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index 6b769f53801..d9a9d78d0b9 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -153,6 +153,7 @@ a variable whose value is a citation frame."
                                             (choice (repeat (repeat sexp))
                                                     symbol)))))
   :group 'supercite-frames)
+(put 'sc-cite-frame-alist 'risky-local-variable t)
 
 (defcustom sc-uncite-frame-alist '()
   "*Alist for frame selection during unciting.
@@ -161,6 +162,7 @@ See the variable `sc-cite-frame-alist' for details."
                                             (choice (repeat (repeat sexp))
                                                     symbol)))))
   :group 'supercite-frames)
+(put 'sc-uncite-frame-alist 'risky-local-variable t)
 
 (defcustom sc-recite-frame-alist '()
   "*Alist for frame selection during reciting.
@@ -169,6 +171,7 @@ See the variable `sc-cite-frame-alist' for details."
                                             (choice (repeat (repeat sexp))
                                                     symbol)))))
   :group 'supercite-frames)
+(put 'sc-recite-frame-alist 'risky-local-variable t)
 
 (defcustom sc-default-cite-frame
   '(;; initialize fill state and temporary variables when entering
@@ -214,6 +217,7 @@ See the variable `sc-cite-frame-alist' for details."
   "*Default REGI frame for citing a region."
   :type '(repeat (repeat sexp))
   :group 'supercite-frames)
+(put 'sc-default-cite-frame 'risky-local-variable t)
 
 (defcustom sc-default-uncite-frame
   '(;; do nothing on a blank line
@@ -224,6 +228,7 @@ See the variable `sc-cite-frame-alist' for details."
   "*Default REGI frame for unciting a region."
   :type '(repeat (repeat sexp))
   :group 'supercite-frames)
+(put 'sc-default-uncite-frame 'risky-local-variable t)
 
 (defcustom sc-default-recite-frame
   '(;; initialize fill state when entering frame
@@ -240,6 +245,7 @@ See the variable `sc-cite-frame-alist' for details."
   "*Default REGI frame for reciting a region."
   :type '(repeat (repeat sexp))
   :group 'supercite-frames)
+(put 'sc-default-recite-frame 'risky-local-variable t)
 
 (defcustom sc-cite-region-limit t
   "*This variable controls automatic citation of yanked text.
@@ -427,6 +433,7 @@ to be consulted during attribution selection."
                                      (choice (sexp :tag "List to eval")
                                              string)))))
   :group 'supercite-attr)
+(put 'sc-attrib-selection-list 'risky-local-variable t)
 
 (defcustom sc-attribs-preselect-hook nil
   "*Hook to run before selecting an attribution."
@@ -482,6 +489,7 @@ this list is chosen for automatic reference header insertions.
 Electric reference mode will cycle through this list of functions."
   :type '(repeat sexp)
   :group 'supercite)
+(put 'sc-rewrite-header-list 'risky-local-variable t)
 
 (defcustom sc-titlecue-regexp "\\s +-+\\s +"
   "*Regular expression describing the separator between names and titles.
diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el
index 16383304503..e4921b047df 100644
--- a/lisp/mh-e/mh-acros.el
+++ b/lisp/mh-e/mh-acros.el
@@ -1,6 +1,6 @@
 ;;; mh-acros.el --- Macros used in MH-E
 
-;; Copyright (C) 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2005 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index 1356e2c8b95..7f2cd2f5266 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -1,7 +1,6 @@
 ;;; mh-alias.el --- MH-E mail alias completion and expansion
 ;;
-;; Copyright (C) 1994, 95, 96, 1997,
-;;  2001, 02, 03, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2005 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index cde52c65043..4f7e413d464 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -1,7 +1,6 @@
 ;;; mh-comp.el --- MH-E functions for composing messages
 
-;; Copyright (C) 1993, 95, 1997,
-;;  2000, 01, 02, 03, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 95, 1997, 2000, 2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-customize.el b/lisp/mh-e/mh-customize.el
index c9a4b11702d..c5689afc13e 100644
--- a/lisp/mh-e/mh-customize.el
+++ b/lisp/mh-e/mh-customize.el
@@ -1,6 +1,6 @@
 ;;; mh-customize.el --- MH-E customization
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index c2322624507..b5eea79ae1e 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -1,7 +1,7 @@
 ;;; mh-e.el --- GNU Emacs interface to the MH mail system
 
 ;; Copyright (C) 1985, 86, 87, 88, 90, 92, 93, 94, 95, 97, 1999,
-;;  2000, 01, 02, 03, 2004, 2005 Free Software Foundation, Inc.
+;;  2000, 2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index ef745f4c06f..a632efc7856 100644
--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@@ -1,6 +1,6 @@
 ;;; mh-funcs.el --- MH-E functions not everyone will use right away
 
-;; Copyright (C) 1993, 1995, 2001, 02, 03, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el
index b850c8fdc43..e4b4a5b0d54 100644
--- a/lisp/mh-e/mh-gnus.el
+++ b/lisp/mh-e/mh-gnus.el
@@ -1,6 +1,6 @@
 ;;; mh-gnus.el --- Make MH-E compatible with installed version of Gnus.
 
-;; Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2005 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el
index 4bb5f90cf18..7b44dae1d06 100644
--- a/lisp/mh-e/mh-identity.el
+++ b/lisp/mh-e/mh-identity.el
@@ -1,6 +1,6 @@
 ;;; mh-identity.el --- Multiple identify support for MH-E.
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-inc.el b/lisp/mh-e/mh-inc.el
index 682b8aa7c53..95341fa75f7 100644
--- a/lisp/mh-e/mh-inc.el
+++ b/lisp/mh-e/mh-inc.el
@@ -1,6 +1,6 @@
 ;;; mh-inc.el --- MH-E `inc' and separate mail spool handling
 ;;
-;; Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2005 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-index.el b/lisp/mh-e/mh-index.el
index 91eed420e2e..cde630236b0 100644
--- a/lisp/mh-e/mh-index.el
+++ b/lisp/mh-e/mh-index.el
@@ -1,6 +1,6 @@
 ;;; mh-index  --  MH-E interface to indexing programs
 
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2005 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-init.el b/lisp/mh-e/mh-init.el
index a975b882128..b97e9fcde65 100644
--- a/lisp/mh-e/mh-init.el
+++ b/lisp/mh-e/mh-init.el
@@ -1,6 +1,6 @@
 ;;; mh-init.el --- MH-E initialization.
 
-;; Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2005 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el
index 095a8c3c3fd..29005d47aa6 100644
--- a/lisp/mh-e/mh-junk.el
+++ b/lisp/mh-e/mh-junk.el
@@ -1,6 +1,6 @@
 ;;; mh-junk.el --- Interface to anti-spam measures
 
-;; Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2005 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>,
 ;;         Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-loaddefs.el b/lisp/mh-e/mh-loaddefs.el
index fd989ffa3b9..4abe3b208ef 100644
--- a/lisp/mh-e/mh-loaddefs.el
+++ b/lisp/mh-e/mh-loaddefs.el
@@ -1,6 +1,6 @@
 ;;; mh-loaddefs.el --- automatically extracted autoloads
 ;;
-;;; Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+;;; Copyright (C) 2005 Free Software Foundation, Inc.
 ;;; Author: Bill Wohler <wohler@newt.com>
 ;;; Keywords: mail
 ;;; Commentary:
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index bc870134779..d286069ba4b 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -1,7 +1,6 @@
 ;;; mh-mime.el --- MH-E support for composing MIME messages
 
-;; Copyright (C) 1993, 1995, 2001, 02, 03, 2004, 2005
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-pick.el b/lisp/mh-e/mh-pick.el
index b92a98f26cc..7b0ae4bafdf 100644
--- a/lisp/mh-e/mh-pick.el
+++ b/lisp/mh-e/mh-pick.el
@@ -1,6 +1,6 @@
 ;;; mh-pick.el --- make a search pattern and search for a message in MH-E
 
-;; Copyright (C) 1993, 1995, 2001, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-print.el b/lisp/mh-e/mh-print.el
index 7539e455919..9a7df0b8fd4 100644
--- a/lisp/mh-e/mh-print.el
+++ b/lisp/mh-e/mh-print.el
@@ -1,6 +1,6 @@
 ;;; mh-print.el --- MH-E printing support
 
-;; Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2005 Free Software Foundation, Inc.
 
 ;; Author: Jeffrey C Honig <jch@honig.net>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el
index 8d2369ed19a..d09e9805682 100644
--- a/lisp/mh-e/mh-seq.el
+++ b/lisp/mh-e/mh-seq.el
@@ -1,6 +1,6 @@
 ;;; mh-seq.el --- MH-E sequences support
 
-;; Copyright (C) 1993, 1995, 2001, 02, 03, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-speed.el b/lisp/mh-e/mh-speed.el
index 2617a941de1..a20e6e0a410 100644
--- a/lisp/mh-e/mh-speed.el
+++ b/lisp/mh-e/mh-speed.el
@@ -1,6 +1,6 @@
 ;;; mh-speed.el --- Speedbar interface for MH-E.
 
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2005 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index a57567a7bd3..a7ba9311403 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -1,7 +1,6 @@
 ;;; mh-utils.el --- MH-E code needed for both sending and reading
 
-;; Copyright (C) 1993, 95, 1997,
-;;  2000, 01, 02, 03, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 95, 1997, 2000, 01, 2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 8b4ed89e7b0..7fd07ebccfb 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1,6 +1,6 @@
 ;;; ange-ftp.el --- transparent FTP support for GNU Emacs
 
-;; Copyright (C) 1989,90,91,92,93,94,95,96,98, 2000, 2001
+;; Copyright (C) 1989,90,91,92,93,94,95,96,98, 2000, 2001, 2005
 ;;  Free Software Foundation, Inc.
 
 ;; Author: Andy Norman (ange@hplb.hpl.hp.com)
@@ -1646,7 +1646,7 @@ good, skip, fatal, or unknown."
                     ;; if we gave an empty password to the USER command earlier
                     ;; then we should send a null password now.
                     (if (string-match "Password: *$" ange-ftp-process-string)
-                        (send-string proc "\n"))))
+                        (process-send-string proc "\n"))))
               (while (and ange-ftp-process-busy
                           (string-match "\n" ange-ftp-process-string))
                 (let ((line (substring ange-ftp-process-string
@@ -1741,18 +1741,18 @@ good, skip, fatal, or unknown."
     ;; Replace STR by the result of the comint processing.
     (setq str (buffer-substring comint-last-output-start (process-mark proc))))
   (cond ((string-match "login: *$" str)
-         (send-string proc
-                      (concat
-                       (let ((ange-ftp-default-user t))
-                         (ange-ftp-get-user ange-ftp-gateway-host))
-                       "\n")))
+         (process-send-string proc
+                              (concat
+                               (let ((ange-ftp-default-user t))
+                                 (ange-ftp-get-user ange-ftp-gateway-host))
+                               "\n")))
         ((string-match "Password: *$" str)
-         (send-string proc
-                      (concat
-                       (ange-ftp-get-passwd ange-ftp-gateway-host
-                                            (ange-ftp-get-user
-                                             ange-ftp-gateway-host))
-                       "\n")))
+         (process-send-string proc
+                              (concat
+                               (ange-ftp-get-passwd ange-ftp-gateway-host
+                                                    (ange-ftp-get-user
+                                                     ange-ftp-gateway-host))
+                               "\n")))
         ((string-match ange-ftp-gateway-fatal-msgs str)
          (delete-process proc)
          (setq ange-ftp-gwp-running nil))
@@ -1835,7 +1835,7 @@ been queued with no result.  CONT will still be called, however."
               (insert (substring cmd 0 (match-end 0)) " Turtle Power!\n")
             (insert cmd)))
         (move-marker comint-last-input-end (point))
-        (send-string proc cmd)
+        (process-send-string proc cmd)
         (set-marker (process-mark proc) (point))
         (if nowait
             nil
@@ -2109,7 +2109,7 @@ suffix of the form #PORT to specify a non-default port"
                (line (cdr status)))
           (save-match-data
             (if (string-match ange-ftp-hash-mark-msgs line)
-                (let ((size (string-to-int (match-string 1 line))))
+                (let ((size (string-to-number (match-string 1 line))))
                   (setq ange-ftp-ascii-hash-mark-size size
                         ange-ftp-hash-mark-unit (ash size -4))
 
@@ -5082,7 +5082,7 @@ Other orders of $ and _ seem to all work just fine.")
                      (and (string-match regexp name)
                           (setq version
                                 (max version
-                                     (string-to-int (match-string 1 name))))))
+                                     (string-to-number (match-string 1 name))))))
                    files)
                   (setq version (1+ version))
                   (puthash
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 9b5708d6503..5cd8701d1a5 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -1,6 +1,6 @@
 ;;; browse-url.el --- pass a URL to a WWW browser
 
-;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 2001, 2004, 2005
+;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 2001, 2005
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Denis Howe <dbh@doc.ic.ac.uk>
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 2e6b1625146..b279715329f 100644
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -1,6 +1,6 @@
 ;;; eudc.el --- Emacs Unified Directory Client
 
-;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2005 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index b0409df2b7c..2917fab0a7b 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -1,6 +1,6 @@
 ;;; ldap.el --- client interface to LDAP for Emacs
 
-;; Copyright (C) 1998, 1999, 2000, 2002, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2005  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 4a54702643a..c1c88dfc323 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -1,6 +1,6 @@
 ;;; net-utils.el --- network functions
 
-;; Copyright (C) 1998, 1999, 2000, 2001  Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2005  Free Software Foundation, Inc.
 
 ;; Author:  Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Sun Mar 16 1997
@@ -468,7 +468,8 @@ If your system's ping continues until interrupted, you can try setting
       (require 'ffap)
       (read-from-minibuffer
        "Lookup host: "
-       (or (ffap-string-at-point 'machine) "")))))
+       (with-no-warnings
+         (or (ffap-string-at-point 'machine) ""))))))
   (net-utils-run-program
    "Dig"
    (concat "** "
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 40a1e4bfad3..ebf4dcd3618 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -1,6 +1,6 @@
 ;;; quickurl.el --- insert an URL based on text at point in buffer
 
-;; Copyright (C) 1999,2000,2001 Free Software Foundation, Inc.
+;; Copyright (C) 1999,2000,2001,2005 Free Software Foundation, Inc.
 
 ;; Author: Dave Pearson <davep@davep.org>
 ;; Maintainer: Dave Pearson <davep@davep.org>
diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el
index 67521ca2e73..3ad66166ece 100644
--- a/lisp/net/rlogin.el
+++ b/lisp/net/rlogin.el
@@ -1,6 +1,6 @@
 ;;; rlogin.el --- remote login interface
 
-;; Copyright (C) 1992, 93, 94, 95, 97, 1998, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 93, 94, 95, 97, 1998, 2002, 2005 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 9cbeee545b5..73fef1452a0 100644
--- a/lisp/net/snmp-mode.el
+++ b/lisp/net/snmp-mode.el
@@ -1,6 +1,6 @@
 ;;; snmp-mode.el --- SNMP & SNMPv2 MIB major mode
 
-;; Copyright (C) 1995, 1998, 2002  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998, 2002, 2005  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 40a28494774..94a7b325d0e 100644
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -1,6 +1,6 @@
 ;;; telnet.el --- run a telnet session from within an Emacs buffer
 
-;; Copyright (C) 1985, 88, 1992, 94, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 1985, 88, 1992, 94, 2005  Free Software Foundation, Inc.
 
 ;; Author: William F. Schelter
 ;; Maintainer: FSF
@@ -91,19 +91,19 @@ rejecting one login and prompting again for a username and password.")
 (defun telnet-interrupt-subjob ()
   "Interrupt the program running through telnet on the remote host."
   (interactive)
-  (send-string nil telnet-interrupt-string))
+  (process-send-string nil telnet-interrupt-string))
 
 (defun telnet-c-z ()
   (interactive)
-  (send-string nil "\C-z"))
+  (process-send-string nil "\C-z"))
 
 (defun send-process-next-char ()
   (interactive)
-  (send-string nil
-               (char-to-string
-                (let ((inhibit-quit t))
-                  (prog1 (read-char)
-                    (setq quit-flag nil))))))
+  (process-send-string nil
+                       (char-to-string
+                        (let ((inhibit-quit t))
+                          (prog1 (read-char)
+                            (setq quit-flag nil))))))
 
 ; initialization on first load.
 (if telnet-mode-map
@@ -141,8 +141,8 @@ rejecting one login and prompting again for a username and password.")
             ((string-match "passw" string)
              (telnet-filter proc string)
              (setq telnet-count 0)
-             (send-string proc (concat (comint-read-noecho "Password: " t)
-                                       telnet-new-line))
+             (process-send-string proc (concat (comint-read-noecho "Password: " t)
+                                               telnet-new-line))
              (clear-this-command-keys))
             (t (telnet-check-software-type-initialize string)
                (telnet-filter proc string)
@@ -231,9 +231,9 @@ Normally input is edited in Emacs and sent a line at a time."
       ;; Don't send the `open' cmd till telnet is ready for it.
       (accept-process-output process)
       (erase-buffer)
-      (send-string process (concat "open " host
-                                   (if port " " "") (or port "")
-                                   "\n"))
+      (process-send-string process (concat "open " host
+                                           (if port " " "") (or port "")
+                                           "\n"))
       (telnet-mode)
       (setq comint-input-sender 'telnet-simple-send)
       (setq telnet-count telnet-initial-count))))
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index fd747387100..2de9362ca07 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -1,6 +1,6 @@
 ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
 
-;; Copyright (C) 1996-1999, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2003, 2005 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: comm, tls, gnutls, ssl
diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el
index 3be891a49f8..496ee926d51 100644
--- a/lisp/net/tramp-ftp.el
+++ b/lisp/net/tramp-ftp.el
@@ -1,6 +1,6 @@
 ;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP and EFS -*- coding: iso-8859-1; -*-
 
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2005 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <Michael.Albinus@alcatel.de>
 ;; Keywords: comm, processes
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index ebdbc354ec4..c93bdfb8e61 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, 2005 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
@@ -954,7 +954,7 @@ Domain names in USER and port numbers in HOST are acknowledged."
       (when port   (setq args (append args (list "-p" port))))
 
       ; OK, let's go
-      (tramp-pre-connection nil tramp-smb-method user host)
+      (tramp-pre-connection nil tramp-smb-method user host tramp-chunksize)
       (tramp-message 7 "Opening connection for //%s@%s/%s..."
                      user host (or share ""))
 
diff --git a/lisp/net/tramp-util.el b/lisp/net/tramp-util.el
index 1621c2c818e..eff8130b996 100644
--- a/lisp/net/tramp-util.el
+++ b/lisp/net/tramp-util.el
@@ -1,7 +1,7 @@
 ;;; -*- coding: iso-2022-7bit; -*-
 ;;; tramp-util.el --- Misc utility functions to use with Tramp
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
 
 ;; Author: kai.grossjohann@gmx.net
 ;; Keywords: comm, extensions, processes
diff --git a/lisp/net/tramp-uu.el b/lisp/net/tramp-uu.el
index d18af101c48..09dfa7d04a5 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, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2005  Free Software Foundation, Inc.
 
 ;; Author: Kai Gro,A_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 ;; Keywords: comm, terminals
diff --git a/lisp/net/tramp-vc.el b/lisp/net/tramp-vc.el
index c58d83504c2..9a281d9d40d 100644
--- a/lisp/net/tramp-vc.el
+++ b/lisp/net/tramp-vc.el
@@ -1,6 +1,6 @@
 ;;; tramp-vc.el --- Version control integration for TRAMP.el
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 by Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2005 by Free Software Foundation, Inc.
 
 ;; Author: Daniel Pittman <daniel@danann.net>
 ;; Keywords: comm, processes
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index bfdf7ed067a..a5ee3c9bc04 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1,7 +1,7 @@
 ;;; -*- mode: Emacs-Lisp; coding: iso-2022-7bit; -*-
 ;;; tramp.el --- Transparent Remote Access, Multiple Protocol
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
 
 ;; Author: kai.grossjohann@gmx.net
 ;; Keywords: comm, processes
@@ -1352,7 +1352,9 @@ autocorrect\" to the remote host."
 
 ;; Chunked sending kluge.  We set this to 500 for black-listed constellations
 ;; known to have a bug in `process-send-string'; some ssh connections appear
-;; to drop bytes when data is sent too quickly.
+;; to drop bytes when data is sent too quickly.  There is also a connection
+;; buffer local variable, which is computed depending on remote host properties
+;; when `tramp-chunksize' is zero or nil.
 (defcustom tramp-chunksize
   (when (and (not (featurep 'xemacs))
              (memq system-type '(hpux)))
@@ -3231,7 +3233,13 @@ This is like `dired-recursive-delete-directory' for tramp files."
        (mapconcat #'tramp-shell-quote-argument (cons program arguments) " "))
       (tramp-wait-for-output))
     (unless discard
-      (insert-buffer (tramp-get-buffer multi-method method user host)))
+      ;; We cannot use `insert-buffer' because the tramp buffer
+      ;; changes its contents before insertion due to calling
+      ;; `expand-file' and alike.
+      (insert
+       (with-current-buffer
+           (tramp-get-buffer multi-method method user host)
+         (buffer-string))))
     (save-excursion
       (prog1
           (tramp-send-command-and-check multi-method method user host nil)
@@ -3360,8 +3368,10 @@ This is like `dired-recursive-delete-directory' for tramp files."
                    switches
                    (if wildcard
                        localname
-                     (tramp-shell-quote-argument
-                      (file-name-nondirectory localname))))))
+                     (if (zerop (length (file-name-nondirectory localname)))
+                         ""
+                       (tramp-shell-quote-argument
+                        (file-name-nondirectory localname)))))))
         (sit-for 1)                     ;needed for rsh but not ssh?
         (tramp-wait-for-output))
       ;; The following let-binding is used by code that's commented
@@ -3369,8 +3379,13 @@ This is like `dired-recursive-delete-directory' for tramp files."
       ;; that the commented-out code is really not needed.  Commenting-out
       ;; happened on 2003-03-13.
       (let ((old-pos (point)))
-        (insert-buffer-substring
-         (tramp-get-buffer multi-method method user host))
+        ;; We cannot use `insert-buffer' because the tramp buffer
+        ;; changes its contents before insertion due to calling
+        ;; `expand-file' and alike.
+        (insert
+         (with-current-buffer
+             (tramp-get-buffer multi-method method user host)
+           (buffer-string)))
         ;; On XEmacs, we want to call (exchange-point-and-mark t), but
         ;; that doesn't exist on Emacs, so we use this workaround instead.
         ;; Since zmacs-region-stays doesn't exist in Emacs, this ought to
@@ -3561,7 +3576,13 @@ This will break if COMMAND prints a newline, followed by the value of
             (unless asynchronous
               (tramp-wait-for-output)))
           (unless asynchronous
-            (insert-buffer (tramp-get-buffer multi-method method user host)))
+            ;; We cannot use `insert-buffer' because the tramp buffer
+            ;; changes its contents before insertion due to calling
+            ;; `expand-file' and alike.
+            (insert
+             (with-current-buffer
+                 (tramp-get-buffer multi-method method user host)
+               (buffer-string))))
           (when error-buffer
             (save-excursion
               (unless (bufferp error-buffer)
@@ -3571,7 +3592,11 @@ This will break if COMMAND prints a newline, followed by the value of
                "cat /tmp/tramp.$$.err")
               (tramp-wait-for-output)
               (set-buffer error-buffer)
-              (insert-buffer (tramp-get-buffer multi-method method user host))
+              ;; Same comment as above
+              (insert
+               (with-current-buffer
+                   (tramp-get-buffer multi-method method user host)
+                 (buffer-string)))
               (tramp-send-command-and-check
                multi-method method user host "rm -f /tmp/tramp.$$.err")))
           (save-excursion
@@ -4834,6 +4859,9 @@ Function may have 0-3 parameters."
 (defun tramp-set-auto-save ()
   (when (and (buffer-file-name)
              (tramp-tramp-file-p (buffer-file-name))
+             ;; ange-ftp has its own auto-save mechanism
+             (eq (tramp-find-foreign-file-name-handler (buffer-file-name))
+                 'tramp-sh-file-name-handler)
              auto-save-default)
     (auto-save-mode 1)))
 (add-hook 'find-file-hooks 'tramp-set-auto-save t)
@@ -5417,7 +5445,7 @@ Maybe the different regular expressions need to be tuned.
              method))
     (when multi-method
       (error "Cannot multi-connect using telnet connection method"))
-    (tramp-pre-connection multi-method method user host)
+    (tramp-pre-connection multi-method method user host tramp-chunksize)
     (tramp-message 7 "Opening connection for %s@%s using %s..."
                    (or user (user-login-name)) host method)
     (let ((process-environment (copy-sequence process-environment)))
@@ -5475,7 +5503,7 @@ arguments, and xx will be used as the host name to connect to.
   (save-match-data
     (when multi-method
       (error "Cannot multi-connect using rsh connection method"))
-    (tramp-pre-connection multi-method method user host)
+    (tramp-pre-connection multi-method method user host tramp-chunksize)
     (if (and user (not (string= user "")))
         (tramp-message 7 "Opening connection for %s@%s using %s..."
                        user host method)
@@ -5544,7 +5572,7 @@ prompt than you do, so it is not at all unlikely that the variable
       (error
        "Cannot connect to different host `%s' with `su' connection method"
        host))
-    (tramp-pre-connection multi-method method user host)
+    (tramp-pre-connection multi-method method user host tramp-chunksize)
     (tramp-message 7 "Opening connection for `%s' using `%s'..."
                    (or user "<root>") method)
     (let ((process-environment (copy-sequence process-environment)))
@@ -5609,7 +5637,7 @@ log in as u2 to h2."
     (unless (and (= (length method) (length user))
                  (= (length method) (length host)))
       (error "Arrays METHOD, USER, HOST must have equal length"))
-    (tramp-pre-connection multi-method method user host)
+    (tramp-pre-connection multi-method method user host tramp-chunksize)
     (tramp-message 7 "Opening `%s' connection..." multi-method)
     (let ((process-environment (copy-sequence process-environment)))
       (setenv "TERM" tramp-terminal-type)
@@ -5810,7 +5838,7 @@ Uses PROMPT as a prompt and sends the password to process P."
 ;; HHH: Not Changed.  This might handle the case where USER is not
 ;;      given in the "File name" very poorly.  Then, the local
 ;;      variable tramp-current-user will be set to nil.
-(defun tramp-pre-connection (multi-method method user host)
+(defun tramp-pre-connection (multi-method method user host chunksize)
   "Do some setup before actually logging in.
 METHOD, USER and HOST specify the connection."
   (set-buffer (tramp-get-buffer multi-method method user host))
@@ -5818,6 +5846,7 @@ METHOD, USER and HOST specify the connection."
   (set (make-local-variable 'tramp-current-method) method)
   (set (make-local-variable 'tramp-current-user)   user)
   (set (make-local-variable 'tramp-current-host)   host)
+  (set (make-local-variable 'tramp-chunksize)      chunksize)
   (set (make-local-variable 'inhibit-eol-conversion) nil)
   (erase-buffer))
 
@@ -5869,6 +5898,20 @@ to set up.  METHOD, USER and HOST specify the connection."
   (erase-buffer)
   (tramp-send-command-internal multi-method method user host
                                "TERM=dumb; export TERM")
+  (erase-buffer)
+  ;; Check whether the remote host suffers from buggy `send-process-string'.
+  ;; This is known for FreeBSD (see comment in `send_process', file process.c).
+  ;; I've tested sending 624 bytes successfully, sending 625 bytes failed.
+  ;; Emacs makes a hack when this host type is detected locally.  It cannot
+  ;; handle remote hosts, though.
+  (when (or (not tramp-chunksize) (zerop tramp-chunksize))
+    (tramp-message 9 "Checking remote host type for `send-process-string' bug")
+    (tramp-send-command-internal multi-method method user host
+                                 "(uname -sr) 2>/dev/null")
+    (goto-char (point-min))
+    (when (looking-at "FreeBSD")
+      (setq tramp-chunksize 500)))
+
   ;; Try to set up the coding system correctly.
   ;; CCC this can't be the right way to do it.  Hm.
   (save-excursion
@@ -6948,7 +6991,8 @@ as default."
       ;; Permissions should be set always, because there might be an old
       ;; auto-saved file belonging to another original file.  This could
       ;; be a security threat.
-      (set-file-modes buffer-auto-save-file-name (file-modes bfn)))))
+      (set-file-modes buffer-auto-save-file-name
+                      (or (file-modes bfn) ?\600)))))
 
 (unless (or (> emacs-major-version 21)
             (and (featurep 'xemacs)
@@ -7226,7 +7270,6 @@ Only works for Bourne-like shells."
          tramp-yesno-prompt-regexp
          tramp-yn-prompt-regexp
          tramp-terminal-prompt-regexp
-         tramp-out-of-band-prompt-regexp
          tramp-temp-name-prefix
          tramp-file-name-structure
          tramp-file-name-regexp
@@ -7286,31 +7329,44 @@ report.
 (defun tramp-append-tramp-buffers ()
   "Append Tramp buffers into the bug report."
 
-  ;; We load mml.el from Gnus.
+  ;; We load message.el and mml.el from Gnus.
   (if (featurep 'xemacs)
-      (load "mml" 'noerror)
+      (progn
+        (load "message" 'noerror)
+        (load "mml" 'noerror))
+    (require 'message nil 'noerror)
     (require 'mml nil 'noerror))
+  (when (functionp 'message-mode)
+    (funcall 'message-mode))
+  (when (functionp 'mml-mode)
+    (funcall 'mml-mode t))
 
   (when (and
-         ;; We don't want to add another dependency.
-         (functionp 'mml-insert-empty-tag)
-         ;; 2nd parameter since Emacs 22.
-         (condition-case nil
-             (list-buffers-noselect nil nil)
-           (t nil)))
-    (let ((buffer-list
-           (delq nil
-            (mapcar '(lambda (b)
-             (when (string-match "^\\*\\(debug \\)?tramp/" (buffer-name b)) b))
-             (buffer-list))))
-          (curbuf (current-buffer)))
+         (eq major-mode 'message-mode)
+         (boundp 'mml-mode)
+         (symbol-value 'mml-mode))
+
+    (let* ((tramp-buf-regexp "\\*\\(debug \\)?tramp/")
+           (buffer-list
+            (delq nil
+                  (mapcar '(lambda (b)
+                     (when (string-match tramp-buf-regexp (buffer-name b)) b))
+                          (buffer-list))))
+           (curbuf (current-buffer)))
 
       ;; There is at least one Tramp buffer.
       (when buffer-list
-        (switch-to-buffer (list-buffers-noselect nil buffer-list))
+        (switch-to-buffer (list-buffers-noselect nil))
         (delete-other-windows)
         (setq buffer-read-only nil)
-        (goto-char (point-max))
+        (goto-char (point-min))
+        (while (not (eobp))
+          (if (re-search-forward tramp-buf-regexp (tramp-point-at-eol) t)
+              (forward-line 1)
+            (forward-line 0)
+            (let ((start (point)))
+              (forward-line 1)
+              (kill-region start (point)))))
         (insert "
 The buffer(s) above will be appended to this message.  If you don't want
 to append a buffer because it contains sensible data, or because the buffer
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 12e56600f00..c8ef71eb9f3 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 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 ;; Author: Kai.Grossjohann@CS.Uni-Dortmund.DE 
 ;; Keywords: comm, processes
@@ -30,7 +30,7 @@
 ;; are auto-frobbed from configure.ac, so you should edit that file and run
 ;; "autoconf && ./configure" to change them.
 
-(defconst tramp-version "2.0.48"
+(defconst tramp-version "2.0.49"
   "This version of Tramp.")
 
 (defconst tramp-bug-report-address "tramp-devel@gnu.org"
diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el
index 0fc47fafa85..23c54d5a09f 100644
--- a/lisp/net/webjump.el
+++ b/lisp/net/webjump.el
@@ -1,6 +1,6 @@
 ;;; webjump.el --- programmable Web hotlist
 
-;; Copyright (C) 1996, 1997, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 2005 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 6b4d22f9b13..c7999616375 100644
--- a/lisp/net/zone-mode.el
+++ b/lisp/net/zone-mode.el
@@ -1,6 +1,6 @@
 ;;; zone-mode.el --- major mode for editing DNS zone files
 
-;; Copyright (C) 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2005 Free Software Foundation, Inc.
 
 ;; Author: John Heidemann <johnh@isi.edu>
 ;; Keywords: DNS, languages
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 5a7b7666e89..59044da6ef9 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -90,7 +90,8 @@ Major modes should set this variable.")
 
 (defcustom comment-fill-column nil
   "Column to use for `comment-indent'.  If nil, use `fill-column' instead."
-  :type '(choice (const nil) integer))
+  :type '(choice (const nil) integer)
+  :group 'comment)
 
 ;;;###autoload
 (defcustom comment-column 32
@@ -99,7 +100,8 @@ 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
 not to go beyond `comment-fill-column'."
-  :type 'integer)
+  :type 'integer
+  :group 'comment)
 (make-variable-buffer-local 'comment-column)
 
 ;;;###autoload
@@ -201,7 +203,8 @@ INDENT specifies that the `comment-start' markers should not be put at the
 See `comment-styles' for a list of available styles."
   :type (if (boundp 'comment-styles)
             `(choice ,@(mapcar (lambda (s) `(const ,(car s))) comment-styles))
-          'symbol))
+          'symbol)
+  :group 'comment)
 
 ;;;###autoload
 (defcustom comment-padding " "
@@ -211,7 +214,8 @@ of the corresponding number of spaces.
 
 Extra spacing between the comment characters and the comment text
 makes the comment easier to read.  Default is 1.  nil means 0."
-  :type '(choice string integer (const nil)))
+  :type '(choice string integer (const nil))
+  :group 'comment)
 
 ;;;###autoload
 (defcustom comment-multi-line nil
@@ -222,7 +226,8 @@ customize this variable.
 
 It also affects \\[indent-new-comment-line].  However, if you want this
 behavior for explicit filling, you might as well use \\[newline-and-indent]."
-  :type 'boolean)
+  :type 'boolean
+  :group 'comment)
 
 (defcustom comment-empty-lines nil
   "If nil, `comment-region' does not comment out empty lines.
@@ -231,7 +236,8 @@ if `eol' it only comments out empty lines if comments are
 terminated by the end of line (i.e. `comment-end' is empty)."
   :type '(choice (const :tag "Never" nil)
           (const :tag "Always" t)
-          (const :tag "EOl-terminated" 'eol)))
+          (const :tag "EOl-terminated" 'eol))
+  :group 'comment)
 
 ;;;;
 ;;;; Helpers
@@ -1091,7 +1097,8 @@ Else, call `comment-indent'."
 (defcustom comment-auto-fill-only-comments nil
   "Non-nil means to only auto-fill inside comments.
 This has no effect in modes that do not define a comment syntax."
-  :type 'boolean)
+  :type 'boolean
+  :group 'comment)
 
 (defun comment-valid-prefix-p (prefix compos)
   (or
diff --git a/lisp/obsolete/rsz-mini.el b/lisp/obsolete/rsz-mini.el
index d44a88df801..a90cb625dc5 100644
--- a/lisp/obsolete/rsz-mini.el
+++ b/lisp/obsolete/rsz-mini.el
@@ -63,7 +63,8 @@
 
 ;;;###autoload
 (defcustom resize-minibuffer-frame-max-height nil
-  "*This variable is obsolete.")
+  "*This variable is obsolete."
+  :group 'resize-minibuffer)
 
 ;;;###autoload
 (defcustom resize-minibuffer-frame-exactly t
diff --git a/lisp/play/gametree.el b/lisp/play/gametree.el
index f79ded4955e..abab58d6018 100644
--- a/lisp/play/gametree.el
+++ b/lisp/play/gametree.el
@@ -204,12 +204,12 @@ should be no leading white space."
                             gametree-half-ply-regexp "\\)"))
           (limit (save-excursion (beginning-of-line 1) (point))))
       (if (looking-at boundary)
-          (+ (* 2 (string-to-int (match-string 1)))
+          (+ (* 2 (string-to-number (match-string 1)))
              (if (string-match gametree-half-ply-regexp (match-string 2)) 1 0))
         (save-excursion
           (re-search-backward boundary limit)
           (skip-chars-backward "0123456789")
-          (1+ (* 2 (string-to-int
+          (1+ (* 2 (string-to-number
                     (buffer-substring (point) (match-end 1))))))))))
 
 (defun gametree-current-branch-ply ()
@@ -345,7 +345,7 @@ This value is simply the outline heading level of the current line."
   "Return score of current variation according to its score tag.
 When no score tag is present, use the value of `gametree-default-score'."
   (if (looking-at gametree-score-regexp)
-      (string-to-int (match-string 3))
+      (string-to-number (match-string 3))
     gametree-default-score))
 
 (defun gametree-compute-reduced-score ()
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index e7eb0657eac..8dba21afe9b 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -672,7 +672,7 @@ file.  If none is set, return nil."
                     (not (integerp choice))
                     (< choice 1)
                     (> choice (length prj-files)))
-              (setq choice (string-to-int
+              (setq choice (string-to-number
                             (read-from-minibuffer "Enter No. of your choice: "))))
             (set 'selected (nth (1- choice) prj-files))))
 
@@ -1800,7 +1800,7 @@ This function is disabled for operators, and only works for identifiers."
                       (< choice 1)
                       (> choice len))
                 (setq choice
-                      (string-to-int
+                      (string-to-number
                        (read-from-minibuffer "Enter No. of your choice: "))))
               )
             (set-buffer ali-buffer)
@@ -1988,7 +1988,7 @@ is using."
                    (< choice 1)
                    (> choice (length list)))
           (setq choice
-                (string-to-int
+                (string-to-number
                  (read-from-minibuffer "Enter No. of your choice: "))))
         )
       (set 'choice (1- choice))
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index 1a35fe41860..03587577f59 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -785,6 +785,7 @@ bound to `antlr-language'.  For example, with value
   \((java-mode \. 2) (c++-mode \. 0))
 Java actions are fontified with level 2 and C++ actions are not
 fontified at all."
+  :group 'antlr
   :type '(choice (const :tag "None" none)
                  (const :tag "Inherit" inherit)
                  (const :tag "Default" nil)
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index ea36064412f..0a4cb6c8cd6 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -335,7 +335,8 @@ This function does not do any hidden buffer changes."
 ;; locking is in use.  This variable is extended with the face in
 ;; `c-doc-face-name' when fontification is activated in cc-fonts.el.
 (defvar c-literal-faces
-  '(font-lock-comment-face font-lock-string-face))
+  '(font-lock-comment-face font-lock-string-face
+                           font-lock-comment-delimiter-face))
 
 (defun c-shift-line-indentation (shift-amt)
   ;; This function does not do any hidden buffer changes.
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 74efef4133f..26c0bdaf60f 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -673,7 +673,7 @@ casts and declarations are fontified.  Used on level 2 and higher."
                       (c-font-lock-objc-iip-decl)))
                   nil))))))
 
-      ("!" . font-lock-negation-char-face)
+      ("\\(!\\)[^=]" 1 font-lock-negation-char-face)
       ))
 
 (defun c-font-lock-complex-decl-prepare (limit)
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index f5180b1fb48..ad43228a100 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -119,6 +119,10 @@ nil means compute the name with `(concat \"*\" (downcase major-mode) \"*\")'.")
 It is called with two arguments: the compilation buffer, and a string
 describing how the process finished.")
 
+(make-obsolete-variable 'compilation-finish-function
+  "Use `compilation-finish-functions', but it works a little differently."
+  "22.1")
+
 ;;;###autoload
 (defvar compilation-finish-functions nil
   "Functions to call when a compilation process finishes.
@@ -1247,8 +1251,7 @@ Optional argument MINOR indicates this is called from
   (make-local-variable 'compilation-messages-start)
   (make-local-variable 'compilation-error-screen-columns)
   (make-local-variable 'overlay-arrow-position)
-  (set (make-local-variable 'overlay-arrow-string)
-       (if (display-graphic-p) "=>" ""))
+  (set (make-local-variable 'overlay-arrow-string) "")
   (setq next-error-overlay-arrow-position nil)
   (add-hook 'kill-buffer-hook
             (lambda () (setq next-error-overlay-arrow-position nil)) nil t)
@@ -1575,9 +1578,12 @@ region and the first line of the next region."
       (setcdr loc (list line file marker)))
     loc))
 
-(defcustom compilation-context-lines 0
-  "*Display this many lines of leading context before message.
-If nil, don't scroll the compilation output window."
+(defcustom compilation-context-lines nil
+  "Display this many lines of leading context before the current message.
+If nil and the left fringe is displayed, don't scroll the
+compilation output window; an arrow in the left fringe points to
+the current message.  If nil and there is no left fringe, the message
+displays at the top of the window; there is no arrow."
   :type '(choice integer (const :tag "No window scrolling" nil))
   :group 'compilation
   :version "22.1")
@@ -1586,10 +1592,17 @@ If nil, don't scroll the compilation output window."
   "Align the compilation output window W with marker MK near top."
   (if (integerp compilation-context-lines)
       (set-window-start w (save-excursion
-                            (goto-char mk)
-                            (beginning-of-line (- 1 compilation-context-lines))
-                            (point))))
-  (set-window-point w mk))
+                            (goto-char mk)
+                            (beginning-of-line
+                             (- 1 compilation-context-lines))
+                            (point)))
+    ;; If there is no left fringe.
+    (if (equal (car (window-fringes)) 0)
+        (set-window-start w (save-excursion
+                              (goto-char mk)
+                            (beginning-of-line 1)
+                            (point)))))
+    (set-window-point w mk))
 
 (defvar next-error-highlight-timer)
 
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index e32a43ede9e..436bc04d044 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -120,7 +120,7 @@
         ;; Probably will not work due to some save-excursion???
         ;; Or save-file-position?
         ;; (message "Did I get to line %s?" (elt (, elt) 1))
-        `(goto-line (string-to-int (elt ,elt 1))))
+        `(goto-line (string-to-number (elt ,elt 1))))
     ;;)
     (defmacro cperl-etags-goto-tag-location (elt)
       `(etags-goto-tag-location ,elt))))
diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el
index 4ebbc549697..8d3ee554026 100644
--- a/lisp/progmodes/delphi.el
+++ b/lisp/progmodes/delphi.el
@@ -1530,7 +1530,7 @@ before the indent, the point is moved to the indent."
     (save-selected-window
       (switch-to-buffer-other-window to-buffer)
       (goto-char (point-max))
-      (set-window-dot (get-buffer-window to-buffer) (point))
+      (set-window-point (get-buffer-window to-buffer) (point))
       (insert the-msg))))
 
 ;; Debugging helpers:
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 457c00d9008..6dd15897e7b 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -1448,10 +1448,10 @@ Pop to member buffer if no prefix ARG, to tree buffer otherwise."
 (defun ebrowse-set-tree-indentation ()
   "Set the indentation width of the tree display."
   (interactive)
-  (let ((width (string-to-int (read-from-minibuffer
-                               (concat "Indentation ("
-                                       (int-to-string ebrowse--indentation)
-                                       "): ")))))
+  (let ((width (string-to-number (read-from-minibuffer
+                                  (concat "Indentation ("
+                                          (int-to-string ebrowse--indentation)
+                                          "): ")))))
     (when (plusp width)
       (setf ebrowse--indentation width)
       (ebrowse-redraw-tree))))
@@ -2329,7 +2329,7 @@ With prefix ARG, switch to the tree buffer else pop to it."
   "Set the column width of the member display.
 The new width is read from the minibuffer."
   (interactive)
-  (let ((width (string-to-int
+  (let ((width (string-to-number
                 (read-from-minibuffer
                  (concat "Column width ("
                          (int-to-string (if ebrowse--long-display-flag
@@ -4313,7 +4313,7 @@ NUMBER-OF-STATIC-VARIABLES:"
   "Select the nth entry in the list by the keys 1..9."
   (interactive)
   (let* ((maxlin (count-lines (point-min) (point-max)))
-         (n (min maxlin (+ 2 (string-to-int (this-command-keys))))))
+         (n (min maxlin (+ 2 (string-to-number (this-command-keys))))))
     (goto-line n)
     (throw 'electric-buffer-menu-select (point))))
 
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 0569d26db61..32ede0e1474 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1283,16 +1283,16 @@ where they were found."
 
 
       (if (looking-at "[0-9]")
-          (setq line (string-to-int (buffer-substring
-                                     (point)
-                                     (progn (skip-chars-forward "0-9")
-                                            (point))))))
+          (setq line (string-to-number (buffer-substring
+                                        (point)
+                                        (progn (skip-chars-forward "0-9")
+                                               (point))))))
       (search-forward ",")
       (if (looking-at "[0-9]")
-          (setq startpos (string-to-int (buffer-substring
-                                         (point)
-                                         (progn (skip-chars-forward "0-9")
-                                                (point)))))))
+          (setq startpos (string-to-number (buffer-substring
+                                            (point)
+                                            (progn (skip-chars-forward "0-9")
+                                                   (point)))))))
     ;; Leave point on the next line of the tags file.
     (forward-line 1)
     (cons tag-text (cons line startpos))))
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index a2fa660bff0..5463ee3ffa9 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1004,7 +1004,7 @@ Return its components if so, nil if no."
                (line-idx (nth 2 (car patterns))))
 
           (setq raw-file-name (if file-idx (match-string file-idx line) nil))
-          (setq line-no       (if line-idx (string-to-int (match-string line-idx line)) 0))
+          (setq line-no       (if line-idx (string-to-number (match-string line-idx line)) 0))
           (setq err-text      (if (> (length (car patterns)) 4)
                                   (match-string (nth 4 (car patterns)) line)
                                 (flymake-patch-err-text (substring line (match-end 0)))))
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 5c81ba7f6f9..4c95fc65d58 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -3215,7 +3215,7 @@ This event can be examined by forms in GUD-TOOLTIP-DISPLAY.")
         (add-hook 'tooltip-hook 'gud-tooltip-tips)
         (define-key global-map [mouse-movement] 'gud-tooltip-mouse-motion))
     (unless tooltip-mode (remove-hook 'pre-command-hook 'tooltip-hide)
-    (remove-hook 'change-major-mode-hook 'tooltip-change-major-mode)
+    (remove-hook 'change-major-mode-hook 'gud-tooltip-change-major-mode)
     (remove-hook 'tooltip-hook 'gud-tooltip-tips)
     (define-key global-map [mouse-movement] 'ignore)))
   (gud-tooltip-activate-mouse-motions-if-enabled)
@@ -3253,7 +3253,7 @@ If GUD-TOOLTIP-DEREFERENCE is t, also prepend a `*' to EXPR."
   (when gud-tooltip-dereference
     (setq expr (concat "*" expr)))
   (case gud-minor-mode
-    ((gdb gdba) (concat "server print " expr))
+    (gdba (concat "server print " expr))
     ((dbx gdbmi) (concat "print " expr))
     (xdb (concat "p " expr))
     (sdb (concat expr "/"))
@@ -3293,6 +3293,10 @@ This function must return nil if it doesn't handle EVENT."
                       (tooltip-show (cdr define-elt))
                       expr))))
             (let ((cmd (gud-tooltip-print-command expr)))
+              (when (and gud-tooltip-mode (eq gud-minor-mode 'gdb))
+                (gud-tooltip-mode -1)
+                (message-box "Using GUD tooltips in this mode is unsafe\n\
+so they have been disabled."))
               (unless (null cmd) ; CMD can be nil if unknown debugger
                 (if (memq gud-minor-mode '(gdba gdbmi))
                       (if gdb-macro-info
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 221a6f4aebb..77244819f1b 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -45,7 +45,7 @@
 ;;
 ;; INSTALLATION:
 ;; =============
-;; 
+;;
 ;; Follow the instructions in the INSTALL file of the distribution.
 ;; In short, put this file on your load path and add the following
 ;; lines to your .emacs file:
@@ -58,9 +58,9 @@
 ;;
 ;;   The newest version of this file can be found on the maintainers
 ;;   web site.
-;; 
+;;
 ;;     http://idlwave.org
-;; 
+;;
 ;; DOCUMENTATION
 ;; =============
 ;;
@@ -77,7 +77,7 @@
 ;; it is a bug in XEmacs.
 ;; The Debug menu in source buffers *does* display the bindings correctly.
 ;;
-;; 
+;;
 ;; CUSTOMIZATION VARIABLES
 ;; =======================
 ;;
@@ -101,12 +101,12 @@
   (condition-case () (require 'custom) (error nil))
   (if (and (featurep 'custom)
            (fboundp 'custom-declare-variable)
-           (fboundp 'defface))     
+           (fboundp 'defface))
       ;; We've got what we needed
       (setq idlwave-shell-have-new-custom t)
     ;; We have the old or no custom-library, hack around it!
     (defmacro defgroup (&rest args) nil)
-    (defmacro defcustom (var value doc &rest args) 
+    (defmacro defcustom (var value doc &rest args)
       `(defvar ,var ,value ,doc))))
 
 ;;; Customizations: idlwave-shell group
@@ -118,10 +118,10 @@
   :group 'idlwave)
 
 (defcustom idlwave-shell-prompt-pattern "^ ?IDL> "
-  "*Regexp to match IDL prompt at beginning of a line. 
-For example, \"^IDL> \" or \"^WAVE> \". 
+  "*Regexp to match IDL prompt at beginning of a line.
+For example, \"^IDL> \" or \"^WAVE> \".
 The \"^\" means beginning of line, and is required.
-This variable is used to initialize `comint-prompt-regexp' in the 
+This variable is used to initialize `comint-prompt-regexp' in the
 process buffer.
 
 This is a fine thing to set in your `.emacs' file."
@@ -210,7 +210,7 @@ So by default setting a breakpoint will be on C-c C-d C-b."
   :type 'boolean)
 
 (defcustom idlwave-shell-automatic-electric-debug 'breakpoint
-  "Enter the electric-debug minor mode automatically.  
+  "Enter the electric-debug minor mode automatically.
 This occurs at a breakpoint or any other halt.  The mode is exited
 upon return to the main level.  Can be set to 'breakpoint to enter
 electric debug mode only when breakpoints are tripped."
@@ -295,7 +295,7 @@ The history is only saved if the variable `idlwave-shell-save-command-history'
 is non-nil."
   :group 'idlwave-shell-command-setup
   :type 'file)
-  
+
 (defcustom idlwave-shell-show-commands
   '(run misc breakpoint)
   "*A list of command types to show output from in the shell.
@@ -306,12 +306,12 @@ the copious shell traffic to be displayed."
   :type '(choice
           (const everything)
           (set :tag "Checklist" :greedy t
-               (const :tag "All .run and .compile commands"        run)  
+               (const :tag "All .run and .compile commands"        run)
                (const :tag "All breakpoint commands"               breakpoint)
                (const :tag "All debug and stepping commands"       debug)
                (const :tag "Close, window, retall, etc. commands"  misc))))
 
-(defcustom idlwave-shell-examine-alist 
+(defcustom idlwave-shell-examine-alist
   '(("Print"            . "print,___")
     ("Help"             . "help,___")
     ("Structure Help"   . "help,___,/STRUCTURE")
@@ -322,14 +322,14 @@ the copious shell traffic to be displayed."
     ("Ptr Valid"        . "print,ptr_valid(___)")
     ("Widget Valid"     . "print,widget_info(___,/VALID)")
     ("Widget Geometry"  . "help,widget_info(___,/GEOMETRY)"))
-  "Alist of special examine commands for popup selection.  
+  "Alist of special examine commands for popup selection.
 The keys are used in the selection popup created by
 `idlwave-shell-examine-select', and the corresponding value is sent as
 a command to the shell, with special sequence `___' replaced by the
 expression being examined."
   :group 'idlwave-shell-command-setup
   :type '(repeat
-          (cons 
+          (cons
            (string :tag "Label  ")
            (string :tag "Command"))))
 
@@ -340,7 +340,7 @@ expression being examined."
   "*Non-nil mean, put output of examine commands in their own buffer."
   :group 'idlwave-shell-command-setup
   :type 'boolean)
-  
+
 (defcustom idlwave-shell-comint-settings
   '((comint-scroll-to-bottom-on-input . t)
     (comint-scroll-to-bottom-on-output . t)
@@ -403,7 +403,7 @@ strings.  Here is some example code which makes use of the default spells.
   answer = GET_KBRD(1)
 
 Since the IDLWAVE shell defines the system variable `!IDLWAVE_VERSION',
-you could actually check if you are running under Emacs before printing 
+you could actually check if you are running under Emacs before printing
 the magic strings.  Here is a procedure which uses this.
 
 Usage:
@@ -420,7 +420,7 @@ pro idlwave_char_input,on=on,off=off
       if keyword_set(on) then         print,'<chars>' $
         else if keyword_set(off) then print,'</chars>' $
         else                          print,'<onechar>'
-  endif 
+  endif
 end"
   :group 'idlwave-shell-command-setup
   :type '(list
@@ -478,10 +478,10 @@ line where IDL is stopped.  See also `idlwave-shell-mark-stop-line'."
   :group 'idlwave-shell-highlighting-and-faces
   :type 'string)
 
-(defcustom idlwave-shell-electric-stop-line-face 
+(defcustom idlwave-shell-electric-stop-line-face
   (prog1
       (copy-face 'modeline 'idlwave-shell-electric-stop-line-face)
-    (set-face-background 'idlwave-shell-electric-stop-line-face 
+    (set-face-background 'idlwave-shell-electric-stop-line-face
                          idlwave-shell-electric-stop-color)
     (condition-case nil
         (set-face-foreground 'idlwave-shell-electric-stop-line-face nil)
@@ -527,7 +527,7 @@ lines which have a breakpoint.  See also `idlwave-shell-mark-breakpoints'."
   ;; Just copy the underline face to be on the safe side.
   (copy-face 'underline 'idlwave-shell-bp-face))
 
-(defcustom idlwave-shell-disabled-breakpoint-face 
+(defcustom idlwave-shell-disabled-breakpoint-face
   'idlwave-shell-disabled-bp-face
   "*The face for disabled breakpoint lines in the source code.
 Allows you to choose the font, color and other properties for
@@ -580,18 +580,18 @@ before use by the shell.")
 
 TYPE is either 'pro' or 'rinfo', and `idlwave-shell-temp-pro-file' or
 `idlwave-shell-temp-rinfo-save-file' is set (respectively)."
-  (cond 
+  (cond
    ((eq type 'rinfo)
-    (or idlwave-shell-temp-rinfo-save-file 
-        (setq idlwave-shell-temp-rinfo-save-file 
+    (or idlwave-shell-temp-rinfo-save-file
+        (setq idlwave-shell-temp-rinfo-save-file
               (idlwave-shell-make-temp-file idlwave-shell-temp-pro-prefix))))
    ((eq type 'pro)
     (or idlwave-shell-temp-pro-file
-        (setq idlwave-shell-temp-pro-file 
+        (setq idlwave-shell-temp-pro-file
               (idlwave-shell-make-temp-file idlwave-shell-temp-pro-prefix))))
-   (t (error "Wrong argument (idlwave-shell-temp-file): %s" 
+   (t (error "Wrong argument (idlwave-shell-temp-file): %s"
              (symbol-name type)))))
-    
+
 
 (defun idlwave-shell-make-temp-file (prefix)
   "Create a temporary file."
@@ -619,7 +619,7 @@ TYPE is either 'pro' or 'rinfo', and `idlwave-shell-temp-pro-file' or
 
 
 (defvar idlwave-shell-dirstack-query "cd,current=___cur & print,___cur"
-  "Command used by `idlwave-shell-resync-dirs' to query IDL for 
+  "Command used by `idlwave-shell-resync-dirs' to query IDL for
 the directory stack.")
 
 (defvar idlwave-shell-path-query "print,'PATH:<'+transpose(expand_path(!PATH,/ARRAY))+'>' & print,'SYSDIR:<'+!dir+'>'"
@@ -627,7 +627,7 @@ the directory stack.")
   "The command which gets !PATH and !DIR info from the shell.")
 
 (defvar idlwave-shell-mode-line-info nil
-  "Additional info displayed in the mode line")  
+  "Additional info displayed in the mode line")
 
 (defvar idlwave-shell-default-directory nil
   "The default directory in the idlwave-shell buffer, of outside use.")
@@ -678,7 +678,7 @@ the directory stack.")
             window-system)                ; Window systems always
     (progn
       (setq idlwave-shell-stop-line-overlay (make-overlay 1 1))
-      (overlay-put idlwave-shell-stop-line-overlay 
+      (overlay-put idlwave-shell-stop-line-overlay
                    'face idlwave-shell-stop-line-face))))
 
  (t
@@ -686,7 +686,7 @@ the directory stack.")
   (if window-system
       (progn
         (setq idlwave-shell-stop-line-overlay (make-overlay 1 1))
-        (overlay-put idlwave-shell-stop-line-overlay 
+        (overlay-put idlwave-shell-stop-line-overlay
                      'face idlwave-shell-stop-line-face)))))
 
 ;; Now the expression and output overlays
@@ -747,7 +747,7 @@ with `*'s."
 
 ;;; The following are the types of messages we attempt to catch to
 ;;; resync our idea of where IDL execution currently is.
-;;; 
+;;;
 
 (defvar idlwave-shell-halt-frame nil
   "The frame associated with halt/breakpoint messages.")
@@ -791,7 +791,7 @@ IDL has currently stepped.")
 
 (defconst idlwave-shell-electric-debug-help
   "   ==> IDLWAVE Electric Debug Mode Help <==
- 
+
  Break Point Setting and Clearing:
   b          Set breakpoint ([C-u b] for conditional, [C-n b] nth hit, etc.).
   d          Clear nearby breakpoint.
@@ -817,7 +817,7 @@ IDL has currently stepped.")
  Examining Expressions (with prefix for examining the region):
   p          Print expression near point or in region ([C-u p]).
   ?          Help on expression near point or in region ([C-u ?]).
-  x          Examine expression near point or in region ([C-u x]) with 
+  x          Examine expression near point or in region ([C-u x]) with
              letter completion of the examine type.
 
  Miscellaneous:
@@ -871,18 +871,18 @@ IDL has currently stepped.")
    `\\[idlwave-routine-info]' displays information about an IDL routine near point,
    just like in `idlwave-mode'.  The module used is the one at point or
    the one whose argument list is being edited.
-   To update IDLWAVE's knowledge about compiled or edited modules, use 
+   To update IDLWAVE's knowledge about compiled or edited modules, use
    \\[idlwave-update-routine-info].
    \\[idlwave-find-module] find the source of a module.
    \\[idlwave-resolve] tells IDL to compile an unresolved module.
    \\[idlwave-context-help] shows the online help on the item at
    point, if online help has been installed.
-  
+
 
 4. Debugging
    ---------
    A complete set of commands for compiling and debugging IDL programs
-   is available from the menu.  Also keybindings starting with a 
+   is available from the menu.  Also keybindings starting with a
    `C-c C-d' prefix are available for most commands in the *idl* buffer
    and also in source buffers.  The best place to learn about the
    keybindings is again the menu.
@@ -974,8 +974,8 @@ IDL has currently stepped.")
   (idlwave-shell-display-line nil)
   (setq idlwave-shell-calling-stack-index 0)
   (setq idlwave-shell-only-prompt-pattern
-        (concat "\\`[ \t\n]*" 
-                (substring idlwave-shell-prompt-pattern 1) 
+        (concat "\\`[ \t\n]*"
+                (substring idlwave-shell-prompt-pattern 1)
                 "[ \t\n]*\\'"))
 
   (when idlwave-shell-query-for-class
@@ -1010,14 +1010,14 @@ IDL has currently stepped.")
       (while (setq entry (pop list))
         (set (make-local-variable (car entry)) (cdr entry)))))
 
-  
-  (unless (memq 'comint-carriage-motion 
+
+  (unless (memq 'comint-carriage-motion
                 (default-value 'comint-output-filter-functions))
     ;; Strip those pesky ctrl-m's.
     (add-hook 'comint-output-filter-functions
               (lambda (string)
                 (when (string-match "\r" string)
-                  (let ((pmark (process-mark (get-buffer-process 
+                  (let ((pmark (process-mark (get-buffer-process
                                               (current-buffer)))))
                     (save-excursion
                       ;; bare CR -> delete preceding line
@@ -1059,8 +1059,8 @@ IDL has currently stepped.")
   (idlwave-shell-send-command idlwave-shell-initial-commands nil 'hide)
   ;; Turn off IDL's ^d interpreting, and define a system
   ;; variable which knows the version of IDLWAVE
-  (idlwave-shell-send-command 
-   (format "defsysv,'!idlwave_version','%s',1" 
+  (idlwave-shell-send-command
+   (format "defsysv,'!idlwave_version','%s',1"
            idlwave-mode-version)
    nil 'hide)
   ;; Get the paths if they weren't read in from file
@@ -1081,7 +1081,7 @@ IDL has currently stepped.")
       (setq idlwave-system-directory sysdir)
       (put 'idlwave-system-directory 'from-shell t))
     ;; Preserve any existing flags
-    (setq idlwave-path-alist 
+    (setq idlwave-path-alist
           (mapcar (lambda (x)
                     (let ((old-entry (assoc x old-path-alist)))
                       (if old-entry
@@ -1089,7 +1089,7 @@ IDL has currently stepped.")
                         (list x))))
                   dirs))
     (put 'idlwave-path-alist 'from-shell t)
-    (if idlwave-path-alist 
+    (if idlwave-path-alist
         (if (and idlwave-auto-write-paths
                  (not idlwave-library-path)
                  (not no-write) )
@@ -1125,8 +1125,8 @@ IDL has currently stepped.")
                          (frame (selected-frame)))
                      (catch 'exit
                        (while flist
-                         (if (not (eq (car flist) 
-                                      idlwave-shell-idl-wframe)) 
+                         (if (not (eq (car flist)
+                                      idlwave-shell-idl-wframe))
                              (throw 'exit (car flist))
                            (setq flist (cdr flist))))))
                    (make-frame))
@@ -1144,9 +1144,9 @@ IDL has currently stepped.")
             ;; We do not have a source frame, so we use this one.
             (setq idlwave-shell-display-wframe (selected-frame)))
         ;; Return a new frame
-        (setq idlwave-shell-idl-wframe 
+        (setq idlwave-shell-idl-wframe
               (make-frame idlwave-shell-frame-parameters)))))
-  
+
 ;;;###autoload
 (defun idlwave-shell (&optional arg quick)
   "Run an inferior IDL, with I/O through buffer `(idlwave-shell-buffer)'.
@@ -1173,14 +1173,14 @@ See also the variable `idlwave-shell-prompt-pattern'.
           (delete-other-windows))
         (and idlwave-shell-use-dedicated-frame
              (setq idlwave-shell-idl-wframe (selected-frame)))
-        (add-hook 'idlwave-shell-sentinel-hook 
+        (add-hook 'idlwave-shell-sentinel-hook
                   'save-buffers-kill-emacs t))
 
     ;; A non-nil arg means, we want a dedicated frame.  This will last
     ;; for the current editing session.
     (if arg (setq idlwave-shell-use-dedicated-frame t))
     (if (equal arg '(16)) (setq idlwave-shell-use-dedicated-frame nil))
-    
+
     ;; Check if the process still exists.  If not, create it.
     (unless (comint-check-proc (idlwave-shell-buffer))
       (let* ((prg (or idlwave-shell-explicit-file-name "idl"))
@@ -1207,9 +1207,9 @@ See also the variable `idlwave-shell-prompt-pattern'.
       (if (eq (selected-frame) (window-frame window))
           (select-window window))))
   ;; Save the paths at the end
-  (add-hook 'idlwave-shell-sentinel-hook 
+  (add-hook 'idlwave-shell-sentinel-hook
             (lambda ()
-              (if (and 
+              (if (and
                    idlwave-auto-write-paths
                    idlwave-path-alist
                    (not idlwave-library-path)
@@ -1240,7 +1240,7 @@ Return either nil or 'hide."
     (setq idlwave-shell-show-commands (list type))))
 
 
-(defun idlwave-shell-send-command (&optional cmd pcmd hide preempt 
+(defun idlwave-shell-send-command (&optional cmd pcmd hide preempt
                                              show-if-error)
   "Send a command to IDL process.
 
@@ -1261,18 +1261,18 @@ If optional fourth argument PREEMPT is non-nil CMD is put at front of
 `idlwave-shell-pending-commands'.  If PREEMPT is 'wait, wait for all
 output to complete and the next prompt to arrive before returning
 \(useful if you need an answer now\). IDL is considered ready if the
-prompt is present and if `idlwave-shell-ready' is non-nil.  
+prompt is present and if `idlwave-shell-ready' is non-nil.
 
 If SHOW-IF-ERROR is non-nil, show the output it it contains an error
 message, independent of what HIDE is set to."
 
 ;  (setq hide nil)  ;  FIXME: turn this on for debugging only
-;  (if (null cmd) 
+;  (if (null cmd)
 ;      (progn
-;       (message "SENDING Pending commands: %s" 
+;       (message "SENDING Pending commands: %s"
 ;                (prin1-to-string idlwave-shell-pending-commands)))
 ;    (message "SENDING %s|||%s" cmd pcmd))
-  (if (and (symbolp idlwave-shell-show-commands) 
+  (if (and (symbolp idlwave-shell-show-commands)
            (eq idlwave-shell-show-commands 'everything))
       (setq hide nil))
   (let ((save-buffer (current-buffer))
@@ -1300,7 +1300,7 @@ message, independent of what HIDE is set to."
                     (append (list (list cmd pcmd hide show-if-error))
                             idlwave-shell-pending-commands)
                   ;; Put at end.
-                  (append idlwave-shell-pending-commands 
+                  (append idlwave-shell-pending-commands
                           (list (list cmd pcmd hide show-if-error))))))
       ;; Check if IDL ready
       (let ((save-point (point-marker)))
@@ -1349,7 +1349,7 @@ message, independent of what HIDE is set to."
     (if (or (not (setq buf (get-buffer (idlwave-shell-buffer))))
             (not (setq proc (get-buffer-process buf))))
         (funcall errf "Shell is not running"))
-    (if (equal c ?\C-g) 
+    (if (equal c ?\C-g)
         (funcall errf "Abort")
       (comint-send-string proc (char-to-string c)))))
 
@@ -1390,7 +1390,7 @@ when the IDL prompt gets displayed again after the current IDL command."
     (if idlwave-shell-ready
         (funcall errf "No IDL program seems to be waiting for input"))
 
-    ;; OK, start the loop 
+    ;; OK, start the loop
     (message "Character mode on:  Sending single chars (`C-g' to exit)")
     (message
      (catch 'exit
@@ -1470,14 +1470,14 @@ error messages, etc."
   (setq output (substring output (string-match "\n" output)))
   (while (string-match "\\(\n\\|\\`\\)%.*\\(\n  .*\\)*" output)
     (setq output (replace-match "" nil t output)))
-  (unless 
+  (unless
       (string-match idlwave-shell-only-prompt-pattern output)
     output))
 
 (defvar idlwave-shell-hidden-output-buffer " *idlwave-shell-hidden-output*"
   "Buffer containing hidden output from IDL commands.")
 (defvar idlwave-shell-current-state nil)
-  
+
 (defun idlwave-shell-filter (proc string)
   "Watch for IDL prompt and filter incoming text.
 When the IDL prompt is received executes `idlwave-shell-post-command-hook'
@@ -1509,20 +1509,20 @@ and then calls `idlwave-shell-send-command' for any pending commands."
                       (idlwave-shell-input-mode-magic
                        (concat idlwave-shell-accumulation string)))
                   (setq idlwave-shell-accumulation
-                        (substring string 
-                                   (progn (string-match "\\(.*[\n\r]+\\)*" 
+                        (substring string
+                                   (progn (string-match "\\(.*[\n\r]+\\)*"
                                                         string)
                                           (match-end 0)))))
               (setq idlwave-shell-accumulation
                     (concat idlwave-shell-accumulation string)))
-            
-            
+
+
 ;;; Test/Debug code
 ;             (save-excursion (set-buffer
 ;                              (get-buffer-create "*idlwave-shell-output*"))
 ;                             (goto-char (point-max))
 ;                             (insert "\nSTRING===>\n" string "\n<====\n"))
-            
+
             ;; Check for prompt in current accumulating output
             (if (setq idlwave-shell-ready
                       (string-match idlwave-shell-prompt-pattern
@@ -1558,16 +1558,16 @@ and then calls `idlwave-shell-send-command' for any pending commands."
                         (if (and idlwave-shell-show-if-error
                                  (eq idlwave-shell-current-state 'error))
                             (idlwave-shell-comint-filter proc full-output)
-                          ;; If it's only *mostly* hidden, filter % lines, 
+                          ;; If it's only *mostly* hidden, filter % lines,
                           ;; and show anything that remains
                           (if (eq idlwave-shell-hide-output 'mostly)
                               (let ((filtered
-                                     (idlwave-shell-filter-hidden-output 
+                                     (idlwave-shell-filter-hidden-output
                                       full-output)))
-                                (if filtered 
-                                    (idlwave-shell-comint-filter 
+                                (if filtered
+                                    (idlwave-shell-comint-filter
                                      proc filtered))))))
-                    
+
                     ;; Call the post-command hook
                     (if (listp idlwave-shell-post-command-hook)
                         (progn
@@ -1612,7 +1612,7 @@ and then calls `idlwave-shell-send-command' for any pending commands."
             (condition-case nil
                 (comint-write-input-ring)
               (error nil)))))
-            
+
     (when (and (> (length (frame-list)) 1)
                (frame-live-p idlwave-shell-idl-wframe))
       (delete-frame idlwave-shell-idl-wframe)
@@ -1636,8 +1636,8 @@ and then calls `idlwave-shell-send-command' for any pending commands."
 ;; in module and file names.  I am not sure if it will be necessary to
 ;; change this.  Currently it seems to work the way it is.
 (defvar idlwave-shell-syntax-error
-  "^% Syntax error.\\s-*\n\\s-*At:\\s-*\\(.*\\),\\s-*Line\\s-*\\(.*\\)" 
-  "A regular expression to match an IDL syntax error.  
+  "^% Syntax error.\\s-*\n\\s-*At:\\s-*\\(.*\\),\\s-*Line\\s-*\\(.*\\)"
+  "A regular expression to match an IDL syntax error.
 The 1st pair matches the file name, the second pair matches the line
 number.")
 
@@ -1645,16 +1645,16 @@ number.")
   "^% .*\n\\s-*At:\\s-*\\(.*\\),\\s-*Line\\s-*\\(.*\\)"
   "A regular expression to match any IDL error.")
 
-(defvar idlwave-shell-halting-error 
+(defvar idlwave-shell-halting-error
   "^% .*\n\\([^%].*\n\\)*% Execution halted at:\\(\\s-*\\S-+\\s-*[0-9]+\\s-*.*\\)\n"
   "A regular expression to match errors which halt execution.")
 
-(defvar idlwave-shell-cant-continue-error 
+(defvar idlwave-shell-cant-continue-error
   "^% Can't continue from this point.\n"
   "A regular expression to match errors stepping errors.")
 
 (defvar idlwave-shell-file-line-message
-  (concat 
+  (concat
    "\\("                                 ; program name group (1)
    "\\$MAIN\\$\\|"                       ; main level routine
    "\\<[a-zA-Z][a-zA-Z0-9_$:]*"          ; start with a letter followed by [..]
@@ -1672,7 +1672,7 @@ number.")
    "\\)"                                 ; end line number group (5)
    )
   "*A regular expression to parse out the file name and line number.
-The 1st group should match the subroutine name.  
+The 1st group should match the subroutine name.
 The 3rd group is the line number.
 The 5th group is the file name.
 All parts may contain linebreaks surrounded by spaces.  This is important
@@ -1691,9 +1691,9 @@ the above."
     (cond
      ;; Make sure we have output
      ((not idlwave-shell-command-output))
-     
+
      ;; First Priority: Syntax and other errors
-     ((or 
+     ((or
        (string-match idlwave-shell-syntax-error
                      idlwave-shell-command-output)
        (string-match idlwave-shell-other-error
@@ -1707,19 +1707,19 @@ the above."
         (setq idlwave-shell-error-last (point)))
       (setq idlwave-shell-current-state 'error)
       (idlwave-shell-goto-next-error))
-   
+
      ;; Second Priority: Halting errors
      ((string-match idlwave-shell-halting-error
                     idlwave-shell-command-output)
       ;; Grab the file and line state info.
       (setq idlwave-shell-calling-stack-index 0)
       (setq idlwave-shell-halt-frame
-            (idlwave-shell-parse-line 
-             (substring idlwave-shell-command-output 
+            (idlwave-shell-parse-line
+             (substring idlwave-shell-command-output
                         (match-beginning 2)))
             idlwave-shell-current-state 'error)
       (idlwave-shell-display-line (idlwave-shell-pc-frame)))
-     
+
      ;; Third Priority: Various types of innocuous HALT and
      ;; TRACEBACK messages.
      ((or (setq trace (string-match idlwave-shell-trace-message-re
@@ -1729,25 +1729,25 @@ the above."
       ;; Grab the file and line state info.
       (setq idlwave-shell-calling-stack-index 0)
       (setq idlwave-shell-halt-frame
-            (idlwave-shell-parse-line 
+            (idlwave-shell-parse-line
              (substring idlwave-shell-command-output (match-end 0))))
       (setq idlwave-shell-current-state 'halt)
       ;; Don't debug trace messages
       (idlwave-shell-display-line (idlwave-shell-pc-frame) nil
                                   (if trace 'no-debug)))
-     
-     ;; Fourth Priority: Breakpoints 
+
+     ;; Fourth Priority: Breakpoints
      ((string-match idlwave-shell-break-message
                     idlwave-shell-command-output)
       (setq idlwave-shell-calling-stack-index 0)
-      (setq idlwave-shell-halt-frame 
-            (idlwave-shell-parse-line 
+      (setq idlwave-shell-halt-frame
+            (idlwave-shell-parse-line
              (substring idlwave-shell-command-output (match-end 0))))
       ;; We used to count hits on breakpoints
       ;; this is no longer supported since IDL breakpoints
       ;; have learned counting.
       ;; Do breakpoint command processing
-      (let ((bp (assoc 
+      (let ((bp (assoc
                  (list
                   (nth 0 idlwave-shell-halt-frame)
                   (nth 1 idlwave-shell-halt-frame))
@@ -1760,9 +1760,9 @@ the above."
           ;; A breakpoint that we did not know about - perhaps it was
           ;; set by the user...  Let's update our list.
           (idlwave-shell-bp-query)))
-      (setq idlwave-shell-current-state 'breakpoint)      
+      (setq idlwave-shell-current-state 'breakpoint)
       (idlwave-shell-display-line (idlwave-shell-pc-frame)))
-     
+
      ;; Last Priority: Can't Step errors
      ((string-match idlwave-shell-cant-continue-error
                     idlwave-shell-command-output)
@@ -1777,7 +1777,7 @@ We need to work hard here to remove the stupid line breaks inserted by
 IDL5.  These line breaks can be right in the middle of procedure
 or file names.
 It is very difficult to come up with a robust solution.  This one seems
-to be pretty good though.  
+to be pretty good though.
 
 Here is in what ways it improves over the previous solution:
 
@@ -1802,7 +1802,7 @@ statements."
       (setq procedure (match-string 1 string)
             number (match-string 3 string)
             file (match-string 5 string))
-        
+
       ;; Repair the strings
       (setq procedure (idlwave-shell-repair-string procedure))
       (setq number (idlwave-shell-repair-string number))
@@ -1811,7 +1811,7 @@ statements."
       ;; If we have a file, return the frame list
       (if file
           (list (idlwave-shell-file-name file)
-                (string-to-int number)
+                (string-to-number number)
                 procedure)
         ;; No success finding a file
         nil))))
@@ -1828,7 +1828,7 @@ The last line of STRING may be garbage - we check which one makes a valid
 file name."
   (let ((file1 "") (file2 "") (start 0))
     ;; We scan no further than to the next "^%" line
-    (if (string-match "^%" file) 
+    (if (string-match "^%" file)
         (setq file (substring file 0 (match-beginning 0))))
     ;; Take out the line breaks
     (while (string-match "[ \t]*\n[ \t]*" file start)
@@ -1883,7 +1883,7 @@ file name."
 The size is given by `idlwave-shell-graphics-window-size'."
   (interactive "P")
   (let ((n (if n (prefix-numeric-value n) 0)))
-    (idlwave-shell-send-command 
+    (idlwave-shell-send-command
      (apply 'format "window,%d,xs=%d,ys=%d"
             n idlwave-shell-graphics-window-size)
      nil (idlwave-shell-hide-p 'misc) nil t)))
@@ -1903,16 +1903,16 @@ directory."
 Also get rid of widget events in the queue."
   (interactive "P")
   (save-selected-window
-    ;;if (widget_info(/MANAGED))[0] gt 0 then for i=0,n_elements(widget_info(/MANAGED))-1 do widget_control,(widget_info(/MANAGED))[i],/clear_events & 
-    (idlwave-shell-send-command "retall" nil 
-                                (if (idlwave-shell-hide-p 'misc) 'mostly) 
+    ;;if (widget_info(/MANAGED))[0] gt 0 then for i=0,n_elements(widget_info(/MANAGED))-1 do widget_control,(widget_info(/MANAGED))[i],/clear_events &
+    (idlwave-shell-send-command "retall" nil
+                                (if (idlwave-shell-hide-p 'misc) 'mostly)
                                 nil t)
     (idlwave-shell-display-line nil)))
 
 (defun idlwave-shell-closeall (&optional arg)
   "Close all open files."
   (interactive "P")
-  (idlwave-shell-send-command "close,/all" nil 
+  (idlwave-shell-send-command "close,/all" nil
                               (idlwave-shell-hide-p 'misc) nil t))
 
 (defun idlwave-shell-quit (&optional arg)
@@ -1928,7 +1928,7 @@ With prefix ARG, exit without confirmation."
 
 (defun idlwave-shell-reset (&optional hidden)
   "Reset IDL.  Return to main level and destroy the leftover variables.
-This issues the following commands:  
+This issues the following commands:
 RETALL
 WIDGET_CONTROL,/RESET
 CLOSE, /ALL
@@ -1978,14 +1978,14 @@ HEAP_GC, /VERBOSE"
       ;; Set dummy values and kill the text
       (setq sep "@" sep-re "@ *" text "")
       (if idlwave-idlwave_routine_info-compiled
-          (message 
-           "Routine Info warning: No match for BEGIN line in \n>>>\n%s\n<<<\n" 
+          (message
+           "Routine Info warning: No match for BEGIN line in \n>>>\n%s\n<<<\n"
            idlwave-shell-command-output)))
     (if (string-match "^>>>END OF IDLWAVE ROUTINE INFO.*" text)
         (setq text (substring text 0 (match-beginning 0)))
       (if idlwave-idlwave_routine_info-compiled
-          (message 
-           "Routine Info warning: No match for END line in \n>>>\n%s\n<<<\n" 
+          (message
+           "Routine Info warning: No match for END line in \n>>>\n%s\n<<<\n"
            idlwave-shell-command-output)))
     (if (string-match "\\S-" text)
         ;; Obviously, the pro worked.  Make a note that we have it now.
@@ -2003,59 +2003,59 @@ HEAP_GC, /VERBOSE"
             key (nth 4 specs)
             keys (if (and (stringp key)
                           (not (string-match "\\` *\\'" key)))
-                     (mapcar 'list 
+                     (mapcar 'list
                              (delete "" (idlwave-split-string key " +")))))
       (setq name (idlwave-sintern-routine-or-method name class t)
             class (idlwave-sintern-class class t)
             file (if (equal file "") nil file)
-            keys (mapcar (lambda (x) 
+            keys (mapcar (lambda (x)
                            (list (idlwave-sintern-keyword (car x) t))) keys))
-      
+
       ;; In the following ignore routines already defined in buffers,
       ;; assuming that if the buffer stuff differs, it is a "new"
       ;; version, not yet compiled, and should take precedence.
       ;; We could do the same for the library to avoid duplicates -
       ;; but I think frequently a user might have several versions of
-      ;; the same function in different programs, and in this case the 
+      ;; the same function in different programs, and in this case the
       ;; compiled one will be the best guess of all versions.
       ;; Therefore, we leave duplicates of library routines in.
       (cond ((string= name "$MAIN$"))    ; ignore this one
             ((and (string= type "PRO")
                   ;; FIXME: is it OK to make the buffer routines dominate?
                   (or t (null file)
-                      (not (idlwave-rinfo-assq name 'pro class 
+                      (not (idlwave-rinfo-assq name 'pro class
                                                idlwave-buffer-routines)))
                   ;; FIXME: is it OK to make the library routines dominate?
-                  ;;(not (idlwave-rinfo-assq name 'pro class 
+                  ;;(not (idlwave-rinfo-assq name 'pro class
                   ;;                       idlwave-library-routines))
                   )
-             (setq entry (list name 'pro class 
-                               (cons 'compiled 
+             (setq entry (list name 'pro class
+                               (cons 'compiled
                                      (if file
                                          (list
                                           (file-name-nondirectory file)
-                                          (idlwave-sintern-dir 
+                                          (idlwave-sintern-dir
                                            (file-name-directory file)))))
                                cs (cons nil keys)))
-             (if file 
+             (if file
                  (push entry idlwave-compiled-routines)
                (push entry idlwave-unresolved-routines)))
-            
+
             ((and (string= type "FUN")
                   ;; FIXME: is it OK to make the buffer routines dominate?
                   (or t (not file)
-                      (not (idlwave-rinfo-assq name 'fun class 
+                      (not (idlwave-rinfo-assq name 'fun class
                                                idlwave-buffer-routines)))
                   ;; FIXME: is it OK to make the library routines dominate?
-                  ;; (not (idlwave-rinfo-assq name 'fun class 
+                  ;; (not (idlwave-rinfo-assq name 'fun class
                   ;;                       idlwave-library-routines))
                   )
-             (setq entry (list name 'fun class 
+             (setq entry (list name 'fun class
                                (cons 'compiled
                                      (if file
                                          (list
                                           (file-name-nondirectory file)
-                                          (idlwave-sintern-dir 
+                                          (idlwave-sintern-dir
                                            (file-name-directory file)))))
                                cs (cons nil keys)))
              (if file
@@ -2072,7 +2072,7 @@ Change the default directory for the process buffer to concur."
     (set-buffer (idlwave-shell-buffer))
     (if (string-match ",___cur[\n\r]\\(\\S-*\\) *[\n\r]"
                       idlwave-shell-command-output)
-        (let ((dir (substring idlwave-shell-command-output 
+        (let ((dir (substring idlwave-shell-command-output
                               (match-beginning 1) (match-end 1))))
 ;         (message "Setting Emacs working dir to %s" dir)
           (setq idlwave-shell-default-directory dir)
@@ -2086,10 +2086,10 @@ Change the default directory for the process buffer to concur."
         expression)
     (save-excursion
       (goto-char apos)
-      (setq expression (buffer-substring 
+      (setq expression (buffer-substring
                         (catch 'exit
                           (while t
-                            (if (not (re-search-backward 
+                            (if (not (re-search-backward
                                       "[^][.A-Za-z0-9_() ]" bos t))
                                 (throw 'exit bos)) ;ran into bos
                             (if (not (idlwave-is-pointer-dereference bol))
@@ -2117,7 +2117,7 @@ Change the default directory for the process buffer to concur."
                             idlwave-shell-command-output))
          (string-match (concat match "\\([A-Za-z_0-9]+\\)")
                        idlwave-shell-command-output))
-        (setq idlwave-shell-get-object-class 
+        (setq idlwave-shell-get-object-class
               (match-string 1 idlwave-shell-command-output)))))
 
 (defvar idlwave-sint-sysvars nil)
@@ -2131,7 +2131,7 @@ keywords."
   (interactive "P")
   (let (exec-cmd)
     (cond
-     ((and 
+     ((and
        (setq exec-cmd (idlwave-shell-executive-command))
        (cdr exec-cmd)
        (member (upcase (cdr exec-cmd))
@@ -2141,7 +2141,7 @@ keywords."
       (idlwave-shell-complete-filename))
 
      ((car-safe exec-cmd)
-      (setq idlwave-completion-help-info 
+      (setq idlwave-completion-help-info
             '(idlwave-shell-complete-execcomm-help))
       (idlwave-complete-in-buffer 'execcomm 'execcomm
                                   idlwave-executive-commands-alist nil
@@ -2160,7 +2160,7 @@ keywords."
              (let ((case-fold-search t))
                (not (looking-at ".*obj_new")))))
       (idlwave-shell-complete-filename))
-     
+
      (t
       ;; Default completion of modules and keywords
       (idlwave-complete arg)))))
@@ -2182,7 +2182,7 @@ keywords."
 We assume that we are after a file name when completing one of the
 args of an executive .run, .rnew or .compile."
   ;; CWD might have changed, resync, to set default directory
-  (idlwave-shell-resync-dirs) 
+  (idlwave-shell-resync-dirs)
   (let ((comint-file-name-chars idlwave-shell-file-name-chars))
     (comint-dynamic-complete-as-filename)))
 
@@ -2223,7 +2223,7 @@ args of an executive .run, .rnew or .compile."
 
 (defun idlwave-shell-redisplay (&optional hide)
   "Tries to resync the display with where execution has stopped.
-Issues a \"help,/trace\" command followed by a call to 
+Issues a \"help,/trace\" command followed by a call to
 `idlwave-shell-display-line'.  Also updates the breakpoint
 overlays."
   (interactive)
@@ -2236,7 +2236,7 @@ overlays."
   (idlwave-shell-bp-query))
 
 (defun idlwave-shell-display-level-in-calling-stack (&optional hide)
-  (idlwave-shell-send-command 
+  (idlwave-shell-send-command
    "help,/trace"
    `(progn
       ;; scanning for the state will reset the stack level - restore it
@@ -2267,14 +2267,14 @@ overlays."
       (setq idlwave-shell-calling-stack-index nmin
             message (format "%d is the current calling stack level - can't go further down"
                             (- nmin)))))
-    (setq idlwave-shell-calling-stack-routine 
+    (setq idlwave-shell-calling-stack-routine
           (nth 2 (nth idlwave-shell-calling-stack-index stack)))
 
     ;; only edebug if in that mode already
-    (idlwave-shell-display-line 
+    (idlwave-shell-display-line
      (nth idlwave-shell-calling-stack-index stack) nil
-     (unless idlwave-shell-electric-debug-mode 'no-debug)) 
-    (message (or message 
+     (unless idlwave-shell-electric-debug-mode 'no-debug))
+    (message (or message
                  (format "In routine %s (stack level %d)"
                          idlwave-shell-calling-stack-routine
                          (- idlwave-shell-calling-stack-index))))))
@@ -2305,7 +2305,7 @@ used.  Does nothing if the resulting frame is nil."
 (defun idlwave-shell-pc-frame ()
   "Returns the frame for IDL execution."
   (and idlwave-shell-halt-frame
-       (list (nth 0 idlwave-shell-halt-frame) 
+       (list (nth 0 idlwave-shell-halt-frame)
              (nth 1 idlwave-shell-halt-frame)
              (nth 2 idlwave-shell-halt-frame))))
 
@@ -2323,7 +2323,7 @@ column in the line.  If NO-DEBUG is non-nil, do *not* toggle the electric
 debug mode."
   (if (not frame)
       ;; Remove stop-line overlay from old position
-      (progn 
+      (progn
         (setq overlay-arrow-string nil)
         (setq idlwave-shell-mode-line-info nil)
         (setq idlwave-shell-is-stopped nil)
@@ -2340,10 +2340,10 @@ debug mode."
 ;;;
 ;;; buffer : the buffer to display a line in.
 ;;; select-shell: current buffer is the shell.
-;;; 
+;;;
       (setq idlwave-shell-mode-line-info
             (if (nth 2 frame)
-                (format "[%d:%s]" 
+                (format "[%d:%s]"
                         (- idlwave-shell-calling-stack-index)
                         (nth 2 frame))))
       (let* ((buffer (idlwave-find-file-noselect (car frame) 'shell))
@@ -2367,7 +2367,7 @@ debug mode."
             (forward-line 0)
             (setq pos (point))
             (setq idlwave-shell-is-stopped t)
-            
+
             (if idlwave-shell-stop-line-overlay
                 ;; Move overlay
                 (move-overlay idlwave-shell-stop-line-overlay
@@ -2389,12 +2389,12 @@ debug mode."
           ;; If we have the column of the error, move the cursor there.
           (if col (move-to-column col))
           (setq pos (point))
-          
+
           ;; Enter electric debug mode, if not prohibited and not in
           ;; it already
-          (when (and (or 
+          (when (and (or
                       (eq idlwave-shell-automatic-electric-debug t)
-                      (and 
+                      (and
                        (eq idlwave-shell-automatic-electric-debug 'breakpoint)
                        (not (eq idlwave-shell-current-state 'error))))
                      (not no-debug)
@@ -2402,14 +2402,14 @@ debug mode."
                      (not idlwave-shell-electric-debug-mode))
             (idlwave-shell-electric-debug-mode)
             (setq electric t)))
-        
+
         ;; Make sure pos is really displayed in the window.
         (set-window-point window pos)
-        
-        ;; If we came from the shell, go back there.  Otherwise select 
+
+        ;; If we came from the shell, go back there.  Otherwise select
         ;; the window where the error is displayed.
         (if (or (and idlwave-shell-electric-zap-to-file electric)
-                (and (equal (buffer-name) (idlwave-shell-buffer)) 
+                (and (equal (buffer-name) (idlwave-shell-buffer))
                      (not select-shell)))
             (select-window window))))))
 
@@ -2419,35 +2419,35 @@ debug mode."
   (interactive "p")
   (or (not arg) (< arg 1)
       (setq arg 1))
-  (idlwave-shell-send-command 
+  (idlwave-shell-send-command
    (concat ".s " (if (integerp arg) (int-to-string arg) arg))
    nil (if (idlwave-shell-hide-p 'debug) 'mostly) nil t))
 
 (defun idlwave-shell-stepover (arg)
   "Stepover one source line.
-If given prefix argument ARG, step ARG source lines. 
+If given prefix argument ARG, step ARG source lines.
 Uses IDL's stepover executive command which does not enter called functions."
   (interactive "p")
   (or (not arg) (< arg 1)
       (setq arg 1))
-  (idlwave-shell-send-command 
+  (idlwave-shell-send-command
    (concat ".so " (if (integerp arg) (int-to-string arg) arg))
    nil (if (idlwave-shell-hide-p 'debug) 'mostly) nil t))
 
 (defun idlwave-shell-break-here (&optional count cmd condition no-show)
-  "Set breakpoint at current line.  
+  "Set breakpoint at current line.
 
 If Count is nil then an ordinary breakpoint is set.  We treat a count
 of 1 as a temporary breakpoint using the ONCE keyword.  Counts greater
 than 1 use the IDL AFTER=count keyword to break only after reaching
 the statement count times.
 
-Optional argument CMD is a list or function to evaluate upon reaching 
+Optional argument CMD is a list or function to evaluate upon reaching
 the breakpoint."
-  
+
   (interactive "P")
   (when (listp count)
-    (if (equal (car count) 4) 
+    (if (equal (car count) 4)
         (setq condition (read-string "Break Condition: ")))
     (setq count nil))
   (idlwave-shell-set-bp
@@ -2470,7 +2470,7 @@ the problem with not being able to set the breakpoint."
       (progn
         (if (progn
               (beep)
-              (y-or-n-p 
+              (y-or-n-p
                (concat "Okay to recompile file "
                        (idlwave-shell-bp-get bp 'file) " ")))
             ;; Recompile
@@ -2478,7 +2478,7 @@ the problem with not being able to set the breakpoint."
               ;; Clean up before retrying
               (idlwave-shell-command-failure)
               (idlwave-shell-send-command
-               (concat ".run " (idlwave-shell-bp-get bp 'file)) nil 
+               (concat ".run " (idlwave-shell-bp-get bp 'file)) nil
                (if (idlwave-shell-hide-p 'run) 'mostly) nil t)
               ;; Try setting breakpoint again
               (idlwave-shell-set-bp bp))
@@ -2502,9 +2502,9 @@ breakpoint can not be set."
 (defun idlwave-shell-cont (&optional no-show)
   "Continue executing."
   (interactive)
-  (idlwave-shell-send-command ".c" (unless no-show 
+  (idlwave-shell-send-command ".c" (unless no-show
                                      '(idlwave-shell-redisplay 'hide))
-                              (if (idlwave-shell-hide-p 'debug) 'mostly) 
+                              (if (idlwave-shell-hide-p 'debug) 'mostly)
                               nil t))
 
 (defun idlwave-shell-go ()
@@ -2585,7 +2585,7 @@ at a breakpoint."
           ((eq force 'enable) (setq disabled t)))
     (when bp
       (setf (nth 3 (cdr (cdr bp))) (not disabled))
-      (idlwave-shell-send-command 
+      (idlwave-shell-send-command
        (concat "breakpoint,"
                (if disabled "/enable," "/disable,")
                (int-to-string (idlwave-shell-bp-get bp)))
@@ -2599,13 +2599,13 @@ If ENABLE is non-nil, enable them instead."
     (while bpl
       (setq disabled (idlwave-shell-bp-get (car bpl) 'disabled))
       (when (idlwave-xor (not disabled) (eq enable 'enable))
-        (idlwave-shell-toggle-enable-current-bp 
+        (idlwave-shell-toggle-enable-current-bp
          (car bpl) (if (eq enable 'enable) 'enable 'disable) no-update)
         (push (car bpl) modified))
       (setq bpl (cdr bpl)))
     (unless no-update (idlwave-shell-bp-query))
     modified))
-  
+
 (defun idlwave-shell-to-here ()
   "Set a breakpoint with count 1 then continue."
   (interactive)
@@ -2643,7 +2643,7 @@ in the current routine."
 (defun idlwave-shell-set-bp-in-module (module)
   "Set breakpoint in module.  Assumes that `idlwave-shell-sources-alist'
 contains an entry for that module."
-  (let ((source-file (car-safe 
+  (let ((source-file (car-safe
                       (cdr-safe
                        (assoc (upcase module)
                               idlwave-shell-sources-alist))))
@@ -2662,7 +2662,7 @@ contains an entry for that module."
         (save-excursion
           (goto-char (point-min))
           (let ((case-fold-search t))
-            (if (re-search-forward 
+            (if (re-search-forward
                  (concat "^[ \t]*\\(pro\\|function\\)[ \t]+"
                          (downcase module)
                          "[ \t\n,]") nil t)
@@ -2704,7 +2704,7 @@ Sets a breakpoint with count 1 at end of block, then continues."
   "Attempt to run until this procedure exits.
 Runs to the last statement and then steps 1 statement.  Use the .out command."
   (interactive)
-  (idlwave-shell-send-command ".o" nil 
+  (idlwave-shell-send-command ".o" nil
                               (if (idlwave-shell-hide-p 'debug) 'mostly)
                               nil t))
 
@@ -2751,7 +2751,7 @@ Runs to the last statement and then steps 1 statement.  Use the .out command."
      (interactive "e")
      (let ((transient-mark-mode t)
            (zmacs-regions t)
-           (tracker (if (featurep 'xemacs) 
+           (tracker (if (featurep 'xemacs)
                         (if (fboundp 'default-mouse-track-event-is-with-button)
                             'idlwave-xemacs-hack-mouse-track
                           'mouse-track)
@@ -2769,7 +2769,7 @@ Runs to the last statement and then steps 1 statement.  Use the .out command."
   (let ((oldfunc (symbol-function 'default-mouse-track-event-is-with-button)))
     (unwind-protect
         (progn
-          (fset 'default-mouse-track-event-is-with-button 
+          (fset 'default-mouse-track-event-is-with-button
                 'idlwave-default-mouse-track-event-is-with-button)
           (mouse-track event))
       (fset 'default-mouse-track-event-is-with-button oldfunc))))
@@ -2801,7 +2801,7 @@ Runs to the last statement and then steps 1 statement.  Use the .out command."
 (defvar idlwave-shell-examine-completion-list nil)
 
 (defun idlwave-shell-print (arg &optional help ev complete-help-type)
-  "Print current expression.  
+  "Print current expression.
 
 With HELP non-nil, show help on expression.  If HELP is a string,
 the expression will be put in place of ___, e.g.:
@@ -2834,11 +2834,11 @@ idlw-shell-examine-alist via mini-buffer shortcut key."
   (save-excursion
     (let* ((process (get-buffer-process (current-buffer)))
            (process-mark (if process (process-mark process)))
-           (stack-label 
+           (stack-label
             (if (and (integerp idlwave-shell-calling-stack-index)
                      (> idlwave-shell-calling-stack-index 0))
-                (format "  [-%d:%s]" 
-                        idlwave-shell-calling-stack-index 
+                (format "  [-%d:%s]"
+                        idlwave-shell-calling-stack-index
                         idlwave-shell-calling-stack-routine)))
            expr beg end cmd examine-hook)
       (cond
@@ -2868,7 +2868,7 @@ idlw-shell-examine-alist via mini-buffer shortcut key."
            ;; an array
            (forward-sexp))
          (setq end (point)))))
-      
+
       ;; Get expression, but first move the begin mark if a
       ;; process-mark is inside the region, to keep the overlay from
       ;; wandering in the Shell.
@@ -2879,17 +2879,17 @@ idlw-shell-examine-alist via mini-buffer shortcut key."
 
       ;; Show the overlay(s) and attach any necessary hooks and filters
       (when (and beg end idlwave-shell-expression-overlay)
-        (move-overlay idlwave-shell-expression-overlay beg end 
+        (move-overlay idlwave-shell-expression-overlay beg end
                       (current-buffer))
-        (add-hook 'pre-command-hook 
+        (add-hook 'pre-command-hook
                   'idlwave-shell-delete-expression-overlay))
-      (setq examine-hook 
+      (setq examine-hook
             (if idlwave-shell-separate-examine-output
                 'idlwave-shell-examine-display
               'idlwave-shell-examine-highlight))
       (add-hook 'pre-command-hook
                 'idlwave-shell-delete-output-overlay)
-      
+
       ;; Remove empty or comment-only lines
       (while (string-match "\n[ \t]*\\(;.*\\)?\r*\n" expr)
         (setq expr (replace-match "\n" t t expr)))
@@ -2899,41 +2899,41 @@ idlw-shell-examine-alist via mini-buffer shortcut key."
       ;; Remove final newline
       (if (string-match "\n[ \t\r]*\\'" expr)
           (setq expr (replace-match "" t t expr)))
-      
+
       (catch 'exit
         ;; Pop-up or complete on the examine selection list, if appropriate
         (if (or
              complete-help-type
              (and ev idlwave-shell-examine-alist)
              (consp help))
-            (let ((help-cons 
+            (let ((help-cons
                    (if (consp help) help
-                     (assoc 
+                     (assoc
                       ;; A cons from either a pop-up or mini-buffer completion
                       (if complete-help-type
                           (idlwave-one-key-select 'idlwave-shell-examine-alist
                                                   "Examine with: " 1.5)
 ;;                        (idlwave-completing-read
-;;                         "Examine with: " 
+;;                         "Examine with: "
 ;;                         idlwave-shell-examine-alist nil nil nil
 ;;                         'idlwave-shell-examine-completion-list
 ;;                         "Print")
-                        (idlwave-popup-select 
-                         ev 
-                         (mapcar 'car idlwave-shell-examine-alist) 
+                        (idlwave-popup-select
+                         ev
+                         (mapcar 'car idlwave-shell-examine-alist)
                          "Examine with"))
                       idlwave-shell-examine-alist))))
               (setq help (cdr help-cons))
               (if (null help) (throw 'exit nil))
               (if idlwave-shell-separate-examine-output
-                  (setq idlwave-shell-examine-label 
-                        (concat 
+                  (setq idlwave-shell-examine-label
+                        (concat
                          (format "==>%s<==\n%s:" expr (car help-cons))
                          stack-label "\n"))))
           ;; The regular help label (no popups, cons cells, etc.)
           (setq idlwave-shell-examine-label
                 (concat
-                 (format "==>%s<==\n%s:" expr 
+                 (format "==>%s<==\n%s:" expr
                          (cond ((null help) "print")
                                ((stringp help) help)
                                (t (symbol-name help))))
@@ -2946,9 +2946,9 @@ idlw-shell-examine-alist via mini-buffer shortcut key."
                         idlwave-shell-calling-stack-index)))
         (setq cmd (idlwave-shell-help-statement help expr))
         ;;(idlwave-shell-recenter-shell-window)
-        (idlwave-shell-send-command 
-         cmd 
-         examine-hook 
+        (idlwave-shell-send-command
+         cmd
+         examine-hook
          (if idlwave-shell-separate-examine-output 'hide))))))
 
 (defvar idlwave-shell-examine-window-alist nil
@@ -2975,9 +2975,9 @@ idlw-shell-examine-alist via mini-buffer shortcut key."
           (let* ((end (or
                        (re-search-backward idlwave-shell-prompt-pattern nil t)
                        (point-max)))
-                 (beg (progn 
+                 (beg (progn
                         (goto-char
-                         (or (progn (if (re-search-backward 
+                         (or (progn (if (re-search-backward
                                          idlwave-shell-prompt-pattern nil t)
                                         (match-end 0)))
                              (point-min)))
@@ -2994,21 +2994,21 @@ idlw-shell-examine-alist via mini-buffer shortcut key."
         (setq buffer-read-only t)
         (move-overlay idlwave-shell-output-overlay cur-beg cur-end
                       (current-buffer))
-        
+
         ;; Look for the examine buffer in all windows.  If one is
         ;; found in a frame all by itself, use that, otherwise, switch
         ;; to or create an examine window in this frame, and resize if
         ;; it's a newly created window
         (let* ((winlist (get-buffer-window-list "*Examine*" nil 'visible)))
-          (setq win (idlwave-display-buffer 
-                     "*Examine*" 
+          (setq win (idlwave-display-buffer
+                     "*Examine*"
                      nil
                      (let ((list winlist) thiswin)
                        (catch 'exit
                          (save-selected-window
                            (while (setq thiswin (pop list))
                              (select-window thiswin)
-                             (if (one-window-p) 
+                             (if (one-window-p)
                                  (throw 'exit (window-frame thiswin)))))))))
           (set-window-start win (point-min)) ; Ensure the point is visible.
           (save-selected-window
@@ -3029,7 +3029,7 @@ idlw-shell-examine-alist via mini-buffer shortcut key."
                 ;; And add the new value.
                 (if (setq elt (assoc win idlwave-shell-examine-window-alist))
                     (setcdr elt (window-height))
-                  (add-to-list 'idlwave-shell-examine-window-alist 
+                  (add-to-list 'idlwave-shell-examine-window-alist
                                (cons win (window-height)))))))))
       ;; Recenter for maximum output, after widened
       (save-selected-window
@@ -3047,7 +3047,7 @@ idlw-shell-examine-alist via mini-buffer shortcut key."
 
 (defun idlwave-shell-examine-display-clear ()
   (interactive)
-  (save-excursion 
+  (save-excursion
     (let ((buf (get-buffer "*Examine*")))
       (when (bufferp buf)
         (set-buffer buf)
@@ -3075,7 +3075,7 @@ versions of IDL."
     ;; break.  We will look for identifiers and exclude cases where we
     ;; know it is not a variable.  To distinguish array references from
     ;; function calls, we require that arrays use [] instead of ()
-    
+
     (while (string-match
             "\\(\\`\\|[^a-zA-Z0-9$_][ \t]*\\)\\([a-zA-Z][a-zA-Z0-9$_]*\\)\\([ \t]*[^a-zA-Z0-9$_]\\|\\'\\)" expr start)
       (setq var (match-string 2 expr)
@@ -3091,7 +3091,7 @@ versions of IDL."
        ((string-match "->[ \t]*\\'" pre))        ;; a method
        ((string-match "\\.\\'" pre))             ;; structure member
        ((and (string-match "\\([\"\']\\)[^\1]*$" pre)
-             (string-match (concat "^[^" (match-string 1 pre) "]*" 
+             (string-match (concat "^[^" (match-string 1 pre) "]*"
                                    (match-string 1 pre)) post)))
        (t ;; seems to be a variable - replace its name in the
           ;; expression with the fetch.
@@ -3109,13 +3109,13 @@ to insert expression in place of the marker ___, e.g.: print,
 size(___,/DIMENSIONS)"
   (cond
    ((null help) (concat "print, " expr))
-   ((stringp help) 
+   ((stringp help)
     (if (string-match "\\(^\\|[^_]\\)\\(___\\)\\([^_]\\|$\\)" help)
         (concat (substring help 0 (match-beginning 2))
                 expr
                 (substring help (match-end 2)))))
    (t (concat "help, " expr))))
-   
+
 
 (defun idlwave-shell-examine-highlight ()
   "Highlight the most recent IDL output."
@@ -3123,7 +3123,7 @@ size(___,/DIMENSIONS)"
          (process (get-buffer-process buffer))
          (process-mark (if process (process-mark process)))
          output-begin output-end)
-    (save-excursion 
+    (save-excursion
       (set-buffer buffer)
       (goto-char process-mark)
       (beginning-of-line)
@@ -3131,12 +3131,12 @@ size(___,/DIMENSIONS)"
       (re-search-backward idlwave-shell-prompt-pattern nil t)
       (beginning-of-line 2)
       (setq output-begin (point)))
-            
+
     ;; First make sure the shell window is visible
     (idlwave-display-buffer (idlwave-shell-buffer)
                             nil (idlwave-shell-shell-frame))
     (if (and idlwave-shell-output-overlay process-mark)
-        (move-overlay idlwave-shell-output-overlay 
+        (move-overlay idlwave-shell-output-overlay
                       output-begin output-end buffer))))
 
 (defun idlwave-shell-delete-output-overlay ()
@@ -3147,7 +3147,7 @@ size(___,/DIMENSIONS)"
             (delete-overlay idlwave-shell-output-overlay))
       (error nil))
     (remove-hook 'pre-command-hook 'idlwave-shell-delete-output-overlay)))
-  
+
 (defun idlwave-shell-delete-expression-overlay ()
   (unless (or (eq this-command 'idlwave-shell-mouse-nop)
               (eq this-command 'handle-switch-frame))
@@ -3176,7 +3176,7 @@ contains four items:
 count - number of times to execute breakpoint. When count reaches 0
   the breakpoint is cleared and removed from the alist.
 
-command - command to execute when breakpoint is reached, either a 
+command - command to execute when breakpoint is reached, either a
   lisp function to be called with `funcall' with no arguments or a
   list to be evaluated with `eval'.
 
@@ -3209,11 +3209,11 @@ If there is a prefix argument, display IDL process."
           (insert "\nend\n"))
       (save-buffer 0)))
   (idlwave-shell-send-command (concat ".run " idlwave-shell-temp-pro-file)
-                              nil 
+                              nil
                               (if (idlwave-shell-hide-p 'run) 'mostly)
                               nil t)
   (if n
-      (idlwave-display-buffer (idlwave-shell-buffer) 
+      (idlwave-display-buffer (idlwave-shell-buffer)
                               nil (idlwave-shell-shell-frame))))
 
 (defun idlwave-shell-evaluate-region (beg end &optional n)
@@ -3224,7 +3224,7 @@ Does not work for a region with multiline blocks - use
   (interactive "r\nP")
   (idlwave-shell-send-command (buffer-substring beg end))
   (if n
-      (idlwave-display-buffer (idlwave-shell-buffer) 
+      (idlwave-display-buffer (idlwave-shell-buffer)
                               nil (idlwave-shell-shell-frame))))
 
 (defun idlwave-shell-delete-temp-files ()
@@ -3279,7 +3279,7 @@ Queries IDL using the string in `idlwave-shell-bp-query'."
                               'hide))
 
 (defun idlwave-shell-bp-get (bp &optional item)
-  "Get a value for a breakpoint.  
+  "Get a value for a breakpoint.
 BP has the form of elements in idlwave-shell-bp-alist.  Optional
 second arg ITEM is the particular value to retrieve.  ITEM can be
 'file, 'line, 'index, 'module, 'count, 'cmd, 'condition, 'disabled or
@@ -3314,8 +3314,8 @@ breakpoint overlays."
           ;; Searching the breakpoints
           ;; In IDL 5.5, the breakpoint reporting format changed.
           (bp-re54 "^[ \t]*\\([0-9]+\\)[ \t]+\\(\\S-+\\)?[ \t]+\\([0-9]+\\)[ \t]+\\(\\S-+\\)")
-          (bp-re55 
-           (concat 
+          (bp-re55
+           (concat
             "^\\s-*\\([0-9]+\\)"    ; 1 index
             "\\s-+\\([0-9]+\\)"     ; 2 line number
             "\\s-+\\(Uncompiled\\|" ; 3-6 either uncompiled or routine name
@@ -3330,27 +3330,27 @@ breakpoint overlays."
           bp-re indmap)
       (setq idlwave-shell-bp-alist (list nil))
       ;; Search for either header type, and set the correct regexp
-      (when (or 
+      (when (or
              (if (re-search-forward "^\\s-*Index.*\n\\s-*-" nil t)
-                 (setq bp-re bp-re54    ; versions <= 5.4 
+                 (setq bp-re bp-re54    ; versions <= 5.4
                        indmap '(1 2 3 4))) ;index module line file
-             (if (re-search-forward 
+             (if (re-search-forward
                   "^\\s-*Index\\s-*Line\\s-*Attributes\\s-*File" nil t)
                  (setq bp-re bp-re55    ; versions >= 5.5
                        indmap '(1 6 2 16)))) ; index module line file
         ;; There seems to be a breakpoint listing here, parse breakpoint lines.
         (while (re-search-forward bp-re nil t)
-          (setq index (string-to-int (match-string (nth 0 indmap)))
+          (setq index (string-to-number (match-string (nth 0 indmap)))
                 module (match-string (nth 1 indmap))
-                line (string-to-int (match-string (nth 2 indmap)))
+                line (string-to-number (match-string (nth 2 indmap)))
                 file (idlwave-shell-file-name (match-string (nth 3 indmap))))
           (if (eq bp-re bp-re55)
-              (setq count (if (match-string 10) 1 
+              (setq count (if (match-string 10) 1
                             (if (match-string 8)
-                                (string-to-int (match-string 8))))
+                                (string-to-number (match-string 8))))
                     condition (match-string 13)
                     disabled (not (null (match-string 15)))))
-                    
+
           ;; Add the breakpoint info to the list
           (nconc idlwave-shell-bp-alist
                  (list (cons (list file line)
@@ -3360,7 +3360,7 @@ breakpoint overlays."
                               count nil condition disabled))))))
       (setq idlwave-shell-bp-alist (cdr idlwave-shell-bp-alist))
       ;; Update breakpoint data
-      (if (eq bp-re bp-re54) 
+      (if (eq bp-re bp-re54)
           (mapcar 'idlwave-shell-update-bp old-bp-alist)
         (mapcar 'idlwave-shell-update-bp-command-only old-bp-alist))))
   ;; Update the breakpoint overlays
@@ -3375,8 +3375,8 @@ breakpoint overlays."
   "Update BP data in breakpoint list.
 If BP frame is in `idlwave-shell-bp-alist' updates the breakpoint data."
   (let ((match (assoc (car bp) idlwave-shell-bp-alist)))
-    (if match 
-        (if command-only 
+    (if match
+        (if command-only
             (setf (nth 1 (cdr (cdr match))) (nth 1 (cdr (cdr match))))
           (setcdr (cdr match) (cdr (cdr bp)))))))
 
@@ -3401,7 +3401,7 @@ Otherwise return the filename in bp."
   (let*
       ((bp-file (idlwave-shell-bp-get bp 'file))
        (bp-module (idlwave-shell-bp-get bp 'module))
-       (internal-file-list 
+       (internal-file-list
         (cdr (assoc bp-module idlwave-shell-sources-alist))))
     (if (and internal-file-list
              (equal bp-file (nth 0 internal-file-list)))
@@ -3409,14 +3409,14 @@ Otherwise return the filename in bp."
       bp-file)))
 
 (defun idlwave-shell-set-bp (bp &optional no-show)
-  "Try to set a breakpoint BP.  
+  "Try to set a breakpoint BP.
 The breakpoint will be placed at the beginning of the statement on the
 line specified by BP or at the next IDL statement if that line is not
 a statement.  Determines IDL's internal representation for the
 breakpoint, which may have occurred at a different line than
 specified.  If NO-SHOW is non-nil, don't do any updating."
   ;; Get and save the old breakpoints
-  (idlwave-shell-send-command 
+  (idlwave-shell-send-command
    idlwave-shell-bp-query
    `(progn
      (idlwave-shell-filter-bp (quote ,no-show))
@@ -3434,7 +3434,7 @@ specified.  If NO-SHOW is non-nil, don't do any updating."
 (defun idlwave-shell-set-bp2 (bp &optional no-show)
   "Use results of breakpoint and sources query to set bp.
 Use the count argument with IDLs breakpoint command.
-We treat a count of 1 as a temporary breakpoint. 
+We treat a count of 1 as a temporary breakpoint.
 Counts greater than 1 use the IDL AFTER=count keyword to break
 only after reaching the statement count times."
   (let*
@@ -3446,11 +3446,11 @@ only after reaching the statement count times."
               ((> arg 1)
                (format ",after=%d" arg))))
        (condition (idlwave-shell-bp-get bp 'condition))
-       (key (concat key 
+       (key (concat key
                     (if condition (concat ",CONDITION=\"" condition "\""))))
        (line (idlwave-shell-bp-get bp 'line)))
     (idlwave-shell-send-command
-     (concat "breakpoint,'" 
+     (concat "breakpoint,'"
              (idlwave-shell-sources-bp bp) "',"
              (if (integerp line) (setq line (int-to-string line)))
              key)
@@ -3534,14 +3534,14 @@ Existing overlays are recycled, in order to minimize consumption."
           ov ov-list bp buf old-buffers win)
 
       ;; Delete the old overlays from their buffers
-      (if ov-alist 
+      (if ov-alist
           (while (setq ov-list (pop ov-alist))
             (while (setq ov (pop (cdr ov-list)))
               (add-to-list 'old-buffers (overlay-buffer ov))
               (delete-overlay ov))))
-      
+
       (setq ov-alist idlwave-shell-bp-overlays
-            idlwave-shell-bp-overlays 
+            idlwave-shell-bp-overlays
             (if idlwave-shell-bp-glyph
                 (mapcar 'list (mapcar 'car idlwave-shell-bp-glyph))
               (list (list 'bp))))
@@ -3565,7 +3565,7 @@ Existing overlays are recycled, in order to minimize consumption."
                               (t 'bp-n)))
                             (t 'bp))
                          'bp))
-                 (help-list 
+                 (help-list
                   (delq nil
                         (list
                          (if count
@@ -3573,7 +3573,7 @@ Existing overlays are recycled, in order to minimize consumption."
                          (if condition
                              (concat "condition: " condition))
                          (if disabled "disabled"))))
-                 (help-text (if help-list 
+                 (help-text (if help-list
                                 (mapconcat 'identity help-list ",")))
                  (full-type (if disabled
                                 (intern (concat (symbol-name type)
@@ -3582,7 +3582,7 @@ Existing overlays are recycled, in order to minimize consumption."
                  (ov-existing (assq full-type ov-alist))
                  (ov (or (and (cdr ov-existing)
                               (pop (cdr ov-existing)))
-                         (idlwave-shell-make-new-bp-overlay 
+                         (idlwave-shell-make-new-bp-overlay
                           type disabled help-text)))
                  match)
             (move-overlay ov beg end)
@@ -3592,7 +3592,7 @@ Existing overlays are recycled, in order to minimize consumption."
                      (list (list full-type ov)))))
           ;; Take care of margins if using a glyph
           (when use-glyph
-            (if old-buffers 
+            (if old-buffers
                 (setq old-buffers (delq (current-buffer) old-buffers)))
             (if (fboundp 'set-specifier) ;; XEmacs
                 (set-specifier left-margin-width (cons (current-buffer) 2))
@@ -3610,7 +3610,7 @@ Existing overlays are recycled, in order to minimize consumption."
 
 
 (defun idlwave-shell-make-new-bp-overlay (&optional type disabled help)
-  "Make a new overlay for highlighting breakpoints.  
+  "Make a new overlay for highlighting breakpoints.
 
 This stuff is strongly dependant upon the version of Emacs.  If TYPE
 is passed, make an overlay of that type ('bp or 'bp-cond, currently
@@ -3620,17 +3620,17 @@ text popup."
         (use-glyph (and (memq idlwave-shell-mark-breakpoints '(t glyph))
                         idlwave-shell-bp-glyph))
         (type (or type 'bp))
-        (face (if disabled 
+        (face (if disabled
                   idlwave-shell-disabled-breakpoint-face
                 idlwave-shell-breakpoint-face)))
     (if (featurep 'xemacs)
         ;; This is XEmacs
         (progn
-          (cond 
+          (cond
            ;; tty's cannot display glyphs
            ((eq (console-type) 'tty)
             (set-extent-property ov 'face face))
-            
+
            ;; use the glyph
            (use-glyph
             (let ((glyph (cdr (assq type idlwave-shell-bp-glyph))))
@@ -3651,13 +3651,13 @@ text popup."
         (if use-glyph
             (let ((image-props (cdr (assq type idlwave-shell-bp-glyph)))
                   string)
-              
+
               (if disabled (setq image-props
-                                 (append image-props 
+                                 (append image-props
                                          (list :conversion 'disabled))))
-              (setq string 
-                   (propertize "@" 
-                               'display 
+              (setq string
+                   (propertize "@"
+                               'display
                                (list (list 'margin 'left-margin)
                                      image-props)
                                'mouse-face 'highlight
@@ -3685,14 +3685,14 @@ text popup."
 Also with prefix arg, ask for the command.  You can also use the command
 `idlwave-shell-edit-default-command-line' to edit the line."
   (interactive "P")
-  (cond 
+  (cond
    ((equal arg '(16))
     (setq idlwave-shell-command-line-to-execute nil))
    ((equal arg '(4))
-    (setq idlwave-shell-command-line-to-execute 
+    (setq idlwave-shell-command-line-to-execute
           (read-string "IDL> " idlwave-shell-command-line-to-execute))))
   (idlwave-shell-reset 'hidden)
-  (idlwave-shell-send-command 
+  (idlwave-shell-send-command
    (or idlwave-shell-command-line-to-execute
        (with-current-buffer (idlwave-shell-buffer)
          (ring-ref comint-input-ring 0)))
@@ -3702,7 +3702,7 @@ Also with prefix arg, ask for the command.  You can also use the command
   "Save file and run it in IDL.
 Runs `save-buffer' and sends a '.RUN' command for the associated file to IDL.
 When called from the shell buffer, re-run the file which was last handled by
-one of the save-and-.. commands."  
+one of the save-and-.. commands."
   (interactive)
   (idlwave-shell-save-and-action 'run))
 
@@ -3718,7 +3718,7 @@ one of the save-and-.. commands."
   "Save file and batch it in IDL.
 Runs `save-buffer' and sends a '@file' command for the associated file to IDL.
 When called from the shell buffer, re-batch the file which was last handled by
-one of the save-and-.. commands."  
+one of the save-and-.. commands."
   (interactive)
   (idlwave-shell-save-and-action 'batch))
 
@@ -3758,7 +3758,7 @@ handled by this command."
          'idlwave-shell-maybe-update-routine-info
          (if (idlwave-shell-hide-p 'run) 'mostly) nil t)
         (idlwave-shell-bp-query))
-    (let ((msg (format "No such file %s" 
+    (let ((msg (format "No such file %s"
                        idlwave-shell-last-save-and-action-file)))
       (setq idlwave-shell-last-save-and-action-file nil)
       (error msg))))
@@ -3791,7 +3791,7 @@ Queries IDL using the string in `idlwave-shell-sources-query'."
 
 (defun idlwave-shell-sources-filter ()
   "Get source files from `idlwave-shell-sources-query' output.
-Create `idlwave-shell-sources-alist' consisting of 
+Create `idlwave-shell-sources-alist' consisting of
 list elements of the form:
  (module name . (source-file-truename idlwave-internal-filename))."
   (save-excursion
@@ -3876,9 +3876,9 @@ list elements of the form:
                   (list
                    (save-match-data
                      (idlwave-shell-file-name
-                      (buffer-substring (match-beginning 1 ) 
+                      (buffer-substring (match-beginning 1 )
                                         (match-end 1))))
-                   (string-to-int
+                   (string-to-number
                     (buffer-substring (match-beginning 2)
                                       (match-end 2)))))
             ;; Try to find the column of the error
@@ -3943,13 +3943,13 @@ Otherwise, just expand the file name."
 
 ;; The mouse bindings for PRINT and HELP
 (idlwave-shell-define-key-both
- (if (featurep 'xemacs) 
-     [(shift button2)] 
+ (if (featurep 'xemacs)
+     [(shift button2)]
    [(shift down-mouse-2)])
  'idlwave-shell-mouse-print)
 (idlwave-shell-define-key-both
- (if (featurep 'xemacs) 
-     [(control meta button2)] 
+ (if (featurep 'xemacs)
+     [(control meta button2)]
    [(control meta down-mouse-2)])
   'idlwave-shell-mouse-help)
 (idlwave-shell-define-key-both
@@ -3958,14 +3958,14 @@ Otherwise, just expand the file name."
    [(control shift down-mouse-2)])
  'idlwave-shell-examine-select)
 ;; Add this one from the idlwave-mode-map
-(define-key idlwave-shell-mode-map 
+(define-key idlwave-shell-mode-map
   (if (featurep 'xemacs)
       [(shift button3)]
     [(shift mouse-3)])
   'idlwave-mouse-context-help)
 
 ;; For Emacs, we need to turn off the button release events.
-(defun idlwave-shell-mouse-nop (event) 
+(defun idlwave-shell-mouse-nop (event)
   (interactive "e"))
 (unless (featurep 'xemacs)
   (idlwave-shell-define-key-both
@@ -3975,7 +3975,7 @@ Otherwise, just expand the file name."
   (idlwave-shell-define-key-both
    [(control meta mouse-2)] 'idlwave-shell-mouse-nop))
 
-  
+
 ;; The following set of bindings is used to bind the debugging keys.
 ;; If `idlwave-shell-activate-prefix-keybindings' is non-nil, the
 ;; first key in the list gets bound the C-c C-d prefix map.  If
@@ -3984,10 +3984,10 @@ Otherwise, just expand the file name."
 ;; `idlwave-mode-map' and `idlwave-shell-mode-map'.  The next list
 ;; item, if non-nil, means to bind this as a single key in the
 ;; electric-debug-mode-map.
-;; 
+;;
 ;; [C-c C-d]-binding   debug-modifier-key command bind-electric-debug buf-only
-;; Used keys:   abcdef hijklmnopqrstuvwxyz 
-;; Unused keys:       g             
+;; Used keys:   abcdef hijklmnopqrstuvwxyz
+;; Unused keys:       g
 (let* ((specs
         '(([(control ?b)]   ?b   idlwave-shell-break-here t t)
           ([(control ?i)]   ?i   idlwave-shell-break-in t t)
@@ -4037,10 +4037,10 @@ Otherwise, just expand the file name."
           electric (nth 3 s)
           only-buffer (nth 4 s)
           cannotshift (and shift (char-valid-p c2) (eq c2 (upcase c2))))
-    
+
     ;; The regular prefix keymap.
     (when (and idlwave-shell-activate-prefix-keybindings k1)
-      (unless only-buffer 
+      (unless only-buffer
         (define-key idlwave-shell-mode-prefix-map k1 cmd))
       (define-key idlwave-mode-prefix-map k1 cmd))
     ;; The debug modifier map
@@ -4054,24 +4054,24 @@ Otherwise, just expand the file name."
         (unless only-buffer (define-key idlwave-shell-mode-map k2 cmd))))
     ;; The electric debug single-keystroke map
     (if (and electric (char-or-string-p c2))
-        (define-key idlwave-shell-electric-debug-mode-map (char-to-string c2) 
+        (define-key idlwave-shell-electric-debug-mode-map (char-to-string c2)
           cmd))))
 
 ;; A few extras in the electric debug map
 (define-key idlwave-shell-electric-debug-mode-map " " 'idlwave-shell-step)
 (define-key idlwave-shell-electric-debug-mode-map "+" 'idlwave-shell-stack-up)
 (define-key idlwave-shell-electric-debug-mode-map "=" 'idlwave-shell-stack-up)
-(define-key idlwave-shell-electric-debug-mode-map "-" 
+(define-key idlwave-shell-electric-debug-mode-map "-"
   'idlwave-shell-stack-down)
-(define-key idlwave-shell-electric-debug-mode-map "_" 
+(define-key idlwave-shell-electric-debug-mode-map "_"
   'idlwave-shell-stack-down)
 (define-key idlwave-shell-electric-debug-mode-map "q" 'idlwave-shell-retall)
-(define-key idlwave-shell-electric-debug-mode-map "t" 
+(define-key idlwave-shell-electric-debug-mode-map "t"
   '(lambda () (interactive) (idlwave-shell-send-command "help,/TRACE")))
 (define-key idlwave-shell-electric-debug-mode-map [(control ??)]
   'idlwave-shell-electric-debug-help)
-(define-key idlwave-shell-electric-debug-mode-map "x" 
-  '(lambda (arg) (interactive "P") 
+(define-key idlwave-shell-electric-debug-mode-map "x"
+  '(lambda (arg) (interactive "P")
      (idlwave-shell-print arg nil nil t)))
 
 
@@ -4092,12 +4092,12 @@ Otherwise, just expand the file name."
     (setq idlwave-shell-suppress-electric-debug nil))
   (idlwave-shell-electric-debug-mode))
 
-(defvar idlwave-shell-electric-debug-read-only) 
+(defvar idlwave-shell-electric-debug-read-only)
 (defvar idlwave-shell-electric-debug-buffers nil)
 
 (easy-mmode-define-minor-mode idlwave-shell-electric-debug-mode
   "Toggle Electric Debug mode.
-With no argument, this command toggles the mode. 
+With no argument, this command toggles the mode.
 Non-null prefix argument turns on the mode.
 Null prefix argument turns off the mode.
 
@@ -4107,7 +4107,7 @@ nil
 " *Debugging*"
 idlwave-shell-electric-debug-mode-map)
 
-(add-hook 
+(add-hook
  'idlwave-shell-electric-debug-mode-on-hook
  (lambda ()
    (set (make-local-variable 'idlwave-shell-electric-debug-read-only)
@@ -4115,13 +4115,13 @@ idlwave-shell-electric-debug-mode-map)
    (setq buffer-read-only t)
    (add-to-list 'idlwave-shell-electric-debug-buffers (current-buffer))
    (if idlwave-shell-stop-line-overlay
-       (overlay-put idlwave-shell-stop-line-overlay 'face 
+       (overlay-put idlwave-shell-stop-line-overlay 'face
                     idlwave-shell-electric-stop-line-face))
    (if (facep 'fringe)
        (set-face-foreground 'fringe idlwave-shell-electric-stop-color
                             (selected-frame)))))
 
-(add-hook 
+(add-hook
  'idlwave-shell-electric-debug-mode-off-hook
  (lambda ()
    ;; Return to previous read-only state
@@ -4130,7 +4130,7 @@ idlwave-shell-electric-debug-mode-map)
    (setq idlwave-shell-electric-debug-buffers
          (delq (current-buffer) idlwave-shell-electric-debug-buffers))
    (if idlwave-shell-stop-line-overlay
-       (overlay-put idlwave-shell-stop-line-overlay 'face 
+       (overlay-put idlwave-shell-stop-line-overlay 'face
                     idlwave-shell-stop-line-face)
      (if (facep 'fringe)
          (set-face-foreground 'fringe (face-foreground 'default))))))
@@ -4161,7 +4161,7 @@ idlwave-shell-electric-debug-mode-map)
 ;; Show the help text
 (defun idlwave-shell-electric-debug-help ()
   (interactive)
-  (with-output-to-temp-buffer "*IDLWAVE Electric Debug Help*" 
+  (with-output-to-temp-buffer "*IDLWAVE Electric Debug Help*"
     (princ idlwave-shell-electric-debug-help))
   (let* ((current-window (selected-window))
          (window (get-buffer-window "*IDLWAVE Electric Debug Help*"))
@@ -4176,7 +4176,7 @@ idlwave-shell-electric-debug-mode-map)
   `("Debug"
     ["Electric Debug Mode"
      idlwave-shell-electric-debug-mode
-     :style toggle :selected idlwave-shell-electric-debug-mode 
+     :style toggle :selected idlwave-shell-electric-debug-mode
      :included (eq major-mode 'idlwave-mode) :keys "C-c C-d C-v"]
     "--"
     ("Compile & Run"
@@ -4192,35 +4192,35 @@ idlwave-shell-electric-debug-mode-map)
      "--"
      ["Goto Next Error" idlwave-shell-goto-next-error t]
      "--"
-     ["Compile and Run Region" idlwave-shell-run-region 
+     ["Compile and Run Region" idlwave-shell-run-region
       (eq major-mode 'idlwave-mode)]
-     ["Evaluate Region" idlwave-shell-evaluate-region 
+     ["Evaluate Region" idlwave-shell-evaluate-region
       (eq major-mode 'idlwave-mode)]
      "--"
      ["Execute Default Cmd" idlwave-shell-execute-default-command-line t]
      ["Edit Default Cmd" idlwave-shell-edit-default-command-line t])
     ("Breakpoints"
-     ["Set Breakpoint" idlwave-shell-break-here 
+     ["Set Breakpoint" idlwave-shell-break-here
       :keys "C-c C-d C-c" :active (eq major-mode 'idlwave-mode)]
      ("Set Special Breakpoint"
       ["Set After Count Breakpoint"
        (progn
-        (let ((count (string-to-int (read-string "Break after count: "))))
+        (let ((count (string-to-number (read-string "Break after count: "))))
               (if (integerp count) (idlwave-shell-break-here count))))
        :active (eq major-mode 'idlwave-mode)]
       ["Set Condition Breakpoint"
        (idlwave-shell-break-here '(4))
        :active (eq major-mode 'idlwave-mode)])
-     ["Break in Module" idlwave-shell-break-in 
+     ["Break in Module" idlwave-shell-break-in
       :keys "C-c C-d C-i" :active (eq major-mode 'idlwave-mode)]
      ["Break in this Module" idlwave-shell-break-this-module
       :keys "C-c C-d C-j" :active (eq major-mode 'idlwave-mode)]
      ["Clear Breakpoint" idlwave-shell-clear-current-bp t]
      ["Clear All Breakpoints" idlwave-shell-clear-all-bp t]
      ["Disable/Enable Breakpoint" idlwave-shell-toggle-enable-current-bp t]
-     ["Goto Previous Breakpoint" idlwave-shell-goto-previous-bp 
+     ["Goto Previous Breakpoint" idlwave-shell-goto-previous-bp
       :keys "C-c C-d [" :active (eq major-mode 'idlwave-mode)]
-     ["Goto Next Breakpoint" idlwave-shell-goto-next-bp 
+     ["Goto Next Breakpoint" idlwave-shell-goto-next-bp
       :keys "C-c C-d ]" :active (eq major-mode 'idlwave-mode)]
      ["List All Breakpoints" idlwave-shell-list-all-bp t]
      ["Resync Breakpoints" idlwave-shell-bp-query t])
@@ -4252,38 +4252,38 @@ idlwave-shell-electric-debug-mode-map)
      ["Redisplay and Sync" idlwave-shell-redisplay t])
     ("Show Commands"
      ["Everything" (if (eq idlwave-shell-show-commands 'everything)
-                       (progn 
+                       (progn
                          (setq idlwave-shell-show-commands
                                (get 'idlwave-shell-show-commands 'last-val))
                          (put 'idlwave-shell-show-commands 'last-val nil))
-                     (put 'idlwave-shell-show-commands 'last-val 
+                     (put 'idlwave-shell-show-commands 'last-val
                           idlwave-shell-show-commands)
                      (setq idlwave-shell-show-commands 'everything))
       :style toggle :selected (and (not (listp idlwave-shell-show-commands))
-                                   (eq idlwave-shell-show-commands 
+                                   (eq idlwave-shell-show-commands
                                        'everything))]
      "--"
      ["Compiling Commands" (idlwave-shell-add-or-remove-show 'run)
-      :style toggle 
-      :selected (not (idlwave-shell-hide-p 
+      :style toggle
+      :selected (not (idlwave-shell-hide-p
                       'run
                       (get 'idlwave-shell-show-commands 'last-val)))
       :active (not (eq idlwave-shell-show-commands 'everything))]
      ["Breakpoint Commands" (idlwave-shell-add-or-remove-show 'breakpoint)
-      :style toggle 
-      :selected (not (idlwave-shell-hide-p 
+      :style toggle
+      :selected (not (idlwave-shell-hide-p
                       'breakpoint
                       (get 'idlwave-shell-show-commands 'last-val)))
       :active (not (eq idlwave-shell-show-commands 'everything))]
      ["Debug Commands" (idlwave-shell-add-or-remove-show 'debug)
-      :style toggle 
-      :selected (not (idlwave-shell-hide-p 
+      :style toggle
+      :selected (not (idlwave-shell-hide-p
                       'debug
                       (get 'idlwave-shell-show-commands 'last-val)))
       :active (not (eq idlwave-shell-show-commands 'everything))]
      ["Miscellaneous Commands" (idlwave-shell-add-or-remove-show 'misc)
-      :style toggle 
-      :selected (not (idlwave-shell-hide-p 
+      :style toggle
+      :selected (not (idlwave-shell-hide-p
                       'misc
                       (get 'idlwave-shell-show-commands 'last-val)))
       :active (not (eq idlwave-shell-show-commands 'everything))])
@@ -4297,7 +4297,7 @@ idlwave-shell-electric-debug-mode-map)
       :style toggle :selected idlwave-shell-use-input-mode-magic])
     "--"
     ["Update Working Dir" idlwave-shell-resync-dirs t]
-    ["Save Path Info" 
+    ["Save Path Info"
      (idlwave-shell-send-command idlwave-shell-path-query
                                  'idlwave-shell-get-path-info
                                  'hide)
@@ -4309,7 +4309,7 @@ idlwave-shell-electric-debug-mode-map)
 
 (if (or (featurep 'easymenu) (load "easymenu" t))
     (progn
-      (easy-menu-define 
+      (easy-menu-define
        idlwave-mode-debug-menu idlwave-mode-map "IDL debugging menus"
        idlwave-shell-menu-def)
       (easy-menu-define
@@ -4329,7 +4329,7 @@ idlwave-shell-electric-debug-mode-map)
 (defvar idlwave-shell-bp-glyph nil
   "The glyphs to mark breakpoint lines in the source code.")
 
-(let ((image-alist 
+(let ((image-alist
        '((bp . "/* XPM */
 static char * file[] = {
 \"14 12 3 1\",
@@ -4462,7 +4462,7 @@ static char * file[] = {
 \"    .XXXX.    \",
 \"     ....     \",
 \"              \"};"))) im-cons im)
-  
+
   (while (setq im-cons (pop image-alist))
     (setq im (cond ((and (featurep 'xemacs)
                          (featurep 'xpm))
@@ -4475,7 +4475,7 @@ static char * file[] = {
                    ((and (not (featurep 'xemacs))
                          (fboundp 'image-type-available-p)
                          (image-type-available-p 'xpm))
-                    (list 'image :type 'xpm :data (cdr im-cons) 
+                    (list 'image :type 'xpm :data (cdr im-cons)
                           :ascent 'center))
                    (t nil)))
     (if im (push (cons (car im-cons) im) idlwave-shell-bp-glyph))))
@@ -4485,7 +4485,7 @@ static char * file[] = {
 
 ;;; Load the toolbar when wanted by the user.
 
-(autoload 'idlwave-toolbar-toggle "idlw-toolbar" 
+(autoload 'idlwave-toolbar-toggle "idlw-toolbar"
   "Toggle the IDLWAVE toolbar")
 (autoload 'idlwave-toolbar-add-everywhere "idlw-toolbar"
   "Add IDLWAVE toolbar")
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index 083d87f581c..13bc7f08999 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -214,10 +214,8 @@ processes, you can change `inferior-lisp-buffer' to another process
 buffer with \\[set-variable].")
 
 ;;;###autoload
-(defcustom inferior-lisp-mode-hook '()
-  "*Hook for customising Inferior Lisp mode."
-  :type 'hook
-  :group 'inferior-lisp)
+(defvar inferior-lisp-mode-hook '()
+  "*Hook for customising Inferior Lisp mode.")
 
 (put 'inferior-lisp-mode 'mode-class 'special)
 
@@ -590,10 +588,8 @@ See variable `lisp-describe-sym-command'."
 
 ;;; Do the user's customisation...
 ;;;===============================
-(defcustom inferior-lisp-load-hook nil
-  "This hook is run when the library `inf-lisp' is loaded."
-  :type 'hook
-  :group 'inferior-lisp)
+(defvar inferior-lisp-load-hook nil
+  "This hook is run when the library `inf-lisp' is loaded.")
 
 (run-hooks 'inferior-lisp-load-hook)
 
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 7c1ccb25fb0..86002768757 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -100,12 +100,35 @@
   :prefix "makefile-")
 
 (defface makefile-space-face
-   '((((class color)) (:background  "hotpink"))
-     (t (:reverse-video t)))
+  '((((class color)) (:background  "hotpink"))
+    (t (:reverse-video t)))
   "Face to use for highlighting leading spaces in Font-Lock mode."
   :group 'faces
   :group 'makefile)
 
+(defface makefile-targets-face
+  ;; This needs to go along both with foreground and background colors (i.e. shell)
+  '((t (:underline t)))
+  "Face to use for additionally highlighting rule targets in Font-Lock mode."
+  :group 'faces
+  :group 'makefile)
+
+(defface makefile-shell-face
+  '((((class color) (background light)) (:background  "seashell1"))
+    (((class color) (background dark)) (:background  "seashell4"))
+    (t (:reverse-video t)))
+  "Face to use for additionally highlighting Shell commands in Font-Lock mode."
+  :group 'faces
+  :group 'makefile)
+
+(defface makefile-makepp-perl-face
+  '((((class color) (background light)) (:background  "LightBlue1")) ; Camel Book
+    (((class color) (background dark)) (:background  "DarkBlue"))
+    (t (:reverse-video t)))
+  "Face to use for additionally highlighting Perl code in Font-Lock mode."
+  :group 'faces
+  :group 'makefile)
+
 (defcustom makefile-browser-buffer-name "*Macros and Targets*"
   "*Name of the macro- and target browser buffer."
   :type 'string
@@ -234,17 +257,29 @@ not be enclosed in { } or ( )."
 ;; Note that the first big subexpression is used by font lock.  Note
 ;; that if you change this regexp you might have to fix the imenu
 ;; index in makefile-imenu-generic-expression.
-(defconst makefile-dependency-regex
-  "^ *\\([^ \n\t#:=]+\\([ \t]+\\([^ \t\n#:=]+\\|\\$[({][^ \t\n#})]+[})]\\)\\)*\\)[ \t]*:\\([ \t]*$\\|\\([^=\n].*$\\)\\)"
+(defvar makefile-dependency-regex
+  ;; Allow for two nested levels $(v1:$(v2:$(v3:a=b)=c)=d)
+  "^ *\\(\\(?: *\\$\\(?:[({]\\(?:\\$\\(?:[({]\\(?:\\$\\(?:[^({]\\|.[^\n$#})]+?[})]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\| *[^ \n$#:=]+\\)+?\\)[ \t]*\\(:\\)\\(?:[ \t]*$\\|[^=\n]\\(?:[^#\n]*?;[ \t]*\\(.+\\)\\)?\\)"
   "Regex used to find dependency lines in a makefile.")
 
-;; Note that the first subexpression is used by font lock.  Note
-;; that if you change this regexp you might have to fix the imenu
-;; index in makefile-imenu-generic-expression.
+(defvar makefile-dependency-skip "^:"
+  "Characters to skip to find a line that might be a dependency.")
+
+(defvar makefile-rule-action-regex
+  "^\t[ \t]*\\([-@]*\\)[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)"
+  "Regex used to highlight rule action lines in font lock mode.")
+
+;; Note that the first and second subexpression is used by font lock.  Note
+;; that if you change this regexp you might have to fix the imenu index in
+;; makefile-imenu-generic-expression.
 (defconst makefile-macroassign-regex
-  "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*[*:+]?[:?]?="
+  "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)\\|[*:+]?[:?]?=[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)\\)"
   "Regex used to find macro assignment lines in a makefile.")
 
+(defconst makefile-var-use-regex
+  "[^$]\\$[({]\\([-a-zA-Z0-9_.]+\\|[@%<?^+*][FD]?\\)"
+  "Regex used to find $(macro) uses in a makefile.")
+
 (defconst makefile-ignored-files-in-pickup-regex
   "\\(^\\..*\\)\\|\\(.*~$\\)\\|\\(.*,v$\\)\\|\\(\\.[chy]\\)"
   "Regex for filenames that will NOT be included in the target list.")
@@ -254,50 +289,189 @@ not be enclosed in { } or ( )."
 (defvar makefile-space-face 'makefile-space-face
   "Face to use for highlighting leading spaces in Font-Lock mode.")
 
-(defconst makefile-font-lock-keywords
-  (list
+;; These lists were inspired by the old solution.  But they are silly, because
+;; you can't differentiate what follows.  They need to be split up.
+(defconst makefile-statements '("include")
+  "List of keywords understood by standard make.")
+
+(defconst makefile-automake-statements
+  `("if" "else" "endif" ,@makefile-statements)
+  "List of keywords understood by automake.")
+
+(defconst makefile-gmake-statements
+  `("-sinclude" "sinclude" "override" "vpath"
+    "ifdef" "ifndef" "ifeq" "ifneq" "-include" "define" "endef" "export"
+    "unexport"
+    ,@(cdr makefile-automake-statements))
+  "List of keywords understood by gmake.")
+
+;; These are even more silly, because you can have more spaces in between.
+(defconst makefile-makepp-statements
+  `("and ifdef" "and ifndef" "and ifeq" "and ifneq" "and ifperl"
+    "and ifmakeperl" "and ifsys" "and ifnsys" "build_cache" "build_check"
+    "else ifdef" "else ifndef" "else ifeq" "else ifneq" "else ifperl"
+    "else ifmakeperl" "else ifsys" "else ifnsys" "enddef" "load_makefile"
+    "ifperl" "ifmakeperl" "ifsys" "ifnsys" "_include"  "makeperl" "makesub"
+    "no_implicit_load" "perl" "perl-begin" "perl_begin" "perl-end" "perl_end"
+    "prebuild" "or ifdef" "or ifndef" "or ifeq" "or ifneq" "or ifperl"
+    "or ifmakeperl" "or ifsys" "or ifnsys" "register_command_parser"
+    "register_scanner" "repository" "runtime" "signature" "sub"
+    ,@(nthcdr 4 makefile-gmake-statements))
+  "List of keywords understood by gmake.")
+
+(defconst makefile-bsdmake-statements
+  `(".elif" ".elifdef" ".elifmake" ".elifndef" ".elifnmake" ".else" ".endfor"
+    ".endif" ".for" ".if" ".ifdef" ".ifmake" ".ifndef" ".ifnmake" ".undef")
+  "List of keywords understood by BSD make.")
+
+(defun makefile-make-font-lock-keywords (var keywords space
+                                             &optional negation
+                                             &rest font-lock-keywords)
+  `(;; Do macro assignments.  These get the "variable-name" face.
+    (,makefile-macroassign-regex
+     (1 font-lock-variable-name-face)
+     ;; This is for after !=
+     (2 'makefile-shell-face prepend t)
+     ;; This is for after normal assignment
+     (3 'font-lock-string-face prepend t))
+
+    ;; Rule actions.
+    (makefile-match-action
+     (1 font-lock-type-face)
+     (2 'makefile-shell-face prepend)
+     ;; Only makepp has builtin commands.
+     (3 font-lock-builtin-face prepend t))
+
+    ;; Variable references even in targets/strings/comments.
+    (,var 1 font-lock-variable-name-face prepend)
+
+    ;; Automatic variable references and single character variable references,
+    ;; but not shell variables references.
+    ("[^$]\\$\\([@%<?^+*_]\\|[a-zA-Z0-9]\\>\\)"
+     1 font-lock-constant-face prepend)
+    ("[^$]\\(\\$[@%*]\\)"
+     1 'makefile-targets-face prepend)
 
-   ;; Do macro assignments.  These get the "variable-name" face rather
-   ;; arbitrarily.
-   (list makefile-macroassign-regex 1 'font-lock-variable-name-face)
+    ;; Fontify conditionals and includes.
+    (,(concat "^\\(?: [ \t]*\\)?"
+              (regexp-opt keywords t)
+              "\\>[ \t]*\\([^: \t\n#]*\\)")
+     (1 font-lock-keyword-face) (2 font-lock-variable-name-face))
 
-   ;; Do dependencies.  These get the function name face.
-   (list makefile-dependency-regex 1 'font-lock-function-name-face)
+    ,@(if negation
+          `((,negation (1 font-lock-negation-char-face prepend)
+                       (2 font-lock-negation-char-face prepend t))))
 
-   ;; Variable references even in targets/strings/comments.
-   '("[^$]\\$[({]\\([-a-zA-Z0-9_.]+\\|[@%<?^+*][FD]?\\)[}):]"
-     1 font-lock-constant-face prepend)
+    ,@(if space
+          '(;; Highlight lines that contain just whitespace.
+            ;; They can cause trouble, especially if they start with a tab.
+            ("^[ \t]+$" . makefile-space-face)
 
-   ;; Automatic variable references and single character variable references,
-   ;; but not shell variables references.
-   '("[^$]\\$\\([@%<?^+*_]\\|[a-zA-Z0-9]\\>\\)"
-     1 font-lock-constant-face prepend)
+            ;; Highlight shell comments that Make treats as commands,
+            ;; since these can fool people.
+            ("^\t+#" 0 makefile-space-face t)
 
-   ;; Fontify conditionals and includes.
-   ;; Note that plain `if' is an automake conditional, and not a bug.
-   (list
-    (concat "^\\(?: [ \t]*\\)?"
-            (regexp-opt '("-include" "-sinclude" "include" "sinclude" "ifeq"
-                          "if" "ifneq" "ifdef" "ifndef" "endif" "else"
-                          "define" "endef" "override"
-                          "export" "unexport" "vpath") t)
-            "\\>[ \t]*\\([^: \t\n#]*\\)")
-    '(1 font-lock-keyword-face) '(2 font-lock-variable-name-face))
+            ;; Highlight spaces that precede tabs.
+            ;; They can make a tab fail to be effective.
+            ("^\\( +\\)\t" 1 makefile-space-face)))
 
-   '("^\\(?: [ \t]*\\)?if\\(n\\)\\(?:def\\|eq\\)\\>"
-     1 font-lock-negation-char-face prepend)
+    ,@font-lock-keywords
 
-   ;; Highlight lines that contain just whitespace.
-   ;; They can cause trouble, especially if they start with a tab.
-   '("^[ \t]+$" . makefile-space-face)
+    ;; Do dependencies.
+    (makefile-match-dependency
+     (1 'makefile-targets-face prepend)
+     (3 'makefile-shell-face prepend t))))
 
-   ;; Highlight shell comments that Make treats as commands,
-   ;; since these can fool people.
-   '("^\t+#" 0 makefile-space-face t)
+(defconst makefile-font-lock-keywords
+  (makefile-make-font-lock-keywords
+   makefile-var-use-regex
+   makefile-statements
+   t))
+
+(defconst makefile-automake-font-lock-keywords
+  (makefile-make-font-lock-keywords
+   makefile-var-use-regex
+   makefile-automake-statements
+   t))
+
+(defconst makefile-gmake-font-lock-keywords
+  (makefile-make-font-lock-keywords
+   makefile-var-use-regex
+   makefile-gmake-statements
+   t
+   "^\\(?: [ \t]*\\)?if\\(n\\)\\(?:def\\|eq\\)\\>"
+
+   '("[^$]\\(\\$[({][@%*][DF][})]\\)"
+     1 'makefile-targets-face prepend)
+
+   ;; $(function ...) ${function ...}
+   '("[^$]\\$[({]\\([-a-zA-Z0-9_.]+\\s \\)"
+     1 font-lock-function-name-face prepend)
+
+   ;; $(shell ...) ${shell ...}
+   '("[^$]\\$\\([({]\\)shell[ \t]+"
+     makefile-match-function-end nil nil
+     (1 'makefile-shell-face prepend t))))
+
+(defconst makefile-makepp-font-lock-keywords
+  (makefile-make-font-lock-keywords
+   makefile-var-use-regex
+   makefile-makepp-statements
+   nil
+   "^\\(?: [ \t]*\\)?\\(?:and[ \t]+\\|else[ \t]+\\|or[ \t]+\\)?if\\(n\\)\\(?:def\\|eq\\|sys\\)\\>"
+
+   '("[^$]\\(\\$[({]\\(?:target\\|output\\)s?\\_>.*?[})]\\)"
+     1 'makefile-targets-face prepend)
+
+   ;; Colon modifier keywords.
+   '("\\(:\\s *\\)\\(build_c\\(?:ache\\|heck\\)\\|env\\(?:ironment\\)?\\|foreach\\|signature\\|scanner\\|quickscan\\|smartscan\\)\\>\\([^:\n]*\\)"
+     (1 font-lock-type-face t)
+     (2 font-lock-keyword-face t)
+     (3 font-lock-variable-name-face t))
+
+   ;; $(function ...) $((function ...)) ${function ...} ${{function ...}}
+   '("[^$]\\$\\(?:((?\\|{{?\\)\\([-a-zA-Z0-9_.]+\\s \\)"
+     1 font-lock-function-name-face prepend)
+
+   ;; $(shell ...) $((shell ...)) ${shell ...} ${{shell ...}}
+   '("[^$]\\$\\(((?\\|{{?\\)shell\\(?:[-_]\\(?:global[-_]\\)?once\\)?[ \t]+"
+     makefile-match-function-end nil nil
+     (1 'makefile-shell-face prepend t))
+
+   ;; $(perl ...) $((perl ...)) ${perl ...} ${{perl ...}}
+   '("[^$]\\$\\(((?\\|{{?\\)makeperl[ \t]+"
+     makefile-match-function-end nil nil
+     (1 'makefile-makepp-perl-face prepend t))
+   '("[^$]\\$\\(((?\\|{{?\\)perl[ \t]+"
+     makefile-match-function-end nil nil
+     (1 'makefile-makepp-perl-face t t))
+
+   ;; Can we unify these with (if (match-end 1) 'prepend t)?
+   '("ifmakeperl\\s +\\(.*\\)" 1 'makefile-makepp-perl-face prepend)
+   '("ifperl\\s +\\(.*\\)" 1 'makefile-makepp-perl-face t)
+
+   ;; Perl block single- or multiline, as statement or rule action.
+   ;; Don't know why the initial newline in 2nd variant of group 2 doesn't get skipped.
+   '("\\<make\\(?:perl\\|sub\\s +\\S +\\)\\s *\n?\\s *{\\(?:{\\s *\n?\\(\\(?:.*\n\\)+?\\)\\s *}\\|\\s *\\(\\(?:.*?\\|\n?\\(?:.*\n\\)+?\\)\\)\\)}"
+     (1 'makefile-makepp-perl-face prepend t)
+     (2 'makefile-makepp-perl-face prepend t))
+   '("\\<\\(?:perl\\|sub\\s +\\S +\\)\\s *\n?\\s *{\\(?:{\\s *\n?\\(\\(?:.*\n\\)+?\\)\\s *}\\|\\s *\\(\\(?:.*?\\|\n?\\(?:.*\n\\)+?\\)\\)\\)}"
+     (1 'makefile-makepp-perl-face t t)
+     (2 'makefile-makepp-perl-face t t))
+
+   ;; Statement style perl block.
+   '("perl[-_]begin\\s *\\(?:\\s #.*\\)?\n\\(\\(?:.*\n\\)+?\\)\\s *perl[-_]end\\>"
+     1 'makefile-makepp-perl-face t)))
+
+(defconst makefile-bsdmake-font-lock-keywords
+  (makefile-make-font-lock-keywords
+   ;; A lot more could be done for variables here:
+   makefile-var-use-regex
+   makefile-bsdmake-statements
+   t
+   "^\\(?: [ \t]*\\)?\\.\\(?:el\\)?if\\(n?\\)\\(?:def\\|make\\)?\\>[ \t]*\\(!?\\)"
+   '("^[ \t]*\\.for[ \t].+[ \t]\\(in\\)\\>" 1 font-lock-keyword-face)))
 
-   ;; Highlight spaces that precede tabs.
-   ;; They can make a tab fail to be effective.
-   '("^\\( +\\)\t" 1 makefile-space-face)))
 
 (defconst makefile-font-lock-syntactic-keywords
   ;; From sh-script.el.
@@ -310,9 +484,8 @@ not be enclosed in { } or ( )."
     ("\\\\\n" 0 ".")))
 
 (defvar makefile-imenu-generic-expression
-  (list
-   (list "Dependencies" makefile-dependency-regex  1)
-   (list "Macro Assignment" makefile-macroassign-regex 1))
+  `(("Dependencies" ,makefile-dependency-regex 1)
+    ("Macro Assignment" ,makefile-macroassign-regex 1))
   "Imenu generic expression for Makefile mode.  See `imenu-generic-expression'.")
 
 ;;; ------------------------------------------------------------
@@ -371,47 +544,50 @@ The function must satisfy this calling convention:
     ()
   (define-abbrev-table 'makefile-mode-abbrev-table ()))
 
-(defvar makefile-mode-map nil
+(defvar makefile-mode-map
+  (let ((map (make-sparse-keymap)))
+    ;; set up the keymap
+    (define-key map "\C-c:" 'makefile-insert-target-ref)
+    (if makefile-electric-keys
+        (progn
+          (define-key map "$" 'makefile-insert-macro-ref)
+          (define-key map ":" 'makefile-electric-colon)
+          (define-key map "=" 'makefile-electric-equal)
+          (define-key map "." 'makefile-electric-dot)))
+    (define-key map "\C-c\C-f" 'makefile-pickup-filenames-as-targets)
+    (define-key map "\C-c\C-b" 'makefile-switch-to-browser)
+    (define-key map "\C-c\C-c" 'comment-region)
+    (define-key map "\C-c\C-p" 'makefile-pickup-everything)
+    (define-key map "\C-c\C-u" 'makefile-create-up-to-date-overview)
+    (define-key map "\C-c\C-i" 'makefile-insert-gmake-function)
+    (define-key map "\C-c\C-\\" 'makefile-backslash-region)
+    (define-key map "\C-c\C-m\C-a" 'makefile-automake-mode)
+    (define-key map "\C-c\C-m\C-b" 'makefile-bsdmake-mode)
+    (define-key map "\C-c\C-m\C-g" 'makefile-gmake-mode)
+    (define-key map "\C-c\C-m\C-m" 'makefile-mode)
+    (define-key map "\C-c\C-m\C-p" 'makefile-makepp-mode)
+    (define-key map "\M-p"     'makefile-previous-dependency)
+    (define-key map "\M-n"     'makefile-next-dependency)
+    (define-key map "\e\t"     'makefile-complete)
+
+    ;; Make menus.
+    (define-key map [menu-bar makefile-mode]
+      (cons "Makefile" (make-sparse-keymap "Makefile")))
+
+    (define-key map [menu-bar makefile-mode browse]
+      '("Pop up Makefile Browser" . makefile-switch-to-browser))
+    (define-key map [menu-bar makefile-mode complete]
+      '("Complete Target or Macro" . makefile-complete))
+    (define-key map [menu-bar makefile-mode pickup]
+      '("Find Targets and Macros" . makefile-pickup-everything))
+
+    (define-key map [menu-bar makefile-mode prev]
+      '("Move to Previous Dependency" . makefile-previous-dependency))
+    (define-key map [menu-bar makefile-mode next]
+      '("Move to Next Dependency" . makefile-next-dependency))
+    map)
   "The keymap that is used in Makefile mode.")
 
-(if makefile-mode-map
-    ()
-  (setq makefile-mode-map (make-sparse-keymap))
-  ;; set up the keymap
-  (define-key makefile-mode-map "\C-c:" 'makefile-insert-target-ref)
-  (if makefile-electric-keys
-      (progn
-        (define-key makefile-mode-map "$" 'makefile-insert-macro-ref)
-        (define-key makefile-mode-map ":" 'makefile-electric-colon)
-        (define-key makefile-mode-map "=" 'makefile-electric-equal)
-        (define-key makefile-mode-map "." 'makefile-electric-dot)))
-  (define-key makefile-mode-map "\C-c\C-f" 'makefile-pickup-filenames-as-targets)
-  (define-key makefile-mode-map "\C-c\C-b" 'makefile-switch-to-browser)
-  (define-key makefile-mode-map "\C-c\C-c" 'comment-region)
-  (define-key makefile-mode-map "\C-c\C-p" 'makefile-pickup-everything)
-  (define-key makefile-mode-map "\C-c\C-u" 'makefile-create-up-to-date-overview)
-  (define-key makefile-mode-map "\C-c\C-i" 'makefile-insert-gmake-function)
-  (define-key makefile-mode-map "\C-c\C-\\" 'makefile-backslash-region)
-  (define-key makefile-mode-map "\M-p"     'makefile-previous-dependency)
-  (define-key makefile-mode-map "\M-n"     'makefile-next-dependency)
-  (define-key makefile-mode-map "\e\t"     'makefile-complete)
-
-  ;; Make menus.
-  (define-key makefile-mode-map [menu-bar makefile-mode]
-    (cons "Makefile" (make-sparse-keymap "Makefile")))
-
-  (define-key makefile-mode-map [menu-bar makefile-mode browse]
-    '("Pop up Makefile Browser" . makefile-switch-to-browser))
-  (define-key makefile-mode-map [menu-bar makefile-mode complete]
-    '("Complete Target or Macro" . makefile-complete))
-  (define-key makefile-mode-map [menu-bar makefile-mode pickup]
-    '("Find Targets and Macros" . makefile-pickup-everything))
-
-  (define-key makefile-mode-map [menu-bar makefile-mode prev]
-    '("Move to Previous Dependency" . makefile-previous-dependency))
-  (define-key makefile-mode-map [menu-bar makefile-mode next]
-    '("Move to Next Dependency" . makefile-next-dependency)))
-
 (defvar makefile-browser-map nil
   "The keymap that is used in the macro- and target browser.")
 (if makefile-browser-map
@@ -504,8 +680,19 @@ The function must satisfy this calling convention:
 
 ;;;###autoload
 (defun makefile-mode ()
-  "Major mode for editing Makefiles.
-This function ends by invoking the function(s) `makefile-mode-hook'.
+  "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
+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'.
+
+It is strongly recommended to use `font-lock-mode', because that
+provides additional parsing information.  This is used for
+example to see that a rule action `echo foo: bar' is a not rule
+dependency, despite the colon.
 
 \\{makefile-mode-map}
 
@@ -601,7 +788,8 @@ Makefile mode can be configured by modifying the following variables:
           nil nil
           ((?$ . "."))
           backward-paragraph
-          (font-lock-syntactic-keywords . makefile-font-lock-syntactic-keywords)))
+          (font-lock-syntactic-keywords . makefile-font-lock-syntactic-keywords)
+          (font-lock-support-mode)))    ; JIT breaks on long series of continuation lines.
 
   ;; Add-log.
   (make-local-variable 'add-log-current-defun-function)
@@ -643,7 +831,45 @@ Makefile mode can be configured by modifying the following variables:
 
   ;; Real TABs are important in makefiles
   (setq indent-tabs-mode t)
-  (run-hooks 'makefile-mode-hook))
+  (run-mode-hooks 'makefile-mode-hook))
+
+;; These should do more than just differentiate font-lock.
+;;;###autoload
+(define-derived-mode makefile-automake-mode makefile-mode "Makefile.am"
+  "An adapted `makefile-mode' that knows about automake."
+  (setq font-lock-defaults
+        `(makefile-automake-font-lock-keywords ,@(cdr font-lock-defaults))))
+
+;;;###autoload
+(define-derived-mode makefile-gmake-mode makefile-mode "GNUmakefile"
+  "An adapted `makefile-mode' that knows about gmake."
+  (setq font-lock-defaults
+        `(makefile-gmake-font-lock-keywords ,@(cdr font-lock-defaults))))
+
+;;;###autoload
+(define-derived-mode makefile-makepp-mode makefile-mode "Makeppfile"
+  "An adapted `makefile-mode' that knows about makepp."
+   (set (make-local-variable 'makefile-rule-action-regex)
+        ;; Don't care about initial tab, but I don't know how to font-lock correctly without.
+        "^\t[ \t]*\\(\\(?:\\(?:noecho\\|ignore[-_]error\\|[-@]+\\)[ \t]*\\)*\\)\\(\\(&\\S +\\)?\\(?:.+\\\\\n\\)*.+\\)")
+
+  (setq font-lock-defaults
+        `(makefile-makepp-font-lock-keywords ,@(cdr font-lock-defaults))))
+
+;;;###autoload
+(define-derived-mode makefile-bsdmake-mode makefile-mode "BSDmakefile"
+  "An adapted `makefile-mode' that knows about BSD make."
+  (set (make-local-variable 'makefile-dependency-regex)
+       ;; Identical to default, except allows `!' instead of `:'.
+       "^ *\\(\\(?: *\\$\\(?:[({]\\(?:\\$\\(?:[({]\\(?:\\$\\(?:[^({]\\|.[^\n$#})]+?[})]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\| *[^ \n$#:=]+\\)+?\\)[ \t]*\\([:!]\\)\\(?:[ \t]*$\\|[^=\n]\\(?:[^#\n]*?;[ \t]*\\(.+\\)\\)?\\)")
+  (set (make-local-variable 'makefile-dependency-skip) "^:!")
+  (set (make-local-variable 'makefile-rule-action-regex)
+       "^\t[ \t]*\\([-+@]*\\)[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)")
+  (setq font-lock-defaults
+        `(makefile-bsdmake-font-lock-keywords ,@(cdr font-lock-defaults))
+        imenu-generic-expression
+        `(("Dependencies" ,makefile-dependency-regex 1)
+          ,@(cdr imenu-generic-expression))))
 
 
 
@@ -654,18 +880,27 @@ Makefile mode can be configured by modifying the following variables:
   (interactive)
   (let ((here (point)))
     (end-of-line)
-    (if (re-search-forward makefile-dependency-regex (point-max) t)
+    (if (makefile-match-dependency nil)
         (progn (beginning-of-line) t)   ; indicate success
       (goto-char here) nil)))
 
 (defun makefile-previous-dependency ()
   "Move point to the beginning of the previous dependency line."
   (interactive)
-  (let ((here (point)))
+  (let ((pt (point)))
     (beginning-of-line)
-    (if (re-search-backward makefile-dependency-regex (point-min) t)
-        (progn (beginning-of-line) t)   ; indicate success
-      (goto-char here) nil)))
+    ;; makefile-match-dependency done backwards:
+    (catch 'found
+      (while (progn (skip-chars-backward makefile-dependency-skip)
+                    (not (bobp)))
+        (or (prog1 (eq (char-after) ?=)
+              (backward-char))
+            (get-text-property (point) 'face)
+            (beginning-of-line)
+            (if (looking-at makefile-dependency-regex)
+                (throw 'found t))))
+      (goto-char pt)
+      nil)))
 
 
 
@@ -763,74 +998,56 @@ Anywhere else just self-inserts."
 (defun makefile-pickup-targets ()
   "Notice names of all target definitions in Makefile."
   (interactive)
-  (if (not makefile-need-target-pickup)
-      nil
-    (setq makefile-need-target-pickup nil)
-    (setq makefile-target-table nil)
-    (setq makefile-has-prereqs nil)
+  (when makefile-need-target-pickup
+    (setq makefile-need-target-pickup nil
+          makefile-target-table nil
+          makefile-has-prereqs nil)
     (save-excursion
       (goto-char (point-min))
-      (while (re-search-forward makefile-dependency-regex nil t)
-        (makefile-add-this-line-targets)))
-    (message "Read targets OK.")))
-
-(defun makefile-add-this-line-targets ()
-  (save-excursion
-    (beginning-of-line)
-    (let ((done-with-line nil)
-          (line-number (1+ (count-lines (point-min) (point)))))
-      (while (not done-with-line)
-        (skip-chars-forward " \t")
-        (if (not (setq done-with-line (or (eolp)
-                                          (char-equal (char-after (point)) ?:))))
-            (progn
-              (let* ((start-of-target-name (point))
-                     (target-name
-                      (progn
-                        (skip-chars-forward "^ \t:#")
-                        (buffer-substring start-of-target-name (point))))
+      (while (makefile-match-dependency nil)
+        (goto-char (match-beginning 1))
+        (while (let ((target-name
+                      (buffer-substring-no-properties (point)
+                                                      (progn
+                                                        (skip-chars-forward "^ \t:#")
+                                                        (point))))
                      (has-prereqs
                       (not (looking-at ":[ \t]*$"))))
-                (if (makefile-remember-target target-name has-prereqs)
-                    (message "Picked up target \"%s\" from line %d"
-                             target-name line-number)))))))))
+                 (if (makefile-remember-target target-name has-prereqs)
+                     (message "Picked up target \"%s\" from line %d"
+                              target-name (line-number-at-pos)))
+                 (skip-chars-forward " \t")
+                 (not (or (eolp) (eq (char-after) ?:)))))
+        (forward-line)))
+    (message "Read targets OK.")))
 
 (defun makefile-pickup-macros ()
   "Notice names of all macro definitions in Makefile."
   (interactive)
-  (if (not makefile-need-macro-pickup)
-      nil
-    (setq makefile-need-macro-pickup nil)
-    (setq makefile-macro-table nil)
+  (when makefile-need-macro-pickup
+    (setq makefile-need-macro-pickup nil
+          makefile-macro-table nil)
     (save-excursion
       (goto-char (point-min))
       (while (re-search-forward makefile-macroassign-regex nil t)
-        (makefile-add-this-line-macro)
-        (forward-line 1)))
+        (goto-char (match-beginning 1))
+        (let ((macro-name (buffer-substring-no-properties (point)
+                                                          (progn
+                                                            (skip-chars-forward "^ \t:#=*")
+                                                            (point)))))
+          (if (makefile-remember-macro macro-name)
+              (message "Picked up macro \"%s\" from line %d"
+                       macro-name (line-number-at-pos))))
+        (forward-line)))
     (message "Read macros OK.")))
 
-(defun makefile-add-this-line-macro ()
-  (save-excursion
-    (beginning-of-line)
-    (skip-chars-forward " \t")
-    (unless (eolp)
-      (let* ((start-of-macro-name (point))
-             (line-number (1+ (count-lines (point-min) (point))))
-             (macro-name (progn
-                           (skip-chars-forward "^ \t:#=*")
-                           (buffer-substring start-of-macro-name (point)))))
-        (if (makefile-remember-macro macro-name)
-            (message "Picked up macro \"%s\" from line %d"
-                     macro-name line-number))))))
-
 (defun makefile-pickup-everything (arg)
   "Notice names of all macros and targets in Makefile.
 Prefix arg means force pickups to be redone."
   (interactive "P")
   (if arg
-      (progn
-        (setq makefile-need-target-pickup t)
-        (setq makefile-need-macro-pickup t)))
+      (setq makefile-need-target-pickup t
+            makefile-need-macro-pickup t))
   (makefile-pickup-macros)
   (makefile-pickup-targets)
   (if makefile-pickup-everything-picks-up-filenames-p
@@ -841,17 +1058,12 @@ Prefix arg means force pickups to be redone."
 Checks each filename against `makefile-ignored-files-in-pickup-regex'
 and adds all qualifying names to the list of known targets."
   (interactive)
-  (let* ((dir (file-name-directory (buffer-file-name)))
-         (raw-filename-list (if dir
-                                (file-name-all-completions "" dir)
-                              (file-name-all-completions "" ""))))
-    (mapcar (lambda (name)
-               (if (and (not (file-directory-p name))
-                        (not (string-match makefile-ignored-files-in-pickup-regex
-                                           name)))
-                   (if (makefile-remember-target name)
-                       (message "Picked up file \"%s\" as target" name))))
-            raw-filename-list)))
+  (mapc (lambda (name)
+          (or (file-directory-p name)
+              (string-match makefile-ignored-files-in-pickup-regex name)
+              (if (makefile-remember-target name)
+                  (message "Picked up file \"%s\" as target" name))))
+        (file-name-all-completions "" (or (file-name-directory (buffer-file-name)) ""))))
 
 
 
@@ -1453,6 +1665,41 @@ Then prompts for all required parameters."
 ;;; Utility functions
 ;;; ------------------------------------------------------------
 
+(defun makefile-match-function-end (end)
+  "To be called as an anchored matcher by font-lock.
+The anchor must have matched the opening parens in the first group."
+  (let ((s (match-string-no-properties 1)))
+    (setq s (cond ((string= s "(") "\\(.*?\\)[ \t]*)")
+                  ((string= s "{") "\\(.*?\\)[ \t]*}")
+                  ((string= s "((") "\\(.*?\\)[ \t]*))")
+                  ((string= s "{{") "\\(.*?\\)[ \t]*}}")))
+    (if s (looking-at s))))
+
+(defun makefile-match-dependency (bound)
+  "Search for `makefile-dependency-regex' up to BOUND.
+Checks that the colon has not already been fontified, else we
+matched in a rule action."
+  (catch 'found
+    (let ((pt (point)))
+      (while (progn (skip-chars-forward makefile-dependency-skip bound)
+                    (not (eobp)))
+        (forward-char)
+        (or (eq (char-after) ?=)
+            (get-text-property (1- (point)) 'face)
+            (when (save-excursion
+                    (beginning-of-line)
+                    (looking-at makefile-dependency-regex))
+              (end-of-line)
+              (throw 'found (point)))))
+      (goto-char pt))
+    nil))
+
+(defun makefile-match-action (bound)
+  (catch 'found
+    (while (re-search-forward makefile-rule-action-regex bound t)
+      (or (eq ?\\ (char-after (- (match-beginning 0) 2)))
+          (throw 'found t)))))
+
 (defun makefile-do-macro-insertion (macro-name)
   "Insert a macro reference."
   (if (not (zerop (length macro-name)))
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 0febea4450f..f2576ad94db 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -376,33 +376,41 @@ The expansion is entirely correct because it uses the C preprocessor."
 
 (defcustom perl-indent-level 4
   "*Indentation of Perl statements with respect to containing block."
-  :type 'integer)
+  :type 'integer
+  :group 'perl)
 (defcustom perl-continued-statement-offset 4
   "*Extra indent for lines not starting new statements."
-  :type 'integer)
+  :type 'integer
+  :group 'perl)
 (defcustom perl-continued-brace-offset -4
   "*Extra indent for substatements that start with open-braces.
 This is in addition to `perl-continued-statement-offset'."
-  :type 'integer)
+  :type 'integer
+  :group 'perl)
 (defcustom perl-brace-offset 0
   "*Extra indentation for braces, compared with other text in same context."
-  :type 'integer)
+  :type 'integer
+  :group 'perl)
 (defcustom perl-brace-imaginary-offset 0
   "*Imagined indentation of an open brace that actually follows a statement."
-  :type 'integer)
+  :type 'integer
+  :group 'perl)
 (defcustom perl-label-offset -2
   "*Offset of Perl label lines relative to usual indentation."
-  :type 'integer)
+  :type 'integer
+  :group 'perl)
 (defcustom perl-indent-continued-arguments nil
   "*If non-nil offset of argument lines relative to usual indentation.
 If nil, continued arguments are aligned with the first argument."
-  :type '(choice integer (const nil)))
+  :type '(choice integer (const nil))
+  :group 'perl)
 
 (defcustom perl-tab-always-indent tab-always-indent
   "Non-nil means TAB in Perl mode always indents the current line.
 Otherwise it inserts a tab character if you type it past the first
 nonwhite character on the line."
-  :type 'boolean)
+  :type 'boolean
+  :group 'perl)
 
 ;; I changed the default to nil for consistency with general Emacs
 ;; conventions -- rms.
@@ -411,11 +419,13 @@ nonwhite character on the line."
 For lines which don't need indenting, TAB either indents an
 existing comment, moves to end-of-line, or if at end-of-line already,
 create a new comment."
-  :type 'boolean)
+  :type 'boolean
+  :group 'perl)
 
 (defcustom perl-nochange ";?#\\|\f\\|\\s(\\|\\(\\w\\|\\s_\\)+:[^:]"
   "*Lines starting with this regular expression are not auto-indented."
-  :type 'regexp)
+  :type 'regexp
+  :group 'perl)
 
 ;; Outline support
 
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 25bc337a7b2..73450dec61a 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -234,8 +234,8 @@ Entry to this mode calls the value of `prolog-mode-hook' with no arguments,
 if that value is non-nil.  Likewise with the value of `comint-mode-hook'.
 `prolog-mode-hook' is called after `comint-mode-hook'.
 
-You can send text to the inferior Prolog from other buffers
-using the commands `send-region', `send-string' and \\[prolog-consult-region].
+You can send text to the inferior Prolog from other buffers using the commands
+`process-send-region', `process-send-string' and \\[prolog-consult-region].
 
 Commands:
 Tab indents for Prolog; with argument, shifts rest
@@ -265,12 +265,12 @@ If COMPILE (prefix arg) is not nil, use compile mode rather than consult mode."
   (interactive "P\nr")
   (save-excursion
     (if compile
-        (send-string "prolog" prolog-compile-string)
-      (send-string "prolog" prolog-consult-string))
-    (send-region "prolog" beg end)
-    (send-string "prolog" "\n")         ;May be unnecessary
+        (process-send-string "prolog" prolog-compile-string)
+      (process-send-string "prolog" prolog-consult-string))
+    (process-send-region "prolog" beg end)
+    (process-send-string "prolog" "\n")         ;May be unnecessary
     (if prolog-eof-string
-        (send-string "prolog" prolog-eof-string)
+        (process-send-string "prolog" prolog-eof-string)
       (process-send-eof "prolog")))) ;Send eof to prolog process.
 
 (defun prolog-consult-region-and-go (compile beg end)
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index b3495c74491..2d8f1d80aae 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -1173,7 +1173,7 @@ Use line numbers if `ps-run-error-line-numbers' is not nil"
         (let (i)
           (setq
            i
-           (string-to-int
+           (string-to-number
             (buffer-substring (match-beginning 0) (match-end 0))))
           (goto-char p)
           (pop-to-buffer ps-run-parent)
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index f2389d8defa..0173c419b5d 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1015,7 +1015,7 @@ Anything else means:   whenever we have a \"good guess\" as to the value."
   :group 'sh-indentation)
 
 (defcustom sh-popup-occur-buffer nil
-  "*Controls when  `sh-learn-buffer-indent' pops the *indent* buffer.
+  "*Controls when  `sh-learn-buffer-indent' pops the `*indent*' buffer.
 If t it is always shown.  If nil, it is shown only when there
 are conflicts."
   :type '(choice
@@ -1044,7 +1044,7 @@ Can be set to a number, or to nil which means leave it as is."
 
 (defcustom sh-basic-offset 4
   "*The default indentation increment.
-This value is used for the + and - symbols in an indentation variable."
+This value is used for the `+' and `-' symbols in an indentation variable."
   :type 'integer
   :group 'sh-indentation)
 
@@ -1088,7 +1088,7 @@ a number means align to that column, e.g. 0 means fist column."
            :menu-tag "/   Indent left  half sh-basic-offset")))
 
 (defcustom sh-indent-for-else 0
-  "*How much to indent an else relative to an if.  Usually 0."
+  "*How much to indent an `else' relative to its `if'.  Usually 0."
   :type `(choice
           (integer :menu-tag "A number (positive=>indent right)"
                    :tag "A number")
@@ -1104,75 +1104,75 @@ a number means align to that column, e.g. 0 means fist column."
           sh-symbol-list))
 
 (defcustom sh-indent-for-fi 0
-  "*How much to indent a fi relative to an if.  Usually 0."
+  "*How much to indent a `fi' relative to its `if'.  Usually 0."
   :type `(choice ,@ sh-number-or-symbol-list )
   :group 'sh-indentation)
 
-(defcustom sh-indent-for-done '0
-  "*How much to indent a done relative to its matching stmt.  Usually 0."
+(defcustom sh-indent-for-done 0
+  "*How much to indent a `done' relative to its matching stmt.  Usually 0."
   :type `(choice ,@ sh-number-or-symbol-list )
   :group 'sh-indentation)
 
 (defcustom sh-indent-after-else '+
-  "*How much to indent a statement after an else statement."
+  "*How much to indent a statement after an `else' statement."
   :type `(choice ,@ sh-number-or-symbol-list )
   :group 'sh-indentation)
 
 (defcustom sh-indent-after-if '+
-  "*How much to indent a statement after an if statement.
-This includes lines after else and elif statements, too, but
-does not affect then else elif or fi statements themselves."
+  "*How much to indent a statement after an `if' statement.
+This includes lines after `else' and `elif' statements, too, but
+does not affect the `else', `elif' or `fi' statements themselves."
   :type `(choice ,@ sh-number-or-symbol-list )
   :group 'sh-indentation)
 
 (defcustom sh-indent-for-then 0
-  "*How much to indent a then relative to an if."
+  "*How much to indent a `then' relative to its `if'."
   :type `(choice ,@ sh-number-or-symbol-list )
   :group 'sh-indentation)
 
 (defcustom sh-indent-for-do 0
-  "*How much to indent a do statement.
-This is relative to the statement before the do, i.e. the
-while until or for statement."
+  "*How much to indent a `do' statement.
+This is relative to the statement before the `do', typically a
+`while', `until', `for', `repeat' or `select' statement."
   :type `(choice ,@ sh-number-or-symbol-list)
   :group 'sh-indentation)
 
-(defcustom sh-indent-after-do '*
-  "*How much to indent a line after a do statement.
-This is used when the do is the first word of the line.
-This is relative to the statement before the do, e.g. a
-while for repeat or select statement."
+(defcustom sh-indent-after-do '+
+  "*How much to indent a line after a `do' statement.
+This is used when the `do' is the first word of the line.
+This is relative to the statement before the `do', typically a
+`while', `until', `for', `repeat' or `select' statement."
   :type `(choice ,@ sh-number-or-symbol-list)
   :group 'sh-indentation)
 
 (defcustom sh-indent-after-loop-construct '+
   "*How much to indent a statement after a loop construct.
 
-This variable is used when the keyword \"do\" is on the same line as the
-loop statement (e.g.  \"until\", \"while\" or \"for\").
-If the do is on a line by itself, then `sh-indent-after-do' is used instead."
+This variable is used when the keyword `do' is on the same line as the
+loop statement (e.g., `until', `while' or `for').
+If the `do' is on a line by itself, then `sh-indent-after-do' is used instead."
   :type `(choice ,@ sh-number-or-symbol-list)
   :group 'sh-indentation)
 
 
 (defcustom sh-indent-after-done 0
-  "*How much to indent a statement after a \"done\" keyword.
-Normally this is 0, which aligns the \"done\" to the matching
+  "*How much to indent a statement after a `done' keyword.
+Normally this is 0, which aligns the `done' to the matching
 looping construct line.
-Setting it non-zero allows you to have the \"do\" statement on a line
+Setting it non-zero allows you to have the `do' statement on a line
 by itself and align the done under to do."
   :type `(choice ,@ sh-number-or-symbol-list)
   :group 'sh-indentation)
 
 (defcustom sh-indent-for-case-label '+
   "*How much to indent a case label statement.
-This is relative to the line containing the case statement."
+This is relative to the line containing the `case' statement."
   :type `(choice ,@ sh-number-or-symbol-list)
   :group 'sh-indentation)
 
 (defcustom sh-indent-for-case-alt '++
   "*How much to indent statements after the case label.
-This is relative to the line containing the case statement."
+This is relative to the line containing the `case' statement."
   :type `(choice ,@ sh-number-or-symbol-list)
   :group 'sh-indentation)
 
@@ -1184,7 +1184,7 @@ This is relative to the line containing the case statement."
 
 (defcustom sh-indent-after-open '+
   "*How much to indent after a line with an opening parenthesis or brace.
-For an open paren after a function `sh-indent-after-function' is used."
+For an open paren after a function, `sh-indent-after-function' is used."
   :type `(choice ,@ sh-number-or-symbol-list)
   :group 'sh-indentation)
 
@@ -1196,13 +1196,13 @@ For an open paren after a function `sh-indent-after-function' is used."
 ;; These 2 are for the rc shell:
 
 (defcustom sh-indent-after-switch '+
-  "*How much to indent a case statement relative to the switch statement.
+  "*How much to indent a `case' statement relative to the `switch' statement.
 This is for the rc shell."
   :type `(choice ,@ sh-number-or-symbol-list)
   :group 'sh-indentation)
 
 (defcustom sh-indent-after-case '+
-  "*How much to indent a statement relative to the case statement.
+  "*How much to indent a statement relative to the `case' statement.
 This is for the rc shell."
   :type `(choice ,@ sh-number-or-symbol-list)
   :group 'sh-indentation)
diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el
index 95cfbb15196..a3447befa20 100644
--- a/lisp/progmodes/tcl.el
+++ b/lisp/progmodes/tcl.el
@@ -123,15 +123,18 @@
 
 (defcustom tcl-indent-level 4
   "*Indentation of Tcl statements with respect to containing block."
-  :type 'integer)
+  :type 'integer
+  :group 'tcl)
 
 (defcustom tcl-continued-indent-level 4
   "*Indentation of continuation line relative to first line of command."
-  :type 'integer)
+  :type 'integer
+  :group 'tcl)
 
 (defcustom tcl-auto-newline nil
   "*Non-nil means automatically newline before and after braces you insert."
-  :type 'boolean)
+  :type 'boolean
+  :group 'tcl)
 
 (defcustom tcl-tab-always-indent tab-always-indent
   "*Control effect of TAB key.
@@ -149,7 +152,8 @@ to take place:
   6. Move backward to start of comment, indenting if necessary."
   :type '(choice (const :tag "Always" t)
                  (const :tag "Beginning only" nil)
-                 (const :tag "Maybe move or make or delete comment" 'tcl)))
+                 (const :tag "Maybe move or make or delete comment" 'tcl))
+  :group 'tcl)
 
 
 (defcustom tcl-electric-hash-style nil ;; 'smart
@@ -160,23 +164,28 @@ meaning that the choice between `backslash' and `quote' should be
 made depending on the number of hashes inserted; or nil, meaning that
 no quoting should be done.  Any other value for this variable is
 taken to mean `smart'.  The default is nil."
-  :type '(choice (const backslash) (const quote) (const smart) (const nil)))
+  :type '(choice (const backslash) (const quote) (const smart) (const nil))
+  :group 'tcl)
 
 (defcustom tcl-help-directory-list nil
   "*List of topmost directories containing TclX help files."
-  :type '(repeat directory))
+  :type '(repeat directory)
+  :group 'tcl)
 
 (defcustom tcl-use-smart-word-finder t
   "*If not nil, use smart way to find current word, for Tcl help feature."
-  :type 'boolean)
+  :type 'boolean
+  :group 'tcl)
 
 (defcustom tcl-application "wish"
   "*Name of Tcl program to run in inferior Tcl mode."
-  :type 'string)
+  :type 'string
+  :group 'tcl)
 
 (defcustom tcl-command-switches nil
   "*List of switches to supply to the `tcl-application' program."
-  :type '(repeat string))
+  :type '(repeat string)
+  :group 'tcl)
 
 (defcustom tcl-prompt-regexp "^\\(% \\|\\)"
   "*If not nil, a regexp that will match the prompt in the inferior process.
@@ -184,7 +193,8 @@ If nil, the prompt is the name of the application with \">\" appended.
 
 The default is \"^\\(% \\|\\)\", which will match the default primary
 and secondary prompts for tclsh and wish."
-  :type 'regexp)
+  :type 'regexp
+  :group 'tcl)
 
 (defcustom inferior-tcl-source-command "source %s\n"
   "*Format-string for building a Tcl command to load a file.
@@ -192,7 +202,8 @@ This format string should use `%s' to substitute a file name
 and should result in a Tcl expression that will command the
 inferior Tcl to load that file.  The filename will be appropriately
 quoted for Tcl."
-  :type 'string)
+  :type 'string
+  :group 'tcl)
 
 (defface tcl-escaped-newline '((t :inherit font-lock-string-face))
   "Face used for (non-escaped) backslash at end of a line in Tcl mode."
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 9f0e63e80a6..12f04895f98 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -5082,7 +5082,7 @@ Return a valid value only."
                          ((string-equal "++" input) '++)
                          ((string-equal "--" input) '--)
                          ((string-match "^-?[0-9]+$" input)
-                          (string-to-int input))
+                          (string-to-number input))
                          ((fboundp (setq interned (intern input)))
                           interned)
                          ((boundp interned) interned)
@@ -13701,10 +13701,10 @@ entity ENT-KEY."
       (condition-case ()
           (progn (load-file file-dir-name)
                  (string< (mapconcat
-                           (lambda (a) (format "%3d" (string-to-int a)))
+                           (lambda (a) (format "%3d" (string-to-number a)))
                            (split-string "3.31.14" "\\.") "")
                           (mapconcat
-                           (lambda (a) (format "%3d" (string-to-int a)))
+                           (lambda (a) (format "%3d" (string-to-number a)))
                            (split-string vhdl-cache-version "\\.") "")))
         (error (progn (vhdl-warning (format "ERROR:  Corrupted cache file: \"%s\"" file-dir-name))
                       nil))))))
@@ -14075,7 +14075,7 @@ otherwise use cached data."
                    (beginning-of-line) (looking-at "^\\([0-9]+\\):"))
                  (re-search-backward
                   (format "^[0-%d]:\\s-*[[{<]-"
-                          (max (1- (string-to-int (match-string 1))) 0)) nil t)))
+                          (max (1- (string-to-number (match-string 1))) 0)) nil t)))
     (goto-char (match-end 0))
     (speedbar-do-function-pointer)
     (speedbar-center-buffer-smartly)))
diff --git a/lisp/replace.el b/lisp/replace.el
index 1cef7ecc52a..c9c70b59de5 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1288,14 +1288,14 @@ passed in.  If LITERAL is set, no checking is done, anyway."
     (while (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\\\?\\)"
                          newtext)
       (setq newtext
-            (read-input "Edit replacement string: "
-                        (prog1
-                            (cons
-                             (replace-match "" t t newtext 3)
-                             (1+ (match-beginning 3)))
-                          (setq match-data
-                                (replace-match-data
-                                 nil match-data match-data))))
+            (read-string "Edit replacement string: "
+                         (prog1
+                             (cons
+                              (replace-match "" t t newtext 3)
+                              (1+ (match-beginning 3)))
+                           (setq match-data
+                                 (replace-match-data
+                                  nil match-data match-data))))
             noedit nil)))
   (set-match-data match-data)
   (replace-match newtext fixedcase literal)
@@ -1571,8 +1571,8 @@ make, or the user didn't cancel the call."
                                                 nil real-match-data
                                                 real-match-data)
                                next-replacement
-                               (read-input "Edit replacement string: "
-                                           next-replacement)
+                               (read-string "Edit replacement string: "
+                                            next-replacement)
                                noedit nil)
                          (if replaced
                              (set-match-data real-match-data)
diff --git a/lisp/reveal.el b/lisp/reveal.el
index 97411fc1669..c08f9b604cb 100644
--- a/lisp/reveal.el
+++ b/lisp/reveal.el
@@ -54,7 +54,8 @@
 
 (defcustom reveal-around-mark t
   "Reveal text around the mark, if active."
-  :type 'boolean)
+  :type 'boolean
+  :group 'reveal)
 
 (defvar reveal-open-spots nil)
 (make-variable-buffer-local 'reveal-open-spots)
diff --git a/lisp/server.el b/lisp/server.el
index a0f41e59ff8..0a5fc942206 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -325,11 +325,11 @@ PROC is the server process.  Format of STRING is \"PATH PATH PATH... \\n\"."
                        (setq request "")))))
            ;; ARG is a line number option.
            ((string-match "\\`\\+[0-9]+\\'" arg)
-            (setq lineno (string-to-int (substring arg 1))))
+            (setq lineno (string-to-number (substring arg 1))))
            ;; ARG is line number:column option.
            ((string-match "\\`+\\([0-9]+\\):\\([0-9]+\\)\\'" arg)
-            (setq lineno (string-to-int (match-string 1 arg))
-                  columnno (string-to-int (match-string 2 arg))))
+            (setq lineno (string-to-number (match-string 1 arg))
+                  columnno (string-to-number (match-string 2 arg))))
            (t
             ;; Undo the quoting that emacsclient does
             ;; for certain special characters.
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index b3149500ae5..653c1e7f042 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -675,7 +675,7 @@ Returns t unless files were locked; then returns nil."
           (message "Data recovered from %s."
                    (car (insert-file-contents (make-auto-save-file-name))))
           (sit-for 1))
-        (eval-current-buffer))
+        (eval-buffer))
       (when shadow-todo-file
         (set-buffer (setq shadow-todo-buffer
                           (find-file-noselect shadow-todo-file)))
@@ -686,7 +686,7 @@ Returns t unless files were locked; then returns nil."
           (message "Data recovered from %s."
                    (car (insert-file-contents (make-auto-save-file-name))))
           (sit-for 1))
-        (eval-current-buffer nil))
+        (eval-buffer nil))
       (shadow-invalidate-hashtable))
     t))
 
diff --git a/lisp/shell.el b/lisp/shell.el
index 354ed88f80f..fd5e6c25032 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -759,7 +759,7 @@ Environment variables are expanded, see function `substitute-in-file-name'."
 ;; If STR is of the form +n, for n>0, return n. Otherwise, nil.
 (defun shell-extract-num (str)
   (and (string-match "^\\+[1-9][0-9]*$" str)
-       (string-to-int str)))
+       (string-to-number str)))
 
 
 (defun shell-dirtrack-mode ()
diff --git a/lisp/startup.el b/lisp/startup.el
index a6679f923d0..96213f2924e 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1634,11 +1634,11 @@ normal otherwise."
                  (kill-emacs t))
 
                 ((string-match "^\\+[0-9]+\\'" argi)
-                 (setq line (string-to-int argi)))
+                 (setq line (string-to-number argi)))
 
                 ((string-match "^\\+\\([0-9]+\\):\\([0-9]+\\)\\'" argi)
-                 (setq line (string-to-int (match-string 1 argi))
-                       column (string-to-int (match-string 2 argi))))
+                 (setq line (string-to-number (match-string 1 argi))
+                       column (string-to-number (match-string 2 argi))))
 
                 ((setq tem (assoc argi command-line-x-option-alist))
                  ;; Ignore X-windows options and their args if not using X.
diff --git a/lisp/subr.el b/lisp/subr.el
index 1c2c01e6b16..d91642c5cbe 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -603,8 +603,13 @@ in the current Emacs session, then this function may return nil."
       (setq event (car event)))
   (if (symbolp event)
       (car (get event 'event-symbol-elements))
-    (let ((base (logand event (1- ?\A-\^@))))
-      (downcase (if (< base 32) (logior base 64) base)))))
+    (let* ((base (logand event (1- ?\A-\^@)))
+           (uncontrolled (if (< base 32) (logior base 64) base)))
+      ;; There are some numbers that are invalid characters and
+      ;; cause `downcase' to get an error.
+      (condition-case ()
+          (downcase uncontrolled)
+        (error uncontrolled)))))
 
 (defsubst mouse-movement-p (object)
   "Return non-nil if OBJECT is a mouse movement event."
@@ -753,16 +758,14 @@ and `event-end' functions."
 
 ;;;; Obsolescent names for functions.
 
-(defalias 'window-dot 'window-point)
-(defalias 'set-window-dot 'set-window-point)
-(defalias 'read-input 'read-string)
-(defalias 'send-string 'process-send-string)
-(defalias 'send-region 'process-send-region)
-(defalias 'show-buffer 'set-window-buffer)
-(defalias 'eval-current-buffer 'eval-buffer)
+(define-obsolete-function-alias 'window-dot 'window-point "22.1")
+(define-obsolete-function-alias 'set-window-dot 'set-window-point "22.1")
+(define-obsolete-function-alias 'read-input 'read-string "22.1")
+(define-obsolete-function-alias 'show-buffer 'set-window-buffer "22.1")
+(define-obsolete-function-alias 'eval-current-buffer 'eval-buffer "22.1")
+(define-obsolete-function-alias 'string-to-int 'string-to-number "22.1")
 
 (make-obsolete 'char-bytes "now always returns 1." "20.4")
-(make-obsolete 'baud-rate "use the `baud-rate' variable instead." "before 19.15")
 
 (defun insert-string (&rest args)
   "Mocklisp-compatibility insert function.
@@ -771,6 +774,7 @@ is converted into a string by expressing it in decimal."
   (dolist (el args)
     (insert (if (integerp el) (number-to-string el) el))))
 (make-obsolete 'insert-string 'insert "22.1")
+
 (defun makehash (&optional test) (make-hash-table :test (or test 'eql)))
 (make-obsolete 'makehash 'make-hash-table "22.1")
 
@@ -778,6 +782,7 @@ is converted into a string by expressing it in decimal."
 (defun baud-rate ()
   "Return the value of the `baud-rate' variable."
   baud-rate)
+(make-obsolete 'baud-rate "use the `baud-rate' variable instead." "before 19.15")
 
 
 ;;;; Obsolescence declarations for variables, and aliases.
@@ -787,10 +792,6 @@ is converted into a string by expressing it in decimal."
 (make-obsolete-variable 'unread-command-char
   "use `unread-command-events' instead.  That variable is a list of events to reread, so it now uses nil to mean `no event', instead of -1."
   "before 19.15")
-(make-obsolete-variable 'post-command-idle-hook
-  "use timers instead, with `run-with-idle-timer'." "before 19.34")
-(make-obsolete-variable 'post-command-idle-delay
-  "use timers instead, with `run-with-idle-timer'." "before 19.34")
 
 ;; Lisp manual only updated in 22.1.
 (define-obsolete-variable-alias 'executing-macro 'executing-kbd-macro
@@ -805,6 +806,8 @@ is converted into a string by expressing it in decimal."
 
 ;;;; Alternate names for functions - these are not being phased out.
 
+(defalias 'send-string 'process-send-string)
+(defalias 'send-region 'process-send-region)
 (defalias 'string= 'string-equal)
 (defalias 'string< 'string-lessp)
 (defalias 'move-marker 'set-marker)
@@ -822,9 +825,6 @@ is converted into a string by expressing it in decimal."
 (defalias 'point-at-eol 'line-end-position)
 (defalias 'point-at-bol 'line-beginning-position)
 
-;;; Should this be an obsolete name?  If you decide it should, you get
-;;; to go through all the sources and change them.
-(define-obsolete-function-alias 'string-to-int 'string-to-number)
 
 ;;;; Hook manipulation functions.
 
@@ -983,7 +983,8 @@ It can also be nil, if the definition is not associated with any file.
 
 If TYPE is nil, then any kind of definition is acceptable.
 If TYPE is `defun' or `defvar', that specifies function
-definition only or variable definition only."
+definition only or variable definition only.
+`defface' specifies a face definition only."
   (if (and (or (null type) (eq type 'defun))
            (symbolp symbol) (fboundp symbol)
            (eq 'autoload (car-safe (symbol-function symbol))))
@@ -1040,12 +1041,10 @@ This makes or adds to an entry on `after-load-alist'.
 FILE should be the name of a library, with no directory name."
   (eval-after-load file (read)))
 
-;;; make-network-process wrappers
+;;; open-network-stream is a wrapper around make-network-process.
 
-(if (featurep 'make-network-process)
-    (progn
-
-(defun open-network-stream (name buffer host service)
+(when (featurep 'make-network-process)
+  (defun open-network-stream (name buffer host service)
   "Open a TCP connection for a service to a host.
 Returns a subprocess-object to represent the connection.
 Input and output work as for subprocesses; `delete-process' closes it.
@@ -1061,56 +1060,7 @@ HOST is name of the host to connect to, or its IP address.
 SERVICE is name of the service desired, or an integer specifying
  a port number to connect to."
   (make-network-process :name name :buffer buffer
-                        :host host :service service))
-
-(defun open-network-stream-nowait (name buffer host service &optional sentinel filter)
-  "Initiate connection to a TCP connection for a service to a host.
-It returns nil if non-blocking connects are not supported; otherwise,
-it returns a subprocess-object to represent the connection.
-
-This function is similar to `open-network-stream', except that it
-returns before the connection is established.  When the connection
-is completed, the sentinel function will be called with second arg
-matching `open' (if successful) or `failed' (on error).
-
-Args are NAME BUFFER HOST SERVICE SENTINEL FILTER.
-NAME, BUFFER, HOST, and SERVICE are as for `open-network-stream'.
-Optional args SENTINEL and FILTER specify the sentinel and filter
-functions to be used for this network stream."
-  (if (featurep 'make-network-process  '(:nowait t))
-      (make-network-process :name name :buffer buffer :nowait t
-                            :host host :service service
-                            :filter filter :sentinel sentinel)))
-
-(defun open-network-stream-server (name buffer service &optional sentinel filter)
-  "Create a network server process for a TCP service.
-It returns nil if server processes are not supported; otherwise,
-it returns a subprocess-object to represent the server.
-
-When a client connects to the specified service, a new subprocess
-is created to handle the new connection, and the sentinel function
-is called for the new process.
-
-Args are NAME BUFFER SERVICE SENTINEL FILTER.
-NAME is name for the server process.  Client processes are named by
- appending the ip-address and port number of the client to NAME.
-BUFFER is the buffer (or buffer name) to associate with the server
- process.  Client processes will not get a buffer if a process filter
- is specified or BUFFER is nil; otherwise, a new buffer is created for
- the client process.  The name is similar to the process name.
-Third arg SERVICE is name of the service desired, or an integer
- specifying a port number to connect to.  It may also be t to select
- an unused port number for the server.
-Optional args SENTINEL and FILTER specify the sentinel and filter
- functions to be used for the client processes; the server process
- does not use these function."
-  (if (featurep 'make-network-process '(:server t))
-      (make-network-process :name name :buffer buffer
-                            :service service :server t :noquery t
-                            :sentinel sentinel :filter filter)))
-
-))  ;; (featurep 'make-network-process)
-
+                        :host host :service service)))
 
 ;; compatibility
 
@@ -2362,7 +2312,7 @@ macros."
   "Delete from ALIST all elements whose car is `eq' to KEY.
 Return the modified alist.
 Elements of ALIST that are not conses are ignored."
-  (while (and (consp (car alist)) 
+  (while (and (consp (car alist))
               (eq (car (car alist)) key))
     (setq alist (cdr alist)))
   (let ((tail alist) tail-cdr)
@@ -2377,7 +2327,7 @@ Elements of ALIST that are not conses are ignored."
   "Delete from ALIST all elements whose cdr is `eq' to VALUE.
 Return the modified alist.
 Elements of ALIST that are not conses are ignored."
-  (while (and (consp (car alist)) 
+  (while (and (consp (car alist))
               (eq (cdr (car alist)) value))
     (setq alist (cdr alist)))
   (let ((tail alist) tail-cdr)
diff --git a/lisp/term.el b/lisp/term.el
index 1e04f7ac015..7f8347a986d 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -3337,7 +3337,7 @@ The top-most line is line 0."
                 (second-colon
                  (string-match ":" string (1+ first-colon)))
                 (filename (substring string 1 first-colon))
-                (fileline (string-to-int
+                (fileline (string-to-number
                            (substring string (1+ first-colon) second-colon))))
            (setq term-pending-frame (cons filename fileline))))
         ((= (aref string 0) ?/)
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 02a6564f6a1..f44fd616560 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -106,7 +106,7 @@
         (let ((param (nth 3 aelt)))
           (setq default-frame-alist
                 (cons (cons param
-                            (string-to-int (car x-invocation-args)))
+                            (string-to-number (car x-invocation-args)))
                       default-frame-alist)
                 x-invocation-args
                 (cdr x-invocation-args))))))
@@ -1328,6 +1328,13 @@ in `selection-converter-alist', which see."
                          coding 'utf-16)))
               (setq str (or s (encode-coding-string str 'utf-16-mac)))))
            ((eq type 'com.apple.traditional-mac-plain-text)
+            (let ((encodables (find-coding-systems-string str))
+                  (rest mac-script-code-coding-systems))
+              (unless (memq coding encodables)
+                (while (and rest (not (memq (cdar rest) encodables)))
+                  (setq rest (cdr rest)))
+                (if rest
+                    (setq coding (cdar rest)))))
             (setq coding (coding-system-change-eol-conversion coding 'mac))
             (setq str (encode-coding-string str coding)))
            (t
diff --git a/lisp/term/sun-mouse.el b/lisp/term/sun-mouse.el
index 8d9bfb67cf7..cee02919a66 100644
--- a/lisp/term/sun-mouse.el
+++ b/lisp/term/sun-mouse.el
@@ -615,7 +615,7 @@ CODE values: 13 = Tool-Position, 14 = Size-in-Pixels, 18 = Size-in-Chars."
     (setq str (substring str (match-end 0)))
     (string-match ";[0-9]*" str)
     (setq x (substring str (1+ (match-beginning 0)) (match-end 0)))
-    (cons (string-to-int y) (string-to-int x))))
+    (cons (string-to-number y) (string-to-number x))))
 
 (defun sm::font-size ()
   "Returns font size in pixels: (cons Ysize Xsize)"
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index b4bd84cad03..3fcf281a9b9 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -146,7 +146,7 @@ the last file dropped is selected."
   "Handle SWITCH of the form \"-switch n\"."
   (let ((aelt (assoc switch command-line-x-option-alist)))
     (if aelt
-        (push (cons (nth 3 aelt) (string-to-int (pop x-invocation-args)))
+        (push (cons (nth 3 aelt) (string-to-number (pop x-invocation-args)))
               default-frame-alist))))
 
 ;; Handle options that apply to initial frame only
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 8641909da1c..4f440207c96 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -105,7 +105,7 @@
         (let ((param (nth 3 aelt)))
           (setq default-frame-alist
                 (cons (cons param
-                            (string-to-int (car x-invocation-args)))
+                            (string-to-number (car x-invocation-args)))
                       default-frame-alist)
                 x-invocation-args
                 (cdr x-invocation-args))))))
diff --git a/lisp/terminal.el b/lisp/terminal.el
index d33ba914cd3..b84b1b6ed00 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -489,7 +489,7 @@ lets you type a terminal emulator command."
              (progn
                (and terminal-more-processing (null (cdr te-pending-output))
                     (te-set-more-count nil))
-               (send-string te-process (make-string 1 last-input-char))
+               (process-send-string te-process (make-string 1 last-input-char))
                (te-process-output t))
            (message "Function key `%s' ignored"
                     (single-key-description last-input-char))))))
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index c41145befc8..1615da60910 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -61,7 +61,8 @@ If the function returns nil, then `fill-paragraph' does its normal work.")
 Kinsoku processing is designed to prevent certain characters from being
 placed at the beginning or end of a line by filling.
 See the documentation of `kinsoku' for more information."
-  :type 'boolean)
+  :type 'boolean
+  :group 'fill)
 
 (defun set-fill-prefix ()
   "Set the fill prefix to the current line up to point.
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index b171e6530fc..6aff0a731c7 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2266,9 +2266,9 @@ Optional third arg SHIFT is an offset to apply based on previous corrections."
       (setq output (substring output (match-end 0))) ; skip over misspelling
       (if (eq type ?#)
           (setq count 0)                ; no misses for type #
-        (setq count (string-to-int output) ; get number of misses.
+        (setq count (string-to-number output) ; get number of misses.
               output (substring output (1+ (string-match " " output 1)))))
-      (setq offset (string-to-int output))
+      (setq offset (string-to-number output))
       (if (eq type ?#)                  ; No miss or guess list.
           (setq output nil)
         (setq output (substring output (1+ (string-match " " output 1)))))
diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index c0638804ffa..9c5addb85fa 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -134,7 +134,7 @@ closing requests for requests that are used in matched pairs."
   (save-excursion
     (looking-at outline-regexp)
     (skip-chars-forward ".H ")
-    (string-to-int (buffer-substring (point) (+ 1 (point))))))
+    (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
diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el
index 93cd0757b4e..821eb7feca2 100644
--- a/lisp/textmodes/reftex-auc.el
+++ b/lisp/textmodes/reftex-auc.el
@@ -1,8 +1,9 @@
 ;;; reftex-auc.el --- RefTeX's interface to AUCTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
+;;  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Version: 4.26
+;; Version: 4.28
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el
index f12d01716fe..90ab8b7a3af 100644
--- a/lisp/textmodes/reftex-cite.el
+++ b/lisp/textmodes/reftex-cite.el
@@ -3,7 +3,7 @@
 ;;  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Version: 4.26
+;; Version: 4.28
 
 ;; This file is part of GNU Emacs.
 
@@ -312,12 +312,12 @@
       (not (stringp (car al1))))))
 
 (defun reftex-bib-sort-year (e1 e2)
-  (< (string-to-int (or (cdr (assoc "year" e1)) "0"))
-     (string-to-int (or (cdr (assoc "year" e2)) "0"))))
+  (< (string-to-number (or (cdr (assoc "year" e1)) "0"))
+     (string-to-number (or (cdr (assoc "year" e2)) "0"))))
 
 (defun reftex-bib-sort-year-reverse (e1 e2)
-  (> (string-to-int (or (cdr (assoc "year" e1)) "0"))
-     (string-to-int (or (cdr (assoc "year" e2)) "0"))))
+  (> (string-to-number (or (cdr (assoc "year" e1)) "0"))
+     (string-to-number (or (cdr (assoc "year" e2)) "0"))))
 
 (defun reftex-get-crossref-alist (entry)
   ;; return the alist from a crossref entry
@@ -681,7 +681,7 @@ While entering the regexp, completion on knows citation keys is possible.
         ;; Should we cleanup empty optional arguments?
         ;; if the first is empty, it can be removed.  If the second is empty,
         ;; it has to go.  If there is only a single arg and empty, it can go
-        ;; as well.
+        ;; as well.
         (when reftex-cite-cleanup-optional-args
           (cond 
            ((string-match "\\([a-zA-Z0-9]\\)\\[\\]{" string)
@@ -988,7 +988,7 @@ While entering the regexp, completion on knows citation keys is possible.
   (while (string-match
           "\\(\\`\\|[^%]\\)\\(\\(%\\([0-9]*\\)\\([a-zA-Z]\\)\\)[.,;: ]*\\)"
           format)
-    (let ((n (string-to-int (match-string 4 format)))
+    (let ((n (string-to-number (match-string 4 format)))
           (l (string-to-char (match-string 5 format)))
           rpl b e)
       (save-match-data
diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el
index e832465cf17..b73c62a9a0a 100644
--- a/lisp/textmodes/reftex-dcr.el
+++ b/lisp/textmodes/reftex-dcr.el
@@ -1,8 +1,9 @@
 ;;; reftex-dcr.el --- viewing cross references and citations with RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
+;;  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Version: 4.26
+;; Version: 4.28
 ;;
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el
index d3ef2dcb788..76c03c13188 100644
--- a/lisp/textmodes/reftex-global.el
+++ b/lisp/textmodes/reftex-global.el
@@ -1,8 +1,9 @@
 ;;; reftex-global.el --- operations on entire documents with RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
+;;  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Version: 4.26
+;; Version: 4.28
 
 ;; This file is part of GNU Emacs.
 
@@ -416,10 +417,6 @@ Also checks if buffers visiting the files are in read-only mode."
         (find-file  (car flist))))))
 
 ;;;###autoload
-(defvar reftex-isearch-minor-mode nil)
-(make-variable-buffer-local 'reftex-isearch-minor-mode)
-
-;;;###autoload
 (defun reftex-isearch-minor-mode (&optional arg)
   "When on, isearch searches the whole document, not only the current file.
 This minor mode allows isearch to search through all the files of
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index 8fada9c4930..ff2ea70a011 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -3,7 +3,7 @@
 ;;  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Version: 4.26
+;; Version: 4.28
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el
index ce1e3d77d72..0046c1b34b8 100644
--- a/lisp/textmodes/reftex-parse.el
+++ b/lisp/textmodes/reftex-parse.el
@@ -3,7 +3,7 @@
 ;;  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Version: 4.26
+;; Version: 4.28
 ;;
 
 ;; This file is part of GNU Emacs.
@@ -999,7 +999,7 @@ of master file."
         (if (string-match "\\`[A-Z]\\'" number-string)
             (aset reftex-section-numbers i
                   (- (string-to-char number-string) ?A -1))
-            (aset reftex-section-numbers i (string-to-int number-string)))
+            (aset reftex-section-numbers i (string-to-number number-string)))
         (pop numbers))
       (decf i)))
   (put 'reftex-section-numbers 'appendix appendix))
@@ -1045,7 +1045,7 @@ of master file."
             (setq string 
                   (concat
                    (char-to-string
-                    (1- (+ ?A (string-to-int (match-string 0 string)))))
+                    (1- (+ ?A (string-to-number (match-string 0 string)))))
                    (substring string (match-end 0))))))
       (if star
           (concat (make-string (1- (length string)) ?\ ) "*")
diff --git a/lisp/textmodes/reftex-ref.el b/lisp/textmodes/reftex-ref.el
index 6afbb77767c..be6f95d6ebc 100644
--- a/lisp/textmodes/reftex-ref.el
+++ b/lisp/textmodes/reftex-ref.el
@@ -3,7 +3,7 @@
 ;;  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Version: 4.26
+;; Version: 4.28
 
 ;; This file is part of GNU Emacs.
 
@@ -29,6 +29,7 @@
 (eval-when-compile (require 'cl))
 (provide 'reftex-ref)
 (require 'reftex)
+(require 'reftex-parse)
 ;;;
 
 (defun reftex-label-location (&optional bound)
@@ -200,13 +201,13 @@ This function is controlled by the settings of reftex-insert-label-flags."
               force-prompt)
 
           (while (not valid)
-            ;; iterate until we get a legal label
+            ;; iterate until we get a valid label
 
             (setq label (read-string
                          (if naked "Naked Label: " "Label: ")
                          default))
 
-            ;; Lets make sure that this is a legal label
+            ;; Lets make sure that this is a valid label
             (cond
 
              ((string-match (concat "\\`\\(" (regexp-quote prefix)
diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el
index 8b0ebb2ca2b..eb8c3035c90 100644
--- a/lisp/textmodes/reftex-sel.el
+++ b/lisp/textmodes/reftex-sel.el
@@ -1,8 +1,9 @@
 ;;; reftex-sel.el --- the selection modes for RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
+;;  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Version: 4.26
+;; Version: 4.28
 
 ;; This file is part of GNU Emacs.
 
@@ -418,7 +419,7 @@ During a selection process, these are the local bindings.
           (remove-hook 'post-command-hook 
                        'reftex-select-post-command-hook t))
         ;; Kill the mark overlays
-        (mapcar (lambda (c) (delete-overlay (nth 1 c)))
+        (mapcar (lambda (c) (reftex-delete-overlay (nth 1 c)))
                 reftex-select-marked)))))
 
     (set (make-local-variable 'reftex-last-line)
@@ -604,14 +605,14 @@ Useful for large TOC's."
     (setq boe (or (previous-single-property-change (1+ (point)) :data)
                   (point-min))
           eoe (or (next-single-property-change (point) :data) (point-max)))
-    (setq ovl (make-overlay boe eoe))
+    (setq ovl (reftex-make-overlay boe eoe))
     (push (list data ovl separator) reftex-select-marked)
-    (overlay-put ovl 'face reftex-select-mark-face)
-    (overlay-put ovl 'before-string
-                 (if separator
-                     (format "*%c%d* " separator
-                             (length reftex-select-marked))
-                   (format "*%d*  " (length reftex-select-marked))))
+    (reftex-overlay-put ovl 'face reftex-select-mark-face)
+    (reftex-overlay-put ovl 'before-string
+                        (if separator
+                            (format "*%c%d* " separator
+                                    (length reftex-select-marked))
+                          (format "*%d*  " (length reftex-select-marked))))
     (message "Entry has mark no. %d" (length reftex-select-marked))))
 
 (defun reftex-select-mark-comma ()
@@ -637,19 +638,16 @@ Useful for large TOC's."
          sep)
     (unless cell
       (error "No marked entry at point"))
-    (and ovl (delete-overlay ovl))
+    (and ovl (reftex-delete-overlay ovl))
     (setq reftex-select-marked (delq cell reftex-select-marked))
-    (if (featurep 'xemacs)
-        ;; before-string property is broken in Emacs
-        (progn
-          (setq cnt (1+ (length reftex-select-marked)))
-          (mapcar (lambda (c)
-                    (setq sep (nth 2 c))
-                    (overlay-put (nth 1 c) 'before-string
-                                 (if sep
-                                     (format "*%c%d* " sep (decf cnt))
-                                   (format "*%d*  " (decf cnt)))))
-                  reftex-select-marked)))
+    (setq cnt (1+ (length reftex-select-marked)))
+    (mapcar (lambda (c)
+              (setq sep (nth 2 c))
+              (reftex-overlay-put (nth 1 c) 'before-string
+                                  (if sep
+                                      (format "*%c%d* " sep (decf cnt))
+                                    (format "*%d*  " (decf cnt)))))
+            reftex-select-marked)
     (message "Entry no longer marked")))
 
 (defun reftex-select-help ()
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el
index ed9746f8a69..8ad811391c7 100644
--- a/lisp/textmodes/reftex-toc.el
+++ b/lisp/textmodes/reftex-toc.el
@@ -1,8 +1,9 @@
 ;;; reftex-toc.el --- RefTeX's table of contents mode
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
+;;  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Version: 4.26
+;; Version: 4.28
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index b2ca7bed250..b9748b31df2 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -3,7 +3,7 @@
 ;;  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Version: 4.26
+;; Version: 4.28
 
 ;; This file is part of GNU Emacs.
 
@@ -155,6 +155,21 @@ distribution.  Mixed-case symbols are convenience aliases.")
       (?f    . "\\fullcite{%l}")
       (?F    . "\\fullocite{%l}")
       (?n    . "\\nocite{%l}")))
+    (jurabib "The Jurabib package"
+     ((?\C-m . "\\cite{%l}")
+      (?c    . "\\cite[][]{%l}")
+      (?t    . "\\citet{%l}")
+      (?p    . "\\citep{%l}")
+      (?e    . "\\citep[e.g.][]{%l}")
+      (?s    . "\\citep[see][]{%l}")
+      (?u    . "\\fullcite{%l}")
+      (?i    . "\\citetitle{%l}")
+      (?a    . "\\citeauthor{%l}")
+      (?e    . "\\citefield{}{%l}")
+      (?y    . "\\citeyear{%l}")
+      (?f    . "\\footcite{%l}")
+      (?F    . "\\footcite[][]{%l}")
+      (?l    . "\\footfullcite{%l}")))
     (bibentry "The Bibentry package"
       "\\bibentry{%l}")
     (harvard "The Harvard package"
@@ -639,7 +654,7 @@ or macro."
   "Non-nil means, trust the label prefix when determining label type.
 It is customary to use special label prefixes to distinguish different label
 types.  The label prefixes have no syntactic meaning in LaTeX (unless
-special packages like fancyref) are being used.  RefTeX can and by
+special packages like fancyref are being used).  RefTeX can and by
 default does parse around each label to detect the correct label type,
 but this process can be slow when a document contains thousands of
 labels.  If you use label prefixes consistently, you may speed up
@@ -1373,7 +1388,9 @@ Inserting indexing commands in a line makes the line longer - often
 so long that it does not fit onto the screen.  When this variable is
 non-nil, newlines will be added as necessary before and/or after the
 indexing command to keep lines short.  However, the matched text
-phrase and its index command will always end up on a single line.")
+phrase and its index command will always end up on a single line."
+  :group 'reftex-index-support
+  :type 'boolean)
 
 (defcustom reftex-index-phrases-sort-prefers-entry nil
   "*Non-nil means when sorting phrase lines, the explicit index entry is used.
@@ -1529,7 +1546,7 @@ TYPE:       File type like \"bib\" or \"tex\".
 DEF-EXT:    The default extension for that file type, like \".tex\" or \".bib\".
 OTHER-EXT:  Any number of other valid extensions for this file type.
 
-When a files is searched and it does not have any of the valid extensions,
+When a files is searched and it does not have any of the legal extensions,
 we try the default extension first, and then the naked file name.
 
 If you are using AUCTeX, you also need to add new extensions to
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index 865217dab08..f8b4cba65ae 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -3,7 +3,7 @@
 ;;  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Version: 4.26
+;; Version: 4.28
 ;; Keywords: tex
 
 ;; This file is part of GNU Emacs.
@@ -301,7 +301,7 @@
 ;;; Define the formal stuff for a minor mode named RefTeX.
 ;;;
 
-(defconst reftex-version "RefTeX version 4.26"
+(defconst reftex-version "RefTeX version 4.28"
   "Version string for RefTeX.")
 
 (defvar reftex-mode nil
@@ -1501,7 +1501,7 @@ When DIE is non-nil, throw an error if file not found."
     (when (null (get pathvar 'status))
       ;; Get basic path
       (set pathvar
-           (reftex-uniq
+           (reftex-uniquify
             (reftex-parse-colon-path
              (mapconcat
               (lambda(x) 
@@ -1606,15 +1606,6 @@ When DIE is non-nil, throw an error if file not found."
         (push dir path1)))
     path1))
 
-(defun reftex-uniq (list)
-  (let (new)
-    (while list
-      (or (member (car list) new)
-          (push (car list) new))
-      (pop list))
-    (nreverse new)))
-
-
 ;;; =========================================================================
 ;;;
 ;;; Parser functions
@@ -2145,7 +2136,7 @@ Works on both Emacs and XEmacs."
     (nreverse rtn)))
 
 (defun reftex-uniquify (list)
-  ;; Return a list of all elements in LIST, but each only once
+  ;; Return a list of all elements in LIST, but each only once, keeping order
   (let (new elm)
     (while list
       (setq elm (pop list))
@@ -2342,31 +2333,40 @@ IGNORE-WORDS List of words which should be removed from the string."
             (if (find-face face) (throw 'exit face))
           (if (facep face) (throw 'exit face)))))))
 
-;; Highlighting uses overlays.  For XEmacs, we need the emulation.
-(if (featurep 'xemacs) (require 'overlay))
+;; Highlighting uses overlays.  For XEmacs, we use extends.
+(if (featurep 'xemacs)
+    (progn
+      (defalias 'reftex-make-overlay 'make-extent)
+      (defalias 'reftex-overlay-put 'set-extent-property)
+      (defalias 'reftex-move-overlay 'set-extent-endpoints)
+      (defalias 'reftex-delete-overlay 'detach-extent))
+  (defalias 'reftex-make-overlay 'make-overlay)
+  (defalias 'reftex-overlay-put 'overlay-put)
+  (defalias 'reftex-move-overlay 'move-overlay)
+  (defalias 'reftex-delete-overlay 'delete-overlay))
 
 ;; We keep a vector with several different overlays to do our highlighting.
 (defvar reftex-highlight-overlays [nil nil nil])
 
 ;; Initialize the overlays
-(aset reftex-highlight-overlays 0 (make-overlay 1 1))
-(overlay-put (aref reftex-highlight-overlays 0) 
+(aset reftex-highlight-overlays 0 (reftex-make-overlay 1 1))
+(reftex-overlay-put (aref reftex-highlight-overlays 0) 
              'face 'highlight)
-(aset reftex-highlight-overlays 1 (make-overlay 1 1))
-(overlay-put (aref reftex-highlight-overlays 1)
+(aset reftex-highlight-overlays 1 (reftex-make-overlay 1 1))
+(reftex-overlay-put (aref reftex-highlight-overlays 1)
              'face reftex-cursor-selected-face)
-(aset reftex-highlight-overlays 2 (make-overlay 1 1))
-(overlay-put (aref reftex-highlight-overlays 2)
+(aset reftex-highlight-overlays 2 (reftex-make-overlay 1 1))
+(reftex-overlay-put (aref reftex-highlight-overlays 2)
              'face reftex-cursor-selected-face)
 
 ;; Two functions for activating and deactivation highlight overlays
 (defun reftex-highlight (index begin end &optional buffer)
   "Highlight a region with overlay INDEX."
-  (move-overlay (aref reftex-highlight-overlays index)
+  (reftex-move-overlay (aref reftex-highlight-overlays index)
                 begin end (or buffer (current-buffer))))
 (defun reftex-unhighlight (index)
   "Detach overlay INDEX."
-  (delete-overlay (aref reftex-highlight-overlays index)))
+  (reftex-delete-overlay (aref reftex-highlight-overlays index)))
 
 (defun reftex-highlight-shall-die ()
   ;; Function used in pre-command-hook to remove highlights.
@@ -2424,6 +2424,9 @@ IGNORE-WORDS List of words which should be removed from the string."
 
 ;; Define a menu for the menu bar if Emacs is running under X
 
+(defvar reftex-isearch-minor-mode nil)
+(make-variable-buffer-local 'reftex-isearch-minor-mode)
+
 (require 'easymenu)
 
 (easy-menu-define reftex-mode-menu reftex-mode-map
diff --git a/lisp/textmodes/spell.el b/lisp/textmodes/spell.el
index c6289819c88..6afaae83703 100644
--- a/lisp/textmodes/spell.el
+++ b/lisp/textmodes/spell.el
@@ -128,9 +128,9 @@ for example, \"word\"."
          (forward-char 1)
          (delete-region (point-min) (point))
          (setq newword
-               (read-input (concat "`" word
-                                   "' not recognized; edit a replacement: ")
-                           word))
+               (read-string (concat "`" word
+                                    "' not recognized; edit a replacement: ")
+                            word))
          (flush-lines (concat "^" (regexp-quote word) "$")))
         (if (not (equal word newword))
             (progn
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index a85e968d3ee..118ca3bb3fa 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -842,7 +842,8 @@ simply by any key input."
   :group 'table-hooks)
 
 (defcustom table-yank-handler '(nil nil t nil)
-  "*yank-handler for table.")
+  "*yank-handler for table."
+  :group 'table)
 
 (setplist 'table-disable-incompatibility-warning nil)
 
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index e478169c250..ad029266f3b 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -2807,7 +2807,7 @@ Default is to leave the number of spaces as is."
   (let ((arg  (texinfo-parse-arg-discard)))
     (if (string= "asis" arg)
         (setq texinfo-paragraph-indent "asis")
-      (setq texinfo-paragraph-indent (string-to-int arg)))))
+      (setq texinfo-paragraph-indent (string-to-number arg)))))
 
 (put 'refill 'texinfo-format 'texinfo-format-refill)
 (defun texinfo-format-refill ()
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index c0ba69f80c2..96f48434ab5 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -270,7 +270,7 @@ template."
           (string-match "\\`\\(\\(-?[0-9]+\\)/\\)?\\([^%]+\\)?\\(\\(%[-.,:@+_ #^()0-9]*[A-Za-z%][^%]*\\)*%[-.,:@+_ #^()0-9]*[A-Za-z%]\\)?\\([^%]+\\)?\\'" time-stamp-pattern)
           (and (match-beginning 2)
                (setq line-limit
-                     (string-to-int (match-string 2 time-stamp-pattern))))
+                     (string-to-number (match-string 2 time-stamp-pattern))))
           (and (match-beginning 3)
                (setq ts-start (match-string 3 time-stamp-pattern)))
           (and (match-beginning 4)
@@ -558,9 +558,9 @@ and all `time-stamp-format' compatibility."
          ((eq cur-char ?y)              ;year
           (or alt-form (not (string-equal field-width ""))
               (time-stamp-conv-warn "%y" "%:y"))
-          (string-to-int (format-time-string "%Y" time)))
+          (string-to-number (format-time-string "%Y" time)))
          ((eq cur-char ?Y)              ;4-digit year, new style
-          (string-to-int (format-time-string "%Y" time)))
+          (string-to-number (format-time-string "%Y" time)))
          ((eq cur-char ?z)              ;time zone lower case
           (if change-case
               ""                        ;discourage %z variations
@@ -597,7 +597,7 @@ and all `time-stamp-format' compatibility."
           (let* ((initial-length (length padded-result))
                  (desired-length (if (string-equal field-width "")
                                      initial-length
-                                   (string-to-int field-width))))
+                                   (string-to-number field-width))))
             (if (> initial-length desired-length)
                 ;; truncate strings on right, years on left
                 (if (stringp field-result)
@@ -621,7 +621,7 @@ width specification or \"\".  TIME is the time to convert."
                                (format "%%:%c" format-char)))
     (if (and alt-form (not (string-equal field-width "")))
         ""                              ;discourage "%:2d" and the like
-      (string-to-int (format-time-string format-string time)))))
+      (string-to-number (format-time-string format-string time)))))
 
 (defvar time-stamp-conversion-warn t
   "Warn about soon-to-be-unsupported forms in `time-stamp-format'.
diff --git a/lisp/time.el b/lisp/time.el
index 850843402ca..ddf0d932733 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -331,7 +331,7 @@ update which can wait for the next redisplay."
                               ;; Record that mail file is accessible.
                               (setq display-time-server-down-time nil)))))))
          (24-hours (substring time 11 13))
-         (hour (string-to-int 24-hours))
+         (hour (string-to-number 24-hours))
          (12-hours (int-to-string (1+ (% (+ hour 11) 12))))
          (am-pm (if (>= hour 12) "pm" "am"))
          (minutes (substring time 14 16))
diff --git a/lisp/timezone.el b/lisp/timezone.el
index bad269d9cbc..62c8f86f79b 100644
--- a/lisp/timezone.el
+++ b/lisp/timezone.el
@@ -205,7 +205,7 @@ Understands the following styles:
       ;; Unix Epoch, so are 2000+.  Three-digit years are assumed to
       ;; be relative to 1900.
       (if (< (length year) 4)
-          (let ((y (string-to-int year)))
+          (let ((y (string-to-number year)))
             (if (< y 69)
                 (setq y (+ y 100)))
             (setq year (int-to-string (+ 1900 y)))))
@@ -271,7 +271,7 @@ or an integer of the form +-HHMM, or a time zone name."
                   ;; +900
                   timezone))
         (if (stringp timezone)
-            (setq timezone (string-to-int timezone)))
+            (setq timezone (string-to-number timezone)))
         ;; Taking account of minute in timezone.
         ;; HHMM -> MM
         (let* ((abszone (abs timezone))
@@ -314,7 +314,7 @@ Gregorian date Sunday, December 31, 1 BC."
 If LOCAL is nil, it is assumed to be GMT.
 If TIMEZONE is nil, use the local time zone."
   (let* ((date   (timezone-parse-date date))
-         (year   (string-to-int (aref date 0)))
+         (year   (string-to-number (aref date 0)))
          (year   (cond ((< year 69)
                         (+ year 2000))
                        ((< year 100)
@@ -322,12 +322,12 @@ If TIMEZONE is nil, use the local time zone."
                        ((< year 1000)   ; possible 3-digit years.
                         (+ year 1900))
                        (t year)))
-         (month  (string-to-int (aref date 1)))
-         (day    (string-to-int (aref date 2)))
+         (month  (string-to-number (aref date 1)))
+         (day    (string-to-number (aref date 2)))
          (time   (timezone-parse-time (aref date 3)))
-         (hour   (string-to-int (aref time 0)))
-         (minute (string-to-int (aref time 1)))
-         (second (string-to-int (aref time 2)))
+         (hour   (string-to-number (aref time 0)))
+         (minute (string-to-number (aref time 1)))
+         (second (string-to-number (aref time 2)))
          (local  (or (aref date 4) local)) ;Use original if defined
          (timezone
           (or timezone
diff --git a/lisp/tmm.el b/lisp/tmm.el
index 99931867792..3e0a8e95701 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -395,7 +395,7 @@ element of keymap, an `x-popup-menu' argument, or an element of
 `x-popup-menu' argument (when IN-X-MENU is not-nil).
 This function adds the element only if it is not already present.
 It uses the free variable `tmm-table-undef' to keep undefined keys."
-  (let (km str cache plist filter visible (event (car elt)))
+  (let (km str cache plist filter visible enable (event (car elt)))
     (setq elt (cdr elt))
     (if (eq elt 'undefined)
         (setq tmm-table-undef (cons (cons event nil) tmm-table-undef))
@@ -436,6 +436,9 @@ It uses the free variable `tmm-table-undef' to keep undefined keys."
                (setq visible (plist-get plist :visible))
                (if visible
                    (setq km (and (eval visible) km)))
+               (setq enable (plist-get plist :enable))
+               (if enable
+                   (setq km (and (eval enable) km)))
                (and str
                     (consp (nth 3 elt))
                     (stringp (cdr (nth 3 elt))) ; keyseq cache
diff --git a/lisp/toolbar/tool-bar.el b/lisp/toolbar/tool-bar.el
index f22d84cafaf..5f2e3afd46c 100644
--- a/lisp/toolbar/tool-bar.el
+++ b/lisp/toolbar/tool-bar.el
@@ -1,6 +1,6 @@
 ;;; tool-bar.el --- setting up the tool bar
 ;;
-;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
 ;;
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: mouse frames
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index ea9094da78a..792a81f3221 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -110,17 +110,20 @@ would have the following buffer names in the various styles:
                 (const post-forward)
                 (const post-forward-angle-brackets)
                 (const :tag "standard Emacs behavior (nil)" nil))
-  :require 'uniquify)
+  :require 'uniquify
+  :group 'uniquify)
 
 (defcustom uniquify-after-kill-buffer-p t
   "If non-nil, rerationalize buffer names after a buffer has been killed."
-  :type 'boolean)
+  :type 'boolean
+  :group 'uniquify)
 
 (defcustom uniquify-ask-about-buffer-names-p nil
   "*If non-nil, permit user to choose names for buffers with same base file.
 If the user chooses to name a buffer, uniquification is preempted and no
 other buffer names are changed."
-  :type 'boolean)
+  :type 'boolean
+  :group 'uniquify)
 
 ;; The default value matches certain Gnus buffers.
 (defcustom uniquify-ignore-buffers-re nil
@@ -128,11 +131,13 @@ other buffer names are changed."
 For instance, set this to \"^draft-[0-9]+$\" to avoid having uniquify rename
 draft buffers even if `uniquify-after-kill-buffer-p' is non-nil and the
 visited file name isn't the same as that of the buffer."
-  :type '(choice (const :tag "Uniquify all buffers" nil) regexp))
+  :type '(choice (const :tag "Uniquify all buffers" nil) regexp)
+  :group 'uniquify)
 
 (defcustom uniquify-min-dir-content 0
   "*Minimum number of directory name components included in buffer name."
-  :type 'integer)
+  :type 'integer
+  :group 'uniquify)
 
 (defcustom uniquify-separator nil
   "*String separator for buffer name components.
@@ -140,14 +145,16 @@ When `uniquify-buffer-name-style' is `post-forward', separates
 base file name from directory part in buffer names (default \"|\").
 When `uniquify-buffer-name-style' is `reverse', separates all
 file name components (default \"\\\")."
-  :type '(choice (const nil) string))
+  :type '(choice (const nil) string)
+  :group 'uniquify)
 
 (defcustom uniquify-trailing-separator-p nil
   "*If non-nil, add a file name separator to dired buffer names.
 If `uniquify-buffer-name-style' is `forward', add the separator at the end;
 if it is `reverse', add the separator at the beginning; otherwise, this
 variable is ignored."
-  :type 'boolean)
+  :type 'boolean
+  :group 'uniquify)
 
 (defcustom uniquify-strip-common-suffix
   ;; Using it when uniquify-min-dir-content>0 doesn't make much sense.
@@ -156,7 +163,8 @@ variable is ignored."
 E.g. if you open /a1/b/c/d and /a2/b/c/d, the buffer names will say
 \"d|a1\" and \"d|a2\" instead of \"d|a1/b/c\" and \"d|a2/b/c\".
 This can be handy when you have deep parallel hierarchies."
-  :type 'boolean)
+  :type 'boolean
+  :group 'uniquify)
 
 (defvar uniquify-list-buffers-directory-modes '(dired-mode cvs-mode)
   "List of modes for which uniquify should obey `list-buffers-directory'.
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index a023bdf18c7..546af477106 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,21 @@
+2005-05-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * url-cookie.el (url-cookie-multiple-line):
+        Specify group and type in defcustom.
+
+2005-05-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * url-auth.el (url-register-auth-scheme):
+        * url-cookie.el (url-cookie-expired-p):
+        * url-dav.el (url-dav-process-date-property)
+        (url-dav-process-boolean-property, url-dav-process-DAV:status):
+        * url-http.el (url-http-chunked-encoding-after-change-function)
+        (url-http-wait-for-headers-change-function):
+        * url-ns.el (isInNet):
+        * url-parse.el (url-generic-parse-url):
+        * url-util.el (url-get-normalized-date): Replace `string-to-int'
+        by `string-to-number'.
+
 2005-04-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * url.el (url-retrieve-synchronously): Work around the fact that
diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index 260315c5d54..ea208ccadea 100644
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -293,7 +293,7 @@ RATING   a rating between 1 and 10 of the strength of the authentication.
          (function (or function (intern (concat "url-" type "-auth"))))
          (rating (cond
                   ((null rating) 2)
-                  ((stringp rating) (string-to-int rating))
+                  ((stringp rating) (string-to-number rating))
                   (t rating)))
          (node (assoc type url-registered-auth-schemes)))
     (if (not (fboundp function))
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index 9f7db867597..328e60b63bc 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -87,7 +87,9 @@
   "*If nil, HTTP requests put all cookies for the server on one line.
 Some web servers, such as http://www.hotmail.com/, only accept cookies
 when they are on one line.  This is broken behaviour, but just try
-telling Microsoft that.")
+telling Microsoft that."
+  :type 'boolean
+  :group 'url-cookie)
 
 (defvar url-cookies-changed-since-last-save nil
   "Whether the cookies list has changed since the last save operation.")
@@ -208,13 +210,13 @@ telling Microsoft that.")
          (cur-date (and exp (timezone-parse-date (current-time-string))))
          (exp-date (and exp (timezone-parse-date exp)))
          (cur-greg (and cur-date (timezone-absolute-from-gregorian
-                                  (string-to-int (aref cur-date 1))
-                                  (string-to-int (aref cur-date 2))
-                                  (string-to-int (aref cur-date 0)))))
+                                  (string-to-number (aref cur-date 1))
+                                  (string-to-number (aref cur-date 2))
+                                  (string-to-number (aref cur-date 0)))))
          (exp-greg (and exp (timezone-absolute-from-gregorian
-                             (string-to-int (aref exp-date 1))
-                             (string-to-int (aref exp-date 2))
-                             (string-to-int (aref exp-date 0)))))
+                             (string-to-number (aref exp-date 1))
+                             (string-to-number (aref exp-date 2))
+                             (string-to-number (aref exp-date 0)))))
          (diff-in-days (and exp (- cur-greg exp-greg)))
          )
     (cond
@@ -224,12 +226,12 @@ telling Microsoft that.")
      (t                                 ; Expires sometime today, check times
       (let* ((cur-time (timezone-parse-time (aref cur-date 3)))
              (exp-time (timezone-parse-time (aref exp-date 3)))
-             (cur-norm (+ (* 360 (string-to-int (aref cur-time 2)))
-                          (*  60 (string-to-int (aref cur-time 1)))
-                          (*   1 (string-to-int (aref cur-time 0)))))
-             (exp-norm (+ (* 360 (string-to-int (aref exp-time 2)))
-                          (*  60 (string-to-int (aref exp-time 1)))
-                          (*   1 (string-to-int (aref exp-time 0))))))
+             (cur-norm (+ (* 360 (string-to-number (aref cur-time 2)))
+                          (*  60 (string-to-number (aref cur-time 1)))
+                          (*   1 (string-to-number (aref cur-time 0)))))
+             (exp-norm (+ (* 360 (string-to-number (aref exp-time 2)))
+                          (*  60 (string-to-number (aref exp-time 1)))
+                          (*   1 (string-to-number (aref exp-time 0))))))
         (> (- cur-norm exp-norm) 1))))))
 
 ;;;###autoload
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index d6c5ffffa43..a0f1ae1ebe7 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -121,17 +121,17 @@
 
     ;; Nobody else handles iso8601 correctly, lets do it ourselves.
     (when (string-match date-re date-string re-start)
-      (setq year (string-to-int (match-string 1 date-string))
-            month (string-to-int (match-string 2 date-string))
-            day (string-to-int (match-string 3 date-string))
+      (setq year (string-to-number (match-string 1 date-string))
+            month (string-to-number (match-string 2 date-string))
+            day (string-to-number (match-string 3 date-string))
             re-start (match-end 0))
       (when (string-match time-re date-string re-start)
-        (setq hour (string-to-int (match-string 1 date-string))
-              minute (string-to-int (match-string 2 date-string))
-              seconds (string-to-int (match-string 3 date-string))
-              fractional-seconds (string-to-int (or
-                                                 (match-string 4 date-string)
-                                                 "0"))
+        (setq hour (string-to-number (match-string 1 date-string))
+              minute (string-to-number (match-string 2 date-string))
+              seconds (string-to-number (match-string 3 date-string))
+              fractional-seconds (string-to-number (or
+                                                    (match-string 4 date-string)
+                                                    "0"))
               re-start (match-end 0))
         (when (string-match tz-re date-string re-start)
           (setq tz (match-string 1 date-string)))
@@ -149,7 +149,7 @@
     time))
 
 (defun url-dav-process-boolean-property (node)
-  (/= 0 (string-to-int (url-dav-node-text node))))
+  (/= 0 (string-to-number (url-dav-node-text node))))
 
 (defun url-dav-process-uri-property (node)
   ;; Returns a parsed representation of the URL...
@@ -318,7 +318,7 @@
   ;; only care about the numeric status code.
   (let ((status (url-dav-node-text node)))
     (if (string-match "\\`[ \r\t\n]*HTTP/[0-9.]+ \\([0-9]+\\)" status)
-        (string-to-int (match-string 1 status))
+        (string-to-number (match-string 1 status))
       500)))
 
 (defun url-dav-process-DAV:propstat (node)
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 872ea22ce05..16d51a0258c 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -827,10 +827,10 @@ the end of the document."
                                                  'text-cursor
                                                'cursor)
                                        'invisible t))
-            (setq url-http-chunked-length (string-to-int (buffer-substring
-                                                          (match-beginning 1)
-                                                          (match-end 1))
-                                                         16)
+            (setq url-http-chunked-length (string-to-number (buffer-substring
+                                                             (match-beginning 1)
+                                                             (match-end 1))
+                                                            16)
                   url-http-chunked-counter (1+ url-http-chunked-counter)
                   url-http-chunked-start (set-marker
                                           (or url-http-chunked-start
@@ -904,7 +904,7 @@ the end of the document."
                     url-http-content-type (mail-fetch-field "content-type"))
               (if (mail-fetch-field "content-length")
                   (setq url-http-content-length
-                        (string-to-int (mail-fetch-field "content-length"))))
+                        (string-to-number (mail-fetch-field "content-length"))))
               (widen)))
           (if url-http-transfer-encoding
               (setq url-http-transfer-encoding
diff --git a/lisp/url/url-ns.el b/lisp/url/url-ns.el
index fe181422e4f..1dcb1f85f27 100644
--- a/lisp/url/url-ns.el
+++ b/lisp/url/url-ns.el
@@ -51,9 +51,9 @@
     (if (or (/= (length netc) (length ipc))
             (/= (length ipc) (length maskc)))
         nil
-      (setq netc (mapcar 'string-to-int netc)
-            ipc (mapcar 'string-to-int ipc)
-            maskc (mapcar 'string-to-int maskc))
+      (setq netc (mapcar 'string-to-number netc)
+            ipc (mapcar 'string-to-number ipc)
+            maskc (mapcar 'string-to-number maskc))
       (and
        (= (logand (nth 0 netc) (nth 0 maskc))
           (logand (nth 0 ipc)  (nth 0 maskc)))
diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el
index 97348ab5db2..5b5250ab31f 100644
--- a/lisp/url/url-parse.el
+++ b/lisp/url/url-parse.el
@@ -167,7 +167,7 @@ Format is:
                   (setq pass (match-string 2 user)
                         user (match-string 1 user)))
               (if (string-match ":\\([0-9+]+\\)" host)
-                  (setq port (string-to-int (match-string 1 host))
+                  (setq port (string-to-number (match-string 1 host))
                         host (substring host 0 (match-beginning 0))))
               (if (string-match ":$" host)
                   (setq host (substring host 0 (match-beginning 0))))
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index 1d0bfcf0c48..b796d695461 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -196,7 +196,7 @@ Will not do anything if `url-show-status' is nil."
          (year nil)
          (month (car
                  (rassoc
-                  (string-to-int (aref parsed 1)) url-monthabbrev-alist)))
+                  (string-to-number (aref parsed 1)) url-monthabbrev-alist)))
          )
     (setq day (or (car-safe (rassoc day url-weekday-alist))
                   (substring raw 0 3))
diff --git a/lisp/vms-patch.el b/lisp/vms-patch.el
index 48174f41237..60033dc7f20 100644
--- a/lisp/vms-patch.el
+++ b/lisp/vms-patch.el
@@ -93,7 +93,7 @@ If the logical name `EMACS_FILE_NAME' is defined, `find-file' that file."
     (if (not args)
         (if file
             (progn (find-file file)
-                   (if line (goto-line (string-to-int line)))))
+                   (if line (goto-line (string-to-number line)))))
       (cd (file-name-directory file))
       (vms-command-line-again))))
 
diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index 6a3ff36108e..1877e159ae7 100644
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -146,7 +146,8 @@ menu if the variable `w32-use-w32-font-dialog' is nil."
                 (const :tag "Seperator" (""))
                 (list :tag "Font Entry"
                       (string :tag "Menu text")
-                      (string :tag "Font"))))))))
+                      (string :tag "Font")))))))
+    :group 'w32)
 
 (defcustom x-select-enable-clipboard t
   "*Non-nil means cutting and pasting uses the clipboard.