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

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 272-288)

   - src/xdisp.c (dump_glyph_row): Don't display overlay_arrow_p field.
   - Update from CVS
   - Merge from gnus--rel--5.10

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

   - Update from CVS

82 files changed, 4032 insertions, 2094 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75822754e85..c95e169bebc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,590 @@
+2005-05-05  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/cmacexp.el (c-macro-preprocessor): Update for BSD and
+        use gcc instead of cpp.
+
+        * progmodes/gdb-ui.el (gdb-cpp-define-alist-flags): New variable.
+        (gdb-create-define-alist): Use. it.
+        (gdb-cpp-define-alist-program): Update for MS-DOS?
+
+2005-05-04  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/cmacexp.el (c-macro-preprocessor): Update for Mac OSX.
+
+2005-05-03  Ulf Jasper  <ulf.jasper@web.de>
+
+        * calendar/icalendar.el (icalendar-version): Now at 0.12.
+        (icalendar-duration-correction): Remove.
+        (icalendar--get-event-properties): Split result at commas.
+        (icalendar--decode-isoduration): New optional argument
+        DURATION-CORRECTION.
+        (icalendar--convert-ordinary-to-ical, icalendar--convert-sexp-to-ical)
+        (icalendar--convert-yearly-to-ical, icalendar--convert-weekly-to-ical)
+        (icalendar--convert-block-to-ical, icalendar--convert-float-to-ical)
+        (icalendar--convert-date-to-ical, icalendar--convert-cyclic-to-ical)
+        (icalendar--convert-anniversary-to-ical): New functions, extracted
+        from icalendar-export-region, with bug fixes.
+        (icalendar-export-region): Use the above functions.
+        (icalendar-import-buffer): Check before saving diary file.
+        (icalendar--convert-recurring-to-diary)
+        (icalendar--convert-non-recurring-all-day-to-diary)
+        (icalendar--convert-non-recurring-not-all-day-to-diary): New functions,
+        extracted from icalendar--convert-ical-to-diary, with bug fixes.
+        (icalendar--convert-ical-to-diary): Use the above functions.
+
+2005-05-03  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/cc-mode.el (cc-define-alist, cc-create-define-alist):
+        Remove these recent additions.
+        (c-mode): Restore to before 2005-04-28.
+
+        * progmodes/cc-vars.el (cc-define-list-program): Remove this
+        recent addition.
+
+        * progmodes/gdb-ui.el (gdb-cpp-define-alist-program)
+        (gdb-define-alist): New variables.
+        (gdb-create-define-alist): New function.
+        (gdb-set-gud-minor-mode-1): Handle gdb-define-alist.
+        (gdb-source, gdb-memory-set-repeat-count): Replace string-to-int
+        with string-to-number.
+        (gdb-reset): Kill gdb-define-alist. Move assignments outside loop.
+
+        * progmodes/gud.el: Replace string-to-int with string-to-number.
+        (gud-find-file): Handle gdb-define-alist.
+
+        * tooltip.el (tooltip-gud-tips): Use gdb-define-alist.
+
+2005-05-02  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-aent.el (math-read-token):
+        * calc/calc-bin.el (calc-word-size):
+        * calc/calc-ext.el (calc-read-number-fancy):
+        * calc/calc-forms.el (calc-time, calc-date-notation, math-this-year)
+        (math-parse-date, math-parse-standard-date, calcFunc-tzone):
+        * calc/calc-frac.el (calc-over-notation):
+        * calc/calc-graph.el (calc-graph-plot, calc-graph-set-styles)
+        (calc-graph-num-points, calc-graph-init):
+        * calc/calc-prog.el (calc-read-parse-table-part)
+        (calc-edit-macro-repeats):
+        * calc/calc-yank.el (calc-do-grab-rectangle):
+        * calc/calc.el (calcDigit-key, math-read-number, math-read-bignum):
+        Replace `string-to-int' by `string-to-number'.
+
+2005-05-02  Kim F. Storm  <storm@cua.dk>
+
+        * kmacro.el: Use executing-kbd-macro-index variable.
+
+2005-05-02  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * net/rlogin.el (rlogin-parse-words): Delete func.
+        (rlogin): Use split-string, not rlogin-parse-words.
+        Also, if there are option-like elements in the parsed args,
+        take the host to be the first arg immediately following them.
+        Suggested by Michael Mauger.
+
+2005-05-01  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * subr.el (executing-macro): Use `define-obsolete-variable-alias'.
+
+2005-05-02  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/cc-mode.el (cc-create-define-alist): Use a shell.
+        (cc-mode-cpp-program): Rename to cc-define-list-program and
+        move to cc-vars.el.
+
+        * progmodes/cc-vars.el (cc-define-list-program):
+        Change to "gcc -E -dM -". Make customizable.
+
+2005-05-02  Kim F. Storm  <storm@cua.dk>
+
+        * emulation/cua-base.el: Fix check for CUA-mode if no init file.
+
+2005-05-02  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/cc-mode.el (cc-mode-cpp-program): Change to "gcc -E".
+
+        * international/mule-util.el (truncate-string): Remove alias and
+        obsolete declaration.
+
+        * international/mule-cmds.el (update-iso-coding-systems):
+        Remove alias and obsolete declaration.
+
+        * international/mule.el (coding-system-parent): Remove alias and
+        obsolete declaration.
+
+        * subr.el (define-function, sref): Remove aliases and obsolete
+        declarations.
+        (chars-in-region): Remove obsolete declaration.
+
+2005-05-01  Richard M. Stallman  <rms@gnu.org>
+
+        * info.el (Info-mode): Set widen-automatically to nil, locally.
+
+        * simple.el (widen-automatically): New variable.
+        (pop-global-mark): Obey widen-automatically.
+
+2005-05-01  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * term/xterm.el (function-key-map): Call substitute-key-definition
+        before the keymap size is increased by a lot of define-key calls.
+
+2005-05-01  Richard M. Stallman  <rms@gnu.org>
+
+        * subr.el (add-to-invisibility-spec, remove-from-invisibility-spec):
+        Rename ARG to ELEMENT.  Doc fix.
+
+2005-05-01  Nick Roberts  <nickrob@snap.net.nz>
+
+        * allout.el (allout-exposure): Remove macro and obsolete declaration.
+        Remove references to allout-exposure/change to allout-new-exposure.
+
+        * emacs-lisp/bytecomp.el (dot, dot-min, dot-max): Don't create
+        bytecode symbols.
+
+        * subr.el (dot, dot-marker, dot-min, dot-max, buffer-flush-undo)
+        (compiled-function-p, focus-frame, unfocus-frame):
+        Remove aliases and obsolete declarations.
+        Back out inadvertant changes from previous commit.
+
+2005-05-01  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * files.el (require-final-newline): Make Custom tags consistent
+        with mode-require-final-newline.
+        (mode-require-final-newline): Doc fix.
+
+2005-05-01  Lute Kamstra  <lute@gnu.org>
+
+        * international/latexenc.el (latexenc-find-file-coding-system):
+        Fix regular expressions.  Suggested by David Kastrup <dak@gnu.org>
+        and Stefan Monnier <monnier@iro.umontreal.ca>.
+
+2005-05-01  Nick Roberts  <nickrob@snap.net.nz>
+
+        * subr.el (string-to-int): Make obsolete.
+
+2005-04-30  Richard M. Stallman  <rms@gnu.org>
+
+        * simple.el (next-error-overlay-arrow-position): Turn off, for ttys.
+
+        * loadup.el: load jka-comp-hook.
+
+        * jka-compr.el: Many functions and vars moved to jka-compr-hook.el.
+        (jka-compr-handler): Add autoload.  `put' calls moved
+        to jka-compr-hook.el.
+        (compression, jka-compr): defgroups moved to jka-compr-hook.el.
+        (jka-compr-inhibit): Autoload.
+
+        * jka-comp-hook.el: New file.
+        Enable the mode by default.
+
+        * files.el (backup-buffer-copy): Use copy-file instead
+        of write-region, and put back the 'excl.
+
+2005-04-30  Chong Yidong  <cyd@stupidchicken.com>
+
+        * progmodes/flymake.el (flymake-split-string)
+        (flymake-split-string, flymake-log, flymake-pid-to-names)
+        (flymake-reg-names, flymake-get-source-buffer-name)
+        (flymake-unreg-names, flymake-add-line-err-info)
+        (flymake-add-err-info): Clarify docstrings.
+        (flymake-popup-menu, flymake-make-emacs-menu)
+        (flymake-make-xemacs-menu): Add docstrings.
+        (flymake-get-buffer-*, flymake-set-buffer-*): Functions deleted.
+        Set variables directly throughout.
+
+2005-04-30  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/cc-mode.el (cc-create-define-alist): Check that file
+        exists. Initialise cc-define-alist.
+        (c-mode): Add cc-create-define-alist locally to after-save-hook.
+        If there is no file (Macroexpansion) don't create an alist.
+
+2005-04-29  Sam Steingold  <sds@gnu.org>
+
+        * progmodes/cc-mode.el (cc-mode-cpp-program): New user variable.
+        (cc-create-define-alist): Use it instead of the hard-coded string.
+
+2005-04-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * international/mule-conf.el (file-coding-system-alist): Fix regexp
+        for latexenc.
+
+2005-04-29  Lute Kamstra  <lute@gnu.org>
+
+        * emacs-lisp/generic.el: Improve commentary section.
+        (define-generic-mode): Improve docstring.
+
+2005-04-29  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (many places): Change to quiet the byte compiler.
+        (org-prefix-format-compiled): New variable.
+        (org-compile-prefix-format): New function.
+        (org-timeline, org-agenda, org-diary): Call org-compile-prefix-format.
+        (org-agenda-prefix-format,org-timeline-prefix-format): New options.
+        (org-agenda-get-scheduled): Check if file is opened in `org-mode'.
+        (org-get-entries-from-diary): Use `org-get-time-of-day' for
+        consistency with entries from `org-mode' files.
+        (org-get-time-of-day): Fix bug with partial matches early in a line.
+        (org-non-link-chars): New constant.
+        (org-link-regexp): Respect `org-non-link-chars'.
+        (org-agenda-day-view): Remove command.
+        (org-agenda-toggle-week-view): Rename from `org-agenda-week-view'.
+        (org-follow-bbdb-link, org-store-link): Search also company field.
+        (org-highlight-overlay): New variable.
+        (org-highlight, org-unhighlight): New functions.
+        (org-agenda-mode): Add pre-command-hook to remove highlight.
+        (org-evaluate-time-range): Behavior depends upon whether time stamp
+        contains a time or not.
+        (org-show-subtree, org-show-entry): New functions.
+        (org-agenda-cleanup-fancy-diary): Remove empty lines.
+
+2005-04-28  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * comint.el (comint-output-filter-functions): Add autoload cookie.
+
+2005-04-28  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-everywhere): Fix last change.
+
+2005-04-28  Arne J,Ax(Brgensen  <arne@arnested.dk>
+
+        * international/latexenc.el: New file.
+        * international/mule-conf.el (file-coding-system-alist): For .tex,
+        .ltx, .dtx and .drv extensions, use `latexenc-find-file-coding-system'.
+
+2005-04-28  Lute Kamstra  <lute@gnu.org>
+
+        * font-lock.el (font-lock-add-keywords)
+        (font-lock-remove-keywords): Clarify docstring.
+        (font-lock-keywords-alist, font-lock-removed-keywords-alist):
+        Don't start docstrings with a `*'.
+        (font-lock-update-removed-keyword-alist): Give it a docstring.
+
+        * generic-x.el: Update commentary section.
+        Only require font-lock when compiling.
+        Define all modes conditionally.
+        Place all generic modes in the generic-x-modes customization group.
+        (generic-x-modes): New customization group.
+        (generic-default-modes, generic-mswindows-modes)
+        (generic-unix-modes, generic-other-modes): New constants.
+        (generic-define-mswindows-modes, generic-define-unix-modes):
+        Update docstrings.  Make them obsolete.
+        (generic-extras-enable-list): New default value.  Update docstring.
+        Improve :type.  Change :set function.
+        (bat-generic-mode-syntax-table, rul-generic-mode-syntax-table):
+        Fix docstring.
+
+        * emacs-lisp/generic.el (generic-mode-internal):
+        Simplify font-lock-defaults.
+        (define-generic-mode): Fix docstring.
+
+2005-04-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/grep.el (grep-mode-font-lock-keywords): Use the
+        font-lock-face property to highlight matches.
+
+2005-04-28  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/cc-mode.el: (cc-create-define-alist): New function.
+        (cc-define-alist): New variable.
+        (c-mode): Make it local and initialise it.
+
+        * progmodes/gdb-ui.el (gdb-active-process): New variable.
+        (gdb-exited): New function.
+        (gdb-annotation-rules): Use it.
+        (gdb-starting): Set gdb-active-process to t.
+        (gdb-stopping): Amend doc string.
+        (gdb-reset): Set gdb-active-process to nil.
+
+        * tooltip.el (tooltip-gud-tips): Show the associated #define
+        directives when a C program under GDB is not executing.
+
+2005-04-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/cperl-mode.el (cperl-mode): Don't precompile the
+        font-lock-fontify-syntactic-keywords.
+
+        * font-lock.el (font-lock-default-fontify-region): Don't force
+        parse-sexp-lookup-properties to nil.
+
+2005-04-27  Alexander Klimov  <alserkli@inbox.ru>  (tiny change)
+
+        * man.el (man-mode-syntax-table): Set up `:' to have
+        word-constituent syntax.
+
+2005-04-27  Lute Kamstra  <lute@gnu.org>
+
+        * novice.el (disable-command): Don't add spurious newlines to the
+        init file.  Reported by Dan Jacobson <jidanni@jidanni.org>.
+
+2005-04-26  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-yank.el (calc-edit-finish): Make sure there is more
+        than one window before deleting window.
+
+2005-04-26  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * shell.el (shell-prompt-pattern): Doc fix.
+        (shell-mode): Set paragraph-separate buffer locally to "\\'".
+
+        * comint.el (comint-prompt-regexp, comint-get-old-input)
+        (comint-use-prompt-regexp)
+        (comint-use-prompt-regexp-instead-of-fields)
+        (comint-replace-by-expanded-history, comint-send-input)
+        (comint-output-filter, comint-get-old-input-default)
+        (comint-line-beginning-position, comint-bol, comint-show-output)
+        (comint-backward-matching-input, comint-forward-matching-input)
+        (comint-next-prompt, comint-previous-prompt):
+        Rename `comint-use-prompt-regexp-instead-of-fields' to
+        `comint-use-prompt-regexp'.  Keep old name as alias and declare
+        obsolete.
+        (comint-use-prompt-regexp): Shorten first line of doc string.
+
+        * ielm.el (inferior-emacs-lisp-mode): Adapt to above name change.
+        Set paragraph-separate buffer locally to "\\'".
+
+        * hippie-exp.el (try-expand-line, try-expand-line-all-buffers):
+        Adapt to above name change.
+
+        * net/net-utils.el (nslookup-prompt-regexp, ftp-prompt-regexp)
+        (smbclient-prompt-regexp): Ditto.
+
+        * progmodes/inf-lisp.el (inferior-lisp-prompt): Ditto.
+
+2005-04-27  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-location-alist): Rename from
+        gdb-location-list.
+        Break lines that are over 80 characters wide.
+
+2005-04-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcvs-info.el (cvs-fileinfo->full-path, cvs-display-full-path):
+        New fun and var, to preserve compatibility.
+
+        * pcvs.el, pcvs-info.el: Rename "full-path" -> "full-name".
+
+2005-04-26  Dominique de Waleffe  <ddw@missioncriticalit.com>  (tiny change)
+
+        * pcvs-info.el (cvs-fileinfo->backup-file): Don't pass the full file
+        name to file-newer-than-file-p.
+
+2005-04-26  Richard M. Stallman  <rms@gnu.org>
+
+        * simple.el (line-move-1): Avoid using vertical-motion in easy cases.
+
+        * progmodes/python.el (python-mode):
+        Use new name eldoc-documentation-function.
+
+        * hexl.el (hexl-mode): Use new name eldoc-documentation-function.
+
+        * emacs-lisp/eldoc.el (eldoc-mode): Doc fix.
+        (eldoc-documentation-function):
+        Rename from eldoc-print-current-symbol-info-function.  Calls changed.
+
+2005-04-26  Nick Roberts  <nickrob@snap.net.nz>
+
+        * emacs-lisp/byte-run.el (define-obsolete-function-alias): New macro.
+
+2005-04-25  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * term/xterm.el (function-key-map): Fix strings for
+        {C,S,A,C-S}-f[1-4].  Use substitute-key-definition to bind
+        {C,S,A,C-S}-{f1-f12}.
+
+2005-04-26  Kenichi Handa  <handa@m17n.org>
+
+        * international/mule-cmds.el (select-safe-coding-system):
+        Fix previous change.
+
+2005-04-26  Lute Kamstra  <lute@gnu.org>
+
+        * emacs-lisp/easy-mmode.el (define-minor-mode): Fix docstring.
+
+        * font-lock.el (font-lock-fontify-region-function): Fix docstring.
+        (font-lock-comment-delimiter-face): Ditto.
+
+        * calc/calc.el (calc-trail-mode): Don't set font-lock-defaults.
+
+2005-04-25  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-help.el (calc-view-news): Let-bind inhibit-read-only
+        to t while inserting information; use help-mode.
+
+2005-04-25  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * term.el (ansi-term-color-vector): Use the xterm colors.
+        (term-raw-map): Don't add mappings for \eO and \e[. Map deletechar.
+
+2005-04-25  Lute Kamstra  <lute@gnu.org>
+
+        * font-core.el (font-lock-defaults): Fix docstring.
+
+        * font-lock.el (font-lock-syntactic-face-function): Fix docstring.
+
+2005-04-25  Kenichi Handa  <handa@m17n.org>
+
+        * international/mule-cmds.el (select-safe-coding-system):
+        Don't check consistency with coding: spec, etc if raw-text or
+        no-conversion was found to be safe.
+
+2005-04-24  Richard M. Stallman  <rms@gnu.org>
+
+        * mail/sendmail.el (mail-font-lock-keywords): Match any number of
+        citation markers at start of each line.
+
+        * mail/rmail.el (rmail-font-lock-keywords): Match any number of
+        citation markers at start of each line.
+
+        * font-lock.el (font-lock-comment-delimiter-face): Doc fix.
+
+        * files.el (mode-require-final-newline): Fix previous change.
+        (require-final-newline): Fix type label.
+
+2005-04-24  Glenn Morris  <gmorris@ast.cam.ac.uk>
+
+        * progmodes/f90.el (f90-calculate-indent): Fix treatment of first
+        statement in buffer (broken by 2004-11-24 change).
+
+2005-04-24  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-everywhere): Save and restore old read-buffer-function
+        and read-file-name-function values.  Don't overwrite existing
+        non-nil values if ido-mode is enabled without ido-everywhere.
+
+2005-04-24  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * files.el (mode-require-final-newline): Minor doc fix.
+
+2005-04-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * subr.el (syntax-after): Doc fix.
+        (syntax-class): If argument is nil, return nil.  Mask off upper 16
+        bits, not 8 bits.
+
+        * files.el (mode-require-final-newline): Doc fix.
+        (backup-buffer-copy): Fix last change.
+
+2005-04-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * term/mac-win.el: Require select.  Set selection-coding-system to
+        mac-system-coding-system.  Call menu-bar-enable-clipboard.
+        (x-last-selected-text-clipboard, x-last-selected-text-primary)
+        (x-select-enable-clipboard): New variables.
+        (x-select-text, x-get-selection, x-selection-value)
+        (x-get-selection-value, mac-select-convert-to-string)
+        (mac-services-open-file, mac-services-open-selection)
+        (mac-services-insert-text): New functions.
+        (CLIPBOARD, FIND): Put mac-scrap-name property.
+        (com.apple.traditional-mac-plain-text, public.utf16-plain-text)
+        (public.tiff): Put mac-ostype property.
+        (selection-converter-alist): Add entries for them.
+        (mac-application-menu-map): New keymap.
+        (interprogram-cut-function, interprogram-paste-function): Set to
+        x-select-text and x-get-selection-value, respectively.
+        (split-window-keep-point): Set to t.
+
+2005-04-23  Richard M. Stallman  <rms@gnu.org>
+
+        * files.el (read-directory-name): Always pass non-nil
+        DEFAULT-FILENAME arg to read-file-name.
+        (backup-buffer-copy, basic-save-buffer-2): Take care against
+        writing thru an unexpected existing symlink.
+        (revert-buffer): In indirect buffer, revert the base buffer.
+        (magic-mode-alist): Doc fix.
+        (buffer-stale-function): Doc fix.
+        (minibuffer-with-setup-hook): Avoid warning.
+        (mode-require-final-newline): Doc and custom fix.
+
+        * follow.el (follow-end-of-buffer): Use with-no-warnings.
+
+        * font-lock.el (font-lock-comment-face): On terminals with few colors,
+        use the default appearance.
+        (font-lock-comment-delimiter-face): New face, new variable.
+
+        * imenu.el (imenu--generic-function): The official position of a
+        definition is the start of the line that BEG is in.
+
+        * midnight.el (midnight-timer): Move defvar up.
+
+        * mouse.el (mouse-drag-region-1): Delete some debugging code.
+
+        * saveplace.el (save-place-to-alist): Use with-no-warnings.
+
+        * startup.el (command-line): Use with-no-warnings.
+
+        * window.el (window-size-fixed): New defvar.
+
+        * emacs-lisp/easymenu.el (easy-menu-do-define): Use defalias, not fset.
+
+        * mail/rmail.el (rmail-font-lock-keywords):
+        Use font-lock-comment-delimiter-face.
+
+        * mail/sendmail.el (mail-font-lock-keywords):
+        Use font-lock-comment-delimiter-face.
+
+        * progmodes/compile.el (next-error-highlight-timer): New defvar.
+
+2005-04-23  SAITO Takuya  <tabmore@rivo.mediatti.net>  (tiny change)
+
+        * progmodes/compile.el (compilation-mode-font-lock-keywords):
+        Specify t for LAXMATCH when matching directories.
+        Save match data around compilation-compat-error-properties form.
+
+2005-04-23  David Kastrup  <dak@gnu.org>
+
+        * textmodes/tex-mode.el (TeX-mode, plain-TeX-mode, LaTeX-mode):
+        Mention that the autoloaded aliases should be kept for AUCTeX.
+
+2005-04-23  Andreas Schwab  <schwab@suse.de>
+
+        * isearch.el (isearch-forward): Doc fix.
+
+2005-04-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * jit-lock.el (jit-lock-stealth-time): Change default value to 16.
+        (jit-lock-stealth-nice): Change default value to 0.5.
+
+2005-04-23  Eric Hanchrow  <offby1@blarg.net>  (tiny change)
+
+        * abbrev.el (write-abbrev-file): Write table entries in
+        alphabetical order by table name.
+
+2005-04-22  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-read-internal): Fix `list' completion.
+
+2005-04-22  Kenichi Handa  <handa@m17n.org>
+
+        * recentf.el (recentf-save-file-coding-system): New variable.
+        (recentf-save-list): Encode the file by
+        recentf-save-file-coding-system and add coding: tag.
+
+2005-04-22  Nick Roberts  <nickrob@snap.net.nz>
+
+        * emacs-lisp/byte-run.el (define-obsolete-variable-alias): New macro.
+
+2005-04-21  Lute Kamstra  <lute@gnu.org>
+
+        * loadhist.el (unload-feature): Don't remove a function from hooks
+        if it is about to be restored to an autoload .  Remove functions
+        that will become unbound from auto-mode-alist.  Simplify the code.
+
+        * subr.el (assq-delete-all): New implementation that is linear,
+        not quadratic.  Suggested by David Kastrup <dak@gnu.org>.
+        (rassq-delete-all): New function.
+
+        * menu-bar.el (menu-bar-options-save, menu-bar-showhide-menu):
+        Add size-indication-mode.
+
 2005-04-21  Kenichi Handa  <handa@m17n.org>
 
         * international/mule-cmds.el: Add autoload for widget-value in
-        eval-when-compile
+        eval-when-compile.
 
 2005-04-21  Nick Roberts  <nickrob@snap.net.nz>
 
-        * menu-bar.el (menu-bar-options-save, menu-bar-showhide-menu): 
+        * menu-bar.el (menu-bar-options-save, menu-bar-showhide-menu):
         Add tooltip-mode.
 
         * bindings.el (mode-line-mode-menu): Remove tooltip-mode.
@@ -372,8 +951,8 @@
 2005-04-11  Rajesh Vaidheeswarran  <rv@gnu.org>
 
         * whitespace.el (whitespace-buffer-leading)
-        (whitespace-buffer-trailing): Revert the incorrect test
-        inversion. However, fix the highlight area for the leading and
+        (whitespace-buffer-trailing): Revert the incorrect test inversion.
+        However, fix the highlight area for the leading and
         trailing whitespaces to show space.
 
 2005-04-11  Rajesh Vaidheeswarran  <rv@gnu.org>
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index aa4249d014e..711e8e2ebe9 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -92,11 +92,11 @@ Mark is set after the inserted text."
   (interactive)
   (push-mark
    (save-excursion
-    (let ((tables abbrev-table-name-list))
-      (while tables
-        (insert-abbrev-table-description (car tables) t)
-        (setq tables (cdr tables))))
-    (point))))
+     (let ((tables abbrev-table-name-list))
+       (while tables
+         (insert-abbrev-table-description (car tables) t)
+         (setq tables (cdr tables))))
+     (point))))
 
 (defun list-abbrevs (&optional local)
   "Display a list of defined abbrevs.
@@ -168,23 +168,23 @@ the ones defined from the buffer now."
   (interactive "P")
   (if arg (kill-all-abbrevs))
   (save-excursion
-   (goto-char (point-min))
-   (while (and (not (eobp)) (re-search-forward "^(" nil t))
-     (let* ((buf (current-buffer))
-            (table (read buf))
-            abbrevs name hook exp count sys)
-       (forward-line 1)
-       (while (progn (forward-line 1)
-                     (not (eolp)))
-         (setq name (read buf) count (read buf))
-         (if (equal count '(sys))
-             (setq sys t count (read buf)))
-         (setq exp (read buf))
-         (skip-chars-backward " \t\n\f")
-         (setq hook (if (not (eolp)) (read buf)))
-         (skip-chars-backward " \t\n\f")
-         (setq abbrevs (cons (list name exp hook count sys) abbrevs)))
-       (define-abbrev-table table abbrevs)))))
+    (goto-char (point-min))
+    (while (and (not (eobp)) (re-search-forward "^(" nil t))
+      (let* ((buf (current-buffer))
+             (table (read buf))
+             abbrevs name hook exp count sys)
+        (forward-line 1)
+        (while (progn (forward-line 1)
+                      (not (eolp)))
+          (setq name (read buf) count (read buf))
+          (if (equal count '(sys))
+              (setq sys t count (read buf)))
+          (setq exp (read buf))
+          (skip-chars-backward " \t\n\f")
+          (setq hook (if (not (eolp)) (read buf)))
+          (skip-chars-backward " \t\n\f")
+          (setq abbrevs (cons (list name exp hook count sys) abbrevs)))
+        (define-abbrev-table table abbrevs)))))
 
 (defun read-abbrev-file (&optional file quietly)
   "Read abbrev definitions from file written with `write-abbrev-file'.
@@ -201,7 +201,7 @@ Optional second argument QUIETLY non-nil means don't display a message."
 Optional argument FILE is the name of the file to read;
 it defaults to the value of `abbrev-file-name'.
 Does not display any message."
-  ;(interactive "fRead abbrev file: ")
+                                        ;(interactive "fRead abbrev file: ")
   (read-abbrev-file file t))
 
 (defun write-abbrev-file (&optional file)
@@ -221,7 +221,17 @@ specified in `abbrev-file-name' is used."
   (let ((coding-system-for-write 'emacs-mule))
     (with-temp-file file
       (insert ";;-*-coding: emacs-mule;-*-\n")
-      (dolist (table abbrev-table-name-list)
+      (dolist (table
+               ;; We sort the table in order to ease the automatic
+               ;; merging of different versions of the user's abbrevs
+               ;; file.  This is useful, for example, for when the
+               ;; user keeps their home directory in a revision
+               ;; control system, and is therefore keeping multiple
+               ;; slightly-differing copies loosely synchronized.
+               (sort (copy-sequence abbrev-table-name-list)
+                     (lambda (s1 s2)
+                       (string< (symbol-name s1)
+                                (symbol-name s2)))))
         (insert-abbrev-table-description table nil)))))
 
 (defun add-mode-abbrev (arg)
diff --git a/lisp/allout.el b/lisp/allout.el
index 4b1c152b6b1..6fb81f9f6f7 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -3975,18 +3975,16 @@ need not be quoted in `allout-new-exposure'.
 
 Cursor is left at start position.
 
-Use this instead of obsolete `allout-exposure'.
-
 Examples:
-\(allout-exposure (-1 () () () 1) 0)
+\(allout-new-exposure (-1 () () () 1) 0)
         Close current topic at current level so only the immediate
         subtopics are shown, except also show the children of the
         third subtopic; and close the next topic at the current level.
-\(allout-exposure : -1 0)
+\(allout-new-exposure : -1 0)
         Close all topics at current level to expose only their
         immediate children, except for the last topic at the current
         level, in which even its immediate children are hidden.
-\(allout-exposure -2 : -1 *)
+\(allout-new-exposure -2 : -1 *)
         Expose children and grandchildren of first topic at current
         level, and expose children of subsequent topics at current
         level *except* for the last, which should be opened completely."
@@ -3995,17 +3993,6 @@ Examples:
                       (allout-next-heading)))
              (error "allout-new-exposure: Can't find any outline topics"))
         (list 'allout-expose-topic (list 'quote spec))))
-;;;_   > allout-exposure '()
-(defmacro allout-exposure (&rest spec)
-  "Literal frontend for `allout-old-expose-topic', doesn't evaluate arguments
-and retains start position."
-  (list 'save-excursion
-        '(if (not (or (allout-goto-prefix)
-                      (allout-next-heading)))
-             (error "Can't find any outline topics"))
-        (cons 'allout-old-expose-topic
-              (mapcar (function (lambda (x) (list 'quote x))) spec))))
-(make-obsolete 'allout-exposure 'allout-new-exposure "19.23")
 
 ;;;_ #7 Systematic outline presentation - copying, printing, flattening
 
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el
index a2d6e9dc88c..b947b597acf 100644
--- a/lisp/calc/calc-aent.el
+++ b/lisp/calc/calc-aent.el
@@ -1,6 +1,6 @@
 ;;; calc-aent.el --- algebraic entry 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: Dave Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
@@ -734,7 +734,7 @@ in Calc algebraic input.")
                        math-exp-pos (match-end 1))
                (if (eq (string-match "\\$\\([1-9][0-9]*\\)" math-exp-str math-exp-pos)
                        math-exp-pos)
-                   (setq math-expr-data (- (string-to-int (math-match-substring
+                   (setq math-expr-data (- (string-to-number (math-match-substring
                                                      math-exp-str 1))))
                  (string-match "\\$+" math-exp-str math-exp-pos)
                  (setq math-expr-data (- (match-end 0) (match-beginning 0))))
@@ -743,7 +743,7 @@ in Calc algebraic input.")
             ((eq ch ?\#)
              (if (eq (string-match "#\\([1-9][0-9]*\\)" math-exp-str math-exp-pos)
                      math-exp-pos)
-                 (setq math-expr-data (string-to-int
+                 (setq math-expr-data (string-to-number
                                  (math-match-substring math-exp-str 1))
                        math-exp-pos (match-end 0))
                (setq math-expr-data 1
diff --git a/lisp/calc/calc-bin.el b/lisp/calc/calc-bin.el
index e960220c09b..445f9d28531 100644
--- a/lisp/calc/calc-bin.el
+++ b/lisp/calc/calc-bin.el
@@ -1,6 +1,6 @@
 ;;; calc-bin.el --- binary 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>
@@ -135,7 +135,7 @@
                (if (equal n "")
                    calc-word-size
                  (if (string-match "\\`[-+]?[0-9]+\\'" n)
-                     (string-to-int n)
+                     (string-to-number n)
                    (error "Expected an integer")))
              (prefix-numeric-value n)))
    (or (= n calc-word-size)
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index d4d50d64658..df9f9512aaa 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 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
@@ -2815,7 +2815,7 @@ calc-kill calc-kill-region calc-yank))))
 
    ;; Integer+fraction with explicit radix
    ((string-match "^\\([0-9]+\\)\\(#\\|\\^\\^\\)\\([0-9a-zA-Z]*\\)[:/]\\([0-9a-zA-Z]*\\)[:/]\\([0-9a-zA-Z]\\)$" s)
-    (let ((radix (string-to-int (math-match-substring s 1)))
+    (let ((radix (string-to-number (math-match-substring s 1)))
           (int (math-match-substring s 3))
           (num (math-match-substring s 4))
           (den (math-match-substring s 5)))
@@ -2829,7 +2829,7 @@ calc-kill calc-kill-region calc-yank))))
 
    ;; Fraction with explicit radix
    ((string-match "^\\([0-9]+\\)\\(#\\|\\^\\^\\)\\([0-9a-zA-Z]*\\)[:/]\\([0-9a-zA-Z]*\\)$" s)
-    (let ((radix (string-to-int (math-match-substring s 1)))
+    (let ((radix (string-to-number (math-match-substring s 1)))
           (num (math-match-substring s 3))
           (den (math-match-substring s 4)))
       (let ((num (if (> (length num) 0) (math-read-radix num radix) 1))
@@ -2839,7 +2839,7 @@ calc-kill calc-kill-region calc-yank))))
    ;; Float with explicit radix and exponent
    ((or (string-match "^0*\\(\\([2-9]\\|1[0-4]\\)\\(#\\|\\^\\^\\)[0-9a-dA-D.]+\\)[eE]\\([-+]?[0-9]+\\)$" s)
         (string-match "^\\(\\([0-9]+\\)\\(#\\|\\^\\^\\)[0-9a-zA-Z.]+\\) *\\* *\\2\\.? *\\^ *\\([-+]?[0-9]+\\)$" s))
-    (let ((radix (string-to-int (math-match-substring s 2)))
+    (let ((radix (string-to-number (math-match-substring s 2)))
           (mant (math-match-substring s 1))
           (exp (math-match-substring s 4)))
       (let ((mant (math-read-number mant))
@@ -2849,7 +2849,7 @@ calc-kill calc-kill-region calc-yank))))
 
    ;; Float with explicit radix, no exponent
    ((string-match "^\\([0-9]+\\)\\(#\\|\\^\\^\\)\\([0-9a-zA-Z]*\\)\\.\\([0-9a-zA-Z]*\\)$" s)
-    (let ((radix (string-to-int (math-match-substring s 1)))
+    (let ((radix (string-to-number (math-match-substring s 1)))
           (int (math-match-substring s 3))
           (fracs (math-match-substring s 4)))
       (let ((int (if (> (length int) 0) (math-read-radix int radix) 0))
@@ -2861,7 +2861,7 @@ calc-kill calc-kill-region calc-yank))))
    ;; Integer with explicit radix
    ((string-match "^\\([0-9]+\\)\\(#\\|\\^\\^\\)\\([0-9a-zA-Z]+\\)$" s)
     (math-read-radix (math-match-substring s 3)
-                     (string-to-int (math-match-substring s 1))))
+                     (string-to-number (math-match-substring s 1))))
 
    ;; C language hexadecimal notation
    ((and (eq calc-language 'c)
diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el
index 4870891231a..10e4793c7a5 100644
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -39,9 +39,9 @@
      (calc-enter-result 0 "time"
                         (list 'mod
                               (list 'hms
-                                    (string-to-int (substring time 11 13))
-                                    (string-to-int (substring time 14 16))
-                                    (string-to-int (substring time 17 19)))
+                                    (string-to-number (substring time 11 13))
+                                    (string-to-number (substring time 14 16))
+                                    (string-to-number (substring time 17 19)))
                               (list 'hms 24 0 0))))))
 
 (defun calc-to-hms (arg)
@@ -80,7 +80,7 @@
    (if (equal fmt "")
        (setq fmt "1"))
    (if (string-match "\\` *[0-9] *\\'" fmt)
-       (setq fmt (nth (string-to-int fmt) calc-standard-date-formats)))
+       (setq fmt (nth (string-to-number fmt) calc-standard-date-formats)))
    (or (string-match "[a-zA-Z]" fmt)
        (error "Bad date format specifier"))
    (and arg
@@ -441,7 +441,7 @@
 
 
 (defun math-this-year ()
-  (string-to-int (substring (current-time-string) -4)))
+  (string-to-number (substring (current-time-string) -4)))
 
 (defun math-leap-year-p (year)
   (if (Math-lessp year 1752)
@@ -730,14 +730,14 @@
           (if (or (string-match "\\([0-9][0-9]?\\):\\([0-9][0-9]?\\)\\(:\\([0-9][0-9]?\\(\\.[0-9]+\\)?\\)\\)? *\\([ap]m?\\|[ap]\\. *m\\.\\|noon\\|n\\>\\|midnight\\|mid\\>\\|m\\>\\)?" math-pd-str)
                   (string-match "\\([0-9][0-9]?\\)\\(\\)\\(\\(\\(\\)\\)\\) *\\([ap]m?\\|[ap]\\. *m\\.\\|noon\\|n\\>\\|midnight\\|mid\\>\\|m\\>\\)" math-pd-str))
               (let ((ampm (math-match-substring math-pd-str 6)))
-                (setq hour (string-to-int (math-match-substring math-pd-str 1))
+                (setq hour (string-to-number (math-match-substring math-pd-str 1))
                       minute (math-match-substring math-pd-str 2)
                       second (math-match-substring math-pd-str 4)
                       math-pd-str (concat (substring math-pd-str 0 (match-beginning 0))
                                   (substring math-pd-str (match-end 0))))
                 (if (equal minute "")
                     (setq minute 0)
-                  (setq minute (string-to-int minute)))
+                  (setq minute (string-to-number minute)))
                 (if (equal second "")
                     (setq second 0)
                   (setq second (math-read-number second)))
@@ -801,7 +801,7 @@
           (setq temp 0)
           (while (string-match "[0-9]+" math-pd-str temp)
             (and c (throw 'syntax "Too many numbers in date"))
-            (setq c (string-to-int (math-match-substring math-pd-str 0)))
+            (setq c (string-to-number (math-match-substring math-pd-str 0)))
             (or b (setq b c c nil))
             (or a (setq a b b nil))
             (setq temp (match-end 0)))
@@ -1021,7 +1021,7 @@
                                   (string-match "\\` *[0-9][0-9][0-9]" math-pd-str)
                                 (string-match "\\` *[0-9][0-9]" math-pd-str))
                             (string-match "\\` *[0-9]+" math-pd-str)))
-                     (and (setq num (string-to-int
+                     (and (setq num (string-to-number
                                      (math-match-substring math-pd-str 0))
                                 math-pd-str (substring math-pd-str (match-end 0)))
                           nil))
@@ -1236,13 +1236,13 @@
               (setq p (cdr p))))
           (if (looking-at "\\([-+][0-9]?[0-9]\\)\\([0-9][0-9]\\)?\\(\\'\\|[^0-9]\\)")
               (setq offset (math-add
-                            (string-to-int (buffer-substring
+                            (string-to-number (buffer-substring
                                             (match-beginning 1)
                                             (match-end 1)))
                             (if (match-beginning 2)
-                                (math-div (string-to-int (buffer-substring
-                                                          (match-beginning 2)
-                                                          (match-end 2)))
+                                (math-div (string-to-number (buffer-substring
+                                                             (match-beginning 2)
+                                                             (match-end 2)))
                                           60)
                               0)))))
         (if p
diff --git a/lisp/calc/calc-frac.el b/lisp/calc/calc-frac.el
index cdb8ac9beb6..87ee59440c3 100644
--- a/lisp/calc/calc-frac.el
+++ b/lisp/calc/calc-frac.el
@@ -1,6 +1,6 @@
 ;;; calc-frac.el --- fraction 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>
@@ -56,7 +56,7 @@
    (if (string-match "\\`\\([^ 0-9][^ 0-9]?\\)[0-9]*\\'" fmt)
        (let ((n nil))
          (if (/= (match-end 0) (match-end 1))
-             (setq n (string-to-int (substring fmt (match-end 1)))
+             (setq n (string-to-number (substring fmt (match-end 1)))
                    fmt (math-match-substring fmt 1)))
          (if (eq n 0) (error "Bad denominator"))
          (calc-change-mode 'calc-frac-format (list fmt n) t))
diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el
index 6a58a6215fa..09bea69cf73 100644
--- a/lisp/calc/calc-graph.el
+++ b/lisp/calc/calc-graph.el
@@ -407,13 +407,13 @@
                                        (prin1-to-string output)))))
          (setq calc-graph-resolution (calc-graph-find-command "samples"))
          (if calc-graph-resolution
-             (setq calc-graph-resolution (string-to-int calc-graph-resolution))
+             (setq calc-graph-resolution (string-to-number calc-graph-resolution))
            (setq calc-graph-resolution (if calc-graph-is-splot
                                 calc-graph-default-resolution-3d
                               calc-graph-default-resolution)))
          (setq precision (calc-graph-find-command "precision"))
          (if precision
-             (setq precision (string-to-int precision))
+             (setq precision (string-to-number precision))
            (setq precision calc-graph-default-precision))
          (calc-graph-set-command "terminal")
          (calc-graph-set-command "output")
@@ -1078,11 +1078,11 @@ This \"dumb\" driver will be present in Gnuplot 3.0."
                 (setq mode (buffer-substring (match-beginning 1)
                                              (match-end 1))))
             (if (looking-at "[ \ta-z]+\\([0-9]+\\)")
-                (setq lstyle (string-to-int
+                (setq lstyle (string-to-number
                               (buffer-substring (match-beginning 1)
                                                 (match-end 1)))))
             (if (looking-at "[ \ta-z]+[0-9]+[ \t]+\\([0-9]+\\)")
-                (setq pstyle (string-to-int
+                (setq pstyle (string-to-number
                               (buffer-substring (match-beginning 1)
                                                 (match-end 1)))))))
       (setq lenbl (or (equal mode "lines") (equal mode "linespoints"))
@@ -1195,11 +1195,11 @@ This \"dumb\" driver will be present in Gnuplot 3.0."
           (if (equal res "")
               (message "Default resolution is %d"
                        calc-graph-default-resolution)
-            (setq calc-graph-default-resolution (string-to-int res)))
+            (setq calc-graph-default-resolution (string-to-number res)))
         (if (equal res "")
             (message "Default 3D resolution is %d"
                      calc-graph-default-resolution-3d)
-          (setq calc-graph-default-resolution-3d (string-to-int res))))
+          (setq calc-graph-default-resolution-3d (string-to-number res))))
     (calc-graph-set-command "samples" (if (not (equal res "")) res))))
 
 (defun calc-graph-device (name flag)
@@ -1456,7 +1456,7 @@ This \"dumb\" driver will be present in Gnuplot 3.0."
                 (goto-char origin)
                 (re-search-forward
                  "G N U P L O T.*\n.*version \\([0-9]+\\)\\." nil t))
-              (setq calc-gnuplot-version (string-to-int (buffer-substring
+              (setq calc-gnuplot-version (string-to-number (buffer-substring
                                                          (match-beginning 1)
                                                          (match-end 1))))
             (setq calc-gnuplot-version 1))
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index 46b8cec2ac6..2a89bb2b883 100644
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -393,12 +393,14 @@ C-w  Describe how there is no warranty for Calc."
         (error "Can't locate Calc sources"))
     (calc-quit)
     (switch-to-buffer "*Help*")
-    (erase-buffer)
-    (insert-file-contents (expand-file-name "README" (car path)))
-    (search-forward "Summary of changes")
-    (forward-line -1)
-    (delete-region (point-min) (point))
-    (goto-char (point-min))))
+    (let ((inhibit-read-only t))
+      (erase-buffer)
+      (insert-file-contents (expand-file-name "README" (car path)))
+      (search-forward "Summary of changes")
+      (forward-line -1)
+      (delete-region (point-min) (point))
+      (goto-char (point-min)))
+    (help-mode)))
 
 (defvar calc-help-long-names '((?b . "binary/business")
                                (?g . "graphics")
diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el
index 05ec668cce9..01ca770ba27 100644
--- a/lisp/calc/calc-prog.el
+++ b/lisp/calc/calc-prog.el
@@ -1,6 +1,6 @@
 ;;; calc-prog.el --- user programmability 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>
@@ -637,7 +637,7 @@
              (setq part (nconc part (list (if (= (match-beginning 1)
                                                  (match-end 1))
                                               0
-                                            (string-to-int
+                                            (string-to-number
                                              (buffer-substring
                                               (1+ (match-beginning 1))
                                               (match-end 1)))))))
@@ -727,7 +727,7 @@
   (goto-char calc-edit-top)
   (while
       (re-search-forward "^\\([0-9]+\\)\\*" nil t)
-    (let ((num (string-to-int (match-string 1)))
+    (let ((num (string-to-number (match-string 1)))
           (line (buffer-substring (point) (line-end-position))))
       (goto-char (line-beginning-position))
       (kill-line 1)
diff --git a/lisp/calc/calc-yank.el b/lisp/calc/calc-yank.el
index 339dfd838a4..84c117a1723 100644
--- a/lisp/calc/calc-yank.el
+++ b/lisp/calc/calc-yank.el
@@ -1,6 +1,6 @@
 ;;; calc-yank.el --- kill-ring functionality 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>
@@ -231,7 +231,7 @@
                         pos j)))))
         (if (string-match "\\` *-?[0-9][0-9]?[0-9]?[0-9]?[0-9]?[0-9]? *\\'"
                           (car data))
-            (setq vals (list 'vec (string-to-int (car data))))
+            (setq vals (list 'vec (string-to-number (car data))))
           (if (and (null arg)
                    (string-match "[[{][^][{}]*[]}]" (car data)))
               (setq pos (match-beginning 0)
@@ -528,7 +528,7 @@ To cancel the edit, simply kill the *Calc Edit* buffer."
     (goto-char calc-edit-top)
     (if (buffer-modified-p)
         (eval calc-edit-handler))
-    (if one-window
+    (if (and one-window (not (one-window-p t)))
         (delete-window))
     (if (get-buffer-window return)
         (select-window (get-buffer-window return))
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index ceee013e493..617fc1ddc89 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -1174,8 +1174,6 @@ commands given here will actually operate on the *Calculator* stack."
   (setq buffer-read-only t)
   (make-local-variable 'overlay-arrow-position)
   (make-local-variable 'overlay-arrow-string)
-  (set (make-local-variable 'font-lock-defaults)
-       '(nil t nil nil nil (font-lock-core-only . t)))
   (when buf
     (set (make-local-variable 'calc-main-buffer) buf))
   (when (= (buffer-size) 0)
@@ -2138,7 +2136,7 @@ See calc-keypad for details."
      (t
       (insert (char-to-string last-command-char))
       (if (or (and (calc-minibuffer-contains "[-+]?\\(.*\\+/- *\\|.*mod *\\)?\\([0-9][0-9]?\\)#[0-9a-zA-Z]*\\(:[0-9a-zA-Z]*\\(:[0-9a-zA-Z]*\\)?\\|.[0-9a-zA-Z]*\\(e[-+]?[0-9]*\\)?\\)?\\'")
-                   (let ((radix (string-to-int
+                   (let ((radix (string-to-number
                                  (buffer-substring
                                   (match-beginning 2) (match-end 2)))))
                      (and (>= radix 2)
@@ -3280,7 +3278,7 @@ See calc-keypad for details."
                 (eq (aref digs 0) ?0))
            (math-read-number (concat "8#" digs))
          (if (<= (length digs) 6)
-             (string-to-int digs)
+             (string-to-number digs)
            (cons 'bigpos (math-read-bignum digs))))))
 
     ;; Clean up the string if necessary
@@ -3317,7 +3315,7 @@ See calc-keypad for details."
            (exp (math-match-substring s 2)))
        (let ((mant (if (> (length mant) 0) (math-read-number mant) 1))
              (exp (if (<= (length exp) (if (memq (aref exp 0) '(?+ ?-)) 8 7))
-                      (string-to-int exp))))
+                      (string-to-number exp))))
          (and mant exp (Math-realp mant) (> exp -4000000) (< exp 4000000)
               (let ((mant (math-float mant)))
                 (list 'float (nth 1 mant) (+ (nth 2 mant) exp)))))))
@@ -3332,9 +3330,9 @@ See calc-keypad for details."
 
 (defun math-read-bignum (s)   ; [l X]
   (if (> (length s) 3)
-      (cons (string-to-int (substring s -3))
+      (cons (string-to-number (substring s -3))
             (math-read-bignum (substring s 0 -3)))
-    (list (string-to-int s))))
+    (list (string-to-number s))))
 
 
 (defconst math-tex-ignore-words
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 320a6aa0f72..f37b966a45a 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -28,6 +28,13 @@
 
 ;; This package is documented in the Emacs Manual.
 
+;;   Please note:
+;; - Diary entries which have a start time but no end time are assumed to
+;;   last for one hour when they are exported.
+;; - Weekly diary entries are assumed to occur the first time in the first
+;;   week of the year 2000 when they are exported.
+;; - Yearly diary entries are assumed to occur the first time in the year
+;;   1900 when they are exported.
 
 ;;; History:
 
@@ -75,11 +82,11 @@
 ;;    + the parser is too soft
 ;;    + error log is incomplete
 ;;    + nice to have: #include "webcal://foo.com/some-calendar.ics"
+;;    + timezones, currently all times are local!
 
 ;;  * Export from diary to ical
 ;;    + diary-date, diary-float, and self-made sexp entries are not
 ;;      understood
-;;    + timezones, currently all times are local!
 
 ;;  * Other things
 ;;    + clean up all those date/time parsing functions
@@ -90,7 +97,7 @@
 
 ;;; Code:
 
-(defconst icalendar-version 0.11
+(defconst icalendar-version 0.12
   "Version number of icalendar.el.")
 
 ;; ======================================================================
@@ -145,16 +152,8 @@ replaced by the organizer."
   :type 'string
   :group 'icalendar)
 
-(defcustom icalendar-duration-correction
-  t
-  "Workaround for all-day events.
-If non-nil the length=duration of iCalendar appointments that
-have a length of exactly n days is decreased by one day.  This
-fixes problems with all-day events, which appear to be one day
-longer than they are."
-  :type 'boolean
-  :group 'icalendar)
-
+(defvar icalendar-debug nil
+  "Enable icalendar debug messages.")
 
 ;; ======================================================================
 ;; NO USER SERVICABLE PARTS BELOW THIS LINE
@@ -162,8 +161,6 @@ longer than they are."
 
 (defconst icalendar--weekday-array ["SU" "MO" "TU" "WE" "TH" "FR" "SA"])
 
-(defvar icalendar-debug nil ".")
-
 ;; ======================================================================
 ;; all the other libs we need
 ;; ======================================================================
@@ -295,7 +292,7 @@ it finds"
     (while props
       (setq pp (car props))
       (if (eq (car pp) prop)
-          (setq result (cons (car (cddr pp)) result)))
+          (setq result (append (split-string (car (cddr pp)) ",") result)))
       (setq props (cdr props)))
     result))
 
@@ -411,12 +408,15 @@ FIXME: multiple comma-separated values should be allowed!"
     ;; isodatetimestring == nil
     nil))
 
-(defun icalendar--decode-isoduration (isodurationstring)
-  "Return ISODURATIONSTRING in format like `decode-time'.
+(defun icalendar--decode-isoduration (isodurationstring
+                                      &optional duration-correction)
+  "Convert ISODURATIONSTRING into format provided by `decode-time'.
 Converts from ISO-8601 to Emacs representation.  If ISODURATIONSTRING
 specifies UTC time (trailing letter Z) the decoded time is given in
 the local time zone!
 
+Optional argument DURATION-CORRECTION shortens result by one day.
+
 FIXME: TZID-attributes are ignored....!
 FIXME: multiple comma-separated values should be allowed!"
   (if isodurationstring
@@ -442,7 +442,7 @@ FIXME: multiple comma-separated values should be allowed!"
             (setq days (read (substring isodurationstring
                                         (match-beginning 3)
                                         (match-end 3))))
-            (when icalendar-duration-correction
+            (when duration-correction
               (setq days (1- days))))
            ((match-beginning 4)         ;days and time
             (if (match-beginning 5)
@@ -710,14 +710,14 @@ FExport diary data into iCalendar file: ")
                            "?")))
     ;; prepare buffer with error messages
     (save-current-buffer
-      (set-buffer (get-buffer-create " *icalendar-errors*"))
+      (set-buffer (get-buffer-create "*icalendar-errors*"))
       (erase-buffer))
 
     ;; here we go
     (save-excursion
       (goto-char min)
       (while (re-search-forward
-              "^\\([^ \t\n].*\\)\\(\\(\n[ \t].*\\)*\\)" max t)
+              "^\\([^ \t\n].+\\)\\(\\(\n[ \t].*\\)*\\)" max t)
         (setq entry-main (match-string 1))
         (if (match-beginning 2)
             (setq entry-rest (match-string 2))
@@ -728,369 +728,42 @@ FExport diary data into iCalendar file: ")
                              (car (cddr (current-time)))))
         (condition-case error-val
             (progn
-              (cond
-               ;; anniversaries
-               ((string-match
-                 (concat nonmarker
-                         "%%(diary-anniversary \\([^)]+\\))\\s-*\\(.*\\)")
-                 entry-main)
-                (icalendar--dmsg "diary-anniversary %s" entry-main)
-                (let* ((datetime (substring entry-main (match-beginning 1)
-                                            (match-end 1)))
-                       (summary (icalendar--convert-string-for-export
-                                 (substring entry-main (match-beginning 2)
-                                            (match-end 2))))
-                       (startisostring (icalendar--datestring-to-isodate
-                                        datetime))
-                       (endisostring (icalendar--datestring-to-isodate
-                                      datetime 1)))
-                  (setq contents
-                        (concat "\nDTSTART;VALUE=DATE:" startisostring
-                                "\nDTEND;VALUE=DATE:" endisostring
-                                "\nSUMMARY:" summary
-                                "\nRRULE:FREQ=YEARLY;INTERVAL=1"
-                                ;; the following is redundant,
-                                ;; but korganizer seems to expect this... ;(
-                                ;; and evolution doesn't understand it... :(
-                                ;; so... who is wrong?!
-                                ";BYMONTH="
-                                (substring startisostring 4 6)
-                                ";BYMONTHDAY="
-                                (substring startisostring 6 8))))
-                (unless (string= entry-rest "")
-                  (setq contents
-                        (concat contents "\nDESCRIPTION:"
-                                (icalendar--convert-string-for-export
-                                 entry-rest)))))
-               ;; cyclic events
-               ;; %%(diary-cyclic )
-               ((string-match
-                 (concat nonmarker
-                         "%%(diary-cyclic \\([^ ]+\\) +"
-                         "\\([^ /]+[ /]+[^ /]+[ /]+[^ ]+\\))\\s-*\\(.*\\)")
-                 entry-main)
-                (icalendar--dmsg "diary-cyclic %s" entry-main)
-                (let* ((frequency (substring entry-main (match-beginning 1)
-                                             (match-end 1)))
-                       (datetime (substring entry-main (match-beginning 2)
-                                            (match-end 2)))
-                       (summary (icalendar--convert-string-for-export
-                                 (substring entry-main (match-beginning 3)
-                                            (match-end 3))))
-                       (startisostring (icalendar--datestring-to-isodate
-                                        datetime))
-                       (endisostring (icalendar--datestring-to-isodate
-                                      datetime 1)))
-                  (setq contents
-                        (concat "\nDTSTART;VALUE=DATE:" startisostring
-                                "\nDTEND;VALUE=DATE:" endisostring
-                                "\nSUMMARY:" summary
-                                "\nRRULE:FREQ=DAILY;INTERVAL=" frequency
-                                ;; strange: korganizer does not expect
-                                ;; BYSOMETHING here...
-                                )))
-                (unless (string= entry-rest "")
-                  (setq contents
-                        (concat contents "\nDESCRIPTION:"
-                                (icalendar--convert-string-for-export
-                                 entry-rest)))))
-               ;; diary-date -- FIXME
-               ((string-match
-                 (concat nonmarker
-                         "%%(diary-date \\([^)]+\\))\\s-*\\(.*\\)")
-                 entry-main)
-                (icalendar--dmsg "diary-date %s" entry-main)
-                (error "`diary-date' is not supported yet"))
-               ;; float events -- FIXME
-               ((string-match
-                 (concat nonmarker
-                         "%%(diary-float \\([^)]+\\))\\s-*\\(.*\\)")
-                 entry-main)
-                (icalendar--dmsg "diary-float %s" entry-main)
-                (error "`diary-float' is not supported yet"))
-               ;; block events
-               ((string-match
-                 (concat nonmarker
-                         "%%(diary-block \\([^ /]+[ /]+[^ /]+[ /]+[^ ]+\\)"
-                         " +\\([^ /]+[ /]+[^ /]+[ /]+[^ ]+\\))\\s-*"
-                         "\\(.*\\)")
-                 entry-main)
-                (icalendar--dmsg "diary-block %s" entry-main)
-                (let* ((startstring (substring entry-main
-                                               (match-beginning 1)
-                                               (match-end 1)))
-                       (endstring (substring entry-main
-                                             (match-beginning 2)
-                                             (match-end 2)))
-                       (summary (icalendar--convert-string-for-export
-                                 (substring entry-main (match-beginning 3)
-                                            (match-end 3))))
-                       (startisostring (icalendar--datestring-to-isodate
-                                        startstring))
-                       (endisostring (icalendar--datestring-to-isodate
-                                      endstring 1)))
-                  (setq contents
-                        (concat "\nDTSTART;VALUE=DATE:" startisostring
-                                "\nDTEND;VALUE=DATE:" endisostring
-                                "\nSUMMARY:" summary))
-                  (unless (string= entry-rest "")
-                    (setq contents
-                          (concat contents "\nDESCRIPTION:"
-                                  (icalendar--convert-string-for-export
-                                   entry-rest))))))
-               ;; other sexp diary entries -- FIXME
-               ((string-match
-                 (concat nonmarker
-                         "%%(\\([^)]+\\))\\s-*\\(.*\\)")
-                 entry-main)
-                (icalendar--dmsg "diary-sexp %s" entry-main)
-                (error "sexp-entries are not supported yet"))
-               ;; weekly by day
-               ;; Monday 8:30 Team meeting
-               ((and (string-match
-                      (concat nonmarker
-                              "\\([a-z]+\\)\\s-+"
-                              "\\(0?\\([1-9][0-9]?:[0-9][0-9]\\)"
-                              "\\([ap]m\\)?"
-                              "\\(-0?"
-                              "\\([1-9][0-9]?:[0-9][0-9]\\)"
-                              "\\([ap]m\\)?\\)?"
-                              "\\)?"
-                              "\\s-*\\(.*\\)$")
-                      entry-main)
-                     (icalendar--get-weekday-abbrev
-                      (substring entry-main (match-beginning 1)
-                                 (match-end 1))))
-                (icalendar--dmsg "weekly %s" entry-main)
-                (let* ((day (icalendar--get-weekday-abbrev
-                             (substring entry-main (match-beginning 1)
-                                        (match-end 1))))
-                       (starttimestring (icalendar--diarytime-to-isotime
-                                         (if (match-beginning 3)
-                                             (substring entry-main
-                                                        (match-beginning 3)
-                                                        (match-end 3))
-                                           nil)
-                                         (if (match-beginning 4)
-                                             (substring entry-main
-                                                        (match-beginning 4)
-                                                        (match-end 4))
-                                           nil)))
-                       (endtimestring (icalendar--diarytime-to-isotime
-                                       (if (match-beginning 6)
-                                           (substring entry-main
-                                                      (match-beginning 6)
-                                                      (match-end 6))
-                                         nil)
-                                       (if (match-beginning 7)
-                                           (substring entry-main
-                                                      (match-beginning 7)
-                                                      (match-end 7))
-                                         nil)))
-                       (summary (icalendar--convert-string-for-export
-                                 (substring entry-main (match-beginning 8)
-                                            (match-end 8)))))
-                  (when starttimestring
-                    (unless endtimestring
-                      (let ((time (read
-                                   (icalendar--rris "^T0?" ""
-                                                    starttimestring))))
-                        (setq endtimestring (format "T%06d"
-                                                    (+ 10000 time))))))
-                  (setq contents
-                        (concat "\nDTSTART;"
-                                (if starttimestring
-                                    "VALUE=DATE-TIME:"
-                                  "VALUE=DATE:")
-                                ;; find the correct week day,
-                                ;; 1st january 2000 was a saturday
-                                (format
-                                 "200001%02d"
-                                 (+ (icalendar--get-weekday-number day) 2))
-                                (or starttimestring "")
-                                "\nDTEND;"
-                                (if endtimestring
-                                    "VALUE=DATE-TIME:"
-                                  "VALUE=DATE:")
-                                (format
-                                 "200001%02d"
-                                 ;; end is non-inclusive!
-                                 (+ (icalendar--get-weekday-number day)
-                                    (if endtimestring 2 3)))
-                                (or endtimestring "")
-                                "\nSUMMARY:" summary
-                                "\nRRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY="
-                                day)))
-                (unless (string= entry-rest "")
-                  (setq contents
-                        (concat contents "\nDESCRIPTION:"
-                                (icalendar--convert-string-for-export
-                                 entry-rest)))))
-               ;; yearly by day
-               ;; 1 May Tag der Arbeit
-               ((string-match
-                 (concat nonmarker
-                         (if european-calendar-style
-                             "0?\\([1-9]+[0-9]?\\)\\s-+\\([a-z]+\\)\\s-+"
-                           "\\([a-z]+\\)\\s-+0?\\([1-9]+[0-9]?\\)\\s-+")
-                         "\\*?\\s-*"
-                         "\\(0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?"
-                         "\\("
-                         "-0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?\\)?"
-                         "\\)?"
-                         "\\s-*\\([^0-9]+.*\\)$" ; must not match years
-                         )
-                 entry-main)
-                (icalendar--dmsg "yearly %s" entry-main)
-                (let* ((daypos (if european-calendar-style 1 2))
-                       (monpos (if european-calendar-style 2 1))
-                       (day (read (substring entry-main
-                                             (match-beginning daypos)
-                                             (match-end daypos))))
-                       (month (icalendar--get-month-number
-                               (substring entry-main
-                                          (match-beginning monpos)
-                                          (match-end monpos))))
-                       (starttimestring (icalendar--diarytime-to-isotime
-                                         (if (match-beginning 4)
-                                             (substring entry-main
-                                                        (match-beginning 4)
-                                                        (match-end 4))
-                                           nil)
-                                         (if (match-beginning 5)
-                                             (substring entry-main
-                                                        (match-beginning 5)
-                                                        (match-end 5))
-                                           nil)))
-                       (endtimestring (icalendar--diarytime-to-isotime
-                                       (if (match-beginning 7)
-                                           (substring entry-main
-                                                      (match-beginning 7)
-                                                      (match-end 7))
-                                         nil)
-                                       (if (match-beginning 8)
-                                           (substring entry-main
-                                                      (match-beginning 8)
-                                                      (match-end 8))
-                                         nil)))
-                       (summary (icalendar--convert-string-for-export
-                                 (substring entry-main (match-beginning 9)
-                                            (match-end 9)))))
-                  (when starttimestring
-                    (unless endtimestring
-                      (let ((time (read
-                                   (icalendar--rris "^T0?" ""
-                                                    starttimestring))))
-                        (setq endtimestring (format "T%06d"
-                                                    (+ 10000 time))))))
-                  (setq contents
-                        (concat "\nDTSTART;"
-                                (if starttimestring "VALUE=DATE-TIME:"
-                                  "VALUE=DATE:")
-                                (format "1900%02d%02d" month day)
-                                (or starttimestring "")
-                                "\nDTEND;"
-                                (if endtimestring "VALUE=DATE-TIME:"
-                                  "VALUE=DATE:")
-                                ;; end is not included! shift by one day
-                                (icalendar--date-to-isodate
-                                 (list month day 1900)
-                                 (if endtimestring 0 1))
-                                (or endtimestring "")
-                                "\nSUMMARY:"
-                                summary
-                                "\nRRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH="
-                                (format "%2d" month)
-                                ";BYMONTHDAY="
-                                (format "%2d" day))))
-                (unless (string= entry-rest "")
-                  (setq contents
-                        (concat contents "\nDESCRIPTION:"
-                                (icalendar--convert-string-for-export
-                                 entry-rest)))))
-               ;; "ordinary" events, start and end time given
-               ;; 1 Feb 2003 Hs Hochzeitsfeier, Dreieich
-               ((string-match
-                 (concat nonmarker
-                         "\\([^ /]+[ /]+[^ /]+[ /]+[^ ]+\\)\\s-+"
-                         "\\(0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?"
-                         "\\("
-                         "-0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?\\)?"
-                         "\\)?"
-                         "\\s-*\\(.*\\)")
-                 entry-main)
-                (icalendar--dmsg "ordinary %s" entry-main)
-                (let* ((startdatestring (icalendar--datestring-to-isodate
-                                         (substring entry-main
-                                                    (match-beginning 1)
-                                                    (match-end 1))))
-                       (starttimestring (icalendar--diarytime-to-isotime
-                                         (if (match-beginning 3)
-                                             (substring entry-main
-                                                        (match-beginning 3)
-                                                        (match-end 3))
-                                           nil)
-                                         (if (match-beginning 4)
-                                             (substring entry-main
-                                                        (match-beginning 4)
-                                                        (match-end 4))
-                                           nil)))
-                       (endtimestring (icalendar--diarytime-to-isotime
-                                       (if (match-beginning 6)
-                                           (substring entry-main
-                                                      (match-beginning 6)
-                                                      (match-end 6))
-                                         nil)
-                                       (if (match-beginning 7)
-                                           (substring entry-main
-                                                      (match-beginning 7)
-                                                      (match-end 7))
-                                         nil)))
-                       (summary (icalendar--convert-string-for-export
-                                 (substring entry-main (match-beginning 8)
-                                            (match-end 8)))))
-                  (unless startdatestring
-                    (error "Could not parse date"))
-                  (when starttimestring
-                    (unless endtimestring
-                      (let ((time
-                             (read (icalendar--rris "^T0?" ""
-                                                    starttimestring))))
-                        (setq endtimestring (format "T%06d"
-                                                    (+ 10000 time))))))
-                  (setq contents (concat
-                                  "\nDTSTART;"
-                                  (if starttimestring "VALUE=DATE-TIME:"
-                                    "VALUE=DATE:")
-                                  startdatestring
-                                  (or starttimestring "")
-                                  "\nDTEND;"
-                                  (if endtimestring "VALUE=DATE-TIME:"
-                                    "VALUE=DATE:")
-                                  (icalendar--datestring-to-isodate
-                                   (substring entry-main
-                                              (match-beginning 1)
-                                              (match-end 1))
-                                   (if endtimestring 0 1))
-                                  (or endtimestring "")
-                                  "\nSUMMARY:"
-                                  summary))
-                  ;; could not parse the date
-                  (unless (string= entry-rest "")
-                    (setq contents
-                          (concat contents "\nDESCRIPTION:"
-                                  (icalendar--convert-string-for-export
-                                   entry-rest))))))
-               ;; everything else
-               (t
-                ;; Oops! what's that?
-                (error "Could not parse entry")))
+              (setq contents
+                    (or
+                     ;; anniversaries -- %%(diary-anniversary ...)
+                     (icalendar--convert-anniversary-to-ical nonmarker
+                                                             entry-main)
+                     ;; cyclic events -- %%(diary-cyclic ...)
+                     (icalendar--convert-cyclic-to-ical nonmarker entry-main)
+                     ;; diary-date -- %%(diary-date ...)
+                     (icalendar--convert-date-to-ical nonmarker entry-main)
+                     ;; float events -- %%(diary-float ...)
+                     (icalendar--convert-float-to-ical nonmarker entry-main)
+                     ;; block events -- %%(diary-block ...)
+                     (icalendar--convert-block-to-ical nonmarker entry-main)
+                     ;; other sexp diary entries
+                     (icalendar--convert-sexp-to-ical nonmarker entry-main)
+                     ;; weekly by day -- Monday 8:30 Team meeting
+                     (icalendar--convert-weekly-to-ical nonmarker entry-main)
+                     ;; yearly by day -- 1 May Tag der Arbeit
+                     (icalendar--convert-yearly-to-ical nonmarker entry-main)
+                     ;; "ordinary" events, start and end time given
+                     ;; 1 Feb 2003 blah
+                     (icalendar--convert-ordinary-to-ical nonmarker entry-main)
+                     ;; everything else
+                     ;; Oops! what's that?
+                     (error "Could not parse entry")))
+              (unless (string= entry-rest "")
+                (setq contents
+                      (concat contents "\nDESCRIPTION:"
+                              (icalendar--convert-string-for-export
+                               entry-rest))))
               (setq result (concat result header contents "\nEND:VEVENT")))
           ;; handle errors
           (error
            (setq found-error t)
            (save-current-buffer
-             (set-buffer (get-buffer-create " *icalendar-errors*"))
+             (set-buffer (get-buffer-create "*icalendar-errors*"))
              (insert (format "Error in line %d -- %s: `%s'\n"
                              (count-lines (point-min) (point))
                              (cadr error-val)
@@ -1110,6 +783,518 @@ FExport diary data into iCalendar file: ")
           (save-buffer))))
     found-error))
 
+;; subroutines
+(defun icalendar--convert-ordinary-to-ical (nonmarker entry-main)
+  "Convert \"ordinary\" diary entry to icalendar format.
+
+NONMARKER is a regular expression matching the start of non-marking
+entries.  ENTRY-MAIN is the first line of the diary entry."
+  (if (string-match (concat nonmarker
+                            "\\([^ /]+[ /]+[^ /]+[ /]+[^ ]+\\)\\s-*"
+                            "\\(0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?"
+                            "\\("
+                            "-0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?\\)?"
+                            "\\)?"
+                            "\\s-*\\(.*\\)")
+                    entry-main)
+      (let* ((datetime (substring entry-main (match-beginning 1)
+                                  (match-end 1)))
+             (startisostring (icalendar--datestring-to-isodate
+                              datetime))
+             (endisostring (icalendar--datestring-to-isodate
+                            datetime 1))
+             (starttimestring (icalendar--diarytime-to-isotime
+                               (if (match-beginning 3)
+                                   (substring entry-main
+                                              (match-beginning 3)
+                                              (match-end 3))
+                                 nil)
+                               (if (match-beginning 4)
+                                   (substring entry-main
+                                              (match-beginning 4)
+                                              (match-end 4))
+                                 nil)))
+             (endtimestring (icalendar--diarytime-to-isotime
+                             (if (match-beginning 6)
+                                 (substring entry-main
+                                            (match-beginning 6)
+                                            (match-end 6))
+                               nil)
+                             (if (match-beginning 7)
+                                 (substring entry-main
+                                            (match-beginning 7)
+                                            (match-end 7))
+                               nil)))
+             (summary (icalendar--convert-string-for-export
+                       (substring entry-main (match-beginning 8)
+                                  (match-end 8)))))
+        (icalendar--dmsg "ordinary %s" entry-main)
+
+        (unless startisostring
+          (error "Could not parse date"))
+        (when starttimestring
+          (unless endtimestring
+            (let ((time
+                   (read (icalendar--rris "^T0?" ""
+                                          starttimestring))))
+              (setq endtimestring (format "T%06d"
+                                          (+ 10000 time))))))
+        (concat "\nDTSTART;"
+                (if starttimestring "VALUE=DATE-TIME:"
+                  "VALUE=DATE:")
+                startisostring
+                (or starttimestring "")
+                "\nDTEND;"
+                (if endtimestring "VALUE=DATE-TIME:"
+                  "VALUE=DATE:")
+                (if starttimestring
+                    startisostring
+                  endisostring)
+                (or endtimestring "")
+                "\nSUMMARY:"
+                summary))
+    ;; no match
+    nil))
+
+(defun icalendar--convert-weekly-to-ical (nonmarker entry-main)
+  "Convert weekly diary entry to icalendar format.
+
+NONMARKER is a regular expression matching the start of non-marking
+entries.  ENTRY-MAIN is the first line of the diary entry."
+  (if (and (string-match (concat nonmarker
+                                 "\\([a-z]+\\)\\s-+"
+                                 "\\(0?\\([1-9][0-9]?:[0-9][0-9]\\)"
+                                 "\\([ap]m\\)?"
+                                 "\\(-0?"
+                                 "\\([1-9][0-9]?:[0-9][0-9]\\)"
+                                 "\\([ap]m\\)?\\)?"
+                                 "\\)?"
+                                 "\\s-*\\(.*\\)$")
+                         entry-main)
+           (icalendar--get-weekday-abbrev
+            (substring entry-main (match-beginning 1)
+                       (match-end 1))))
+      (let* ((day (icalendar--get-weekday-abbrev
+                   (substring entry-main (match-beginning 1)
+                              (match-end 1))))
+             (starttimestring (icalendar--diarytime-to-isotime
+                               (if (match-beginning 3)
+                                   (substring entry-main
+                                              (match-beginning 3)
+                                              (match-end 3))
+                                 nil)
+                               (if (match-beginning 4)
+                                   (substring entry-main
+                                              (match-beginning 4)
+                                              (match-end 4))
+                                 nil)))
+             (endtimestring (icalendar--diarytime-to-isotime
+                             (if (match-beginning 6)
+                                 (substring entry-main
+                                            (match-beginning 6)
+                                            (match-end 6))
+                               nil)
+                             (if (match-beginning 7)
+                                 (substring entry-main
+                                            (match-beginning 7)
+                                            (match-end 7))
+                               nil)))
+             (summary (icalendar--convert-string-for-export
+                       (substring entry-main (match-beginning 8)
+                                  (match-end 8)))))
+        (icalendar--dmsg "weekly %s" entry-main)
+
+        (when starttimestring
+          (unless endtimestring
+            (let ((time (read
+                         (icalendar--rris "^T0?" ""
+                                          starttimestring))))
+              (setq endtimestring (format "T%06d"
+                                          (+ 10000 time))))))
+        (concat "\nDTSTART;"
+                (if starttimestring
+                    "VALUE=DATE-TIME:"
+                  "VALUE=DATE:")
+                ;; find the correct week day,
+                ;; 1st january 2000 was a saturday
+                (format
+                 "200001%02d"
+                 (+ (icalendar--get-weekday-number day) 2))
+                (or starttimestring "")
+                "\nDTEND;"
+                (if endtimestring
+                    "VALUE=DATE-TIME:"
+                  "VALUE=DATE:")
+                (format
+                 "200001%02d"
+                 ;; end is non-inclusive!
+                 (+ (icalendar--get-weekday-number day)
+                    (if endtimestring 2 3)))
+                (or endtimestring "")
+                "\nSUMMARY:" summary
+                "\nRRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY="
+                day))
+    ;; no match
+    nil))
+
+(defun icalendar--convert-yearly-to-ical (nonmarker entry-main)
+  "Convert yearly diary entry to icalendar format.
+
+NONMARKER is a regular expression matching the start of non-marking
+entries.  ENTRY-MAIN is the first line of the diary entry."
+  (if (string-match (concat nonmarker
+                            (if european-calendar-style
+                                "0?\\([1-9]+[0-9]?\\)\\s-+\\([a-z]+\\)\\s-+"
+                              "\\([a-z]+\\)\\s-+0?\\([1-9]+[0-9]?\\)\\s-+")
+                            "\\*?\\s-*"
+                            "\\(0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?"
+                            "\\("
+                            "-0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?\\)?"
+                            "\\)?"
+                            "\\s-*\\([^0-9]+.*\\)$" ; must not match years
+                            )
+                    entry-main)
+      (let* ((daypos (if european-calendar-style 1 2))
+             (monpos (if european-calendar-style 2 1))
+             (day (read (substring entry-main
+                                   (match-beginning daypos)
+                                   (match-end daypos))))
+             (month (icalendar--get-month-number
+                     (substring entry-main
+                                (match-beginning monpos)
+                                (match-end monpos))))
+             (starttimestring (icalendar--diarytime-to-isotime
+                               (if (match-beginning 4)
+                                   (substring entry-main
+                                              (match-beginning 4)
+                                              (match-end 4))
+                                 nil)
+                               (if (match-beginning 5)
+                                   (substring entry-main
+                                              (match-beginning 5)
+                                              (match-end 5))
+                                 nil)))
+             (endtimestring (icalendar--diarytime-to-isotime
+                             (if (match-beginning 7)
+                                 (substring entry-main
+                                            (match-beginning 7)
+                                            (match-end 7))
+                               nil)
+                             (if (match-beginning 8)
+                                 (substring entry-main
+                                            (match-beginning 8)
+                                            (match-end 8))
+                               nil)))
+             (summary (icalendar--convert-string-for-export
+                       (substring entry-main (match-beginning 9)
+                                  (match-end 9)))))
+        (icalendar--dmsg "yearly %s" entry-main)
+
+        (when starttimestring
+          (unless endtimestring
+            (let ((time (read
+                         (icalendar--rris "^T0?" ""
+                                          starttimestring))))
+              (setq endtimestring (format "T%06d"
+                                          (+ 10000 time))))))
+        (concat "\nDTSTART;"
+                (if starttimestring "VALUE=DATE-TIME:"
+                  "VALUE=DATE:")
+                (format "1900%02d%02d" month day)
+                (or starttimestring "")
+                "\nDTEND;"
+                (if endtimestring "VALUE=DATE-TIME:"
+                  "VALUE=DATE:")
+                ;; end is not included! shift by one day
+                (icalendar--date-to-isodate
+                 (list month day 1900)
+                 (if endtimestring 0 1))
+                (or endtimestring "")
+                "\nSUMMARY:"
+                summary
+                "\nRRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH="
+                (format "%2d" month)
+                ";BYMONTHDAY="
+                (format "%2d" day)))
+    ;; no match
+    nil))
+
+(defun icalendar--convert-sexp-to-ical (nonmarker entry-main)
+  "Convert complex sexp diary entry to icalendar format -- unsupported!
+
+FIXME!
+
+NONMARKER is a regular expression matching the start of non-marking
+entries.  ENTRY-MAIN is the first line of the diary entry."
+  (if (string-match (concat nonmarker
+                            "%%(\\([^)]+\\))\\s-*\\(.*\\)")
+                    entry-main)
+      (progn
+        (icalendar--dmsg "diary-sexp %s" entry-main)
+        (error "Sexp-entries are not supported yet"))
+    ;; no match
+    nil))
+
+(defun icalendar--convert-block-to-ical (nonmarker entry-main)
+  "Convert block diary entry to icalendar format.
+
+NONMARKER is a regular expression matching the start of non-marking
+entries.  ENTRY-MAIN is the first line of the diary entry."
+  (if (string-match (concat nonmarker
+                            "%%(diary-block \\([^ /]+[ /]+[^ /]+[ /]+[^ ]+\\)"
+                            " +\\([^ /]+[ /]+[^ /]+[ /]+[^ ]+\\))\\s-*"
+                            "\\(0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?"
+                            "\\("
+                            "-0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?\\)?"
+                            "\\)?"
+                            "\\s-*\\(.*\\)")
+                    entry-main)
+      (let* ((startstring (substring entry-main
+                                     (match-beginning 1)
+                                     (match-end 1)))
+             (endstring (substring entry-main
+                                   (match-beginning 2)
+                                   (match-end 2)))
+             (startisostring (icalendar--datestring-to-isodate
+                              startstring))
+             (endisostring (icalendar--datestring-to-isodate
+                            endstring))
+             (endisostring+1 (icalendar--datestring-to-isodate
+                              endstring 1))
+             (starttimestring (icalendar--diarytime-to-isotime
+                               (if (match-beginning 4)
+                                   (substring entry-main
+                                              (match-beginning 4)
+                                              (match-end 4))
+                                 nil)
+                               (if (match-beginning 5)
+                                   (substring entry-main
+                                              (match-beginning 5)
+                                              (match-end 5))
+                                 nil)))
+             (endtimestring (icalendar--diarytime-to-isotime
+                             (if (match-beginning 7)
+                                 (substring entry-main
+                                            (match-beginning 7)
+                                            (match-end 7))
+                               nil)
+                             (if (match-beginning 8)
+                                 (substring entry-main
+                                            (match-beginning 8)
+                                            (match-end 8))
+                               nil)))
+             (summary (icalendar--convert-string-for-export
+                       (substring entry-main (match-beginning 9)
+                                  (match-end 9)))))
+        (icalendar--dmsg "diary-block %s" entry-main)
+        (when starttimestring
+          (unless endtimestring
+            (let ((time
+                   (read (icalendar--rris "^T0?" ""
+                                          starttimestring))))
+              (setq endtimestring (format "T%06d"
+                                          (+ 10000 time))))))
+        (if starttimestring
+            ;; with time -> write rrule
+            (concat "\nDTSTART;VALUE=DATE-TIME:"
+                    startisostring
+                    starttimestring
+                    "\nDTEND;VALUE=DATE-TIME:"
+                    startisostring
+                    endtimestring
+                    "\nSUMMARY:"
+                    summary
+                    "\nRRULE:FREQ=DAILY;INTERVAL=1;UNTIL="
+                    endisostring)
+          ;; no time -> write long event
+          (concat "\nDTSTART;VALUE=DATE:" startisostring
+                  "\nDTEND;VALUE=DATE:" endisostring+1
+                  "\nSUMMARY:" summary)))
+    ;; no match
+    nil))
+
+(defun icalendar--convert-float-to-ical (nonmarker entry-main)
+  "Convert float diary entry to icalendar format -- unsupported!
+
+FIXME!
+
+NONMARKER is a regular expression matching the start of non-marking
+entries.  ENTRY-MAIN is the first line of the diary entry."
+  (if (string-match (concat nonmarker
+                            "%%(diary-float \\([^)]+\\))\\s-*\\(.*\\)")
+                    entry-main)
+      (progn
+        (icalendar--dmsg "diary-float %s" entry-main)
+        (error "`diary-float' is not supported yet"))
+    ;; no match
+    nil))
+
+(defun icalendar--convert-date-to-ical (nonmarker entry-main)
+  "Convert `diary-date' diary entry to icalendar format -- unsupported!
+
+FIXME!
+
+NONMARKER is a regular expression matching the start of non-marking
+entries.  ENTRY-MAIN is the first line of the diary entry."
+  (if (string-match (concat nonmarker
+                            "%%(diary-date \\([^)]+\\))\\s-*\\(.*\\)")
+                    entry-main)
+      (progn
+        (icalendar--dmsg "diary-date %s" entry-main)
+        (error "`diary-date' is not supported yet"))
+    ;; no match
+    nil))
+
+(defun icalendar--convert-cyclic-to-ical (nonmarker entry-main)
+  "Convert `diary-cyclic' diary entry to icalendar format.
+
+NONMARKER is a regular expression matching the start of non-marking
+entries.  ENTRY-MAIN is the first line of the diary entry."
+  (if (string-match (concat nonmarker
+                            "%%(diary-cyclic \\([^ ]+\\) +"
+                            "\\([^ /]+[ /]+[^ /]+[ /]+[^ ]+\\))\\s-*"
+                            "\\(0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?"
+                            "\\("
+                            "-0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?\\)?"
+                            "\\)?"
+                            "\\s-*\\(.*\\)")
+                    entry-main)
+      (let* ((frequency (substring entry-main (match-beginning 1)
+                                   (match-end 1)))
+             (datetime (substring entry-main (match-beginning 2)
+                                  (match-end 2)))
+             (startisostring (icalendar--datestring-to-isodate
+                              datetime))
+             (endisostring (icalendar--datestring-to-isodate
+                            datetime))
+             (endisostring+1 (icalendar--datestring-to-isodate
+                              datetime 1))
+             (starttimestring (icalendar--diarytime-to-isotime
+                               (if (match-beginning 4)
+                                   (substring entry-main
+                                              (match-beginning 4)
+                                              (match-end 4))
+                                 nil)
+                               (if (match-beginning 5)
+                                   (substring entry-main
+                                              (match-beginning 5)
+                                              (match-end 5))
+                                 nil)))
+             (endtimestring (icalendar--diarytime-to-isotime
+                             (if (match-beginning 7)
+                                 (substring entry-main
+                                            (match-beginning 7)
+                                            (match-end 7))
+                               nil)
+                             (if (match-beginning 8)
+                                 (substring entry-main
+                                            (match-beginning 8)
+                                            (match-end 8))
+                               nil)))
+             (summary (icalendar--convert-string-for-export
+                       (substring entry-main (match-beginning 9)
+                                  (match-end 9)))))
+        (icalendar--dmsg "diary-cyclic %s" entry-main)
+        (when starttimestring
+          (unless endtimestring
+            (let ((time
+                   (read (icalendar--rris "^T0?" ""
+                                          starttimestring))))
+              (setq endtimestring (format "T%06d"
+                                          (+ 10000 time))))))
+        (concat "\nDTSTART;"
+                (if starttimestring "VALUE=DATE-TIME:"
+                  "VALUE=DATE:")
+                startisostring
+                (or starttimestring "")
+                "\nDTEND;"
+                (if endtimestring "VALUE=DATE-TIME:"
+                  "VALUE=DATE:")
+                (if endtimestring endisostring endisostring+1)
+                (or endtimestring "")
+                "\nSUMMARY:" summary
+                "\nRRULE:FREQ=DAILY;INTERVAL=" frequency
+                ;; strange: korganizer does not expect
+                ;; BYSOMETHING here...
+                ))
+    ;; no match
+    nil))
+
+(defun icalendar--convert-anniversary-to-ical (nonmarker entry-main)
+  "Convert `diary-anniversary' diary entry to icalendar format.
+
+NONMARKER is a regular expression matching the start of non-marking
+entries.  ENTRY-MAIN is the first line of the diary entry."
+  (if (string-match (concat nonmarker
+                            "%%(diary-anniversary \\([^)]+\\))\\s-*"
+                            "\\(0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?"
+                            "\\("
+                            "-0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?\\)?"
+                            "\\)?"
+                            "\\s-*\\(.*\\)")
+                    entry-main)
+      (let* ((datetime (substring entry-main (match-beginning 1)
+                                  (match-end 1)))
+             (startisostring (icalendar--datestring-to-isodate
+                              datetime))
+             (endisostring (icalendar--datestring-to-isodate
+                            datetime 1))
+             (starttimestring (icalendar--diarytime-to-isotime
+                               (if (match-beginning 3)
+                                   (substring entry-main
+                                              (match-beginning 3)
+                                              (match-end 3))
+                                 nil)
+                               (if (match-beginning 4)
+                                   (substring entry-main
+                                              (match-beginning 4)
+                                              (match-end 4))
+                                 nil)))
+             (endtimestring (icalendar--diarytime-to-isotime
+                             (if (match-beginning 6)
+                                 (substring entry-main
+                                            (match-beginning 6)
+                                            (match-end 6))
+                               nil)
+                             (if (match-beginning 7)
+                                 (substring entry-main
+                                            (match-beginning 7)
+                                            (match-end 7))
+                               nil)))
+             (summary (icalendar--convert-string-for-export
+                       (substring entry-main (match-beginning 8)
+                                  (match-end 8)))))
+        (icalendar--dmsg "diary-anniversary %s" entry-main)
+        (when starttimestring
+          (unless endtimestring
+            (let ((time
+                   (read (icalendar--rris "^T0?" ""
+                                          starttimestring))))
+              (setq endtimestring (format "T%06d"
+                                          (+ 10000 time))))))
+        (concat "\nDTSTART;"
+                (if starttimestring "VALUE=DATE-TIME:"
+                  "VALUE=DATE:")
+                startisostring
+                (or starttimestring "")
+                "\nDTEND;"
+                (if endtimestring "VALUE=DATE-TIME:"
+                  "VALUE=DATE:")
+                endisostring
+                (or endtimestring "")
+                "\nSUMMARY:" summary
+                "\nRRULE:FREQ=YEARLY;INTERVAL=1"
+                ;; the following is redundant,
+                ;; but korganizer seems to expect this... ;(
+                ;; and evolution doesn't understand it... :(
+                ;; so... who is wrong?!
+                ";BYMONTH="
+                (substring startisostring 4 6)
+                ";BYMONTHDAY="
+                (substring startisostring 6 8)))
+    ;; no match
+    nil))
+
 ;; ======================================================================
 ;; Import -- convert icalendar to emacs-diary
 ;; ======================================================================
@@ -1170,10 +1355,12 @@ buffer `*icalendar-errors*'."
                              ical-contents
                              diary-file do-not-ask non-marking))
           (when diary-file
-            ;; save the diary file
-            (save-current-buffer
-              (set-buffer (find-buffer-visiting diary-file))
-              (save-buffer)))
+            ;; save the diary file if it is visited already
+            (let ((b (find-buffer-visiting diary-file)))
+              (when b
+                (save-current-buffer
+                  (set-buffer b)
+                  (save-buffer)))))
           (message "Converting icalendar...done")
           ;; return t if no error occured
           (not ical-errors))
@@ -1185,10 +1372,6 @@ buffer `*icalendar-errors*'."
 (defalias 'icalendar-extract-ical-from-buffer 'icalendar-import-buffer)
 (make-obsolete 'icalendar-extract-ical-from-buffer 'icalendar-import-buffer)
 
-;; ======================================================================
-;; private area
-;; ======================================================================
-
 (defun icalendar--format-ical-event (event)
   "Create a string representation of an iCalendar EVENT."
   (let ((string icalendar-import-format)
@@ -1226,7 +1409,7 @@ whether to actually import it.  NON-MARKING determines whether diary
 events are created as non-marking.
 This function attempts to return t if something goes wrong.  In this
 case an error string which describes all the errors and problems is
-written into the buffer ` *icalendar-errors*'."
+written into the buffer `*icalendar-errors*'."
   (let* ((ev (icalendar--all-events ical-list))
          (error-string "")
          (event-ok t)
@@ -1238,14 +1421,16 @@ written into the buffer ` *icalendar-errors*'."
       (setq ev (cdr ev))
       (setq event-ok nil)
       (condition-case error-val
-          (let* ((dtstart (icalendar--decode-isodatetime
-                           (icalendar--get-event-property e 'DTSTART)))
+          (let* ((dtstart (icalendar--get-event-property e 'DTSTART))
+                 (dtstart-dec (icalendar--decode-isodatetime dtstart))
                  (start-d (icalendar--datetime-to-diary-date
-                           dtstart))
-                 (start-t (icalendar--datetime-to-colontime dtstart))
-                 (dtend (icalendar--decode-isodatetime
-                         (icalendar--get-event-property e 'DTEND)))
+                           dtstart-dec))
+                 (start-t (icalendar--datetime-to-colontime dtstart-dec))
+                 (dtend (icalendar--get-event-property e 'DTEND))
+                 (dtend-dec (icalendar--decode-isodatetime dtend))
+                 (dtend-1-dec (icalendar--decode-isodatetime dtend -1))
                  end-d
+                 end-1-d
                  end-t
                  (subject (icalendar--convert-string-for-import
                            (or (icalendar--get-event-property e 'SUMMARY)
@@ -1253,165 +1438,50 @@ written into the buffer ` *icalendar-errors*'."
                  (rrule (icalendar--get-event-property e 'RRULE))
                  (rdate (icalendar--get-event-property e 'RDATE))
                  (duration (icalendar--get-event-property e 'DURATION)))
-            (icalendar--dmsg "%s: %s" start-d subject)
+            (icalendar--dmsg "%s: `%s'" start-d subject)
             ;; check whether start-time is missing
-            (if  (and (icalendar--get-event-property-attributes
-                       e 'DTSTART)
-                      (string= (cadr (icalendar--get-event-property-attributes
-                                      e 'DTSTART))
-                               "DATE"))
+            (if  (and dtstart
+                      (string=
+                       (cadr (icalendar--get-event-property-attributes
+                              e 'DTSTART))
+                       "DATE"))
                 (setq start-t nil))
             (when duration
-              (let ((dtend2 (icalendar--add-decoded-times
-                             dtstart
-                             (icalendar--decode-isoduration duration))))
-                (if (and dtend (not (eq dtend dtend2)))
+              (let ((dtend-dec-d (icalendar--add-decoded-times
+                                  dtstart-dec
+                                  (icalendar--decode-isoduration duration)))
+                    (dtend-1-dec-d (icalendar--add-decoded-times
+                                    dtstart-dec
+                                    (icalendar--decode-isoduration duration
+                                                                   t))))
+                (if (and dtend-dec (not (eq dtend-dec dtend-dec-d)))
                     (message "Inconsistent endtime and duration for %s"
                              subject))
-                (setq dtend dtend2)))
-            (setq end-d (if dtend
-                            (icalendar--datetime-to-diary-date dtend)
+                (setq dtend-dec dtend-dec-d)
+                (setq dtend-1-dec dtend-1-dec-d)))
+            (setq end-d (if dtend-dec
+                            (icalendar--datetime-to-diary-date dtend-dec)
                           start-d))
-            (setq end-t (if dtend
-                            (icalendar--datetime-to-colontime dtend)
+            (setq end-1-d (if dtend-1-dec
+                              (icalendar--datetime-to-diary-date dtend-1-dec)
+                            start-d))
+            (setq end-t (if (and
+                             dtend-dec
+                             (not (string=
+                                   (cadr
+                                    (icalendar--get-event-property-attributes
+                                     e 'DTEND))
+                                   "DATE")))
+                            (icalendar--datetime-to-colontime dtend-dec)
                           start-t))
             (icalendar--dmsg "start-d: %s, end-d: %s" start-d end-d)
             (cond
              ;; recurring event
              (rrule
-              (icalendar--dmsg "recurring event")
-              (let* ((rrule-props (icalendar--split-value rrule))
-                     (frequency (cadr (assoc 'FREQ rrule-props)))
-                     (until (cadr (assoc 'UNTIL rrule-props)))
-                     (interval (read (cadr (assoc 'INTERVAL rrule-props)))))
-                (cond ((string-equal frequency "WEEKLY")
-                       (if (not start-t)
-                           (progn
-                             ;; weekly and all-day
-                             (icalendar--dmsg "weekly all-day")
-                             (if until
-                                 (let ((fro
-                                        (icalendar--datetime-to-diary-date
-                                         (icalendar--decode-isodatetime
-                                          (icalendar--get-event-property
-                                           e
-                                           'DTSTART))))
-                                       (unt
-                                        (icalendar--datetime-to-diary-date
-                                         (icalendar--decode-isodatetime
-                                          until -1))))
-                             (setq diary-string
-                                   (format
-                                    (concat "%%%%(and "
-                                            "(diary-cyclic %d %s) "
-                                            "(diary-block %s %s))")
-                                    (* interval 7)
-                                    (icalendar--datetime-to-diary-date
-                                     dtstart)
-                                    (icalendar--datetime-to-diary-date
-                                     dtstart)
-                                    (icalendar--datetime-to-diary-date
-                                     (icalendar--decode-isodatetime
-                                      until -1)))))
-                               (setq diary-string
-                                     (format "%%%%(and (diary-cyclic %d %s))"
-                                             (* interval 7)
-                                             (icalendar--datetime-to-diary-date
-                                              dtstart))))
-                             (setq event-ok t))
-                         ;; weekly and not all-day
-                         (let* ((byday (cadr (assoc 'BYDAY rrule-props)))
-                                (weekday
-                                 (icalendar--get-weekday-number byday)))
-                           (icalendar--dmsg "weekly not-all-day")
-                           (if until
-                               (let ((fro
-                                      (icalendar--datetime-to-diary-date
-                                       (icalendar--decode-isodatetime
-                                        (icalendar--get-event-property
-                                         e
-                                         'DTSTART))))
-                                     (unt
-                                      (icalendar--datetime-to-diary-date
-                                       (icalendar--decode-isodatetime
-                                        until))))
-                                 (setq diary-string
-                                       (format
-                                        (concat "%%%%(and "
-                                                "(diary-cyclic %d %s) "
-                                                "(diary-block %s %s)) "
-                                                "%s%s%s")
-                                        (* interval 7)
-                                        (icalendar--datetime-to-diary-date
-                                         dtstart)
-                                        (icalendar--datetime-to-diary-date
-                                         dtstart)
-                                        (icalendar--datetime-to-diary-date
-                                         (icalendar--decode-isodatetime
-                                          until))
-                                        start-t
-                                        (if end-t "-" "") (or end-t ""))))
-                             ;; no limit
-                             ;; FIXME!!!!
-                             ;; DTSTART;VALUE=DATE-TIME:20030919T090000
-                             ;; DTEND;VALUE=DATE-TIME:20030919T113000
-                             (setq diary-string
-                                   (format
-                                    "%%%%(and (diary-cyclic %s %s)) %s%s%s"
-                                    (* interval 7)
-                                    (icalendar--datetime-to-diary-date
-                                     dtstart)
-                                    start-t
-                                    (if end-t "-" "") (or end-t ""))))
-                           (setq event-ok t))))
-                      ;; yearly
-                      ((string-equal frequency "YEARLY")
-                       (icalendar--dmsg "yearly")
-                       (setq diary-string
-                             (format
-                              "%%%%(and (diary-anniversary %s))"
-                              (icalendar--datetime-to-diary-date dtstart)))
-                       (setq event-ok t))
-                      ;; FIXME: war auskommentiert:
-                      ((and (string-equal frequency "DAILY")
-                            ;;(not (string= start-d end-d))
-                            ;;(not start-t)
-                            ;;(not end-t)
-                            )
-                       (let ((ds (icalendar--datetime-to-diary-date
-                                  (icalendar--decode-isodatetime
-                                   (icalendar--get-event-property
-                                    e 'DTSTART))))
-                             (de (icalendar--datetime-to-diary-date
-                                  (icalendar--decode-isodatetime
-                                   until -1))))
-                         (setq diary-string
-                               (format
-                                "%%%%(and (diary-block %s %s))"
-                                ds de)))
-                       (setq event-ok t))))
-              ;; Handle exceptions from recurrence rules
-              (let ((ex-dates (icalendar--get-event-properties e
-                                                               'EXDATE)))
-                (while ex-dates
-                  (let* ((ex-start (icalendar--decode-isodatetime
-                  (car ex-dates)))
-                         (ex-d (icalendar--datetime-to-diary-date
-                         ex-start)))
-                    (setq diary-string
-                          (icalendar--rris "^%%(\\(and \\)?"
-                                           (format
-                                           "%%%%(and (not (diary-date %s)) "
-                                           ex-d)
-                                           diary-string)))
-                  (setq ex-dates (cdr ex-dates))))
-              ;; FIXME: exception rules are not recognized
-              (if (icalendar--get-event-property e 'EXRULE)
-                  (setq diary-string
-                        (concat diary-string
-                                "\n Exception rules: "
-                                (icalendar--get-event-properties
-                                 e 'EXRULE)))))
+              (setq diary-string
+                    (icalendar--convert-recurring-to-diary e dtstart-dec start-t
+                                                           end-t))
+              (setq event-ok t))
              (rdate
               (icalendar--dmsg "rdate event")
               (setq diary-string "")
@@ -1423,35 +1493,22 @@ written into the buffer ` *icalendar-errors*'."
              ;; non-recurring event
              ;; all-day event
              ((not (string= start-d end-d))
-              (icalendar--dmsg "non-recurring event")
-              (let ((ds (icalendar--datetime-to-diary-date dtstart))
-                    (de (icalendar--datetime-to-diary-date dtend)))
-                (setq diary-string
-                      (format "%%%%(and (diary-block %s %s))"
-                              ds de)))
+              (setq diary-string
+                    (icalendar--convert-non-recurring-all-day-to-diary
+                     e start-d end-1-d))
               (setq event-ok t))
              ;; not all-day
              ((and start-t (or (not end-t)
                                (not (string= start-t end-t))))
-              (icalendar--dmsg "not all day event")
-              (cond (end-t
-                     (setq diary-string
-                           (format "%s %s-%s"
-                                   (icalendar--datetime-to-diary-date
-                                    dtstart "/")
-                                   start-t end-t)))
-                    (t
-                     (setq diary-string
-                           (format "%s %s"
-                                   (icalendar--datetime-to-diary-date
-                                    dtstart "/")
-                                   start-t))))
+              (setq diary-string
+                    (icalendar--convert-non-recurring-not-all-day-to-diary
+                     e dtstart-dec dtend-dec start-t end-t))
               (setq event-ok t))
              ;; all-day event
              (t
               (icalendar--dmsg "all day event")
               (setq diary-string (icalendar--datetime-to-diary-date
-                                  dtstart "/"))
+                                  dtstart-dec "/"))
               (setq event-ok t)))
             ;; add all other elements unless the user doesn't want to have
             ;; them
@@ -1478,12 +1535,237 @@ written into the buffer ` *icalendar-errors*'."
          (message error-string))))
     (if found-error
         (save-current-buffer
-          (set-buffer (get-buffer-create " *icalendar-errors*"))
+          (set-buffer (get-buffer-create "*icalendar-errors*"))
           (erase-buffer)
           (insert error-string)))
     (message "Converting icalendar...done")
     found-error))
 
+;; subroutines for importing
+(defun icalendar--convert-recurring-to-diary (e dtstart-dec start-t end-t)
+  "Convert recurring icalendar event E to diary format.
+
+DTSTART-DEC is the DTSTART property of E.
+START-T is the event's start time in diary format.
+END-T is the event's end time in diary format."
+  (icalendar--dmsg "recurring event")
+  (let* ((rrule        (icalendar--get-event-property e 'RRULE))
+         (rrule-props  (icalendar--split-value rrule))
+         (frequency    (cadr (assoc 'FREQ rrule-props)))
+         (until        (cadr (assoc 'UNTIL rrule-props)))
+         (count        (cadr (assoc 'COUNT rrule-props)))
+         (interval     (read (or (cadr (assoc 'INTERVAL rrule-props)) "1")))
+         (dtstart-conv (icalendar--datetime-to-diary-date dtstart-dec))
+         (until-conv   (icalendar--datetime-to-diary-date
+                        (icalendar--decode-isodatetime until)))
+         (until-1-conv (icalendar--datetime-to-diary-date
+                        (icalendar--decode-isodatetime until -1)))
+         (result  ""))
+
+    ;; FIXME FIXME interval!!!!!!!!!!!!!
+
+    (when count
+      (if until
+          (message "Must not have UNTIL and COUNT -- ignoring COUNT element!")
+        (let ((until-1 0))
+          (cond ((string-equal frequency "DAILY")
+                 (setq until (icalendar--add-decoded-times
+                              dtstart-dec 
+                              (list 0 0 0 (* (read count) interval) 0 0)))
+                 (setq until-1 (icalendar--add-decoded-times
+                                dtstart-dec
+                                (list 0 0 0 (* (- (read count) 1) interval)
+                                      0 0)))
+                 )
+                ((string-equal frequency "WEEKLY")
+                 (setq until (icalendar--add-decoded-times
+                              dtstart-dec
+                              (list 0 0 0 (* (read count) 7 interval) 0 0)))
+                 (setq until-1 (icalendar--add-decoded-times
+                                dtstart-dec
+                                (list 0 0 0 (* (- (read count) 1) 7
+                                               interval) 0 0)))
+                 )
+                ((string-equal frequency "MONTHLY")
+                 (setq until (icalendar--add-decoded-times
+                              dtstart-dec (list 0 0 0 0 (* (- (read count) 1)
+                                                           interval) 0)))
+                 (setq until-1 (icalendar--add-decoded-times
+                                dtstart-dec (list 0 0 0 0 (* (- (read count) 1)
+                                                             interval) 0)))
+                 )
+                ((string-equal frequency "YEARLY")
+                 (setq until (icalendar--add-decoded-times
+                              dtstart-dec (list 0 0 0 0 0 (* (- (read count) 1)
+                                                             interval))))
+                 (setq until-1 (icalendar--add-decoded-times
+                                dtstart-dec
+                                (list 0 0 0 0 0 (* (- (read count) 1)
+                                                   interval))))
+                 )
+                (t
+                 (message "Cannot handle COUNT attribute for `%s' events."
+                          frequency)))
+          (setq until-conv (icalendar--datetime-to-diary-date until))
+          (setq until-1-conv (icalendar--datetime-to-diary-date until-1))
+          ))
+      )
+    (cond ((string-equal frequency "WEEKLY")
+           (if (not start-t)
+               (progn
+                 ;; weekly and all-day
+                 (icalendar--dmsg "weekly all-day")
+                 (if until
+                     (setq result
+                           (format
+                            (concat "%%%%(and "
+                                    "(diary-cyclic %d %s) "
+                                    "(diary-block %s %s))")
+                            (* interval 7)
+                            dtstart-conv
+                            dtstart-conv
+                            (if count until-1-conv until-conv)
+                            ))
+                   (setq result
+                         (format "%%%%(and (diary-cyclic %d %s))"
+                                 (* interval 7)
+                                 dtstart-conv))))
+             ;; weekly and not all-day
+             (let* ((byday (cadr (assoc 'BYDAY rrule-props)))
+                    (weekday
+                     (icalendar--get-weekday-number byday)))
+               (icalendar--dmsg "weekly not-all-day")
+               (if until
+                   (setq result
+                         (format
+                          (concat "%%%%(and "
+                                  "(diary-cyclic %d %s) "
+                                  "(diary-block %s %s)) "
+                                  "%s%s%s")
+                          (* interval 7)
+                          dtstart-conv
+                          dtstart-conv
+                          until-conv
+                          (or start-t "")
+                          (if end-t "-" "") (or end-t "")))
+                 ;; no limit
+                 ;; FIXME!!!!
+                 ;; DTSTART;VALUE=DATE-TIME:20030919T090000
+                 ;; DTEND;VALUE=DATE-TIME:20030919T113000
+                 (setq result
+                       (format
+                        "%%%%(and (diary-cyclic %s %s)) %s%s%s"
+                        (* interval 7)
+                        dtstart-conv
+                        (or start-t "")
+                        (if end-t "-" "") (or end-t "")))))))
+          ;; yearly
+          ((string-equal frequency "YEARLY")
+           (icalendar--dmsg "yearly")
+           (if until
+               (setq result (format
+                             (concat "%%%%(and (diary-date %s %s t) "
+                                     "(diary-block %s %s)) %s%s%s")
+                             (if european-calendar-style (nth 3 dtstart-dec)
+                               (nth 4 dtstart-dec))
+                             (if european-calendar-style (nth 4 dtstart-dec)
+                               (nth 3 dtstart-dec))
+                             dtstart-conv
+                             until-conv
+                             (or start-t "")
+                             (if end-t "-" "") (or end-t "")))
+             (setq result (format
+                           "%%%%(and (diary-anniversary %s)) %s%s%s"
+                           dtstart-conv
+                           (or start-t "")
+                           (if end-t "-" "") (or end-t "")))))
+          ;; monthly
+          ((string-equal frequency "MONTHLY")
+           (icalendar--dmsg "monthly")
+           (setq result
+                 (format
+                  "%%%%(and (diary-date %s %s %s) (diary-block %s %s)) %s%s%s"
+                  (if european-calendar-style (nth 3 dtstart-dec) "t")
+                  (if european-calendar-style "t" (nth 3 dtstart-dec))
+                  "t"
+                  dtstart-conv
+                  (if until
+                      until-conv
+                    "1 1 9999") ;; FIXME: should be unlimited
+                  (or start-t "")
+                  (if end-t "-" "") (or end-t ""))))
+          ;; daily
+          ((and (string-equal frequency "DAILY"))
+           (if until
+               (setq result
+                     (format
+                      (concat "%%%%(and (diary-cyclic %s %s) "
+                              "(diary-block %s %s)) %s%s%s")
+                      interval dtstart-conv dtstart-conv
+                      (if count until-1-conv until-conv)
+                      (or start-t "")
+                      (if end-t "-" "") (or end-t "")))
+             (setq result
+                   (format
+                    "%%%%(and (diary-cyclic %s %s)) %s%s%s"
+                    interval
+                    dtstart-conv
+                    (or start-t "")
+                    (if end-t "-" "") (or end-t ""))))))
+    ;; Handle exceptions from recurrence rules
+    (let ((ex-dates (icalendar--get-event-properties e 'EXDATE)))
+      (while ex-dates
+        (let* ((ex-start (icalendar--decode-isodatetime
+                          (car ex-dates)))
+               (ex-d (icalendar--datetime-to-diary-date
+                      ex-start)))
+          (setq result
+                (icalendar--rris "^%%(\\(and \\)?"
+                                 (format
+                                  "%%%%(and (not (diary-date %s)) "
+                                  ex-d)
+                                 result)))
+        (setq ex-dates (cdr ex-dates))))
+    ;; FIXME: exception rules are not recognized
+    (if (icalendar--get-event-property e 'EXRULE)
+        (setq result
+              (concat result
+                      "\n Exception rules: "
+                      (icalendar--get-event-properties
+                       e 'EXRULE))))
+    result))
+
+(defun icalendar--convert-non-recurring-all-day-to-diary (event start-d end-d)
+  "Convert non-recurring icalendar EVENT to diary format.
+
+DTSTART is the decoded DTSTART property of E.
+Argument START-D gives the first day.
+Argument END-D gives the last day."
+  (icalendar--dmsg "non-recurring all-day event")
+  (format "%%%%(and (diary-block %s %s))" start-d end-d))
+
+(defun icalendar--convert-non-recurring-not-all-day-to-diary (event dtstart-dec
+                                                                    dtend-dec
+                                                                    start-t
+                                                                    end-t)
+  "Convert recurring icalendar EVENT to diary format.
+
+DTSTART-DEC is the decoded DTSTART property of E.
+DTEND-DEC is the decoded DTEND property of E.
+START-T is the event's start time in diary format.
+END-T is the event's end time in diary format."
+  (icalendar--dmsg "not all day event")
+  (cond (end-t
+         (format "%s %s-%s"
+                 (icalendar--datetime-to-diary-date
+                  dtstart-dec "/")
+                 start-t end-t))
+        (t
+         (format "%s %s"
+                 (icalendar--datetime-to-diary-date
+                  dtstart-dec "/")
+                 start-t))))
+
 (defun icalendar--add-diary-entry (string diary-file non-marking
                                           &optional subject)
   "Add STRING to the diary file DIARY-FILE.
diff --git a/lisp/comint.el b/lisp/comint.el
index 35309f7507a..fbb5810de16 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -159,7 +159,7 @@
 Defaults to \"^\", the null string at BOL.
 
 This variable is only used if the variable
-`comint-use-prompt-regexp-instead-of-fields' is non-nil.
+`comint-use-prompt-regexp' is non-nil.
 
 Good choices:
   Canonical Lisp: \"^[^> \\n]*>+:? *\" (Lucid, franz, kcl, T, cscheme, oaklisp)
@@ -353,7 +353,7 @@ text.  It returns the text to be submitted as process input.  The
 default is `comint-get-old-input-default', which either grabs the
 current input field or grabs the current line and strips off leading
 text matching `comint-prompt-regexp', depending on the value of
-`comint-use-prompt-regexp-instead-of-fields'.")
+`comint-use-prompt-regexp'.")
 
 (defvar comint-dynamic-complete-functions
   '(comint-replace-by-expanded-history comint-dynamic-complete-filename)
@@ -373,6 +373,7 @@ history list.  Default is to save anything that isn't all whitespace.")
   "Abnormal hook run before input is sent to the process.
 These functions get one argument, a string containing the text to send.")
 
+;;;###autoload
 (defvar comint-output-filter-functions '(comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt)
   "Functions to call after output is inserted into the buffer.
 One possible function is `comint-postoutput-scroll-to-bottom'.
@@ -406,8 +407,8 @@ See `comint-send-input'."
 ;; Note: If it is decided to purge comint-prompt-regexp from the source
 ;; entirely, searching for uses of this variable will help to identify
 ;; places that need attention.
-(defcustom comint-use-prompt-regexp-instead-of-fields nil
-  "*If non-nil, use `comint-prompt-regexp' to distinguish prompts from user-input.
+(defcustom comint-use-prompt-regexp nil
+  "*If non-nil, use `comint-prompt-regexp' to recognize prompts.
 If nil, then program output and user-input are given different `field'
 properties, which Emacs commands can use to distinguish them (in
 particular, common movement commands such as begining-of-line respect
@@ -415,6 +416,13 @@ field boundaries in a natural way)."
   :type 'boolean
   :group 'comint)
 
+;; Autoload is necessary for Custom to recognize old alias.
+;;;###autoload
+(defvaralias 'comint-use-prompt-regexp-instead-of-fields
+  'comint-use-prompt-regexp)
+(make-obsolete-variable 'comint-use-prompt-regexp-instead-of-fields
+                        'comint-use-prompt-regexp "22.1")
+
 (defcustom comint-mode-hook '(turn-on-font-lock)
   "Hook run upon entry to `comint-mode'.
 This is run before the process is cranked up."
@@ -1150,7 +1158,7 @@ See `comint-magic-space' and `comint-replace-by-expanded-history-before-point'.
 Returns t if successful."
   (interactive)
   (if (and comint-input-autoexpand
-           (if comint-use-prompt-regexp-instead-of-fields
+           (if comint-use-prompt-regexp
                ;; Use comint-prompt-regexp
                (save-excursion
                  (beginning-of-line)
@@ -1419,10 +1427,10 @@ in the buffer.  E.g.,
 
 If the interpreter is the csh,
     `comint-get-old-input' is the default:
-        If `comint-use-prompt-regexp-instead-of-fields' is nil, then
+        If `comint-use-prompt-regexp' is nil, then
         either return the current input field, if point is on an input
         field, or the current line, if point is on an output field.
-        If `comint-use-prompt-regexp-instead-of-fields' is non-nil, then
+        If `comint-use-prompt-regexp' is non-nil, then
         return the current line with any initial string matching the
         regexp `comint-prompt-regexp' removed.
     `comint-input-filter-functions' monitors input for \"cd\", \"pushd\", and
@@ -1487,14 +1495,14 @@ Similarly for Soar, Scheme, etc."
                  font-lock-face comint-highlight-input
                  mouse-face highlight
                  help-echo "mouse-2: insert after prompt as new input"))
-              (unless comint-use-prompt-regexp-instead-of-fields
+              (unless comint-use-prompt-regexp
                 ;; Give old user input a field property of `input', to
                 ;; distinguish it from both process output and unsent
                 ;; input.  The terminating newline is put into a special
                 ;; `boundary' field to make cursor movement between input
                 ;; and output fields smoother.
                 (put-text-property beg end 'field 'input)))
-            (unless (or no-newline comint-use-prompt-regexp-instead-of-fields)
+            (unless (or no-newline comint-use-prompt-regexp)
               ;; Cover the terminating newline
               (add-text-properties end (1+ end)
                                    '(rear-nonsticky t
@@ -1708,7 +1716,7 @@ Make backspaces delete the previous character."
 
             (goto-char (process-mark process)) ; in case a filter moved it
 
-            (unless comint-use-prompt-regexp-instead-of-fields
+            (unless comint-use-prompt-regexp
               (let ((inhibit-read-only t)
                     (inhibit-modification-hooks t))
                 (add-text-properties comint-last-output-start (point)
@@ -1844,10 +1852,10 @@ This function could be on `comint-output-filter-functions' or bound to a key."
 
 (defun comint-get-old-input-default ()
   "Default for `comint-get-old-input'.
-If `comint-use-prompt-regexp-instead-of-fields' is nil, then either
+If `comint-use-prompt-regexp' is nil, then either
 return the current input field, if point is on an input field, or the
 current line, if point is on an output field.
-If `comint-use-prompt-regexp-instead-of-fields' is non-nil, then return
+If `comint-use-prompt-regexp' is non-nil, then return
 the current line with any initial string matching the regexp
 `comint-prompt-regexp' removed."
   (let ((bof (field-beginning)))
@@ -1880,10 +1888,10 @@ set the hook `comint-input-sender'."
 
 (defun comint-line-beginning-position ()
   "Return the buffer position of the beginning of the line, after any prompt.
-If `comint-use-prompt-regexp-instead-of-fields' is non-nil, then the
-prompt skip is done by skipping text matching the regular expression
-`comint-prompt-regexp', a buffer local variable."
-  (if comint-use-prompt-regexp-instead-of-fields
+If `comint-use-prompt-regexp' is non-nil, then the prompt skip is done by
+skipping text matching the regular expression `comint-prompt-regexp',
+a buffer local variable."
+  (if comint-use-prompt-regexp
       ;; Use comint-prompt-regexp
       (save-excursion
         (beginning-of-line)
@@ -1901,9 +1909,9 @@ prompt skip is done by skipping text matching the regular expression
 (defun comint-bol (&optional arg)
   "Go to the beginning of line, then skip past the prompt, if any.
 If prefix argument is given (\\[universal-argument]) the prompt is not skipped.
-If `comint-use-prompt-regexp-instead-of-fields' is non-nil, then the
-prompt skip is done by skipping text matching the regular expression
-`comint-prompt-regexp', a buffer local variable."
+If `comint-use-prompt-regexp' is non-nil, then the prompt skip is done
+by skipping text matching the regular expression `comint-prompt-regexp',
+a buffer local variable."
   (interactive "P")
   (if arg
       ;; Unlike `beginning-of-line', forward-line ignores field boundaries
@@ -2034,7 +2042,7 @@ Sets mark to the value of point when this command is run."
   (interactive)
   (push-mark)
   (let ((pos (or (marker-position comint-last-input-end) (point-max))))
-    (cond (comint-use-prompt-regexp-instead-of-fields
+    (cond (comint-use-prompt-regexp
            (goto-char pos)
            (beginning-of-line 0)
            (set-window-start (selected-window) (point))
@@ -2127,13 +2135,13 @@ Sends an EOF only if point is at the end of the buffer and there is no input."
 
 (defun comint-backward-matching-input (regexp n)
   "Search backward through buffer for input fields that match REGEXP.
-If `comint-use-prompt-regexp-instead-of-fields' is non-nil, then input
-fields are identified by lines that match `comint-prompt-regexp'.
+If `comint-use-prompt-regexp' is non-nil, then input fields are identified
+by lines that match `comint-prompt-regexp'.
 
 With prefix argument N, search for Nth previous match.
 If N is negative, find the next or Nth next match."
   (interactive (comint-regexp-arg "Backward input matching (regexp): "))
-  (if comint-use-prompt-regexp-instead-of-fields
+  (if comint-use-prompt-regexp
       ;; Use comint-prompt-regexp
       (let* ((re (concat comint-prompt-regexp ".*" regexp))
              (pos (save-excursion (end-of-line (if (> n 0) 0 1))
@@ -2159,8 +2167,8 @@ If N is negative, find the next or Nth next match."
 
 (defun comint-forward-matching-input (regexp arg)
   "Search forward through buffer for input fields that match REGEXP.
-If `comint-use-prompt-regexp-instead-of-fields' is non-nil, then input
-fields are identified by lines that match `comint-prompt-regexp'.
+If `comint-use-prompt-regexp' is non-nil, then input fields are identified
+by lines that match `comint-prompt-regexp'.
 
 With prefix argument N, search for Nth following match.
 If N is negative, find the previous or Nth previous match."
@@ -2170,11 +2178,11 @@ If N is negative, find the previous or Nth previous match."
 
 (defun comint-next-prompt (n)
   "Move to end of Nth next prompt in the buffer.
-If `comint-use-prompt-regexp-instead-of-fields' is nil, then this means
-the beginning of the Nth next `input' field, otherwise, it means the Nth
-occurrence of text matching `comint-prompt-regexp'."
+If `comint-use-prompt-regexp' is nil, then this means the beginning of
+the Nth next `input' field, otherwise, it means the Nth occurrence of
+text matching `comint-prompt-regexp'."
   (interactive "p")
-  (if comint-use-prompt-regexp-instead-of-fields
+  (if comint-use-prompt-regexp
       ;; Use comint-prompt-regexp
       (let ((paragraph-start comint-prompt-regexp))
         (end-of-line (if (> n 0) 1 0))
@@ -2207,9 +2215,9 @@ occurrence of text matching `comint-prompt-regexp'."
 
 (defun comint-previous-prompt (n)
   "Move to end of Nth previous prompt in the buffer.
-If `comint-use-prompt-regexp-instead-of-fields' is nil, then this means
-the beginning of the Nth previous `input' field, otherwise, it means the Nth
-occurrence of text matching `comint-prompt-regexp'."
+If `comint-use-prompt-regexp' is nil, then this means the beginning of
+the Nth previous `input' field, otherwise, it means the Nth occurrence of
+text matching `comint-prompt-regexp'."
   (interactive "p")
   (comint-next-prompt (- n)))
 
@@ -3022,7 +3030,7 @@ the process mark is at the beginning of the accumulated input."
 ;; appropriate magic default by examining what we think is the prompt)?
 ;;
 ;; Fixme: look for appropriate fields, rather than regexp, if
-;; `comint-use-prompt-regexp-instead-of-fields' is true.
+;; `comint-use-prompt-regexp' is true.
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Variables
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 60fc862676d..5c92f247a05 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -114,6 +114,18 @@ was first made obsolete, for example a date or a release number."
     (put function 'byte-obsolete-info (list new handler when)))
   function)
 
+(defmacro define-obsolete-function-alias (function new
+                                                   &optional when docstring)
+  "Set FUNCTION's function definition to NEW and warn that FUNCTION is obsolete.
+If provided, WHEN should be a string indicating when FUNCTION was
+first made obsolete, for example a date or a release number.  The
+optional argument DOCSTRING specifies the documentation string
+for FUNCTION; if DOCSTRING is omitted or nil, FUNCTION uses the
+documentation string of NEW unluess it already has one."
+  `(progn
+     (defalias ,function ,new ,docstring)
+     (make-obsolete ,function ,new ,when)))
+
 (defun make-obsolete-variable (variable new &optional when)
   "Make the byte-compiler warn that VARIABLE is obsolete.
 The warning will say that NEW should be used instead.
@@ -129,6 +141,18 @@ was first made obsolete, for example a date or a release number."
   (put variable 'byte-obsolete-variable (cons new when))
   variable)
 
+(defmacro define-obsolete-variable-alias (variable new
+                                                 &optional when docstring)
+  "Make VARIABLE a variable alias for NEW and warn that VARIABLE is obsolete.
+If provided, WHEN should be a string indicating when VARIABLE was
+first made obsolete, for example a date or a release number.  The
+optional argument DOCSTRING specifies the documentation string
+for VARIABLE; if DOCSTRING is omitted or nil, VARIABLE uses the
+documentation string of NEW unless it already has one."
+  `(progn
+     (defvaralias ,variable ,new ,docstring)
+      (make-obsolete-variable ,variable ,new ,when)))
+
 (defmacro dont-compile (&rest body)
   "Like `progn', but the body always runs interpreted (not compiled).
 If you think you need this, you're probably making a mistake somewhere."
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 950193463f7..a752f9f9b61 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2900,9 +2900,6 @@ That command is designed for interactive use only" fn))
 (put 'byte-concatN 'byte-opcode-invert 'concat)
 (put 'byte-insertN 'byte-opcode-invert 'insert)
 
-(byte-defop-compiler (dot byte-point)           0)
-(byte-defop-compiler (dot-max byte-point-max)   0)
-(byte-defop-compiler (dot-min byte-point-min)   0)
 (byte-defop-compiler point              0)
 ;;(byte-defop-compiler mark             0) ;; obsolete
 (byte-defop-compiler point-max          0)
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 01935c9d5e8..831ffb2d576 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -95,8 +95,8 @@ BODY contains code that will be executed each time the mode is (dis)activated.
   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\".
-                (This default may not be a valid customization group defined
-                with `defgroup'.  Make sure it is.)
+                Don't use this default group name unless you have written a
+                `defgroup' to define that group properly.
 :global GLOBAL  If non-nil specifies that the minor mode is not meant to be
                 buffer-local, so don't make the variable MODE buffer-local.
                 By default, the mode is buffer-local.
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index b0f3b9b9d3e..78ba1fe27bf 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -160,18 +160,18 @@ A menu item can be a list with the same format as MENU.  This is a submenu."
   (let ((keymap (easy-menu-create-menu (car menu) (cdr menu))))
     (when symbol
       (set symbol keymap)
-      (fset symbol
-            `(lambda (event) ,doc (interactive "@e")
-               ;; FIXME: XEmacs uses popup-menu which calls the binding
-               ;; while x-popup-menu only returns the selection.
-               (x-popup-menu event
-                             (or (and (symbolp ,symbol)
-                                      (funcall
-                                       (or (plist-get (get ,symbol 'menu-prop)
-                                                      :filter)
-                                           'identity)
-                                       (symbol-function ,symbol)))
-                                 ,symbol)))))
+      (defalias symbol
+        `(lambda (event) ,doc (interactive "@e")
+           ;; FIXME: XEmacs uses popup-menu which calls the binding
+           ;; while x-popup-menu only returns the selection.
+           (x-popup-menu event
+                         (or (and (symbolp ,symbol)
+                                  (funcall
+                                   (or (plist-get (get ,symbol 'menu-prop)
+                                                  :filter)
+                                       'identity)
+                                   (symbol-function ,symbol)))
+                             ,symbol)))))
     (mapcar (lambda (map)
               (define-key map (vector 'menu-bar (easy-menu-intern (car menu)))
                 (cons 'menu-item
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index f31dafb7b11..b23217151e3 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -45,7 +45,7 @@
 
 ;; Major modes for other languages may use Eldoc by defining an
 ;; appropriate function as the buffer-local value of
-;; `eldoc-print-current-symbol-info-function'.
+;; `eldoc-documentation-function'.
 
 ;;; Code:
 
@@ -139,16 +139,11 @@ truncated to make more of the arglist or documentation string visible."
 ;;;###autoload
 (define-minor-mode eldoc-mode
   "Toggle ElDoc mode on or off.
-Show the defined parameters for the elisp function near point.
-
-For the emacs lisp function at the beginning of the sexp which point is
-within, show the defined parameters for the function in the echo area.
-This information is extracted directly from the function or macro if it is
-in pure lisp.  If the emacs function is a subr, the parameters are obtained
-from the documentation string if possible.
-
-If point is over a documented variable, print that variable's docstring
-instead.
+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.
 
 With prefix ARG, turn ElDoc mode on if and only if ARG is positive."
   :group 'eldoc :lighter eldoc-minor-mode-string
@@ -167,7 +162,6 @@ With prefix ARG, turn ElDoc mode on if and only if ARG is positive."
   (eldoc-mode 1))
 
 
-;; Idle timers are part of Emacs 19.31 and later.
 (defun eldoc-schedule-timer ()
   (or (and eldoc-timer
            (memq eldoc-timer timer-idle-list))
@@ -235,7 +229,7 @@ With prefix ARG, turn ElDoc mode on if and only if ARG is positive."
        (not (eq (selected-window) (minibuffer-window)))))
 
 
-(defvar eldoc-print-current-symbol-info-function nil
+(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
 doc about a function etc. appropriate to the context around point.
@@ -249,8 +243,8 @@ Emacs Lisp mode) that support Eldoc.")
 (defun eldoc-print-current-symbol-info ()
   (condition-case err
       (and (eldoc-display-message-p)
-           (if eldoc-print-current-symbol-info-function
-               (eldoc-message (funcall eldoc-print-current-symbol-info-function))
+           (if eldoc-documentation-function
+               (eldoc-message (funcall eldoc-documentation-function))
              (let* ((current-symbol (eldoc-current-symbol))
                     (current-fnsym  (eldoc-fnsym-in-current-sexp))
                     (doc (cond
diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el
index 6851faeddd6..410b1d8eaa5 100644
--- a/lisp/emacs-lisp/generic.el
+++ b/lisp/emacs-lisp/generic.el
@@ -35,15 +35,15 @@
 ;;
 ;; Each generic mode can define the following:
 ;;
-;; * List of comment-characters.  The entries in this list should be
-;;   either a character, a one or two character string or a cons pair.
-;;   If the entry is a character or a string, it is added to the
-;;   mode's syntax table with `comment-start' syntax.  If the entry is
-;;   a cons pair, the elements of the pair are considered to be
-;;   `comment-start' and `comment-end' respectively.  (The latter
-;;   should be nil if you want comments to end at end of line.)
-;;   LIMITATIONS: Emacs does not support comment strings of more than
-;;   two characters in length.
+;; * List of comment-characters.  The elements of this list should be
+;;   either a character, a one or two character string, or a cons
+;;   cell.  If the entry is a character or a string, it is added to
+;;   the mode's syntax table with "comment starter" syntax.  If the
+;;   entry is a cons cell, the `car' and `cdr' of the pair are
+;;   considered the "comment starter" and "comment ender"
+;;   respectively.  (The latter should be nil if you want comments to
+;;   end at the end of the line.)  Emacs does not support comment
+;;   strings of more than two characters in length.
 ;;
 ;; * List of keywords to font-lock.  Each keyword should be a string.
 ;;   If you have additional keywords which should be highlighted in a
@@ -121,40 +121,42 @@ instead (which see).")
                                     &rest custom-keyword-args)
   "Create a new generic mode MODE.
 
-MODE is the name of the command for the generic mode; it need not
-be quoted.  The optional DOCSTRING is the documentation for the
-mode command.  If you do not supply it, a default documentation
-string will be used 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, whose entries are either a single
-character, a one or two character string or a cons pair.  If the
-entry is a character or a string, it is added to the mode's
-syntax table with `comment-start' syntax.  If the entry is a cons
-pair, the elements of the pair are considered to be
-`comment-start' and `comment-end' respectively.  (The latter
-should be nil if you want comments to end at end of line.)  Note
-that Emacs has limitations regarding comment characters.
+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 entry in the list should have the same form as an entry in
-`font-lock-keywords'.
+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 regexps are added to `auto-mode-alist'
-as soon as `define-generic-mode' is called.
+`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.
+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.  They will be passed to the generated `defcustom' form of
-the mode hook variable MODE-hook.  Defaults to MODE without the
-possible trailing \"-mode\".  (This default may not be a valid
-customization group defined with `defgroup'.  Make sure it is.)
-You can specify keyword arguments without specifying a docstring.
+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.
 
 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
@@ -178,7 +180,7 @@ See the file generic-x.el for some examples of `define-generic-mode'."
 
     (unless (plist-get custom-keyword-args :group)
       (setq custom-keyword-args
-            (plist-put custom-keyword-args 
+            (plist-put custom-keyword-args
                        :group `',(intern (replace-regexp-in-string
                                           "-mode\\'" "" name)))))
 
@@ -226,7 +228,7 @@ See the file generic-x.el for some examples of `define-generic-mode'."
     (when keyword-list
       (push (concat "\\_<" (regexp-opt keyword-list t) "\\_>")
             generic-font-lock-keywords))
-    (setq font-lock-defaults '(generic-font-lock-keywords nil))
+    (setq font-lock-defaults '(generic-font-lock-keywords))
 
     ;; Call a list of functions
     (mapcar 'funcall function-list)
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 6aeb4bab5a2..2a515bc95f7 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1397,10 +1397,11 @@ paste (in addition to the normal emacs bindings)."
 ;;;###autoload  '(error (concat "\n\n"
 ;;;###autoload  "CUA-mode is now part of the standard GNU Emacs distribution,\n"
 ;;;###autoload  "so you may now enable and customize CUA via the Options menu.\n\n"
-;;;###autoload  "Your " (file-name-nondirectory user-init-file) " loads an older version of CUA-mode which does\n"
-;;;###autoload  "not work correctly with this version of GNU Emacs.\n"
+;;;###autoload  "You have loaded an older version of CUA-mode which does\n"
+;;;###autoload  "not work correctly with this version of GNU Emacs.\n\n"
+;;;###autoload  (if user-init-file (concat
 ;;;###autoload  "To correct this, remove the loading and customization of the\n"
-;;;###autoload  "old version from the " user-init-file " file.\n\n")))
+;;;###autoload  "old version from the " user-init-file " file.\n\n")))))
 
 (provide 'cua)
 
diff --git a/lisp/files.el b/lisp/files.el
index 407922082f1..ea4799968fe 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -286,30 +286,30 @@ from `mode-require-final-newline'."
   :type '(choice (const :tag "When visiting" visit)
                  (const :tag "When saving" t)
                  (const :tag "When visiting or saving" visit-save)
-                 (const :tag "Never" nil)
-                 (other :tag "Ask" ask))
+                 (const :tag "Don't add newlines" nil)
+                 (other :tag "Ask each time" ask))
   :group 'editing-basics)
 
 (defcustom mode-require-final-newline t
   "*Whether to add a newline at end of file, in certain major modes.
 Those modes set `require-final-newline' to this value when you enable them.
-They do so because they are used for files that are supposed
+They do so because they are often used for files that are supposed
 to end in newlines, and the question is how to arrange that.
 
 A value of t means do this only when the file is about to be saved.
 A value of `visit' means do this right after the file is visited.
 A value of `visit-save' means do it at both of those times.
 Any other non-nil value means ask user whether to add a newline, when saving.
-nil means don't add newlines.
 
-You will have to be careful if you set this to nil: you will have
-to remember to manually add a final newline whenever you finish a
-file that really needs one."
+nil means do not add newlines.  That is a risky choice in this variable
+since this value is used for modes for files that ought to have final newlines.
+So if you set this to nil, you must explicitly check and add
+a final newline, whenever you save a file that really needs one."
   :type '(choice (const :tag "When visiting" visit)
                  (const :tag "When saving" t)
                  (const :tag "When visiting or saving" visit-save)
-                 (const :tag "Never" nil)
-                 (other :tag "Ask" ask))
+                 (const :tag "Don't add newlines" nil)
+                 (other :tag "Ask each time" ask))
   :group 'editing-basics
   :version "22.1")
 
@@ -529,8 +529,8 @@ See Info node `(elisp)Standard File Names' for more details."
 Value is not expanded---you must call `expand-file-name' yourself.
 Default name to DEFAULT-DIRNAME if user exits with the same
 non-empty string that was inserted by this function.
- (If DEFAULT-DIRNAME is omitted, the current buffer's directory is used,
-  except that if INITIAL is specified, that combined with DIR is used.)
+ (If DEFAULT-DIRNAME is omitted, DIR combined with INITIAL is used,
+  or just DIR if INITIAL is nil.)
 If the user exits with an empty minibuffer, this function returns
 an empty string.  (This can only happen if the user erased the
 pre-inserted contents or if `insert-default-directory' is nil.)
@@ -544,7 +544,10 @@ the value of `default-directory'."
   (unless default-dirname
     (setq default-dirname
           (if initial (concat dir initial) default-directory)))
-  (read-file-name prompt dir default-dirname mustmatch initial
+  (read-file-name prompt dir (or default-dirname 
+                                 (if initial (expand-file-name initial dir)
+                                   dir))
+                  mustmatch initial
                   'file-directory-p))
 
 
@@ -940,12 +943,13 @@ BODY should use the minibuffer at most once.
 Recursive uses of the minibuffer will not be affected."
   (declare (indent 1) (debug t))
   (let ((hook (make-symbol "setup-hook")))
-    `(let ((,hook
-            (lambda ()
-              ;; Clear out this hook so it does not interfere
-              ;; with any recursive minibuffer usage.
-              (remove-hook 'minibuffer-setup-hook ,hook)
-              (,fun))))
+    `(let (,hook)
+       (setq ,hook
+             (lambda ()
+               ;; Clear out this hook so it does not interfere
+               ;; with any recursive minibuffer usage.
+               (remove-hook 'minibuffer-setup-hook ,hook)
+               (,fun)))
        (unwind-protect
            (progn
              (add-hook 'minibuffer-setup-hook ,hook)
@@ -1973,8 +1977,13 @@ with that interpreter in `interpreter-mode-alist'.")
     ("%![^V]" . ps-mode)
     ("# xmcd " . conf-unix-mode))
   "Alist of buffer beginnings vs. corresponding major mode functions.
-Each element looks like (REGEXP . FUNCTION).  FUNCTION will be
-called, unless it is nil (to allow `auto-mode-alist' to override).")
+Each element looks like (REGEXP . FUNCTION).  After visiting a file,
+if REGEXP matches the text at the beginning of the buffer,
+`normal-mode' will call FUNCTION rather than allowing `auto-mode-alist'
+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.")
 
 (defun set-auto-mode (&optional keep-mode-if-same)
   "Select major mode appropriate for current buffer.
@@ -2740,15 +2749,26 @@ BACKUPNAME is the backup file name, which is the old file renamed."
             (file-error nil))))))
 
 (defun backup-buffer-copy (from-name to-name modes)
-  (condition-case ()
-      (copy-file from-name to-name t t)
-    (file-error
-     ;; If copying fails because file TO-NAME
-     ;; is not writable, delete that file and try again.
-     (if (and (file-exists-p to-name)
-              (not (file-writable-p to-name)))
-         (delete-file to-name))
-     (copy-file from-name to-name t t)))
+  (let ((umask (default-file-modes)))
+    (unwind-protect
+        (progn
+          ;; Create temp files with strict access rights.  It's easy to
+          ;; loosen them later, whereas it's impossible to close the
+          ;; time-window of loose permissions otherwise.
+          (set-default-file-modes ?\700)
+          (while (condition-case ()
+                     (progn
+                       (condition-case nil
+                           (delete-file to-name)
+                         (file-error nil))
+                       (copy-file from-name to-name t t 'excl)
+                       nil)
+                   (file-already-exists t))
+            ;; The file was somehow created by someone else between
+            ;; `delete-file' and `copy-file', so let's try again.
+            nil))
+      ;; Reset the umask.
+      (set-default-file-modes umask)))
   (and modes
        (set-file-modes to-name (logand modes #o1777))))
 
@@ -3331,39 +3351,41 @@ Before and after saving the buffer, this function runs
           ;; This requires write access to the containing dir,
           ;; which is why we don't try it if we don't have that access.
           (let ((realname buffer-file-name)
-                tempname nogood i succeed
+                tempname succeed
+                (umask (default-file-modes))
                 (old-modtime (visited-file-modtime)))
-            (setq i 0)
-            (setq nogood t)
-            ;; Find the temporary name to write under.
-            (while nogood
-              (setq tempname (format
-                              (if (and (eq system-type 'ms-dos)
-                                       (not (msdos-long-file-names)))
-                                  "%s#%d.tm#" ; MSDOS limits files to 8+3
-                                (if (memq system-type '(vax-vms axp-vms))
-                                    "%s$tmp$%d"
-                                  "%s#tmp#%d"))
-                              dir i))
-              (setq nogood (file-exists-p tempname))
-              (setq i (1+ i)))
+            ;; Create temp files with strict access rights.  It's easy to
+            ;; loosen them later, whereas it's impossible to close the
+            ;; time-window of loose permissions otherwise.
             (unwind-protect
-                (progn (clear-visited-file-modtime)
-                       (write-region (point-min) (point-max)
-                                     tempname nil realname
-                                     buffer-file-truename)
-                       (setq succeed t))
-              ;; If writing the temp file fails,
-              ;; delete the temp file.
-              (or succeed
-                  (progn
-                    (condition-case nil
-                        (delete-file tempname)
-                      (file-error nil))
-                    (set-visited-file-modtime old-modtime))))
-            ;; Since we have created an entirely new file
-            ;; and renamed it, make sure it gets the
-            ;; right permission bits set.
+                (progn
+                  (clear-visited-file-modtime)
+                  (set-default-file-modes ?\700)
+                  ;; Try various temporary names.
+                  ;; This code follows the example of make-temp-file,
+                  ;; but it calls write-region in the appropriate way
+                  ;; for saving the buffer.
+                  (while (condition-case ()
+                             (progn
+                               (setq tempname
+                                     (make-temp-name
+                                      (expand-file-name "tmp" dir)))
+                               (write-region (point-min) (point-max)
+                                             tempname nil  realname
+                                             buffer-file-truename 'excl)
+                               nil)
+                           (file-already-exists t))
+                    ;; The file was somehow created by someone else between
+                    ;; `make-temp-name' and `write-region', let's try again.
+                    nil)
+                  (setq succeed t))
+              ;; Reset the umask.
+              (set-default-file-modes umask)
+              ;; If we failed, restore the buffer's modtime.
+              (unless succeed
+                (set-visited-file-modtime old-modtime)))
+            ;; Since we have created an entirely new file,
+            ;; make sure it gets the right permission bits set.
             (setq setmodes (or setmodes (cons (file-modes buffer-file-name)
                                               buffer-file-name)))
             ;; We succeeded in writing the temp file,
@@ -3649,7 +3671,7 @@ The function you specify is responsible for updating (or preserving) point.")
 (defvar buffer-stale-function nil
   "Function to check whether a non-file buffer needs reverting.
 This should be a function with one optional argument NOCONFIRM.
-Auto Revert Mode sets NOCONFIRM to t.  The function should return
+Auto Revert Mode passes t for NOCONFIRM.  The function should return
 non-nil if the buffer should be reverted.  A return value of
 `fast' means that the need for reverting was not checked, but
 that reverting the buffer is fast.  The buffer is current when
@@ -3718,91 +3740,93 @@ non-nil, it is called instead of rereading visited file contents."
   (interactive (list (not current-prefix-arg)))
   (if revert-buffer-function
       (funcall revert-buffer-function ignore-auto noconfirm)
-    (let* ((auto-save-p (and (not ignore-auto)
-                             (recent-auto-save-p)
-                             buffer-auto-save-file-name
-                             (file-readable-p buffer-auto-save-file-name)
-                             (y-or-n-p
-   "Buffer has been auto-saved recently.  Revert from auto-save file? ")))
-           (file-name (if auto-save-p
-                          buffer-auto-save-file-name
-                        buffer-file-name)))
-      (cond ((null file-name)
-             (error "Buffer does not seem to be associated with any file"))
-            ((or noconfirm
-                 (and (not (buffer-modified-p))
-                      (let ((tail revert-without-query)
-                            (found nil))
-                        (while tail
-                          (if (string-match (car tail) file-name)
-                              (setq found t))
-                          (setq tail (cdr tail)))
-                        found))
-                 (yes-or-no-p (format "Revert buffer from file %s? "
-                                      file-name)))
-             (run-hooks 'before-revert-hook)
-             ;; If file was backed up but has changed since,
-             ;; we shd make another backup.
-             (and (not auto-save-p)
-                  (not (verify-visited-file-modtime (current-buffer)))
-                  (setq buffer-backed-up nil))
-             ;; Get rid of all undo records for this buffer.
-             (or (eq buffer-undo-list t)
-                 (setq buffer-undo-list nil))
-             ;; Effectively copy the after-revert-hook status,
-             ;; since after-find-file will clobber it.
-             (let ((global-hook (default-value 'after-revert-hook))
-                   (local-hook-p (local-variable-p 'after-revert-hook))
-                   (local-hook (and (local-variable-p 'after-revert-hook)
-                                    after-revert-hook)))
-               (let (buffer-read-only
-                     ;; Don't make undo records for the reversion.
-                     (buffer-undo-list t))
-                 (if revert-buffer-insert-file-contents-function
-                     (funcall revert-buffer-insert-file-contents-function
-                              file-name auto-save-p)
-                   (if (not (file-exists-p file-name))
-                       (error (if buffer-file-number
-                                  "File %s no longer exists!"
-                                "Cannot revert nonexistent file %s")
-                              file-name))
-                   ;; Bind buffer-file-name to nil
-                   ;; so that we don't try to lock the file.
-                   (let ((buffer-file-name nil))
-                     (or auto-save-p
-                         (unlock-buffer)))
-                   (widen)
-                   (let ((coding-system-for-read
-                          ;; Auto-saved file shoule be read by Emacs'
-                          ;; internal coding.
-                          (if auto-save-p 'auto-save-coding
-                            (or coding-system-for-read
-                                buffer-file-coding-system-explicit))))
-                     ;; This force after-insert-file-set-coding
-                     ;; (called from insert-file-contents) to set
-                     ;; buffer-file-coding-system to a proper value.
-                     (kill-local-variable 'buffer-file-coding-system)
-
-                     ;; Note that this preserves point in an intelligent way.
-                     (if preserve-modes
-                         (let ((buffer-file-format buffer-file-format))
-                           (insert-file-contents file-name (not auto-save-p)
-                                                 nil nil t))
-                       (insert-file-contents file-name (not auto-save-p)
-                                             nil nil t)))))
-               ;; Recompute the truename in case changes in symlinks
-               ;; have changed the truename.
-               (setq buffer-file-truename
-                     (abbreviate-file-name (file-truename buffer-file-name)))
-               (after-find-file nil nil t t preserve-modes)
-               ;; Run after-revert-hook as it was before we reverted.
-               (setq-default revert-buffer-internal-hook global-hook)
-               (if local-hook-p
-                   (set (make-local-variable 'revert-buffer-internal-hook)
-                        local-hook)
-                 (kill-local-variable 'revert-buffer-internal-hook))
-               (run-hooks 'revert-buffer-internal-hook))
-             t)))))
+    (with-current-buffer (or (buffer-base-buffer (current-buffer))
+                             (current-buffer))
+      (let* ((auto-save-p (and (not ignore-auto)
+                               (recent-auto-save-p)
+                               buffer-auto-save-file-name
+                               (file-readable-p buffer-auto-save-file-name)
+                               (y-or-n-p
+     "Buffer has been auto-saved recently.  Revert from auto-save file? ")))
+             (file-name (if auto-save-p
+                            buffer-auto-save-file-name
+                          buffer-file-name)))
+        (cond ((null file-name)
+               (error "Buffer does not seem to be associated with any file"))
+              ((or noconfirm
+                   (and (not (buffer-modified-p))
+                        (let ((tail revert-without-query)
+                              (found nil))
+                          (while tail
+                            (if (string-match (car tail) file-name)
+                                (setq found t))
+                            (setq tail (cdr tail)))
+                          found))
+                   (yes-or-no-p (format "Revert buffer from file %s? "
+                                        file-name)))
+               (run-hooks 'before-revert-hook)
+               ;; If file was backed up but has changed since,
+               ;; we shd make another backup.
+               (and (not auto-save-p)
+                    (not (verify-visited-file-modtime (current-buffer)))
+                    (setq buffer-backed-up nil))
+               ;; Get rid of all undo records for this buffer.
+               (or (eq buffer-undo-list t)
+                   (setq buffer-undo-list nil))
+               ;; Effectively copy the after-revert-hook status,
+               ;; since after-find-file will clobber it.
+               (let ((global-hook (default-value 'after-revert-hook))
+                     (local-hook-p (local-variable-p 'after-revert-hook))
+                     (local-hook (and (local-variable-p 'after-revert-hook)
+                                      after-revert-hook)))
+                 (let (buffer-read-only
+                       ;; Don't make undo records for the reversion.
+                       (buffer-undo-list t))
+                   (if revert-buffer-insert-file-contents-function
+                       (funcall revert-buffer-insert-file-contents-function
+                                file-name auto-save-p)
+                     (if (not (file-exists-p file-name))
+                         (error (if buffer-file-number
+                                    "File %s no longer exists!"
+                                  "Cannot revert nonexistent file %s")
+                                file-name))
+                     ;; Bind buffer-file-name to nil
+                     ;; so that we don't try to lock the file.
+                     (let ((buffer-file-name nil))
+                       (or auto-save-p
+                           (unlock-buffer)))
+                     (widen)
+                     (let ((coding-system-for-read
+                            ;; Auto-saved file shoule be read by Emacs'
+                            ;; internal coding.
+                            (if auto-save-p 'auto-save-coding
+                              (or coding-system-for-read
+                                  buffer-file-coding-system-explicit))))
+                       ;; This force after-insert-file-set-coding
+                       ;; (called from insert-file-contents) to set
+                       ;; buffer-file-coding-system to a proper value.
+                       (kill-local-variable 'buffer-file-coding-system)
+
+                       ;; Note that this preserves point in an intelligent way.
+                       (if preserve-modes
+                           (let ((buffer-file-format buffer-file-format))
+                             (insert-file-contents file-name (not auto-save-p)
+                                                   nil nil t))
+                         (insert-file-contents file-name (not auto-save-p)
+                                               nil nil t)))))
+                 ;; Recompute the truename in case changes in symlinks
+                 ;; have changed the truename.
+                 (setq buffer-file-truename
+                       (abbreviate-file-name (file-truename buffer-file-name)))
+                 (after-find-file nil nil t t preserve-modes)
+                 ;; Run after-revert-hook as it was before we reverted.
+                 (setq-default revert-buffer-internal-hook global-hook)
+                 (if local-hook-p
+                     (set (make-local-variable 'revert-buffer-internal-hook)
+                          local-hook)
+                   (kill-local-variable 'revert-buffer-internal-hook))
+                 (run-hooks 'revert-buffer-internal-hook))
+               t))))))
 
 (defun recover-this-file ()
   "Recover the visited file--get contents from its last auto-save file."
diff --git a/lisp/follow.el b/lisp/follow.el
index a01b0e77eb2..61517a68ff1 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -980,7 +980,8 @@ of the way from the true end."
           (t
            (select-window (car (reverse followers)))))
     (goto-char pos)
-    (end-of-buffer arg)))
+    (with-no-warnings
+      (end-of-buffer arg))))
 
 ;;}}}
 
diff --git a/lisp/font-core.el b/lisp/font-core.el
index 5bf30d4d6c5..a077ce756c0 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -32,7 +32,7 @@
   "Defaults for Font Lock mode specified by the major mode.
 Defaults should be of the form:
 
- (KEYWORDS KEYWORDS-ONLY CASE-FOLD SYNTAX-ALIST SYNTAX-BEGIN ...)
+ (KEYWORDS [KEYWORDS-ONLY [CASE-FOLD [SYNTAX-ALIST [SYNTAX-BEGIN ...]]]])
 
 KEYWORDS may be a symbol (a variable or function whose value is the keywords to
 use for fontification) or a list of symbols.  If KEYWORDS-ONLY is non-nil,
@@ -66,11 +66,10 @@ textual modes (i.e., the mode-dependent function is known to put point and mark
 around a text block relevant to that mode).
 
 Other variables include that for syntactic keyword fontification,
-`font-lock-syntactic-keywords'
-and those for buffer-specialized fontification functions,
-`font-lock-fontify-buffer-function', `font-lock-unfontify-buffer-function',
-`font-lock-fontify-region-function', `font-lock-unfontify-region-function',
-`font-lock-inhibit-thing-lock' and `font-lock-maximum-size'.")
+`font-lock-syntactic-keywords' and those for buffer-specialized fontification
+functions, `font-lock-fontify-buffer-function',
+`font-lock-unfontify-buffer-function', `font-lock-fontify-region-function',
+`font-lock-unfontify-region-function', and `font-lock-inhibit-thing-lock'.")
 (make-variable-buffer-local 'font-lock-defaults)
 
 (defvar font-lock-defaults-alist nil
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 59d68e6376d..906169a0d9b 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -309,6 +309,9 @@ If a number, only buffers greater than this size have fontification messages."
 (defvar font-lock-comment-face          'font-lock-comment-face
   "Face name to use for comments.")
 
+(defvar font-lock-comment-delimiter-face 'font-lock-comment-delimiter-face
+  "Face name to use for comment delimiters.")
+
 (defvar font-lock-string-face           'font-lock-string-face
   "Face name to use for strings.")
 
@@ -463,12 +466,12 @@ user-level keywords, but normally their values have been
 optimized.")
 
 (defvar font-lock-keywords-alist nil
-  "*Alist of `font-lock-keywords' local to a `major-mode'.
+  "Alist of `font-lock-keywords' local to a `major-mode'.
 This is normally set via `font-lock-add-keywords' and
 `font-lock-remove-keywords'.")
 
 (defvar font-lock-removed-keywords-alist nil
-  "*Alist of `font-lock-keywords' removed from `major-mode'.
+  "Alist of `font-lock-keywords' removed from `major-mode'.
 This is normally set via `font-lock-add-keywords' and
 `font-lock-remove-keywords'.")
 
@@ -493,7 +496,7 @@ sometimes be slightly incorrect.")
   "Function to determine which face to use when fontifying syntactically.
 The function is called with a single parameter (the state as returned by
 `parse-partial-sexp' at the beginning of the region to highlight) and
-should return a face.")
+should return a face.  This is normally set via `font-lock-defaults'.")
 
 (defvar font-lock-syntactic-keywords nil
   "A list of the syntactic keywords to highlight.
@@ -565,8 +568,8 @@ This is normally set via `font-lock-defaults'.")
 (defvar font-lock-fontify-region-function 'font-lock-default-fontify-region
   "Function to use for fontifying a region.
 It should take two args, the beginning and end of the region, and an optional
-third arg VERBOSE.  If non-nil, the function should print status messages.
-This is normally set via `font-lock-defaults'.")
+third arg VERBOSE.  If VERBOSE is non-nil, the function should print status
+messages.  This is normally set via `font-lock-defaults'.")
 
 (defvar font-lock-unfontify-region-function 'font-lock-default-unfontify-region
   "Function to use for unfontifying a region.
@@ -643,6 +646,7 @@ Major/minor modes can set this variable if they know which option applies.")
 ;;;###autoload
 (defun font-lock-add-keywords (mode keywords &optional append)
   "Add highlighting KEYWORDS for MODE.
+
 MODE should be a symbol, the major mode command name, such as `c-mode'
 or nil.  If nil, highlighting keywords are added for the current buffer.
 KEYWORDS should be a list; see the variable `font-lock-keywords'.
@@ -660,9 +664,9 @@ For example:
 adds two fontification patterns for C mode, to fontify `FIXME:' words, even in
 comments, and to fontify `and', `or' and `not' words as keywords.
 
-When used from an elisp package (such as a minor mode), it is recommended
-to use nil for MODE (and place the call in a loop or on a hook) to avoid
-subtle problems due to details of the implementation.
+When used from a Lisp program (such as a minor mode), it is recommended to
+use nil for MODE (and place the call on a hook) to avoid subtle problems
+due to details of the implementation.
 
 Note that some modes have specialized support for additional patterns, e.g.,
 see the variables `c-font-lock-extra-types', `c++-font-lock-extra-types',
@@ -703,9 +707,7 @@ see the variables `c-font-lock-extra-types', `c++-font-lock-extra-types',
                     (font-lock-compile-keywords font-lock-keywords t)))))))
 
 (defun font-lock-update-removed-keyword-alist (mode keywords append)
-  ;; Update `font-lock-removed-keywords-alist' when adding new
-  ;; KEYWORDS to MODE.
-  ;;
+  "Update `font-lock-removed-keywords-alist' when adding new KEYWORDS to MODE."
   ;; When font-lock is enabled first all keywords in the list
   ;; `font-lock-keywords-alist' are added, then all keywords in the
   ;; list `font-lock-removed-keywords-alist' are removed.  If a
@@ -753,9 +755,9 @@ see the variables `c-font-lock-extra-types', `c++-font-lock-extra-types',
 MODE should be a symbol, the major mode command name, such as `c-mode'
 or nil.  If nil, highlighting keywords are removed for the current buffer.
 
-When used from an elisp package (such as a minor mode), it is recommended
-to use nil for MODE (and place the call in a loop or on a hook) to avoid
-subtle problems due to details of the implementation."
+When used from a Lisp program (such as a minor mode), it is recommended to
+use nil for MODE (and place the call on a hook) to avoid subtle problems
+due to details of the implementation."
   (cond (mode
          ;; Remove one keyword at the time.
          (dolist (keyword keywords)
@@ -1004,7 +1006,8 @@ a very meaningful entity to highlight.")
 
 (defun font-lock-default-fontify-region (beg end loudly)
   (save-buffer-state
-      ((parse-sexp-lookup-properties font-lock-syntactic-keywords)
+      ((parse-sexp-lookup-properties
+        (or parse-sexp-lookup-properties font-lock-syntactic-keywords))
        (old-syntax-table (syntax-table)))
     (unwind-protect
         (save-restriction
@@ -1615,7 +1618,7 @@ 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-face
+(defface font-lock-comment-delimiter-face
   '((((class grayscale) (background light))
      (:foreground "DimGray" :weight bold :slant italic))
     (((class grayscale) (background dark))
@@ -1633,6 +1636,27 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
     (((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))
+    (((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))
+     )
+    (((class color) (min-colors 8) (background dark))
+     )
+    (t (:weight bold :slant italic)))
   "Font Lock mode face used to highlight comments."
   :group 'font-lock-highlighting-faces)
 
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index a13103edb3d..31aa9299fbb 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1,4 +1,4 @@
-;;; generic-x.el --- Extra Modes for generic-mode
+;;; generic-x.el --- A collection of generic modes
 
 ;; Copyright (C) 1997, 1998, 2003, 2005 Free Software Foundation, Inc.
 
@@ -25,7 +25,7 @@
 
 ;;; Commentary:
 ;;
-;; This file contains some pre-defined generic-modes.
+;; This file contains a collection generic modes.
 ;;
 ;; INSTALLATION:
 ;;
@@ -34,12 +34,18 @@
 ;;   (require 'generic-x)
 ;;
 ;; You can decide which modes to load by setting the variable
-;; `generic-extras-enable-list'.  Some platform-specific modes are
-;; affected by the variables `generic-define-mswindows-modes' and
-;; `generic-define-unix-modes' (which see).
+;; `generic-extras-enable-list'.  Its default value is platform-
+;; specific.  The recommended way to set this variable is through
+;; customize:
 ;;
-;; You can also send in new modes; if the file types a reasonably common,
-;; we would like to install them.
+;;   M-x customize-option RET generic-extras-enable-list RET
+;;
+;; This lets you select generic modes from the list of available
+;; modes.  If you manually set `generic-extras-enable-list' in your
+;; .emacs, do it BEFORE loading generic-x with (require 'generic-x).
+;;
+;; You can also send in new modes; if the file types are reasonably
+;; common, we would like to install them.
 ;;
 ;; DEFAULT GENERIC MODE:
 ;;
@@ -54,13 +60,13 @@
 ;; PROBLEMS WHEN USED WITH FOLDING MODE:
 ;;
 ;; [The following relates to the obsolete selective-display technique.
-;; Folding mode should use invisible text properties instead. -- Dave
+;; Folding mode should use invisible text properties instead.  -- Dave
 ;; Love]
 ;;
 ;; From Anders Lindgren <andersl@csd.uu.se>
 ;;
 ;; Problem summary: Wayne Adams has found a problem when using folding
-;; mode in conjuction with font-lock for a mode defined in
+;; mode in conjunction with font-lock for a mode defined in
 ;; `generic-x.el'.
 ;;
 ;; The problem, as Wayne described it, was that error messages of the
@@ -69,18 +75,18 @@
 ;; >      - various msgs including "Fontifying region...(error Stack
 ;; > overflow in regexp matcher)" appear
 ;;
-;; I have just tracked down the cause of the problem.  The regexp:s in
-;; `generic-x.el' does not take into account the way that folding
-;; hides sections of the buffer.  The technique is known as
+;; I have just tracked down the cause of the problem.  The regexp's in
+;; `generic-x.el' do not take into account the way that folding hides
+;; sections of the buffer.  The technique is known as
 ;; `selective-display' and has been available for a very long time (I
-;; started using it back in the good old' Emacs 18 days).  Basically, a
+;; started using it back in the good old Emacs 18 days).  Basically, a
 ;; section is hidden by creating one very long line were the newline
 ;; character (C-j) is replaced by a linefeed (C-m) character.
 ;;
 ;; Many other hiding packages, besides folding, use the same technique,
 ;; the problem should occur when using them as well.
 ;;
-;; The erroronous lines in `generic-extras' look like the following (this
+;; The erroneous lines in `generic-x.el' look like the following (this
 ;; example is from the `ini' section):
 ;;
 ;;     '(("^\\(\\[.*\\]\\)"   1 'font-lock-constant-face)
@@ -92,17 +98,17 @@
 ;; [foo]
 ;; bar = xxx
 ;;
-;; However, since the `.' regexp symbol match the linefeed character the
-;; entire folded section is searched, resulting in a regexp stack
+;; However, since the `.' regexp symbol matches the linefeed character
+;; the entire folded section is searched, resulting in a regexp stack
 ;; overflow.
 ;;
-;; Solution suggestion 2: Instead of using ".", use the sequence
-;; "[^\n\r]".  This will make the rules behave just as before, but they
-;; will work together with selective-display.
+;; Solution suggestion: Instead of using ".", use the sequence
+;; "[^\n\r]".  This will make the rules behave just as before, but
+;; they will work together with selective-display.
 
 ;;; Code:
 
-(require 'font-lock)
+(eval-when-compile (require 'font-lock))
 
 (defgroup generic-x nil
   "A collection of generic modes."
@@ -110,6 +116,11 @@
   :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
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -147,7 +158,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)
+(define-generic-mode default-generic-mode (list ?#) nil nil nil nil :group 'generic-x-modes)
 
 ;; A more general solution would allow us to enter generic-mode for
 ;; *any* comment character, but would require us to synthesize a new
@@ -185,55 +196,101 @@ This hook will be installed if the variable
 ;; Other Generic modes
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defcustom generic-extras-enable-list nil
-  "*List of generic modes to enable by default.
-Each entry in the list should be a symbol.  The variables
-`generic-define-mswindows-modes' and `generic-define-unix-modes'
-also affect which generic modes are defined.  Please note that if
-you set this variable after generic-x is loaded, you must reload
-generic-x to enable the specified modes."
-  :group 'generic-x
-  :type  '(repeat sexp))
+;; If you add a generic mode to this file, put it in one of these four
+;; lists as well.
+
+(defconst generic-default-modes
+  '(apache-conf-generic-mode
+    apache-log-generic-mode
+    hosts-generic-mode
+    java-manifest-generic-mode
+    java-properties-generic-mode
+    javascript-generic-mode
+    show-tabs-generic-mode
+    vrml-generic-mode)
+  "List of generic modes that are defined by default.")
+
+(defconst generic-mswindows-modes
+  '(bat-generic-mode
+    inf-generic-mode
+    ini-generic-mode
+    rc-generic-mode
+    reg-generic-mode
+    rul-generic-mode)
+  "List of generic modes that are defined by default on MS-Windows.")
+
+(defconst generic-unix-modes
+  '(alias-generic-mode
+    etc-fstab-generic-mode
+    etc-modules-conf-generic-mode
+    etc-passwd-generic-mode
+    etc-services-generic-mode
+    fvwm-generic-mode
+    inetd-conf-generic-mode
+    mailagent-rules-generic-mode
+    mailrc-generic-mode
+    named-boot-generic-mode
+    named-database-generic-mode
+    prototype-generic-mode
+    resolve-conf-generic-mode
+    samba-generic-mode
+    x-resource-generic-mode)
+  "List of generic modes that are defined by default on Unix.")
+
+(defconst generic-other-modes
+  '(astap-generic-mode
+    ibis-generic-mode
+    pkginfo-generic-mode
+    spice-generic-mode)
+  "List of generic mode that are not defined by default.")
 
 (defcustom generic-define-mswindows-modes
   (memq system-type '(windows-nt ms-dos))
-  "*If non-nil, some MS-Windows specific generic modes will be defined."
+  "*Non-nil means the modes in `generic-mswindows-modes' will be defined.
+This is a list of MS-Windows specific generic modes.  This variable
+only effects the default value of `generic-extras-enable-list'."
   :group 'generic-x
-  :type  'boolean)
+  :type 'boolean
+  :version "22.1")
+(make-obsolete-variable 'generic-define-mswindows-modes 'generic-extras-enable-list "22.1")
 
 (defcustom generic-define-unix-modes
   (not (memq system-type '(windows-nt ms-dos)))
-  "*If non-nil, some Unix specific generic modes will be defined."
+  "*Non-nil means the modes in `generic-unix-modes' will be defined.
+This is a list of Unix specific generic modes.  This variable only
+effects the default value of `generic-extras-enable-list'."
   :group 'generic-x
-  :type  'boolean)
-
-(and generic-define-mswindows-modes
-     (setq generic-extras-enable-list
-           (append '(bat-generic-mode
-                     ini-generic-mode
-                     inf-generic-mode
-                     rc-generic-mode
-                     reg-generic-mode
-                     rul-generic-mode
-                     hosts-generic-mode
-                     apache-conf-generic-mode
-                     apache-log-generic-mode)
-                   generic-extras-enable-list)))
-
-(and generic-define-unix-modes
-     (setq generic-extras-enable-list
-           (append '(apache-conf-generic-mode
-                     apache-log-generic-mode
-                     samba-generic-mode
-                     hosts-generic-mode
-                     fvwm-generic-mode
-                     x-resource-generic-mode
-                     alias-generic-mode
-                     inetd-conf-generic-mode
-                     etc-services-generic-mode
-                     etc-passwd-generic-mode
-                     etc-fstab-generic-mode)
-                   generic-extras-enable-list)))
+  :type 'boolean
+  :version "22.1")
+(make-obsolete-variable 'generic-define-unix-modes 'generic-extras-enable-list "22.1")
+
+(defcustom generic-extras-enable-list
+  (append generic-default-modes
+          (if generic-define-mswindows-modes generic-mswindows-modes)
+          (if generic-define-unix-modes generic-unix-modes)
+          nil)
+  "List of generic modes to define.
+Each entry in the list should be a symbol.  If you set this variable
+directly, without using customize, you must reload generic-x to put
+your changes into effect."
+  :group 'generic-x
+  :type (let (list)
+          (dolist (mode
+                   (sort (append generic-default-modes
+                                 generic-mswindows-modes
+                                 generic-unix-modes
+                                 generic-other-modes
+                                 nil)
+                         (lambda (a b)
+                           (string< (symbol-name b)
+                                    (symbol-name a))))
+                   (cons 'set list))
+            (push `(const ,mode) list)))
+  :set (lambda (s v)
+         (set-default s v)
+         (unless load-in-progress
+           (load "generic-x")))
+  :version "22.1")
 
 ;;; Apache
 (when (memq 'apache-conf-generic-mode generic-extras-enable-list)
@@ -252,7 +309,7 @@ generic-x to enable the specified modes."
               ("*Directories*" "^\\s-*<Directory\\s-*\\([^>]+\\)>" 1)
               ("*Locations*"   "^\\s-*<Location\\s-*\\([^>]+\\)>" 1))))))
   "Generic mode for Apache or HTTPD configuration files."
-  :group 'generic-x))
+  :group 'generic-x-modes))
 
 (when (memq 'apache-log-generic-mode generic-extras-enable-list)
 
@@ -266,7 +323,7 @@ generic-x to enable the specified modes."
   '("access_log\\'")
   nil
   "Mode for Apache log files"
-  :group 'generic-x))
+  :group 'generic-x-modes))
 
 ;;; Samba
 (when (memq 'samba-generic-mode generic-extras-enable-list)
@@ -281,7 +338,7 @@ generic-x to enable the specified modes."
   '("smb\\.conf\\'")
   '(generic-bracket-support)
   "Generic mode for Samba configuration files."
-  :group 'generic-x))
+  :group 'generic-x-modes))
 
 ;;; Fvwm
 ;; This is pretty basic. Also, modes for other window managers could
@@ -307,7 +364,7 @@ generic-x to enable the specified modes."
   '("\\.fvwmrc\\'" "\\.fvwm2rc\\'")
   nil
   "Generic mode for FVWM configuration files."
-  :group 'generic-x))
+  :group 'generic-x-modes))
 
 ;;; X Resource
 ;; I'm pretty sure I've seen an actual mode to do this, but I don't
@@ -321,7 +378,7 @@ generic-x to enable the specified modes."
   '("\\.Xdefaults\\'" "\\.Xresources\\'" "\\.Xenvironment\\'" "\\.ad\\'")
   nil
   "Generic mode for X Resource configuration files."
-  :group 'generic-x))
+  :group 'generic-x-modes))
 
 ;;; Hosts
 (when (memq 'hosts-generic-mode generic-extras-enable-list)
@@ -333,7 +390,7 @@ generic-x to enable the specified modes."
   '("[hH][oO][sS][tT][sS]\\'")
   nil
   "Generic mode for HOSTS files."
-  :group 'generic-x))
+  :group 'generic-x-modes))
 
 ;;; Windows INF files
 (when (memq 'inf-generic-mode generic-extras-enable-list)
@@ -345,7 +402,7 @@ generic-x to enable the specified modes."
   '("\\.[iI][nN][fF]\\'")
   '(generic-bracket-support)
   "Generic mode for MS-Windows INF files."
-  :group 'generic-x))
+  :group 'generic-x-modes))
 
 ;;; Windows INI files
 ;; Should define escape character as well!
@@ -368,7 +425,7 @@ generic-x to enable the specified modes."
   "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)
+  :group 'generic-x-modes)
 
 (defun ini-generic-mode-find-file-hook ()
   "Hook function to enter Ini-Generic mode automatically for INI files.
@@ -397,7 +454,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
       (setq imenu-generic-expression
             '((nil "^\\s-*\\(.*\\)\\s-*=" 1))))))
   "Generic mode for MS-Windows Registry files."
-  :group 'generic-x))
+  :group 'generic-x-modes))
 
 ;;; DOS/Windows BAT files
 (when (memq 'bat-generic-mode generic-extras-enable-list)
@@ -472,10 +529,10 @@ like an INI file.  You can add this hook to `find-file-hook'."
     "\\`[aA][uU][tT][oO][eE][xX][eE][cC]\\.")
   '(generic-bat-mode-setup-function)
   "Generic mode for MS-Windows BAT files."
-  :group 'generic-x)
+  :group 'generic-x-modes)
 
 (defvar bat-generic-mode-syntax-table nil
-  "Syntax table in use in bat-generic-mode buffers.")
+  "Syntax table in use in `bat-generic-mode' buffers.")
 
 (defvar bat-generic-mode-keymap (make-sparse-keymap)
   "Keymap for bet-generic-mode.")
@@ -552,7 +609,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
       (setq imenu-generic-expression
             '((nil "\\s-/\\([^/]+\\)/[i, \t\n]" 1))))))
   "Mode for Mailagent rules files."
-  :group 'generic-x))
+  :group 'generic-x-modes))
 
 ;; Solaris/Sys V prototype files
 (when (memq 'prototype-generic-mode generic-extras-enable-list)
@@ -576,7 +633,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
   '("prototype\\'")
   nil
   "Mode for Sys V prototype files."
-  :group 'generic-x))
+  :group 'generic-x-modes))
 
 ;; Solaris/Sys V pkginfo files
 (when (memq 'pkginfo-generic-mode generic-extras-enable-list)
@@ -590,10 +647,12 @@ like an INI file.  You can add this hook to `find-file-hook'."
   '("pkginfo\\'")
   nil
   "Mode for Sys V pkginfo files."
-  :group 'generic-x))
+  :group 'generic-x-modes))
 
 ;; Javascript mode
 ;; Includes extra keywords from Armando Singer [asinger@MAIL.COLGATE.EDU]
+(when (memq 'javascript-generic-mode generic-extras-enable-list)
+
 (define-generic-mode javascript-generic-mode
   '("//" ("/*" . "*/"))
   '("break"
@@ -668,9 +727,11 @@ like an INI file.  You can add this hook to `find-file-hook'."
             '((nil "^function\\s-+\\([A-Za-z0-9_]+\\)" 1)
               ("*Variables*" "^var\\s-+\\([A-Za-z0-9_]+\\)" 1))))))
   "Mode for JavaScript files."
-  :group 'generic-x)
+  :group 'generic-x-modes))
 
 ;; VRML files
+(when (memq 'vrml-generic-mode generic-extras-enable-list)
+
 (define-generic-mode vrml-generic-mode
   '(?#)
   '("DEF"
@@ -720,9 +781,11 @@ like an INI file.  You can add this hook to `find-file-hook'."
                "DEF\\s-+\\([-A-Za-z0-9_]+\\)\\s-+\\([A-Za-z0-9]+\\)\\s-*{"
                1))))))
   "Generic Mode for VRML files."
-  :group 'generic-x)
+  :group 'generic-x-modes))
 
 ;; Java Manifests
+(when (memq 'java-manifest-generic-mode generic-extras-enable-list)
+
 (define-generic-mode java-manifest-generic-mode
   '(?#)
   '("Name"
@@ -740,9 +803,11 @@ like an INI file.  You can add this hook to `find-file-hook'."
   '("[mM][aA][nN][iI][fF][eE][sS][tT]\\.[mM][fF]\\'")
   nil
   "Mode for Java Manifest files"
-  :group 'generic-x)
+  :group 'generic-x-modes))
 
 ;; Java properties files
+(when (memq 'java-properties-generic-mode generic-extras-enable-list)
+
 (define-generic-mode java-properties-generic-mode
   '(?! ?#)
   nil
@@ -771,7 +836,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
       (setq imenu-generic-expression
             '((nil "^\\([^#! \t\n\r=:]+\\)" 1))))))
   "Mode for Java properties files."
-  :group 'generic-x)
+  :group 'generic-x-modes))
 
 ;; C shell alias definitions
 (when (memq 'alias-generic-mode generic-extras-enable-list)
@@ -790,7 +855,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
       (setq imenu-generic-expression
             '((nil "^\\(alias\\|unalias\\)\\s-+\\([-a-zA-Z0-9_]+\\)" 2))))))
   "Mode for C Shell alias files."
-  :group 'generic-x))
+  :group 'generic-x-modes))
 
 ;;; Windows RC files
 ;; Contributed by ACorreir@pervasive-sw.com (Alfred Correira)
@@ -883,7 +948,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     '("\\.[rR][cC]\\'")
     nil
     "Generic mode for MS-Windows Resource files."
-    :group 'generic-x))
+    :group 'generic-x-modes))
 
 ;; InstallShield RUL files
 ;; Contributed by  Alfred.Correira@Pervasive.Com
@@ -1436,7 +1501,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
   "Function argument constants used in InstallShield 3 and 5."))
 
 (defvar rul-generic-mode-syntax-table nil
-  "Syntax table to use in rul-generic-mode buffers.")
+  "Syntax table to use in `rul-generic-mode' buffers.")
 
 (setq rul-generic-mode-syntax-table
       (make-syntax-table c++-mode-syntax-table))
@@ -1504,7 +1569,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
   '("\\.[rR][uU][lL]\\'")
   '(generic-rul-mode-setup-function)
   "Generic mode for InstallShield RUL files."
-  :group 'generic-x)
+  :group 'generic-x-modes)
 
 (define-skeleton rul-if
   "Insert an if statement."
@@ -1531,6 +1596,8 @@ like an INI file.  You can add this hook to `find-file-hook'."
   > "end;"))
 
 ;; Additions by ACorreir@pervasive-sw.com (Alfred Correira)
+(when (memq 'mailrc-generic-mode generic-extras-enable-list)
+
 (define-generic-mode mailrc-generic-mode
   '(?#)
   '("alias"
@@ -1553,7 +1620,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
   '("\\.mailrc\\'")
   nil
   "Mode for mailrc files."
-  :group 'generic-x)
+  :group 'generic-x-modes))
 
 ;; Inetd.conf
 (when (memq 'inetd-conf-generic-mode generic-extras-enable-list)
@@ -1574,7 +1641,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     (lambda ()
       (setq imenu-generic-expression
             '((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))
-  :group 'generic-x))
+  :group 'generic-x-modes))
 
 ;; Services
 (when (memq 'etc-services-generic-mode generic-extras-enable-list)
@@ -1593,7 +1660,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     (lambda ()
       (setq imenu-generic-expression
             '((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))
-  :group 'generic-x))
+  :group 'generic-x-modes))
 
 ;; Password and Group files
 (when (memq 'etc-passwd-generic-mode generic-extras-enable-list)
@@ -1636,7 +1703,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     (lambda ()
       (setq imenu-generic-expression
             '((nil "^\\([-A-Za-z0-9_]+\\):" 1))))))
-  :group 'generic-x))
+  :group 'generic-x-modes))
 
 ;; Fstab
 (when (memq 'etc-fstab-generic-mode generic-extras-enable-list)
@@ -1687,9 +1754,11 @@ like an INI file.  You can add this hook to `find-file-hook'."
     (lambda ()
       (setq imenu-generic-expression
             '((nil "^\\([/-A-Za-z0-9_]+\\)\\s-+" 1))))))
-  :group 'generic-x))
+  :group 'generic-x-modes))
 
 ;; From Jacques Duthen <jacques.duthen@sncf.fr>
+(when (memq 'show-tabs-generic-mode generic-extras-enable-list)
+
 (eval-when-compile
 
 (defconst show-tabs-generic-mode-font-lock-defaults-1
@@ -1711,7 +1780,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)
+  :group 'generic-x-modes)
 
 (defface show-tabs-space-face
   '((((class grayscale) (background light)) (:background "DimGray"   :weight bold))
@@ -1720,7 +1789,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)
+  :group 'generic-x-modes)
 
 (define-generic-mode show-tabs-generic-mode
   nil ;; no comment char
@@ -1730,12 +1799,14 @@ like an INI file.  You can add this hook to `find-file-hook'."
   ;; '(show-tabs-generic-mode-hook-fun)
   nil
   "Generic mode to show tabs and trailing spaces"
-  :group 'generic-x)
+  :group 'generic-x-modes))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; DNS modes
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(when (memq 'named-boot-generic-mode generic-extras-enable-list)
+
 (define-generic-mode named-boot-generic-mode
   ;; List of comment characters
   '(?\;)
@@ -1752,7 +1823,9 @@ like an INI file.  You can add this hook to `find-file-hook'."
   '("/etc/named.boot\\'")
   ;; List of set up functions to call
   nil
-  :group 'generic-x)
+  :group 'generic-x-modes))
+
+(when (memq 'named-database-generic-mode generic-extras-enable-list)
 
 (define-generic-mode named-database-generic-mode
   ;; List of comment characters
@@ -1766,7 +1839,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
   nil
   ;; List of set up functions to call
   nil
-  :group 'generic-x)
+  :group 'generic-x-modes)
 
 (defvar named-database-time-string "%Y%m%d%H"
   "Timestring for named serial numbers.")
@@ -1774,7 +1847,9 @@ like an INI file.  You can add this hook to `find-file-hook'."
 (defun named-database-print-serial ()
   "Print a serial number based on the current date."
   (interactive)
-  (insert (format-time-string named-database-time-string (current-time))))
+  (insert (format-time-string named-database-time-string (current-time)))))
+
+(when (memq 'resolve-conf-generic-mode generic-extras-enable-list)
 
 (define-generic-mode resolve-conf-generic-mode
   ;; List of comment characters
@@ -1787,12 +1862,14 @@ like an INI file.  You can add this hook to `find-file-hook'."
   '("/etc/resolv[e]?.conf\\'")
   ;; List of set up functions to call
   nil
-  :group 'generic-x)
+  :group 'generic-x-modes))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Modes for spice and common electrical engineering circuit netlist formats
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(when (memq 'spice-generic-mode generic-extras-enable-list)
+
 (define-generic-mode spice-generic-mode
   nil
   '("and"
@@ -1830,7 +1907,9 @@ like an INI file.  You can add this hook to `find-file-hook'."
     (lambda()
       (setq font-lock-defaults '(generic-font-lock-keywords nil t)))))
   "Generic mode for SPICE circuit netlist files."
-  :group 'generic-x)
+  :group 'generic-x-modes))
+
+(when (memq 'ibis-generic-mode generic-extras-enable-list)
 
 (define-generic-mode ibis-generic-mode
   '(?|)
@@ -1840,7 +1919,9 @@ like an INI file.  You can add this hook to `find-file-hook'."
   '("\\.[iI][bB][sS]\\'")
   '(generic-bracket-support)
   "Generic mode for IBIS circuit netlist files."
-  :group 'generic-x)
+  :group 'generic-x-modes))
+
+(when (memq 'astap-generic-mode generic-extras-enable-list)
 
 (define-generic-mode astap-generic-mode
   nil
@@ -1876,7 +1957,9 @@ like an INI file.  You can add this hook to `find-file-hook'."
     (lambda()
       (setq font-lock-defaults '(generic-font-lock-keywords nil t)))))
   "Generic mode for ASTAP circuit netlist files."
-  :group 'generic-x)
+  :group 'generic-x-modes))
+
+(when (memq 'etc-modules-conf-generic-mode generic-extras-enable-list)
 
 (define-generic-mode etc-modules-conf-generic-mode
   ;; List of comment characters
@@ -1919,7 +2002,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
   '("/etc/modules.conf" "/etc/conf.modules")
   ;; List of set up functions to call
   nil
-  :group 'generic-x)
+  :group 'generic-x-modes))
 
 (provide 'generic-x)
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f08f21fadb7..a5c403f0d7d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,24 @@
+2005-04-24  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * spam-report.el (spam-report-unplug-agent)
+        (spam-report-plug-agent, spam-report-deagentize)
+        (spam-report-agentize, spam-report-url-ping-temp-agent-function):
+        support for the Agent in spam-report: when unplugged, report to a
+        file; when plugged, submit all the requests.
+        [Added missing offline functionality from trunk.]
+
+2005-04-24  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * spam-report.el (spam-report-url-to-file)
+        (spam-report-requests-file): New function and variable for offline
+        reporting.
+        (spam-report-url-ping-function): Add `spam-report-url-to-file'
+        and user defined function.
+        (spam-report-process-queue): New function.
+        Process requests from `spam-report-requests-file'.
+        (spam-report-url-ping-mm-url): Autoload.
+        [Added missing offline functionality from trunk.]
+        
 2005-04-18  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * qp.el (quoted-printable-encode-region): Save excursion.
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 80d422b06ab..b8283ffaaa8 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -59,14 +59,32 @@ instead."
 
 (defcustom spam-report-url-ping-function
   'spam-report-url-ping-plain
-  "Function to use for url ping spam reporting."
+  "Function to use for url ping spam reporting.
+The function must accept the arguments `host' and `report'."
   :type '(choice
           (const :tag "Connect directly"
                  spam-report-url-ping-plain)
           (const :tag "Use the external program specified in `mm-url-program'"
-                 spam-report-url-ping-mm-url))
+                 spam-report-url-ping-mm-url)
+          (const :tag "Store request URLs in `spam-report-requests-file'"
+                 spam-report-url-to-file)
+          (function :tag "User defined function" nil))
   :group 'spam-report)
 
+(defcustom spam-report-requests-file
+  (nnheader-concat gnus-directory "spam/" "spam-report-requests.url")
+  ;; Is there a convention for the extension of such a file?
+  ;; Should we use `spam-directory'?
+  "File where spam report request are stored."
+  :type 'file
+  :group 'spam-report)
+
+(defvar spam-report-url-ping-temp-agent-function nil
+  "Internal variable for `spam-report-agentize' and `spam-report-deagentize'.
+This variable will store the value of `spam-report-url-ping-function' from
+before `spam-report-agentize' was run, so that `spam-report-deagentize' can
+undo that change.")
+
 (defun spam-report-gmane (&rest articles)
   "Report an article as spam through Gmane"
   (dolist (article articles)
@@ -75,10 +93,11 @@ instead."
                    (string-match spam-report-gmane-regex gnus-newsgroup-name)))
       (gnus-message 6 "Reporting spam article %d to spam.gmane.org..." article)
       (if spam-report-gmane-use-article-number
-          (spam-report-url-ping "spam.gmane.org"
-                                (format "/%s:%d"
-                                        (gnus-group-real-name gnus-newsgroup-name)
-                                        article))
+          (spam-report-url-ping 
+           "spam.gmane.org"
+           (format "/%s:%d"
+                   (gnus-group-real-name gnus-newsgroup-name)
+                   article))
         (with-current-buffer nntp-server-buffer
           (gnus-request-head article gnus-newsgroup-name)
           (goto-char (point-min))
@@ -113,14 +132,113 @@ the function specified by `spam-report-url-ping-function'."
        (format "GET %s HTTP/1.1\nUser-Agent: %s (spam-report.el)\nHost: %s\n\n"
                report (gnus-emacs-version) host)))))
 
+;;;###autoload
+(defun spam-report-process-queue (&optional file keep)
+  "Report all queued requests from `spam-report-requests-file'.
+
+If FILE is given, use it instead of `spam-report-requests-file'.
+If KEEP is t, leave old requests in the file.  If KEEP is the
+symbol `ask', query before flushing the queue file."
+  (interactive
+   (list (read-file-name
+          "File: "
+          (file-name-directory spam-report-requests-file)
+          spam-report-requests-file
+          nil
+          (file-name-nondirectory spam-report-requests-file))
+         current-prefix-arg))
+  (if (eq spam-report-url-ping-function 'spam-report-url-to-file)
+      (error (concat "Cannot process requests when "
+                     "`spam-report-url-ping-function' is "
+                     "`spam-report-url-to-file'."))
+    (gnus-message 7 "Processing requests using `%s'."
+                  spam-report-url-ping-function))
+  (or file (setq file spam-report-requests-file))
+  (save-excursion
+    (set-buffer (find-file-noselect file))
+    (goto-char (point-min))
+    (while (and (not (eobp))
+                (re-search-forward
+                 "http://\\([^/]+\\)\\(/.*\\) *$" (point-at-eol) t))
+      (funcall spam-report-url-ping-function (match-string 1) (match-string 2))
+      (forward-line 1))
+    (if (or (eq keep nil)
+            (and (eq keep 'ask)
+                 (y-or-n-p
+                  (format
+                   "Flush requests from `%s'? " (current-buffer)))))
+        (progn
+          (gnus-message 7 "Flushing request file `%s'"
+                        spam-report-requests-file)
+          (erase-buffer)
+          (save-buffer)
+          (kill-buffer (current-buffer)))
+      (gnus-message 7 "Keeping requests in `%s'" spam-report-requests-file))))
+
+;;;###autoload
 (defun spam-report-url-ping-mm-url (host report)
   "Ping a host through HTTP, addressing a specific GET resource. Use
 the external program specified in `mm-url-program' to connect to
 server."
   (with-temp-buffer
-    (let ((url (concat "http://" host "/" report)))
+    (let ((url (concat "http://" host report)))
       (mm-url-insert url t))))
 
+;;;###autoload
+(defun spam-report-url-to-file (host report)
+  "Collect spam report requests in `spam-report-requests-file'.
+Customize `spam-report-url-ping-function' to use this function."
+  (let ((url (concat "http://" host report))
+        (file spam-report-requests-file))
+    (gnus-make-directory (file-name-directory file))
+    (gnus-message 9 "Writing URL `%s' to file `%s'" url file)
+    (with-temp-buffer
+      (insert url)
+      (newline)
+      (append-to-file (point-min) (point-max) file))))
+
+;;;###autoload
+(defun spam-report-agentize ()
+  "Add spam-report support to the Agent.
+Spam reports will be queued with \\[spam-report-url-to-file] when
+the Agent is unplugged, and will be submitted in a batch when the
+Agent is plugged."
+  (interactive)
+  (add-hook 'gnus-agent-plugged-hook 'spam-report-plug-agent)
+  (add-hook 'gnus-agent-unplugged-hook 'spam-report-unplug-agent))
+
+;;;###autoload
+(defun spam-report-deagentize ()
+  "Remove spam-report support from the Agent.
+Spam reports will be queued with the method used when
+\\[spam-report-agentize] was run."
+  (interactive)
+  (remove-hook 'gnus-agent-plugged-hook 'spam-report-plug-agent)
+  (remove-hook 'gnus-agent-unplugged-hook 'spam-report-unplug-agent))
+
+(defun spam-report-plug-agent ()
+  "Adjust spam report settings for plugged state.
+Process queued spam reports."
+  ;; Process the queue, unless the user only wanted to report to a file
+  ;; anyway.
+  (unless (equal spam-report-url-ping-temp-agent-function
+                 'spam-report-url-to-file)
+    (spam-report-process-queue))
+  ;; Set the reporting function, if we have memorized something otherwise,
+  ;; stick with plain URL reporting.
+  (setq spam-report-url-ping-function
+        (or spam-report-url-ping-temp-agent-function
+            'spam-report-url-ping-plain)))
+
+(defun spam-report-unplug-agent ()
+  "Restore spam report settings for unplugged state."
+  ;; save the old value
+  (setq spam-report-url-ping-temp-agent-function
+        spam-report-url-ping-function)
+  ;; store all reports to file
+  (setq spam-report-url-ping-function
+        'spam-report-url-to-file))
+
 (provide 'spam-report)
 
 ;;; arch-tag: f6683295-ec89-4ab5-8803-8cc842293022
diff --git a/lisp/help.el b/lisp/help.el
index e65982623c1..76fc43d63ef 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -611,6 +611,7 @@ pass a string or a vector.
 If non-nil UNTRANSLATED is a vector of the untranslated events.
 It can also be a number in which case the untranslated events from
 the last key hit are used."
+  ;; UP-EVENT is the up-event that was discarded by reading KEY, or nil.
   (interactive "kDescribe key: \np\nU")
   (if (numberp untranslated)
       (setq untranslated (this-single-command-raw-keys)))
@@ -634,7 +635,8 @@ the last key hit are used."
           ;; Don't bother user with strings from (e.g.) the select-paste menu.
           (if (stringp (aref key (1- (length key))))
               (aset key (1- (length key)) "(any string)"))
-          (if (stringp (aref untranslated (1- (length untranslated))))
+          (if (and untranslated
+                   (stringp (aref untranslated (1- (length untranslated)))))
               (aset untranslated (1- (length untranslated))
                     "(any string)"))
           (with-output-to-temp-buffer (help-buffer)
diff --git a/lisp/hexl.el b/lisp/hexl.el
index af996940f86..99bbda91c6c 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -284,7 +284,7 @@ You can use \\[hexl-find-file] to visit a file in Hexl mode.
     (add-hook 'change-major-mode-hook 'hexl-maybe-dehexlify-buffer nil t)
 
     ;; Set a callback function for eldoc.
-    (set (make-local-variable 'eldoc-print-current-symbol-info-function)
+    (set (make-local-variable 'eldoc-documentation-function)
          'hexl-print-current-point-info)
     (eldoc-add-command-completions "hexl-")
     (eldoc-remove-command "hexl-save-buffer" 
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 91eb01b5193..bd726564da6 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -634,7 +634,7 @@ for subsequent calls (for further possible completions of the same
 string).  It returns t if a new completion is found, nil otherwise."
   (let ((expansion ())
         (strip-prompt (and (get-buffer-process (current-buffer))
-                           comint-use-prompt-regexp-instead-of-fields
+                           comint-use-prompt-regexp
                            comint-prompt-regexp)))
     (if (not old)
         (progn
@@ -681,7 +681,7 @@ for subsequent calls (for further possible completions of the same
 string).  It returns t if a new completion is found, nil otherwise."
   (let ((expansion ())
         (strip-prompt (and (get-buffer-process (current-buffer))
-                           comint-use-prompt-regexp-instead-of-fields
+                           comint-use-prompt-regexp
                            comint-prompt-regexp))
         (buf (current-buffer))
         (orig-case-fold-search case-fold-search))
@@ -708,7 +708,7 @@ string).  It returns t if a new completion is found, nil otherwise."
                       (widen))
                   (goto-char he-search-loc)
                   (setq strip-prompt (and (get-buffer-process (current-buffer))
-                                          comint-use-prompt-regexp-instead-of-fields
+                                          comint-use-prompt-regexp
                                           comint-prompt-regexp))
                   (setq expansion
                         (let ((case-fold-search orig-case-fold-search))
diff --git a/lisp/ido.el b/lisp/ido.el
index 2e2aca3126e..7ed2d62386c 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -56,7 +56,7 @@
 ;; so I invented a common "ido-" namespace for the merged packages.
 ;;
 ;; This version is based on ido.el version 1.57 released on
-;; gnu.emacs.sources adapted for emacs 21.5 to use command remapping
+;; gnu.emacs.sources adapted for emacs 22.1 to use command remapping
 ;; and optionally hooking the read-buffer and read-file-name functions.
 ;;
 ;; Prefix matching was added by Klaus Berndl <klaus.berndl@sdm.de> based on
@@ -1346,12 +1346,19 @@ This function also adds a hook to the minibuffer."
   (setq ido-everywhere (if arg
                            (> (prefix-numeric-value arg) 0)
                          (not ido-everywhere)))
-  (setq read-file-name-function
-        (and ido-everywhere (memq ido-mode '(both file))
-             'ido-read-file-name))
-  (setq read-buffer-function
-        (and ido-everywhere (memq ido-mode '(both buffer))
-             'ido-read-buffer)))
+  (when (get 'ido-everywhere 'file)
+    (setq read-file-name-function (car (get 'ido-everywhere 'file)))
+    (put 'ido-everywhere 'file nil))
+  (when (get 'ido-everywhere 'buffer)
+    (setq read-buffer-function (car (get 'ido-everywhere 'buffer)))
+    (put 'ido-everywhere 'buffer nil))
+  (when ido-everywhere
+    (when (memq ido-mode '(both file))
+      (put 'ido-everywhere 'file (cons read-file-name-function nil))
+      (setq read-file-name-function 'ido-read-file-name))
+    (when (memq ido-mode '(both buffer))
+      (put 'ido-everywhere 'buffer (cons read-buffer-function nil))
+      (setq read-buffer-function 'ido-read-buffer))))
 
 
 ;;; IDO KEYMAP
@@ -1793,7 +1800,7 @@ If INITIAL is non-nil, it specifies the initial input string."
                 (ido-name (car ido-matches))))
 
         (cond
-         ((eq item 'buffer)
+         ((memq item '(buffer list))
           (setq done t))
 
          ((string-equal "./" ido-selected)
diff --git a/lisp/ielm.el b/lisp/ielm.el
index 5ef6ff1e1eb..65654ca2c7a 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -482,6 +482,7 @@ Customized bindings may be defined in `ielm-map', which currently contains:
   (interactive)
   (comint-mode)
   (setq comint-prompt-regexp (concat "^" (regexp-quote ielm-prompt)))
+  (set (make-local-variable 'paragraph-separate) "\\'")
   (make-local-variable 'paragraph-start)
   (setq paragraph-start comint-prompt-regexp)
   (setq comint-input-sender 'ielm-input-sender)
@@ -538,7 +539,7 @@ Customized bindings may be defined in `ielm-map', which currently contains:
     ;; Add a silly header
     (insert ielm-header)
     (ielm-set-pm (point-max))
-    (unless comint-use-prompt-regexp-instead-of-fields
+    (unless comint-use-prompt-regexp
       (let ((inhibit-read-only t))
         (add-text-properties
          (point-min) (point-max)
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 85430bbdbfc..831550bd7a3 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -777,7 +777,7 @@ They may also be nested index alists like:
 depending on PATTERNS."
 
   (let ((index-alist (list 'dummy))
-        prev-pos beg
+        prev-pos
         (case-fold-search (if (or (local-variable-p 'imenu-case-fold-search)
                                   (not (local-variable-p 'font-lock-defaults)))
                               imenu-case-fold-search
@@ -807,7 +807,7 @@ depending on PATTERNS."
                   (index (nth 2 pat))
                   (function (nth 3 pat))
                   (rest (nthcdr 4 pat))
-                  start)
+                  start beg)
               ;; Go backwards for convenience of adding items in order.
               (goto-char (point-max))
               (while (and (re-search-backward regexp nil t)
@@ -815,32 +815,35 @@ depending on PATTERNS."
                           ;; because it means a bad regexp was specified.
                           (not (= (match-beginning 0) (match-end 0))))
                 (setq start (point))
-                (goto-char (match-end index))
-                (setq beg (match-beginning index))
-                ;; Go to the start of the match.
+                ;; Record the start of the line in which the match starts.
                 ;; That's the official position of this definition.
-                (goto-char start)
+                (goto-char (match-beginning index))
+                (beginning-of-line)
+                (setq beg (point))
                 (imenu-progress-message prev-pos nil t)
                 ;; Add this sort of submenu only when we've found an
                 ;; item for it, avoiding empty, duff menus.
                 (unless (assoc menu-title index-alist)
                   (push (list menu-title) index-alist))
                 (if imenu-use-markers
-                    (setq start (copy-marker start)))
+                    (setq beg (copy-marker beg)))
                 (let ((item
                        (if function
                            (nconc (list (match-string-no-properties index)
-                                        start function)
+                                        beg function)
                                   rest)
                          (cons (match-string-no-properties index)
-                               start)))
+                               beg)))
                       ;; This is the desired submenu,
                       ;; starting with its title (or nil).
                       (menu (assoc menu-title index-alist)))
                   ;; Insert the item unless it is already present.
                   (unless (member item (cdr menu))
                     (setcdr menu
-                            (cons item (cdr menu))))))))
+                            (cons item (cdr menu)))))
+                ;; Go to the start of the match, to make sure we
+                ;; keep making progress backwards.
+                (goto-char start))))
           (set-syntax-table old-table)))
     (imenu-progress-message prev-pos 100 t)
     ;; Sort each submenu by position.
diff --git a/lisp/info.el b/lisp/info.el
index 3ded620cb7a..cfb44cb18f1 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3243,6 +3243,8 @@ Advanced commands:
   (make-local-variable 'line-move-ignore-invisible)
   (setq line-move-ignore-invisible t)
   (make-local-variable 'desktop-save-buffer)
+  (make-local-variable 'widen-automatically)
+  (setq widen-automatically nil)
   (setq desktop-save-buffer 'Info-desktop-buffer-misc-data)
   (add-hook 'kill-buffer-hook 'Info-kill-buffer nil t)
   (add-hook 'clone-buffer-hook 'Info-clone-buffer-hook nil t)
diff --git a/lisp/international/latexenc.el b/lisp/international/latexenc.el
new file mode 100644
index 00000000000..1fd04b55919
--- /dev/null
+++ b/lisp/international/latexenc.el
@@ -0,0 +1,171 @@
+;;; latexenc.el --- guess correct coding system in LaTeX files
+
+;; Copyright (C) 2005 Free Software Foundation, Inc.
+
+;; Author: Arne J,Ax(Brgensen <arne@arnested.dk>
+;; Keywords: mule, coding system, latex
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This code tries to guess the correct coding system of a LaTeX file.
+
+;; First it searches for a \inputencoding{...} or
+;; \usepackage[...]{inputenc} line in the file and looks up the ... in
+;; `latex-inputenc-coding-alist' to find the corresponding coding
+;; system.
+
+;; If this fails it will search for AUCTeX's TeX-master or tex-mode's
+;; tex-main-file variable in the local variables section and visit
+;; that file to get the coding system from the master file. This check
+;; can be disabled by setting `latexenc-dont-use-TeX-master-flag' to
+;; t.
+
+;; If we have still not found a coding system we will try to use the
+;; standard tex-mode's `tex-guess-main-file' and get the coding system
+;; from the main file. This check can be disabled by setting
+;; `latexenc-dont-use-tex-guess-main-file-flag' to t.
+
+;; The functionality is enabled by adding the function
+;; `latexenc-find-file-coding-system' to `file-coding-system-alist'
+;; like this
+
+;; (add-to-list 'file-coding-system-alist
+;;           '("\\.tex\\|\\.ltx\\|\\.dtx\\|\\.drv\\'" . latexenc-find-file-coding-system))
+
+;;; Code:
+
+;;;###autoload
+(defcustom latex-inputenc-coding-alist
+  '(("ansinew" . windows-1252) ; MS Windows ANSI encoding, extension of Latin-1
+    ("applemac" . mac-roman)
+    ("ascii" . us-ascii)
+    ("cp1250" . windows-1250) ; MS Windows encoding, codepage 1250
+    ("cp1252" . windows-1252) ; synonym of ansinew
+    ("cp1257" . cp1257)
+    ("cp437de" . cp437) ; IBM code page 437 (German version): 225 is \ss
+    ("cp437" . cp437) ; IBM code page 437: 225 is \beta
+    ("cp850" . cp850) ; IBM code page 850
+    ("cp852" . cp852) ; IBM code page 852
+    ;; ("cp858" . undecided) ; IBM code page 850 but with a euro symbol
+    ("cp865" . cp865) ; IBM code page 865
+    ;; The DECMultinational charaterset used by the OpenVMS system
+    ;; ("decmulti" . undecided)
+    ("latin1" . iso-8859-1)
+    ("latin2" . iso-8859-2)
+    ("latin3" . iso-8859-3)
+    ("latin4" . iso-8859-4)
+    ("latin5" . iso-8859-5)
+    ("latin9" . iso-8859-15)
+    ;; ("latin10" . undecided)
+    ;; ("macce" . undecided) ; Apple Central European
+    ("next" . next) ; The Next encoding
+    ("utf8" . utf-8)
+    ("utf8x" . utf-8)) ; used by the Unicode LaTeX package
+  "Mapping from encoding names used by LaTeX's \"inputenc.sty\" to Emacs coding systems.
+Used by the function `latexenc-find-file-coding-system'."
+  :group 'files
+  :group 'mule
+  :type '(alist :key-type (string :tag "LaTeX input encoding")
+                :value-type (coding-system :tag "Coding system")))
+
+;;;###autoload
+(defun latexenc-inputenc-to-coding-system (inputenc)
+  "Return the corresponding coding-system for the specified input encoding.
+Return nil if no matching coding system can be found."
+  (cdr (assoc inputenc latex-inputenc-coding-alist)))
+
+;;;###autoload
+(defun latexenc-coding-system-to-inputenc (cs)
+  "Return the corresponding input encoding for the specified coding system.
+Return nil if no matching input encoding can be found."
+  (let (result)
+    (catch 'result
+      (dolist (elem latex-inputenc-coding-alist result)
+        (let ((elem-cs (cdr elem)))
+          (when (and (coding-system-p elem-cs)
+                     (coding-system-p cs)
+                     (eq (coding-system-base cs) (coding-system-base elem-cs)))
+            (setq result (car elem))
+            (throw 'result result)))))))
+
+(defvar latexenc-dont-use-TeX-master-flag nil
+  "Non-nil means don't follow TeX-master to find the coding system.")
+
+(defvar latexenc-dont-use-tex-guess-main-file-flag nil
+  "Non-nil means don't use tex-guessmain-file to find the coding system.")
+
+;;;###autoload
+(defun latexenc-find-file-coding-system (arg-list)
+  "Determine the coding system of a LaTeX file if it uses \"inputenc.sty\".
+The mapping from LaTeX's \"inputenc.sty\" encoding names to Emacs
+coding system names is determined from `latex-inputenc-coding-alist'."
+  (if (eq (car arg-list) 'insert-file-contents)
+      (save-excursion
+        ;; try to find the coding system in this file
+        (goto-char (point-min))
+        (if (or
+             (re-search-forward "^[^%\n]*\\\\inputencoding{\\(.*\\)}" nil t)
+             (re-search-forward "^[^%\n]*\\\\usepackage\\[\\(.*\\)\\]{inputenc}" nil t))
+            (let* ((match (match-string 1))
+                   (sym (intern match)))
+              (when (latexenc-inputenc-to-coding-system match)
+                (setq sym (latexenc-inputenc-to-coding-system match))
+                (when (coding-system-p sym)
+                  sym
+                  (if (and (require 'code-pages nil t) (coding-system-p sym))
+                      sym
+                    'undecided))))
+          ;; else try to find it in the master/main file
+          (let (latexenc-main-file)
+            ;; is there a TeX-master or tex-main-file in the local variable section
+            (unless latexenc-dont-use-TeX-master-flag
+              (goto-char (point-max))
+              (when (re-search-backward "^%+ *\\(TeX-master\\|tex-main-file\\): *\"\\(.+\\)\"" nil t)
+                (let ((file (concat (file-name-directory (nth 1 arg-list)) (match-string 2))))
+                  (if (file-exists-p file)
+                      (setq latexenc-main-file file)
+                    (if (boundp 'TeX-default-extension)
+                        (when (file-exists-p (concat file "." TeX-default-extension))
+                          (setq latexenc-main-file (concat file "." TeX-default-extension)))
+                      (dolist (ext '("drv" "dtx" "ltx" "tex"))
+                        (if (file-exists-p (concat file "." ext))
+                            (setq latexenc-main-file (concat file "." ext)))))))))
+            ;; try tex-modes tex-guess-main-file
+            (when (and (not latexenc-dont-use-tex-guess-main-file-flag)
+                       (not latexenc-main-file))
+              (when (fboundp 'tex-guess-main-file)
+                (let ((tex-start-of-header "\\\\document\\(style\\|class\\)")
+                      (default-directory (file-name-directory (nth 1 arg-list))))
+                  (setq latexenc-main-file (tex-guess-main-file)))))
+            ;; if we found a master/main file get the coding system from it
+            (if (and latexenc-main-file
+                     (file-readable-p latexenc-main-file))
+                (let* ((latexenc-dont-use-tex-guess-main-file-flag t)
+                       (latexenc-dont-use-TeX-master-flag t)
+                       (latexenc-main-buffer (find-file-noselect latexenc-main-file t)))
+                  (or (buffer-local-value 'coding-system-for-write latexenc-main-buffer)
+                      (buffer-local-value 'buffer-file-coding-system latexenc-main-buffer)))
+              'undecided))))
+    'undecided))
+
+(provide 'latexenc)
+
+;; arch-tag: f971bc3e-1fec-4609-8f2f-73dd41ab22e1
+;;; latexenc.el ends here
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 08827e09f0f..8a2c8da2665 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -354,9 +354,6 @@ This also sets the following values:
     (setq default-process-coding-system
           (cons output-coding input-coding))))
 
-(defalias 'update-iso-coding-systems 'update-coding-systems-internal)
-(make-obsolete 'update-iso-coding-systems 'update-coding-systems-internal "20.3")
-
 (defun prefer-coding-system (coding-system)
   "Add CODING-SYSTEM at the front of the priority list for automatic detection.
 This also sets the following coding systems:
@@ -905,7 +902,10 @@ and TO is ignored."
     ;; give when file is re-read.
     ;; But don't do this if we explicitly ignored the cookie
     ;; by using `find-file-literally'.
-    (unless (or (stringp from) find-file-literally)
+    (unless (or (stringp from)
+                find-file-literally
+                (and coding-system
+                     (memq (coding-system-type coding-system) '(0 5))))
       (let ((auto-cs (save-excursion
                        (save-restriction
                          (widen)
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index a3a05a72958..79bf4f3432a 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -1443,7 +1443,8 @@ for decoding and encoding files, process I/O, etc."
         ;; the beginning of a doc string, work.
         ("\\(\\`\\|/\\)loaddefs.el\\'" . (raw-text . raw-text-unix))
         ("\\.tar\\'" . (no-conversion . no-conversion))
-        ( "\\.po[tx]?\\'\\|\\.po\\." . po-find-file-coding-system)
+        ( "\\.po[tx]?\\'\\|\\.po\\." . po-find-file-coding-system)
+        ("\\.\\(tex\\|ltx\\|dtx\\|drv\\)\\'" . latexenc-find-file-coding-system)
         ("" . (undecided . nil))))
 
 
diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el
index bfaffba230d..b85d98a1787 100644
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -211,12 +211,6 @@ defaults to \"...\"."
 ;;                       (prin1-to-string (cdr ret)))
 ;;             (prin1-to-string ret))))))
 
-;;; For backward compatibility ...
-;;;###autoload
-(defalias 'truncate-string 'truncate-string-to-width)
-
-;;;###autoload
-(make-obsolete 'truncate-string 'truncate-string-to-width "20.1")
 
 ;;; Nested alist handler.  Nested alist is alist whose elements are
 ;;; also nested alist.
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 8d5ca33881a..ca08d020c74 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -843,9 +843,6 @@ like `mime-charset' as well as the current style like `:mime-charset'."
           (plist-get (coding-system-plist coding-system)
                      (intern (concat ":" (symbol-name prop)))))))
 
-(defalias 'coding-system-parent 'coding-system-base)
-(make-obsolete 'coding-system-parent 'coding-system-base "20.3")
-
 (defun coding-system-eol-type-mnemonic (coding-system)
   "Return the string indicating end-of-line format of CODING-SYSTEM."
   (let* ((eol-type (coding-system-eol-type coding-system))
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 0bcbfbb2b89..94210d3018b 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -527,9 +527,9 @@ Type \\[isearch-quote-char] to quote control character to search for it.
  starting point.
 
 Type \\[isearch-query-replace] to start `query-replace' with string to\
-replace from  last search string.
+ replace from last search string.
 Type \\[isearch-query-replace-regexp] to start `query-replace-regexp'\
-with string to replace from last search string..
+ with string to replace from last search string..
 
 Type \\[isearch-toggle-case-fold] to toggle search case-sensitivity.
 Type \\[isearch-toggle-regexp] to toggle regular-expression mode.
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index fe64d871d96..100eb6076db 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -69,7 +69,7 @@ Preserves the `buffer-modified-p' state of the current buffer."
   :group 'jit-lock)
 
 
-(defcustom jit-lock-stealth-time 3
+(defcustom jit-lock-stealth-time 16
   "*Time in seconds to wait before beginning stealth fontification.
 Stealth fontification occurs if there is no input within this time.
 If nil, stealth fontification is never performed.
@@ -80,7 +80,7 @@ The value of this variable is used when JIT Lock mode is turned on."
   :group 'jit-lock)
 
 
-(defcustom jit-lock-stealth-nice 0.125
+(defcustom jit-lock-stealth-nice 0.5
   "*Time in seconds to pause between chunks of stealth fontification.
 Each iteration of stealth fontification is separated by this amount of time,
 thus reducing the demand that stealth fontification makes on the system.
diff --git a/lisp/jka-comp-hook.el b/lisp/jka-comp-hook.el
new file mode 100644
index 00000000000..ead50b76343
--- /dev/null
+++ b/lisp/jka-comp-hook.el
@@ -0,0 +1,293 @@
+;;; jka-comp-hook.el --- preloaded code to enable jka-compr.el
+
+;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2003, 2004, 2005  Free Software Foundation, Inc.
+
+;; Author: jka@ece.cmu.edu (Jay K. Adams)
+;; Maintainer: FSF
+;; Keywords: data
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This file contains the  code to enable and disable Auto-Compression mode.
+;; It is preloaded.  The guts of this mode are in jka-compr.el, which
+;; is loaded only when you really try to uncompress something.
+
+;;; Code:
+
+(defgroup compression nil
+  "Data compression utilities"
+  :group 'data)
+
+(defgroup jka-compr nil
+  "jka-compr customization"
+  :group 'compression)
+
+;;; I have this defined so that .Z files are assumed to be in unix
+;;; compress format; and .gz files, in gzip format, and .bz2 files in bzip fmt.
+(defcustom jka-compr-compression-info-list
+  ;;[regexp
+  ;; compr-message  compr-prog  compr-args
+  ;; uncomp-message uncomp-prog uncomp-args
+  ;; can-append auto-mode-flag strip-extension-flag file-magic-bytes]
+  '(["\\.Z\\(~\\|\\.~[0-9]+~\\)?\\'"
+     "compressing"    "compress"     ("-c")
+     "uncompressing"  "uncompress"   ("-c")
+     nil t "\037\235"]
+     ;; Formerly, these had an additional arg "-c", but that fails with
+     ;; "Version 0.1pl2, 29-Aug-97." (RedHat 5.1 GNU/Linux) and
+     ;; "Version 0.9.0b, 9-Sept-98".
+    ["\\.bz2\\'"
+     "bzip2ing"        "bzip2"         nil
+     "bunzip2ing"      "bzip2"         ("-d")
+     nil t "BZh"]
+    ["\\.tbz\\'"
+     "bzip2ing"        "bzip2"         nil
+     "bunzip2ing"      "bzip2"         ("-d")
+     nil nil "BZh"]
+    ["\\.tgz\\'"
+     "compressing"        "gzip"         ("-c" "-q")
+     "uncompressing"      "gzip"         ("-c" "-q" "-d")
+     t nil "\037\213"]
+    ["\\.g?z\\(~\\|\\.~[0-9]+~\\)?\\'"
+     "compressing"        "gzip"         ("-c" "-q")
+     "uncompressing"      "gzip"         ("-c" "-q" "-d")
+     t t "\037\213"]
+    ;; dzip is gzip with random access.  Its compression program can't
+    ;; read/write stdin/out, so .dz files can only be viewed without
+    ;; saving, having their contents decompressed with gzip.
+    ["\\.dz\\'"
+     nil              nil            nil
+     "uncompressing"      "gzip"         ("-c" "-q" "-d")
+     nil t "\037\213"])
+
+  "List of vectors that describe available compression techniques.
+Each element, which describes a compression technique, is a vector of
+the form [REGEXP COMPRESS-MSG COMPRESS-PROGRAM COMPRESS-ARGS
+UNCOMPRESS-MSG UNCOMPRESS-PROGRAM UNCOMPRESS-ARGS
+APPEND-FLAG STRIP-EXTENSION-FLAG FILE-MAGIC-CHARS], where:
+
+   regexp                is a regexp that matches filenames that are
+                         compressed with this format
+
+   compress-msg          is the message to issue to the user when doing this
+                         type of compression (nil means no message)
+
+   compress-program      is a program that performs this compression
+                         (nil means visit file in read-only mode)
+
+   compress-args         is a list of args to pass to the compress program
+
+   uncompress-msg        is the message to issue to the user when doing this
+                         type of uncompression (nil means no message)
+
+   uncompress-program    is a program that performs this compression
+
+   uncompress-args       is a list of args to pass to the uncompress program
+
+   append-flag           is non-nil if this compression technique can be
+                         appended
+
+   strip-extension-flag  non-nil means strip the regexp from file names
+                         before attempting to set the mode.
+
+   file-magic-chars      is a string of characters that you would find
+                         at the beginning of a file compressed in this way.
+
+Because of the way `call-process' is defined, discarding the stderr output of
+a program adds the overhead of starting a shell each time the program is
+invoked."
+  :type '(repeat (vector regexp
+                         (choice :tag "Compress Message"
+                                 (string :format "%v")
+                                 (const :tag "No Message" nil))
+                         (choice :tag "Compress Program"
+                                 (string)
+                                 (const :tag "None" nil))
+                         (repeat :tag "Compress Arguments" string)
+                         (choice :tag "Uncompress Message"
+                                 (string :format "%v")
+                                 (const :tag "No Message" nil))
+                         (choice :tag "Uncompress Program"
+                                 (string)
+                                 (const :tag "None" nil))
+                         (repeat :tag "Uncompress Arguments" string)
+                         (boolean :tag "Append")
+                         (boolean :tag "Strip Extension")
+                         (string :tag "Magic Bytes")))
+  :group 'jka-compr)
+
+(defcustom jka-compr-mode-alist-additions
+  (list (cons "\\.tgz\\'" 'tar-mode) (cons "\\.tbz\\'" 'tar-mode))
+  "A list of pairs to add to `auto-mode-alist' when jka-compr is installed."
+  :type '(repeat (cons string symbol))
+  :group 'jka-compr)
+
+(defcustom jka-compr-load-suffixes '(".gz")
+  "List of suffixes to try when loading files."
+  :type '(repeat string)
+  :group 'jka-compr)
+
+;; List of all the elements we actually added to file-coding-system-alist.
+(defvar jka-compr-added-to-file-coding-system-alist nil)
+
+(defvar jka-compr-file-name-handler-entry
+  nil
+  "The entry in `file-name-handler-alist' used by the jka-compr I/O functions.")
+
+(defun jka-compr-build-file-regexp ()
+  (mapconcat
+   'jka-compr-info-regexp
+   jka-compr-compression-info-list
+   "\\|"))
+
+;;; Functions for accessing the return value of jka-compr-get-compression-info
+(defun jka-compr-info-regexp               (info)  (aref info 0))
+(defun jka-compr-info-compress-message     (info)  (aref info 1))
+(defun jka-compr-info-compress-program     (info)  (aref info 2))
+(defun jka-compr-info-compress-args        (info)  (aref info 3))
+(defun jka-compr-info-uncompress-message   (info)  (aref info 4))
+(defun jka-compr-info-uncompress-program   (info)  (aref info 5))
+(defun jka-compr-info-uncompress-args      (info)  (aref info 6))
+(defun jka-compr-info-can-append           (info)  (aref info 7))
+(defun jka-compr-info-strip-extension      (info)  (aref info 8))
+(defun jka-compr-info-file-magic-bytes     (info)  (aref info 9))
+
+
+(defun jka-compr-get-compression-info (filename)
+  "Return information about the compression scheme of FILENAME.
+The determination as to which compression scheme, if any, to use is
+based on the filename itself and `jka-compr-compression-info-list'."
+  (catch 'compression-info
+    (let ((case-fold-search nil))
+      (mapcar
+       (function (lambda (x)
+                   (and (string-match (jka-compr-info-regexp x) filename)
+                        (throw 'compression-info x))))
+       jka-compr-compression-info-list)
+      nil)))
+
+(defun jka-compr-install ()
+  "Install jka-compr.
+This adds entries to `file-name-handler-alist' and `auto-mode-alist'
+and `inhibit-first-line-modes-suffixes'."
+
+  (setq jka-compr-file-name-handler-entry
+        (cons (jka-compr-build-file-regexp) 'jka-compr-handler))
+
+  (setq file-name-handler-alist (cons jka-compr-file-name-handler-entry
+                                      file-name-handler-alist))
+
+  (setq jka-compr-added-to-file-coding-system-alist nil)
+
+  (mapcar
+   (function (lambda (x)
+               ;; Don't do multibyte encoding on the compressed files.
+               (let ((elt (cons (jka-compr-info-regexp x)
+                                 '(no-conversion . no-conversion))))
+                 (setq file-coding-system-alist
+                       (cons elt file-coding-system-alist))
+                 (setq jka-compr-added-to-file-coding-system-alist
+                       (cons elt jka-compr-added-to-file-coding-system-alist)))
+
+               (and (jka-compr-info-strip-extension x)
+                    ;; Make entries in auto-mode-alist so that modes
+                    ;; are chosen right according to the file names
+                    ;; sans `.gz'.
+                    (setq auto-mode-alist
+                          (cons (list (jka-compr-info-regexp x)
+                                      nil 'jka-compr)
+                                auto-mode-alist))
+                    ;; Also add these regexps to
+                    ;; inhibit-first-line-modes-suffixes, so that a
+                    ;; -*- line in the first file of a compressed tar
+                    ;; file doesn't override tar-mode.
+                    (setq inhibit-first-line-modes-suffixes
+                          (cons (jka-compr-info-regexp x)
+                                inhibit-first-line-modes-suffixes)))))
+   jka-compr-compression-info-list)
+  (setq auto-mode-alist
+        (append auto-mode-alist jka-compr-mode-alist-additions))
+
+  ;; Make sure that (load "foo") will find /bla/foo.el.gz.
+  (setq load-suffixes
+        (apply 'append
+               (mapcar (lambda (suffix)
+                         (cons suffix
+                               (mapcar (lambda (ext) (concat suffix ext))
+                                       jka-compr-load-suffixes)))
+                       load-suffixes))))
+
+
+(defun jka-compr-installed-p ()
+  "Return non-nil if jka-compr is installed.
+The return value is the entry in `file-name-handler-alist' for jka-compr."
+
+  (let ((fnha file-name-handler-alist)
+        (installed nil))
+
+    (while (and fnha (not installed))
+     (and (eq (cdr (car fnha)) 'jka-compr-handler)
+           (setq installed (car fnha)))
+      (setq fnha (cdr fnha)))
+
+    installed))
+
+(define-minor-mode auto-compression-mode
+  "Toggle automatic file compression and uncompression.
+With prefix argument ARG, turn auto compression on if positive, else off.
+Returns the new status of auto compression (non-nil means on)."
+  :global t :group 'jka-compr
+  (let* ((installed (jka-compr-installed-p))
+         (flag auto-compression-mode))
+    (cond
+     ((and flag installed) t)           ; already installed
+     ((and (not flag) (not installed)) nil) ; already not installed
+     (flag (jka-compr-install))
+     (t (jka-compr-uninstall)))))
+
+(defmacro with-auto-compression-mode (&rest body)
+  "Evalute BODY with automatic file compression and uncompression enabled."
+  (let ((already-installed (make-symbol "already-installed")))
+    `(let ((,already-installed (jka-compr-installed-p)))
+       (unwind-protect
+           (progn
+             (unless ,already-installed
+               (jka-compr-install))
+             ,@body)
+         (unless ,already-installed
+           (jka-compr-uninstall))))))
+(put 'with-auto-compression-mode 'lisp-indent-function 0)
+
+
+;;; This is what we need to know about jka-compr-handler
+;;; in order to decide when to call it.
+
+(put 'jka-compr-handler 'safe-magic t)
+(put 'jka-compr-handler 'operations '(jka-compr-byte-compiler-base-file-name
+                                      write-region insert-file-contents
+                                      file-local-copy load))
+
+;;; Turn on the mode.
+(auto-compression-mode 1)
+
+(provide 'jka-comp-hook)
+
+;; arch-tag: 4bd73429-f400-45fe-a065-270a113e31a8
+;;; jka-comp-hook.el ends here
\ No newline at end of file
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 5bda4349288..ec2eab463cc 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -100,15 +100,6 @@
 
 ;;; Code:
 
-(defgroup compression nil
-  "Data compression utilities"
-  :group 'data)
-
-(defgroup jka-compr nil
-  "jka-compr customization"
-  :group 'compression)
-
-
 (defcustom jka-compr-shell "sh"
   "*Shell to be used for calling compression programs.
 The value of this variable only matters if you want to discard the
@@ -120,118 +111,6 @@ for `jka-compr-compression-info-list')."
 (defvar jka-compr-use-shell
   (not (memq system-type '(ms-dos windows-nt))))
 
-;;; I have this defined so that .Z files are assumed to be in unix
-;;; compress format; and .gz files, in gzip format, and .bz2 files in bzip fmt.
-(defcustom jka-compr-compression-info-list
-  ;;[regexp
-  ;; compr-message  compr-prog  compr-args
-  ;; uncomp-message uncomp-prog uncomp-args
-  ;; can-append auto-mode-flag strip-extension-flag file-magic-bytes]
-  '(["\\.Z\\(~\\|\\.~[0-9]+~\\)?\\'"
-     "compressing"    "compress"     ("-c")
-     "uncompressing"  "uncompress"   ("-c")
-     nil t "\037\235"]
-     ;; Formerly, these had an additional arg "-c", but that fails with
-     ;; "Version 0.1pl2, 29-Aug-97." (RedHat 5.1 GNU/Linux) and
-     ;; "Version 0.9.0b, 9-Sept-98".
-    ["\\.bz2\\'"
-     "bzip2ing"        "bzip2"         nil
-     "bunzip2ing"      "bzip2"         ("-d")
-     nil t "BZh"]
-    ["\\.tbz\\'"
-     "bzip2ing"        "bzip2"         nil
-     "bunzip2ing"      "bzip2"         ("-d")
-     nil nil "BZh"]
-    ["\\.tgz\\'"
-     "zipping"        "gzip"         ("-c" "-q")
-     "unzipping"      "gzip"         ("-c" "-q" "-d")
-     t nil "\037\213"]
-    ["\\.g?z\\(~\\|\\.~[0-9]+~\\)?\\'"
-     "zipping"        "gzip"         ("-c" "-q")
-     "unzipping"      "gzip"         ("-c" "-q" "-d")
-     t t "\037\213"]
-    ;; dzip is gzip with random access.  Its compression program can't
-    ;; read/write stdin/out, so .dz files can only be viewed without
-    ;; saving, having their contents decompressed with gzip.
-    ["\\.dz\\'"
-     nil              nil            nil
-     "unzipping"      "gzip"         ("-c" "-q" "-d")
-     nil t "\037\213"])
-
-  "List of vectors that describe available compression techniques.
-Each element, which describes a compression technique, is a vector of
-the form [REGEXP COMPRESS-MSG COMPRESS-PROGRAM COMPRESS-ARGS
-UNCOMPRESS-MSG UNCOMPRESS-PROGRAM UNCOMPRESS-ARGS
-APPEND-FLAG STRIP-EXTENSION-FLAG FILE-MAGIC-CHARS], where:
-
-   regexp                is a regexp that matches filenames that are
-                         compressed with this format
-
-   compress-msg          is the message to issue to the user when doing this
-                         type of compression (nil means no message)
-
-   compress-program      is a program that performs this compression
-                         (nil means visit file in read-only mode)
-
-   compress-args         is a list of args to pass to the compress program
-
-   uncompress-msg        is the message to issue to the user when doing this
-                         type of uncompression (nil means no message)
-
-   uncompress-program    is a program that performs this compression
-
-   uncompress-args       is a list of args to pass to the uncompress program
-
-   append-flag           is non-nil if this compression technique can be
-                         appended
-
-   strip-extension-flag  non-nil means strip the regexp from file names
-                         before attempting to set the mode.
-
-   file-magic-chars      is a string of characters that you would find
-                         at the beginning of a file compressed in this way.
-
-Because of the way `call-process' is defined, discarding the stderr output of
-a program adds the overhead of starting a shell each time the program is
-invoked."
-  :type '(repeat (vector regexp
-                         (choice :tag "Compress Message"
-                                 (string :format "%v")
-                                 (const :tag "No Message" nil))
-                         (choice :tag "Compress Program"
-                                 (string)
-                                 (const :tag "None" nil))
-                         (repeat :tag "Compress Arguments" string)
-                         (choice :tag "Uncompress Message"
-                                 (string :format "%v")
-                                 (const :tag "No Message" nil))
-                         (choice :tag "Uncompress Program"
-                                 (string)
-                                 (const :tag "None" nil))
-                         (repeat :tag "Uncompress Arguments" string)
-                         (boolean :tag "Append")
-                         (boolean :tag "Strip Extension")
-                         (string :tag "Magic Bytes")))
-  :group 'jka-compr)
-
-(defcustom jka-compr-mode-alist-additions
-  (list (cons "\\.tgz\\'" 'tar-mode) (cons "\\.tbz\\'" 'tar-mode))
-  "A list of pairs to add to `auto-mode-alist' when jka-compr is installed."
-  :type '(repeat (cons string symbol))
-  :group 'jka-compr)
-
-(defcustom jka-compr-load-suffixes '(".gz")
-  "List of suffixes to try when loading files."
-  :type '(repeat string)
-  :group 'jka-compr)
-
-;; List of all the elements we actually added to file-coding-system-alist.
-(defvar jka-compr-added-to-file-coding-system-alist nil)
-
-(defvar jka-compr-file-name-handler-entry
-  nil
-  "The entry in `file-name-handler-alist' used by the jka-compr I/O functions.")
-
 (defvar jka-compr-really-do-compress nil
   "Non-nil in a buffer whose visited file was uncompressed on visiting it.
 This means compress the data on writing the file, even if the
@@ -764,12 +643,13 @@ There should be no more than seven characters after the final `/'."
 (put 'byte-compiler-base-file-name 'jka-compr
      'jka-compr-byte-compiler-base-file-name)
 
+;;;###autoload
 (defvar jka-compr-inhibit nil
   "Non-nil means inhibit automatic uncompression temporarily.
 Lisp programs can bind this to t to do that.
 It is not recommended to set this variable permanently to anything but nil.")
 
-(put 'jka-compr-handler 'safe-magic t)
+;;;###autoload
 (defun jka-compr-handler (operation &rest args)
   (save-match-data
     (let ((jka-op (get operation 'jka-compr)))
@@ -790,65 +670,6 @@ It is not recommended to set this variable permanently to anything but nil.")
     (apply operation args)))
 
 
-(defun jka-compr-build-file-regexp ()
-  (mapconcat
-   'jka-compr-info-regexp
-   jka-compr-compression-info-list
-   "\\|"))
-
-
-(defun jka-compr-install ()
-  "Install jka-compr.
-This adds entries to `file-name-handler-alist' and `auto-mode-alist'
-and `inhibit-first-line-modes-suffixes'."
-
-  (setq jka-compr-file-name-handler-entry
-        (cons (jka-compr-build-file-regexp) 'jka-compr-handler))
-
-  (setq file-name-handler-alist (cons jka-compr-file-name-handler-entry
-                                      file-name-handler-alist))
-
-  (setq jka-compr-added-to-file-coding-system-alist nil)
-
-  (mapcar
-   (function (lambda (x)
-               ;; Don't do multibyte encoding on the compressed files.
-               (let ((elt (cons (jka-compr-info-regexp x)
-                                 '(no-conversion . no-conversion))))
-                 (setq file-coding-system-alist
-                       (cons elt file-coding-system-alist))
-                 (setq jka-compr-added-to-file-coding-system-alist
-                       (cons elt jka-compr-added-to-file-coding-system-alist)))
-
-               (and (jka-compr-info-strip-extension x)
-                    ;; Make entries in auto-mode-alist so that modes
-                    ;; are chosen right according to the file names
-                    ;; sans `.gz'.
-                    (setq auto-mode-alist
-                          (cons (list (jka-compr-info-regexp x)
-                                      nil 'jka-compr)
-                                auto-mode-alist))
-                    ;; Also add these regexps to
-                    ;; inhibit-first-line-modes-suffixes, so that a
-                    ;; -*- line in the first file of a compressed tar
-                    ;; file doesn't override tar-mode.
-                    (setq inhibit-first-line-modes-suffixes
-                          (cons (jka-compr-info-regexp x)
-                                inhibit-first-line-modes-suffixes)))))
-   jka-compr-compression-info-list)
-  (setq auto-mode-alist
-        (append auto-mode-alist jka-compr-mode-alist-additions))
-
-  ;; Make sure that (load "foo") will find /bla/foo.el.gz.
-  (setq load-suffixes
-        (apply 'append
-               (mapcar (lambda (suffix)
-                         (cons suffix
-                               (mapcar (lambda (ext) (concat suffix ext))
-                                       jka-compr-load-suffixes)))
-                       load-suffixes))))
-
-
 (defun jka-compr-uninstall ()
   "Uninstall jka-compr.
 This removes the entries in `file-name-handler-alist' and `auto-mode-alist'
@@ -908,59 +729,6 @@ by `jka-compr-installed'."
         (push suffix suffixes)))
     (setq load-suffixes (nreverse suffixes))))
 
-
-(defun jka-compr-installed-p ()
-  "Return non-nil if jka-compr is installed.
-The return value is the entry in `file-name-handler-alist' for jka-compr."
-
-  (let ((fnha file-name-handler-alist)
-        (installed nil))
-
-    (while (and fnha (not installed))
-     (and (eq (cdr (car fnha)) 'jka-compr-handler)
-           (setq installed (car fnha)))
-      (setq fnha (cdr fnha)))
-
-    installed))
-
-
-;;; Add the file I/O hook if it does not already exist.
-;;; Make sure that jka-compr-file-name-handler-entry is eq to the
-;;; entry for jka-compr in file-name-handler-alist.
-(and (jka-compr-installed-p)
-     (jka-compr-uninstall))
-
-
-;;;###autoload
-(define-minor-mode auto-compression-mode
-  "Toggle automatic file compression and uncompression.
-With prefix argument ARG, turn auto compression on if positive, else off.
-Returns the new status of auto compression (non-nil means on)."
-  :global t :group 'jka-compr
-  (let* ((installed (jka-compr-installed-p))
-         (flag auto-compression-mode))
-    (cond
-     ((and flag installed) t)           ; already installed
-     ((and (not flag) (not installed)) nil) ; already not installed
-     (flag (jka-compr-install))
-     (t (jka-compr-uninstall)))))
-
-
-;;;###autoload
-(defmacro with-auto-compression-mode (&rest body)
-  "Evalute BODY with automatic file compression and uncompression enabled."
-  (let ((already-installed (make-symbol "already-installed")))
-    `(let ((,already-installed (jka-compr-installed-p)))
-       (unwind-protect
-           (progn
-             (unless ,already-installed
-               (jka-compr-install))
-             ,@body)
-         (unless ,already-installed
-           (jka-compr-uninstall))))))
-(put 'with-auto-compression-mode 'lisp-indent-function 0)
-
-
 (provide 'jka-compr)
 
 ;;; arch-tag: 3f15b630-e9a7-46c4-a22a-94afdde86ebc
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index 20816fc7fea..7224786c50d 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -960,9 +960,9 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
 (defun kmacro-step-edit-prompt (macro index)
   ;; Show step-edit prompt
   (let ((keys (and (not kmacro-step-edit-appending)
-                   index (substring macro index executing-macro-index)))
+                   index (substring macro index executing-kbd-macro-index)))
         (future (and (not kmacro-step-edit-appending)
-                     (substring macro executing-macro-index)))
+                     (substring macro executing-kbd-macro-index)))
         (message-log-max nil)
         (curmsg (current-message)))
 
@@ -1020,12 +1020,12 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
            (not (eq kmacro-step-edit-action t)))
       ;; Find the actual end of this key sequence.
       ;; Must be able to backtrack in case we actually execute it.
-      (setq restore-index executing-macro-index)
+      (setq restore-index executing-kbd-macro-index)
       (let (unread-command-events)
         (quoted-insert 0)
         (when unread-command-events
-          (setq executing-macro-index (- executing-macro-index (length unread-command-events))
-                next-index executing-macro-index)))))
+          (setq executing-kbd-macro-index (- executing-kbd-macro-index (length unread-command-events))
+                next-index executing-kbd-macro-index)))))
 
     ;; Query the user; stop macro exection temporarily
     (let ((macro executing-kbd-macro)
@@ -1045,7 +1045,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
             (when unread-command-events
               (setq kmacro-step-edit-new-macro
                     (substring kmacro-step-edit-new-macro 0 (- (length unread-command-events)))
-                    executing-macro-index (- executing-macro-index (length unread-command-events)))))
+                    executing-kbd-macro-index (- executing-kbd-macro-index (length unread-command-events)))))
           (setq current-prefix-arg nil
                 prefix-arg nil)
           (setq act 'ignore))
@@ -1099,24 +1099,24 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
         (setq act t)
         t)
        ((member act '(insert-1 insert))
-        (setq executing-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index))
+        (setq executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index))
         (setq kmacro-step-edit-inserting (if (eq act 'insert-1) 1 t))
         nil)
        ((member act '(replace-1 replace))
         (setq kmacro-step-edit-inserting (if (eq act 'replace-1) 1 t))
         (setq kmacro-step-edit-prefix-index nil)
-        (if (= executing-macro-index (length executing-kbd-macro))
+        (if (= executing-kbd-macro-index (length executing-kbd-macro))
             (setq executing-kbd-macro (vconcat executing-kbd-macro [nil])
                   kmacro-step-edit-appending t))
         nil)
        ((eq act 'append)
         (setq kmacro-step-edit-inserting t)
-        (if (= executing-macro-index (length executing-kbd-macro))
+        (if (= executing-kbd-macro-index (length executing-kbd-macro))
             (setq executing-kbd-macro (vconcat executing-kbd-macro [nil])
                   kmacro-step-edit-appending t))
         t)
        ((eq act 'append-end)
-        (if (= executing-macro-index (length executing-kbd-macro))
+        (if (= executing-kbd-macro-index (length executing-kbd-macro))
             (setq executing-kbd-macro (vconcat executing-kbd-macro [nil])
                   kmacro-step-edit-inserting t
                   kmacro-step-edit-appending t)
@@ -1124,21 +1124,21 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
         (setq act t)
         t)
        ((eq act 'help)
-        (setq executing-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index))
+        (setq executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index))
         (setq kmacro-step-edit-help (not kmacro-step-edit-help))
         nil)
        (t ;; Ignore unknown responses
-        (setq executing-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index))
+        (setq executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index))
         nil))
-      (if (> executing-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index))
+      (if (> executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index))
           (setq kmacro-step-edit-new-macro
                 (vconcat kmacro-step-edit-new-macro
                          (substring executing-kbd-macro
                                     (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)
-                                    (if (eq act t) nil executing-macro-index)))
+                                    (if (eq act t) nil executing-kbd-macro-index)))
                 kmacro-step-edit-prefix-index nil))
       (if restore-index
-          (setq executing-macro-index restore-index)))
+          (setq executing-kbd-macro-index restore-index)))
      (t
       (setq this-command 'ignore)))
     (setq kmacro-step-edit-key-index next-index)))
@@ -1151,7 +1151,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
         (executing-kbd-macro nil)
         (defining-kbd-macro nil)
         cmd keys next-index)
-    (setq executing-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)
+    (setq executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)
           kmacro-step-edit-prefix-index nil)
     (kmacro-step-edit-prompt macro nil)
     ;; Now, we have read a key sequence from the macro, but we don't want
@@ -1172,8 +1172,8 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
             (setq kmacro-step-edit-inserting nil)
             (when unread-command-events
               (setq keys (substring keys 0 (- (length unread-command-events)))
-                    executing-macro-index (- executing-macro-index (length unread-command-events))
-                    next-index executing-macro-index
+                    executing-kbd-macro-index (- executing-kbd-macro-index (length unread-command-events))
+                    next-index executing-kbd-macro-index
                     unread-command-events nil)))
           (setq cmd 'ignore)
           nil)
@@ -1217,7 +1217,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
      ((eq kmacro-step-edit-active 'ignore)
       (setq this-command 'ignore))
      ((eq kmacro-step-edit-active 'append-end)
-      (if (= executing-macro-index (length executing-kbd-macro))
+      (if (= executing-kbd-macro-index (length executing-kbd-macro))
           (setq executing-kbd-macro (vconcat executing-kbd-macro [nil])
                 kmacro-step-edit-inserting t
                 kmacro-step-edit-appending t
@@ -1243,8 +1243,8 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
   (when kmacro-step-edit-active
     (add-hook 'pre-command-hook 'kmacro-step-edit-pre-command nil nil)
     (if kmacro-step-edit-key-index
-        (setq executing-macro-index kmacro-step-edit-key-index)
-      (setq kmacro-step-edit-key-index executing-macro-index))))
+        (setq executing-kbd-macro-index kmacro-step-edit-key-index)
+      (setq kmacro-step-edit-key-index executing-kbd-macro-index))))
 
 
 (defun kmacro-step-edit-macro ()
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 1c71cc6cd07..da6fd695da3 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -188,27 +188,34 @@ such as redefining an Emacs function."
                              (string-match "-hooks?\\'" (symbol-name x)))
                         (memq x unload-feature-special-hooks))) ; Known abnormal hooks etc.
            (dolist (y unload-hook-features-list)
-             (when (eq (car-safe y) 'defun)
-               (remove-hook x (cdr y))))))))
+             (when (and (eq (car-safe y) 'defun)
+                        (not (get (cdr y) 'autoload)))
+               (remove-hook x (cdr y)))))))
+      ;; Remove any feature-symbols from auto-mode-alist as well.
+      (dolist (y unload-hook-features-list)
+        (when (and (eq (car-safe y) 'defun)
+                   (not (get (cdr y) 'autoload)))
+          (setq auto-mode-alist
+                (rassq-delete-all (cdr y) auto-mode-alist)))))
     (when (fboundp 'elp-restore-function) ; remove ELP stuff first
       (dolist (elt unload-hook-features-list)
         (when (symbolp elt)
           (elp-restore-function elt))))
     (dolist (x unload-hook-features-list)
       (if (consp x)
-          (progn
-            ;; Remove any feature names that this file provided.
-            (when (eq (car x) 'provide)
-              (setq features (delq (cdr x) features)))
-            (when (eq (car x) 'defun)
-              (let ((fun (cdr x)))
-                (when (fboundp fun)
-                  (when (fboundp 'ad-unadvise)
-                    (ad-unadvise fun))
-                  (fmakunbound fun)
-                  (let ((aload (get fun 'autoload)))
-                    (when aload 
-                      (fset fun (cons 'autoload aload))))))))
+          (cond
+           ;; Remove any feature names that this file provided.
+           ((eq (car x) 'provide)
+            (setq features (delq (cdr x) features)))
+           ((eq (car x) 'defun)
+            (let ((fun (cdr x)))
+              (when (fboundp fun)
+                (when (fboundp 'ad-unadvise)
+                  (ad-unadvise fun))
+                (fmakunbound fun)
+                (let ((aload (get fun 'autoload)))
+                  (when aload
+                    (fset fun (cons 'autoload aload))))))))
         ;; Kill local values as much as possible.
         (dolist (buf (buffer-list))
           (with-current-buffer buf
@@ -217,8 +224,7 @@ such as redefining an Emacs function."
         (unless (local-variable-if-set-p x)
           (makunbound x))))
     ;; Delete the load-history element for this file.
-    (let ((elt (assoc file load-history)))
-      (setq load-history (delq elt load-history)))))
+    (setq load-history (delq (assoc file load-history) load-history))))
 
 (provide 'loadhist)
 
diff --git a/lisp/loadup.el b/lisp/loadup.el
index df7134edcc2..4cc6ebbff0f 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -179,6 +179,7 @@
 (message "%s" (garbage-collect))
 
 (load "vc-hooks")
+(load "jka-comp-hook")
 (load "ediff-hook")
 (if (fboundp 'x-show-tip) (load "tooltip"))
 (message "%s" (garbage-collect))
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 377cb0e4d5a..1feaf94317f 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -662,11 +662,12 @@ The first parenthesized expression should match the MIME-charset name.")
             ;; Use MATCH-ANCHORED to effectively anchor the regexp left side.
             `(,cite-chars
               (,(concat "\\=[ \t]*"
-                        "\\(\\([" cite-prefix "]+[" cite-suffix "]*\\)?"
-                        "\\(" cite-chars "[ \t]*\\)\\)+"
+                        "\\(\\(\\([" cite-prefix "]+[" cite-suffix "]*\\)?"
+                        "\\(" cite-chars "[ \t]*\\)\\)+\\)"
                         "\\(.*\\)")
                (beginning-of-line) (end-of-line)
-               (3 font-lock-comment-face nil t)))
+               (1 font-lock-comment-delimiter-face nil t)
+               (5 font-lock-comment-face nil t)))
             '("^\\(X-[a-z0-9-]+\\|In-reply-to\\|Date\\):.*\\(\n[ \t]+.*\\)*$"
               . font-lock-string-face))))
   "Additional expressions to highlight in Rmail mode.")
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 91e768f7e7b..5667aa85ff1 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -378,11 +378,12 @@ actually occur.")
             ;; Use MATCH-ANCHORED to effectively anchor the regexp left side.
             `(,cite-chars
               (,(concat "\\=[ \t]*"
-                        "\\(\\([" cite-prefix "]+[" cite-suffix "]*\\)?"
-                        "\\(" cite-chars "[ \t]*\\)\\)+"
+                        "\\(\\(\\([" cite-prefix "]+[" cite-suffix "]*\\)?"
+                        "\\(" cite-chars "[ \t]*\\)\\)+\\)"
                         "\\(.*\\)")
                (beginning-of-line) (end-of-line)
-               (3 font-lock-comment-face nil t)))
+               (1 font-lock-comment-delimiter-face nil t)
+               (5 font-lock-comment-face nil t)))
             '("^\\(X-[A-Za-z0-9-]+\\|In-reply-to\\):.*\\(\n[ \t]+.*\\)*$"
               . font-lock-string-face))))
   "Additional expressions to highlight in Mail mode.")
diff --git a/lisp/man.el b/lisp/man.el
index 8c384028e17..712b1f30e7f 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -387,6 +387,7 @@ Otherwise, the value is whatever the function
   (let ((table (copy-syntax-table (standard-syntax-table))))
     (modify-syntax-entry ?. "w" table)
     (modify-syntax-entry ?_ "w" table)
+    (modify-syntax-entry ?: "w" table)  ; for PDL::Primitive in Perl man pages
     table)
   "Syntax table used in Man mode buffers.")
 
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index d0d42b9666d..ee51e8c349a 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -639,9 +639,9 @@ by \"Save Options\" in Custom buffers.")
   (let ((need-save nil))
     ;; These are set with menu-bar-make-mm-toggle, which does not
     ;; put on a customized-value property.
-    (dolist (elt '(line-number-mode column-number-mode cua-mode show-paren-mode
-                   transient-mark-mode global-font-lock-mode
-                   blink-cursor-mode))
+    (dolist (elt '(line-number-mode column-number-mode size-indication-mode
+                   cua-mode show-paren-mode transient-mark-mode
+                   global-font-lock-mode blink-cursor-mode))
       (and (customize-mark-to-save elt)
            (setq need-save t)))
     ;; These are set with `customize-set-variable'.
@@ -692,6 +692,11 @@ by \"Save Options\" in Custom buffers.")
                            "Line Numbers"
                            "Show the current line number in the mode line"))
 
+(define-key menu-bar-showhide-menu [size-indication-mode]
+  (menu-bar-make-mm-toggle size-indication-mode
+                           "Size Indication"
+                           "Show the size of the buffer in the mode line"))
+
 (define-key menu-bar-showhide-menu [linecolumn-separator]
   '("--"))
 
diff --git a/lisp/midnight.el b/lisp/midnight.el
index a81ce37856a..83b21dda7e4 100644
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -48,6 +48,11 @@
   :group 'calendar
   :version "20.3")
 
+(defvar midnight-timer nil
+  "Timer running the `midnight-hook' `midnight-delay' seconds after midnight.
+Use `cancel-timer' to stop it and `midnight-delay-set' to change
+the time when it is run.")
+
 (defcustom midnight-mode nil
   "*Non-nil means run `midnight-hook' at midnight.
 Setting this variable outside customize has no effect;
@@ -204,11 +209,6 @@ The default value is `clean-buffer-list'."
   (multiple-value-bind (sec min hrs) (decode-time)
     (- (* 24 60 60) (* 60 60 hrs) (* 60 min) sec)))
 
-(defvar midnight-timer nil
-  "Timer running the `midnight-hook' `midnight-delay' seconds after midnight.
-Use `cancel-timer' to stop it and `midnight-delay-set' to change
-the time when it is run.")
-
 ;;;###autoload
 (defun midnight-delay-set (symb tm)
   "Modify `midnight-timer' according to `midnight-delay'.
diff --git a/lisp/mouse.el b/lisp/mouse.el
index a527b040d8a..f4f531959b7 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -908,7 +908,6 @@ at the same position."
       (track-mouse
         (while (progn
                  (setq event (read-event))
-                 (setq mve (cons event (and (boundp 'mve) mve)))
                  (or (mouse-movement-p event)
                      (memq (car-safe event) '(switch-frame select-window))))
           (if (memq (car-safe event) '(switch-frame select-window))
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index 581a070134d..4a54702643a 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -160,7 +160,7 @@ These options can be used to limit how many ICMP packets are emitted."
   "Regexp to match the nslookup prompt.
 
 This variable is only used if the variable
-`comint-use-prompt-regexp-instead-of-fields' is non-nil."
+`comint-use-prompt-regexp' is non-nil."
   :group 'net-utils
   :type  'regexp)
 
@@ -183,7 +183,7 @@ This variable is only used if the variable
   "Regexp which matches the FTP program's prompt.
 
 This variable is only used if the variable
-`comint-use-prompt-regexp-instead-of-fields' is non-nil."
+`comint-use-prompt-regexp' is non-nil."
   :group 'net-utils
   :type  'regexp)
 
@@ -201,7 +201,7 @@ This variable is only used if the variable
   "Regexp which matches the smbclient program's prompt.
 
 This variable is only used if the variable
-`comint-use-prompt-regexp-instead-of-fields' is non-nil."
+`comint-use-prompt-regexp' is non-nil."
   :group 'net-utils
   :type  'regexp)
 
diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el
index fa7e0d1950e..67521ca2e73 100644
--- a/lisp/net/rlogin.el
+++ b/lisp/net/rlogin.el
@@ -179,10 +179,15 @@ variable."
 
   (let* ((process-connection-type rlogin-process-connection-type)
          (args (if rlogin-explicit-args
-                   (append (rlogin-parse-words input-args)
+                   (append (split-string input-args)
                            rlogin-explicit-args)
-                 (rlogin-parse-words input-args)))
-         (host (car args))
+                 (split-string input-args)))
+         (host (let ((tail args))
+                 ;; Find first arg that doesn't look like an option.
+                 ;; This still loses for args that take values, feh.
+                 (while (and tail (= ?- (aref (car tail) 0)))
+                   (setq tail (cdr tail)))
+                 (car tail)))
          (user (or (car (cdr (member "-l" args)))
                    (user-login-name)))
          (buffer-name (if (string= user (user-login-name))
@@ -281,19 +286,6 @@ local one share the same directories (through NFS)."
           (goto-char orig-point)))))))
 
 
-;; Parse a line into its constituent parts (words separated by
-;; whitespace).  Return a list of the words.
-(defun rlogin-parse-words (line)
-  (let ((list nil)
-        (posn 0)
-        (match-data (match-data)))
-    (while (string-match "[^ \t\n]+" line posn)
-      (setq list (cons (substring line (match-beginning 0) (match-end 0))
-                       list))
-      (setq posn (match-end 0)))
-    (set-match-data (match-data))
-    (nreverse list)))
-
 (defun rlogin-send-Ctrl-C ()
   (interactive)
   (process-send-string nil "\C-c"))
diff --git a/lisp/novice.el b/lisp/novice.el
index 3e63f0a7bc6..171285ca3f1 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -1,6 +1,6 @@
 ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs
 
-;; Copyright (C) 1985, 1986, 1987, 1994, 2002, 2004
+;; Copyright (C) 1985, 1986, 1987, 1994, 2002, 2004, 2005
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -182,9 +182,10 @@ to future sessions."
       (if (search-forward (concat "(put '" (symbol-name command) " ") nil t)
           (delete-region
            (progn (beginning-of-line) (point))
-           (progn (forward-line 1) (point))))
-      (goto-char (point-max))
-      (insert "\n(put '" (symbol-name command) " 'disabled t)\n")
+           (progn (forward-line 1) (point)))
+        (goto-char (point-max))
+        (insert ?\n))
+      (insert "(put '" (symbol-name command) " 'disabled t)\n")
       (save-buffer))))
 
 (provide 'novice)
diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el
index 0f66099c46f..cf367072838 100644
--- a/lisp/pcvs-info.el
+++ b/lisp/pcvs-info.el
@@ -41,11 +41,13 @@
 ;;;; config variables
 ;;;;
 
-(defcustom cvs-display-full-path t
-  "*Specifies how the filenames should look like in the listing.
-If t, their full path name will be displayed, else only the filename."
+(defcustom cvs-display-full-name t
+  "*Specifies how the filenames should be displayed in the listing.
+If non-nil, their full filename name will be displayed, else only the
+non-directory part."
   :group 'pcl-cvs
   :type '(boolean))
+(define-obsolete-variable-alias 'cvs-display-full-path 'cvs-display-full-name)
 
 (defcustom cvs-allow-dir-commit nil
   "*Allow `cvs-mode-commit' on directories.
@@ -165,7 +167,7 @@ to confuse some users sometimes."
   ;; In addition to the above, the following values can be extracted:
 
   ;; handled    ;; t if this file doesn't require further action.
-  ;; full-path  ;; The complete relative filename.
+  ;; full-name  ;; The complete relative filename.
   ;; pp-name    ;; The printed file name
   ;; backup-file;; For MERGED and CONFLICT files after a \"cvs update\",
                 ;; this is a full path to the backup file where the
@@ -201,7 +203,7 @@ to confuse some users sometimes."
 
 ;; Fake selectors:
 
-(defun cvs-fileinfo->full-path (fileinfo)
+(defun cvs-fileinfo->full-name (fileinfo)
   "Return the full path for the file that is described in FILEINFO."
   (let ((dir (cvs-fileinfo->dir fileinfo)))
     (if (eq (cvs-fileinfo->type fileinfo) 'DIRCHANGE)
@@ -209,11 +211,12 @@ to confuse some users sometimes."
       ;; Here, I use `concat' rather than `expand-file-name' because I want
       ;; the resulting path to stay relative if `dir' is relative.
       (concat dir (cvs-fileinfo->file fileinfo)))))
+(define-obsolete-function-alias 'cvs-fileinfo->full-path 'cvs-fileinfo->full-name)
 
 (defun cvs-fileinfo->pp-name (fi)
   "Return the filename of FI as it should be displayed."
-  (if cvs-display-full-path
-      (cvs-fileinfo->full-path fi)
+  (if cvs-display-full-name
+      (cvs-fileinfo->full-name fi)
     (cvs-fileinfo->file fi)))
 
 (defun cvs-fileinfo->backup-file (fileinfo)
@@ -225,10 +228,11 @@ to confuse some users sometimes."
                                  (concat "\\`" (regexp-quote cvs-bakprefix)
                                          (regexp-quote file) "\\(\\.[0-9]+\\.[0-9]+\\)+\\'")))
          bf)
-    (dolist (f files bf)
+    (dolist (f files)
       (when (and (file-readable-p f)
                  (or (null bf) (file-newer-than-file-p f bf)))
-        (setq bf (concat dir f))))))
+        (setq bf f)))
+    (concat dir bf)))
 
 ;; (defun cvs-fileinfo->handled (fileinfo)
 ;;   "Tell if this requires further action"
@@ -327,7 +331,7 @@ For use by the cookie package."
     (insert
      (case type
        (DIRCHANGE (concat "In directory "
-                          (cvs-add-face (cvs-fileinfo->full-path fileinfo)
+                          (cvs-add-face (cvs-fileinfo->full-name fileinfo)
                                         'cvs-header-face t
                                         'cvs-goal-column t)
                           ":"))
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index e7139d9cfba..6382705139e 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -233,7 +233,7 @@
                              nil        ;don't update display while running
                              "status"
                              "-v"
-                             (cvs-fileinfo->full-path (car marked)))
+                             (cvs-fileinfo->full-name (car marked)))
                (goto-char (point-min))
                (let ((tags (cvs-status-get-tags)))
                  (when (listp tags) tags)))))))
@@ -512,7 +512,7 @@ If non-nil, NEW means to create a new buffer no matter what."
       (let* ((dir+files+rest
               (if (or (null fis) (not single-dir))
                   ;; not single-dir mode: just process the whole thing
-                  (list "" (mapcar 'cvs-fileinfo->full-path fis) nil)
+                  (list "" (mapcar 'cvs-fileinfo->full-name fis) nil)
                 ;; single-dir mode: extract the same-dir-elements
                 (let ((dir (cvs-fileinfo->dir (car fis))))
                   ;; output the concerned dir so the parser can translate paths
@@ -611,7 +611,7 @@ If non-nil, NEW means to create a new buffer no matter what."
              (append (cvs-flags-query 'cvs-cvs-flags nil 'noquery)
                      (if cvs-cvsroot (list "-d" cvs-cvsroot))
                      args
-                     (mapcar 'cvs-fileinfo->full-path fis))))))
+                     (mapcar 'cvs-fileinfo->full-name fis))))))
 
 (defun cvs-update-header (cmd add)
   (let* ((hf (ewoc-get-hf cvs-cookies))
@@ -831,7 +831,7 @@ the problem."
   (and (or (eq (cvs-fileinfo->type fi) 'REMOVED)
            (and (eq (cvs-fileinfo->type fi) 'CONFLICT)
                 (eq (cvs-fileinfo->subtype fi) 'REMOVED)))
-       (file-exists-p (cvs-fileinfo->full-path fi))))
+       (file-exists-p (cvs-fileinfo->full-name fi))))
 
 ;; called at the following times:
 ;; - postparse  ((eq cvs-auto-remove-handled t) cvs-auto-remove-directories nil)
@@ -1406,7 +1406,7 @@ If FILE is non-nil, directory entries won't be selected."
 (defun cvs-mode-files (&rest -cvs-mode-files-args)
   (cvs-mode!
    (lambda ()
-     (mapcar 'cvs-fileinfo->full-path
+     (mapcar 'cvs-fileinfo->full-name
              (apply 'cvs-mode-marked -cvs-mode-files-args)))))
 
 ;;
@@ -1564,7 +1564,7 @@ With prefix argument, prompt for cvs flags."
     ;; find directories and look for fis needing a description
     (dolist (fi fis)
       (cond
-       ((file-directory-p (cvs-fileinfo->full-path fi)) (push fi dirs))
+       ((file-directory-p (cvs-fileinfo->full-name fi)) (push fi dirs))
        ((eq (cvs-fileinfo->type fi) 'UNKNOWN) (setq needdesc t))))
     ;; prompt for description if necessary
     (let* ((msg (if (and needdesc
@@ -1642,8 +1642,8 @@ or \"Conflict\" in the *cvs* buffer."
 Signal an error if there is no backup file."
   (let ((backup-file (cvs-fileinfo->backup-file fileinfo)))
     (unless backup-file
-      (error "%s has no backup file" (cvs-fileinfo->full-path fileinfo)))
-    (list backup-file (cvs-fileinfo->full-path fileinfo))))
+      (error "%s has no backup file" (cvs-fileinfo->full-name fileinfo)))
+    (list backup-file (cvs-fileinfo->full-name fileinfo))))
 
 ;;
 ;; Emerge support
@@ -1697,7 +1697,7 @@ Signal an error if there is no backup file."
 
 (defun cvs-retrieve-revision (fileinfo rev)
   "Retrieve the given REVision of the file in FILEINFO into a new buffer."
-  (let* ((file (cvs-fileinfo->full-path fileinfo))
+  (let* ((file (cvs-fileinfo->full-name fileinfo))
          (buffile (concat file "." rev)))
     (or (find-buffer-visiting buffile)
         (with-current-buffer (create-file-buffer buffile)
@@ -1729,7 +1729,7 @@ Signal an error if there is no backup file."
   (interactive)
   (let ((fi (cvs-mode-marked 'merge nil :one t :file t)))
     (let ((merge (cvs-fileinfo->merge fi))
-          (file (cvs-fileinfo->full-path fi))
+          (file (cvs-fileinfo->full-name fi))
           (backup-file (cvs-fileinfo->backup-file fi)))
       (if (not (and merge backup-file))
           (let ((buf (find-file-noselect file)))
@@ -1760,7 +1760,7 @@ Signal an error if there is no backup file."
      (list (or rev1 (cvs-flags-query 'cvs-idiff-version))
            rev2)))
   (let ((fi (cvs-mode-marked 'diff "idiff" :one t :file t)))
-    (let* ((file (cvs-fileinfo->full-path fi))
+    (let* ((file (cvs-fileinfo->full-name fi))
            (rev1-buf (cvs-retrieve-revision fi (or rev1 "BASE")))
            (rev2-buf (if rev2 (cvs-retrieve-revision fi rev2)))
            ;; this binding is used by cvs-ediff-startup-hook
@@ -1778,13 +1778,13 @@ Signal an error if there is no backup file."
       (error "idiff-other cannot be applied to more than 2 files at a time"))
     (let* ((fi1 (car fis))
            (rev1-buf (if rev1 (cvs-retrieve-revision fi1 rev1)
-                       (find-file-noselect (cvs-fileinfo->full-path fi1))))
+                       (find-file-noselect (cvs-fileinfo->full-name fi1))))
            rev2-buf)
       (if (cdr fis)
           (let ((fi2 (nth 1 fis)))
             (setq rev2-buf
                   (if rev2 (cvs-retrieve-revision fi2 rev2)
-                    (find-file-noselect (cvs-fileinfo->full-path fi2)))))
+                    (find-file-noselect (cvs-fileinfo->full-name fi2)))))
         (error "idiff-other doesn't know what other file/buffer to use"))
       (let* (;; this binding is used by cvs-ediff-startup-hook
              (cvs-transient-buffers (list rev1-buf rev2-buf)))
@@ -1799,7 +1799,7 @@ Signal an error if there is no backup file."
     (let (ret)
       (dolist (fi (or fis (list (cvs-create-fileinfo 'DIRCHANGE "" "." ""))))
         (when (cvs-string-prefix-p
-               (expand-file-name (cvs-fileinfo->full-path fi) dir)
+               (expand-file-name (cvs-fileinfo->full-name fi) dir)
                buffer-file-name)
           (setq ret t)))
       ret)))
@@ -2002,7 +2002,7 @@ With a prefix, opens the buffer in an OTHER window."
              (set-buffer cvs-buf)
              (setq default-directory odir))
          (let ((buf (if rev (cvs-retrieve-revision fi rev)
-                      (find-file-noselect (cvs-fileinfo->full-path fi)))))
+                      (find-file-noselect (cvs-fileinfo->full-name fi)))))
            (funcall (cond ((eq other 'dont-select) 'display-buffer)
                           (other
                            (if view 'view-buffer-other-window
@@ -2093,14 +2093,14 @@ Returns a list of FIS that should be `cvs remove'd."
          (silent (or (not cvs-confirm-removals)
                      (cvs-every (lambda (fi)
                                   (or (not (file-exists-p
-                                            (cvs-fileinfo->full-path fi)))
+                                            (cvs-fileinfo->full-name fi)))
                                       (cvs-applicable-p fi 'safe-rm)))
                                 files)))
          (tmpbuf (cvs-temp-buffer)))
     (when (and (not silent) (equal cvs-confirm-removals 'list))
       (with-current-buffer tmpbuf
         (let ((inhibit-read-only t))
-          (cvs-insert-strings (mapcar 'cvs-fileinfo->full-path fis))
+          (cvs-insert-strings (mapcar 'cvs-fileinfo->full-name fis))
           (cvs-pop-to-buffer-same-frame (current-buffer))
           (shrink-window-if-larger-than-buffer))))
     (if (not (or silent
@@ -2119,7 +2119,7 @@ Returns a list of FIS that should be `cvs remove'd."
         (progn (message "Aborting") nil)
       (dolist (fi files)
         (let* ((type (cvs-fileinfo->type fi))
-               (file (cvs-fileinfo->full-path fi)))
+               (file (cvs-fileinfo->full-name fi)))
           (when (or all (eq type 'UNKNOWN))
             (when (file-exists-p file) (delete-file file))
             (unless all (setf (cvs-fileinfo->type fi) 'DEAD) t))))
@@ -2166,7 +2166,7 @@ With prefix argument, prompt for cvs flags."
   (interactive)
   (let ((marked (cvs-get-marked (cvs-ignore-marks-p "byte-compile"))))
     (dolist (fi marked)
-      (let ((filename (cvs-fileinfo->full-path fi)))
+      (let ((filename (cvs-fileinfo->full-name fi)))
         (when (string-match "\\.el\\'" filename)
           (byte-compile-file filename))))))
 
@@ -2237,7 +2237,7 @@ this file, or a list of arguments to send to the program."
 
 (defun cvs-revert-if-needed (fis)
   (dolist (fileinfo fis)
-    (let* ((file (cvs-fileinfo->full-path fileinfo))
+    (let* ((file (cvs-fileinfo->full-name fileinfo))
            (buffer (find-buffer-visiting file)))
       ;; For a revert to happen the user must be editing the file...
       (unless (or (null buffer)
diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index 27fe81e451d..28d988961a6 100644
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -118,6 +118,7 @@
               (file-exists-p "/opt/SUNWspro/SC3.0.1/bin/acomp"))
          "/opt/SUNWspro/SC3.0.1/bin/acomp -C -E")
         ((file-exists-p "/usr/ccs/lib/cpp") "/usr/ccs/lib/cpp -C")
+        ((memq system-type '(darwin berkeley-unix)) "gcc -E -C -")
         (t "/lib/cpp -C"))
   "The preprocessor used by the cmacexp package.
 
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 129a01f5498..0cc70386be8 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -710,7 +710,7 @@ FILE should be (ABSOLUTE-FILENAME) or (RELATIVE-FILENAME . DIRNAME) or nil."
                         `(,(car elt)
                           (compilation-directory-properties
                            ,(car elt) ,(cdr elt))
-                          t))
+                          t t))
                       (cdr compilation-directory-matcher)))))
 
      ;; Compiler warning/error lines.
@@ -733,11 +733,12 @@ FILE should be (ABSOLUTE-FILENAME) or (RELATIVE-FILENAME . DIRNAME) or nil."
               ;; allowed `line' to be a function that computed the actual
               ;; error location.  Let's do our best.
               `(,(car item)
-                (0 (compilation-compat-error-properties
-                    (funcall ',line (cons (match-string ,file)
-                                          (cons default-directory
-                                                ',(nthcdr 4 item)))
-                             ,(if col `(match-string ,col)))))
+                (0 (save-match-data
+                     (compilation-compat-error-properties
+                      (funcall ',line (cons (match-string ,file)
+                                            (cons default-directory
+                                                  ',(nthcdr 4 item)))
+                               ,(if col `(match-string ,col))))))
                 (,file compilation-error-face t))
 
             (unless (or (null (nth 5 item)) (integerp (nth 5 item)))
@@ -1589,6 +1590,8 @@ If nil, don't scroll the compilation output window."
                             (point))))
   (set-window-point w mk))
 
+(defvar next-error-highlight-timer)
+
 (defun compilation-goto-locus (msg mk end-mk)
   "Jump to an error corresponding to MSG at MK.
 All arguments are markers.  If END-MK is non-nil, mark is set there
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 700fa1c9efe..4a701edcca2 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1514,14 +1514,14 @@ or as help on variables `cperl-tips', `cperl-problems',
         (set 'font-lock-unfontify-region-function ; not present with old Emacs
               'cperl-font-lock-unfontify-region-function)
         (make-local-variable 'cperl-syntax-done-to)
-        ;; Another bug: unless font-lock-syntactic-keywords, font-lock
-        ;;  ignores syntax-table text-property.  (t) is a hack
-        ;;  to make font-lock think that font-lock-syntactic-keywords
-        ;;  are defined
         (make-local-variable 'font-lock-syntactic-keywords)
         (setq font-lock-syntactic-keywords
               (if cperl-syntaxify-by-font-lock
-                  '(t (cperl-fontify-syntaxically))
+                  '((cperl-fontify-syntaxically))
+                ;; unless font-lock-syntactic-keywords, font-lock (pre-22.1)
+                ;;  used to ignore syntax-table text-properties.  (t) is a hack
+                ;;  to make font-lock think that font-lock-syntactic-keywords
+                ;;  are defined.
                 '(t)))))
   (make-local-variable 'cperl-old-style)
   (if (boundp 'normal-auto-fill-function) ; 19.33 and later
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 14363e4dccf..eb6db05c159 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1109,9 +1109,15 @@ Does not check type and subprogram indentation."
   (let (icol cont (case-fold-search t) (pnt (point)))
     (save-excursion
       (if (not (f90-previous-statement))
-          ;; First statement in buffer.
+          ;; If f90-previous-statement returns nil, we must have been
+          ;; called from on or before the first line of the first statement.
           (setq icol (if (save-excursion
-                           (f90-next-statement)
+                           ;; f90-previous-statement has moved us over
+                           ;; comment/blank lines, so we need to get
+                           ;; back to the first code statement.
+                           (when (looking-at "[ \t]*\\([!#]\\|$\\)")
+                             (f90-next-statement))
+                           (skip-chars-forward " \t0-9")
                            (f90-looking-at-program-block-start))
                          0
                        ;; No explicit PROGRAM start statement.
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 73d77affdc4..a2fa660bff0 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -62,7 +62,8 @@
     (replace-in-string str regexp rep)))
 
 (defun flymake-split-string (str pattern)
-  "Split, then remove first and/or last in case it's empty."
+  "Split STR into a list of substrings bounded by PATTERN.
+Zero-length substrings at the beginning and end of the list are omitted."
   (let* ((splitted (split-string str pattern)))
     (if (and (> (length splitted) 0) (= 0 (length (elt splitted 0))))
         (setq splitted (cdr splitted)))
@@ -86,7 +87,12 @@
     (lambda (&optional arg) (save-excursion (end-of-line arg) (point)))))
 
 (defun flymake-popup-menu (pos menu-data)
-  (if (and (fboundp 'popup-menu) (fboundp 'make-event))
+  "Pop up the flymake menu at position POS, using the data MENU-DATA.
+POS is a list of the form ((X Y) WINDOW), where X and Y are
+pixels positions from the top left corner of WINDOW's frame.
+MENU-DATA is a list of error and warning messages returned by
+`flymake-make-err-menu-data'."
+  (if (featurep 'xemacs)
       (let* ((x-pos       (nth 0 (nth 0 pos)))
              (y-pos       (nth 1 (nth 0 pos)))
              (fake-event-props  '(button 1 x 1 y 1)))
@@ -96,6 +102,10 @@
     (x-popup-menu pos (flymake-make-emacs-menu menu-data))))
 
 (defun flymake-make-emacs-menu (menu-data)
+  "Return a menu specifier using MENU-DATA.
+MENU-DATA is a list of error and warning messages returned by
+`flymake-make-err-menu-data'.
+See `x-popup-menu' for the menu specifier format."
   (let* ((menu-title     (nth 0 menu-data))
          (menu-items     (nth 1 menu-data))
          (menu-commands  nil))
@@ -109,6 +119,7 @@
 (defun flymake-nop ())
 
 (defun flymake-make-xemacs-menu (menu-data)
+  "Return a menu specifier using MENU-DATA."
   (let* ((menu-title     (nth 0 menu-data))
          (menu-items     (nth 1 menu-data))
          (menu-commands  nil))
@@ -152,7 +163,11 @@
   :type 'integer)
 
 (defun flymake-log (level text &rest args)
-  "Log a message with optional arguments."
+  "Log a message at level LEVEL.
+If LEVEL is higher than `flymake-log-level', the message is
+ignored.  Otherwise, it is printed using `message'.
+TEXT is a format control string, and the remaining arguments ARGS
+are the string substitutions (see `format')."
   (if (<= level flymake-log-level)
       (let* ((msg (apply 'format text args)))
         (message msg)
@@ -176,69 +191,37 @@
     tmp))
 
 (defvar flymake-pid-to-names (flymake-makehash)
-  "pid -> source buffer name, output file name mapping.")
+  "Hash table mapping PIDs to source buffer names and output files.")
 
 (defun flymake-reg-names (pid source-buffer-name)
-  "Save into in PID map."
+  "Associate PID with SOURCE-BUFFER-NAME in `flymake-pid-to-names'."
   (unless (stringp source-buffer-name)
     (error "Invalid buffer name"))
   (puthash pid (list source-buffer-name) flymake-pid-to-names))
 
 (defun flymake-get-source-buffer-name (pid)
-  "Return buffer name stored in PID map."
+  "Return buffer name associated with PID in `flymake-pid-to-names'."
   (nth 0 (gethash pid flymake-pid-to-names)))
 
 (defun flymake-unreg-names (pid)
-  "Delete PID->buffer name mapping."
+  "Remove the entry associated with PID from `flymake-pid-to-names'."
   (remhash pid flymake-pid-to-names))
 
-(defun flymake-get-buffer-var (buffer var-name)
-  "Switch to BUFFER if necessary and return local variable VAR-NAME."
-  (unless (bufferp buffer)
-    (error "Invalid buffer"))
-
-  (if (eq buffer (current-buffer))
-      (symbol-value var-name)
-    (with-current-buffer buffer
-      (symbol-value var-name))))
-
-(defun flymake-set-buffer-var (buffer var-name var-value)
-  "Switch to BUFFER if necessary and set local variable VAR-NAME to VAR-VALUE."
-  (unless (bufferp buffer)
-    (error "Invalid buffer"))
-
-  (if (eq buffer (current-buffer))
-      (set var-name var-value)
-    (with-current-buffer buffer
-      (set var-name var-value))))
-
 (defvar flymake-buffer-data (flymake-makehash)
   "Data specific to syntax check tool, in name-value pairs.")
 
 (make-variable-buffer-local 'flymake-buffer-data)
 
-(defun flymake-get-buffer-data (buffer)
-  (flymake-get-buffer-var buffer 'flymake-buffer-data))
-
-(defun flymake-set-buffer-data (buffer data)
-  (flymake-set-buffer-var buffer 'flymake-buffer-data data))
-
 (defun flymake-get-buffer-value (buffer name)
-  (gethash name (flymake-get-buffer-data buffer)))
+  (gethash name (with-current-buffer buffer flymake-buffer-data)))
 
 (defun flymake-set-buffer-value (buffer name value)
-  (puthash name value (flymake-get-buffer-data buffer)))
+  (puthash name value (with-current-buffer buffer flymake-buffer-data)))
 
 (defvar flymake-output-residual nil)
 
 (make-variable-buffer-local 'flymake-output-residual)
 
-(defun flymake-get-buffer-output-residual (buffer)
-  (flymake-get-buffer-var buffer 'flymake-output-residual))
-
-(defun flymake-set-buffer-output-residual (buffer residual)
-  (flymake-set-buffer-var buffer 'flymake-output-residual residual))
-
 (defcustom flymake-allowed-file-name-masks
   '((".+\\.c$" flymake-simple-make-init flymake-simple-cleanup flymake-get-real-file-name)
     (".+\\.cpp$" flymake-simple-make-init flymake-simple-cleanup flymake-get-real-file-name)
@@ -642,35 +625,38 @@ It's flymake process filter."
 
                   (flymake-parse-residual source-buffer)
                   (flymake-post-syntax-check source-buffer exit-status command)
-                  (flymake-set-buffer-is-running source-buffer nil))))
+                  (setq flymake-is-running nil))))
           (error
            (let ((err-str (format "Error in process sentinel for buffer %s: %s"
                                   source-buffer (error-message-string err))))
              (flymake-log 0 err-str)
-             (flymake-set-buffer-is-running source-buffer nil)))))))
+             (with-current-buffer source-buffer
+               (setq flymake-is-running nil))))))))
 
 (defun flymake-post-syntax-check (source-buffer exit-status command)
-  (flymake-set-buffer-err-info source-buffer (flymake-get-buffer-new-err-info source-buffer))
-  (flymake-set-buffer-new-err-info source-buffer nil)
-
-  (flymake-set-buffer-err-info source-buffer (flymake-fix-line-numbers
-                                              (flymake-get-buffer-err-info source-buffer)
-                                              1
-                                              (flymake-count-lines source-buffer)))
+  (with-current-buffer source-buffer
+    (setq flymake-err-info flymake-new-err-info)
+    (setq flymake-new-err-info nil)
+    (setq flymake-err-info
+          (flymake-fix-line-numbers
+           flymake-err-info 1 (flymake-count-lines source-buffer))))
   (flymake-delete-own-overlays source-buffer)
-  (flymake-highlight-err-lines source-buffer (flymake-get-buffer-err-info source-buffer))
-
-  (let ((err-count   (flymake-get-err-count (flymake-get-buffer-err-info source-buffer) "e"))
-        (warn-count  (flymake-get-err-count (flymake-get-buffer-err-info source-buffer) "w")))
-
-    (flymake-log 2 "%s: %d error(s), %d warning(s) in %.2f second(s)"
+  (flymake-highlight-err-lines
+   source-buffer (with-current-buffer source-buffer flymake-err-info))
+  (let (err-count warn-count)
+    (with-current-buffer source-buffer
+      (setq err-count (flymake-get-err-count flymake-err-info "e"))
+      (setq warn-count  (flymake-get-err-count flymake-err-info "w"))
+      (flymake-log 2 "%s: %d error(s), %d warning(s) in %.2f second(s)"
                  (buffer-name source-buffer) err-count warn-count
-                 (- (flymake-float-time) (flymake-get-buffer-check-start-time source-buffer)))
-    (flymake-set-buffer-check-start-time source-buffer nil)
+                 (- (flymake-float-time) flymake-check-start-time))
+      (setq flymake-check-start-time nil))
+
     (if (and (equal 0 err-count) (equal 0 warn-count))
         (if (equal 0 exit-status)
             (flymake-report-status source-buffer "" "") ; PASSED
-          (if (not (flymake-get-buffer-check-was-interrupted source-buffer))
+          (if (not (with-current-buffer source-buffer
+                     flymake-check-was-interrupted))
               (flymake-report-fatal-status (current-buffer) "CFGERR"
                                            (format "Configuration error has occured while running %s" command))
             (flymake-report-status source-buffer nil ""))) ; "STOPPED"
@@ -679,38 +665,34 @@ It's flymake process filter."
 (defun flymake-parse-output-and-residual (source-buffer output)
   "Split OUTPUT into lines, merge in residual if necessary."
   (with-current-buffer source-buffer
-    (let* ((buffer-residual     (flymake-get-buffer-output-residual source-buffer))
+    (let* ((buffer-residual     flymake-output-residual)
            (total-output        (if buffer-residual (concat buffer-residual output) output))
            (lines-and-residual  (flymake-split-output total-output))
            (lines               (nth 0 lines-and-residual))
            (new-residual        (nth 1 lines-and-residual)))
-
-      (flymake-set-buffer-output-residual source-buffer new-residual)
-      (flymake-set-buffer-new-err-info source-buffer (flymake-parse-err-lines
-                                                      (flymake-get-buffer-new-err-info source-buffer)
-                                                      source-buffer lines)))))
+      (with-current-buffer source-buffer
+        (setq flymake-output-residual new-residual)
+        (setq flymake-new-err-info
+              (flymake-parse-err-lines
+               flymake-new-err-info
+               source-buffer lines))))))
 
 (defun flymake-parse-residual (source-buffer)
   "Parse residual if it's non empty."
   (with-current-buffer source-buffer
-    (when (flymake-get-buffer-output-residual source-buffer)
-      (flymake-set-buffer-new-err-info source-buffer (flymake-parse-err-lines
-                                                      (flymake-get-buffer-new-err-info source-buffer)
-                                                      source-buffer
-                                                      (list (flymake-get-buffer-output-residual source-buffer))))
-      (flymake-set-buffer-output-residual source-buffer nil))))
+    (when flymake-output-residual
+      (setq flymake-new-err-info
+            (flymake-parse-err-lines
+             flymake-new-err-info
+             source-buffer
+             (list flymake-output-residual)))
+      (setq flymake-output-residual nil))))
 
 (defvar flymake-err-info nil
   "Sorted list of line numbers and lists of err info in the form (file, err-text).")
 
 (make-variable-buffer-local 'flymake-err-info)
 
-(defun flymake-get-buffer-err-info (buffer)
-  (flymake-get-buffer-var buffer 'flymake-err-info))
-
-(defun flymake-set-buffer-err-info (buffer err-info)
-  (flymake-set-buffer-var buffer 'flymake-err-info err-info))
-
 (defun flymake-er-make-er (line-no line-err-info-list)
   (list line-no line-err-info-list))
 
@@ -725,12 +707,6 @@ It's flymake process filter."
 
 (make-variable-buffer-local 'flymake-new-err-info)
 
-(defun flymake-get-buffer-new-err-info (buffer)
-  (flymake-get-buffer-var buffer 'flymake-new-err-info))
-
-(defun flymake-set-buffer-new-err-info (buffer new-err-info)
-  (flymake-set-buffer-var buffer 'flymake-new-err-info new-err-info))
-
 ;; getters/setters for line-err-info: (file, line, type, text).
 (defun flymake-ler-make-ler (file line type text &optional full-file)
   (list file line type text full-file))
@@ -1067,7 +1043,11 @@ Return its components if so, nil if no."
                (and (not (flymake-ler-get-file line-one)) (not (flymake-ler-get-file line-two)))))))
 
 (defun flymake-add-line-err-info (line-err-info-list line-err-info)
-  "Insert new err info favoring sorting: err-type e/w, filename nil/non-nil."
+  "Update LINE-ERR-INFO-LIST with the error LINE-ERR-INFO.
+For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'.
+The new element is inserted in the proper position, according to
+the predicate `flymake-line-err-info-is-less-or-equal'.
+The updated value of LINE-ERR-INFO-LIST is returned."
   (if (not line-err-info-list)
       (list line-err-info)
     (let* ((count  (length line-err-info-list))
@@ -1079,7 +1059,10 @@ Return its components if so, nil if no."
       line-err-info-list)))
 
 (defun flymake-add-err-info (err-info-list line-err-info)
-  "Add error info (file line type text) to err info list preserving sort order."
+  "Update ERR-INFO-LIST with the error LINE-ERR-INFO, preserving sort order.
+Returns the updated value of ERR-INFO-LIST.
+For the format of ERR-INFO-LIST, see `flymake-err-info'.
+For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'."
   (let* ((line-no             (if (flymake-ler-get-file line-err-info) 1 (flymake-ler-get-line line-err-info)))
          (info-and-pos        (flymake-find-err-info err-info-list line-no))
          (exists              (car info-and-pos))
@@ -1202,16 +1185,16 @@ Return first 'INCLUDE-DIRS/REL-FILE-NAME' that exists,  or just REL-FILE-NAME if
   (unless (bufferp buffer)
     (error "Expected a buffer"))
   (with-current-buffer buffer
-    (flymake-log 3 "flymake is running: %s" (flymake-get-buffer-is-running buffer))
-    (when (and (not (flymake-get-buffer-is-running buffer))
+    (flymake-log 3 "flymake is running: %s" flymake-is-running)
+    (when (and (not flymake-is-running)
                (flymake-can-syntax-check-file (buffer-file-name buffer)))
       (when (or (not flymake-compilation-prevents-syntax-check)
                 (not (flymake-compilation-is-running))) ;+ (flymake-rep-ort-status buffer "COMP")
         (flymake-clear-buildfile-cache)
         (flymake-clear-project-include-dirs-cache)
 
-        (flymake-set-buffer-check-was-interrupted buffer nil)
-        (flymake-set-buffer-data buffer (flymake-makehash 'equal))
+        (setq flymake-check-was-interrupted nil)
+        (setq flymake-buffer-data (flymake-makehash 'equal))
 
         (let* ((source-file-name  (buffer-file-name buffer))
                (init-f (flymake-get-init-function source-file-name))
@@ -1225,7 +1208,7 @@ Return first 'INCLUDE-DIRS/REL-FILE-NAME' that exists,  or just REL-FILE-NAME if
                 (flymake-log 0 "init function %s for %s failed, cleaning up" init-f source-file-name)
                 (funcall cleanup-f buffer))
             (progn
-              (flymake-set-buffer-last-change-time buffer nil)
+              (setq flymake-last-change-time nil)
               (flymake-start-syntax-check-process buffer cmd args dir))))))))
 
 (defun flymake-start-syntax-check-process (buffer cmd args dir)
@@ -1242,9 +1225,10 @@ Return first 'INCLUDE-DIRS/REL-FILE-NAME' that exists,  or just REL-FILE-NAME if
 
           (flymake-reg-names (process-id process) (buffer-name buffer))
 
-          (flymake-set-buffer-is-running buffer t)
-          (flymake-set-buffer-last-change-time buffer nil)
-          (flymake-set-buffer-check-start-time buffer (flymake-float-time))
+          (with-current-buffer buffer
+            (setq flymake-is-running t)
+            (setq flymake-last-change-time nil)
+            (setq flymake-check-start-time (flymake-float-time)))
 
           (flymake-report-status buffer nil "*")
           (flymake-log 2 "started process %d, command=%s, dir=%s"
@@ -1264,7 +1248,8 @@ Return first 'INCLUDE-DIRS/REL-FILE-NAME' that exists,  or just REL-FILE-NAME if
   (signal-process pid 9)
   (let* ((buffer-name (flymake-get-source-buffer-name pid)))
     (when (and buffer-name (get-buffer buffer-name))
-      (flymake-set-buffer-check-was-interrupted (get-buffer buffer-name) t)))
+      (with-current-buffer (get-buffer buffer-name)
+        (setq flymake-check-was-interrupted t))))
   (flymake-log 1 "killed process %d" pid))
 
 (defun flymake-stop-all-syntax-checks ()
@@ -1288,56 +1273,26 @@ Return first 'INCLUDE-DIRS/REL-FILE-NAME' that exists,  or just REL-FILE-NAME if
 
 (make-variable-buffer-local 'flymake-is-running)
 
-(defun flymake-get-buffer-is-running (buffer)
-  (flymake-get-buffer-var buffer 'flymake-is-running))
-
-(defun flymake-set-buffer-is-running (buffer is-running)
-  (flymake-set-buffer-var buffer 'flymake-is-running is-running))
-
 (defvar flymake-timer nil
   "Timer for starting syntax check.")
 
 (make-variable-buffer-local 'flymake-timer)
 
-(defun flymake-get-buffer-timer (buffer)
-  (flymake-get-buffer-var buffer 'flymake-timer))
-
-(defun flymake-set-buffer-timer (buffer timer)
-  (flymake-set-buffer-var buffer 'flymake-timer timer))
-
 (defvar flymake-last-change-time nil
   "Time of last buffer change.")
 
 (make-variable-buffer-local 'flymake-last-change-time)
 
-(defun flymake-get-buffer-last-change-time (buffer)
-  (flymake-get-buffer-var buffer 'flymake-last-change-time))
-
-(defun flymake-set-buffer-last-change-time (buffer change-time)
-  (flymake-set-buffer-var buffer 'flymake-last-change-time change-time))
-
 (defvar flymake-check-start-time nil
   "Time at which syntax check was started.")
 
 (make-variable-buffer-local 'flymake-check-start-time)
 
-(defun flymake-get-buffer-check-start-time (buffer)
-  (flymake-get-buffer-var buffer 'flymake-check-start-time))
-
-(defun flymake-set-buffer-check-start-time (buffer check-start-time)
-  (flymake-set-buffer-var buffer 'flymake-check-start-time check-start-time))
-
 (defvar flymake-check-was-interrupted nil
   "Non-nil if syntax check was killed by `flymake-compile'.")
 
 (make-variable-buffer-local 'flymake-check-was-interrupted)
 
-(defun flymake-get-buffer-check-was-interrupted (buffer)
-  (flymake-get-buffer-var buffer 'flymake-check-was-interrupted))
-
-(defun flymake-set-buffer-check-was-interrupted (buffer interrupted)
-  (flymake-set-buffer-var buffer 'flymake-check-was-interrupted interrupted))
-
 (defcustom flymake-no-changes-timeout 0.5
   "Time to wait after last change before starting compilation."
   :group 'flymake
@@ -1345,12 +1300,13 @@ Return first 'INCLUDE-DIRS/REL-FILE-NAME' that exists,  or just REL-FILE-NAME if
 
 (defun flymake-on-timer-event (buffer)
   "Start a syntax check for buffer BUFFER if necessary."
-  ;;+(flymake-log 3 "timer: running=%s, time=%s, cur-time=%s" (flymake-get-buffer-is-running buffer) (flymake-get-buffer-last-change-time buffer) (flymake-float-time))
-  (when (and (bufferp buffer) (not (flymake-get-buffer-is-running buffer)))
+  (when (bufferp buffer)
     (with-current-buffer buffer
-      (when (and (flymake-get-buffer-last-change-time buffer)
-                 (> (flymake-float-time) (+ flymake-no-changes-timeout (flymake-get-buffer-last-change-time buffer))))
-        (flymake-set-buffer-last-change-time buffer nil)
+      (when (and (not flymake-is-running)
+                 flymake-last-change-time
+                 (> (flymake-float-time) (+ flymake-no-changes-timeout flymake-last-change-time)))
+
+        (setq flymake-last-change-time nil)
         (flymake-log 3 "starting syntax check as more than 1 second passed since last change")
         (flymake-start-syntax-check buffer)))))
 
@@ -1391,7 +1347,7 @@ Return first 'INCLUDE-DIRS/REL-FILE-NAME' that exists,  or just REL-FILE-NAME if
   "Display a menu with errors/warnings for current line if it has errors and/or warnings."
   (interactive)
   (let* ((line-no             (flymake-current-line-no))
-         (line-err-info-list  (nth 0 (flymake-find-err-info (flymake-get-buffer-err-info (current-buffer)) line-no)))
+         (line-err-info-list  (nth 0 (flymake-find-err-info flymake-err-info line-no)))
          (menu-data           (flymake-make-err-menu-data line-no line-err-info-list))
          (choice              nil)
          (mouse-pos           (flymake-get-point-pixel-pos))
@@ -1442,46 +1398,27 @@ Return first 'INCLUDE-DIRS/REL-FILE-NAME' that exists,  or just REL-FILE-NAME if
 
 (make-variable-buffer-local 'flymake-mode-line)
 
-(defun flymake-get-buffer-mode-line (buffer)
-  (flymake-get-buffer-var buffer 'flymake-mode-line))
-
-(defun flymake-set-buffer-mode-line (buffer mode-line-string)
-  (flymake-set-buffer-var buffer 'flymake-mode-line mode-line-string))
-
 (defvar flymake-mode-line-e-w nil)
 
 (make-variable-buffer-local 'flymake-mode-line-e-w)
 
-(defun flymake-get-buffer-mode-line-e-w (buffer)
-  (flymake-get-buffer-var buffer 'flymake-mode-line-e-w))
-
-(defun flymake-set-buffer-mode-line-e-w (buffer e-w)
-  (flymake-set-buffer-var buffer 'flymake-mode-line-e-w e-w))
-
 (defvar flymake-mode-line-status nil)
 
 (make-variable-buffer-local 'flymake-mode-line-status)
 
-(defun flymake-get-buffer-mode-line-status (buffer)
-  (flymake-get-buffer-var buffer 'flymake-mode-line-status))
-
-(defun flymake-set-buffer-mode-line-status (buffer status)
-  (flymake-set-buffer-var buffer 'flymake-mode-line-status status))
-
 (defun flymake-report-status (buffer e-w &optional status)
   "Show status in mode line."
   (when (bufferp buffer)
     (with-current-buffer buffer
       (when e-w
-        (flymake-set-buffer-mode-line-e-w buffer e-w)
-        )
+        (setq flymake-mode-line-e-w e-w))
       (when status
-        (flymake-set-buffer-mode-line-status buffer status))
+        (setq flymake-mode-line-status status))
       (let* ((mode-line " Flymake"))
-        (when (> (length (flymake-get-buffer-mode-line-e-w buffer)) 0)
-          (setq mode-line (concat mode-line ":"  (flymake-get-buffer-mode-line-e-w buffer))))
-        (setq mode-line (concat mode-line (flymake-get-buffer-mode-line-status buffer)))
-        (flymake-set-buffer-mode-line buffer mode-line)
+        (when (> (length flymake-mode-line-e-w) 0)
+          (setq mode-line (concat mode-line ":" flymake-mode-line-e-w)))
+        (setq mode-line (concat mode-line flymake-mode-line-status))
+        (setq flymake-mode-line mode-line)
         (force-mode-line-update)))))
 
 (defun flymake-display-warning (warning)
@@ -1532,7 +1469,8 @@ With arg, turn Flymake mode on if and only if arg is positive."
 
     (flymake-report-status (current-buffer) "" "")
 
-    (flymake-set-buffer-timer (current-buffer) (run-at-time nil 1 'flymake-on-timer-event (current-buffer)))
+    (setq flymake-timer
+          (run-at-time nil 1 'flymake-on-timer-event (current-buffer)))
 
     (setq flymake-mode t)
     (flymake-log 1 "flymake mode turned ON for buffer %s" (buffer-name (current-buffer)))
@@ -1550,12 +1488,11 @@ With arg, turn Flymake mode on if and only if arg is positive."
 
     (flymake-delete-own-overlays (current-buffer))
 
-    (when (flymake-get-buffer-timer (current-buffer))
-      (cancel-timer (flymake-get-buffer-timer (current-buffer)))
-      (flymake-set-buffer-timer (current-buffer) nil))
-
-    (flymake-set-buffer-is-running (current-buffer) nil)
+    (when flymake-timer
+      (cancel-timer flymake-timer)
+      (setq flymake-timer nil))
 
+    (setq flymake-is-running nil)
     (setq flymake-mode nil)
     (flymake-log 1 "flymake mode turned OFF for buffer %s" (buffer-name (current-buffer)))))
 
@@ -1571,7 +1508,7 @@ With arg, turn Flymake mode on if and only if arg is positive."
     (when (and flymake-start-syntax-check-on-newline (equal new-text "\n"))
       (flymake-log 3 "starting syntax check as new-line has been seen")
       (flymake-start-syntax-check-for-current-buffer))
-    (flymake-set-buffer-last-change-time (current-buffer) (flymake-float-time))))
+    (setq flymake-last-change-time (flymake-float-time))))
 
 (defun flymake-after-save-hook ()
   (if (local-variable-p 'flymake-mode (current-buffer)) ; (???) other way to determine whether flymake is active in buffer being saved?
@@ -1580,9 +1517,9 @@ With arg, turn Flymake mode on if and only if arg is positive."
         (flymake-start-syntax-check-for-current-buffer)))) ; no more mode 3. cannot start check if mode 3 (to temp copies) is active - (???)
 
 (defun flymake-kill-buffer-hook ()
-  (when (flymake-get-buffer-timer (current-buffer))
-    (cancel-timer (flymake-get-buffer-timer (current-buffer)))
-    (flymake-set-buffer-timer (current-buffer) nil)))
+  (when flymake-timer
+    (cancel-timer flymake-timer)
+    (setq flymake-timer nil)))
 
 (defun flymake-find-file-hook ()
   ;;+(when flymake-start-syntax-check-on-find-file
@@ -1636,9 +1573,9 @@ With arg, turn Flymake mode on if and only if arg is positive."
 (defun flymake-goto-next-error ()
   "Go to next error in err ring."
   (interactive)
-  (let ((line-no (flymake-get-next-err-line-no (flymake-get-buffer-err-info (current-buffer)) (flymake-current-line-no))))
+  (let ((line-no (flymake-get-next-err-line-no flymake-err-info (flymake-current-line-no))))
     (when (not line-no)
-      (setq line-no (flymake-get-first-err-line-no (flymake-get-buffer-err-info (current-buffer))))
+      (setq line-no (flymake-get-first-err-line-no flymake-err-info))
       (flymake-log 1 "passed end of file"))
     (if line-no
         (flymake-goto-line line-no)
@@ -1647,9 +1584,9 @@ With arg, turn Flymake mode on if and only if arg is positive."
 (defun flymake-goto-prev-error ()
   "Go to prev error in err ring."
   (interactive)
-  (let ((line-no (flymake-get-prev-err-line-no (flymake-get-buffer-err-info (current-buffer)) (flymake-current-line-no))))
+  (let ((line-no (flymake-get-prev-err-line-no flymake-err-info (flymake-current-line-no))))
     (when (not line-no)
-      (setq line-no (flymake-get-last-err-line-no (flymake-get-buffer-err-info (current-buffer))))
+      (setq line-no (flymake-get-last-err-line-no flymake-err-info))
       (flymake-log 1 "passed beginning of file"))
     (if line-no
         (flymake-goto-line line-no)
@@ -1721,7 +1658,8 @@ With arg, turn Flymake mode on if and only if arg is positive."
 Delete temp file."
   (let* ((temp-source-file-name (flymake-get-buffer-value buffer "temp-source-file-name")))
     (flymake-safe-delete-file temp-source-file-name)
-    (flymake-set-buffer-last-change-time buffer nil)))
+    (with-current-buffer buffer
+      (setq flymake-last-change-time nil))))
 
 (defun flymake-get-real-file-name (buffer file-name-from-err-msg)
   "Translate file name from error message to \"real\" file name.
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 95920ff9f02..56344a67e5c 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -79,8 +79,11 @@
 (defvar gdb-overlay-arrow-position nil)
 (defvar gdb-server-prefix nil)
 (defvar gdb-flush-pending-output nil)
-(defvar gdb-location-list nil "Alist of breakpoint numbers and full filenames.")
+(defvar gdb-location-alist nil
+  "Alist of breakpoint numbers and full filenames.")
 (defvar gdb-find-file-unhook nil)
+(defvar gdb-active-process nil "GUD tooltips display variable values when t, \
+and #define directives otherwise.")
 
 (defvar gdb-buffer-type nil
   "One of the symbols bound in `gdb-buffer-rules'.")
@@ -193,6 +196,43 @@ detailed description of this mode.
   :group 'gud
   :version "22.1")
 
+(defcustom gdb-cpp-define-alist-program 
+  (cond ((eq system-type 'ms-dos) "gcc -E -dM -o - -")
+        (t "gcc -E -dM -"))
+  "The program name for generating an alist of #define directives.
+This list is used to display the #define directive associated
+with an identifier as a tooltip. It works in a debug session with
+GDB, when tooltip-gud-tips-p is t."
+  :type 'string
+  :group 'gud
+  :version "22.1")
+
+(defcustom gdb-cpp-define-alist-flags ""
+  "*Preprocessor flags used by `gdb-create-define-alist'."
+  :type 'string
+  :group 'gud
+  :version "22.1")
+
+(defvar gdb-define-alist nil "Alist of #define directives for GUD tooltips.")
+
+(defun gdb-create-define-alist ()
+  "Create an alist of #define directives for GUD tooltips."
+  (let* ((file (buffer-file-name))
+         (output
+          (with-output-to-string
+            (with-current-buffer standard-output
+              (call-process shell-file-name
+                            (if (file-exists-p file) file nil)
+                            (list t nil) nil "-c"
+                            (concat gdb-cpp-define-alist-program " "
+                                    gdb-cpp-define-alist-flags)))))
+        (define-list (split-string output "\n" t))
+        (name))
+    (setq gdb-define-alist nil)
+    (dolist (define define-list)
+      (setq name (nth 1 (split-string define "[( ]")))
+      (push (cons name define) gdb-define-alist))))
+
 (defun gdb-set-gud-minor-mode (buffer)
   "Set gud-minor-mode from find-file if appropriate."
   (goto-char (point-min))
@@ -205,13 +245,16 @@ detailed description of this mode.
 
 (defun gdb-set-gud-minor-mode-1 (buffer)
   (goto-char (point-min))
-  (if (and (search-forward "Located in " nil t)
-           (looking-at "\\S-*")
-           (string-equal (buffer-file-name buffer)
-                         (match-string 0)))
-      (with-current-buffer buffer
-        (set (make-local-variable 'gud-minor-mode) 'gdba)
-        (set (make-local-variable 'tool-bar-map) gud-tool-bar-map))))
+  (when (and (search-forward "Located in " nil t)
+             (looking-at "\\S-*")
+             (string-equal (buffer-file-name buffer)
+                           (match-string 0)))
+    (with-current-buffer buffer
+      (set (make-local-variable 'gud-minor-mode) 'gdba)
+      (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
+      (make-local-variable 'gdb-define-alist)
+      (gdb-create-define-alist)
+      (add-hook 'after-save-hook 'gdb-create-define-alist nil t))))
 
 (defun gdb-set-gud-minor-mode-existing-buffers ()
   (dolist (buffer (buffer-list))
@@ -281,7 +324,7 @@ detailed description of this mode.
   (setq gdb-output-sink 'user)
   (setq gdb-server-prefix "server ")
   (setq gdb-flush-pending-output nil)
-  (setq gdb-location-list nil)
+  (setq gdb-location-alist nil)
   (setq gdb-find-file-unhook nil)
   ;;
   (setq gdb-buffer-type 'gdba)
@@ -301,7 +344,7 @@ detailed description of this mode.
   (run-hooks 'gdba-mode-hook))
 
 (defcustom gdb-use-colon-colon-notation nil
-  "If non-nil use FUN::VAR format to display variables in the speedbar." ;
+  "If non-nil use FUN::VAR format to display variables in the speedbar."
   :type 'boolean
   :group 'gud
   :version "22.1")
@@ -430,7 +473,8 @@ detailed description of this mode.
         (let ((varnum (match-string 1)))
           (gdb-enqueue-input
            (list
-            (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
+            (if (with-current-buffer gud-comint-buffer
+                  (eq gud-minor-mode 'gdba))
                 (concat "server interpreter mi \"-var-evaluate-expression "
                         varnum "\"\n")
               (concat "-var-evaluate-expression " varnum "\n"))
@@ -482,7 +526,8 @@ detailed description of this mode.
      (list
       (if (with-current-buffer gud-comint-buffer
             (eq gud-minor-mode 'gdba))
-          (concat "server interpreter mi \"-var-assign " varnum " " value "\"\n")
+          (concat "server interpreter mi \"-var-assign "
+                  varnum " " value "\"\n")
         (concat "-var-assign " varnum " " value "\n"))
            'ignore))))
 
@@ -773,8 +818,8 @@ This filter may simply queue input for a later time."
     ("post-prompt" gdb-post-prompt)
     ("source" gdb-source)
     ("starting" gdb-starting)
-    ("exited" gdb-stopping)
-    ("signalled" gdb-stopping)
+    ("exited" gdb-exited)
+    ("signalled" gdb-exited)
     ("signal" gdb-stopping)
     ("breakpoint" gdb-stopping)
     ("watchpoint" gdb-stopping)
@@ -800,7 +845,7 @@ This filter may simply queue input for a later time."
   (setq gud-last-frame
         (cons
          (match-string 1 args)
-         (string-to-int (match-string 2 args))))
+         (string-to-number (match-string 2 args))))
   (setq gdb-current-address (match-string 3 args))
   ;; cover for auto-display output which comes *before*
   ;; stopped annotation
@@ -850,6 +895,7 @@ This sends the next command (if any) to gdb."
   "An annotation handler for `starting'.
 This says that I/O for the subprocess is now the program being debugged,
 not GDB."
+  (setq gdb-active-process t)
   (let ((sink gdb-output-sink))
     (cond
      ((eq sink 'user)
@@ -862,7 +908,7 @@ not GDB."
       (error "Unexpected `starting' annotation")))))
 
 (defun gdb-stopping (ignored)
-  "An annotation handler for `exited' and other annotations.
+  "An annotation handler for `breakpoint' and other annotations.
 They say that I/O for the subprocess is now GDB, not the program
 being debugged."
   (if gdb-use-inferior-io-buffer
@@ -874,6 +920,15 @@ being debugged."
           (gdb-resync)
           (error "Unexpected stopping annotation"))))))
 
+(defun gdb-exited (ignored)
+  "An annotation handler for `exited' and `signalled'.
+They say that I/O for the subprocess is now GDB, not the program
+being debugged and that the program is no longer running. This
+function is used to change the focus of GUD tooltips to #define
+directives."
+  (setq gdb-active-process nil)
+  (gdb-stopping ignored))
+ 
 (defun gdb-frame-begin (ignored)
   (let ((sink gdb-output-sink))
     (cond
@@ -981,7 +1036,8 @@ happens to be appropriate."
                                                 (match-beginning 0))))
             ;;
             ;; Everything after, we save, to combine with later input.
-            (setq gud-marker-acc (substring gud-marker-acc (match-beginning 0))))
+            (setq gud-marker-acc (substring gud-marker-acc
+                                            (match-beginning 0))))
         ;;
         ;; In case we know the gud-marker-acc contains no partial annotations:
         (progn
@@ -1045,7 +1101,7 @@ happens to be appropriate."
 ;; annotation rule binding of whatever gdb sends to tell us this command
 ;; might have changed it's output.
 ;;
-;; NAME is the function name.  DEMAND-PREDICATE tests if output is really needed.
+;; NAME is the function name. DEMAND-PREDICATE tests if output is really needed.
 ;; GDB-COMMAND is a string of such.  OUTPUT-HANDLER is the function bound to the
 ;; input in the input queue (see comment about ``gdb communications'' above).
 
@@ -1077,8 +1133,9 @@ happens to be appropriate."
      ;; put customisation here
      (,custom-defun)))
 
-(defmacro def-gdb-auto-updated-buffer (buffer-key trigger-name gdb-command
-                                                  output-handler-name custom-defun)
+(defmacro def-gdb-auto-updated-buffer (buffer-key
+                                       trigger-name gdb-command
+                                       output-handler-name custom-defun)
   `(progn
      (def-gdb-auto-update-trigger ,trigger-name
        ;; The demand predicate:
@@ -1225,7 +1282,7 @@ static char *magick[] = {
                          '(mouse-face highlight
                            help-echo "mouse-2, RET: visit breakpoint"))
                         (unless (file-exists-p file)
-                           (setq file (cdr (assoc bptno gdb-location-list))))
+                           (setq file (cdr (assoc bptno gdb-location-alist))))
                         (unless (string-equal file "File not found")
                           (if file
                               (with-current-buffer (find-file-noselect file)
@@ -1233,13 +1290,15 @@ static char *magick[] = {
                                      'gdba)
                                 (set (make-local-variable 'tool-bar-map)
                                      gud-tool-bar-map)
-                                ;; only want one breakpoint icon at each location
+                                ;; only want one breakpoint icon at each
+                                ;; location
                                 (save-excursion
                                   (goto-line (string-to-number line))
                                   (gdb-put-breakpoint-icon (eq flag ?y) bptno)))
                             (gdb-enqueue-input
-                             (list (concat "list "
-                                           (match-string-no-properties 1) ":1\n")
+                             (list
+                              (concat "list "
+                                      (match-string-no-properties 1) ":1\n")
                                    'ignore))
                             (gdb-enqueue-input
                              (list "info source\n"
@@ -1351,7 +1410,7 @@ static char *magick[] = {
     (if (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
             (looking-at "\\([0-9]+\\).*point\\s-*\\S-*\\s-*\\(.\\)")
           (looking-at
-      "\\([0-9]+\\)\\s-*\\S-*\\s-*\\S-*\\s-*\\(.\\)\\s-*\\S-*\\s-*\\S-*:[0-9]+"))
+     "\\([0-9]+\\)\\s-*\\S-*\\s-*\\S-*\\s-*\\(.\\)\\s-*\\S-*\\s-*\\S-*:[0-9]+"))
         (gdb-enqueue-input
          (list
           (concat gdb-server-prefix
@@ -1383,14 +1442,15 @@ static char *magick[] = {
     (if (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
             (looking-at "\\([0-9]+\\) .* in .* at\\s-+\\(\\S-*\\):\\([0-9]+\\)")
           (looking-at
- "\\([0-9]+\\)\\s-*\\S-*\\s-*\\S-*\\s-*.\\s-*\\S-*\\s-*\\(\\S-*\\):\\([0-9]+\\)"))
+           "\\([0-9]+\\)\\s-*\\S-*\\s-*\\S-*\\s-*.\\s-*\\S-*\\s-*\
+\\(\\S-*\\):\\([0-9]+\\)"))
         (let ((bptno (match-string 1))
               (file  (match-string 2))
               (line  (match-string 3)))
           (save-selected-window
             (let* ((buf (find-file-noselect
                          (if (file-exists-p file) file
-                           (cdr (assoc bptno gdb-location-list)))))
+                           (cdr (assoc bptno gdb-location-alist)))))
                    (window (display-buffer buf)))
               (with-current-buffer buf
                 (goto-line (string-to-number line))
@@ -1481,7 +1541,8 @@ static char *magick[] = {
   (interactive (list last-input-event))
   (if event (mouse-set-point event))
   (gdb-enqueue-input
-   (list (concat gdb-server-prefix "frame " (gdb-get-frame-number) "\n") 'ignore))
+   (list (concat gdb-server-prefix "frame "
+                 (gdb-get-frame-number) "\n") 'ignore))
   (gud-display-frame))
 
 
@@ -1668,7 +1729,7 @@ static char *magick[] = {
   (save-selected-window
     (select-window (posn-window (event-start event)))
     (let* ((arg (read-from-minibuffer "Repeat count: "))
-          (count (string-to-int arg)))
+          (count (string-to-number arg)))
       (if (< count 0)
           (error "Non-negative numbers only")
         (customize-set-variable 'gdb-memory-repeat-count count)
@@ -1976,7 +2037,8 @@ corresponding to the mode line clicked."
 
 (let ((menu (make-sparse-keymap "GDB-Windows")))
   (define-key gud-menu-map [displays]
-    `(menu-item "GDB-Windows" ,menu :visible (eq gud-minor-mode 'gdba)))
+    `(menu-item "GDB-Windows" ,menu
+                :visible (memq gud-minor-mode '(gdbmi gdba))))
   (define-key menu [gdb] '("Gdb" . gdb-display-gdb-buffer))
   (define-key menu [threads] '("Threads" . gdb-display-threads-buffer))
   (define-key menu [memory] '("Memory" . gdb-display-memory-buffer))
@@ -1987,11 +2049,13 @@ corresponding to the mode line clicked."
                 :enable gdb-use-inferior-io-buffer))
   (define-key menu [locals] '("Locals" . gdb-display-locals-buffer))
   (define-key menu [frames] '("Stack" . gdb-display-stack-buffer))
-  (define-key menu [breakpoints] '("Breakpoints" . gdb-display-breakpoints-buffer)))
+  (define-key menu [breakpoints]
+    '("Breakpoints" . gdb-display-breakpoints-buffer)))
 
 (let ((menu (make-sparse-keymap "GDB-Frames")))
   (define-key gud-menu-map [frames]
-    `(menu-item "GDB-Frames" ,menu :visible (eq gud-minor-mode 'gdba)))
+    `(menu-item "GDB-Frames" ,menu
+                :visible (memq gud-minor-mode '(gdbmi gdba))))
   (define-key menu [gdb] '("Gdb" . gdb-frame-gdb-buffer))
   (define-key menu [threads] '("Threads" . gdb-frame-threads-buffer))
   (define-key menu [memory] '("Memory" . gdb-frame-memory-buffer))
@@ -2002,7 +2066,8 @@ corresponding to the mode line clicked."
                 :enable gdb-use-inferior-io-buffer))
   (define-key menu [locals] '("Locals" . gdb-frame-locals-buffer))
   (define-key menu [frames] '("Stack" . gdb-frame-stack-buffer))
-  (define-key menu [breakpoints] '("Breakpoints" . gdb-frame-breakpoints-buffer)))
+  (define-key menu [breakpoints]
+    '("Breakpoints" . gdb-frame-breakpoints-buffer)))
 
 (let ((menu (make-sparse-keymap "GDB-UI")))
   (define-key gud-menu-map [ui]
@@ -2129,12 +2194,15 @@ Kills the gdb buffers and resets the source buffers."
               (gdb-remove-breakpoint-icons (point-min) (point-max) t)
               (setq gud-minor-mode nil)
               (kill-local-variable 'tool-bar-map)
-              (setq gud-running nil))))))
+              (kill-local-variable 'gdb-define-alist))))))
   (when (markerp gdb-overlay-arrow-position)
     (move-marker gdb-overlay-arrow-position nil)
     (setq gdb-overlay-arrow-position nil))
   (setq overlay-arrow-variable-list
-        (delq 'gdb-overlay-arrow-position overlay-arrow-variable-list)))
+        (delq 'gdb-overlay-arrow-position overlay-arrow-variable-list))
+  (setq gud-running nil)
+  (setq gdb-active-process nil)
+  (remove-hook 'after-save-hook 'gdb-create-define-alist t))
 
 (defun gdb-source-info ()
   "Find the source file where the program starts and displays it with related
@@ -2157,9 +2225,9 @@ Put in buffer and place breakpoint icon."
   (catch 'file-not-found
     (if (search-forward "Located in " nil t)
         (if (looking-at "\\S-*")
-            (push (cons bptno (match-string 0)) gdb-location-list))
+            (push (cons bptno (match-string 0)) gdb-location-alist))
       (gdb-resync)
-      (push (cons bptno "File not found") gdb-location-list)
+      (push (cons bptno "File not found") gdb-location-alist)
       (message-box "Cannot find source file for breakpoint location.\n\
 Add directory to search path for source files using the GDB command, dir.")
       (throw 'file-not-found nil))
@@ -2214,7 +2282,7 @@ BUFFER nil or omitted means use the current buffer."
   (unless buffer
     (setq buffer (current-buffer)))
   (dolist (overlay (overlays-in start end))
-        (when (overlay-get overlay 'put-break)
+    (when (overlay-get overlay 'put-break)
           (delete-overlay overlay))))
 
 (defun gdb-put-breakpoint-icon (enabled bptno)
@@ -2416,7 +2484,8 @@ BUFFER nil or omitted means use the current buffer."
                       (setq gdb-input-queue
                             (delete item gdb-input-queue))))))
             (gdb-enqueue-input
-             (list (concat gdb-server-prefix "disassemble " gdb-current-address "\n")
+             (list (concat gdb-server-prefix "disassemble "
+                           gdb-current-address "\n")
                    'gdb-assembler-handler))
             (push 'gdb-invalidate-assembler gdb-pending-triggers)
             (setq gdb-previous-address gdb-current-address)
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index ab705212397..4f5ffe0d23b 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -1,7 +1,7 @@
 ;;; grep.el --- run compiler as inferior of Emacs, parse error messages
 
 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2001, 2002, 2004  Free Software Foundation, Inc.
+;;   2001, 2002, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
 ;; Maintainer: FSF
@@ -294,7 +294,10 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
       (2 compilation-line-face))
      ;; Highlight grep matches and delete markers
      ("\\(\033\\[01;41m\\)\\(.*?\\)\\(\033\\[00m\\(\033\\[K\\)?\\)"
-      (2 grep-match-face)
+      ;; Refontification does not work after the markers have been
+      ;; deleted.  So we use the font-lock-face property here as Font
+      ;; Lock does not clear that.
+      (2 (list 'face nil 'font-lock-face grep-match-face))
       ((lambda (p))
        (progn
          ;; Delete markers with `replace-match' because it updates
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 9a5d609c523..e98cb9eee58 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -228,6 +228,10 @@ Uses `gud-<MINOR-MODE>-directories' to find the source files."
       (with-current-buffer buf
         (set (make-local-variable 'gud-minor-mode) minor-mode)
         (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
+        (when (memq gud-minor-mode '(gdbmi gdba))
+          (make-local-variable 'gdb-define-alist)
+          (unless  gdb-define-alist (gdb-create-define-alist))
+          (add-hook 'after-save-hook 'gdb-create-define-alist nil t))
         (make-local-variable 'gud-keep-buffer))
       buf)))
 
@@ -474,7 +478,7 @@ off the specialized speedbar mode."
 
        ;; Extract the frame position from the marker.
        gud-last-frame (cons (match-string 1 gud-marker-acc)
-                            (string-to-int (match-string 2 gud-marker-acc)))
+                            (string-to-number (match-string 2 gud-marker-acc)))
 
        ;; Append any text before the marker to the output we're going
        ;; to return - we don't include the marker in this text.
@@ -775,14 +779,14 @@ SKIP is the number of chars to skip on each lines, it defaults to 0."
                         gud-marker-acc start)
           (setq gud-last-frame
                 (cons (match-string 3 gud-marker-acc)
-                      (string-to-int (match-string 4 gud-marker-acc)))))
+                      (string-to-number (match-string 4 gud-marker-acc)))))
          ;; System V Release 4.0 quite often clumps two lines together
          ((string-match "^\\(BREAKPOINT\\|STEPPED\\) process [0-9]+ function [^ ]+ in \\(.+\\)\n\\([0-9]+\\):"
                         gud-marker-acc start)
           (setq gud-sdb-lastfile (match-string 2 gud-marker-acc))
           (setq gud-last-frame
                 (cons gud-sdb-lastfile
-                      (string-to-int (match-string 3 gud-marker-acc)))))
+                      (string-to-number (match-string 3 gud-marker-acc)))))
          ;; System V Release 4.0
          ((string-match "^\\(BREAKPOINT\\|STEPPED\\) process [0-9]+ function [^ ]+ in \\(.+\\)\n"
                         gud-marker-acc start)
@@ -791,7 +795,7 @@ SKIP is the number of chars to skip on each lines, it defaults to 0."
                                               gud-marker-acc start))
                (setq gud-last-frame
                      (cons gud-sdb-lastfile
-                           (string-to-int (match-string 1 gud-marker-acc)))))
+                           (string-to-number (match-string 1 gud-marker-acc)))))
          (t
           (setq gud-sdb-lastfile nil)))
       (setq start (match-end 0)))
@@ -877,7 +881,7 @@ containing the executable being debugged."
                 gud-marker-acc start))
       (setq gud-last-frame
             (cons (match-string 2 gud-marker-acc)
-                  (string-to-int (match-string 1 gud-marker-acc)))
+                  (string-to-number (match-string 1 gud-marker-acc)))
             start (match-end 0)))
 
     ;; Search for the last incomplete line in this chunk
@@ -924,7 +928,7 @@ containing the executable being debugged."
        ;; Extract the frame position from the marker.
        gud-last-frame
        (cons (match-string 1 gud-marker-acc)
-             (string-to-int (match-string 2 gud-marker-acc)))
+             (string-to-number (match-string 2 gud-marker-acc)))
 
        ;; Append any text before the marker to the output we're going
        ;; to return - we don't include the marker in this text.
@@ -1032,7 +1036,7 @@ a better solution in 6.1 upwards.")
             (if (file-exists-p file)
                 (setq gud-last-frame
                       (cons (match-string 1 result)
-                            (string-to-int (match-string 2 result))))))
+                            (string-to-number (match-string 2 result))))))
           result)
          ((string-match                 ; kluged-up marker as above
            "\032\032\\([0-9]*\\):\\(.*\\)\n" result)
@@ -1040,7 +1044,7 @@ a better solution in 6.1 upwards.")
             (if (and file (file-exists-p file))
                 (setq gud-last-frame
                       (cons file
-                            (string-to-int (match-string 1 result))))))
+                            (string-to-number (match-string 1 result))))))
           (setq result (substring result 0 (match-beginning 0))))))
     (or result "")))
 
@@ -1077,7 +1081,7 @@ This was tested using R4.11.")
     (while (string-match re gud-marker-acc start)
       (setq gud-last-frame
             (cons (match-string 4 gud-marker-acc)
-                  (string-to-int (match-string 3 gud-marker-acc)))
+                  (string-to-number (match-string 3 gud-marker-acc)))
             start (match-end 0)))
 
     ;; Search for the last incomplete line in this chunk
@@ -1196,7 +1200,7 @@ containing the executable being debugged."
                               result)
                 (string-match "[^: \t]+:[ \t]+\\([^:]+\\): [^:]+: \\([0-9]+\\):"
                               result))
-            (let ((line (string-to-int (match-string 2 result)))
+            (let ((line (string-to-number (match-string 2 result)))
                   (file (gud-file-name (match-string 1 result))))
               (if file
                   (setq gud-last-frame (cons file line))))))
@@ -1298,7 +1302,7 @@ into one that invokes an Emacs-enabled debugging session.
        ;; Extract the frame position from the marker.
        gud-last-frame
        (cons (match-string 1 gud-marker-acc)
-             (string-to-int (match-string 3 gud-marker-acc)))
+             (string-to-number (match-string 3 gud-marker-acc)))
 
        ;; Append any text before the marker to the output we're going
        ;; to return - we don't include the marker in this text.
@@ -1396,7 +1400,7 @@ and source-file directory for your debugger."
        gud-last-frame
        (let ((file (match-string gud-pdb-marker-regexp-file-group
                                  gud-marker-acc))
-             (line (string-to-int
+             (line (string-to-number
                     (match-string gud-pdb-marker-regexp-line-group
                                   gud-marker-acc))))
          (if (string-equal file "<string>")
@@ -2028,7 +2032,7 @@ nil)
       ;;     (<file-name> . <line-number>) .
       (if (if (match-beginning 1)
               (let (n)
-                (setq n (string-to-int (substring
+                (setq n (string-to-number (substring
                                         gud-marker-acc
                                         (1+ (match-beginning 1))
                                         (- (match-end 1) 2))))
@@ -2039,7 +2043,7 @@ nil)
                     (gud-jdb-find-source (match-string 2 gud-marker-acc)))
               (setq gud-last-frame
                     (cons file-found
-                          (string-to-int
+                          (string-to-number
                            (let
                                ((numstr (match-string 4 gud-marker-acc)))
                              (if (string-match "[.,]" numstr)
@@ -2187,7 +2191,7 @@ gud, see `gud-mode'."
        ;; Extract the frame position from the marker.
        gud-last-frame
        (cons (match-string 2 gud-marker-acc)
-             (string-to-int (match-string 4 gud-marker-acc)))
+             (string-to-number (match-string 4 gud-marker-acc)))
 
        ;; Append any text before the marker to the output we're going
        ;; to return - we don't include the marker in this text.
@@ -2977,6 +2981,7 @@ class of the file (using s to separate nested class ids)."
         (message "gud-find-class: class for file %s not found in gud-jdb-class-source-alist!" f)
         nil))))
 
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; GDB script mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index 06ad2d591ad..083d87f581c 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -167,7 +167,7 @@ and franz.  This variable is used to initialize `comint-prompt-regexp' in the
 Inferior Lisp buffer.
 
 This variable is only used if the variable
-`comint-use-prompt-regexp-instead-of-fields' is non-nil.
+`comint-use-prompt-regexp' is non-nil.
 
 More precise choices:
 Lucid Common Lisp: \"^\\\\(>\\\\|\\\\(->\\\\)+\\\\) *\"
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 5073f2bc23a..3f556bdb695 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1680,7 +1680,7 @@ Repeating the command scrolls the completion window."
 ;;;; Modes.
 
 (defvar outline-heading-end-regexp)
-(defvar eldoc-print-current-symbol-info-function)
+(defvar eldoc-documentation-function)
 
 ;;;###autoload
 (define-derived-mode python-mode fundamental-mode "Python"
@@ -1740,7 +1740,7 @@ lines count as headers.
        'python-beginning-of-defun)
   (set (make-local-variable 'end-of-defun-function) 'python-end-of-defun)
   (setq imenu-create-index-function #'python-imenu-create-index)
-  (set (make-local-variable 'eldoc-print-current-symbol-info-function)
+  (set (make-local-variable 'eldoc-documentation-function)
        #'python-eldoc-function)
   (add-hook 'eldoc-mode-hook
             '(lambda () (run-python 0 t)) nil t) ; need it running
diff --git a/lisp/recentf.el b/lisp/recentf.el
index 40a9204267e..cf61b688eb5 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -1137,6 +1137,12 @@ default."
   ";;; Automatically generated by `recentf' on %s.\n"
   "Header to be written into the `recentf-save-file'.")
 
+(defconst recentf-save-file-coding-system
+  (if (coding-system-p 'utf-8-emacs)
+      'utf-8-emacs
+    'emacs-mule)
+  "Coding system of the file `recentf-save-file'.")
+
 (defun recentf-save-list ()
   "Save the recent list.
 Write data into the file specified by `recentf-save-file'."
@@ -1144,9 +1150,13 @@ Write data into the file specified by `recentf-save-file'."
   (condition-case error
       (with-temp-buffer
         (erase-buffer)
+        (set-buffer-file-coding-system recentf-save-file-coding-system)
         (insert (format recentf-save-file-header (current-time-string)))
         (recentf-dump-variable 'recentf-list recentf-max-saved-items)
         (recentf-dump-variable 'recentf-filter-changer-state)
+        (insert "\n\n;;; Local Variables:\n"
+                (format ";;; coding: %s\n" recentf-save-file-coding-system)
+                ";;; End:\n")
         (write-file (expand-file-name recentf-save-file))
         nil)
     (error
@@ -1207,6 +1217,6 @@ that were operated on recently."
 (provide 'recentf)
 
 (run-hooks 'recentf-load-hook)
-
+
 ;;; arch-tag: 78f1eec9-0d16-4d19-a4eb-2e4529edb62a
 ;;; recentf.el ends here
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index cb61c8383b5..9dc7b858e37 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -166,7 +166,8 @@ To save places automatically in all files, put this in your `.emacs' file:
         (let ((cell (assoc buffer-file-name save-place-alist))
               (position (if (not (eq major-mode 'hexl-mode))
                             (point)
-                          (1+ (hexl-current-address)))))
+                          (with-no-warnings
+                            (1+ (hexl-current-address))))))
           (if cell
               (setq save-place-alist (delq cell save-place-alist)))
           (if (and save-place
diff --git a/lisp/shell.el b/lisp/shell.el
index 1817a1fd3b4..354ed88f80f 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -136,8 +136,9 @@ Defaults to \"^[^#$%>\\n]*[#$%>] *\", which works pretty well.
 This variable is used to initialise `comint-prompt-regexp' in the
 shell buffer.
 
-This variable is only used if the variable
-`comint-use-prompt-regexp-instead-of-fields' is non-nil.
+If `comint-use-prompt-regexp' is nil, then this variable is only used
+to determine paragraph boundaries.  See Info node `Shell Prompts' for
+how Shell mode treats paragraphs.
 
 The pattern should probably not match more than one line.  If it does,
 Shell mode may become confused trying to distinguish prompt from input
@@ -422,6 +423,7 @@ buffer."
   (setq comint-file-name-chars shell-file-name-chars)
   (setq comint-file-name-quote-list shell-file-name-quote-list)
   (setq comint-dynamic-complete-functions shell-dynamic-complete-functions)
+  (set (make-local-variable 'paragraph-separate) "\\'")
   (make-local-variable 'paragraph-start)
   (setq paragraph-start comint-prompt-regexp)
   (make-local-variable 'font-lock-defaults)
diff --git a/lisp/simple.el b/lisp/simple.el
index 2d10e68f6b9..011c1970f82 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -113,7 +113,9 @@ If `fringe-arrow', indicate the locus by the fringe arrow."
 (defvar next-error-highlight-timer nil)
 
 (defvar next-error-overlay-arrow-position nil)
-(put 'next-error-overlay-arrow-position 'overlay-arrow-string "=>")
+;; This is nil so as not to really display anything on text
+;; terminals.  On text terminals, it would hide part of the file name.
+(put 'next-error-overlay-arrow-position 'overlay-arrow-string "")
 (add-to-list 'overlay-arrow-variable-list 'next-error-overlay-arrow-position)
 
 (defvar next-error-last-buffer nil
@@ -3199,6 +3201,14 @@ Invoke \\[apropos-documentation] and type \"transient\" or
 commands which are sensitive to the Transient Mark mode."
   :global t :group 'editing-basics :require nil)
 
+(defvar widen-automatically t
+  "Non-nil means it is ok for commands to call `widen' when they want to.
+Some commands will do this in order to go to positions outside
+the current accessible part of the buffer.
+
+If `widen-automatically' is nil, these commands will do something else
+as a fallback, and won't change the buffer bounds.")
+
 (defun pop-global-mark ()
   "Pop off global mark ring and jump to the top location."
   (interactive)
@@ -3215,7 +3225,9 @@ commands which are sensitive to the Transient Mark mode."
     (set-buffer buffer)
     (or (and (>= position (point-min))
              (<= position (point-max)))
-        (widen))
+        (if widen-automatically
+            (error "Global mark position is outside accessible part of buffer")
+          (widen)))
     (goto-char position)
     (switch-to-buffer buffer)))
 
@@ -3403,19 +3415,37 @@ Outline mode sets this."
                   (goto-char (next-char-property-change (point))))
                 ;; Now move a line.
                 (end-of-line)
-                (and (zerop (vertical-motion 1))
-                     (if (not noerror)
-                         (signal 'end-of-buffer nil)
-                       (setq done t)))
+                ;; If there's no invisibility here, move over the newline.
+                (if (not (line-move-invisible-p (point)))
+                    ;; We avoid vertical-motion when possible
+                    ;; because that has to fontify.
+                    (if (eobp)
+                       (if (not noerror)
+                           (signal 'end-of-buffer nil)
+                         (setq done t))
+                      (forward-line 1))
+                  ;; Otherwise move a more sophisticated way.
+                  ;; (What's the logic behind this code?)
+                  (and (zerop (vertical-motion 1))
+                       (if (not noerror)
+                           (signal 'end-of-buffer nil)
+                         (setq done t))))
                 (unless done
                   (setq arg (1- arg))))
+              ;; The logic of this is the same as the loop above, 
+              ;; it just goes in the other direction.
               (while (and (< arg 0) (not done))
                 (beginning-of-line)
-
-                (if (zerop (vertical-motion -1))
-                    (if (not noerror)
-                        (signal 'beginning-of-buffer nil)
-                      (setq done t)))
+                (if (or (bobp) (not (line-move-invisible-p (1- (point)))))
+                    (if (bobp)
+                        (if (not noerror)
+                            (signal 'beginning-of-buffer nil)
+                          (setq done t))
+                      (forward-line -1))
+                  (if (zerop (vertical-motion -1))
+                      (if (not noerror)
+                          (signal 'beginning-of-buffer nil)
+                        (setq done t))))
                 (unless done
                   (setq arg (1+ arg))
                   (while (and ;; Don't move over previous invis lines
diff --git a/lisp/startup.el b/lisp/startup.el
index 46c44acbe23..2d1b27f4bd1 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -995,7 +995,8 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
   ;; the session manager and we have a session manager connection.
   (if (and (boundp 'x-session-previous-id)
            (stringp x-session-previous-id))
-      (emacs-session-restore x-session-previous-id)))
+      (with-no-warnings
+        (emacs-session-restore x-session-previous-id))))
 
 (defcustom initial-scratch-message (purecopy "\
 ;; This buffer is for notes you don't want to save, and for Lisp evaluation.
diff --git a/lisp/subr.el b/lisp/subr.el
index b9ea857715c..1c2c01e6b16 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -753,35 +753,16 @@ and `event-end' functions."
 
 ;;;; Obsolescent names for functions.
 
-(defalias 'dot 'point)
-(defalias 'dot-marker 'point-marker)
-(defalias 'dot-min 'point-min)
-(defalias 'dot-max 'point-max)
 (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 'buffer-flush-undo 'buffer-disable-undo)
 (defalias 'eval-current-buffer 'eval-buffer)
-(defalias 'compiled-function-p 'byte-code-function-p)
-(defalias 'define-function 'defalias)
 
-(defalias 'sref 'aref)
-(make-obsolete 'sref 'aref "20.4")
 (make-obsolete 'char-bytes "now always returns 1." "20.4")
-(make-obsolete 'chars-in-region "use (abs (- BEG END))." "20.3")
-(make-obsolete 'dot 'point              "before 19.15")
-(make-obsolete 'dot-max 'point-max      "before 19.15")
-(make-obsolete 'dot-min 'point-min      "before 19.15")
-(make-obsolete 'dot-marker 'point-marker "before 19.15")
-(make-obsolete 'buffer-flush-undo 'buffer-disable-undo "before 19.15")
 (make-obsolete 'baud-rate "use the `baud-rate' variable instead." "before 19.15")
-(make-obsolete 'compiled-function-p 'byte-code-function-p "before 19.15")
-(make-obsolete 'define-function 'defalias "20.1")
-(make-obsolete 'focus-frame "it does nothing." "19.32")
-(make-obsolete 'unfocus-frame "it does nothing." "19.32")
 
 (defun insert-string (&rest args)
   "Mocklisp-compatibility insert function.
@@ -798,9 +779,6 @@ is converted into a string by expressing it in decimal."
   "Return the value of the `baud-rate' variable."
   baud-rate)
 
-(defalias 'focus-frame 'ignore "")
-(defalias 'unfocus-frame 'ignore "")
-
 
 ;;;; Obsolescence declarations for variables, and aliases.
 
@@ -809,12 +787,15 @@ 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 'executing-macro 'executing-kbd-macro "before 19.34")
 (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
+                              "before 19.34")
+
 (defvaralias 'x-lost-selection-hooks 'x-lost-selection-functions)
 (make-obsolete-variable 'x-lost-selection-hooks 'x-lost-selection-functions "22.1")
 (defvaralias 'x-sent-selection-hooks 'x-sent-selection-functions)
@@ -843,7 +824,7 @@ is converted into a string by expressing it in decimal."
 
 ;;; Should this be an obsolete name?  If you decide it should, you get
 ;;; to go through all the sources and change them.
-(defalias 'string-to-int 'string-to-number)
+(define-obsolete-function-alias 'string-to-int 'string-to-number)
 
 ;;;; Hook manipulation functions.
 
@@ -2279,7 +2260,8 @@ from `standard-syntax-table' otherwise."
     table))
 
 (defun syntax-after (pos)
-  "Return the raw syntax of the char after POS."
+  "Return the raw syntax of the char after POS.
+If POS is outside the buffer's accessible portion, return nil."
   (unless (or (< pos (point-min)) (>= pos (point-max)))
     (let ((st (if parse-sexp-lookup-properties
                   (get-char-property pos 'syntax-table))))
@@ -2287,22 +2269,23 @@ from `standard-syntax-table' otherwise."
         (aref (or st (syntax-table)) (char-after pos))))))
 
 (defun syntax-class (syntax)
-  "Return the syntax class part of the syntax descriptor SYNTAX."
-  (logand (car syntax) 255))
+  "Return the syntax class part of the syntax descriptor SYNTAX.
+If SYNTAX is nil, return nil."
+  (and syntax (logand (car syntax) 65535)))
 
-(defun add-to-invisibility-spec (arg)
-  "Add elements to `buffer-invisibility-spec'.
+(defun add-to-invisibility-spec (element)
+  "Add ELEMENT to `buffer-invisibility-spec'.
 See documentation for `buffer-invisibility-spec' for the kind of elements
 that can be added."
   (if (eq buffer-invisibility-spec t)
       (setq buffer-invisibility-spec (list t)))
   (setq buffer-invisibility-spec
-        (cons arg buffer-invisibility-spec)))
+        (cons element buffer-invisibility-spec)))
 
-(defun remove-from-invisibility-spec (arg)
-  "Remove elements from `buffer-invisibility-spec'."
+(defun remove-from-invisibility-spec (element)
+  "Remove ELEMENT from `buffer-invisibility-spec'."
   (if (consp buffer-invisibility-spec)
-    (setq buffer-invisibility-spec (delete arg buffer-invisibility-spec))))
+    (setq buffer-invisibility-spec (delete element buffer-invisibility-spec))))
 
 (defun global-set-key (key command)
   "Give KEY a global binding as COMMAND.
@@ -2376,15 +2359,34 @@ macros."
       (eq (car-safe object) 'lambda)))
 
 (defun assq-delete-all (key alist)
-  "Delete from ALIST all elements whose car is KEY.
+  "Delete from ALIST all elements whose car is `eq' to KEY.
 Return the modified alist.
 Elements of ALIST that are not conses are ignored."
-  (let ((tail alist))
-    (while tail
-      (if (and (consp (car tail)) (eq (car (car tail)) key))
-          (setq alist (delq (car tail) alist)))
-      (setq tail (cdr tail)))
-    alist))
+  (while (and (consp (car alist)) 
+              (eq (car (car alist)) key))
+    (setq alist (cdr alist)))
+  (let ((tail alist) tail-cdr)
+    (while (setq tail-cdr (cdr tail))
+      (if (and (consp (car tail-cdr))
+               (eq (car (car tail-cdr)) key))
+          (setcdr tail (cdr tail-cdr))
+        (setq tail tail-cdr))))
+  alist)
+
+(defun rassq-delete-all (value alist)
+  "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)) 
+              (eq (cdr (car alist)) value))
+    (setq alist (cdr alist)))
+  (let ((tail alist) tail-cdr)
+    (while (setq tail-cdr (cdr tail))
+      (if (and (consp (car tail-cdr))
+               (eq (cdr (car tail-cdr)) value))
+          (setcdr tail (cdr tail-cdr))
+        (setq tail tail-cdr))))
+  alist)
 
 (defun make-temp-file (prefix &optional dir-flag suffix)
   "Create a temporary file.
diff --git a/lisp/term.el b/lisp/term.el
index 8cfc11f3dba..1e04f7ac015 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -711,9 +711,10 @@ Buffer local variable.")
   :group 'term
   :type 'string)
 
+;;; Use the same colors that xterm uses, see `xterm-standard-colors'.
 (defvar ansi-term-color-vector
-  [unspecified "black" "red" "green" "yellow" "blue"
-   "magenta" "cyan" "white"])
+  [unspecified "black" "red3" "green3" "yellow3" "blue2"
+   "magenta3" "cyan3" "white"])
 
 ;;; Inspiration came from comint.el -mm
 (defvar term-buffer-maximum-size 2048
@@ -886,7 +887,9 @@ is buffer-local.")
        (i 0))
   (while (< i 128)
     (define-key map (make-string 1 i) 'term-send-raw)
-    (define-key esc-map (make-string 1 i) 'term-send-raw-meta)
+    ;; Avoid O and [. They are used in escape sequences for various keys.
+    (unless (or (eq i ?O) (eq i 91)) 
+                (define-key esc-map (make-string 1 i) 'term-send-raw-meta))
     (setq i (1+ i)))
   (define-key map "\e" esc-map)
   (setq term-raw-map map)
@@ -907,6 +910,7 @@ is buffer-local.")
     (define-key term-raw-map [right] 'term-send-right)
     (define-key term-raw-map [left] 'term-send-left)
     (define-key term-raw-map [delete] 'term-send-del)
+    (define-key term-raw-map [deletechar] 'term-send-del)
     (define-key term-raw-map [backspace] 'term-send-backspace)
     (define-key term-raw-map [home] 'term-send-home)
     (define-key term-raw-map [end] 'term-send-end)
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index d5f1e273988..2c5684091ad 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -74,7 +74,7 @@
 (require 'mouse)
 (require 'scroll-bar)
 (require 'faces)
-;;(require 'select)
+(require 'select)
 (require 'menu-bar)
 (require 'fontset)
 (require 'dnd)
@@ -1143,23 +1143,232 @@ correspoinding TextEncodingBase value."
 
 (define-key special-event-map [language-change] 'mac-handle-language-change)
 
-;;;; Selections and cut buffers
-
-;; Setup to use the Mac clipboard.  The functions mac-cut-function and
-;; mac-paste-function are defined in mac.c.
-(set-selection-coding-system 'compound-text-mac)
-
-(setq interprogram-cut-function
-      '(lambda (str push)
-         (mac-cut-function
-          (encode-coding-string str selection-coding-system t) push)))
-
-(setq interprogram-paste-function
-      '(lambda ()
-         (let ((clipboard (mac-paste-function)))
-           (if clipboard
-               (decode-coding-string clipboard selection-coding-system t)))))
-
+;;;; Selections and Services menu
+
+;; Setup to use the Mac clipboard.
+(set-selection-coding-system mac-system-coding-system)
+
+;;; We keep track of the last text selected here, so we can check the
+;;; current selection against it, and avoid passing back our own text
+;;; from x-get-selection-value.
+(defvar x-last-selected-text-clipboard nil
+  "The value of the CLIPBOARD selection last time we selected or
+pasted text.")
+(defvar x-last-selected-text-primary nil
+  "The value of the PRIMARY X selection last time we selected or
+pasted text.")
+
+(defcustom x-select-enable-clipboard t
+  "*Non-nil means cutting and pasting uses the clipboard.
+This is in addition to the primary selection."
+  :type 'boolean
+  :group 'killing)
+
+;;; Make TEXT, a string, the primary X selection.
+(defun x-select-text (text &optional push)
+  (x-set-selection 'PRIMARY text)
+  (setq x-last-selected-text-primary text)
+  (when x-select-enable-clipboard
+    (x-set-selection 'CLIPBOARD text)
+    (setq x-last-selected-text-clipboard text))
+  )
+
+(defun x-get-selection (&optional type data-type)
+  "Return the value of a selection.
+The argument TYPE (default `PRIMARY') says which selection,
+and the argument DATA-TYPE (default `STRING') says
+how to convert the data.
+
+TYPE may be any symbol \(but nil stands for `PRIMARY').  However,
+only a few symbols are commonly used.  They conventionally have
+all upper-case names.  The most often used ones, in addition to
+`PRIMARY', are `SECONDARY' and `CLIPBOARD'.
+
+DATA-TYPE is usually `STRING', but can also be one of the symbols
+in `selection-converter-alist', which see."
+  (let ((data (x-get-selection-internal (or type 'PRIMARY)
+                                        (or data-type 'STRING)))
+        (coding (or next-selection-coding-system
+                    selection-coding-system)))
+    (when (and (stringp data)
+               (setq data-type (get-text-property 0 'foreign-selection data)))
+      (cond ((eq data-type 'public.utf16-plain-text)
+             (let ((encoded (and (fboundp 'mac-code-convert-string)
+                                 (mac-code-convert-string data
+                                                          'utf-16 coding))))
+               (if encoded
+                   (let ((coding-save last-coding-system-used))
+                     (setq data (decode-coding-string encoded coding))
+                     (setq last-coding-system-used coding-save))
+                 (setq data
+                       (decode-coding-string data 'utf-16)))))
+            ((eq data-type 'com.apple.traditional-mac-plain-text)
+             (setq data (decode-coding-string data coding))))
+      (put-text-property 0 (length data) 'foreign-selection data-type data))
+    data))
+
+(defun x-selection-value (type)
+  (let (text tiff-image)
+    (setq text (condition-case nil
+                   (x-get-selection type 'public.utf16-plain-text)
+                 (error nil)))
+    (if (not text)
+        (setq text (condition-case nil
+                       (x-get-selection type
+                                        'com.apple.traditional-mac-plain-text)
+                     (error nil))))
+    (if text
+        (remove-text-properties 0 (length text) '(foreign-selection nil) text))
+    (setq tiff-image (condition-case nil
+                         (x-get-selection type 'public.tiff)
+                       (error nil)))
+    (when tiff-image
+      (remove-text-properties 0 (length tiff-image)
+                              '(foreign-selection nil) tiff-image)
+      (setq tiff-image (create-image tiff-image 'tiff t))
+      (or text (setq text " "))
+      (put-text-property 0 (length text) 'display tiff-image text))
+    text))
+
+;;; Return the value of the current selection.
+;;; Treat empty strings as if they were unset.
+;;; If this function is called twice and finds the same text,
+;;; it returns nil the second time.  This is so that a single
+;;; selection won't be added to the kill ring over and over.
+(defun x-get-selection-value ()
+  (let (clip-text primary-text)
+    (when x-select-enable-clipboard
+      (setq clip-text (x-selection-value 'CLIPBOARD))
+      (if (string= clip-text "") (setq clip-text nil))
+
+      ;; Check the CLIPBOARD selection for 'newness', is it different
+      ;; from what we remebered them to be last time we did a
+      ;; cut/paste operation.
+      (setq clip-text
+            (cond;; check clipboard
+             ((or (not clip-text) (string= clip-text ""))
+              (setq x-last-selected-text-clipboard nil))
+             ((eq      clip-text x-last-selected-text-clipboard) nil)
+             ((string= clip-text x-last-selected-text-clipboard)
+              ;; Record the newer string,
+              ;; so subsequent calls can use the `eq' test.
+              (setq x-last-selected-text-clipboard clip-text)
+              nil)
+             (t
+              (setq x-last-selected-text-clipboard clip-text))))
+      )
+
+    (setq primary-text (x-selection-value 'PRIMARY))
+    ;; Check the PRIMARY selection for 'newness', is it different
+    ;; from what we remebered them to be last time we did a
+    ;; cut/paste operation.
+    (setq primary-text
+          (cond;; check primary selection
+           ((or (not primary-text) (string= primary-text ""))
+            (setq x-last-selected-text-primary nil))
+           ((eq      primary-text x-last-selected-text-primary) nil)
+           ((string= primary-text x-last-selected-text-primary)
+            ;; Record the newer string,
+            ;; so subsequent calls can use the `eq' test.
+            (setq x-last-selected-text-primary primary-text)
+            nil)
+           (t
+            (setq x-last-selected-text-primary primary-text))))
+
+    ;; As we have done one selection, clear this now.
+    (setq next-selection-coding-system nil)
+
+    ;; At this point we have recorded the current values for the
+    ;; selection from clipboard (if we are supposed to) and primary,
+    ;; So return the first one that has changed (which is the first
+    ;; non-null one).
+    (or clip-text primary-text)
+    ))
+
+(put 'CLIPBOARD 'mac-scrap-name "com.apple.scrap.clipboard")
+(if (eq system-type 'darwin)
+    (put 'FIND 'mac-scrap-name "com.apple.scrap.find"))
+(put 'com.apple.traditional-mac-plain-text 'mac-ostype "TEXT")
+(put 'public.utf16-plain-text 'mac-ostype "utxt")
+(put 'public.tiff 'mac-ostype "TIFF")
+
+(defun mac-select-convert-to-string (selection type value)
+  (let ((str (cdr (xselect-convert-to-string selection nil value)))
+        coding)
+    (setq coding (or next-selection-coding-system selection-coding-system))
+    (if coding
+        (setq coding (coding-system-base coding))
+      (setq coding 'raw-text))
+    (when str
+      ;; If TYPE is nil, this is a local request, thus return STR as
+      ;; is.  Otherwise, encode STR.
+      (if (not type)
+          str
+        (let ((inhibit-read-only t))
+          (remove-text-properties 0 (length str) '(composition nil) str)
+          (cond
+           ((eq type 'public.utf16-plain-text)
+            (let (s)
+              (when (and (fboundp 'mac-code-convert-string)
+                         (memq coding (find-coding-systems-string str)))
+                (setq coding (coding-system-change-eol-conversion coding 'mac))
+                (setq s (mac-code-convert-string
+                         (encode-coding-string str coding)
+                         coding 'utf-16)))
+              (setq str (or s (encode-coding-string str 'utf-16-mac)))))
+           ((eq type 'com.apple.traditional-mac-plain-text)
+            (setq coding (coding-system-change-eol-conversion coding 'mac))
+            (setq str (encode-coding-string str coding)))
+           (t
+            (error "Unknown selection type: %S" type))
+           )))
+
+      (setq next-selection-coding-system nil)
+      (cons type str))))
+
+(setq selection-converter-alist
+      (nconc
+       '((public.utf16-plain-text . mac-select-convert-to-string)
+         (com.apple.traditional-mac-plain-text . mac-select-convert-to-string)
+         ;; This is not enabled by default because the `Import Image'
+         ;; menu makes Emacs crash or hang for unknown reasons.
+         ;; (public.tiff . nil)
+         )
+       selection-converter-alist))
+
+(defun mac-services-open-file ()
+  (interactive)
+  (find-file-existing (x-selection-value mac-services-selection)))
+
+(defun mac-services-open-selection ()
+  (interactive)
+  (switch-to-buffer (generate-new-buffer "*untitled*"))
+  (insert (x-selection-value mac-services-selection))
+  (sit-for 0)
+  (save-buffer) ; It pops up the save dialog.
+  )
+
+(defun mac-services-insert-text ()
+  (interactive)
+  (let ((text (x-selection-value mac-services-selection)))
+    (if (not buffer-read-only)
+        (insert text)
+      (kill-new text)
+      (message
+       (substitute-command-keys
+        "The text from the Services menu can be accessed with \\[yank]")))))
+
+(defvar mac-application-menu-map (make-sparse-keymap))
+(define-key mac-application-menu-map [quit] 'save-buffers-kill-emacs)
+(define-key mac-application-menu-map [services perform open-file]
+  'mac-services-open-file)
+(define-key mac-application-menu-map [services perform open-selection]
+  'mac-services-open-selection)
+(define-key mac-application-menu-map [services paste]
+  'mac-services-insert-text)
+(define-key mac-application-menu-map [preferences] 'customize)
+(define-key mac-application-menu-map [about] 'display-splash-screen)
+(global-set-key [menu-bar application] mac-application-menu-map)
 
 ;;; Do the actual Windows setup here; the above code just defines
 ;;; functions and variables that we use now.
@@ -1444,12 +1653,25 @@ It returns a name of the created fontset."
   (error "Suspending an Emacs running under Mac makes no sense"))
 (add-hook 'suspend-hook 'x-win-suspend-error)
 
+;;; Arrange for the kill and yank functions to set and check the clipboard.
+(setq interprogram-cut-function 'x-select-text)
+(setq interprogram-paste-function 'x-get-selection-value)
+
+
+;;; Turn off window-splitting optimization; Mac is usually fast enough
+;;; that this is only annoying.
+(setq split-window-keep-point t)
+
 ;; Don't show the frame name; that's redundant.
 (setq-default mode-line-frame-identification "  ")
 
 ;; Turn on support for mouse wheels.
 (mouse-wheel-mode 1)
 
+
+;; Enable CLIPBOARD copy/paste through menu bar commands.
+(menu-bar-enable-clipboard)
+
 (defun mac-drag-n-drop (event)
   "Edit the files listed in the drag-n-drop EVENT.
 Switch to a buffer editing the last file dropped."
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 23a25dee827..d4fe99f1f6a 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -26,6 +26,66 @@
 
 ;;; Code:
 
+;;; The terminal intialization C code file might have initialized
+;;; function keys F13->F60 from the termcap/terminfo information.  On
+;;; a PC-style keyboard these keys correspond to
+;;; MODIFIER-FUNCTION_KEY, where modifier is S-, C, A-, C-S-.  The
+;;; code here subsitutes the corresponding defintions in
+;;; function-key-map. This substitution is needed because if a key
+;;; definition if found in function-key-map, there are no further
+;;; lookups in other keymaps.
+(substitute-key-definition [f13] [S-f1] function-key-map) 
+(substitute-key-definition [f14] [S-f2] function-key-map)
+(substitute-key-definition [f15] [S-f3] function-key-map)
+(substitute-key-definition [f16] [S-f4] function-key-map)
+(substitute-key-definition [f17] [S-f5] function-key-map)
+(substitute-key-definition [f18] [S-f6] function-key-map)
+(substitute-key-definition [f19] [S-f7] function-key-map)
+(substitute-key-definition [f20] [S-f8] function-key-map)
+(substitute-key-definition [f21] [S-f9] function-key-map)
+(substitute-key-definition [f22] [S-f10] function-key-map)
+(substitute-key-definition [f23] [S-f11] function-key-map)
+(substitute-key-definition [f24] [S-f12] function-key-map)
+
+(substitute-key-definition [f25] [C-f1] function-key-map) 
+(substitute-key-definition [f26] [C-f2] function-key-map)
+(substitute-key-definition [f27] [C-f3] function-key-map)
+(substitute-key-definition [f28] [C-f4] function-key-map)
+(substitute-key-definition [f29] [C-f5] function-key-map)
+(substitute-key-definition [f30] [C-f6] function-key-map)
+(substitute-key-definition [f31] [C-f7] function-key-map)
+(substitute-key-definition [f32] [C-f8] function-key-map)
+(substitute-key-definition [f33] [C-f9] function-key-map)
+(substitute-key-definition [f34] [C-f10] function-key-map)
+(substitute-key-definition [f35] [C-f11] function-key-map)
+(substitute-key-definition [f36] [C-f12] function-key-map)
+
+(substitute-key-definition [f37] [C-S-f1] function-key-map) 
+(substitute-key-definition [f38] [C-S-f2] function-key-map)
+(substitute-key-definition [f39] [C-S-f3] function-key-map)
+(substitute-key-definition [f40] [C-S-f4] function-key-map)
+(substitute-key-definition [f41] [C-S-f5] function-key-map)
+(substitute-key-definition [f42] [C-S-f6] function-key-map)
+(substitute-key-definition [f43] [C-S-f7] function-key-map)
+(substitute-key-definition [f44] [C-S-f8] function-key-map)
+(substitute-key-definition [f45] [C-S-f9] function-key-map)
+(substitute-key-definition [f46] [C-S-f10] function-key-map)
+(substitute-key-definition [f47] [C-S-f11] function-key-map)
+(substitute-key-definition [f48] [C-S-f12] function-key-map)
+
+(substitute-key-definition [f49] [A-f1] function-key-map) 
+(substitute-key-definition [f50] [A-f2] function-key-map)
+(substitute-key-definition [f51] [A-f3] function-key-map)
+(substitute-key-definition [f52] [A-f4] function-key-map)
+(substitute-key-definition [f53] [A-f5] function-key-map)
+(substitute-key-definition [f54] [A-f6] function-key-map)
+(substitute-key-definition [f55] [A-f7] function-key-map)
+(substitute-key-definition [f56] [A-f8] function-key-map)
+(substitute-key-definition [f57] [A-f9] function-key-map)
+(substitute-key-definition [f58] [A-f10] function-key-map)
+(substitute-key-definition [f59] [A-f11] function-key-map)
+(substitute-key-definition [f60] [A-f12] function-key-map)
+
 (let ((map (make-sparse-keymap)))
   (define-key map "\e[A" [up])
   (define-key map "\e[B" [down])
@@ -51,10 +111,15 @@
   (define-key map "\e[24~" [f12])
   (define-key map "\e[29~" [print])
 
-  (define-key map "\e[11;2~" [S-f1])
-  (define-key map "\e[12;2~" [S-f2])
-  (define-key map "\e[13;2~" [S-f3])
-  (define-key map "\e[14;2~" [S-f4])
+  (define-key map "\eOP" [f1])
+  (define-key map "\eOQ" [f2])
+  (define-key map "\eOR" [f3])
+  (define-key map "\eOS" [f4])
+
+  (define-key map "\eO2P" [S-f1])
+  (define-key map "\eO2Q" [S-f2])
+  (define-key map "\eO2R" [S-f3])
+  (define-key map "\eO2S" [S-f4])
   (define-key map "\e[15;2~" [S-f5])
   (define-key map "\e[17;2~" [S-f6])
   (define-key map "\e[18;2~" [S-f7])
@@ -64,10 +129,10 @@
   (define-key map "\e[23;2~" [S-f11])
   (define-key map "\e[24;2~" [S-f12])
 
-  (define-key map "\e[11;5~" [C-f1])
-  (define-key map "\e[12;5~" [C-f2])
-  (define-key map "\e[13;5~" [C-f3])
-  (define-key map "\e[14;5~" [C-f4])
+  (define-key map "\eO5P" [C-f1])
+  (define-key map "\eO5Q" [C-f2])
+  (define-key map "\eO5R" [C-f3])
+  (define-key map "\eO5S" [C-f4])
   (define-key map "\e[15;5~" [C-f5])
   (define-key map "\e[17;5~" [C-f6])
   (define-key map "\e[18;5~" [C-f7])
@@ -77,10 +142,10 @@
   (define-key map "\e[23;5~" [C-f11])
   (define-key map "\e[24;5~" [C-f12])
 
-  (define-key map "\e[11;6~" [C-S-f1])
-  (define-key map "\e[12;6~" [C-S-f2])
-  (define-key map "\e[13;6~" [C-S-f3])
-  (define-key map "\e[14;6~" [C-S-f4])
+  (define-key map "\eO6P" [C-S-f1])
+  (define-key map "\eO6Q" [C-S-f2])
+  (define-key map "\eO6R" [C-S-f3])
+  (define-key map "\eO6S" [C-S-f4])
   (define-key map "\e[15;6~" [C-S-f5])
   (define-key map "\e[17;6~" [C-S-f6])
   (define-key map "\e[18;6~" [C-S-f7])
@@ -90,10 +155,10 @@
   (define-key map "\e[23;6~" [C-S-f11])
   (define-key map "\e[24;6~" [C-S-f12])
 
-  (define-key map "\e[11;3~" [A-f1])
-  (define-key map "\e[12;3~" [A-f2])
-  (define-key map "\e[13;3~" [A-f3])
-  (define-key map "\e[14;3~" [A-f4])
+  (define-key map "\eO3P" [A-f1])
+  (define-key map "\eO3Q" [A-f2])
+  (define-key map "\eO3R" [A-f3])
+  (define-key map "\eO3S" [A-f4])
   (define-key map "\e[15;3~" [A-f5])
   (define-key map "\e[17;3~" [A-f6])
   (define-key map "\e[18;3~" [A-f7])
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index c162160397e..2c0d1bea77c 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
 ;; Keywords: outlines, hypermedia, calendar
 ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
-;; Version: 3.06
+;; Version: 3.08
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -79,6 +79,16 @@
 ;;
 ;; Changes:
 ;; -------
+;; Version 3.08
+;;    - "|" no longer allowed as part of a link, to allow links in tables.
+;;    - The prefix of items in the agenda buffer can be configured.
+;;    - Cleanup.
+;;
+;; Version 3.07
+;;    - Some folding incinsistencies removed.
+;;    - BBDB links to company-only entries.
+;;    - Bug fixes and global cleanup.
+;;
 ;; Version 3.06
 ;;    - M-S-RET inserts a new TODO heading.
 ;;    - New startup option `content'.
@@ -131,14 +141,14 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl) (require 'calendar))
 (require 'outline)
 (require 'time-date)
 (require 'easymenu)
 
 ;;; Customization variables
 
-(defvar org-version "3.06"
+(defvar org-version "3.08"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -194,8 +204,7 @@ This can also be configured on a per-file basis by adding one of
 the following lines anywhere in the buffer:
 
    #+STARTUP: dlcheck
-   #+STARTUP: nodlcheck
-"
+   #+STARTUP: nodlcheck"
   :group 'org-startup
   :type 'boolean)
 
@@ -215,8 +224,8 @@ has been set."
   :group 'org)
 
 (defcustom org-todo-keywords '("TODO" "DONE")
-  "List of TODO entry keywords.\\<org-mode-map>
-By default, this is '(\"TODO\" \"DONE\").  The last entry in the list is
+  "List of TODO entry keywords.
+\\<org-mode-map>By default, this is '(\"TODO\" \"DONE\").  The last entry in the list is
 considered to mean that the entry is \"done\".  All the other mean that
 action is required, and will make the entry show up in todo lists, diaries
 etc.
@@ -228,8 +237,8 @@ Changes become only effective after restarting Emacs."
   :type '(repeat (string :tag "Keyword")))
 
 (defcustom org-todo-interpretation 'sequence
-  "Controls how TODO keywords are interpreted.\\<org-mode-map>
-Possible values are `sequence' and `type'.
+  "Controls how TODO keywords are interpreted.
+\\<org-mode-map>Possible values are `sequence' and `type'.
 This variable is only relevant if `org-todo-keywords' contains more than two
 states.  There are two ways how these keywords can be used:
 
@@ -256,7 +265,7 @@ RELAXED.  If you later return to this entry and press \\[org-todo] again,
 RELAXED will not be changed REMIND, but directly to DONE.
 
 You can create a large number of types.  To initially select a
-type, it is then best to use C-u \\[org-todo] in order to specify the
+type, it is then best to use \\[universal-argument] \\[org-todo] in order to specify the
 type with completion.  Of course, you can also type the keyword
 directly into the buffer.  M-TAB completes TODO keywords at the
 beginning of a headline."
@@ -304,7 +313,7 @@ Changes become only effective after restarting Emacs."
 (defcustom org-after-todo-state-change-hook nil
   "Hook which is run after the state of a TODO item was changed.
 The new state (a string with a todo keyword, or nil) is available in the
-lisp variable `state'."
+Lisp variable `state'."
   :group 'org-keywords
   :type 'hook)
 
@@ -313,7 +322,7 @@ lisp variable `state'."
   "Do TODO items have priorities?")
 (make-variable-buffer-local 'org-todo-kwd-priority-p)
 (defvar org-todo-kwd-max-priority nil
-  "Maximum priority of TODO items")
+  "Maximum priority of TODO items.")
 (make-variable-buffer-local 'org-todo-kwd-max-priority)
 (defvar org-ds-keyword-length 12
   "Maximum length of the Deadline and SCHEDULED keywords.")
@@ -352,6 +361,15 @@ lisp variable `state'."
   "Matches the SCHEDULED keyword together with a time stamp.")
 (make-variable-buffer-local 'org-scheduled-time-regexp)
 
+(defvar org-category nil
+  "Variable used by org files to set a category for agenda display.
+Such files should use a file variable to set it, for example
+
+   -*- mode: org; org-category: \"ELisp\"
+
+If the file does not specify a category, the file's base name
+is used instead.")
+
 (defun org-set-regexps-and-options ()
   "Precompute regular expressions for current buffer."
   (when (eq major-mode 'org-mode)
@@ -359,8 +377,8 @@ lisp variable `state'."
                '("CATEGORY" "SEQ_TODO" "PRI_TODO" "TYP_TODO" "STARTUP")))
           (splitre "[ \t]+")
           kwds int key value cat)
-      (save-restriction
-        (save-excursion
+      (save-excursion
+        (save-restriction
           (widen)
           (goto-char (point-min))
           (while (re-search-forward re nil t)
@@ -383,7 +401,7 @@ lisp variable `state'."
               (let ((opts (org-split-string value splitre))
                     (set '(("fold" org-startup-folded t)
                            ("nofold" org-startup-folded nil)
-                           ("content" org-startup-folded 'content)
+                           ("content" org-startup-folded content)
                            ("dlcheck" org-startup-with-deadline-check t)
                            ("nodlcheck" org-startup-with-deadline-check nil)))
                     l var val)
@@ -515,8 +533,7 @@ the entries for specific days."
   :type 'boolean)
 
 (defcustom org-agenda-include-diary nil
-  "Non-nil means, when preparing the agenda, also get the
-entries from the emacs calendars diary."
+  "If non-nil, include in the agenda entries from the Emacs Calendar's diary."
   :group 'org-agenda
   :type 'boolean)
 
@@ -566,6 +583,43 @@ categories by priority."
            (const priority-up)
            (const priority-down))))
 
+(defcustom org-agenda-prefix-format "  %-12:c% s"
+  "Format specification for the prefix of items in the agenda buffer.
+This format works similar to a printf format, with the following meaning:
+
+  %c   the category of the item, \"Diary\" for entries from the diary, or
+       as given by the CATEGORY keyword or derived from the file name.
+  %t   the time-of-day specification if one applies to the entry, in the
+       format HH:MM
+  %s   Scheduling/Deadline information, a short string
+
+In addition to the normal printf field modifiers like field width and
+padding instructions, in this format you can also add an additional
+punctuation or whitespace character just before the final format letter.
+This character will be appended to the field value if the value is not
+empty.  For example, the format \"%-12:c\" leads to \"Diary:    \" if
+the category is \"Diary\".  If the category were be empty, no additional
+colon would be interted.
+
+Including `%t' in the format string leads to a double time specification
+because the headline/diary item will contain the time specification as
+well.  However, using `%t' in the format will result in a canonical 24
+hour time specification at a consistent position in the prefix, while the
+time specification in the headline/diary item may be at any position and in
+various formats.
+Example:
+  (setq org-agenda-prefix-format \"  %-12:c% t% s\")"
+  :type 'string
+  :group 'org-agenda)
+
+(defcustom org-timeline-prefix-format "  % s"
+  "Like `org-agenda-prefix-format', but for the timeline of a single file."
+  :type 'string
+  :group 'org-agenda)
+
+(defvar org-prefix-format-compiled nil
+  "The compiled version of `org-???-prefix-format'.")
+
 (defcustom org-sort-agenda-notime-is-late t
   "Non-nil means, items without time are considered late.
 This is only relevant for sorting.  When t, items which have no explicit
@@ -574,15 +628,6 @@ do have a time.  When nil, the default time is before 0:00."
   :group 'org-agenda
   :type 'boolean)
 
-(defvar org-category nil
-  "Variable used by org files to set a category for agenda display.
-Such files should use a file variable to set it, for example
-
-   -*- mode: org; org-category: \"ELisp\"
-
-If the file does not specify a category, the file's base name
-is used instead.")
-
 (defgroup org-structure nil
   "Options concerning structure editing in Org-mode."
   :tag "Org Structure"
@@ -647,7 +692,10 @@ unnecessary clutter."
 
 (defcustom org-allow-space-in-links t
   "Non-nil means, file names in links may contain space characters.
-When nil, it becomes possible to put several links into a line."
+When nil, it becomes possible to put several links into a line.
+Note that in tables, a link never extends accross fields, so in a table
+it is always possible to put several links into a line.
+Changing this varable requires a re-launch of Emacs of become effective."
   :group 'org-link
   :type 'boolean)
 
@@ -667,7 +715,7 @@ The command `org-store-link' adds a link pointing to the current
 location to an internal list. These links accumulate during a session.
 The command `org-insert-link' can be used to insert links into any
 Org-mode file (offering completion for all stored links).  When this
-option is nil, every link which has been inserted once using `C-c C-l'
+option is nil, every link which has been inserted once using \\[org-insert-link]
 will be removed from the list, to make completing the unused links
 more efficient."
   :group 'org-link
@@ -682,15 +730,15 @@ When following a link with Emacs, it may often be useful to display
 this link in another window or frame.  This variable can be used to
 set this up for the different types of links.
 For VM, use any of
-    vm-visit-folder
-    vm-visit-folder-other-frame
+    `vm-visit-folder'
+    `vm-visit-folder-other-frame'
 For Gnus, use any of
-    gnus
-    gnus-other-frame
+    `gnus'
+    `gnus-other-frame'
 For FILE, use any of
-    find-file
-    find-file-other-window
-    find-file-other-frame
+    `find-file'
+    `find-file-other-window'
+    `find-file-other-frame'
 For the calendar, use the variable `calendar-setup'.
 For BBDB, it is currently only possible to display the matches in
 another window."
@@ -792,10 +840,10 @@ extension.  The entries in this list are cons cells with a file extension
 and the corresponding command.  Possible values for the command are:
  `emacs'     The file will be visited by the current Emacs process.
  `default'   Use the default application for this file type.
- string      A command to be executed by a shell. %s will be replaced
+ string      A command to be executed by a shell; %s will be replaced
              by the path to the file.
- sexp        A lisp form which will be evaluated.  The file path will
-             be available in the lisp variable `file'.
+ sexp        A Lisp form which will be evaluated.  The file path will
+             be available in the Lisp variable `file'.
 For more examples, see the system specific constants
 `org-file-apps-defaults-macosx'
 `org-file-apps-defaults-windowsnt'
@@ -1076,7 +1124,7 @@ This option can also be set with the +OPTIONS line, e.g. \"::nil\"."
   :type 'boolean)
 
 (defcustom org-export-with-tables t
-  "Non-nil means, lines starting with \"|\" define a table
+  "If non-nil, lines starting with \"|\" define a table
 For example:
 
   | Name        | Address  | Birthday  |
@@ -1150,7 +1198,7 @@ This option can also be set with the +OPTIONS line, e.g. \"TeX:nil\"."
   :type 'boolean)
 
 (defcustom org-export-html-with-timestamp nil
-  "Non-nil means,  write `org-export-html-html-helper-timestamp'
+  "If non-nil, write `org-export-html-html-helper-timestamp'
 into the exported html text.  Otherwise, the buffer will just be saved
 to a file."
   :group 'org-export
@@ -1348,6 +1396,7 @@ When this is non-nil, the headline after the keyword is set to the
   (defvar org-cursor-color)
   (defvar org-time-was-given)
   (defvar org-ts-what)
+  (defvar mark-active)
   (defvar timecnt)
   (defvar levels-open)
   (defvar title)
@@ -1383,6 +1432,17 @@ When this is non-nil, the headline after the keyword is set to the
 (defvar org-struct-menu)
 (defvar org-org-menu)
 
+;; We use a before-change function to check if a table might need
+;; an update.
+(defvar org-table-may-need-update t
+  "Indicates of a table might need an update.
+This variable is set by `org-before-change-function'. `org-table-align'
+sets it back to nil.")
+
+(defvar org-mode-hook nil)
+(defvar org-inhibit-startup nil)        ; Dynamically-scoped param.
+
+
 ;;;###autoload
 (defun org-mode (&optional arg)
   "Outline-based notes management and organizer, alias 
@@ -1437,14 +1497,15 @@ The following commands are available:
         (goto-char (point-min))
         (insert "    -*- mode: org -*-\n\n")))
   (run-hooks 'org-mode-hook)
-  (unless (boundp 'org-inhibit-startup)
+  (unless org-inhibit-startup
     (if org-startup-with-deadline-check
         (call-interactively 'org-check-deadlines)
       (cond
        ((eq org-startup-folded t)
-        (org-cycle))
-       ((eq org-startup-folded 'contents)
-        (org-cycle) (org-cycle))))))
+        (org-cycle '(4)))
+       ((eq org-startup-folded 'content)
+        (let ((this-command 'org-cycle) (last-command 'org-cycle))
+          (org-cycle '(4)) (org-cycle '(4))))))))
 
 ;;; Font-Lock stuff
 
@@ -1456,10 +1517,13 @@ The following commands are available:
 
 (require 'font-lock)
 
+(defconst org-non-link-chars "\t\n\r|")
 (defconst org-link-regexp
   (if org-allow-space-in-links
-      "\\(https?\\|ftp\\|mailto\\|file\\|news\\|bbdb\\|vm\\|wl\\|rmail\\|gnus\\|shell\\):\\([^\t\n\r]+[^ \t\n\r]\\)"
-    "\\(https?\\|ftp\\|mailto\\|file\\|news\\|bbdb\\|vm\\|wl\\|rmail\\|gnus\\|shell\\):\\([^ \t\n\r]+\\)"
+      (concat
+       "\\(https?\\|ftp\\|mailto|\\|file\\|news\\|bbdb\\|vm\\|wl\\|rmail\\|gnus\\|shell\\):\\([^" org-non-link-chars "]+[^ " org-non-link-chars "]\\)")
+    (concat
+     "\\(https?\\|ftp\\|mailto\\|file\\|news\\|bbdb\\|vm\\|wl\\|rmail\\|gnus\\|shell\\):\\([^ " org-non-link-chars "]+\\)")
     )
   "Regular expression for matching links.")
 (defconst org-ts-lengths
@@ -1502,6 +1566,8 @@ The following commands are available:
     (org-back-to-heading t)
     (- (match-end 0) (match-beginning 0))))
 
+(defvar org-font-lock-keywords nil)
+
 (defun org-set-font-lock-defaults ()
   (let ((org-font-lock-extra-keywords
          (list
@@ -1550,13 +1616,10 @@ The following commands are available:
          '(org-font-lock-keywords t nil nil backward-paragraph))
     (kill-local-variable 'font-lock-keywords) nil))
     
-(defvar org-font-lock-keywords nil)
-
 (defun org-unfontify-region (beg end &optional maybe_loudly)
   "Remove fontification and activation overlays from links."
   (font-lock-default-unfontify-region beg end)
-  (let* ((modified (buffer-modified-p)) ;; FIXME: Why did I add this???
-         (buffer-undo-list t)
+  (let* ((buffer-undo-list t)
          (inhibit-read-only t) (inhibit-point-motion-hooks t)
          (inhibit-modification-hooks t)
          deactivate-mark buffer-file-name buffer-file-truename)
@@ -1651,15 +1714,15 @@ The following commands are available:
     (save-excursion
       (org-back-to-heading)
       (outline-up-heading arg)
-      (show-subtree)))
+      (org-show-subtree)))
 
    ((save-excursion (beginning-of-line 1) (looking-at outline-regexp))
     ;; At a heading: rotate between three different views
     (org-back-to-heading)
-    (let ((goal-column 0) beg eoh eol eos nxh)
+    (let ((goal-column 0) eoh eol eos)
       ;; First, some boundaries
       (save-excursion
-        (org-back-to-heading)  (setq beg (point))
+        (org-back-to-heading)
         (save-excursion
           (beginning-of-line 2)
           (while (and (not (eobp))   ;; this is like `next-line'
@@ -1667,7 +1730,7 @@ The following commands are available:
             (beginning-of-line 2)) (setq eol (point)))
         (outline-end-of-heading)   (setq eoh (point))
         (outline-end-of-subtree)   (setq eos (point))
-        (outline-next-heading)     (setq nxh (point)))
+        (outline-next-heading))
       ;; Find out what to do next and set `this-command'
       (cond
        ((= eos eoh)
@@ -1676,7 +1739,7 @@ The following commands are available:
         (setq org-cycle-subtree-status nil))
        ((>= eol eos)
         ;; Entire subtree is hidden in one line: open it
-        (show-entry)
+        (org-show-entry)
         (show-children)
         (message "CHILDREN")
         (setq org-cycle-subtree-status 'children)
@@ -1684,7 +1747,7 @@ The following commands are available:
        ((and (eq last-command this-command)
              (eq org-cycle-subtree-status 'children))
         ;; We just showed the children, now show everything.
-        (show-subtree)
+        (org-show-subtree)
         (message "SUBTREE")
         (setq org-cycle-subtree-status 'subtree)
         (run-hook-with-args 'org-cycle-hook 'subtree))
@@ -1733,9 +1796,9 @@ This function is the default value of the hook `org-cycle-hook'."
   "Move cursor to the first headline and recenter the headline.
 Optional argument N means, put the headline into the Nth line of the window."
   (goto-char (point-min))
-  (re-search-forward (concat "^" outline-regexp))
-  (beginning-of-line)
-  (recenter (prefix-numeric-value N)))
+  (when (re-search-forward (concat "^" outline-regexp) nil t)
+    (beginning-of-line)
+    (recenter (prefix-numeric-value N))))
 
 (defvar org-goto-window-configuration nil)
 (defvar org-goto-marker nil)
@@ -1836,9 +1899,9 @@ or nil."
         current-prefix-arg arg)
   (throw 'exit nil))
 
-(defun org-goto-left (&optional arg)
+(defun org-goto-left ()
   "Finish org-goto by going to the new location."
-  (interactive "P")
+  (interactive)
   (if (org-on-heading-p)
       (progn
         (beginning-of-line 1)
@@ -1847,9 +1910,9 @@ or nil."
         (throw 'exit nil))
     (error "Not on a heading")))
 
-(defun org-goto-right (&optional arg)
+(defun org-goto-right ()
   "Finish org-goto by going to the new location."
-  (interactive "P")
+  (interactive)
   (if (org-on-heading-p)
       (progn
         (outline-end-of-subtree)
@@ -1870,9 +1933,9 @@ or nil."
 (defvar org-ignore-region nil
   "To temporarily disable the active region.")
 
-(defun org-insert-heading (&optional arg)
+(defun org-insert-heading ()
   "Insert a new heading with same depth at point."
-  (interactive "P")
+  (interactive)
   (let* ((head (save-excursion
                  (condition-case nil
                      (org-back-to-heading)
@@ -1903,34 +1966,36 @@ state (TODO by default).  Also with prefix arg, force first state."
       (insert (car org-todo-keywords) " ")
     (insert (match-string 2) " ")))
 
-(defun org-promote-subtree (&optional arg)
+(defun org-promote-subtree ()
   "Promote the entire subtree.
 See also `org-promote'."
-  (interactive "P")
-  (org-map-tree 'org-promote))
+  (interactive)
+  (save-excursion
+    (org-map-tree 'org-promote)))
 
-(defun org-demote-subtree (&optional arg)
+(defun org-demote-subtree ()
   "Demote the entire subtree.  See `org-demote'.
 See also `org-promote'."
-  (interactive "P")
-  (org-map-tree 'org-demote))
+  (interactive)
+  (save-excursion
+    (org-map-tree 'org-demote)))
 
-(defun org-do-promote (&optional arg)
+(defun org-do-promote ()
   "Promote the current heading higher up the tree.
-If the region is active in transient-mark-mode, promote all headings
+If the region is active in t`ransient-mark-mode', promote all headings
 in the region."
-  (interactive "P")
+  (interactive)
   (save-excursion
     (if (org-region-active-p)
         (org-map-region 'org-promote (region-beginning) (region-end))
       (org-promote)))
   (org-fix-position-after-promote))
 
-(defun org-do-demote (&optional arg)
+(defun org-do-demote ()
   "Demote the current heading lower down the tree.
-If the region is active in transient-mark-mode, demote all headings
+If the region is active in `transient-mark-mode', demote all headings
 in the region."
-  (interactive "P")
+  (interactive)
   (save-excursion
     (if (org-region-active-p)
         (org-map-region 'org-demote (region-beginning) (region-end))
@@ -1945,7 +2010,7 @@ in the region."
 
 (defun org-promote ()
   "Promote the current heading higher up the tree.
-If the region is active in transient-mark-mode, promote all headings
+If the region is active in `transient-mark-mode', promote all headings
 in the region."
   (org-back-to-heading t)
   (let* ((level (save-match-data (funcall outline-level)))
@@ -1957,7 +2022,7 @@ in the region."
 
 (defun org-demote ()
   "Demote the current heading lower down the tree.
-If the region is active in transient-mark-mode, demote all headings
+If the region is active in `transient-mark-mode', demote all headings
 in the region."
   (org-back-to-heading t)
   (let* ((level (save-match-data (funcall outline-level)))
@@ -2066,17 +2131,17 @@ ring.  We need it to check if the kill was created by `org-copy-subtree'.")
   "Was the last copied subtree folded?
 This is used to fold the tree back after pasting.")
 
-(defun org-cut-subtree (&optional arg)
+(defun org-cut-subtree ()
   "Cut the current subtree into the clipboard.
 This is a short-hand for marking the subtree and then cutting it."
-  (interactive "p")
-  (org-copy-subtree arg 'cut))
+  (interactive)
+  (org-copy-subtree 'cut))
 
-(defun org-copy-subtree (&optional arg cut)
+(defun org-copy-subtree (&optional cut)
   "Cut the current subtree into the clipboard.
 This is a short-hand for marking the subtree and then copying it.
 If CUT is non nil, actually cut the subtree."
-  (interactive "p")
+  (interactive)
   (let (beg end folded)
     (org-back-to-heading)
     (setq beg (point))
@@ -2338,7 +2403,7 @@ prefix arg, switch to that state."
   ;; Fixup cursor location if close to the keyword
   (if (and (outline-on-heading-p)
            (not (bolp))
-           (save-excursion (goto-char (point-at-bol))
+           (save-excursion (beginning-of-line 1)
                            (looking-at org-todo-line-regexp))
            (< (point) (+ 2 (or (match-end 2) (match-end 1)))))
       (progn
@@ -2681,7 +2746,7 @@ This is used by `org-read-date' in a temporary keymap for the calendar buffer."
 A deadline is considered due if it happens within `org-deadline-warning-days'
 days from today's date.  If the deadline appears in an entry marked DONE,
 it is not shown.  The prefix arg NDAYS can be used to test that many
-days.  If the prefix is a raw C-u prefix, all deadlines are shown."
+days.  If the prefix is a raw \\[universal-argument] prefix, all deadlines are shown."
   (interactive "P")
   (let* ((org-warn-days
           (cond
@@ -2718,6 +2783,7 @@ days in order to avoid rounding problems."
         (error "Not at a time-stamp range, and none found in current line.")))
   (let* ((ts1 (match-string 1))
          (ts2 (match-string 2))
+         (havetime (or (> (length ts1) 15) (> (length ts2) 15)))
          (match-end (match-end 0))
          (time1 (org-time-string-to-time ts1))
          (time2 (org-time-string-to-time ts2))
@@ -2725,17 +2791,27 @@ days in order to avoid rounding problems."
          (t2 (time-to-seconds time2))
          (diff (abs (- t2 t1)))
          (negative (< (- t2 t1) 0))
-         (ys (floor (* 365 24 60 60)))
+         ;; (ys (floor (* 365 24 60 60)))
          (ds (* 24 60 60))
          (hs (* 60 60))
          (fy "%dy %dd %02d:%02d")
+         (fy1 "%dy %dd")
          (fd "%dd %02d:%02d")
+         (fd1 "%dd")
          (fh "%02d:%02d")
          y d h m align)
-    (setq y (floor (/ diff ys))  diff (mod diff ys)
-          d (floor (/ diff ds))  diff (mod diff ds)
-          h (floor (/ diff hs))  diff (mod diff hs)
-          m (floor (/ diff 60)))
+    ;; FIXME:  Should I re-introduce years, make year refer to same date?
+    ;; This would be the only useful way to have years, actually.
+    (if havetime
+        (setq ; y (floor (/ diff ys))  diff (mod diff ys)
+         y 0
+         d (floor (/ diff ds))  diff (mod diff ds)
+         h (floor (/ diff hs))  diff (mod diff hs)
+         m (floor (/ diff 60)))
+      (setq ; y (floor (/ diff ys))  diff (mod diff ys)
+       y 0
+       d (floor (+ (/ diff ds) 0.5))
+       h 0 m 0))
     (if (not to-buffer)
         (message (org-make-tdiff-string y d h m))
       (when (org-at-table-p)
@@ -2746,8 +2822,8 @@ days in order to avoid rounding problems."
            "\\( *-? *[0-9]+y\\)?\\( *[0-9]+d\\)? *[0-9][0-9]:[0-9][0-9]")
           (replace-match ""))
       (if negative (insert " -"))
-      (if (> y 0) (insert " " (format fy y d h m))
-        (if (> d 0) (insert " " (format fd d h m))
+      (if (> y 0) (insert " " (format (if havetime fy fy1) y d h m))
+        (if (> d 0) (insert " " (format (if havetime fd fd1) d h m))
           (insert " " (format fh h m))))
       (if align (org-table-align))
       (message "Time difference inserted"))))
@@ -2770,7 +2846,7 @@ days in order to avoid rounding problems."
 
 (defun org-parse-time-string (s)
   "Parse the standard Org-mode time string.
-This should be a lot faster than the normal parse-time-string."
+This should be a lot faster than the normal `parse-time-string'."
   (if (string-match org-ts-regexp1 s)
       (list 0
             (string-to-number (or (match-string 8 s) "0"))
@@ -2927,7 +3003,7 @@ If there is already a time stamp at the cursor position, update it."
 ;;; Define the mode
 
 (defvar org-agenda-mode-map (make-sparse-keymap)
-  "Keymap for org-agenda-mode.")
+  "Keymap for `org-agenda-mode'.")
 
 (defvar org-agenda-menu)
 (defvar org-agenda-follow-mode nil)
@@ -2949,6 +3025,7 @@ The following commands are available:
   (easy-menu-add org-agenda-menu)
   (if org-startup-truncated (setq truncate-lines t))
   (add-hook 'post-command-hook 'org-agenda-post-command-hook nil 'local)
+  (add-hook 'pre-command-hook 'org-unhighlight nil 'local)
   (setq org-agenda-follow-mode nil)
   (easy-menu-change 
    '("Agenda") "Agenda Files"
@@ -2968,7 +3045,7 @@ The following commands are available:
 (define-key org-agenda-mode-map "l" 'org-agenda-recenter)
 (define-key org-agenda-mode-map "t" 'org-agenda-todo)
 (define-key org-agenda-mode-map "." 'org-agenda-goto-today)
-(define-key org-agenda-mode-map "w" 'org-agenda-week-view)
+(define-key org-agenda-mode-map "w" 'org-agenda-toggle-week-view)
 (define-key org-agenda-mode-map [(shift right)] 'org-agenda-date-later)
 (define-key org-agenda-mode-map [(shift left)] 'org-agenda-date-earlier)
 
@@ -3043,7 +3120,8 @@ The following commands are available:
     ["Next Dates" org-agenda-later (local-variable-p 'starting-day)]
     ["Previous Dates" org-agenda-earlier (local-variable-p 'starting-day)]
     "--"
-    ["Week/Day View" org-agenda-week-view (local-variable-p 'starting-day)]
+    ["Week/Day View" org-agenda-toggle-week-view
+     (local-variable-p 'starting-day)]
     ["Include Diary" org-agenda-toggle-diary
      :style toggle :selected org-agenda-include-diary :active t]
     "--"
@@ -3060,7 +3138,7 @@ The following commands are available:
     ))
 
 (defvar org-agenda-markers nil
-  "List of all currently active markers created by org-agenda")
+  "List of all currently active markers created by `org-agenda'.")
 (defvar org-agenda-last-marker-time (time-to-seconds (current-time))
   "Creation time of the last agenda marker.")
 
@@ -3074,7 +3152,7 @@ no longer in use."
     m))
 
 (defun org-agenda-maybe-reset-markers (&optional force)
-  "Reset markers created by org-agenda.  But only if they are old enough."
+  "Reset markers created by `org-agenda'.  But only if they are old enough."
   (if (or force
           (> (- (time-to-seconds (current-time))
                 org-agenda-last-marker-time)
@@ -3106,21 +3184,23 @@ When a buffer is unmodified, it is just killed.  When modified, it is saved
       (when (and (buffer-modified-p buf)
                  file
                  (y-or-n-p (format "Save file %s? " file)))
-        (save-excursion
-          (set-buffer buf) (save-buffer)))
+        (with-current-buffer buf (save-buffer)))
       (kill-buffer buf))))
 
+(defvar org-respect-restriction nil)    ; Dynamically-scoped param.
+
 (defun org-timeline (&optional include-all)
   "Show a time-sorted view of the entries in the current org file.
 Only entries with a time stamp of today or later will be listed.  With
-one C-u prefix argument, past entries will also be listed.
-With two C-u prefixes, all unfinished TODO items will also be shown,
+one \\[universal-argument] prefix argument, past entries will also be listed.
+With two \\[universal-argument] prefixes, all unfinished TODO items will also be shown,
 under the current date.
 If the buffer contains an active region, only check the region for
 dates."
   (interactive "P")
   (require 'calendar)
   (org-agenda-maybe-reset-markers 'force)
+  (org-compile-prefix-format org-timeline-prefix-format)
   (let* ((dopast include-all)
          (dotodo (equal include-all '(16)))
          (entry (buffer-file-name))
@@ -3135,7 +3215,7 @@ dates."
          (today (time-to-days (current-time)))
          (org-respect-restriction t)
          (past t)
-         s e rtn d pos)
+         s e rtn d)
     (setq org-agenda-redo-command 
           (list 'progn
                 (list 'switch-to-buffer-other-window (current-buffer))
@@ -3188,13 +3268,14 @@ dates."
   "Produce a weekly view from all files in variable `org-agenda-files'.
 The view will be for the current week, but from the overview buffer you
 will be able to go to other weeks.
-With one C-u prefix argument INCLUDE-ALL, all unfinished TODO items will
+With one \\[universal-argument] prefix argument INCLUDE-ALL, all unfinished TODO items will
 also be shown, under the current date.
 START-DAY defaults to TODAY, or to the most recent match for the weekday
 given in `org-agenda-start-on-weekday'.
 NDAYS defaults to `org-agenda-ndays'."
   (interactive "P")
   (org-agenda-maybe-reset-markers 'force)
+  (org-compile-prefix-format org-agenda-prefix-format)
   (require 'calendar)
   (let* ((org-agenda-start-on-weekday
           (if (or (equal ndays 1)
@@ -3306,31 +3387,31 @@ NDAYS defaults to `org-agenda-ndays'."
         (throw 'nextfile t))
        (t (error "Abort"))))))
 
-(defun org-agenda-quit (arg)
+(defun org-agenda-quit ()
   "Exit agenda by removing the window or the buffer."
-  (interactive "P")
+  (interactive)
   (let ((buf (current-buffer)))
     (if (not (one-window-p)) (delete-window))
     (kill-buffer buf)
     (org-agenda-maybe-reset-markers 'force)))
 
-(defun org-agenda-exit (arg)
+(defun org-agenda-exit ()
   "Exit agenda by removing the window or the buffer.
 Also kill all Org-mode buffers which have been loaded by `org-agenda'.
 Org-mode buffers visited directly by the user will not be touched."
-  (interactive "P")
+  (interactive)
   (org-release-buffers org-agenda-new-buffers)
   (setq org-agenda-new-buffers nil)
-  (org-agenda-quit arg))
+  (org-agenda-quit))
 
-(defun org-agenda-redo (&optional arg)
-  "Rebuild Agenda"
-  (interactive "P")
+(defun org-agenda-redo ()
+  "Rebuild Agenda."
+  (interactive)
   (eval org-agenda-redo-command))
 
-(defun org-agenda-goto-today (arg)
+(defun org-agenda-goto-today ()
   "Go to today."
-  (interactive "P")
+  (interactive)
   (if (boundp 'starting-day)
       (let ((cmd (car org-agenda-redo-command))
             (iall (nth 1 org-agenda-redo-command))
@@ -3357,17 +3438,9 @@ With prefix ARG, go back that many times `org-agenda-ndays'."
   (org-agenda (if (boundp 'include-all-loc) include-all-loc nil)
               (- starting-day (* arg org-agenda-ndays))))
 
-(defun org-agenda-day-view (arg)
-  "Switch agenda to single day view."
-  (interactive "P")
-  (unless (boundp 'starting-day)
-    (error "Not allowed"))
-  (setq org-agenda-ndays 1)
-  (org-agenda include-all-loc starting-day 1))
-
-(defun org-agenda-week-view (arg)
-  "Switch agenda to week view."
-  (interactive "P")
+(defun org-agenda-toggle-week-view ()
+  "Toggle weekly/daily view for aagenda."
+  (interactive)
   (unless (boundp 'starting-day)
     (error "Not allowed"))
   (setq org-agenda-ndays
@@ -3397,6 +3470,21 @@ With prefix ARG, go back that many times `org-agenda-ndays'."
   (if (not (re-search-backward "^\\S-" nil t arg))
       (error "No previous date before this line in this buffer.")))
 
+;; Initialize the highlight
+(defvar org-hl (funcall (if org-xemacs-p 'make-extent 'make-overlay) 1 1))
+(funcall (if org-xemacs-p 'set-extent-property 'overlay-put) org-hl
+         'face 'highlight)
+
+(defun org-highlight (begin end &optional buffer)
+  "Highlight a region with overlay."
+  (funcall (if org-xemacs-p 'set-extent-endpoints 'move-overlay)
+           org-hl begin end (or buffer (current-buffer))))
+
+(defun org-unhighlight ()
+  "Detach overlay INDEX."
+  (funcall (if org-xemacs-p 'detach-extent 'delete-overlay) org-hl))
+
+
 (defun org-agenda-follow-mode ()
   "Toggle follow mode in an agenda buffer."
   (interactive)
@@ -3430,21 +3518,22 @@ With prefix ARG, go back that many times `org-agenda-ndays'."
            (get-text-property (point) 'org-marker))
       (org-agenda-show)))
 
+(defvar org-disable-diary nil)          ;Dynamically-scoped param.
+
 (defun org-get-entries-from-diary (date)
-  "Get the (emacs calendar) diary entries for DATE."
+  "Get the (Emacs Calendar) diary entries for DATE."
   (let* ((fancy-diary-buffer "*temporary-fancy-diary-buffer*")
          (diary-display-hook '(fancy-diary-display))
          (list-diary-entries-hook 
           (cons 'org-diary-default-entry list-diary-entries-hook))
-         entries
-         (disable-org-diary t))
+         entries tod tods
+         (org-disable-diary t))
     (save-excursion
       (save-window-excursion
         (list-diary-entries date 1)))
     (if (not (get-buffer fancy-diary-buffer))
         (setq entries nil)
-      (save-excursion
-        (switch-to-buffer fancy-diary-buffer)
+      (with-current-buffer fancy-diary-buffer
         (setq buffer-read-only nil)
         (if (= (point-max) 1)
             ;; No entries
@@ -3452,11 +3541,6 @@ With prefix ARG, go back that many times `org-agenda-ndays'."
           ;; Omit the date and other unnecessary stuff
           (org-agenda-cleanup-fancy-diary)
           ;; Add prefix to each line and extend the text properties
-          (goto-char (point-min))
-          (while (and (re-search-forward "^" nil t) (not (eobp)))
-            (replace-match "  Diary:     ")
-            (add-text-properties (point-at-bol) (point)
-                                 (text-properties-at (point))))
           (if (= (point-max) 1)
               (setq entries nil)
             (setq entries (buffer-substring (point-min) (- (point-max) 1)))))
@@ -3467,31 +3551,33 @@ With prefix ARG, go back that many times `org-agenda-ndays'."
       (setq entries 
             (mapcar 
              (lambda (x)
-               (if (string-match "\\<\\([012][0-9]\\):\\([0-6][0-9]\\)" x)
-                   (add-text-properties
-                    1 (length x)
-                    (list 'time-of-day
-                          (+ (* 100 (string-to-number
-                                     (match-string 1 x)))
-                             (string-to-number (match-string 2 x))))
-                    x))
+               (setq x (org-format-agenda-item "" x "Diary"))
+               ;; Extend the text properties to the beginning of the line
+               (add-text-properties 
+                0 (length x)
+                (text-properties-at (1- (length x)) x)
+                x)
                x)
              entries)))))
 
 (defun org-agenda-cleanup-fancy-diary ()
   "Remove unwanted stuff in buffer created by fancy-diary-display.
 This gets rid of the date, the underline under the date, and
-the dummy entry installed by org-mode to ensure non-empty diary for each
-date."
+the dummy entry installed by `org-mode' to ensure non-empty diary for each
+date.  Itt also removes lines that contain only whitespace."
   (goto-char (point-min))
   (if (looking-at ".*?:[ \t]*")
       (progn
         (replace-match "")
         (re-search-forward "\n=+$" nil t)
         (replace-match "")
-        (while (re-search-backward "^ +" nil t) (replace-match "")))
+        (while (re-search-backward "^ +\n?" nil t) (replace-match "")))
     (re-search-forward "\n=+$" nil t)
     (delete-region (point-min) (min (point-max) (1+ (match-end 0)))))
+  (goto-char (point-min))
+  (while (re-search-forward "^ +\n" nil t)
+    (replace-match ""))
+  (goto-char (point-min))
   (if (re-search-forward "^Org-mode dummy\n?" nil t)
       (replace-match "")))
 
@@ -3501,7 +3587,7 @@ date."
 (eval-after-load "diary-lib"
   '(defadvice add-to-diary-list (before org-mark-diary-entry activate)
      "Make the position visible."
-     (if (and (boundp 'disable-org-diary)  ;; called from org-agenda
+     (if (and org-disable-diary  ;; called from org-agenda
               (stringp string)
               (buffer-file-name))
          (add-text-properties
@@ -3606,7 +3692,7 @@ sure that TODAY is included in the list."
 
 ;;;###autoload
 (defun org-diary (&rest args)
-  "Returns diary information from org-files.
+  "Return diary information from org-files.
 This function can be used in a \"sexp\" diary entry in the Emacs calendar.
 It accesses org files and extracts information from those files to be
 listed in the diary.  The function accepts arguments specifying what
@@ -3649,6 +3735,7 @@ The function expects the lisp variables `entry' and `date' to be provided
 by the caller, because this is how the calendar works.  Don't use this
 function from a program - use `org-agenda-get-day-entries' instead." 
   (org-agenda-maybe-reset-markers)
+  (org-compile-agenda-prefix-format org-agenda-prefix-format)
   (setq args (or args '(:deadline :scheduled :timestamp)))
   (let* ((files (if (and entry (stringp entry) (string-match "\\S-" entry))
                     (list entry)
@@ -3656,14 +3743,14 @@ function from a program - use `org-agenda-get-day-entries' instead."
          file rtn results)
     ;; If this is called during org-agenda, don't return any entries to
     ;; the calendar.  Org Agenda will list these entries itself.
-    (if (boundp 'disable-org-diary) (setq files nil))
+    (if org-disable-diary (setq files nil))
     (while (setq file (pop files))
       (setq rtn (apply 'org-agenda-get-day-entries file date args))
       (setq results (append results rtn)))
     (concat (org-finalize-agenda-entries results) "\n")))
 
 (defun org-agenda-get-day-entries (file date &rest args)
-  "Does the work for `org-diary' and `org-agenda'
+  "Does the work for `org-diary' and `org-agenda'.
 FILE is the path to a file to be checked for entries.  DATE is date like
 the one returned by `calendar-current-date'.  ARGS are symbols indicating
 which kind of entries should be extracted.  For details about these, see
@@ -3672,26 +3759,26 @@ the documentation of `org-diary'."
   (let* ((org-startup-with-deadline-check nil)
          (org-startup-folded nil)
          (buffer (if (file-exists-p file)
-;                     (find-file-noselect file)
                      (org-get-agenda-file-buffer file)
                    (error "No such file %s" file)))
-         (respect-narrow-p (boundp 'org-respect-restriction))
          arg results rtn)
     (if (not buffer)
         ;; If file does not exist, make sure an error message ends up in diary
         (format "ORG-AGENDA-ERROR: No such org-file %s" file)
-      (save-excursion
-        (set-buffer buffer)
+      (with-current-buffer buffer
+        (unless (eq major-mode 'org-mode)
+          (error "Agenda file %s is not in `org-mode'" file))
         (let ((case-fold-search nil))
           (save-excursion
             (save-restriction
-              (if respect-narrow-p
+              (if org-respect-restriction
                   (if (org-region-active-p)
                       ;; Respect a region to restrict search
                       (narrow-to-region (region-beginning) (region-end)))
                 ;; If we work for the calendar or many files, 
                 ;; get rid of any restriction
                 (widen))
+              ;; The way we repeatedly append to `results' makes it O(n^2) :-(
               (while (setq arg (pop args))
                 (cond
                  ((and (eq arg :todo)
@@ -3748,7 +3835,7 @@ the documentation of `org-diary'."
          (regexp (concat "[\n\r]\\*+ *\\(" org-not-done-regexp
                          "[^\n\r]*\\)"))
          marker priority
-         ee txt pl)
+         ee txt)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (goto-char (match-beginning 1))
@@ -3855,7 +3942,7 @@ the documentation of `org-diary'."
          (todayp (equal date (calendar-current-date))) ; DATE bound by calendar
          (d1 (calendar-absolute-from-gregorian date))  ; DATE bound by calendar
          d2 diff pos pos1
-         ee txt head hdmarker)
+         ee txt head)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (setq pos (1- (match-beginning 1))
@@ -3913,7 +4000,7 @@ the documentation of `org-diary'."
          (regexp org-scheduled-time-regexp)
          (todayp (equal date (calendar-current-date))) ; DATE bound by calendar
          (d1 (calendar-absolute-from-gregorian date))  ; DATE bound by calendar
-         d2 diff marker hdmarker pos pos1
+         d2 diff pos pos1
          ee txt head)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
@@ -3990,38 +4077,66 @@ the documentation of `org-diary'."
     ;; Sort the entries by expiration date.
     (nreverse ee)))
 
-
-(defun org-format-agenda-item (prefix txt)
+(defun org-format-agenda-item (prefix txt &optional category)
   "Format TXT to be inserted into the agenda buffer.
 In particular, this indents the line and adds a category."
-  (let ((cat (or org-category
-                 (file-name-sans-extension
-                  (file-name-nondirectory (buffer-file-name)))))
-        time rtn)
-    (if (symbolp cat) (setq cat (symbol-name cat)))
-    (setq rtn (format "  %-10s %s%s" (concat cat ":") prefix txt))
-    (add-text-properties 
-     0 2 (list 'category (downcase cat)
-               'prefix-length (- (length rtn) (length txt))
-               'time-of-day (org-get-time-of-day rtn))
+  (let* ((category (or category
+                       org-category
+                       (file-name-sans-extension
+                        (file-name-nondirectory (buffer-file-name)))))
+         (extra prefix)
+         (time-of-day (org-get-time-of-day txt))
+         (t1 (if time-of-day (concat "0" (int-to-string time-of-day)) "0000"))
+         (time (if time-of-day
+                   (concat (substring t1 -4 -2)
+                           ":" (substring t1 -2))
+                 ""))
+         rtn)
+    (if (symbolp category) (setq category (symbol-name category)))
+    (setq rtn (concat (eval org-prefix-format-compiled) txt))
+    (add-text-properties
+     0 (length rtn) (list 'category (downcase category)
+                          'prefix-length (- (length rtn) (length txt))
+                          'time-of-day time-of-day)
      rtn)
     rtn))
   
-;; FIXME:  Should this be restricted to beginning of string?
+(defun org-compile-prefix-format (format)
+  "Compile the prefix format into a Lisp form that can be evaluated.
+The resulting form is returned and stored in the variable
+`org-prefix-format-compiled'."
+  (let ((start 0) varform vars (s format) c)
+    (while (string-match "%\\([-+]?[0-9.]*\\)\\([ .;,:!?=|/<>]?\\)\\([cts]\\)"
+                         s start)
+      (setq var (cdr (assoc (match-string 3 s)
+                            '(("c" . category) ("t" . time) ("s" . extra))))
+            c (match-string 2 s)
+            start (1+ (match-beginning 0)))
+      (if (= (length c) 1)
+          (setq varform `(if (equal "" ,var) "" (concat ,var ,c)))
+        (setq varform var))
+      (setq s (replace-match "%\\1s" t nil s))
+      (push varform vars))
+    (setq vars (nreverse vars))
+    (setq org-prefix-format-compiled `(format ,s ,@vars))))
+
 (defun org-get-time-of-day (s)
-  "Check string S for a time of day."
+  "Check string S for a time of day.
+If found, return it as a military time number between 0 and 2400.
+If not found, return nil."
   (save-match-data
-  (when (and 
-         (string-match
-          "\\<\\([012][0-9]\\)\\(:\\([0-6][0-9]\\)\\)?\\([AaPp][Mm]\\)?\\>" s)
-         (or (match-beginning 2) (match-beginning 4)))
-    (+ (* 100 (+ (string-to-number (match-string 1 s))
-                 (if (and (match-beginning 4)
-                          (equal (downcase (match-string 4 s)) "pm"))
-                     12 0)))
-       (if (match-beginning 3)
-           (string-to-number (match-string 3 s))
-         0)))))
+    (when (or
+           (string-match
+            "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)\\([AaPp][Mm]\\)?\\>" s)
+           (string-match
+            "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)?\\([AaPp][Mm]\\)\\>" s))
+      (+ (* 100 (+ (string-to-number (match-string 1 s))
+                   (if (and (match-beginning 4)
+                            (equal (downcase (match-string 4 s)) "pm"))
+                       12 0)))
+         (if (match-beginning 3)
+             (string-to-number (match-string 3 s))
+           0)))))
 
 (defun org-finalize-agenda-entries (list)
   "Sort and concatenate the agenda items."
@@ -4073,7 +4188,7 @@ and by additional input from the age of a schedules or deadline entry."
   (let* ((pri (get-text-property (point-at-bol) 'priority)))
     (message "Priority is %d" (if pri pri -1000))))
 
-(defun org-agenda-goto ()
+(defun org-agenda-goto (&optional highlight)
   "Go to the Org-mode file which contains the item at point."
   (interactive)
   (let* ((marker (or (get-text-property (point) 'org-marker) 
@@ -4087,7 +4202,8 @@ and by additional input from the age of a schedules or deadline entry."
       (org-show-hidden-entry)
       (save-excursion
         (and (outline-next-heading)
-             (org-flag-heading nil))))))  ; show the next heading
+             (org-flag-heading nil)))) ; show the next heading
+    (and highlight (org-highlight (point-at-bol) (point-at-eol)))))
 
 (defun org-agenda-switch-to ()
   "Go to the Org-mode file which contains the item at point."
@@ -4116,14 +4232,14 @@ and by additional input from the age of a schedules or deadline entry."
   "Display the Org-mode file which contains the item at point."
   (interactive)
   (let ((win (selected-window)))
-    (org-agenda-goto)
+    (org-agenda-goto t)
     (select-window win)))
 
 (defun org-agenda-recenter (arg)
   "Display the Org-mode file which contains the item at point and recenter."
   (interactive "P")
   (let ((win (selected-window)))
-    (org-agenda-goto)
+    (org-agenda-goto t)
     (recenter arg)
     (select-window win)))
 
@@ -4159,8 +4275,7 @@ the same tree node, and the headline of the tree node in the Org-mode file."
          (hdmarker (get-text-property (point) 'org-hd-marker))
          (buffer-read-only nil)
          newhead)
-    (save-excursion
-      (set-buffer buffer)
+    (with-current-buffer buffer
       (widen)
       (goto-char pos)
       (org-show-hidden-entry)
@@ -4225,18 +4340,14 @@ This changes the line at point, all other lines in the agenda referring to
 the same tree node, and the headline of the tree node in the Org-mode file."
   (interactive)
   (org-agenda-check-no-diary)
-  (let* ((props (text-properties-at (point)))
-         (col (current-column))
-         (marker (or (get-text-property (point) 'org-marker)
+  (let* ((marker (or (get-text-property (point) 'org-marker)
                      (org-agenda-error)))
-         (pl (get-text-property (point-at-bol) 'prefix-length))
          (buffer (marker-buffer marker))
          (pos (marker-position marker))
          (hdmarker (get-text-property (point) 'org-hd-marker))
          (buffer-read-only nil)
          newhead)
-    (save-excursion
-      (set-buffer buffer)
+    (with-current-buffer buffer
       (widen)
       (goto-char pos)
       (org-show-hidden-entry)
@@ -4271,20 +4382,21 @@ the same tree node, and the headline of the tree node in the Org-mode file."
   (org-agenda-date-later (- arg) what))
 
 (defun org-agenda-date-prompt (arg)
-  "Change the date of this item.  Date is prompted for, with default today."
-  (interactive "p")
+  "Change the date of this item.  Date is prompted for, with default today.
+The prefix ARG is passed to the `org-time-stamp' command and can therefore
+be used to request time specification in the time stamp."
+  (interactive "P")
   (org-agenda-check-no-diary)
   (let* ((marker (or (get-text-property (point) 'org-marker)
                      (org-agenda-error)))
          (buffer (marker-buffer marker))
          (pos (marker-position marker)))
-    (save-excursion
-      (set-buffer buffer)
+    (with-current-buffer buffer
       (widen)
       (goto-char pos)
       (if (not (org-at-timestamp-p))
           (error "Cannot find time stamp"))
-      (org-time-stamp nil)
+      (org-time-stamp arg)
       (message "Time stamp changed to %s" org-last-changed-timestamp))))
 
 (defun org-get-heading ()
@@ -4295,10 +4407,10 @@ the same tree node, and the headline of the tree node in the Org-mode file."
         (match-string 1)
       "")))
 
-(defun org-agenda-diary-entry (arg)
+(defun org-agenda-diary-entry ()
   "Make a diary entry, like the `i' command from the calendar.
 All the standard commands work: block, weekly etc"
-  (interactive "P")
+  (interactive)
   (require 'diary-lib)
   (let* ((char (progn 
                  (message "Diary entry: [d]ay [w]eekly [m]onthly [y]early [a]nniversary [b]lock [c]yclic")
@@ -4344,7 +4456,6 @@ the cursor position."
     (error "Don't know which date to use for calendar command"))
   (let* ((oldf (symbol-function 'calendar-cursor-to-date))
          (point (point))
-         (mark (or (mark t) (point)))
          (date (calendar-gregorian-from-absolute
                 (get-text-property point 'day)))
          (displayed-day (extract-calendar-day date))
@@ -4527,11 +4638,25 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file."
 (defun org-follow-bbdb-link (name)
   "Follow a BBDB link to NAME."
   (require 'bbdb)
-  ;; First try an exact match
-  (bbdb-name (concat "\\`" name "\\'") nil)
-  (if (= 0 (buffer-size (get-buffer "*BBDB*")))
-      ;; No exact match - try partial match
-      (bbdb-name name nil)))
+  (let ((inhibit-redisplay t))
+    (catch 'exit
+      ;; Exact match on name
+      (bbdb-name (concat "\\`" name "\\'") nil)
+      (if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil))
+      ;; Exact match on name
+      (bbdb-company (concat "\\`" name "\\'") nil)
+      (if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil))
+      ;; Partial match on name
+      (bbdb-name name nil)
+      (if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil))
+      ;; Partial match on company
+      (bbdb-company name nil)
+      (if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil))
+      ;; General match including network address and notes
+      (bbdb name nil)
+      (when (= 0 (buffer-size (get-buffer "*BBDB*")))
+        (delete-window (get-buffer-window "*BBDB*"))
+        (error "No matching BBDB record")))))
 
 (defun org-follow-gnus-link (&optional group article)
   "Follow a Gnus link to GROUP and ARTICLE."
@@ -4545,7 +4670,6 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file."
                 (gnus-summary-insert-cached-articles)
                 (gnus-summary-goto-article article nil 'force))
             (message "Message could not be found.")))))
-;;  (if article (gnus-summary-goto-article article nil 'force)))
 
 (defun org-follow-vm-link (&optional folder article readonly)
   "Follow a VM link to FOLDER and ARTICLE."
@@ -4681,8 +4805,9 @@ For file links, arg negates `org-line-numbers-in-file-links'."
 
      ((eq major-mode 'bbdb-mode)
       (setq link (concat "bbdb:"
-                         (bbdb-record-name (bbdb-current-record)))))
-
+                         (or (bbdb-record-name (bbdb-current-record))
+                             (bbdb-record-company (bbdb-current-record))))))
+     
      ((eq major-mode 'calendar-mode)
       (let ((cd (calendar-cursor-to-date)))
         (setq link
@@ -4702,7 +4827,6 @@ For file links, arg negates `org-line-numbers-in-file-links'."
               (folder (buffer-file-name))
               (subject (vm-su-subject message))
               (author (vm-su-full-name message))
-              (address (vm-su-from message))
               (message-id (vm-su-message-id message)))
          (setq folder (abbreviate-file-name folder))
          (if (string-match (concat "^" (regexp-quote vm-folder-directory))
@@ -4747,9 +4871,8 @@ For file links, arg negates `org-line-numbers-in-file-links'."
                                group))
           (setq link (concat "gnus:" group)))))
 
-     ((or (eq major-mode 'gnus-summary-mode)
-          (eq major-mode 'gnus-article-mode))
-      (gnus-article-show-summary)
+     ((memq major-mode '(gnus-summary-mode gnus-article-mode))
+      (and (eq major-mode 'gnus-article-mode) (gnus-article-show-summary))
       (gnus-summary-beginning-of-article)
       (let* ((group (car gnus-article-current))
              (article (cdr gnus-article-current))
@@ -4825,8 +4948,7 @@ For file links, arg negates `org-line-numbers-in-file-links'."
 
 
 (defun org-fixup-message-id-for-http (s)
-  "Replace special characters in a message id, so that it can be used
-in an http query."
+  "Replace special characters in a message id, so it can be used in an http query."
   (while (string-match "<" s)
     (setq s (replace-match "%3C" t t s)))
   (while (string-match ">" s)
@@ -4843,13 +4965,13 @@ Completion can be used to select a link previously stored with
 press RET at the prompt), the link defaults to the most recently
 stored link.
 
-With a C-u prefix, prompts for a file to link to.  The file name can be
+With a \\[universal-argument] prefix, prompts for a file to link to.  The file name can be
 selected using completion.  The path to the file will be relative to
 the current directory if the file is in the current directory or a
 subdirectory.  Otherwise, the link will be the absolute path as
 completed in the minibuffer (i.e. normally ~/path/to/file).
 
-With two C-u prefixes, enforce an absolute path even if the file
+With two \\[universal-argument] prefixes, enforce an absolute path even if the file
 is in the current directory or below."
   (interactive "P")
   (let ((link (if complete-file
@@ -4970,11 +5092,10 @@ See also the variable `org-reverse-note-order'."
       ;; Find the file
       (if (not visiting)
           (find-file-noselect file))
-      (save-excursion
-        (set-buffer (get-file-buffer file))
+      (with-current-buffer (get-file-buffer file)
         (setq reversed (org-notes-order-reversed-p))
-        (save-restriction
-          (save-excursion
+        (save-excursion
+          (save-restriction
             (widen)
             ;; Ask the User for a location
             (setq spos (if fastp 1 (org-get-location
@@ -5038,12 +5159,6 @@ See also the variable `org-reverse-note-order'."
 ;; Emacs package.  We call the former org-type tables, and the latter
 ;; table.el-type tables.
 
-;; We use a before-change function to check if a table might need
-;; an update.
-(defvar org-table-may-need-update t
-  "Indicates of a table might need an update.
-This variable is set by `org-before-change-function'. `org-table-align'
-sets it back to nil.")
 
 (defun org-before-change-function (beg end)
   "Every change indicates that a table might need an update."
@@ -5058,7 +5173,7 @@ sets it back to nil.")
 (defconst org-table1-hline-regexp "^[ \t]*\\+-[-+]"
   "Detects a table-type table hline.")
 (defconst org-table-any-line-regexp "^[ \t]*\\(|\\|\\+-[-+]\\)"
-  "Detects an org-type or table-type table")
+  "Detects an org-type or table-type table.")
 (defconst org-table-border-regexp "^[ \t]*[^| \t]"
   "Searching from within a table (any type) this finds the first line
 outside the table.")
@@ -5210,9 +5325,9 @@ This is being used to correctly align a single field after TAB or RET.")
 This is being used to correctly align a single field after TAB or RET.")
 
 
-(defun org-table-align (&optional arg)
+(defun org-table-align ()
   "Align the table at point by aligning all vertical bars."
-  (interactive "P")
+  (interactive)
   (let* (
          ;; Limits of table
          (beg (org-table-begin))
@@ -5366,10 +5481,10 @@ With argument TABLE-TYPE, go to the end of a table.el-type table."
           (setq org-table-may-need-update t))
         (goto-char pos))))))
 
-(defun org-table-next-field (&optional arg)
+(defun org-table-next-field ()
   "Go to the next field in the current table.
 Before doing so, re-align the table if necessary."
-  (interactive "P")
+  (interactive)
   (if (and org-table-automatic-realign
            org-table-may-need-update)
       (org-table-align))
@@ -5388,10 +5503,10 @@ Before doing so, re-align the table if necessary."
     (error
      (org-table-insert-row 'below))))
 
-(defun org-table-previous-field (&optional arg)
+(defun org-table-previous-field ()
   "Go to the previous field in the table.
 Before doing so, re-align the table if necessary."
-  (interactive "P")
+  (interactive)
   (if (and org-table-automatic-realign
            org-table-may-need-update)
       (org-table-align))
@@ -5404,10 +5519,10 @@ Before doing so, re-align the table if necessary."
   (if (looking-at "| ?")
       (goto-char (match-end 0))))
 
-(defun org-table-next-row (&optional arg)
+(defun org-table-next-row ()
   "Go to the next row (same column) in the current table.
 Before doing so, re-align the table if necessary."
-  (interactive "P")
+  (interactive)
   (if (or (looking-at "[ \t]*$")
           (save-excursion (skip-chars-backward " \t") (bolp)))
       (newline)
@@ -5470,6 +5585,9 @@ I.e. not on a hline or before the first or after the last column?"
           (looking-at "[ \t]*$"))
       (error "Not in table data field")))
 
+(defvar org-table-clip nil
+  "Clipboard for table regions")
+
 (defun org-table-blank-field ()
   "Blank the current table field or active region."
   (interactive)
@@ -5497,7 +5615,6 @@ is always the old value."
   (backward-char 1)
   (if (looking-at "|[^|\r\n]*")
       (let* ((pos (match-beginning 0))
-             (len (length (match-string 0)))
              (val (buffer-substring (1+ pos) (match-end 0))))
         (if replace
             (replace-match (concat "|" replace)))
@@ -5591,9 +5708,9 @@ However, when FORCE is non-nil, create new columns if necessary."
         (looking-at org-table-hline-regexp))
     nil))
 
-(defun org-table-insert-column (&optional arg)
+(defun org-table-insert-column ()
   "Insert a new column into the table."
-  (interactive "P")
+  (interactive)
   (if (not (org-at-table-p))
       (error "Not at a table"))
   (org-table-find-dataline)
@@ -5634,9 +5751,9 @@ However, when FORCE is non-nil, create new columns if necessary."
         (error
          "Please position cursor in a data line for column operations")))))
 
-(defun org-table-delete-column (&optional arg)
+(defun org-table-delete-column ()
   "Delete a column into the table."
-  (interactive "P")
+  (interactive)
   (if (not (org-at-table-p))
       (error "Not at a table"))
   (org-table-find-dataline)
@@ -5777,9 +5894,9 @@ With prefix ARG, insert above the current line."
     (beginning-of-line 0)
     (move-to-column col)))
 
-(defun org-table-kill-row (&optional arg)
+(defun org-table-kill-row ()
   "Delete the current row or horizontal line from the table."
-  (interactive "P")
+  (interactive)
   (if (not (org-at-table-p))
       (error "Not at a table"))
   (let ((col (current-column)))
@@ -5788,14 +5905,11 @@ With prefix ARG, insert above the current line."
     (move-to-column col)))
 
 
-(defun org-table-cut-region (&optional arg)
+(defun org-table-cut-region ()
   "Copy region in table to the clipboard and blank all relevant fields."
-  (interactive "P")
+  (interactive)
   (org-table-copy-region 'cut))
 
-(defvar org-table-clip nil
-  "Clipboard for table regions")
-
 (defun org-table-copy-region (&optional cut)
   "Copy rectangular region in table to clipboard.
 A special clipboard is used which can only be accessed
@@ -5832,20 +5946,19 @@ with `org-table-paste-rectangle'"
     (setq org-table-clip (nreverse region))
     (if cut (org-table-align))))
   
-(defun org-table-paste-rectangle (&optional arg)
+(defun org-table-paste-rectangle ()
   "Paste a rectangular region into a table.
 The upper right corner ends up in the current field.  All involved fields
 will be overwritten.  If the rectangle does not fit into the present table,
 the table is enlarged as needed.  The process ignores horizontal separator
 lines."
-  (interactive "P")
+  (interactive)
   (unless (and org-table-clip (listp org-table-clip))
     (error "First cut/copy a region to paste!"))
   (org-table-check-inside-data-field)
   (let* ((clip org-table-clip)
          (line (count-lines (point-min) (point)))
          (col (org-table-current-column))
-         (l line)
          (org-enable-table-editor t)
          (org-table-automatic-realign nil)
          c cols field)
@@ -5864,7 +5977,7 @@ lines."
     (org-table-align)))
 
 (defun org-table-convert ()
-  "Convert from org-mode table to table.el and back.
+  "Convert from `org-mode' table to table.el and back.
 Obviously, this only works within limits.  When an Org-mode table is
 converted to table.el, all horizontal separator lines get lost, because
 table.el uses these as cell boundaries and has no notion of horizontal lines.
@@ -5915,7 +6028,7 @@ lines, in order to keep the table compact.
 If there is an active region, and both point and mark are in the same column,
 the text in the column is wrapped to minimum width for the given number of
 lines.  Generally, this makes the table more compact.  A prefix ARG may be
-used to change the number of desired lines.  For example, `C-2 C-c C-q'
+used to change the number of desired lines.  For example, `C-2 \\[org-table-wrap]'
 formats the selected text to two lines.  If the region was longer than 2
 lines, the remaining lines remain empty.  A negative prefix argument reduces
 the current number of lines by that amount.  The wrapped text is pasted back
@@ -5984,8 +6097,6 @@ many lines, whatever width that takes.
 The return value is a list of lines, without newlines at the end."
   (let* ((words (org-split-string string "[ \t\n]+"))
          (maxword (apply 'max (mapcar 'length words)))
-         (black (apply '+ (mapcar 'length words)))
-         (total (+ black (length words)))
          w ll)
     (cond (width
            (org-do-wrap words (max maxword width)))
@@ -6003,7 +6114,7 @@ The return value is a list of lines, without newlines at the end."
            
 
 (defun org-do-wrap (words width)
-  "Creates lines of maximum width WIDTH (in characters) from word list WORDS."
+  "Create lines of maximum width WIDTH (in characters) from word list WORDS."
   (let (lines line)
     (while words
       (setq line (pop words))
@@ -6222,10 +6333,10 @@ A few examples for formulae:
   $;%.1f              Reformat current cell to 1 digit after dec.point
   ($3-32)*5/9         degrees F -> C conversion
 
-When called with a raw C-u prefix, the formula is applied to the current
+When called with a raw \\[universal-argument] prefix, the formula is applied to the current
 field, and to the same same column in all following rows, until reaching a
 horizontal line or the end of the table.  When the command is called with a
-numeric prefix argument (like M-3 or C-7 or C-u 24), the formula is applied
+numeric prefix argument (like M-3 or C-7 or \\[universal-argument] 24), the formula is applied
 to the current row, and to the following n-1 rows (but not beyond a
 separator line)."
   (interactive "P")
@@ -6297,7 +6408,7 @@ separator line)."
 ;; modified self-insert.
 
 (defcustom orgtbl-optimized (eq org-enable-table-editor 'optimized)
-  "Non-nil means, use the optimized table editor version for orgtbl-mode.
+  "Non-nil means, use the optimized table editor version for `orgtbl-mode'.
 In the optimized version, the table editor takes over all simple keys that
 normally just insert a character.  In tables, the characters are inserted
 in a way to minimize disturbing the table structure (i.e. in overwrite mode
@@ -6311,21 +6422,21 @@ this variable requires a restart of Emacs to become effective."
   :type 'boolean)
 
 (defvar orgtbl-mode nil
-  "Variable controlling orgtbl-mode, a minor mode enabling the org-mode
+  "Variable controlling `orgtbl-mode', a minor mode enabling the `org-mode'
 table editor in arbitrary modes.")
 (make-variable-buffer-local 'orgtbl-mode)
 
 (defvar orgtbl-mode-map (make-sparse-keymap)
-  "Keymap for orgtbl-mode.")
+  "Keymap for `orgtbl-mode'.")
 
 ;;;###autoload
 (defun turn-on-orgtbl ()
-  "Unconditionally turn on orgtbl-mode."
+  "Unconditionally turn on `orgtbl-mode'."
   (orgtbl-mode 1))
 
 ;;;###autoload
 (defun orgtbl-mode (&optional arg)
-  "The org-mode table editor as a minor mode for use in other modes." 
+  "The `org-mode' table editor as a minor mode for use in other modes." 
   (interactive) 
   (setq orgtbl-mode
         (if arg (> (prefix-numeric-value arg) 0) (not orgtbl-mode)))
@@ -6435,13 +6546,13 @@ table editor in arbitrary modes.")
   (define-key org-mode-map "|" 'self-insert-command))
 
 (defun orgtbl-tab ()
-  "Justification and field motion for orgtbl-mode."
+  "Justification and field motion for `orgtbl-mode'."
   (interactive)
   (org-table-justify-field-maybe)
   (org-table-next-field))
 
 (defun orgtbl-ret ()
-  "Justification and field motion for orgtbl-mode."
+  "Justification and field motion for `orgtbl-mode'."
   (interactive)
   (org-table-justify-field-maybe)
   (org-table-next-row))
@@ -6454,7 +6565,7 @@ overwritten, and the table is not marked as requiring realignment."
   (if (and (org-at-table-p)
            (eq N 1)
            (looking-at "[^|\n]*  +|"))
-      (let (org-table-may-need-update (pos (point)))
+      (let (org-table-may-need-update)
         (goto-char (1- (match-end 0)))
         (delete-backward-char 1)
         (goto-char (match-beginning 0))
@@ -6869,6 +6980,8 @@ The list contains HTML entities for Latin-1, Greek and other symbols.
 It is supplemented by a number of commonly used TeX macros with appropriate
 translations.")
 
+(defvar org-last-level nil) ; dynamically scoped variable
+
 (defun org-export-as-ascii (arg)
   "Export the outline as a pretty ASCII file.
 If there is an active region, export only the region.
@@ -6898,10 +7011,10 @@ underlined headlines.  The default is 3."
          (email       user-mail-address)
          (language    org-export-default-language)
          (text        nil)
-         (last-level  1)
          (todo nil)
          (lang-words nil))
 
+    (setq org-last-level 1)
     (org-init-section-numbers)
 
     (find-file-noselect filename)
@@ -6962,7 +7075,7 @@ underlined headlines.  The default is 3."
                                  (insert
                                   (make-string (* (1- level) 4) ?\ )
                                   (format (if todo "%s (*)\n" "%s\n") txt))
-                                 (setq last-level level))
+                                 (setq org-last-level level))
                              ))))
                   lines)))
 
@@ -7030,11 +7143,11 @@ underlined headlines.  The default is 3."
           (setq title (concat (org-section-number level) " " title)))
       (insert title "\n" (make-string (string-width title) char) "\n"))))
 
-(defun org-export-copy-visible (&optional arg)
+(defun org-export-copy-visible ()
   "Copy the visible part of the buffer to another buffer, for printing.
 Also removes the first line of the buffer if it specifies a mode,
 and all options lines."
-  (interactive "P")
+  (interactive)
   (let* ((filename (concat (file-name-sans-extension (buffer-file-name))
                            ".txt"))
          (buffer (find-file-noselect filename))
@@ -7044,8 +7157,7 @@ and all options lines."
                   "TITLE" "AUTHOR" "EMAIL" "TEXT" "OPTIONS" "LANGUAGE"))
                (if org-noutline-p "\\(\n\\|$\\)" "")))
          s e)
-    (save-excursion
-      (set-buffer buffer)
+    (with-current-buffer buffer
       (erase-buffer)
       (text-mode))
     (save-excursion
@@ -7174,7 +7286,7 @@ headlines.  The default is 3.  Lower levels will become bulleted lists."
   (org-open-file (buffer-file-name)))
 
 (defun org-export-as-html-batch ()
-  "Call org-export-as-html, may be used in batch processing as
+  "Call `org-export-as-html', may be used in batch processing as
 emacs   --batch
         --load=$HOME/lib/emacs/org.el
         --eval \"(setq org-export-headline-levels 2)\"
@@ -7199,7 +7311,6 @@ headlines.  The default is 3.  Lower levels will become bulleted lists."
           (org-skip-comments (org-split-string region "[\r\n]")))
          (lines (org-export-find-first-heading-line all_lines))
          (level 0) (line "") (origline "") txt todo
-         (last-level 1)
          (umax nil)
          (filename (concat (file-name-sans-extension (buffer-file-name))
                            ".html"))
@@ -7220,6 +7331,7 @@ headlines.  The default is 3.  Lower levels will become bulleted lists."
          )
     (message "Exporting...")
 
+    (setq org-last-level 1)
     (org-init-section-numbers)
 
     ;; Search for the export key lines
@@ -7284,15 +7396,15 @@ headlines.  The default is 3.  Lower levels will become bulleted lists."
                              (if (<= level umax)
                                  (progn
                                    (setq head-count (+ head-count 1))
-                                   (if (> level last-level)
+                                   (if (> level org-last-level)
                                        (progn
-                                         (setq cnt (- level last-level))
+                                         (setq cnt (- level org-last-level))
                                          (while (>= (setq cnt (1- cnt)) 0)
                                            (insert "<ul>"))
                                          (insert "\n")))
-                                   (if (< level last-level)
+                                   (if (< level org-last-level)
                                        (progn
-                                         (setq cnt (- last-level level))
+                                         (setq cnt (- org-last-level level))
                                          (while (>= (setq cnt (1- cnt)) 0)
                                            (insert "</ul>"))
                                          (insert "\n")))
@@ -7302,11 +7414,11 @@ headlines.  The default is 3.  Lower levels will become bulleted lists."
                                          "<li><a href=\"#sec-%d\"><span style='color:red'>%s</span></a></li>\n"
                                        "<li><a href=\"#sec-%d\">%s</a></li>\n")
                                      head-count txt))
-                                   (setq last-level level))
+                                   (setq org-last-level level))
                                ))))
                     lines)
-            (while (> last-level 0)
-              (setq last-level (1- last-level))
+            (while (> org-last-level 0)
+              (setq org-last-level (1- org-last-level))
               (insert "</ul>\n"))
             ))
       (setq head-count 0)
@@ -7537,17 +7649,14 @@ But it has the disadvantage, that no cell- or row-spanning is allowed."
 This has the advantage that cell- or row-spanning is allowed.
 But it has the disadvantage, that Org-mode's HTML conversions cannot be used."
   (require 'table)
-  (save-excursion
-    (set-buffer (get-buffer-create " org-tmp1 "))
+  (with-current-buffer (get-buffer-create " org-tmp1 ")
     (erase-buffer)
     (insert (mapconcat 'identity lines "\n"))
     (goto-char (point-min))
     (if (not (re-search-forward "|[^+]" nil t))
         (error "Error processing table."))
     (table-recognize-table)
-    (save-excursion
-      (set-buffer (get-buffer-create " org-tmp2 "))
-      (erase-buffer))
+    (with-current-buffer (get-buffer-create " org-tmp2 ") (erase-buffer))
     (table-generate-source 'html " org-tmp2 ")
     (set-buffer " org-tmp2 ")
     (buffer-substring (point-min) (point-max))))
@@ -7711,7 +7820,7 @@ stacked delimiters is N. Escaping delimiters is not possible."
                           level head-count title level))
         (insert (format "\n<H%d>%s</H%d>\n" level title level))))))
 
-(defun org-html-level-close (level)
+(defun org-html-level-close (&rest args)
   "Terminate one level in HTML export."
   (insert "</ul>"))
 
@@ -7800,6 +7909,7 @@ When LEVEL is non-nil, increase section numbers on that level."
 (define-key org-mode-map "\C-c/"    'org-occur)   ; Minor-mode reserved
 (define-key org-mode-map "\C-c\C-m" 'org-insert-heading)
 (define-key org-mode-map "\M-\C-m"  'org-insert-heading)
+(define-key org-mode-map [(meta shift return)] 'org-insert-todo-heading)
 (define-key org-mode-map "\C-c\C-l" 'org-insert-link)
 (define-key org-mode-map "\C-c\C-o" 'org-open-at-point)
 (define-key org-mode-map "\C-c\C-z" 'org-time-stamp)  ; Alternative binding
@@ -7811,8 +7921,6 @@ When LEVEL is non-nil, increase section numbers on that level."
 (define-key org-mode-map "\C-c["    'org-add-file)
 (define-key org-mode-map "\C-c]"    'org-remove-file)
 (define-key org-mode-map "\C-c\C-r"       'org-timeline)
-;(define-key org-mode-map [(shift up)]     'org-timestamp-up)
-;(define-key org-mode-map [(shift down)]   'org-timestamp-down)
 (define-key org-mode-map [(shift up)]     'org-shiftup)
 (define-key org-mode-map [(shift down)]   'org-shiftdown)
 (define-key org-mode-map [(shift left)]   'org-timestamp-down-day)
@@ -7864,7 +7972,7 @@ overwritten, and the table is not marked as requiring realignment."
   (if (and (org-table-p)
            (eq N 1)
            (looking-at "[^|\n]*  +|"))
-      (let (org-table-may-need-update (pos (point)))
+      (let (org-table-may-need-update)
         (goto-char (1- (match-end 0)))
         (delete-backward-char 1)
         (goto-char (match-beginning 0))
@@ -7935,25 +8043,27 @@ a reduced column width."
    ((org-at-table-p) (org-table-previous-field))
    (t (org-cycle '(4)))))
 
-(defun org-shiftmetaleft (&optional arg)
+(defun org-shiftmetaleft ()
   "Call `org-promote-subtree' or `org-table-delete-column'."
-  (interactive "P")
+  (interactive)
   (cond
-   ((org-at-table-p) (org-table-delete-column arg))
-   ((org-on-heading-p) (org-promote-subtree arg))
+   ((org-at-table-p) (org-table-delete-column))
+   ((org-on-heading-p) (org-promote-subtree))
    (t (org-shiftcursor-error))))
-(defun org-shiftmetaright (&optional arg)
+
+(defun org-shiftmetaright ()
   "Call `org-demote-subtree' or `org-table-insert-column'."
-  (interactive "P")
+  (interactive)
   (cond
-   ((org-at-table-p) (org-table-insert-column arg))
-   ((org-on-heading-p) (org-demote-subtree arg))
+   ((org-at-table-p) (org-table-insert-column))
+   ((org-on-heading-p) (org-demote-subtree))
    (t (org-shiftcursor-error))))
+
 (defun org-shiftmetaup (&optional arg)
   "Call `org-move-subtree-up' or `org-table-kill-row'."
   (interactive "P")
   (cond
-   ((org-at-table-p) (org-table-kill-row arg))
+   ((org-at-table-p) (org-table-kill-row))
    ((org-on-heading-p) (org-move-subtree-up arg))
    (t (org-shiftcursor-error))))
 (defun org-shiftmetadown (&optional arg)
@@ -7969,15 +8079,17 @@ a reduced column width."
   (interactive "P")
   (cond
    ((org-at-table-p) (org-table-move-column 'left))
-   ((or (org-on-heading-p) (org-region-active-p)) (org-do-promote arg))
+   ((or (org-on-heading-p) (org-region-active-p)) (org-do-promote))
    (t (backward-word (prefix-numeric-value arg)))))
+
 (defun org-metaright (&optional arg)
   "Call `org-do-demote' or `org-table-move-column' to right."
   (interactive "P")
   (cond
    ((org-at-table-p) (org-table-move-column nil))
-   ((or (org-on-heading-p) (org-region-active-p)) (org-do-demote arg))
+   ((or (org-on-heading-p) (org-region-active-p)) (org-do-demote))
    (t (forward-word (prefix-numeric-value arg)))))
+
 (defun org-metaup (&optional arg)
   "Call `org-move-subtree-up' or `org-table-move-row' up."
   (interactive "P")
@@ -7985,6 +8097,7 @@ a reduced column width."
    ((org-at-table-p) (org-table-move-row 'up))
    ((org-on-heading-p) (org-move-subtree-up arg))
    (t (org-shiftcursor-error))))
+
 (defun org-metadown (&optional arg)
   "Call `org-move-subtree-down' or `org-table-move-row' down."
   (interactive "P")
@@ -8007,25 +8120,25 @@ a reduced column width."
    ((org-at-timestamp-p) (org-timestamp-down arg))
    (t (org-priority-down))))
 
-(defun org-copy-special (arg)
+(defun org-copy-special ()
   "Call either `org-table-copy' or `org-copy-subtree'."
-  (interactive "P")
+  (interactive)
   (if (org-at-table-p)
-      (org-table-copy-region arg)
-    (org-copy-subtree arg)))
+      (org-table-copy-region)
+    (org-copy-subtree)))
 
-(defun org-cut-special (arg)
-  "Call either `org-table-copy' or `org-copy-subtree'."
-  (interactive "P")
+(defun org-cut-special ()
+  "Call either `org-table-copy' or `org-cut-subtree'."
+  (interactive)
   (if (org-at-table-p)
-      (org-table-cut-region arg)
-    (org-cut-subtree arg)))
+      (org-table-cut-region)
+    (org-cut-subtree)))
 
 (defun org-paste-special (arg)
   "Call either `org-table-paste-rectangle' or `org-paste-subtree'."
   (interactive "P")
   (if (org-at-table-p)
-      (org-table-paste-rectangle arg)
+      (org-table-paste-rectangle)
     (org-paste-subtree arg)))
 
 (defun org-ctrl-c-ctrl-c (&optional arg)
@@ -8040,12 +8153,12 @@ the automatic table editor has been turned off."
      ((org-at-table.el-p)
       (require 'table)
       (beginning-of-line 1)
-      (re-search-forward "|" (save-excursion (end-of-line 2) (point)))
+      (re-search-forward "|" (save-excursion (end-of-line 2) (point))) ;FIXME: line-end-position?
       (table-recognize-table))
      ((org-at-table-p)
       (org-table-align))
      ((save-excursion (beginning-of-line 1) (looking-at "#\\+[A-Z]+"))
-      (let (org-inhibit-startup) (org-mode)))
+      (let ((org-inhibit-startup t)) (org-mode)))
      ((org-region-active-p)
       (org-table-convert-region (region-beginning) (region-end) arg))
      ((and (region-beginning) (region-end))
@@ -8054,9 +8167,9 @@ the automatic table editor has been turned off."
         (error "Abort")))
      (t (error "No table at point, and no region to make one.")))))
 
-(defun org-return (&optional arg)
+(defun org-return ()
   "Call `org-table-next-row' or `newline'."
-  (interactive "P")
+  (interactive)
   (cond
    ((org-at-table-p)
     (org-table-justify-field-maybe)
@@ -8069,7 +8182,7 @@ the automatic table editor has been turned off."
   (cond
    ((org-at-table-p)
     (org-table-wrap-region arg))
-   (t (org-insert-heading arg))))
+   (t (org-insert-heading))))
 
 ;;; Menu entries
 
@@ -8256,7 +8369,7 @@ With optional NODE, go directly to that node."
 ;;; Miscellaneous stuff
 
 (defun org-move-line-down (arg)
-  "Move the current line up."
+  "Move the current line down.  With prefix argument, move it past ARG lines."
   (interactive "p")
   (let ((col (current-column))
         beg end pos)
@@ -8269,13 +8382,13 @@ With optional NODE, go directly to that node."
     (move-to-column col)))
 
 (defun org-move-line-up (arg)
-  "Move the current line up."
+  "Move the current line up.  With prefix argument, move it past ARG lines."
   (interactive "p")
   (let ((col (current-column))
         beg end pos)
     (beginning-of-line 1) (setq beg (point))
     (beginning-of-line 2) (setq end (point))
-    (beginning-of-line (+ -2 arg))
+    (beginning-of-line (- arg))
     (setq pos (move-marker (make-marker) (point)))
     (insert (delete-and-extract-region beg end))
     (goto-char pos)
@@ -8284,7 +8397,7 @@ With optional NODE, go directly to that node."
 ;; Functions needed for Emacs/XEmacs region compatibility
 
 (defun org-region-active-p ()
-  "Is transient-mark-mode on and the region active?
+  "Is `transient-mark-mode' on and the region active?
 Works on both Emacs and XEmacs."
   (if org-ignore-region
       nil
@@ -8403,7 +8516,9 @@ If INVISIBLE-OK is non-nil, an invisible heading line is ok too."
 This function considers both visible and invisible heading lines.
 With argument, move up ARG levels."
   (if org-noutline-p
-      (outline-up-heading arg t)
+      (if (fboundp 'outline-up-heading-all) 
+          (outline-up-heading-all arg)   ; emacs 21 version of outline.el
+        (outline-up-heading arg t))      ; emacs 22 version of outline.el
     (org-back-to-heading t)
     (looking-at outline-regexp)
     (if (<= (- (match-end 0) (match-beginning 0)) arg)
@@ -8422,7 +8537,7 @@ With argument, move up ARG levels."
         (progn
           (org-back-to-heading t)
           (org-flag-heading nil)))
-    (show-entry)))
+    (org-show-entry)))
 
 (defun org-check-occur-regexp (regexp)
   "If REGEXP starts with \"^\", modify it to check for \\r as well.
@@ -8444,7 +8559,7 @@ When ENTRY is non-nil, show the entire entry."
     ;; Check if we should show the entire entry
     (if entry
         (progn
-          (show-entry)
+          (org-show-entry)
           (save-excursion  ;; FIXME: Is this the fix for points in the   -|
                            ;;        middle of text?                      |
             (and (outline-next-heading)   ;;                              |
@@ -8455,6 +8570,28 @@ When ENTRY is non-nil, show the entire entry."
                                flag
                              (if flag ?\r ?\n))))))
 
+(defun org-show-subtree ()
+  "Show everything after this heading at deeper levels."
+  (outline-flag-region 
+   (point) 
+   (save-excursion
+     (outline-end-of-subtree) (outline-next-heading) (point))
+   (if org-noutline-p nil ?\n)))
+
+(defun org-show-entry ()
+  "Show the body directly following this heading.
+Show the heading too, if it is currently invisible."
+  (interactive)
+  (save-excursion
+    (org-back-to-heading t)
+    (outline-flag-region 
+     (1- (point))
+     (save-excursion
+       (re-search-forward (concat "[\r\n]\\(" outline-regexp "\\)") nil 'move)
+       (or (match-beginning 1) (point-max)))
+     (if org-noutline-p nil ?\n))))
+
+
 (defun org-make-options-regexp (kwds)
   "Make a regular expression for keyword lines."
   (concat
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 1b3f06eb34b..04507fbc5e4 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -828,6 +828,14 @@ says which mode to use."
       (tex-mode-internal)
     (tex-guess-mode)))
 
+;; The following three autoloaded aliases appear to conflict with
+;; AUCTeX.  However, even though AUCTeX uses the mixed case variants
+;; for all mode relevant variables and hooks, the invocation function
+;; and setting of `major-mode' themselves need to be lowercase for
+;; AUCTeX to provide a fully functional user-level replacement.  So
+;; these aliases should remain as they are, in particular since AUCTeX
+;; users are likely to use them.
+
 ;;;###autoload
 (defalias 'TeX-mode 'tex-mode)
 ;;;###autoload
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 840aa3c2006..9bd35f05d11 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -119,8 +119,10 @@ position to pop up the tooltip."
 (defcustom tooltip-gud-tips-p nil
   "*Non-nil means show tooltips in GUD sessions.
 
-This allows you to display a variable's value in a tooltip simply by
-pointing at it with the mouse."
+This allows you to display a variable's value in a tooltip simply
+by pointing at it with the mouse.  In the case of a C program
+controlled by GDB, it shows the associated #define directives
+when program is not executing."
   :type 'boolean
   :tag "GUD"
   :group 'tooltip)
@@ -453,29 +455,45 @@ If TOOLTIP-GUD-DEREFERENCE is t, also prepend a `*' to EXPR."
   "Show tip for identifier or selection under the mouse.
 The mouse must either point at an identifier or inside a selected
 region for the tip window to be shown.  If tooltip-gud-dereference is t,
-add a `*' in front of the printed expression.
+add a `*' in front of the printed expression. In the case of a C program
+controlled by GDB, show the associated #define directives when program is
+not executing.
 
 This function must return nil if it doesn't handle EVENT."
   (let (process)
     (when (and (eventp event)
                tooltip-gud-tips-p
                (boundp 'gud-comint-buffer)
+               gud-comint-buffer
+               (buffer-name gud-comint-buffer); gud-comint-buffer might be killed
                (setq process (get-buffer-process gud-comint-buffer))
                (posn-point (event-end event))
-               (progn (setq tooltip-gud-event event)
-                      (eval (cons 'and tooltip-gud-display))))
+               (or (eq gud-minor-mode 'gdba)
+                   (progn (setq tooltip-gud-event event)
+                          (eval (cons 'and tooltip-gud-display)))))
       (let ((expr (tooltip-expr-to-print event)))
         (when expr
-          (let ((cmd (tooltip-gud-print-command expr)))
-            (unless (null cmd)         ; CMD can be nil if unknown debugger
-              (case gud-minor-mode
-                    (gdba (gdb-enqueue-input
-                           (list  (concat cmd "\n") 'gdb-tooltip-print)))
-                    (t
-                     (setq tooltip-gud-original-filter (process-filter process))
-                       (set-process-filter process 'tooltip-gud-process-output)
-                       (gud-basic-call cmd)))
-                    expr)))))))
+          (if (and (eq gud-minor-mode 'gdba)
+                   (not gdb-active-process))
+              (progn
+                (with-current-buffer
+                    (window-buffer (let ((mouse (mouse-position)))
+                                     (window-at (cadr mouse)
+                                                (cddr mouse))))
+                  (let ((define-elt (assoc expr gdb-define-alist)))
+                    (unless (null define-elt)
+                      (tooltip-show (cdr define-elt))
+                      expr))))
+            (let ((cmd (tooltip-gud-print-command expr)))
+              (unless (null cmd) ; CMD can be nil if unknown debugger
+                (case gud-minor-mode
+                  (gdba (gdb-enqueue-input
+                         (list  (concat cmd "\n") 'gdb-tooltip-print)))
+                  (t
+                   (setq tooltip-gud-original-filter (process-filter process))
+                   (set-process-filter process 'tooltip-gud-process-output)
+                  (gud-basic-call cmd)))
+                expr))))))))
 
 (defun gdb-tooltip-print ()
   (tooltip-show
diff --git a/lisp/window.el b/lisp/window.el
index b4fd664a43c..8c46addf444 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -29,6 +29,15 @@
 
 ;;; Code:
 
+(defvar window-size-fixed nil
+ "*Non-nil in a buffer means windows displaying the buffer are fixed-size.
+If the value is`height', then only the window's height is fixed.
+If the value is `width', then only the window's width is fixed.
+Any other non-nil value fixes both the width and the height.
+Emacs won't change the size of any window displaying that buffer,
+unless you explicitly change the size, or Emacs has no other choice.")
+(make-variable-buffer-local 'window-size-fixed)
+
 (defmacro save-selected-window (&rest body)
   "Execute BODY, then select the window that was selected before BODY.
 Also restore the selected window of each frame as it was at the start