50 files changed, 1888 insertions, 1090 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a049da097fd..fd04ddce0f0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,339 @@
+2006-01-24  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * completion.el: Minor fixes in introductory comment.
+        (completion-def-wrapper): Fix alist.
+
+2006-01-25  Nick Roberts  <nickrob@snap.net.nz>
+
+        * thumbs.el (thumbs-new-image-size): New function.
+        (thumbs-increment-image-size-element)
+        (thumbs-decrement-image-size-element, thumbs-increment-image-size)
+        (thumbs-decrement-image-size): Delete.
+        (thumbs-resize-image-1): Rename from thumbs-resize-image.  Keep old
+        temp files and use to resize.
+        (thumbs-resize-image): Rename from thumbs-resize-image-interactive.
+        Use increment argument to enlarge/shrink.  Preserve point.
+        (thumbs-shrink-image): Rename from thumbs-resize-image-size-down.
+        (thumbs-enlarge-image): Rename from thumbs-resize-image-size-up
+        (thumbs-show-thumbs-list): Set thumbs-buffer to current-buffer.
+        (thumbs-mark, thumbs-unmark): Preserve point.
+        (thumbs-modify-image): Keep old temp files and use to modify.
+        Cleanup old temp files at load time.  Preserve point.
+        (thumbs-view-image-mode-map): Use new command names.
+
+2006-01-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * log-view.el (log-view-minor-wrap): First rev is the one at point.
+
+        * calendar/cal-menu.el: Avoid macros from calendar.el so as to break
+        the nastiest part of the cyclic dependency.
+        (cal-menu-update): Use dotimes and calendar-increment-month.
+
+        * calendar/calendar.el: Remove unnecessary leading stars in docstrings.
+        (calendar-week-start-day): Add an :initializer.
+        (calendar-mode-map): Use suppress-keymap, and command remapping.
+        (describe-calendar-mode): Setup xref-stack info for the back button.
+        (calendar-star-date): Insert before delete.
+        (calendar-set-mode-line): Add file-modified info if applicable.
+        (calendar-increment-month): New function.
+
+2006-01-24  Tobias C. Rittweiler  <tcr@freebits.de>  (tiny change)
+
+        * font-lock.el (lisp-font-lock-keywords-2):
+        Recognize "& keywords" only at word boundaries.
+
+2006-01-24  Nick Roberts  <nickrob@snap.net.nz>
+
+        * thumbs.el (thumbs-extra-images): New variable.  Make it buffer-local
+        and permanent-local.
+        (thumbs-max-image-number): New variable.  Make it
+        (thumbs-do-thumbs-insertion): Use them
+        (thumbs-per-line): Change default to 4.
+        (thumbs-marked-list): Rename from thumbs-markedL.
+        (thumbs-cleanup-thumbsdir, thumbs-delete-images)
+        (thumbs-rename-images): Use -list instead of L for internal variables.
+        (thumbs-call-convert): Use call-process instead of shell-command.
+        (thumbs-insert-thumb): Add filename as help-echo to each image.
+        (thumbs-show-from-dir): Rename from thumbs-show-all-from-dir.
+        Give dir to thumbs-show-thumbs-list.
+        (thumbs-show-thumbs-list): Set default-directory to that of images.
+        (thumbs-dired-show): Rename from thumbs-dired-show-all.
+        (thumbs-display-thumbs-buffer, thumbs-show-more-images): New functions.
+        (thumbs-mode-map): Bind "+" to thumbs-show-more-images.
+        (thumbs-view-image-mode-map): Bind "^" to thumbs-display-thumbs-buffer.
+
+2006-01-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * ses.el (ses-read-cell): Provide a default value.
+
+2006-01-23  Juanma Barranquero  <lekktu@gmail.com>
+
+        * term/w32-win.el (image-library-alist): Add additional names for
+        GIF library.
+
+2006-01-23  Arne J,Ax(Brgensen  <arne@arnested.dk>
+
+        * international/latexenc.el (latexenc-find-file-coding-system):
+        Add file-regular-p check.
+
+2006-01-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * simple.el (clone-buffer): Don't show the new buffer in the same
+        window.
+
+2006-01-23  Juri Linkov  <juri@jurta.org>
+
+        * faces.el (link, link-visited): New faces based on default values
+        of `info-xref' and `info-xref-visited'.
+
+        * info.el (info-xref): Inherit from `link'.
+        (info-xref-visited): Inherit from `link-visited'.
+
+        * cus-edit.el (custom-buffer-create-internal): Use widget type
+        `custom-manual' instead of `info-link' and don't set properties
+        `button-face' and `mouse-face' explicitly.
+        (custom-browse-group-tag, custom-browse-variable-tag)
+        (custom-browse-face-tag): Inherit from widget class
+        `custom-group-link' instead of `push-button'.
+        (custom-button-unraised): Inherit from `underline' face.
+        (custom-link): Inherit from `link' face.  Fix doc and group.
+        (custom-add-parent-links, custom-group-value-create): Don't set
+        properties `button-face' and `mouse-face' explicitly for
+        `custom-group-link' widget.
+        (custom-group-link): Add properties `button-face' and `mouse-face'
+        to widget definition.
+        (custom-field-keymap): New variable.  Put `custom-field-keymap' to
+        editable-field's :keymap property.
+        (custom-mode): Fix docstring: substitute keybindings for
+        `widget-forward' and `widget-backward' from `widget-keymap',
+        `widget-complete' from `custom-field-keymap', replace old
+        `Custom-move-and-invoke' with `widget-move-and-invoke'.  Untabify.
+
+        * desktop.el (desktop-load-file): Check for `fboundp' before
+        calling `symbol-function'.
+
+        * simple.el (clone-buffer, clone-indirect-buffer)
+        (clone-indirect-buffer-other-window): Use `read-buffer' instead of
+        `read-string'.  Fix prompts.
+
+        * play/doctor.el (doctor-mode-map): Rename from `doc-mode-map'.
+
+2006-01-23  Nick Roberts  <nickrob@snap.net.nz>
+
+        * thumbs.el (thumbs-file-alist): Avoid creating duplicate entries.
+
+2006-01-22  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * startup.el (inhibit-splash-screen, initial-scratch-message):
+        Doc fixes.
+
+2006-01-22  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.0.52.
+
+        * net/tramp.el, net/tramp-ftp.el, net/tramp-util.el,
+        net/tramp-vc.el: Add code for unloading Tramp.  See comment before
+        `tramp-unload-tramp' for checklist.
+
+        * net/tramp.el: Require `timer-funcs' instead of `timer' if in
+        XEmacs.  Contributed by Steve Youngs <steve@sxemacs.org>.
+        (tramp-unload-file-name-handler-alist)
+        (tramp-unload-tramp): New defuns.
+        (tramp-advice-PC-expand-many-files): New defadvice.
+        (tramp-save-PC-expand-many-files, tramp-setup-complete) Defuns
+        removed.
+        (tramp-handle-expand-file-name): Remove double slash.
+        (tramp-handle-file-attributes-with-ls): Return t as 9th attribute.
+        It doesn't matter, because it will be converted later on.
+        (tramp-handle-file-ownership-preserved-p): Rewritten.  The old
+        implementation was just heuristic.
+        (tramp-post-connection): Set uid and gid properties.
+        (tramp-convert-file-attributes): Set file's gid change bit.
+        (tramp-get-remote-uid, tramp-get-remote-gid): New defuns.
+        (tramp-handle-expand-file-name): Use "~root" for tilde expansion
+        in case of su(do)? methods.  The home directory of the local user
+        will be taken else.
+        (tramp-open-connection-telnet)
+        (tramp-open-connection-rsh, tramp-open-connection-su)
+        (tramp-open-connection-multi): Set PS1 to "$ ".  Otherwise, a
+        local shell prompt could hurt.  Reported by Romain Francoise
+        <romain@orebokech.com>.
+        (tramp-let-maybe): Add `edebug-form-spec' property.
+        (tramp-handle-expand-file-name): Bind `default-directory' locally
+        to "/" in order to avoid problems with UNC shares or Cygwin
+        mounts.
+        (tramp-md5-function): Fix typo in error message.
+
+        * net/tramp-ftp.el (tramp-ftp-enable-ange-ftp): New defun.
+
+        * net/tramp-util.el (top): Apply `ignore' instead of `identity'
+        for byte-compiler pacification.
+
+2006-01-22  Andre Spiegel  <spiegel@gnu.org>
+
+        * vc-rcs.el (vc-rcs-state-heuristic): Use file-attributes with
+        ID-FORMAT `string'.  This allows us to get rid of
+        `vc-user-login-name UID'.
+
+        * vc-sccs.el (vc-sccs-state-heuristic): Likewise.
+
+2006-01-22  John Paul Wallington  <jpw@pobox.com>
+
+        * hl-line.el (hl-line-highlight, hl-line-move): Doc fixes.
+
+2006-01-21  Martin Rudalics  <rudalics@gmx.at>
+
+        * emacs-lisp/find-func.el (find-definition-noselect)
+        (find-variable-noselect): Search variables in C source code too.
+        (find-function-C-source, find-function-noselect, find-function)
+        (find-function-other-frame, find-variable-noselect, find-variable)
+        (find-variable-other-frame, find-variable-at-point):
+        Fix docstrings.
+
+2006-01-21  Francesco Potorti`  <pot@gnu.org>
+
+        * mail/rmailout.el (rmail-output): Don't use content-type if it is nil.
+
+2006-01-21  Agustin Martin  <agustin.martin@hispalinux.es>
+
+        * textmodes/flyspell.el (flyspell-emacs-popup, flypell-xemacs-popup):
+        Default to disabling the "Save affix" question.
+
+2006-01-21  Marien Zwart  <marienz@gentoo.org>  (tiny change)
+
+        * progmodes/python.el (python-mode) <eldoc-mode-hook>: Pass nil as
+        the first arg to run-python.
+
+2006-01-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * startup.el (command-line-1): Handle --no-desktop if desktop.el
+        is not loaded.
+
+2006-01-20  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calcalg2.el (calc-sum-rec): Fix the sum when the lower
+        limit is 0.
+
+        * calc/calc-arith.el (math-add-symb-fancy): Check the length of
+        the correct variable.
+
+2006-01-20  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-open-at-point): Fixed bug with matching a
+        link.  Fixed buggy argument sequence in call to `org-view-tags'.
+        (org-compile-prefix-format): Set `org-prefix-has-tag'.
+        (org-prefix-has-tag): New variable.
+        (org-format-agenda-item): Remove tags from headline if
+        appropriate.
+        (org-agenda-remove-tags-when-in-prefix): New option.
+        (org-get-tags-at): New function.
+
+2006-01-20  Nick Roberts  <nickrob@snap.net.nz>
+
+        * thumbs.el (thumbs-buffer): New variable.  Make it buffer local.
+        (thumbs-find-image): Move image name and number from buffer name
+        to mode name.  Set thumbs-buffer.  Preserve point so that large
+        images remain visible.
+        (thumbs-file-alist): Construct list in thumbs-buffer and reverse
+        order.
+        (thumbs-show-image-num): Get image from thumbs-file-alist.  Set
+        mode name.
+        (thumbs-next-image, thumbs-previous-image): Make them work.
+
+2006-01-19  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * cus-edit.el (custom-buffer-create-internal): State in the text above
+        the whole buffer buttons that they do not operate on hidden items.
+        (custom-face-menu): Use `custom-face-save' instead of
+        `custom-face-save-command'.
+        (custom-face-save-command): Make it an alias for `custom-face-save'
+        and declare it obsolete.
+        (custom-face-save): Doc fix.
+
+        * dired.el (dired-no-confirm): Add quote.
+        (dired-subdir-alist-pre-R): Add quote in
+        `make-variable-buffer-local' form and remove unbalanced parenthesis.
+
+2006-01-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/table.el (table-mode-indicator): Typo in last change.
+
+2006-01-19  Richard M. Stallman  <rms@gnu.org>
+
+        * outline.el (hide-leaves): Don't call outline-end-of-heading.
+        Fixes bug reported in Nov 2005.
+
+        * isearch.el (isearch-forward): Doc fix.
+
+        * dired.el (dired-move-to-filename-regexp): Define as alias.
+        (dired-no-confirm): Use defcustom.
+        (dired-subdir-alist-pre-R): Put defvar at top level.
+
+        * battery.el (battery-linux-proc-acpi): Handle "last full capacity".
+
+        * textmodes/bibtex.el (bibtex-strings, bibtex-reference-keys):
+        Mark as risky.
+
+        * simple.el (set-mark-command): Doc fix.
+        (clone-indirect-buffer-other-window):
+        Read arg like clone-indirect-buffer.
+        (move-beginning-of-line): Skip invisible newlines.
+
+2006-01-19  Masatake YAMATO  <jet@gyve.org>
+
+        * progmodes/cpp.el (cpp-edit-load): Make the order of
+        listed conditions in a base C code buffer and its associate
+        CPP Edit buffer the same.
+
 2006-01-19  Kenichi Handa  <handa@m17n.org>
 
-        * international/mule.el (auto-coding-regexp-alist-lookup): New
-        function.
+        * mail/rmail.el (rmail-enable-mime): Docstring fixed.
+        (rmail-mime-feature): Likewise.
+        (rmail-require-mime-maybe): Use display-warning to show a warning
+        message.
+
+        * international/mule.el (auto-coding-regexp-alist-lookup): New fun.
         (find-auto-coding): Use auto-coding-regexp-alist-lookup.
 
+2006-01-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * array.el: Move defvars out of eval-when-compile.
+        (array-make-template): Replace undeclared global var with a local one.
+        (array-mode): Inline initialization functions.
+        (array-init-local-variables, array-init-max-row)
+        (array-init-max-column, array-init-columns-per-line)
+        (array-init-field-width, array-init-rows-numbered)
+        (array-init-line-length, array-init-lines-per-row): Remove.
+
+        * play/doctor.el: Move defvars out of eval-when-compile.  Use dolist.
+        (doc-mode-map): Define explicitly.
+        (doctor-txtype): Use mapc.
+
+        * textmodes/table.el: Move defvars out of eval-when-compile.
+        Remove harmful code meant to avoid byte-compiler warnings.
+        (table-fixed-mode-indicator): Remove.  Use a more complex mode-line
+        specification that checks table-fixed-width-mode directly.
+        (table-recognize-region, table-recognize-cell):
+        Use restore-buffer-modified-p.
+        (table-fixed-width-mode): Remove code that refreshes
+        table-fixed-mode-indicator.
+        (*table--cell-describe-bindings, *table--cell-describe-mode):
+        Avoid obsolete name print-help-return-message.
+        (table--test-cell-list): Don't use replace-regexp from elisp.
+        (table--point-entered-cell-function, table--point-left-cell-function):
+        Don't set table-fixed-mode-indicator, use force-mode-line-update.
+
+        * textmodes/org.el: Move defvars out of eval-when-compile.  Move code
+        that was after the end of file.  Use buffer-file-name variable.
+        (org-timestamp-change): Use with-current-buffer.
+        (org-todo-list): Don't unnecessarily define a new buffer-local var.
+        (org-agenda-file-to-end, org-agenda-file-to-front): Remove unused arg
+        `file'.
+
+        * progmodes/fortran.el: Move defvars out of eval-when-compile.
+        (fortran-break-line): Remove unused var `opoint'.
+        (fortran-abbrev-start): Obey help-event-list.
+
 2006-01-18  Jesper Harder  <harder@phys.au.dk>
 
         * mail/smtpmail.el (smtpmail-send-it): Use insert-buffer-substring.
@@ -11,25 +341,20 @@
 2006-01-18  Masatake YAMATO  <jet@gyve.org>
 
         * progmodes/make-mode.el (makefile-imake-mode): New mode
-        derived from maiefile-mode.
+        derived from makefile-mode.
         (makefile-imake-mode-syntax-table): New syntax table
         derived from makefile-mode-syntax-table.
-        (makefile-mode): Write about makefile-imake-mode in 
-        doc string.
+        (makefile-mode): Write about makefile-imake-mode in doc string.
         (makefile-mode-map): Bind "\C-c\C-m\C-i" to makefile-imake-mode.
         (makefile-imake-font-lock-keywords): New font lock keywords.
 
-        * files.el (auto-mode-alist): Added Imakefile.
+        * files.el (auto-mode-alist): Add Imakefile.
 
 2006-01-17  Agustin Martin  <agustin.martin@hispalinux.es>
 
         * textmodes/flyspell.el (ispell-kill-ispell-hook): Add to the hook when
         loading the file rather than when turning on flyspell-mode.
 
-2006-01-13  Richard M. Stallman  <rms@gnu.org>
-
-        * font-lock.el (lisp-font-lock-keywords-1): Minor rearrangement.
-
 2006-01-16  Luc Teirlinck  <teirllm@auburn.edu>
 
         * cus-edit.el (customize-rogue): Minor doc fix.
@@ -100,9 +425,8 @@
         (term-mode): Make variables local here instead of doing it in
         `term-emulate-terminal'.
         (term-emulate-terminal): Delete incorrect optimization for cr+lf.
-        Scroll reverse needs to take into account the scroll
-        region.  Saving and restoring the cursor should save the color
-        attributes too.
+        Scroll reverse needs to take into account the scroll region.
+        Saving and restoring the cursor should save the color attributes too.
         (term-reset-terminal): Reset the scroll region.
         (term-handle-ansi-escape): Cursor up and down should take into
         account the scroll region.
@@ -131,6 +455,10 @@
         (Custom-reset-saved): Do not ask for confirmation in single option
         buffers.
 
+2006-01-13  Richard M. Stallman  <rms@gnu.org>
+
+        * font-lock.el (lisp-font-lock-keywords-1): Minor rearrangement.
+
 2006-01-13  Romain Francoise  <romain@orebokech.com>
 
         * add-log.el (add-change-log-entry, change-log-merge):
@@ -167,7 +495,7 @@
         Use `org-expand-wide-chars'.
         (org-open-file): Fix bug in program launch.
         (org-get-time-of-day): Fix bug with times before 1am.
-        (org-agenda-menu): Addes tags commands.
+        (org-agenda-menu): Add tags commands.
 
 2006-01-13  Agustin Martin  <agustin.martin@hispalinux.es>
 
@@ -378,7 +706,7 @@
 
         * emacs-lisp/find-func.el (find-definition-noselect): Fix typo in
         the doc string: "functoin" => "function".
-        ldefs-boot.el: Likewise.
+        * ldefs-boot.el: Likewise.
 
         * textmodes/bibtex.el (bibtex-validate-globally): Fix typo in a
         message text: "Duplicat" => "Duplicate".
@@ -691,7 +1019,7 @@
         that we set completion-ignore-case (i.e., binding via let is not
         sufficient).
         (bibtex-complete): Always set completion-ignore-case and
-        choose-completion-string-functions. The latter is needed because
+        choose-completion-string-functions.  The latter is needed because
         choose-completion-string-functions keeps its value if we quit the
         *Completions* buffer without requesting a completion.
 
@@ -753,7 +1081,7 @@
         (bibtex-beginning-first-field): New functions.
         (bibtex-skip-to-valid-entry): Use bibtex-valid-entry.  Fix regexp.
         (bibtex-map-entries): Fix docstring.
-        (bibtex-flash-head): New arg prompt. Simplify.
+        (bibtex-flash-head): New arg prompt.  Simplify.
         (bibtex-enclosing-field): Include code of bibtex-inside-field.
         (bibtex-insert-kill): Simplify.  Always insert text past the
         current field or entry.
@@ -789,7 +1117,7 @@
         * progmodes/gud.el (gud-tooltip-dereference): Rename from
         toggle-gud-tooltip-dereference.
         (gud-tooltip-print-command): Move concatenation of "*" to expr to...
-        (gud-tooltip-tips): ...here when dereferencing..
+        (gud-tooltip-tips): ...here when dereferencing.
 
 2005-12-28  Bill Wohler  <wohler@newt.com>
 
@@ -1040,7 +1368,7 @@
         * menu-bar.el (menu-find-file-existing): New function.
         (menu-bar-file-menu): Use menu-find-file-existing for Open.
 
-        * tool-bar.el (tool-bar-setup): open changed to menu-find-file-existing.
+        * tool-bar.el (tool-bar-setup): Open changed to menu-find-file-existing.
 
 2005-12-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -1301,7 +1629,7 @@
         * simple.el (last-buffer): Move here.
         (get-next-valid-buffer): New function.
         (next-buffer): Use frame-local buffer list, maintain buried buffer list.
-        (prev-buffer): Ditto. Rename to `previous-buffer'.
+        (prev-buffer): Ditto.  Rename to `previous-buffer'.
 
         * menu-bar.el (menu-bar-update-buffers): Update uses of `prev-buffer'.
         * bindings.el (global-map): Ditto.
@@ -1330,8 +1658,8 @@
         (ispell-buffer-local-dict):
         Don't set spell-personal-dictionary after killing process.
         (ispell-buffer-local-words): Don't clear out ispell-buffer-local-name.
-        (ispell-tex-skip-alists)
-        (ispell-html-skip-alists, ispell-skip-region-alist): Mark as risky.
+        (ispell-tex-skip-alists, ispell-html-skip-alists)
+        (ispell-skip-region-alist): Mark as risky.
 
         * net/newsticker.el (newsticker--retrieval-timer-list)
         (newsticker--display-timer, newsticker-running-p)
@@ -1570,7 +1898,7 @@
         * progmodes/gud.el (gud-tooltip-modes, gud-tooltip-display):
         Add the gud groupname.
         (gud-tooltip-mode): Add the tooltip groupname.
-        (gud-tooltip-echo-area): Add the gud groupname. Remove tag to
+        (gud-tooltip-echo-area): Add the gud groupname.  Remove tag to
         avoid conflict with tooltip-use-echo-area.
 
 2005-12-10  Romain Francoise  <romain@orebokech.com>
@@ -1593,7 +1921,7 @@
 
 2005-12-10  David Koppelman  <koppel@ece.lsu.edu>
 
-        * hi-lock.el: (hi-lock-mode) Renamed from hi-lock-buffer-mode;
+        * hi-lock.el (hi-lock-mode): Rename from hi-lock-buffer-mode;
         react if global-hi-lock-mode seems intended.
         (global-hi-lock-mode) Renamed from hi-lock-mode.
         (hi-lock-archaic-interface-message-used)
@@ -1736,8 +2064,8 @@
 
 2005-12-08  Kim F. Storm  <storm@cua.dk>
 
-        * emulation/cua-rect.el (cua--rectangle-aux-replace): Fix
-        indention of text on right side of replaced rectangle.
+        * emulation/cua-rect.el (cua--rectangle-aux-replace):
+        Fix indention of text on right side of replaced rectangle.
 
 2005-12-09  Nick Roberts  <nickrob@snap.net.nz>
 
@@ -1773,7 +2101,7 @@
         * progmodes/cc-defs.el:
         (i) Load cc-fix.elc for `push' and `pop' (for GNU Emacs 20.4)
 
-        * progmodes/cc-cmds.el (c-show-syntactic-information): change the
+        * progmodes/cc-cmds.el (c-show-syntactic-information): Change the
         highlighting mechanism so it will work in XEmacs too.
 
         * progmodes/cc-defs.el: Insert c-int-to-char.
@@ -1803,8 +2131,8 @@
 
         * progmodes/cc-mode.el: Bind c-subword-mode to C-c C-w.
 
-        * progmodes/cc-subword.el, cc-cmds.el, cc-mode.el: Rename
-        "c-subword-move-mode" as "c-subword-mode".
+        * progmodes/cc-subword.el, cc-cmds.el, cc-mode.el:
+        Rename "c-subword-move-mode" as "c-subword-mode".
 
         * progmodes/cc-mode.el: Added tty suitable bindings for C-c
         <delete> and C-c C-<delete>.  (To the c-hungry- delete functions).
@@ -1836,8 +2164,8 @@
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-fonts.el, cc-vars.el
-        (gtkdoc-font-lock-doc-comments, gtkdoc-font-lock-doc-protection,
-        gtkdoc-font-lock-keywords): GtkDoc patterns contributed by
+        (gtkdoc-font-lock-doc-comments, gtkdoc-font-lock-doc-protection)
+        (gtkdoc-font-lock-keywords): GtkDoc patterns contributed by
         Masatake YAMATO.
 
         (c-doc-comment-style): Made GtkDoc default in C mode.
@@ -1861,7 +2189,7 @@
         c-syntactic-context for calls to "criteria functions", for
         consistency with other calls to user functions.
 
-        * progmodes/cc-cmds.el (c-indent-command): expunge use of
+        * progmodes/cc-cmds.el (c-indent-command): Expunge use of
         `current-prefix-arg', since this might be the prefix arg to a
         command which calls c-indent-command as a function.  Change the
         interactive spec from "p" to "P".
@@ -1880,14 +2208,14 @@
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-cmds.el (c-mask-paragraph): correct, so that
+        * progmodes/cc-cmds.el (c-mask-paragraph): Correct, so that
         auto-fill doesn't split a c-comment's last word from a hanging
         "*/" when a space is typed between them after fill-column.
 
         * progmodes/cc-defs.el: New macro c-delete-and-extract-region.
 
-        * progmodes/cc-styles.el (c-set-style,
-        c-setup-paragraph-variables): Abort the command if we're not in a
+        * progmodes/cc-styles.el (c-set-style)
+        (c-setup-paragraph-variables): Abort the command if we're not in a
         CC Mode buffer.
 
         * progmodes/cc-align.el (c-lineup-C-comments): Correct indentation
@@ -1918,25 +2246,25 @@
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-fonts.el (c-basic-matchers-before,
-        c-complex-decl-matchers): Fixed the "not-arrow-prefix" regexp used
+        * progmodes/cc-fonts.el (c-basic-matchers-before)
+        (c-complex-decl-matchers): Fixed the "not-arrow-prefix" regexp used
         in Pike.
 
         * progmodes/cc-langs.el (c-other-op-syntax-tokens): Only C++ has
         digraphs.
 
         * progmodes/cc-fonts.el, cc-langs.el, cc-engine.el
-        (c-cpp-message-directives, c-cpp-include-directives,
-        c-opt-cpp-macro-define, c-opt-cpp-macro-define-start,
-        c-cpp-expr-directives): Introduced new language constants to
+        (c-cpp-message-directives, c-cpp-include-directives)
+        (c-opt-cpp-macro-define, c-opt-cpp-macro-define-start)
+        (c-cpp-expr-directives): Introduced new language constants to
         control cpp syntax in a cleaner way.
 
         (c-cpp-expr-functions): Renamed from c-cpp-defined-fns.
 
         (c-cpp-matchers, c-forward-to-cpp-define-body): Use them.
 
-        * progmodes/cc-langs.el, cc-fonts.el (c-string-escaped-newlines,
-        c-multiline-string-start-char): New language constants and
+        * progmodes/cc-langs.el, cc-fonts.el (c-string-escaped-newlines)
+        (c-multiline-string-start-char): New language constants and
         variables to specify how newlines in string literals work.
 
         (c-font-lock-invalid-string): Use them.
@@ -1952,15 +2280,15 @@
         * progmodes/cc-engine.el, cc-langs.el
         (c-opt-op-identifier-prefix): New language constant and variable.
 
-        (c-just-after-func-arglist-p, c-after-special-operator-id,
-        c-search-decl-header-end, c-inside-bracelist-p): Use it.
+        (c-just-after-func-arglist-p, c-after-special-operator-id)
+        (c-search-decl-header-end, c-inside-bracelist-p): Use it.
 
         * progmodes/cc-align.el, cc-engine.el
         (c-after-special-operator-id): New helper to handle C++ operator
         identifiers.
 
-        (c-lineup-topmost-intro-cont, c-just-after-func-arglist-p,
-        c-guess-basic-syntax): Handle C++ operator identifiers in
+        (c-lineup-topmost-intro-cont, c-just-after-func-arglist-p)
+        (c-guess-basic-syntax): Handle C++ operator identifiers in
         declarations.
 
         * progmodes/cc-langs.el (c-assignment-operators): Added the
@@ -2030,7 +2358,7 @@
         (c-point-syntax): Add a check for "virtual semicolons" in AWK
         mode, so that the tentative extra newline doesn't change the
         syntax of the following brace.
-        (c-electric-brace): restructure by extracting the above functions.
+        (c-electric-brace): Restructure by extracting the above functions.
         Tidy up the coding somewhat.
         (c-electric-semi&comma, c-electric-colon, c-electric-paren):
         restructure a bit.
@@ -2055,9 +2383,9 @@
         * progmodes/cc-subword.el: New functions and minor mode to handle
         SillyCapsedStyleIndentifiers, contributed by Masatake YAMATO:
 
-        (c-forward-subword, c-backward-subword, c-mark-subword,
-        c-kill-subword, c-backward-kill-subword, c-transpose-subwords,
-        c-capitalize-subword, c-downcase-subword, c-upcase-subword):
+        (c-forward-subword, c-backward-subword, c-mark-subword)
+        (c-kill-subword, c-backward-kill-subword, c-transpose-subwords)
+        (c-capitalize-subword, c-downcase-subword, c-upcase-subword):
         Functions corresponding to the standard word handling functions.
 
         (c-subword-move-mode): Minor mode that replaces all the standard
@@ -2078,7 +2406,7 @@
 
         Introduce an "awk" style, mainly for auto-newline and clean-ups.
 
-        * progmodes/cc-align.el: new function c-snug-1line-defun-close
+        * progmodes/cc-align.el: New function c-snug-1line-defun-close
 
         * progmodes/cc-cmds.el: In c-electric-brace, add code for new
         clean-up one-liner-defun.
@@ -2101,8 +2429,8 @@
         * progmodes/cc-defs.el (c-tnt-chng-record-state): Don't signal an
         error if the mark isn't set.
 
-        * progmodes/cc-engine.el (c-guess-continued-construct,
-        c-guess-basic-syntax): Use `c-forward-decl-or-cast-1' to more
+        * progmodes/cc-engine.el (c-guess-continued-construct)
+        (c-guess-basic-syntax): Use `c-forward-decl-or-cast-1' to more
         accurately detect functions inside functions.
 
         * progmodes/cc-engine.el (c-at-expression-start-p): New function
@@ -2123,8 +2451,8 @@
         (c-forward-objc-directive): New function to move over any ObjC
         directive.
 
-        (c-just-after-func-arglist-p, c-guess-basic-syntax,
-        c-basic-matchers-before): Use it.
+        (c-just-after-func-arglist-p, c-guess-basic-syntax)
+        (c-basic-matchers-before): Use it.
 
         (c-font-lock-objc-iip-decl): Removed.
 
@@ -2134,8 +2462,8 @@
         * progmodes/cc-styles.el (c-style-alist): Fixed several
         inconsistencies in the Whitesmith style.
 
-        * progmodes/cc-align.el (c-lineup-after-whitesmith-blocks): New
-        lineup function to get lines after Whitesmith style blocks
+        * progmodes/cc-align.el (c-lineup-after-whitesmith-blocks):
+        New lineup function to get lines after Whitesmith style blocks
         correctly indented.
 
         (c-lineup-whitesmith-in-block): Backed out the compensation for
@@ -2170,10 +2498,10 @@
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-awk.el: Change the terminology of regexps: A char
-        list is now
-        [asdf], a char class [:alpha:].  Include code for char classes.
-        Set c-awk-NL-prop on lines ending in open strings.  (Bug fix.)
-        Add character classes (e.g. "[:alpha:]") into AWK Mode's regexps.
+        list is now [asdf], a char class [:alpha:].  Include code for char
+        classes.  Set c-awk-NL-prop on lines ending in open strings.  (Bug
+        fix.)  Add character classes (e.g. "[:alpha:]") into AWK Mode's
+        regexps.
 
         Remove (nearly all of) the cruft associated with AWK Mode's former
         concept of "virtual semicolons":
@@ -2195,7 +2523,7 @@
         adapted for virtual semicolons.
 
         * progmodes/cc-engine.el:
-        (c-ws*-string-limit-regexp): new regexp.
+        (c-ws*-string-limit-regexp): New regexp.
         (c-forward-single-comment, c-backward-single-comment): Comment out
         the (now redundant) "special" AWK stuff.
 
@@ -2207,9 +2535,8 @@
 
         * progmodes/cc-fonts.el (c-font-lock-declarations): Always narrow
         to the fontified region so that fontification doesn't occur
-        outside it
-        (could happen e.g. when fontifying a line with an unfinished
-        declaration).
+        outside it (could happen e.g. when fontifying a line with an
+        unfinished declaration).
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
@@ -2322,7 +2649,7 @@
         initialised in c-setup-paragraph-variables, used in string
         scanning subroutines of c-beginning-of-statement.
 
-        * progmodes/cc-cmds.el (c-electric-brace): don't delete a comment
+        * progmodes/cc-cmds.el (c-electric-brace): Don't delete a comment
         which precedes the newly inserted `{'.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
@@ -2358,8 +2685,8 @@
         * progmodes/cc-engine.el (c-guess-basic-syntax): Simplified case
         16D - can't be a class-close at that point.
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax,
-        c-add-class-syntax): Don't narrow out the enclosing declaration
+        * progmodes/cc-engine.el (c-guess-basic-syntax)
+        (c-add-class-syntax): Don't narrow out the enclosing declaration
         level.  This makes everything a lot easier, and it was actually
         only four small places that needed it to work.  Some places that
         previously did `widen' are removed now, which has the effect that
@@ -2385,7 +2712,7 @@
 
         * progmodes/cc-langs.el (c-symbol-start): Include `@' in ObjC.
 
-        (c-decl-start-re): No no longer any need for special treatment of
+        (c-decl-start-re): No longer any need for special treatment of
         ObjC due to the above.
 
         (c-other-block-decl-kwds): Handle "extern" in ObjC too since it
@@ -2397,8 +2724,8 @@
 
         (c-opt-identifier-prefix-key): New internal language constant.
 
-        (c-opt-identifier-concat-key, c-opt-after-id-concat-key,
-        c-identifier-start, c-identifier-key): Now completely calculated
+        (c-opt-identifier-concat-key, c-opt-after-id-concat-key)
+        (c-identifier-start, c-identifier-key): Now completely calculated
         from other constants.
 
         (c-identifier-last-sym-match): Decommissioned since it's no longer
@@ -2415,10 +2742,10 @@
         * progmodes/cc-langs.el (c-filter-ops): New helper function to
         simplify access to `c-operators' and its likes.
 
-        (c-operator-list, c-all-op-syntax-tokens,
-        c-nonsymbol-token-regexp, c-<>-multichar-token-regexp,
-        c-<-op-cont-regexp, c->-op-cont-regexp, c-expr-kwds,
-        c-primary-expr-regexp, c-cast-parens): Use it.
+        (c-operator-list, c-all-op-syntax-tokens)
+        (c-nonsymbol-token-regexp, c-<>-multichar-token-regexp)
+        (c-<-op-cont-regexp, c->-op-cont-regexp, c-expr-kwds)
+        (c-primary-expr-regexp, c-cast-parens): Use it.
 
         * progmodes/cc-defs.el (c-lang-const): Fixes to allow use without
         an explicit language in functions.
@@ -2432,8 +2759,8 @@
         (c-type-decl-prefix-key): Removed some now unnecessary cruft from
         the Pike value.
 
-        * progmodes/cc-engine.el (c-on-identifier,
-        c-simple-skip-symbol-backward): Small fix for handling "-"
+        * progmodes/cc-engine.el (c-on-identifier)
+        (c-simple-skip-symbol-backward): Small fix for handling "-"
         correctly in `skip-chars-backward'.  Affected the operator lfun
         syntax in Pike.
 
@@ -2443,8 +2770,8 @@
         * progmodes/cc-langs.el (c-paren-nontype-kwds): The GCC keyword
         "__attribute__" is followed by a parenthesis.
 
-        (c-type-start-kwds, c-prefix-spec-kwds, c-prefix-spec-kwds-re,
-        c-specifier-key, c-not-decl-init-keywords): Some cleanup using new
+        (c-type-start-kwds, c-prefix-spec-kwds, c-prefix-spec-kwds-re)
+        (c-specifier-key, c-not-decl-init-keywords): Some cleanup using new
         language constants `c-type-start-kwds' and `c-prefix-spec-kwds'.
 
         * progmodes/cc-fonts.el, cc-langs.el, cc-engine.el: Internal
@@ -2455,12 +2782,12 @@
         declarations that can start anywhere.  Used for class declarations
         in Pike.
 
-        (c-specifier-key, c-not-decl-init-keywords,
-        c-decl-prefix-or-start-re, c-find-decl-prefix-search,
-        c-find-decl-spots): Implement `c-decl-start-kwds'.
+        (c-specifier-key, c-not-decl-init-keywords)
+        (c-decl-prefix-or-start-re, c-find-decl-prefix-search)
+        (c-find-decl-spots): Implement `c-decl-start-kwds'.
 
-        (c-other-decl-kwds, c-postfix-decl-spec-kwds, c-decl-hangon-kwds,
-        c-decl-hangon-key, c-forward-decl-or-cast-1): Separated the
+        (c-other-decl-kwds, c-postfix-decl-spec-kwds, c-decl-hangon-kwds)
+        (c-decl-hangon-key, c-forward-decl-or-cast-1): Separated the
         handling of the compiler specific extension keywords into a new
         language constant `c-decl-hangon-kwds' that defines keyword
         clauses to be ignored in declarations.
@@ -2470,10 +2797,10 @@
         Necessary to stop at the declared identifier in e.g. IDL valuetype
         declarations.
 
-        (c-typedef-decl-kwds, c-typeless-decl-kwds, c-type-list-kwds,
-        c-prefix-spec-kwds-re, c-postfix-spec-kwds,
-        c-after-suffixed-type-decl-key, c-opt-postfix-decl-spec-key,
-        c-forward-decl-or-cast-1): Recognize the declared identifier in
+        (c-typedef-decl-kwds, c-typeless-decl-kwds, c-type-list-kwds)
+        (c-prefix-spec-kwds-re, c-postfix-spec-kwds)
+        (c-after-suffixed-type-decl-key, c-opt-postfix-decl-spec-key)
+        (c-forward-decl-or-cast-1): Recognize the declared identifier in
         class and enum declarations as such and not as part of the type.
 
         (c-forward-decl-or-cast-1, c-forward-label): Relaxed the
@@ -2489,24 +2816,24 @@
         * progmodes/cc-engine.el (c-maybe-labelp): Provide no default
         value - this variable is always dynamically bound.
 
-        * progmodes/cc-engine.el, cc-fonts.el, cc-langs.el, cc-menus.el,
-        cc-mode.el, cc-styles.el, cc-vars.el, cc-align.el, cc-awk.el,
-        cc-cmds.el, cc-defs.el: Changed the policy for marking up
+        * progmodes/cc-engine.el, cc-fonts.el, cc-langs.el, cc-menus.el
+        * cc-mode.el, cc-styles.el, cc-vars.el, cc-align.el, cc-awk.el
+        * cc-cmds.el, cc-defs.el: Changed the policy for marking up
         functions that might do hidden buffer changes: All such internal
         functions are now marked instead of those that don't.
 
-        (c-beginning-of-macro, c-end-of-macro, c-(forward|backward)-comments,
-        c-(forward|backward)-single-comment, c-parse-state, c-on-identifier,
-        c-(fast-|slow-|)in-literal, c-literal-limits, c-collect-line-comments,
-        c-literal-type): Allow these functions to make hidden buffer changes,
+        (c-beginning-of-macro, c-end-of-macro, c-(forward|backward)-comments)
+        (c-(forward|backward)-single-comment, c-parse-state, c-on-identifier)
+        (c-(fast-|slow-|)in-literal, c-literal-limits, c-collect-line-comments)
+        (c-literal-type): Allow these functions to make hidden buffer changes,
         so that they are free to use text property caching later on.
 
-        (c-electric-backspace, c-electric-delete-forward, c-electric-pound,
-        c-electric-brace, c-electric-slash, c-electric-star,
-        c-electric-semi&comma, c-electric-colon, c-electric-lt-gt,
-        c-electric-paren, c-electric-continued-statement, c-indent-command,
-        c-indent-region, c-mask-paragraph, c-indent-new-comment-line,
-        c-context-line-break): Added `c-save-buffer-state' calls to comply
+        (c-electric-backspace, c-electric-delete-forward, c-electric-pound)
+        (c-electric-brace, c-electric-slash, c-electric-star)
+        (c-electric-semi&comma, c-electric-colon, c-electric-lt-gt)
+        (c-electric-paren, c-electric-continued-statement, c-indent-command)
+        (c-indent-region, c-mask-paragraph, c-indent-new-comment-line)
+        (c-context-line-break): Added `c-save-buffer-state' calls to comply
         with the changed semantics of the functions above.
 
         * progmodes/cc-engine.el (c-beginning-of-statement-1): Fixed a bug
@@ -2521,10 +2848,10 @@
         (completed statement) with `}' (statement completed by closing
         brace or semicolon) and `$' (statement completed by EOL).
 
-        (c-awk-virtual-semicolon-ends-prev-line-p,
-        c-awk-virtual-semicolon-ends-line-p,
-        c-awk-skip-semantic-ws-forward, c-awk-skip-semantic-ws-backward,
-        c-awk-at-statement-end-p): new functions
+        (c-awk-virtual-semicolon-ends-prev-line-p)
+        (c-awk-virtual-semicolon-ends-line-p)
+        (c-awk-skip-semantic-ws-forward, c-awk-skip-semantic-ws-backward)
+        (c-awk-at-statement-end-p): New functions.
 
         * progmodes/cc-cmds.el: Simplify the structure of functions
         c-forward-over-illiterals, c-back-over-illiterals.  Enhance these
@@ -2596,8 +2923,8 @@
         * progmodes/cc-align.el (c-lineup-arglist): Fixed bug when the
         first argument starts with a special brace list.
 
-        * progmodes/cc-engine.el, cc-fonts.el (c-forward-decl-or-cast-1,
-        c-font-lock-declarations): Broke out the declaration and cast
+        * progmodes/cc-engine.el, cc-fonts.el (c-forward-decl-or-cast-1)
+        (c-font-lock-declarations): Broke out the declaration and cast
         recognition from `c-font-lock-declarations' to a new function, so
         that it can be used in the indentation engine.
 
@@ -2606,16 +2933,16 @@
         wrong side of the search limit that could happen when the start
         position is inside a literal.
 
-        * progmodes/cc-engine.el (c-parse-state,
-        c-invalidate-state-cache): Modified the use of `c-state-cache-end'
+        * progmodes/cc-engine.el (c-parse-state)
+        (c-invalidate-state-cache): Modified the use of `c-state-cache-end'
         so that it's kept a little bit back to increase the hit rate.
 
         (c-parse-state): Changed the macro handling and fixed some
         glitches.  Macro context is checked more often than necessary now,
         but otoh less garbage conses are generated.
 
-        * progmodes/cc-engine.el (c-parse-state,
-        c-invalidate-state-cache): Cache the last position where
+        * progmodes/cc-engine.el (c-parse-state)
+        (c-invalidate-state-cache): Cache the last position where
         `c-state-cache' applies.  This can speed up refontification quite
         a bit in blocks where there are many non-brace parens before the
         point.
@@ -2640,8 +2967,8 @@
         * progmodes/cc-engine.el (c-add-stmt-syntax): Narrowed down the
         special case for "else if" clauses.
 
-        * progmodes/cc-engine.el (c-looking-at-inexpr-block,
-        c-add-stmt-syntax): Use `c-recognize-paren-inexpr-blocks'.
+        * progmodes/cc-engine.el (c-looking-at-inexpr-block)
+        (c-add-stmt-syntax): Use `c-recognize-paren-inexpr-blocks'.
 
         * progmodes/cc-langs.el (c-recognize-paren-inexpr-blocks): New
         language variable to recognize the gcc extension with statement
@@ -2658,8 +2985,8 @@
         `c-beginning-of-statement-1' instead of duplicating parts of it.
         This fixes bogus label recognition.
 
-        * progmodes/cc-engine.el (c-add-type, c-check-type,
-        c-forward-name, c-forward-type): Improved storage of template
+        * progmodes/cc-engine.el (c-add-type, c-check-type)
+        (c-forward-name, c-forward-type): Improved storage of template
         types in `c-found-types' so that they can be recognized better.
 
         (c-syntactic-content): Added option to skip past nested parens.
@@ -2672,8 +2999,8 @@
         (c-forward-type): Handle that `c-last-identifier-range' might be
         nil from `c-forward-name'.
 
-        * progmodes/cc-defs.el: (c-safe-scan-lists,
-        c-(go-)?(up|down)-list-(forward|backward)): Added limit arguments.
+        * progmodes/cc-defs.el (c-safe-scan-lists)
+        (c-(go-)?(up|down)-list-(forward|backward)): Added limit arguments.
 
         * progmodes/cc-defs.el (c-save-buffer-state): Use `unwind-protect'
         to work even if the form fails.
@@ -2705,20 +3032,20 @@
         * progmodes/cc-langs.el (c-unterminated-block-comment-regexp):
         Fixed a bug in the regexp that caused extreme backtracking.
 
-        * progmodes/cc-langs.el (c-block-comment-starter,
-        c-block-comment-ender): New language constants to specify in a
+        * progmodes/cc-langs.el (c-block-comment-starter)
+        (c-block-comment-ender): New language constants to specify in a
         single place how block comments look.
 
-        (c-comment-start-regexp, c-block-comment-start-regexp,
-        comment-start, comment-end, comment-start-skip,
-        c-syntactic-ws-start, c-syntactic-ws-end, c-nonwhite-syntactic-ws,
-        c-syntactic-ws, c-nonempty-syntactic-ws,
-        c-single-line-syntactic-ws, c-syntactic-eol): Now built from
+        (c-comment-start-regexp, c-block-comment-start-regexp)
+        (comment-start, comment-end, comment-start-skip)
+        (c-syntactic-ws-start, c-syntactic-ws-end, c-nonwhite-syntactic-ws)
+        (c-syntactic-ws, c-nonempty-syntactic-ws)
+        (c-single-line-syntactic-ws, c-syntactic-eol): Now built from
         `c-line-comment-starter', `c-block-comment-starter' and
         `c-block-comment-ender'.
 
-        (c-block-comment-regexp, c-unterminated-block-comment-regexp): New
-        language constants to break up things a bit.
+        (c-block-comment-regexp, c-unterminated-block-comment-regexp):
+        New language constants to break up things a bit.
 
         (c-simple-ws): New language constant for simple whitespace.
 
@@ -2910,14 +3237,13 @@
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-defs.el, cc-engine.el (c-mode-is-new-awk-p):
-        Removed;
-        (c-major-mode-is 'awk-mode) can be used instead now.
+        Removed; (c-major-mode-is 'awk-mode) can be used instead now.
 
         * progmodes/cc-mode.el: Always set up AWK mode since emacsen where
         it doesn't work no longer are supported.
 
-        * progmodes/cc-mode.el, cc-styles.el, cc-vars.el, cc-defs.el,
-        cc-engine.el, cc-fonts.el, cc-langs.el, cc-cmds.el: CC Mode now
+        * progmodes/cc-mode.el, cc-styles.el, cc-vars.el, cc-defs.el
+        * cc-engine.el, cc-fonts.el, cc-langs.el, cc-cmds.el: CC Mode now
         requires support for the syntax-table' text property, which rules
         out Emacs 19 and XEmacs < 21.4.  Removed various compatibility
         cruft associated with those versions.
@@ -2934,9 +3260,9 @@
         variable and use an extra quoted face name instead.  All the
         emacsen flavors handle that correctly.
 
-        * progmodes/cc-fonts.el (c-font-lock-complex-decl-prepare,
-        c-font-lock-declarators, c-font-lock-declarations,
-        c-complex-decl-matchers, c-basic-matchers-after): Use a text
+        * progmodes/cc-fonts.el (c-font-lock-complex-decl-prepare)
+        (c-font-lock-declarators, c-font-lock-declarations)
+        (c-complex-decl-matchers, c-basic-matchers-after): Use a text
         property to mark the items in in declarator lists to handle
         refontification inside multiline declarations better.
 
@@ -3000,7 +3326,7 @@
 
 2005-12-07  Bill Wohler  <wohler@newt.com>
 
-        * files.el (auto-mode-alist): Remove mh-letter-mode. Unnecessary,
+        * files.el (auto-mode-alist): Remove mh-letter-mode.  Unnecessary,
         and causes problems with non-MH users (such as Gnus users).
 
 2005-12-08  Nick Roberts  <nickrob@snap.net.nz>
@@ -3017,12 +3343,12 @@
 
 2005-12-07  Kim F. Storm  <storm@cua.dk>
 
-        * ido.el (ido-completion-map): Renamed from ido-mode-map.
+        * ido.el (ido-completion-map): Rename from ido-mode-map.
         (ido-common-completion-map, ido-file-completion-map)
         (ido-file-dir-completion-map, ido-buffer-completion-map):
-        Renamed from ido-mode-....-map.
-        (ido-init-completion-maps): Renamed from ido-init-mode-maps.
-        (ido-setup-completion-map): Renamed from ido-define-mode-map.
+        Rename from ido-mode-....-map.
+        (ido-init-completion-maps): Rename from ido-init-mode-maps.
+        (ido-setup-completion-map): Rename from ido-define-mode-map.
         (ido-read-internal): Bind minibuffer-local-filename-completion-map
         to ido-completion-map.
 
@@ -3076,7 +3402,7 @@
 
         * progmodes/cc-defs.el (c-emacs-features): Don't assume point-min==1.
 
-2005-12-06  Nozomu Ando <nand@mac.com>  (tiny patch)
+2005-12-06  Nozomu Ando  <nand@mac.com>  (tiny patch)
 
         * mail/smtpmail.el (smtpmail-try-auth-methods): Make password
         prompts work for AUTH PLAIN.  Also reported by Steve Allan
@@ -3115,7 +3441,7 @@
         (org-agenda-get-deadlines, org-agenda-get-scheduled)
         (org-agenda-get-blocks): Use `org-get-category'.
         (org-context-in-file-links): Rename from
-        `org-line-numbers-in-file-links' .
+        `org-line-numbers-in-file-links'.
 
 2005-12-06  Romain Francoise  <romain@orebokech.com>
 
@@ -3259,7 +3585,7 @@
 
 2005-12-02  Ken Manheimer  <ken.manheimer@gmail.com>
 
-        * allout.el:(eval-when-compile): Remove unnecessary load of cl.
+        * allout.el (eval-when-compile): Remove unnecessary load of cl.
         Add fset of allout-real-isearch-abort during compile to fix
         byte-compilation warnings.
         (allout-mode-p): Move definition of this macro above all uses, or
@@ -3669,8 +3995,8 @@
 
         (hi-lock-face-phrase-buffer): Call hi-lock-buffer-mode.  Use new
         arguments for hi-lock-set-pattern.
-        (hi-lock-unface-buffer, hi-lock-set-file-patterns): Call
-        font-lock-fontify-buffer.
+        (hi-lock-unface-buffer, hi-lock-set-file-patterns):
+        Call font-lock-fontify-buffer.
         (hi-lock-find-file-hook, hi-lock-current-line)
         (hi-lock-refontify, hi-lock-set-patterns): Delete unused functions.
 
@@ -3699,8 +4025,8 @@
         (org-plain-list-ordered-item-terminator): New options.
         (org-at-item-p, org-beginning-of-item, org-end-of-item)
         (org-get-indentation, org-get-string-indentation)
-        (org-maybe-renumber-ordered-list, org-renumber-ordered-list): New
-        functions.
+        (org-maybe-renumber-ordered-list, org-renumber-ordered-list):
+        New functions.
         (org-move-item-down, org-move-item-up): New commands.
         (org-export-as-html): New classes for CSS support.  Bug fix in
         regular expression detecting fixed-width regions.  Respect
@@ -3884,7 +4210,7 @@
         * man.el (Man-highlight-references): Doc fix.  Reformat code in a
         more Lisp-ish way.
 
-2005-11-19  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se> (tiny change)
+2005-11-19  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>  (tiny change)
 
         * ls-lisp.el (ls-lisp-format-file-size): Format file size with 9
         digits, not 8, to avoid misalignment for files larger than 100MB.
@@ -3914,15 +4240,15 @@
         (org-export-icalendar): Use `org-icalendar-combined-name'.
         (org-cycle-agenda-files, org-agenda-file-to-end)
         (org-agenda-file-to-front): New commands.
-        (org-table-tab-jumps-over-hlines,org-export-html-style): New
-        options.
+        (org-table-tab-jumps-over-hlines, org-export-html-style):
+        New options.
         (org-table-next-field): Use `org-table-tab-jumps-over-hlines'.
-        (org-at-table.el-p, org-set-autofill-regexps,org-html-protect):
+        (org-at-table.el-p, org-set-autofill-regexps, org-html-protect):
         New functions.
         (org-fill-paragraph): Call `org-table-align' in tables.
         (org-mode): Call `org-set-autofill-regexps'.
         (org-export-as-html): Support for local handformatted lists.
-        Modified to produce valid HTML 4.0. Use `org-export-html-style'.
+        Modified to produce valid HTML 4.0.  Use `org-export-html-style'.
         (org-export-local-list-max-depth): New option.
         (org-html-expand): Use `org-html-protect'.
 
@@ -4370,9 +4696,9 @@
         (apropos-variable): Doc fix.  Use apropos-read-pattern.
         (apropos-command): Doc fix.  Use apropos-read-pattern and
         apropos-parse-pattern.  Call apropos-print with nosubst=t.
-        (apropos, apropos-value): Doc fix. Use apropos-read-pattern and
+        (apropos, apropos-value): Doc fix.  Use apropos-read-pattern and
         apropos-parse-pattern.
-        (apropos-documentation): Doc fix. Use apropos-read-pattern and
+        (apropos-documentation): Doc fix.  Use apropos-read-pattern and
         apropos-parse-pattern.  Locally bind apropos-sort-by-scores to
         apropos-documentation-sort-by-scores.  Call apropos-print with
         nosubst=t.
@@ -4440,7 +4766,7 @@
 2005-11-10  Masatake YAMATO  <jet@gyve.org>
 
         * add-log.el (add-log-current-defun): Handle class::method
-        notation of c++. Fix incorrect comment.
+        notation of c++.  Fix incorrect comment.
 
 2005-11-10  Alan Mackenzie  <acm@muc.de>
 
@@ -4574,7 +4900,7 @@
 
         * replace.el (occur-engine): Add marker at end of line, too.
 
-2005-11-04 Ken Manheimer  <ken.manheimer@gmail.com>
+2005-11-04  Ken Manheimer  <ken.manheimer@gmail.com>
 
         * pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
         (pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
@@ -4599,7 +4925,7 @@
         * font-lock.el: Don't deal with font-lock-face-attributes here,
         move the code ...
 
-        * startup.el (command-line): ... here. Use face-spec-set instead
+        * startup.el (command-line): ... here.  Use face-spec-set instead
         of custom-declare-face.
 
         * faces.el (face-spec-set): Reset the face if spec is not nil.
@@ -4616,7 +4942,7 @@
 
 2005-11-04  Ulf Jasper  <ulf.jasper@web.de>
 
-        * newsticker.el: Commentary updated. Code formatting changed.
+        * newsticker.el: Commentary updated.  Code formatting changed.
         (newsticker-version): Change to "1.9".
         (newsticker, newsticker-feed): Doc fix.
         (newsticker-url-list): Doc fix.  Add option "Weekly".
@@ -4636,7 +4962,7 @@
         (newsticker-mode): Doc fix.
         (newsticker-mode): Change mode-line-format.
         (newsticker-start): Remove debug output.
-        (newsticker-start-ticker): Doc fix.  Add Autoload cookie.
+        (newsticker-start-ticker): Doc fix.  Add autoload cookie.
         (newsticker-w3m-show-inline-images): Code formatting.
         (newsticker-next-item): Call `force-mode-line-update'.
         (newsticker-previous-item): Call `force-mode-line-update'.
@@ -4789,8 +5115,8 @@
 2005-11-04  Henrik Enberg  <henrik.enberg@telia.com>
 
         (rcirc-browse-url-map, rcirc-browse-url-at-point)
-        (rcirc-browse-url-at-mouse, rcirc-mangle-text): Make urls
-        mouse and RET clickable.
+        (rcirc-browse-url-at-mouse, rcirc-mangle-text):
+        Make urls mouse and RET clickable.
 
 2005-11-04  Henrik Enberg  <henrik.enberg@telia.com>
 
@@ -4941,7 +5267,7 @@
         * progmodes/fortran.el (fortran-blink-match):
         Use `blink-matching-delay'.
 
-2005-11-02  John Mongan <jmongan@mccammon.ucsd.edu>  (tiny change)
+2005-11-02  John Mongan  <jmongan@mccammon.ucsd.edu>  (tiny change)
 
         * progmodes/f90.el (f90-match-end): Use `blink-matching-delay'.
 
@@ -4981,7 +5307,7 @@
         * vc-sccs.el: Update copyright year.
         * ezimage.el: Likewise.
 
-2005-11-01  KOBAYASHI Yasuhiro <kobayays@otsukakj.co.jp>  (tiny change)
+2005-11-01  KOBAYASHI Yasuhiro  <kobayays@otsukakj.co.jp>  (tiny change)
 
         * info.el (Info-fontify-node): Use `string-width' for fontifying
         underlined titles.
@@ -5212,7 +5538,7 @@
         * pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
         (pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
         (pgg-decrypt, pgg-sign-region, pgg-sign): Add optional
-        'passphrase' argument, so the passphrase can be managed externally
+        `passphrase' argument, so the passphrase can be managed externally
         and then passed in to the system.
 
         * pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache)
@@ -5228,7 +5554,7 @@
         externally and passed in to the system.
 
         * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional
-        'notruncate' argument, so the passphrase cache can be used
+        `notruncate' argument, so the passphrase cache can be used
         reliably with identifiers besides a pgp packet's key id.
 
 2005-10-29  Sascha Wilde  <swilde@sha-bang.de>
@@ -5295,12 +5621,12 @@
         (pgg-decrypt): Convey provided passphrase in subordinate call to
         pgg-decrypt-region.
 
-2005-10-20  Ken Manheimer <ken.manheimer+emacs@gmail.com>
+2005-10-20  Ken Manheimer  <ken.manheimer+emacs@gmail.com>
 
         * pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
         (pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
         (pgg-decrypt, pgg-sign-region, pgg-sign): Add optional
-        'passphrase' argument, so the passphrase can be managed externally
+        `passphrase' argument, so the passphrase can be managed externally
         and then passed in to the system.
 
         * pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache)
@@ -5316,7 +5642,7 @@
         externally and passed in to the system.
 
         * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional
-        'notruncate' argument, so the passphrase cache can be used
+        `notruncate' argument, so the passphrase cache can be used
         reliably with identifiers besides a pgp packet's key id.
 
 2005-10-29  Sascha Wilde  <swilde@sha-bang.de>
@@ -5333,7 +5659,7 @@
 
 2005-10-28  Bill Wohler  <wohler@newt.com>
 
-        * help-mode.el (help-url): New button type. Calls browse-url.
+        * help-mode.el (help-url): New button type.  Calls browse-url.
         (help-xref-url-regexp): New regexp to recognize URLs in docstring.
         Similar to Info nodes: URL `url'.
         (help-make-xrefs): Create help-url buttons for
@@ -5392,7 +5718,7 @@
         * calc/calc-arith.el (calc-mul-symb-fancy): Add checks for
         multiplication by an identity matrix; don't turn multiplication by
         an inverse matrix into division.
-        (math-div-symbol-fancy):  Replace division by matrices with
+        (math-div-symbol-fancy): Replace division by matrices with
         multiplication by inverse.
 
         * calc/calc-misc.el (calcFunc-inv): Check for symbolic matrices.
@@ -5525,7 +5851,7 @@
         * progmodes/gdb-ui.el (gdb-ann3): Bind mouse-3 in left fringe
         to gdb-mouse-toggle-breakpoint-fringe.
         (gdb-mouse-toggle-breakpoint-margin): Rename from
-        gdb-mouse-toggle-breakpoint. Fix doc.
+        gdb-mouse-toggle-breakpoint.  Fix doc.
         (gdb-mouse-toggle-breakpoint-fringe): New defun.
         (gdb-put-string): Add optional SPROPS arg.  Add props to string.
         (gdb-put-breakpoint-icon): Add gdb-bptno and gdb-enabled
@@ -5769,7 +6095,7 @@
         (outlineify-sticky, outlinify-sticky): Add autoload cookie.
         (my-mark-marker): Use `(featurep 'xemacs)'.
 
-2005-10-23  Lars Hansen <larsh@soem.dk>
+2005-10-23  Lars Hansen  <larsh@soem.dk>
 
         * emacs-lisp/bytecomp.el (byte-compile-lambda): New arg add-lambda.
         (byte-compile-file-form-defmumble, byte-compile-defun)
@@ -6057,7 +6383,7 @@
 
         * calc/calc-units.el (math-standard-units): Add units, adjust
         symbols and update values.
-        (math-unit-prefixes):  Add more prefixes.
+        (math-unit-prefixes): Add more prefixes.
 
 2005-10-19  Romain Francoise  <romain@orebokech.com>
 
@@ -6136,12 +6462,12 @@
         lisp/toolbar/tool-bar to lisp and "delete" lisp/toolbar.  Place
         the low resolution images in their own directory (low-color).
 
-        * toolbar/attach.*, toolbar/cancel.*, toolbar/close.*,
-        * toolbar/copy.*, toolbar/cut.*, toolbar/diropen.*, toolbar/exit.*:
-        * toolbar/help.*, toolbar/home.*, toolbar/index.*, toolbar/info.*:
-        * toolbar/mail.*, toolbar/new.*, toolbar/open.*, toolbar/paste.*:
-        * toolbar/preferences.*, toolbar/print.*, toolbar/save.*:
-        * toolbar/saveas.*, toolbar/search.*, toolbar/search-replace.*:
+        * toolbar/attach.*, toolbar/cancel.*, toolbar/close.*
+        * toolbar/copy.*, toolbar/cut.*, toolbar/diropen.*, toolbar/exit.*
+        * toolbar/help.*, toolbar/home.*, toolbar/index.*, toolbar/info.*
+        * toolbar/mail.*, toolbar/new.*, toolbar/open.*, toolbar/paste.*
+        * toolbar/preferences.*, toolbar/print.*, toolbar/save.*
+        * toolbar/saveas.*, toolbar/search.*, toolbar/search-replace.*
         * toolbar/spell.*, toolbar/undo.*: Move to etc/images.
 
         * toolbar/lc-copy.*: Move to etc/images/low-color/copy.*.
@@ -6241,7 +6567,7 @@
 
         * diff-mode.el (diff-mode): Doc fix.
 
-2005-10-16  David Reitter <david.reitter@gmail.com>
+2005-10-16  David Reitter  <david.reitter@gmail.com>
 
         * mail/sendmail.el (send-mail-function): Use mailclient-send-it
         as default on darwin and windows systems.
@@ -6433,8 +6759,8 @@
 
 2005-10-12  Bill Wohler  <wohler@newt.com>
 
-        * makefile.w32-in (MH-E-SRC): New. Used by mh-autoloads.
-        (mh-autoloads): New. Builds mh-e/mh-loaddefs.el. Rebuilds if any
+        * makefile.w32-in (MH-E-SRC): New.  Used by mh-autoloads.
+        (mh-autoloads): New.  Builds mh-e/mh-loaddefs.el.  Rebuilds if any
         files in MH-E-SRC have been updated.
         (updates, compile, recompile, bootstrap): Depend on mh-autoloads.
 
@@ -7073,7 +7399,7 @@
 
         * toolbar/rescan.*: Move and rename to etc/images/refresh.*.
 
-2005-09-30  Eric M. Ludlam <zappo@gnu.org>
+2005-09-30  Eric M. Ludlam  <zappo@gnu.org>
 
         * speedbar.el: New version 1.0pre3.
 
@@ -7275,7 +7601,7 @@
         color rxvt terminals by using the code xterm.el used to use before
         2005-04-09 in order to match the colors used by rxvt.
 
-2005-09-24  Emanuele Giaquinta <emanuele.giaquinta@gmail.com>  (tiny change)
+2005-09-24  Emanuele Giaquinta  <emanuele.giaquinta@gmail.com>  (tiny change)
 
         * term/rxvt.el (rxvt-register-default-colors): Add support for 88
         colors rxvt-unicode terminals by using the same code as xterm.el.
@@ -8058,7 +8384,7 @@
 2005-09-02  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * term/xterm.el (terminal-init-xterm): Add eval-when-compile to
-        fix compilation warning. Reorder the key definitions to group
+        fix compilation warning.  Reorder the key definitions to group
         together keys emitted by the current version of xterm.
 
         * progmodes/vhdl-mode.el (vhdl-highlight-faces)
@@ -8140,7 +8466,7 @@
         (vhdl-get-visible-signals): Fix signal name searching.
         (vhdl-port-flatten, vhdl-port-reverse-direction): Better message.
         (vhdl-fixup-whitespace-region): Fix for character
-        literals (e.g. ':').
+        literals (e.g. `:').
 
 2005-08-31  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -8933,7 +9259,7 @@
 2005-08-10  Lars Hansen  <larsh@soem.dk>
 
         * desktop.el (desktop-buffer-mode-handlers):
-        Make non-customizable. Add autoload cookie.  Change initial value to
+        Make non-customizable.  Add autoload cookie.  Change initial value to
         nil; add elements in respective modules instead.  Fix doc string.
         (desktop-load-file): New function.
         (desktop-minor-mode-handlers): New autoloaded variable.
@@ -8949,7 +9275,7 @@
         indicate-buffer-boundaries, indicate-empty-lines and
         show-trailing-whitespace.
         (desktop-clear): Allow desktop-clear-preserve-buffers to contain
-        regexps. Don't use desktop-clear-preserve-buffers-regexp.
+        regexps.  Don't use desktop-clear-preserve-buffers-regexp.
         (desktop-clear-preserve-buffers-regexp): Delete.
         (desktop-clear-preserve-buffers): Update initial value and docstring.
         (desktop-save-buffer): Fix doc string.
@@ -9575,7 +9901,7 @@
         not `bookmark-exit-hooks'.  Fix docstring.
         (bookmark-bmenu-select): "?\ " -> "?\s".
 
-2005-07-25  Ari Roponen <arjuropo@cc.jyu.fi>  (tiny change)
+2005-07-25  Ari Roponen  <arjuropo@cc.jyu.fi>  (tiny change)
 
         * startup.el (command-line): Fix typo.
 
@@ -9624,7 +9950,7 @@
         (xterm-rxvt-set-background-mode): Remove, not used anymore.
 
         * term/rxvt.el (function-key-map): Use substitute-key-definition
-        to bind {C,S,C-S}-{f1-f10}. Add a few missing key bindings.
+        to bind {C,S,C-S}-{f1-f10}.  Add a few missing key bindings.
 
         * term/cygwin.el: New file.
 
@@ -10338,7 +10664,7 @@
         (mac-services-mail-to): New functions.
         (mac-application-menu-map): Bind them.
 
-2005-07-12  wulei <milton@wulei.net>  (tiny change)
+2005-07-12  wulei  <milton@wulei.net>  (tiny change)
 
         * progmodes/gdb-ui.el: Add note about buffering with Windows.
 
@@ -12611,7 +12937,7 @@
 
         * textmodes/ispell.el (ispell-check-version):
         Use match-string-no-properties.
-        (ispell-region, ispell-buffer-local-parsing, ispell-buffer-local-dict)
+        (ispell-region, ispell-buffer-local-parsing, ispell-buffer-local-dict)
         (ispell-buffer-local-words): Likewise.
 
         * progmodes/make-mode.el (makefile-shell-face): Make this a no-op
@@ -14811,12 +15137,12 @@
         with mode-require-final-newline.
         (mode-require-final-newline): Doc fix.
 
-2005-05-01  Stefan Monnier <monnier@iro.umontreal.ca>
+2005-05-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * international/latexenc.el (latexenc-find-file-coding-system):
         Fix regular expressions.
 
-2005-05-01  David Kastrup <dak@gnu.org>
+2005-05-01  David Kastrup  <dak@gnu.org>
 
         * international/latexenc.el (latexenc-find-file-coding-system):
         Fix regular expressions.
@@ -14883,7 +15209,7 @@
         (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-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.
@@ -15494,7 +15820,7 @@
         (org-mode): Insert first line "*-* mode: org-mode -*-" when called
         interactively in empty file and option
         `org-insert-mode-line-in-empty-file' has been set.
-        (org-agenda-todo,org-agenda-priority): Modify to use
+        (org-agenda-todo, org-agenda-priority): Modify to use
         `org-agenda-change-all-lines'.
         (org-warning-face): Change color on dark background
 
@@ -16641,16 +16967,16 @@
 
 2005-03-25  Werner Lemberg  <wl@gnu.org>
 
-        * calc/calc-forms.el, calc/calc-sel.el:
-        * midnight.el, vc-cvs.el:
-        * emacs-lisp/cl-macs.el:
-        * emulation/vip.el:
-        * eshell/esh-io.el, eshell/esh-var.el:
-        * mail/supercite.el:
+        * calc/calc-forms.el, calc/calc-sel.el
+        * midnight.el, vc-cvs.el
+        * emacs-lisp/cl-macs.el
+        * emulation/vip.el
+        * eshell/esh-io.el, eshell/esh-var.el
+        * mail/supercite.el
         * progmodes/ebnf-abn.el, progmodes/ebnf-bnf.el
         * progmodes/ebnf-ebx.el, progmodes/ebnf-dtd.el, progmodes/ebnf-iso.el
         * progmodes/ebnf-yac.el, progmodes/ebnf2ps.el, progmodes/idlwave.el
-        * progmodes/sh-script.el, progmodes/xscheme.el:
+        * progmodes/sh-script.el, progmodes/xscheme.el
         * textmodes/refbib.el, textmodes/refer.el, textmodes/reftex-cite.el
         * textmodes/reftex-index.el, textmodes/reftex-parse.el
         * textmodes/reftex-ref.el, textmodes/reftex-vars.el
@@ -16767,7 +17093,7 @@
 
 2005-03-23  David Ponce  <david@dponce.com>
 
-        * recentf.el: (recentf-keep): New option.
+        * recentf.el (recentf-keep): New option.
         (recentf-menu-action): Default to `find-file'.
         (recentf-keep-non-readable-files-flag)
         (recentf-keep-non-readable-files-p)
@@ -17966,9 +18292,9 @@
 2005-02-19  Michael Kifer  <kifer@cs.stonybrook.edu>
 
         * ediff.el (ediff-set-diff-overlays-in-one-buffer)
-        (ediff-set-fine-overlays-in-one-buffer,ediff-goto-word): Make sure
+        (ediff-set-fine-overlays-in-one-buffer, ediff-goto-word): Make sure
         we use the syntax table of the correct buffer.
-        (ediff-same-file-contents,ediff-same-contents): Enhancements thanks to
+        (ediff-same-file-contents, ediff-same-contents): Enhancements thanks to
         Felix Gatzemeier.
 
         * ediff-init.el (ediff-hide-face): Check for definedness of functions.
@@ -18842,7 +19168,7 @@
         (rmail-movemail-variant-in-use): New variables.
         (rmail-remote-password, rmail-remote-password-required):
         New customization variables.
-        (rmail-probe,rmail-autodetect, rmail-movemail-variant-p): New funs.
+        (rmail-probe, rmail-autodetect, rmail-movemail-variant-p): New funs.
         (rmail-parse-url): New function.
         (rmail-get-new-mail, rmail-insert-inbox-text): Update for use
         with GNU mailutils movemail.
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index 51cda269238..395ba326ce3 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -19133,6 +19133,10 @@
 
         * menu-bar.el (menu-bar-showhide-menu): Rename functions for toggling.
 
+2002-02-10  Stephen J. Turnbull  <stephen@xemacs.org>
+
+        * ediff-init.el (ediff-has-gutter-support): What was this?
+
 2002-02-10  Michael Kifer  <kifer@cs.stonybrook.edu>
 
         * viper-util.el (viper-read-key-sequence): Fix so it'll read
@@ -19142,8 +19146,6 @@
         * viper.el (describe-key, describe-key-briefly): Get rid of
         viper-events-to-keys.
 
-        * ediff-init.el (ediff-has-gutter-support): Steven Turnbull's patch.
-
         * ediff-wind.el (ediff-setup-control-frame):
         Use ediff-has-gutter-support.
 
diff --git a/lisp/battery.el b/lisp/battery.el
index 710be5a4220..54a0e207ffc 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -271,6 +271,8 @@ The following %-sequences are provided:
 %h Remaining time in hours
 %t Remaining time in the form `h:min'"
   (let ((design-capacity 0)
+        (last-full-capacity 0)
+        full-capacity
         (warn 0)
         (low 0)
         capacity rate rate-type charging-state minutes hours)
@@ -310,18 +312,25 @@ The following %-sequences are provided:
           (when (re-search-forward "design capacity: +\\([0-9]+\\) m[AW]h$"
                                    nil t)
             (incf design-capacity (string-to-number (match-string 1))))
+          (when (re-search-forward "last full capacity: +\\([0-9]+\\) m[AW]h$"
+                                   nil t)
+            (incf last-full-capacity (string-to-number (match-string 1))))
           (when (re-search-forward
                  "design capacity warning: +\\([0-9]+\\) m[AW]h$" nil t)
             (incf warn (string-to-number (match-string 1))))
           (when (re-search-forward "design capacity low: +\\([0-9]+\\) m[AW]h$"
                                    nil t)
             (incf low (string-to-number (match-string 1)))))))
+    (setq full-capacity (if (> last-full-capacity 0)
+                            last-full-capacity design-capacity))
     (and capacity rate
          (setq minutes (if (zerop rate) 0
                          (floor (* (/ (float (if (string= charging-state
                                                           "charging")
-                                                 (- design-capacity capacity)
-                                               capacity)) rate) 60)))
+                                                 (- full-capacity capacity)
+                                               capacity))
+                                      rate)
+                                   60)))
                hours (/ minutes 60)))
     (list (cons ?c (or (and capacity (number-to-string capacity)) "N/A"))
           (cons ?L (or (when (file-exists-p "/proc/acpi/ac_adapter/AC/state")
@@ -368,10 +377,10 @@ The following %-sequences are provided:
           (cons ?t (or (and minutes
                             (format "%d:%02d" hours (- minutes (* 60 hours))))
                        "N/A"))
-          (cons ?p (or (and design-capacity capacity
+          (cons ?p (or (and full-capacity capacity
                             (number-to-string
                              (floor (/ capacity
-                                       (/ (float design-capacity) 100)))))
+                                       (/ (float full-capacity) 100)))))
                        "N/A")))))
 
 
diff --git a/lisp/calc/calc-arith.el b/lisp/calc/calc-arith.el
index dc341cb7aec..64e0b4b7d10 100644
--- a/lisp/calc/calc-arith.el
+++ b/lisp/calc/calc-arith.el
@@ -1201,7 +1201,7 @@
                (and (math-known-scalarp b)
                     (math-add (nth 1 a) b))))
       (and (eq (car-safe b) 'calcFunc-idn)
-           (= (length a) 2)
+           (= (length b) 2)
            (or (and (math-square-matrixp a)
                     (math-add a (math-mimic-ident (nth 1 b) a)))
                (and (math-known-scalarp a)
diff --git a/lisp/calc/calcalg2.el b/lisp/calc/calcalg2.el
index c0fa5310bf4..849ec42c5f6 100644
--- a/lisp/calc/calcalg2.el
+++ b/lisp/calc/calcalg2.el
@@ -2012,7 +2012,7 @@
                       n (1+ n)
                       t1 (cdr t1)))
               (setq n (math-build-polynomial-expr poly high))
-              (if (memq low '(0 1))
+              (if (= low 1)
                   n
                 (math-sub n (math-build-polynomial-expr poly
                                                         (math-sub low 1))))))
diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index 0f8e7295d32..c377bcc8735 100644
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -1,6 +1,6 @@
 ;;; cal-menu.el --- calendar functions for menu bar and popup menu support
 
-;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
@@ -42,7 +42,9 @@
 (defvar displayed-month)
 (defvar displayed-year)
 
-(eval-when-compile (require 'calendar))
+;; Don't require calendar because calendar requires us.
+;; (eval-when-compile (require 'calendar))
+(defvar calendar-mode-map)
 
 (define-key calendar-mode-map [menu-bar edit] 'undefined)
 (define-key calendar-mode-map [menu-bar search] 'undefined)
@@ -211,14 +213,14 @@ not available."
   (condition-case nil
       (if (eq major-mode 'calendar-mode)
           (let ((l))
-            (calendar-for-loop;; Show 11 years--5 before, 5 after year of
-                   ;; middle month
-             i from (- displayed-year 5) to (+ displayed-year 5) do
-             (setq l (cons (vector (format "For Year %s" i)
-                                   (list (list 'lambda 'nil '(interactive)
-                                               (list 'list-holidays i i)))
-                                   t)
-                           l)))
+            ;; Show 11 years--5 before, 5 after year of middle month
+            (dotimes (i 11)
+              (let ((y (+ displayed-year -5 i)))
+                (push (vector (format "For Year %s" y)
+                              (list (list 'lambda 'nil '(interactive)
+                                          (list 'list-holidays y y)))
+                              t)
+                      l)))
             (setq l (cons ["Mark Holidays" mark-calendar-holidays t]
                           (cons ["Unmark Calendar" calendar-unmark t]
                                 (cons "--" l))))
@@ -231,22 +233,18 @@ not available."
                            (calendar-date-string (calendar-current-date) t t))
                   . cal-menu-today-holidays))
             (let ((title
-                   (let ((m1 displayed-month)
-                         (y1 displayed-year)
-                         (m2 displayed-month)
-                         (y2 displayed-year))
-                     (increment-calendar-month m1 y1 -1)
-                     (increment-calendar-month m2 y2 1)
-                     (if (= y1 y2)
+                   (let ((my1 (calendar-increment-month -1))
+                         (my2 (calendar-increment-month 1)))
+                     (if (= (cdr my1) (cdr my2))
                          (format "%s-%s, %d"
-                                 (calendar-month-name m1 'abbrev)
-                                 (calendar-month-name m2 'abbrev)
-                                 y2)
+                                 (calendar-month-name (car my1) 'abbrev)
+                                 (calendar-month-name (car my2) 'abbrev)
+                                 (cdr my2))
                        (format "%s, %d-%s, %d"
-                               (calendar-month-name m1 'abbrev)
-                               y1
-                               (calendar-month-name m2 'abbrev)
-                               y2)))))
+                               (calendar-month-name (car my1) 'abbrev)
+                               (cdr my1)
+                               (calendar-month-name (car my2) 'abbrev)
+                               (cdr my2))))))
               (define-key  calendar-mode-map [menu-bar Holidays 3-month]
                 `(,(format "For Window (%s)" title)
                   . list-calendar-holidays)))
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 1ef8d048c88..f01f4305708 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1,7 +1,7 @@
 ;;; calendar.el --- calendar functions
 
 ;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997,
-;;   2000, 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
@@ -98,11 +98,10 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (defvar displayed-month)
-  (defvar displayed-year)
-  (defvar calendar-month-name-array)
-  (defvar calendar-starred-day))
+(defvar displayed-month)
+(defvar displayed-year)
+(defvar calendar-month-name-array)
+(defvar calendar-starred-day)
 
 (defun calendar-version ()
   (interactive)
@@ -146,7 +145,7 @@
 
 ;;;###autoload
 (defcustom calendar-offset 0
-  "*The offset of the principal month from the center of the calendar window.
+  "The offset of the principal month from the center of the calendar window.
 0 means the principal month is in the center (default), -1 means on the left,
 +1 means on the right.  Larger (or smaller) values push the principal month off
 the screen."
@@ -155,7 +154,7 @@ the screen."
 
 ;;;###autoload
 (defcustom view-diary-entries-initially nil
-  "*Non-nil means display current date's diary entries on entry to calendar.
+  "Non-nil means display current date's diary entries on entry to calendar.
 The diary is displayed in another window when the calendar is first displayed,
 if the current date is visible.  The number of days of diary entries displayed
 is governed by the variable `number-of-diary-entries'.  This variable can
@@ -165,14 +164,14 @@ be overridden by the value of `calendar-setup'."
 
 ;;;###autoload
 (defcustom mark-diary-entries-in-calendar nil
-  "*Non-nil means mark dates with diary entries, in the calendar window.
+  "Non-nil means mark dates with diary entries, in the calendar window.
 The marking symbol is specified by the variable `diary-entry-marker'."
   :type 'boolean
   :group 'diary)
 
 ;;;###autoload
 (defcustom calendar-remove-frame-by-deleting nil
-  "*Determine how the calendar mode removes a frame no longer needed.
+  "Determine how the calendar mode removes a frame no longer needed.
 If nil, make an icon of the frame.  If non-nil, delete the frame."
   :type 'boolean
   :group 'view)
@@ -224,7 +223,7 @@ If nil, make an icon of the frame.  If non-nil, delete the frame."
   (if (not (display-color-p))
       "+"
     'diary)
-  "*How to mark dates that have diary entries.
+  "How to mark dates that have diary entries.
 The value can be either a single-character string or a face."
   :type '(choice string face)
   :group 'diary)
@@ -233,7 +232,7 @@ The value can be either a single-character string or a face."
   (if (not (display-color-p))
       "="
     'calendar-today)
-  "*How to mark today's date in the calendar.
+  "How to mark today's date in the calendar.
 The value can be either a single-character string or a face.
 Marking today's date is done only if you set up `today-visible-calendar-hook'
 to request that."
@@ -244,14 +243,14 @@ to request that."
   (if (not (display-color-p))
       "*"
     'holiday)
-  "*How to mark notable dates in the calendar.
+  "How to mark notable dates in the calendar.
 The value can be either a single-character string or a face."
   :type '(choice string face)
   :group 'calendar)
 
 ;;;###autoload
 (defcustom view-calendar-holidays-initially nil
-  "*Non-nil means display holidays for current three month period on entry.
+  "Non-nil means display holidays for current three month period on entry.
 The holidays are displayed in another window when the calendar is first
 displayed."
   :type 'boolean
@@ -259,14 +258,14 @@ displayed."
 
 ;;;###autoload
 (defcustom mark-holidays-in-calendar nil
-  "*Non-nil means mark dates of holidays in the calendar window.
+  "Non-nil means mark dates of holidays in the calendar window.
 The marking symbol is specified by the variable `calendar-holiday-marker'."
   :type 'boolean
   :group 'holidays)
 
 ;;;###autoload
 (defcustom all-hebrew-calendar-holidays nil
-  "*If nil, show only major holidays from the Hebrew calendar.
+  "If nil, show only major holidays from the Hebrew calendar.
 This means only those Jewish holidays that appear on secular calendars.
 
 If t, show all the holidays that would appear in a complete Hebrew calendar."
@@ -275,7 +274,7 @@ If t, show all the holidays that would appear in a complete Hebrew calendar."
 
 ;;;###autoload
 (defcustom all-christian-calendar-holidays nil
-  "*If nil, show only major holidays from the Christian calendar.
+  "If nil, show only major holidays from the Christian calendar.
 This means only those Christian holidays that appear on secular calendars.
 
 If t, show all the holidays that would appear in a complete Christian
@@ -285,7 +284,7 @@ calendar."
 
 ;;;###autoload
 (defcustom all-islamic-calendar-holidays nil
-  "*If nil, show only major holidays from the Islamic calendar.
+  "If nil, show only major holidays from the Islamic calendar.
 This means only those Islamic holidays that appear on secular calendars.
 
 If t, show all the holidays that would appear in a complete Islamic
@@ -294,13 +293,13 @@ calendar."
   :group 'holidays)
 
 (defcustom diary-file-name-prefix-function (function (lambda (str) str))
-  "*The function that will take a diary file name and return the desired prefix."
+  "The function that will take a diary file name and return the desired prefix."
   :type 'function
   :group 'diary)
 
 ;;;###autoload
 (defcustom all-bahai-calendar-holidays nil
-  "*If nil, show only major holidays from the Baha'i calendar.
+  "If nil, show only major holidays from the Baha'i calendar.
 These are the days on which work and school must be suspended.
 
 If t, show all the holidays that would appear in a complete Baha'i
@@ -310,14 +309,14 @@ calendar."
 
 ;;;###autoload
 (defcustom calendar-load-hook nil
-  "*List of functions to be called after the calendar is first loaded.
+  "List of functions to be called after the calendar is first loaded.
 This is the place to add key bindings to `calendar-mode-map'."
   :type 'hook
   :group 'calendar-hooks)
 
 ;;;###autoload
 (defcustom initial-calendar-window-hook nil
-  "*List of functions to be called when the calendar window is first opened.
+  "List of functions to be called when the calendar window is first opened.
 The functions invoked are called after the calendar window is opened, but
 once opened is never called again.  Leaving the calendar with the `q' command
 and reentering it will cause these functions to be called again."
@@ -326,7 +325,7 @@ and reentering it will cause these functions to be called again."
 
 ;;;###autoload
 (defcustom today-visible-calendar-hook nil
-  "*List of functions called whenever the current date is visible.
+  "List of functions called whenever the current date is visible.
 This can be used, for example, to replace today's date with asterisks; a
 function `calendar-star-date' is included for this purpose:
     (setq today-visible-calendar-hook 'calendar-star-date)
@@ -346,7 +345,7 @@ functions that move by days and weeks."
 
 ;;;###autoload
 (defcustom today-invisible-calendar-hook nil
-  "*List of functions called whenever the current date is not visible.
+  "List of functions called whenever the current date is not visible.
 
 The corresponding variable `today-visible-calendar-hook' is the list of
 functions called when the calendar function was called when the current
@@ -360,7 +359,7 @@ functions that move by days and weeks."
 
 ;;;###autoload
 (defcustom calendar-move-hook nil
-  "*List of functions called whenever the cursor moves in the calendar.
+  "List of functions called whenever the cursor moves in the calendar.
 
 For example,
 
@@ -372,7 +371,7 @@ redisplays the diary for whatever date the cursor is moved to."
 
 ;;;###autoload
 (defcustom diary-file "~/diary"
-  "*Name of the file in which one's personal diary of dates is kept.
+  "Name of the file in which one's personal diary of dates is kept.
 
 The file's entries are lines beginning with any of the forms
 specified by the variable `american-date-diary-pattern', by default:
@@ -480,37 +479,37 @@ details, see the documentation for the variable `list-diary-entries-hook'."
 
 ;;;###autoload
 (defcustom diary-nonmarking-symbol "&"
-  "*Symbol indicating that a diary entry is not to be marked in the calendar."
+  "Symbol indicating that a diary entry is not to be marked in the calendar."
   :type 'string
   :group 'diary)
 
 ;;;###autoload
 (defcustom hebrew-diary-entry-symbol "H"
-  "*Symbol indicating a diary entry according to the Hebrew calendar."
+  "Symbol indicating a diary entry according to the Hebrew calendar."
   :type 'string
   :group 'diary)
 
 ;;;###autoload
 (defcustom islamic-diary-entry-symbol "I"
-  "*Symbol indicating a diary entry according to the Islamic calendar."
+  "Symbol indicating a diary entry according to the Islamic calendar."
   :type 'string
   :group 'diary)
 
 ;;;###autoload
 (defcustom bahai-diary-entry-symbol "B"
-  "*Symbol indicating a diary entry according to the Baha'i calendar."
+  "Symbol indicating a diary entry according to the Baha'i calendar."
   :type 'string
   :group 'diary)
 
 ;;;###autoload
 (defcustom diary-include-string "#include"
-  "*The string indicating inclusion of another file of diary entries.
+  "The string indicating inclusion of another file of diary entries.
 See the documentation for the function `include-other-diary-files'."
   :type 'string
   :group 'diary)
 
 (defcustom diary-glob-file-regexp-prefix "^\\#"
-  "*The regular expression that gets pre-pended to each of the attribute-regexp's for file-wide specifiers."
+  "The regular expression that gets pre-pended to each of the attribute-regexp's for file-wide specifiers."
   :type 'regexp
   :group 'diary)
 
@@ -531,7 +530,7 @@ See the documentation for the function `include-other-diary-files'."
 ;;;    (" *\\[box:\\([-a-z]+\\)\\]$" 1 :box)
 ;;;    (" *\\[stipple:\\([-a-z]+\\)\\]$" 1 :stipple)
     )
-  "*A list of (regexp regnum attr attrtype) lists where the
+  "A list of (regexp regnum attr attrtype) lists where the
 regexp says how to find the tag, the regnum says which
 parenthetical sub-regexp this regexp looks for, and the attr says
 which attribute of the face (or that this _is_ a face) is being
@@ -546,14 +545,14 @@ modified."
 
 ;;;###autoload
 (defcustom sexp-diary-entry-symbol "%%"
-  "*The string used to indicate a sexp diary entry in `diary-file'.
+  "The string used to indicate a sexp diary entry in `diary-file'.
 See the documentation for the function `list-sexp-diary-entries'."
   :type 'string
   :group 'diary)
 
 ;;;###autoload
 (defcustom abbreviated-calendar-year t
-  "*Interpret a two-digit year DD in a diary entry as either 19DD or 20DD.
+  "Interpret a two-digit year DD in a diary entry as either 19DD or 20DD.
 For the Gregorian calendar; similarly for the Hebrew, Islamic and
 Baha'i calendars.  If this variable is nil, years must be written in
 full."
@@ -562,7 +561,7 @@ full."
 
 ;;;###autoload
 (defcustom european-calendar-style nil
-  "*Use the European style of dates in the diary and in any displays.
+  "Use the European style of dates in the diary and in any displays.
 If this variable is t, a date 1/2/1990 would be interpreted as February 1,
 1990.  The default European date styles (see `european-date-diary-pattern')
 are
@@ -589,7 +588,7 @@ are loaded.  Otherwise, use one of the functions `european-calendar' or
     (monthname " *" day "[^,0-9]")
     (monthname " *" day ", *" year "[^0-9]")
     (dayname "\\W"))
-  "*List of pseudo-patterns describing the American patterns of date used.
+  "List of pseudo-patterns describing the American patterns of date used.
 See the documentation of `diary-date-forms' for an explanation."
   :type '(repeat (choice (cons :tag "Backup"
                                :value (backup . nil)
@@ -609,7 +608,7 @@ See the documentation of `diary-date-forms' for an explanation."
     (backup day " *" monthname "\\W+\\<\\([^*0-9]\\|\\([0-9]+[:aApP]\\)\\)")
     (day " *" monthname " *" year "[^0-9]")
     (dayname "\\W"))
-  "*List of pseudo-patterns describing the European patterns of date used.
+  "List of pseudo-patterns describing the European patterns of date used.
 See the documentation of `diary-date-forms' for an explanation."
   :type '(repeat (choice (cons :tag "Backup"
                                :value (backup . nil)
@@ -626,7 +625,7 @@ See the documentation of `diary-date-forms' for an explanation."
   (if european-calendar-style
       european-date-diary-pattern
     american-date-diary-pattern)
-  "*List of pseudo-patterns describing the forms of date used in the diary.
+  "List of pseudo-patterns describing the forms of date used in the diary.
 The patterns on the list must be MUTUALLY EXCLUSIVE and should not match
 any portion of the diary entry itself, just the date component.
 
@@ -664,7 +663,7 @@ a portion of the first word of the diary entry."
 ;;;###autoload
 (defcustom european-calendar-display-form
   '((if dayname (concat dayname ", ")) day " " monthname " " year)
-  "*Pseudo-pattern governing the way a date appears in the European style.
+  "Pseudo-pattern governing the way a date appears in the European style.
 See the documentation of `calendar-date-display-form' for an explanation."
   :type 'sexp
   :group 'calendar)
@@ -672,7 +671,7 @@ See the documentation of `calendar-date-display-form' for an explanation."
 ;;;###autoload
 (defcustom american-calendar-display-form
   '((if dayname (concat dayname ", ")) monthname " " day ", " year)
-  "*Pseudo-pattern governing the way a date appears in the American style.
+  "Pseudo-pattern governing the way a date appears in the American style.
 See the documentation of `calendar-date-display-form' for an explanation."
   :type 'sexp
   :group 'calendar)
@@ -681,7 +680,7 @@ See the documentation of `calendar-date-display-form' for an explanation."
   (if european-calendar-style
       european-calendar-display-form
     american-calendar-display-form)
-  "*Pseudo-pattern governing the way a date appears.
+  "Pseudo-pattern governing the way a date appears.
 
 Used by the function `calendar-date-string', a pseudo-pattern is a list of
 expressions that can involve the keywords `month', `day', and `year', all
@@ -722,7 +721,7 @@ See the documentation of the function `calendar-date-string'."
 
 ;;;###autoload
 (defcustom print-diary-entries-hook 'lpr-buffer
-  "*List of functions called after a temporary diary buffer is prepared.
+  "List of functions called after a temporary diary buffer is prepared.
 The buffer shows only the diary entries currently visible in the diary
 buffer.  The default just does the printing.  Other uses might include, for
 example, rearranging the lines into order by day and time, saving the buffer
@@ -732,7 +731,7 @@ instead of deleting it, or changing the function used to do the printing."
 
 ;;;###autoload
 (defcustom list-diary-entries-hook nil
-  "*List of functions called after diary file is culled for relevant entries.
+  "List of functions called after diary file is culled for relevant entries.
 It is to be used for diary entries that are not found in the diary file.
 
 A function `include-other-diary-files' is provided for use as the value of
@@ -763,14 +762,14 @@ lexicographic order."
 
 ;;;###autoload
 (defcustom diary-hook nil
-  "*List of functions called after the display of the diary.
+  "List of functions called after the display of the diary.
 Can be used for appointment notification."
   :type 'hook
   :group 'diary)
 
 ;;;###autoload
 (defcustom diary-display-hook nil
-  "*List of functions that handle the display of the diary.
+  "List of functions that handle the display of the diary.
 If nil (the default), `simple-diary-display' is used.  Use `ignore' for no
 diary display.
 
@@ -796,7 +795,7 @@ diary buffer, set the variable `diary-list-include-blanks' to t."
 
 ;;;###autoload
 (defcustom nongregorian-diary-listing-hook nil
-  "*List of functions called for listing diary file and included files.
+  "List of functions called for listing diary file and included files.
 As the files are processed for diary entries, these functions are used
 to cull relevant entries.  You can use either or both of
 `list-hebrew-diary-entries', `list-islamic-diary-entries' and
@@ -810,7 +809,7 @@ describes the style of such diary entries."
 
 ;;;###autoload
 (defcustom mark-diary-entries-hook nil
-  "*List of functions called after marking diary entries in the calendar.
+  "List of functions called after marking diary entries in the calendar.
 
 A function `mark-included-diary-files' is also provided for use as the
 `mark-diary-entries-hook'; it enables you to use shared diary files together
@@ -828,7 +827,7 @@ function `include-other-diary-files' as part of `list-diary-entries-hook'."
 
 ;;;###autoload
 (defcustom nongregorian-diary-marking-hook nil
-  "*List of functions called for marking diary file and included files.
+  "List of functions called for marking diary file and included files.
 As the files are processed for diary entries, these functions are used
 to cull relevant entries.  You can use either or both of
 `mark-hebrew-diary-entries', `mark-islamic-diary-entries' and
@@ -842,7 +841,7 @@ describes the style of such diary entries."
 
 ;;;###autoload
 (defcustom diary-list-include-blanks nil
-  "*If nil, do not include days with no diary entry in the list of diary entries.
+  "If nil, do not include days with no diary entry in the list of diary entries.
 Such days will then not be shown in the fancy diary buffer, even if they
 are holidays."
   :type 'boolean
@@ -850,7 +849,7 @@ are holidays."
 
 ;;;###autoload
 (defcustom holidays-in-diary-buffer t
-  "*Non-nil means include holidays in the diary display.
+  "Non-nil means include holidays in the diary display.
 The holidays appear in the mode line of the diary buffer, or in the
 fancy diary buffer next to the date.  This slows down the diary functions
 somewhat; setting it to nil makes the diary display faster."
@@ -880,7 +879,7 @@ somewhat; setting it to nil makes the diary display faster."
     (holiday-fixed 10 31 "Halloween")
     (holiday-fixed 11 11 "Veteran's Day")
     (holiday-float 11 4 4 "Thanksgiving"))
-  "*General holidays.  Default value is for the United States.
+  "General holidays.  Default value is for the United States.
 See the documentation for `calendar-holidays' for details."
   :type 'sexp
   :group 'holidays)
@@ -891,7 +890,7 @@ See the documentation for `calendar-holidays' for details."
 (defcustom oriental-holidays
   '((if (fboundp 'atan)
         (holiday-chinese-new-year)))
-  "*Oriental holidays.
+  "Oriental holidays.
 See the documentation for `calendar-holidays' for details."
   :type 'sexp
   :group 'holidays)
@@ -900,7 +899,7 @@ See the documentation for `calendar-holidays' for details."
 (put 'local-holidays 'risky-local-variable t)
 ;;;###autoload
 (defcustom local-holidays nil
-  "*Local holidays.
+  "Local holidays.
 See the documentation for `calendar-holidays' for details."
   :type 'sexp
   :group 'holidays)
@@ -909,7 +908,7 @@ See the documentation for `calendar-holidays' for details."
 (put 'other-holidays 'risky-local-variable t)
 ;;;###autoload
 (defcustom other-holidays nil
-  "*User defined holidays.
+  "User defined holidays.
 See the documentation for `calendar-holidays' for details."
   :type 'sexp
   :group 'holidays)
@@ -1013,7 +1012,7 @@ See the documentation for `calendar-holidays' for details."
 ;;;###autoload
 (defcustom hebrew-holidays (append hebrew-holidays-1 hebrew-holidays-2
                                 hebrew-holidays-3 hebrew-holidays-4)
-  "*Jewish holidays.
+  "Jewish holidays.
 See the documentation for `calendar-holidays' for details."
   :type 'sexp
   :group 'holidays)
@@ -1064,7 +1063,7 @@ See the documentation for `calendar-holidays' for details."
     (holiday-fixed 12 25 "Christmas")
     (if all-christian-calendar-holidays
         (holiday-julian 12 25 "Eastern Orthodox Christmas")))
-  "*Christian holidays.
+  "Christian holidays.
 See the documentation for `calendar-holidays' for details."
   :type 'sexp
   :group 'holidays)
@@ -1099,7 +1098,7 @@ See the documentation for `calendar-holidays' for details."
         (holiday-islamic 10 1 "Id-al-Fitr"))
     (if all-islamic-calendar-holidays
         (holiday-islamic 12 10 "Id-al-Adha")))
-  "*Islamic holidays.
+  "Islamic holidays.
 See the documentation for `calendar-holidays' for details."
   :type 'sexp
   :group 'holidays)
@@ -1141,7 +1140,7 @@ See the documentation for `calendar-holidays' for details."
         (holiday-fixed 11 26 "Day of the Covenant"))
     (if all-bahai-calendar-holidays
         (holiday-fixed 11 28 "Ascension of `Abdu'l-Baha")))
-  "*Baha'i holidays.
+  "Baha'i holidays.
 See the documentation for `calendar-holidays' for details."
   :type 'sexp
   :group 'holidays)
@@ -1173,7 +1172,7 @@ See the documentation for `calendar-holidays' for details."
                    (/ calendar-daylight-savings-ends-time (float 60))
                    calendar-daylight-time-zone-name)
                 ""))))
-  "*Sun-related holidays.
+  "Sun-related holidays.
 See the documentation for `calendar-holidays' for details."
   :type 'sexp
   :group 'holidays)
@@ -1184,7 +1183,7 @@ See the documentation for `calendar-holidays' for details."
   (append general-holidays local-holidays other-holidays
           christian-holidays hebrew-holidays islamic-holidays
           bahai-holidays oriental-holidays solar-holidays)
-  "*List of notable days for the command \\[holidays].
+  "List of notable days for the command \\[holidays].
 
 Additional holidays are easy to add to the list, just put them in the
 list `other-holidays' in your .emacs file.  Similarly, by setting any
@@ -1304,6 +1303,15 @@ A negative YR is interpreted as BC; -1 being 1 BC, and so on."
      (and (< macro-y 0) (> ,mon 1) (setq ,yr (1- ,yr)))
      (if (< ,yr 1) (setq ,yr (1- ,yr))))) ; 0 AD -> -1 BC, etc
 
+(defun calendar-increment-month (n &optional mon yr)
+  "Return the Nth month after MON/YR.
+The return value is a pair (MONTH . YEAR).
+MON defaults to `displayed-month'.  YR defaults to `displayed-year'."
+  (unless mon (setq mon displayed-month))
+  (unless yr (setq mon displayed-year))
+  (increment-calendar-month mon yr n)
+  (cons mon yr))
+
 (defmacro calendar-for-loop (var from init to final do &rest body)
   "Execute a for loop."
   (declare (debug (symbolp "from" form "to" form "do" body)))
@@ -1313,6 +1321,7 @@ A negative YR is interpreted as BC; -1 being 1 BC, and so on."
 
 (defmacro calendar-sum (index initial condition expression)
   "For INDEX = INITIAL et seq, as long as CONDITION holds, sum EXPRESSION."
+  (declare (debug (symbolp form form form)))
   `(let ((,index ,initial)
          (sum 0))
     (while ,condition
@@ -2140,7 +2149,7 @@ the inserted text.  Value is always t."
 
 ;;;###autoload
 (defcustom calendar-week-start-day 0
-  "*The day of the week on which a week in the calendar begins.
+  "The day of the week on which a week in the calendar begins.
 0 means Sunday (default), 1 means Monday, and so on.
 
 If you change this variable directly (without using customize)
@@ -2148,160 +2157,159 @@ after starting `calendar', you should call `redraw-calendar' to
 update the calendar display to reflect the change, otherwise
 movement commands will not work correctly."
   :type 'integer
+  ;; Change the initialize so that if you reload calendar.el, it will not
+  ;; cause a redraw (which may fail, e.g. with "invalid byte-code in
+  ;; calendar.elc" because of the "byte-compile-dynamic").
+  :initialize 'custom-initialize-default
   :set (lambda (sym val)
          (set sym val)
          (redraw-calendar))
   :group 'calendar)
 
 (defcustom calendar-debug-sexp nil
-  "*Turn debugging on when evaluating a sexp in the diary or holiday list."
+  "Turn debugging on when evaluating a sexp in the diary or holiday list."
   :type 'boolean
   :group 'calendar)
 
 (defvar calendar-mode-map nil)
 (if calendar-mode-map
     nil
-  (setq calendar-mode-map (make-sparse-keymap))
-  (require 'cal-menu)
-  (calendar-for-loop i from 0 to 9 do
-       (define-key calendar-mode-map (int-to-string i) 'digit-argument))
-  (let ((l (list 'narrow-to-region 'mark-word 'mark-sexp 'mark-paragraph
-                 'mark-defun 'mark-whole-buffer 'mark-page
-                 'downcase-region 'upcase-region 'kill-region
-                 'copy-region-as-kill 'capitalize-region 'write-region)))
-    (while l
-      (substitute-key-definition (car l) 'calendar-not-implemented
-                                 calendar-mode-map global-map)
-      (setq l (cdr l))))
-  (define-key calendar-mode-map "-"     'negative-argument)
-  (define-key calendar-mode-map ">"     'scroll-calendar-right)
-  (define-key calendar-mode-map "\C-x>" 'scroll-calendar-right)
-  (define-key calendar-mode-map [prior] 'scroll-calendar-right-three-months)
-  (define-key calendar-mode-map "\ev"   'scroll-calendar-right-three-months)
-  (define-key calendar-mode-map "<"     'scroll-calendar-left)
-  (define-key calendar-mode-map "\C-x<" 'scroll-calendar-left)
-  (define-key calendar-mode-map [next]  'scroll-calendar-left-three-months)
-  (define-key calendar-mode-map "\C-v"  'scroll-calendar-left-three-months)
-  (define-key calendar-mode-map "\C-b"  'calendar-backward-day)
-  (define-key calendar-mode-map "\C-p"  'calendar-backward-week)
-  (define-key calendar-mode-map "\e{"   'calendar-backward-month)
-  (define-key calendar-mode-map "\C-x[" 'calendar-backward-year)
-  (define-key calendar-mode-map "\C-f"  'calendar-forward-day)
-  (define-key calendar-mode-map "\C-n"  'calendar-forward-week)
-  (define-key calendar-mode-map [left]  'calendar-backward-day)
-  (define-key calendar-mode-map [up]    'calendar-backward-week)
-  (define-key calendar-mode-map [right] 'calendar-forward-day)
-  (define-key calendar-mode-map [down]  'calendar-forward-week)
-  (define-key calendar-mode-map "\e}"   'calendar-forward-month)
-  (define-key calendar-mode-map "\C-x]" 'calendar-forward-year)
-  (define-key calendar-mode-map "\C-a"  'calendar-beginning-of-week)
-  (define-key calendar-mode-map "\C-e"  'calendar-end-of-week)
-  (define-key calendar-mode-map "\ea"   'calendar-beginning-of-month)
-  (define-key calendar-mode-map "\ee"   'calendar-end-of-month)
-  (define-key calendar-mode-map "\e<"   'calendar-beginning-of-year)
-  (define-key calendar-mode-map "\e>"   'calendar-end-of-year)
-  (define-key calendar-mode-map "\C-@"  'calendar-set-mark)
-  ;; Many people are used to typing C-SPC and getting C-@.
-  (define-key calendar-mode-map [?\C- ] 'calendar-set-mark)
-  (define-key calendar-mode-map "\C-x\C-x" 'calendar-exchange-point-and-mark)
-  (define-key calendar-mode-map "\e=" 'calendar-count-days-region)
-  (define-key calendar-mode-map "gd"  'calendar-goto-date)
-  (define-key calendar-mode-map "gD"  'calendar-goto-day-of-year)
-  (define-key calendar-mode-map "gj"  'calendar-goto-julian-date)
-  (define-key calendar-mode-map "ga"  'calendar-goto-astro-day-number)
-  (define-key calendar-mode-map "gh"  'calendar-goto-hebrew-date)
-  (define-key calendar-mode-map "gi"  'calendar-goto-islamic-date)
-  (define-key calendar-mode-map "gb"  'calendar-goto-bahai-date)
-  (define-key calendar-mode-map "gC"  'calendar-goto-chinese-date)
-  (define-key calendar-mode-map "gk"  'calendar-goto-coptic-date)
-  (define-key calendar-mode-map "ge"  'calendar-goto-ethiopic-date)
-  (define-key calendar-mode-map "gp"  'calendar-goto-persian-date)
-  (define-key calendar-mode-map "gc"  'calendar-goto-iso-date)
-  (define-key calendar-mode-map "gw"  'calendar-goto-iso-week)
-  (define-key calendar-mode-map "gf"  'calendar-goto-french-date)
-  (define-key calendar-mode-map "gml"  'calendar-goto-mayan-long-count-date)
-  (define-key calendar-mode-map "gmpc" 'calendar-previous-calendar-round-date)
-  (define-key calendar-mode-map "gmnc" 'calendar-next-calendar-round-date)
-  (define-key calendar-mode-map "gmph" 'calendar-previous-haab-date)
-  (define-key calendar-mode-map "gmnh" 'calendar-next-haab-date)
-  (define-key calendar-mode-map "gmpt" 'calendar-previous-tzolkin-date)
-  (define-key calendar-mode-map "gmnt" 'calendar-next-tzolkin-date)
-  (define-key calendar-mode-map "Aa"   'appt-add)
-  (define-key calendar-mode-map "Ad"   'appt-delete)
-  (define-key calendar-mode-map "S"   'calendar-sunrise-sunset)
-  (define-key calendar-mode-map "M"   'calendar-phases-of-moon)
-  (define-key calendar-mode-map " "   'scroll-other-window)
-  (define-key calendar-mode-map (kbd "DEL") 'scroll-other-window-down)
-  (define-key calendar-mode-map "\C-c\C-l" 'redraw-calendar)
-  (define-key calendar-mode-map "."   'calendar-goto-today)
-  (define-key calendar-mode-map "o"   'calendar-other-month)
-  (define-key calendar-mode-map "q"   'exit-calendar)
-  (define-key calendar-mode-map "a"   'list-calendar-holidays)
-  (define-key calendar-mode-map "h"   'calendar-cursor-holidays)
-  (define-key calendar-mode-map "x"   'mark-calendar-holidays)
-  (define-key calendar-mode-map "u"   'calendar-unmark)
-  (define-key calendar-mode-map "m"   'mark-diary-entries)
-  (define-key calendar-mode-map "d"   'diary-view-entries)
-  (define-key calendar-mode-map "D"   'view-other-diary-entries)
-  (define-key calendar-mode-map "s"   'show-all-diary-entries)
-  (define-key calendar-mode-map "pd"  'calendar-print-day-of-year)
-  (define-key calendar-mode-map "pC"  'calendar-print-chinese-date)
-  (define-key calendar-mode-map "pk"  'calendar-print-coptic-date)
-  (define-key calendar-mode-map "pe"  'calendar-print-ethiopic-date)
-  (define-key calendar-mode-map "pp"  'calendar-print-persian-date)
-  (define-key calendar-mode-map "pc"  'calendar-print-iso-date)
-  (define-key calendar-mode-map "pj"  'calendar-print-julian-date)
-  (define-key calendar-mode-map "pa"  'calendar-print-astro-day-number)
-  (define-key calendar-mode-map "ph"  'calendar-print-hebrew-date)
-  (define-key calendar-mode-map "pi"  'calendar-print-islamic-date)
-  (define-key calendar-mode-map "pb"  'calendar-print-bahai-date)
-  (define-key calendar-mode-map "pf"  'calendar-print-french-date)
-  (define-key calendar-mode-map "pm"  'calendar-print-mayan-date)
-  (define-key calendar-mode-map "po"  'calendar-print-other-dates)
-  (define-key calendar-mode-map "id"  'insert-diary-entry)
-  (define-key calendar-mode-map "iw"  'insert-weekly-diary-entry)
-  (define-key calendar-mode-map "im"  'insert-monthly-diary-entry)
-  (define-key calendar-mode-map "iy"  'insert-yearly-diary-entry)
-  (define-key calendar-mode-map "ia"  'insert-anniversary-diary-entry)
-  (define-key calendar-mode-map "ib"  'insert-block-diary-entry)
-  (define-key calendar-mode-map "ic"  'insert-cyclic-diary-entry)
-  (define-key calendar-mode-map "ihd" 'insert-hebrew-diary-entry)
-  (define-key calendar-mode-map "ihm" 'insert-monthly-hebrew-diary-entry)
-  (define-key calendar-mode-map "ihy" 'insert-yearly-hebrew-diary-entry)
-  (define-key calendar-mode-map "iid" 'insert-islamic-diary-entry)
-  (define-key calendar-mode-map "iim" 'insert-monthly-islamic-diary-entry)
-  (define-key calendar-mode-map "iiy" 'insert-yearly-islamic-diary-entry)
-  (define-key calendar-mode-map "iBd" 'insert-bahai-diary-entry)
-  (define-key calendar-mode-map "iBm" 'insert-monthly-bahai-diary-entry)
-  (define-key calendar-mode-map "iBy" 'insert-yearly-bahai-diary-entry)
-  (define-key calendar-mode-map "?"   'calendar-goto-info-node)
-  (define-key calendar-mode-map "tm" 'cal-tex-cursor-month)
-  (define-key calendar-mode-map "tM" 'cal-tex-cursor-month-landscape)
-  (define-key calendar-mode-map "td" 'cal-tex-cursor-day)
-  (define-key calendar-mode-map "tw1" 'cal-tex-cursor-week)
-  (define-key calendar-mode-map "tw2" 'cal-tex-cursor-week2)
-  (define-key calendar-mode-map "tw3" 'cal-tex-cursor-week-iso)
-  (define-key calendar-mode-map "tw4" 'cal-tex-cursor-week-monday)
-  (define-key calendar-mode-map "tfd" 'cal-tex-cursor-filofax-daily)
-  (define-key calendar-mode-map "tfw" 'cal-tex-cursor-filofax-2week)
-  (define-key calendar-mode-map "tfW" 'cal-tex-cursor-filofax-week)
-  (define-key calendar-mode-map "tfy" 'cal-tex-cursor-filofax-year)
-  (define-key calendar-mode-map "ty" 'cal-tex-cursor-year)
-  (define-key calendar-mode-map "tY" 'cal-tex-cursor-year-landscape))
+  (let ((map (make-keymap)))
+    (suppress-keymap map)
+    (dolist (c '(narrow-to-region mark-word mark-sexp mark-paragraph
+                 mark-defun mark-whole-buffer mark-page
+                 downcase-region upcase-region kill-region
+                 copy-region-as-kill capitalize-region write-region))
+      (define-key map (vector 'remap c) 'calendar-not-implemented))
+    (define-key map ">"     'scroll-calendar-right)
+    (define-key map "\C-x>" 'scroll-calendar-right)
+    (define-key map [prior] 'scroll-calendar-right-three-months)
+    (define-key map "\ev"   'scroll-calendar-right-three-months)
+    (define-key map "<"     'scroll-calendar-left)
+    (define-key map "\C-x<" 'scroll-calendar-left)
+    (define-key map [next]  'scroll-calendar-left-three-months)
+    (define-key map "\C-v"  'scroll-calendar-left-three-months)
+    (define-key map "\C-b"  'calendar-backward-day)
+    (define-key map "\C-p"  'calendar-backward-week)
+    (define-key map "\e{"   'calendar-backward-month)
+    (define-key map "\C-x[" 'calendar-backward-year)
+    (define-key map "\C-f"  'calendar-forward-day)
+    (define-key map "\C-n"  'calendar-forward-week)
+    (define-key map [left]  'calendar-backward-day)
+    (define-key map [up]    'calendar-backward-week)
+    (define-key map [right] 'calendar-forward-day)
+    (define-key map [down]  'calendar-forward-week)
+    (define-key map "\e}"   'calendar-forward-month)
+    (define-key map "\C-x]" 'calendar-forward-year)
+    (define-key map "\C-a"  'calendar-beginning-of-week)
+    (define-key map "\C-e"  'calendar-end-of-week)
+    (define-key map "\ea"   'calendar-beginning-of-month)
+    (define-key map "\ee"   'calendar-end-of-month)
+    (define-key map "\e<"   'calendar-beginning-of-year)
+    (define-key map "\e>"   'calendar-end-of-year)
+    (define-key map "\C-@"  'calendar-set-mark)
+    ;; Many people are used to typing C-SPC and getting C-@.
+    (define-key map [?\C- ] 'calendar-set-mark)
+    (define-key map "\C-x\C-x" 'calendar-exchange-point-and-mark)
+    (define-key map "\e=" 'calendar-count-days-region)
+    (define-key map "gd"  'calendar-goto-date)
+    (define-key map "gD"  'calendar-goto-day-of-year)
+    (define-key map "gj"  'calendar-goto-julian-date)
+    (define-key map "ga"  'calendar-goto-astro-day-number)
+    (define-key map "gh"  'calendar-goto-hebrew-date)
+    (define-key map "gi"  'calendar-goto-islamic-date)
+    (define-key map "gb"  'calendar-goto-bahai-date)
+    (define-key map "gC"  'calendar-goto-chinese-date)
+    (define-key map "gk"  'calendar-goto-coptic-date)
+    (define-key map "ge"  'calendar-goto-ethiopic-date)
+    (define-key map "gp"  'calendar-goto-persian-date)
+    (define-key map "gc"  'calendar-goto-iso-date)
+    (define-key map "gw"  'calendar-goto-iso-week)
+    (define-key map "gf"  'calendar-goto-french-date)
+    (define-key map "gml"  'calendar-goto-mayan-long-count-date)
+    (define-key map "gmpc" 'calendar-previous-calendar-round-date)
+    (define-key map "gmnc" 'calendar-next-calendar-round-date)
+    (define-key map "gmph" 'calendar-previous-haab-date)
+    (define-key map "gmnh" 'calendar-next-haab-date)
+    (define-key map "gmpt" 'calendar-previous-tzolkin-date)
+    (define-key map "gmnt" 'calendar-next-tzolkin-date)
+    (define-key map "Aa"   'appt-add)
+    (define-key map "Ad"   'appt-delete)
+    (define-key map "S"   'calendar-sunrise-sunset)
+    (define-key map "M"   'calendar-phases-of-moon)
+    (define-key map " "   'scroll-other-window)
+    (define-key map (kbd "DEL") 'scroll-other-window-down)
+    (define-key map "\C-c\C-l" 'redraw-calendar)
+    (define-key map "."   'calendar-goto-today)
+    (define-key map "o"   'calendar-other-month)
+    (define-key map "q"   'exit-calendar)
+    (define-key map "a"   'list-calendar-holidays)
+    (define-key map "h"   'calendar-cursor-holidays)
+    (define-key map "x"   'mark-calendar-holidays)
+    (define-key map "u"   'calendar-unmark)
+    (define-key map "m"   'mark-diary-entries)
+    (define-key map "d"   'diary-view-entries)
+    (define-key map "D"   'view-other-diary-entries)
+    (define-key map "s"   'show-all-diary-entries)
+    (define-key map "pd"  'calendar-print-day-of-year)
+    (define-key map "pC"  'calendar-print-chinese-date)
+    (define-key map "pk"  'calendar-print-coptic-date)
+    (define-key map "pe"  'calendar-print-ethiopic-date)
+    (define-key map "pp"  'calendar-print-persian-date)
+    (define-key map "pc"  'calendar-print-iso-date)
+    (define-key map "pj"  'calendar-print-julian-date)
+    (define-key map "pa"  'calendar-print-astro-day-number)
+    (define-key map "ph"  'calendar-print-hebrew-date)
+    (define-key map "pi"  'calendar-print-islamic-date)
+    (define-key map "pb"  'calendar-print-bahai-date)
+    (define-key map "pf"  'calendar-print-french-date)
+    (define-key map "pm"  'calendar-print-mayan-date)
+    (define-key map "po"  'calendar-print-other-dates)
+    (define-key map "id"  'insert-diary-entry)
+    (define-key map "iw"  'insert-weekly-diary-entry)
+    (define-key map "im"  'insert-monthly-diary-entry)
+    (define-key map "iy"  'insert-yearly-diary-entry)
+    (define-key map "ia"  'insert-anniversary-diary-entry)
+    (define-key map "ib"  'insert-block-diary-entry)
+    (define-key map "ic"  'insert-cyclic-diary-entry)
+    (define-key map "ihd" 'insert-hebrew-diary-entry)
+    (define-key map "ihm" 'insert-monthly-hebrew-diary-entry)
+    (define-key map "ihy" 'insert-yearly-hebrew-diary-entry)
+    (define-key map "iid" 'insert-islamic-diary-entry)
+    (define-key map "iim" 'insert-monthly-islamic-diary-entry)
+    (define-key map "iiy" 'insert-yearly-islamic-diary-entry)
+    (define-key map "iBd" 'insert-bahai-diary-entry)
+    (define-key map "iBm" 'insert-monthly-bahai-diary-entry)
+    (define-key map "iBy" 'insert-yearly-bahai-diary-entry)
+    (define-key map "?"   'calendar-goto-info-node)
+    (define-key map "tm" 'cal-tex-cursor-month)
+    (define-key map "tM" 'cal-tex-cursor-month-landscape)
+    (define-key map "td" 'cal-tex-cursor-day)
+    (define-key map "tw1" 'cal-tex-cursor-week)
+    (define-key map "tw2" 'cal-tex-cursor-week2)
+    (define-key map "tw3" 'cal-tex-cursor-week-iso)
+    (define-key map "tw4" 'cal-tex-cursor-week-monday)
+    (define-key map "tfd" 'cal-tex-cursor-filofax-daily)
+    (define-key map "tfw" 'cal-tex-cursor-filofax-2week)
+    (define-key map "tfW" 'cal-tex-cursor-filofax-week)
+    (define-key map "tfy" 'cal-tex-cursor-filofax-year)
+    (define-key map "ty" 'cal-tex-cursor-year)
+    (define-key map "tY" 'cal-tex-cursor-year-landscape)
+    (setq calendar-mode-map map)
+    ;; Require cal-menu after initializing calendar-mode-map because it uses it.
+    (require 'cal-menu)))
 
 (defun describe-calendar-mode ()
   "Create a help buffer with a brief description of the `calendar-mode'."
   (interactive)
-  (with-output-to-temp-buffer "*Help*"
+  (help-setup-xref (list #'describe-calendar-mode) (interactive-p))
+  (with-output-to-temp-buffer (help-buffer)
     (princ
      (format
       "Calendar Mode:\nFor a complete description, type %s\n%s\n"
       (substitute-command-keys
        "\\<calendar-mode-map>\\[describe-mode] from within the calendar")
       (substitute-command-keys "\\{calendar-mode-map}")))
-    (save-excursion
-      (set-buffer standard-output)
-      (help-mode))
     (print-help-return-message)))
 
 ;; Calendar mode is suitable only for specially formatted data.
@@ -2451,12 +2459,11 @@ the STRINGS are just concatenated and the result truncated."
          (s (car strings))
          (strings (cdr strings))
          (i 0))
-    (while strings
+    (dolist (string strings)
       (setq s (concat s
                       (make-string (max 0 (/ (+ n i) m)) char)
-                      (car strings)))
-      (setq i (1+ i))
-      (setq strings (cdr strings)))
+                      string))
+      (setq i (1+ i)))
     (substring s 0 length)))
 
 (defun update-calendar-mode-line ()
@@ -2478,7 +2485,7 @@ the STRINGS are just concatenated and the result truncated."
         list)
     (walk-windows (lambda (w)
                     (if (memq (window-buffer w) calendar-buffers)
-                        (setq list (cons w list))))
+                        (push w list)))
                   nil t)
     list))
 
@@ -2488,15 +2495,12 @@ the STRINGS are just concatenated and the result truncated."
          (buffers (list "*Yahrzeits*" lunar-phases-buffer holiday-buffer
                         fancy-diary-buffer diary-buffer calendar-buffer
                         other-calendars-buffer))
-         (buffer-list nil)
-         b)
-    (while buffers
-      (setq b (car buffers))
+         (buffer-list nil))
+    (dolist (b buffers)
       (setq b (cond ((stringp b) (get-buffer b))
                     ((bufferp b) b)
                     (t nil)))
-      (if b (setq buffer-list (cons b buffer-list)))
-      (setq buffers (cdr buffers)))
+      (if b (push b buffer-list)))
     buffer-list))
 
 (defun exit-calendar ()
@@ -2642,7 +2646,7 @@ With argument, jump to mark, pop it, and put point at end of ring."
   (let ((date (calendar-cursor-to-date t)))
     (if (null arg)
         (progn
-          (setq calendar-mark-ring (cons date calendar-mark-ring))
+          (push date calendar-mark-ring)
           ;; Since the top of the mark ring is the marked date in the
           ;; calendar, the mark ring in the calendar is one longer than
           ;; in other buffers to get the same effect.
@@ -2949,16 +2953,18 @@ MARK defaults to `diary-entry-marker'."
   "Replace the date under the cursor in the calendar window with asterisks.
 This function can be used with the `today-visible-calendar-hook' run after the
 calendar window has been prepared."
-  (let ((inhibit-read-only t))
-    (make-local-variable 'calendar-starred-day)
+  (let ((inhibit-read-only t)
+        (modified (buffer-modified-p)))
     (forward-char 1)
-    (setq calendar-starred-day
-          (string-to-number
-           (buffer-substring (point) (- (point) 2))))
-    (delete-char -2)
+    (set (make-local-variable 'calendar-starred-day)
+         (string-to-number
+          (buffer-substring (point) (- (point) 2))))
+    ;; Insert before deleting, to better preserve markers.
     (insert "**")
-    (backward-char 1)
-    (set-buffer-modified-p nil)))
+    (forward-char -2)
+    (delete-char -2)
+    (forward-char 1)
+    (restore-buffer-modified-p modified)))
 
 (defun calendar-mark-today ()
   "Mark the date under the cursor in the calendar window.
@@ -3048,48 +3054,48 @@ Defaults to today's date if DATE is not given."
   (interactive)
   (let* ((date (calendar-cursor-to-date t)))
     (with-current-buffer (get-buffer-create other-calendars-buffer)
-      (setq buffer-read-only nil)
-      (calendar-set-mode-line
-       (concat (calendar-date-string date) " (Gregorian)"))
-      (erase-buffer)
-      (insert
-       (mapconcat 'identity
-                  (list (calendar-day-of-year-string date)
-                        (format "ISO date: %s" (calendar-iso-date-string date))
-                        (format "Julian date: %s"
-                                (calendar-julian-date-string date))
-                        (format
-                         "Astronomical (Julian) day number (at noon UTC): %s.0"
-                         (calendar-astro-date-string date))
-                        (format "Fixed (RD) date: %s"
-                                (calendar-absolute-from-gregorian date))
-                        (format "Hebrew date (before sunset): %s"
-                                (calendar-hebrew-date-string date))
-                        (format "Persian date: %s"
-                                (calendar-persian-date-string date))
-                        (let ((i (calendar-islamic-date-string date)))
-                          (if (not (string-equal i ""))
-                              (format "Islamic date (before sunset): %s" i)))
-                        (let ((b (calendar-bahai-date-string date)))
-                          (if (not (string-equal b ""))
-                              (format "Baha'i date (before sunset): %s" b)))
-                        (format "Chinese date: %s"
-                                (calendar-chinese-date-string date))
-                        (let ((c (calendar-coptic-date-string date)))
-                          (if (not (string-equal c ""))
-                              (format "Coptic date: %s" c)))
-                        (let ((e (calendar-ethiopic-date-string date)))
-                          (if (not (string-equal e ""))
-                              (format "Ethiopic date: %s" e)))
-                        (let ((f (calendar-french-date-string date)))
-                          (if (not (string-equal f ""))
-                              (format "French Revolutionary date: %s" f)))
-                        (format "Mayan date: %s"
-                                (calendar-mayan-date-string date)))
-                  "\n"))
-      (goto-char (point-min))
-      (set-buffer-modified-p nil)
-      (setq buffer-read-only t)
+      (let ((inhibit-read-only t)
+            (modified (buffer-modified-p)))
+        (calendar-set-mode-line
+         (concat (calendar-date-string date) " (Gregorian)"))
+        (erase-buffer)
+        (apply
+         'insert
+         (delq nil
+               (list
+                (calendar-day-of-year-string date) "\n"
+                (format "ISO date: %s\n" (calendar-iso-date-string date))
+                (format "Julian date: %s\n"
+                        (calendar-julian-date-string date))
+                (format "Astronomical (Julian) day number (at noon UTC): %s.0\n"
+                        (calendar-astro-date-string date))
+                (format "Fixed (RD) date: %s\n"
+                        (calendar-absolute-from-gregorian date))
+                (format "Hebrew date (before sunset): %s\n"
+                        (calendar-hebrew-date-string date))
+                (format "Persian date: %s\n"
+                        (calendar-persian-date-string date))
+                (let ((i (calendar-islamic-date-string date)))
+                  (if (not (string-equal i ""))
+                      (format "Islamic date (before sunset): %s\n" i)))
+                (let ((b (calendar-bahai-date-string date)))
+                  (if (not (string-equal b ""))
+                      (format "Baha'i date (before sunset): %s\n" b)))
+                (format "Chinese date: %s\n"
+                        (calendar-chinese-date-string date))
+                (let ((c (calendar-coptic-date-string date)))
+                  (if (not (string-equal c ""))
+                      (format "Coptic date: %s\n" c)))
+                (let ((e (calendar-ethiopic-date-string date)))
+                  (if (not (string-equal e ""))
+                      (format "Ethiopic date: %s\n" e)))
+                (let ((f (calendar-french-date-string date)))
+                  (if (not (string-equal f ""))
+                      (format "French Revolutionary date: %s\n" f)))
+                (format "Mayan date: %s\n"
+                        (calendar-mayan-date-string date)))))
+        (goto-char (point-min))
+        (restore-buffer-modified-p modified))
       (display-buffer other-calendars-buffer))))
 
 (defun calendar-print-day-of-year ()
@@ -3099,11 +3105,15 @@ Defaults to today's date if DATE is not given."
 
 (defun calendar-set-mode-line (str)
   "Set mode line to STR, centered, surrounded by dashes."
-  (setq mode-line-format
-        (calendar-string-spread
-         (list str) ?-
+  (let* ((edges (window-edges))
          ;; As per doc of window-width, total visible mode-line length.
-         (let ((edges (window-edges))) (- (nth 2 edges) (nth 0 edges))))))
+         (width (- (nth 2 edges) (nth 0 edges))))
+    (setq mode-line-format
+          (if buffer-file-name
+              `("-" mode-line-modified
+                ,(calendar-string-spread (list str) ?- (- width 6))
+                "---")
+            (calendar-string-spread (list str) ?- width)))))
 
 (defun calendar-mod (m n)
   "Non-negative remainder of M/N with N instead of 0."
diff --git a/lisp/completion.el b/lisp/completion.el
index 28bf1dd10b9..e231906ad27 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -82,11 +82,11 @@
 ;;  SAVING/LOADING COMPLETIONS
 ;;   Completions are automatically saved from one session to another
 ;; (unless save-completions-flag or enable-completion is nil).
-;; Activating this minor-mode calling completion-initialize) causes Emacs
-;; to load a completions database for a saved completions file
+;; Activating this minor-mode (calling completion-initialize) loads
+;; a completions database for a saved completions file
 ;; (default: ~/.completions).  When you exit, Emacs saves a copy of the
-;; completions that you
-;; often use.  When you next start, Emacs loads in the saved completion file.
+;; completions that you often use.  When you next start, Emacs loads in
+;; the saved completion file.
 ;;
 ;;   The number of completions saved depends loosely on
 ;; *saved-completions-decay-factor*.  Completions that have never been
@@ -2250,13 +2250,14 @@ Patched to remove the most recent completion."
 TYPE is the type of the wrapper to be added.  Can be :before or :under."
   (put function-name 'completion-function
        (cdr (assq type
-                  '((:separator 'use-completion-before-separator)
-                    (:before 'use-completion-before-point)
-                    (:backward-under 'use-completion-backward-under)
-                    (:backward 'use-completion-backward)
-                    (:under 'use-completion-under-point)
-                    (:under-or-before 'use-completion-under-or-before-point)
-                    (:minibuffer-separator 'use-completion-minibuffer-separator))))))
+                  '((:separator . use-completion-before-separator)
+                    (:before . use-completion-before-point)
+                    (:backward-under . use-completion-backward-under)
+                    (:backward . use-completion-backward)
+                    (:under . use-completion-under-point)
+                    (:under-or-before . use-completion-under-or-before-point)
+                    (:minibuffer-separator
+                     . use-completion-minibuffer-separator))))))
 
 (defun use-completion-minibuffer-separator ()
   (let ((completion-syntax-table completion-standard-syntax-table))
@@ -2354,7 +2355,7 @@ TYPE is the type of the wrapper to be added.  Can be :before or :under."
     (if dynamic-completion-mode
         (add-hook (car x) (cdr x))
       (remove-hook (car x) (cdr x))))
-  
+
   ;; "Complete" Key Keybindings.  We don't want to use a minor-mode
   ;; map because these have too high a priority.  We could/should
   ;; probably change the interpretation of minor-mode-map-alist such
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index a5f9e301946..87dc594b0fe 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1470,22 +1470,19 @@ See "
                                (if custom-raised-buttons
                                    "`Raised' text indicates"
                                  "Square brackets indicate")))
-        (widget-create 'info-link
+        (widget-create 'custom-manual
                        :tag "Custom file"
-                       :button-face 'custom-link
-                       :mouse-face 'highlight
                        "(emacs)Saving Customizations")
         (widget-insert
          " for information on how to save in a different file.\n
 See ")
-        (widget-create 'info-link
+        (widget-create 'custom-manual
                        :tag "Help"
-                       :button-face 'custom-link
-                       :mouse-face 'highlight
                        :help-echo "Read the online help."
                        "(emacs)Easy Customization")
         (widget-insert " for more information.\n\n")
-        (widget-insert "Operate on everything in this buffer:\n "))
+        (widget-insert "Operate on all settings in this buffer that \
+are not marked HIDDEN:\n "))
     (widget-insert " "))
   (widget-create 'push-button
                  :tag "Set for Current Session"
@@ -1496,10 +1493,8 @@ Make your editing in this buffer take effect for this session."
   (if (not custom-buffer-verbose-help)
       (progn
         (widget-insert " ")
-        (widget-create 'info-link
+        (widget-create 'custom-manual
                        :tag "Help"
-                       :button-face 'custom-link
-                       :mouse-face 'highlight
                        :help-echo "Read the online help."
                        "(emacs)Easy Customization")))
   (when (or custom-file user-init-file)
@@ -1647,7 +1642,7 @@ item in another window.\n\n"))
   (let ((custom-buffer-style 'tree))
     (custom-toggle-parent widget)))
 
-(define-widget 'custom-browse-group-tag 'push-button
+(define-widget 'custom-browse-group-tag 'custom-group-link
   "Show parent in other window when activated."
   :tag "Group"
   :tag-glyph "folder"
@@ -1657,7 +1652,7 @@ item in another window.\n\n"))
   (let ((parent (widget-get widget :parent)))
     (customize-group-other-window (widget-value parent))))
 
-(define-widget 'custom-browse-variable-tag 'push-button
+(define-widget 'custom-browse-variable-tag 'custom-group-link
   "Show parent in other window when activated."
   :tag "Option"
   :tag-glyph "option"
@@ -1667,7 +1662,7 @@ item in another window.\n\n"))
   (let ((parent (widget-get widget :parent)))
     (customize-variable-other-window (widget-value parent))))
 
-(define-widget 'custom-browse-face-tag 'push-button
+(define-widget 'custom-browse-face-tag 'custom-group-link
   "Show parent in other window when activated."
   :tag "Face"
   :tag-glyph "face"
@@ -2009,13 +2004,7 @@ and `face'."
   :group 'custom-faces)
 
 (defface custom-button-unraised
-  '((((min-colors 88)
-      (class color) (background light)) :foreground "blue1" :underline t)
-    (((class color) (background light)) :foreground "blue" :underline t)
-    (((min-colors 88)
-      (class color) (background dark)) :foreground "cyan1" :underline t)
-    (((class color) (background dark)) :foreground "cyan" :underline t)
-    (t :underline t))
+  '((t :inherit underline))
   "Face for custom buffer buttons if `custom-raised-buttons' is nil."
   :version "22.1"
   :group 'custom-faces)
@@ -2070,15 +2059,10 @@ and `face'."
 (put 'custom-state-face 'face-alias 'custom-state)
 
 (defface custom-link
-  '((((min-colors 88)
-      (class color) (background light)) :foreground "blue1" :underline t)
-    (((class color) (background light)) :foreground "blue" :underline t)
-    (((min-colors 88)
-      (class color) (background dark)) :foreground "cyan1" :underline t)
-    (((class color) (background dark)) :foreground "cyan" :underline t)
-    (t :underline t))
-  "Face for Info links in customization buffers."
-  :group 'info)
+  '((t :inherit link))
+  "Face for links in customization buffers."
+  :version "22.1"
+  :group 'custom-faces)
 
 (define-widget 'custom 'default
   "Customize a user option."
@@ -2245,8 +2229,6 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
                   (insert " ")
                   (push (widget-create-child-and-convert
                          widget 'custom-group-link
-                         :button-face 'custom-link
-                         :mouse-face 'highlight
                          :tag (custom-unlispify-tag-name symbol)
                          symbol)
                         buttons)
@@ -3323,7 +3305,7 @@ SPEC must be a full face spec."
 (defvar custom-face-menu
   `(("Set for Current Session" custom-face-set)
     ,@(when (or custom-file user-init-file)
-        '(("Save for Future Sessions" custom-face-save-command)))
+        '(("Save for Future Sessions" custom-face-save)))
     ("Undo Edits" custom-redraw
      (lambda (widget)
        (memq (widget-get widget :custom-state) '(modified changed))))
@@ -3448,13 +3430,8 @@ Optional EVENT is the location for the menu."
     (custom-face-state-set widget)
     (custom-redraw-magic widget)))
 
-(defun custom-face-save-command (widget)
-  "Save in `.emacs' the face attributes in WIDGET."
-  (custom-face-save widget)
-  (custom-save-all))
-
 (defun custom-face-save (widget)
-  "Prepare for saving WIDGET's face attributes, but don't write `.emacs'."
+  "Save in `.emacs' the face attributes in WIDGET."
   (let* ((symbol (widget-value widget))
          (child (car (widget-get widget :children)))
          (value (custom-post-filter-face-spec (widget-value child)))
@@ -3480,6 +3457,10 @@ Optional EVENT is the location for the menu."
     (custom-face-state-set widget)
     (custom-redraw-magic widget)))
 
+;; For backward compatibility.
+(define-obsolete-function-alias 'custom-face-save-command 'custom-face-save
+  "22.1")
+
 (defun custom-face-reset-saved (widget)
   "Restore WIDGET to the face's default attributes."
   (let* ((symbol (widget-value widget))
@@ -3607,6 +3588,8 @@ restoring it to the state of a face that has never been customized."
 
 (define-widget 'custom-group-link 'link
   "Show parent in other window when activated."
+  :button-face 'custom-link
+  :mouse-face 'highlight
   :help-echo "Create customization buffer for this group."
   :action 'custom-group-link-action)
 
@@ -3805,8 +3788,6 @@ If GROUPS-ONLY non-nil, return only those members that are groups."
            (if (eq custom-buffer-style 'links)
                (push (widget-create-child-and-convert
                       widget 'custom-group-link
-                      :button-face 'custom-link
-                      :mouse-face 'highlight
                       :tag "Go to Group"
                       symbol)
                      buttons)
@@ -4400,6 +4381,15 @@ The format is suitable for use with `easy-menu-define'."
     ["Erase Customization" Custom-reset-standard t]
     ["Info" (info "(emacs)Easy Customization") t]))
 
+(defvar custom-field-keymap
+  (let ((map (copy-keymap widget-field-keymap)))
+    (define-key map "\C-c\C-c" 'Custom-set)
+    (define-key map "\C-x\C-s" 'Custom-save)
+    map)
+  "Keymap used inside editable fields in customization buffers.")
+
+(widget-put (get 'editable-field 'widget-type) :keymap custom-field-keymap)
+
 (defun Custom-goto-parent ()
   "Go to the parent group listed at the top of this buffer.
 If several parents are listed, go to the first of them."
@@ -4425,17 +4415,18 @@ If several parents are listed, go to the first of them."
 
 The following commands are available:
 
-Move to next button or editable field.     \\[widget-forward]
-Move to previous button or editable field. \\[widget-backward]
-\\<widget-field-keymap>\
+\\<widget-keymap>\
+Move to next button, link or editable field.     \\[widget-forward]
+Move to previous button, link or editable field. \\[widget-backward]
+\\<custom-field-keymap>\
 Complete content of editable text field.   \\[widget-complete]
 \\<custom-mode-map>\
-Invoke button under the mouse pointer.     \\[Custom-move-and-invoke]
-Invoke button under point.                 \\[widget-button-press]
+Invoke button under the mouse pointer.     \\[widget-move-and-invoke]
+Invoke button under point.                 \\[widget-button-press]
 Set all options from current text.         \\[Custom-set]
 Make values in current text permanent.     \\[Custom-save]
-Make text match actual option values.      \\[Custom-reset-current]
-Reset options to permanent settings.       \\[Custom-reset-saved]
+Make text match actual option values.      \\[Custom-reset-current]
+Reset options to permanent settings.       \\[Custom-reset-saved]
 Erase customizations; set options
   and buffer text to the standard values.  \\[Custom-reset-standard]
 
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 689c541140e..98e31081abf 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -966,7 +966,7 @@ directory DIRNAME."
 (defun desktop-load-file (function)
   "Load the file where auto loaded FUNCTION is defined."
   (when function
-    (let ((fcell (symbol-function function)))
+    (let ((fcell (and (fboundp function) (symbol-function function))))
       (when (and (listp fcell)
                  (eq 'autoload (car fcell)))
         (load (cadr fcell))))))
diff --git a/lisp/dired.el b/lisp/dired.el
index 3cc83b29fdd..fe8f6996b28 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -286,6 +286,9 @@ In simple cases, this list contains one element.")
 This is an alist of the form (SUBDIR . SWITCHES).")
 (make-variable-buffer-local 'dired-switches-alist)
 
+(defvaralias 'dired-move-to-filename-regexp
+  'directory-listing-before-filename-regexp)
+
 (defvar dired-subdir-regexp "^. \\([^\n\r]+\\)\\(:\\)[\n\r]"
   "Regexp matching a maybe hidden subdirectory line in `ls -lR' output.
 Subexpression 1 is the subdirectory proper, no trailing colon.
@@ -2514,11 +2517,18 @@ if there are no flagged files."
       (set-window-start w2 1)
       )))
 
-(defvar dired-no-confirm nil
+(defcustom dired-no-confirm nil
   "A list of symbols for commands Dired should not confirm.
 Command symbols are `byte-compile', `chgrp', `chmod', `chown', `compress',
 `copy', `delete', `hardlink', `load', `move', `print', `shell', `symlink',
-`touch' and `uncompress'.")
+`touch' and `uncompress'."
+  :group 'dired
+  :type '(set (const byte-compile) (const chgrp)
+              (const chmod) (const chown) (const compress)
+              (const copy) (const delete) (const hardlink)
+              (const load) (const move) (const print)
+              (const shell) (const symlink) (const touch)
+              (const uncompress)))
 
 (defun dired-mark-pop-up (bufname op-symbol files function &rest args)
   "Return FUNCTION's result on ARGS after showing which files are marked.
@@ -3091,9 +3101,9 @@ With optional second arg NO-REVERT, don't refresh the listing afterwards."
   (if (eq major-mode 'dired-mode) (dired-sort-set-modeline))
   (or no-revert (revert-buffer)))
 
-(make-variable-buffer-local
- (defvar dired-subdir-alist-pre-R nil
-   "Value of `dired-subdir-alist' before -R switch added."))
+(defvar dired-subdir-alist-pre-R nil
+  "Value of `dired-subdir-alist' before -R switch added.")
+(make-variable-buffer-local 'dired-subdir-alist-pre-R)
 
 (defun dired-sort-R-check (switches)
   "Additional processing of -R in ls option string SWITCHES.
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 43e8b917ce8..4c218263a62 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -165,7 +165,7 @@ If nil, do not try to find the source code of functions and variables
 defined in C.")
 
 (defun find-function-C-source (fun-or-var file type)
-  "Find the source location where SUBR-OR-VAR is defined in FILE.
+  "Find the source location where FUN-OR-VAR is defined in FILE.
 TYPE should be nil to find a function, or `defvar' to find a variable."
   (unless find-function-C-source-directory
     (setq find-function-C-source-directory
@@ -243,7 +243,7 @@ The search is done in the source for library LIBRARY."
 (defun find-function-noselect (function)
   "Return a pair (BUFFER . POINT) pointing to the definition of FUNCTION.
 
-Finds the Emacs Lisp library containing the definition of FUNCTION
+Finds the source file containing the definition of FUNCTION
 in a buffer and the point of the definition.  The buffer is
 not selected.
 
@@ -335,7 +335,7 @@ Set mark before moving, if the buffer already existed."
 (defun find-function (function)
   "Find the definition of the FUNCTION near point.
 
-Finds the Emacs Lisp library containing the definition of the function
+Finds the source file containing the definition of the function
 near point (selected by `function-called-at-point') in a buffer and
 places point before the definition.
 Set mark before moving, if the buffer already existed.
@@ -356,7 +356,7 @@ See `find-function' for more details."
 
 ;;;###autoload
 (defun find-function-other-frame (function)
-  "Find, in ananother frame, the definition of FUNCTION near point.
+  "Find, in another frame, the definition of FUNCTION near point.
 
 See `find-function' for more details."
   (interactive (find-function-read))
@@ -364,24 +364,25 @@ See `find-function' for more details."
 
 ;;;###autoload
 (defun find-variable-noselect (variable &optional file)
-  "Return a pair `(BUFFER . POINT)' pointing to the definition of SYMBOL.
+  "Return a pair `(BUFFER . POINT)' pointing to the definition of VARIABLE.
 
-Finds the Emacs Lisp library containing the definition of SYMBOL
-in a buffer, and the point of the definition.  It does not switch
-to the buffer or display it.
+Finds the library containing the definition of VARIABLE in a buffer and
+the point of the definition.  The buffer is not selected.
 
 The library where VARIABLE is defined is searched for in FILE or
 `find-function-source-path', if non nil, otherwise in `load-path'."
   (if (not variable)
-      (error "You didn't specify a variable"))
-  (let ((library (or file (symbol-file variable 'defvar))))
-    (find-function-search-for-symbol variable 'defvar library)))
+      (error "You didn't specify a variable")
+    (let ((library (or file
+                       (symbol-file variable 'defvar)
+                       (help-C-file-name variable 'var))))
+      (find-function-search-for-symbol variable 'defvar library))))
 
 ;;;###autoload
 (defun find-variable (variable)
   "Find the definition of the VARIABLE near point.
 
-Finds the Emacs Lisp library containing the definition of the variable
+Finds the library containing the definition of the variable
 near point (selected by `variable-at-point') in a buffer and
 places point before the definition.
 
@@ -403,7 +404,7 @@ See `find-variable' for more details."
 
 ;;;###autoload
 (defun find-variable-other-frame (variable)
-  "Find, in annother frame, the definition of VARIABLE near point.
+  "Find, in another frame, the definition of VARIABLE near point.
 
 See `find-variable' for more details."
   (interactive (find-function-read 'defvar))
@@ -412,18 +413,22 @@ See `find-variable' for more details."
 ;;;###autoload
 (defun find-definition-noselect (symbol type &optional file)
   "Return a pair `(BUFFER . POINT)' pointing to the definition of SYMBOL.
-TYPE says what type of definition: nil for a function,
-`defvar' or `defface' for a variable or face.  This function
-does not switch to the buffer or display it.
+TYPE says what type of definition: nil for a function, `defvar' for a
+variabke, `defface' for a face.  This function does not switch to the
+buffer nor display it.
 
 The library where SYMBOL is defined is searched for in FILE or
 `find-function-source-path', if non nil, otherwise in `load-path'."
-  (if (not symbol)
-      (error "You didn't specify a symbol"))
-  (if (null type)
-      (find-function-noselect symbol)
+  (cond
+   ((not symbol)
+    (error "You didn't specify a symbol"))
+   ((null type)
+    (find-function-noselect symbol))
+   ((eq type 'defvar)
+    (find-variable-noselect symbol file))
+   (t
     (let ((library (or file (symbol-file symbol type))))
-      (find-function-search-for-symbol symbol type library))))
+      (find-function-search-for-symbol symbol type library)))))
 
 ;; For symmetry, this should be called find-face; but some programs
 ;; assume that, if that name is defined, it means something else.
@@ -480,7 +485,7 @@ Set mark before moving, if the buffer already existed."
 
 ;;;###autoload
 (defun find-variable-at-point ()
-  "Find directly the function at point in the other window."
+  "Find directly the variable at point in the other window."
   (interactive)
   (let ((symb (variable-at-point)))
     (when (and symb (not (equal symb 0)))
diff --git a/lisp/faces.el b/lisp/faces.el
index 2bc3d3968e2..14613bec679 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1918,6 +1918,28 @@ created."
   :group 'basic-faces
   :version "22.1")
 
+(defface link
+  '((((class color) (min-colors 88) (background light))
+     :foreground "blue1" :underline t)
+    (((class color) (background light))
+     :foreground "blue" :underline t)
+    (((class color) (min-colors 88) (background dark))
+     :foreground "cyan1" :underline t)
+    (((class color) (background dark))
+     :foreground "cyan" :underline t)
+    (t :inherit underline))
+  "Basic face for unvisited links."
+  :group 'basic-faces
+  :version "22.1")
+
+(defface link-visited
+  '((default :inherit link)
+    (((class color) (background light)) :foreground "magenta4")
+    (((class color) (background dark)) :foreground "violet"))
+  "Basic face for visited links."
+  :group 'basic-faces
+  :version "22.1")
+
 (defface highlight
   '((((class color) (min-colors 88) (background light))
      :background "darkseagreen2")
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index acdcf68c7dc..f85aa37b3b5 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2127,7 +2127,7 @@ other modes in which C preprocessor directives are used. e.g. `asm-mode' and
        ;; Constant values.
        ("\\<:\\sw+\\>" 0 font-lock-builtin-face)
        ;; ELisp and CLisp `&' keywords as types.
-       ("\\&\\sw+\\>" . font-lock-type-face)
+       ("\\<\\&\\sw+\\>" . font-lock-type-face)
        ;; ELisp regexp grouping constructs
        ((lambda (bound)
           (catch 'found
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6e0405c24eb..fbbf7281b69 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,62 @@
+2006-01-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-uu.el (mm-uu-dissect-text-parts): Ignore it if a given part
+        is dissected into a single part of which the type is the same as
+        the given one.
+
+2006-01-21  Kevin Ryde  <user42@zip.com.au>
+
+        * mailcap.el (mailcap-parse-mailcap-extras): "test" key must go
+        into alists as symbol not string, since that's what
+        mailcap-viewer-passes-test and mailcap-mailcap-entry-passes-test
+        look for.
+
+2006-01-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-uu.el (mm-uu-dissect-text-parts): Reduce the number of
+        recursive calls.
+
+2006-01-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-view.el (mm-w3m-standalone-supports-m17n-p): New variable.
+        (mm-w3m-standalone-supports-m17n-p): New function.
+        (mm-inline-text-html-render-with-w3m-standalone): Use it to alter
+        w3m usage.
+
+        * gnus-art.el (gnus-article-wash-html-with-w3m-standalone): Use
+        mm-w3m-standalone-supports-m17n-p to alter w3m usage.
+
+2006-01-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-uu.el (mm-uu-dissect-text-parts): Decode content transfer
+        encoding.
+
+2006-01-20  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * mml.el (mml-attach-file): Describe `description' in doc string.
+        (mml-menu): Add Emacs MIME manual and PGG manual.
+
+2006-01-19  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * spam.el (spam-group-ham-mark-p, spam-group-spam-mark-p)
+        (spam-group-spam-marks, spam-list-articles, spam-group-ham-marks):
+        Revert 2006-01-08 change because the functions will be used in No
+        Gnus.
+
+2006-01-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-bodies.el (mm-decode-body): Don't decode decoded body.
+
+        * mm-uu.el (mm-uu-dissect-text-parts): Dissect dissected parts.
+
+2006-01-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-decode.el (mm-inlined-types): Add application/pgp.
+        (mm-automatic-display): Ditto.
+
+        * mm-uu.el (mm-uu-dissect-text-parts): Recognize application/pgp
+        part as text.
+
 2006-01-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * nnrss.el: Update copyright.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 92a4f09ded3..b51ceff29a9 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2541,15 +2541,18 @@ charset defined in `gnus-summary-show-article-charset-alist' is used."
 
 (defun gnus-article-wash-html-with-w3m-standalone ()
   "Wash the current buffer with w3m."
-  (unless (mm-coding-system-p charset)
-    ;; The default.
-    (setq charset 'iso-8859-1))
-  (let ((coding-system-for-write charset)
-        (coding-system-for-read charset))
-    (call-process-region
-     (point-min) (point-max)
-     "w3m" t t nil "-dump" "-T" "text/html"
-     "-I" (symbol-name charset) "-O" (symbol-name charset))))
+  (if (mm-w3m-standalone-supports-m17n-p)
+      (progn
+        (unless (mm-coding-system-p charset) ;; Bound by `article-wash-html'.
+          ;; The default.
+          (setq charset 'iso-8859-1))
+        (let ((coding-system-for-write charset)
+              (coding-system-for-read charset))
+          (call-process-region
+           (point-min) (point-max)
+           "w3m" t t nil "-dump" "-T" "text/html"
+           "-I" (symbol-name charset) "-O" (symbol-name charset))))
+    (mm-inline-wash-with-stdin nil "w3m" "-dump" "-T" "text/html")))
 
 (defun article-hide-list-identifiers ()
   "Remove list identifies from the Subject header.
diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el
index 166edb60f7a..80153645819 100644
--- a/lisp/gnus/mailcap.el
+++ b/lisp/gnus/mailcap.el
@@ -528,7 +528,12 @@ MAILCAPS if set; otherwise (on Unix) use the path from RFC 1524, plus
                     (skip-chars-forward ";"))
                 (setq done t))))
           (setq value (buffer-substring val-pos (point))))
-        (setq results (cons (cons name value) results))
+        ;; `test' as symbol, others like "copiousoutput" and "needsx11" as
+        ;; strings
+        (setq results (cons (cons (if (string-equal name "test")
+                                      'test
+                                    name)
+                                  value) results))
         (skip-chars-forward " \";\n\t"))
       results)))
 
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index ed3dc28253d..7871ca9f253 100644
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@ -1,7 +1,7 @@
 ;;; mm-bodies.el --- Functions for decoding MIME things
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;      MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -248,7 +248,8 @@ decoding.  If it is nil, default to `mail-parse-charset'."
   (save-excursion
     (when encoding
       (mm-decode-content-transfer-encoding encoding type))
-    (when (featurep 'mule)  ; Fixme: Wrong test for unibyte session.
+    (when (and (featurep 'mule) ;; Fixme: Wrong test for unibyte session.
+               (not (eq charset 'gnus-decoded)))
       (let ((coding-system (mm-charset-to-coding-system charset)))
         (if (and (not coding-system)
                  (listp mail-parse-ignored-charsets)
@@ -261,8 +262,7 @@ decoding.  If it is nil, default to `mail-parse-charset'."
                    ;;in XEmacs
                    (mm-multibyte-p)
                    (or (not (eq coding-system 'ascii))
-                       (setq coding-system mail-parse-charset))
-                   (not (eq coding-system 'gnus-decoded)))
+                       (setq coding-system mail-parse-charset)))
           (mm-decode-coding-region (point-min) (point-max)
                                    coding-system))
         (setq buffer-file-coding-system
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 5b55af4d756..b275807c051 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1,7 +1,7 @@
 ;;; mm-decode.el --- Functions for decoding MIME things
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;      MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -279,7 +279,9 @@ before the external MIME handler is invoked."
     "application/x-emacs-lisp"
     "application/pgp-signature" "application/x-pkcs7-signature"
     "application/pkcs7-signature" "application/x-pkcs7-mime"
-    "application/pkcs7-mime")
+    "application/pkcs7-mime"
+    ;; Mutt still uses this even though it has already been withdrawn.
+    "application/pgp")
   "List of media types that are to be displayed inline.
 See also `mm-inline-media-tests', which says how to display a media
 type inline."
@@ -302,7 +304,9 @@ when selecting a different article."
     "application/emacs-lisp" "application/x-emacs-lisp"
     "application/x-pkcs7-signature"
     "application/pkcs7-signature" "application/x-pkcs7-mime"
-    "application/pkcs7-mime")
+    "application/pkcs7-mime"
+    ;; Mutt still uses this even though it has already been withdrawn.
+    "application/pgp")
   "A list of MIME types to be displayed automatically."
   :type '(repeat regexp)
   :group 'mime-display)
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index 312c3dd8542..fa36582af01 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -511,21 +511,40 @@ value of `mm-uu-text-plain-type'."
 
 (defun mm-uu-dissect-text-parts (handle)
   "Dissect text parts and put uu handles into HANDLE."
-  (let ((buffer (mm-handle-buffer handle))
-        type children)
+  (let ((buffer (mm-handle-buffer handle)))
     (cond ((stringp buffer)
            (dolist (elem (cdr handle))
              (mm-uu-dissect-text-parts elem)))
           ((bufferp buffer)
-           (when (and (setq type (mm-handle-media-type handle))
-                      (stringp type)
-                      (string-match "\\`text/" type)
-                      (with-current-buffer buffer
-                        (setq children
-                              (mm-uu-dissect t (mm-handle-type handle)))))
-             (kill-buffer buffer)
-             (setcar handle (car children))
-             (setcdr handle (cdr children))))
+           (let ((type (mm-handle-media-type handle))
+                 (case-fold-search t) ;; string-match
+                 encoding children)
+             (when (and
+                    (stringp type)
+                    ;; Mutt still uses application/pgp even though
+                    ;; it has already been withdrawn.
+                    (string-match "\\`text/\\|\\`application/pgp\\'" type)
+                    (setq children
+                          (with-current-buffer buffer
+                            (if (setq encoding (mm-handle-encoding handle))
+                                ;; Inherit the multibyteness of the `buffer'.
+                                (with-temp-buffer
+                                  (insert-buffer-substring buffer)
+                                  (mm-decode-content-transfer-encoding
+                                   encoding type)
+                                  (mm-uu-dissect t (mm-handle-type handle)))
+                              (mm-uu-dissect t (mm-handle-type handle))))))
+               ;; Ignore it if a given part is dissected into a single
+               ;; part of which the type is the same as the given one.
+               (if (and (<= (length children) 2)
+                        (string-equal (mm-handle-media-type (cadr children))
+                                      type))
+                   (kill-buffer (mm-handle-buffer (cadr children)))
+                 (kill-buffer buffer)
+                 (setcdr handle (cdr children))
+                 (setcar handle (car children)) ;; "multipart/mixed"
+                 (dolist (elem (cdr children))
+                   (mm-uu-dissect-text-parts elem))))))
           (t
            (dolist (elem handle)
              (mm-uu-dissect-text-parts elem))))))
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 645e960b535..73cab0a5676 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -262,29 +262,57 @@
               (delete-region ,(point-min-marker)
                              ,(point-max-marker)))))))))
 
+(defvar mm-w3m-standalone-supports-m17n-p (if (featurep 'mule) 'undecided)
+  "*T means the w3m command supports the m17n feature.")
+
+(defun mm-w3m-standalone-supports-m17n-p ()
+  "Say whether the w3m command supports the m17n feature."
+  (cond ((eq mm-w3m-standalone-supports-m17n-p t) t)
+        ((eq mm-w3m-standalone-supports-m17n-p nil) nil)
+        ((not (featurep 'mule)) (setq mm-w3m-standalone-supports-m17n-p nil))
+        ((condition-case nil
+             (let ((coding-system-for-write 'iso-2022-jp)
+                   (coding-system-for-read 'iso-2022-jp)
+                   (str (mm-decode-coding-string "\
+\e$B#D#o#e#s!!#w#3#m!!#s#u#p#p#o#r#t#s!!#m#1#7#n!)\e(B" 'iso-2022-jp)))
+               (mm-with-multibyte-buffer
+                 (insert str)
+                 (call-process-region
+                  (point-min) (point-max) "w3m" t t nil "-dump"
+                  "-T" "text/html" "-I" "iso-2022-jp" "-O" "iso-2022-jp")
+                 (goto-char (point-min))
+                 (search-forward str nil t)))
+           (error nil))
+         (setq mm-w3m-standalone-supports-m17n-p t))
+        (t
+         ;;(message "You had better upgrade your w3m command")
+         (setq mm-w3m-standalone-supports-m17n-p nil))))
+
 (defun mm-inline-text-html-render-with-w3m-standalone (handle)
   "Render a text/html part using w3m."
-  (let ((source (mm-get-part handle))
-        (charset (mail-content-type-get (mm-handle-type handle) 'charset))
-        cs)
-    (unless (and charset
-                 (setq cs (mm-charset-to-coding-system charset))
-                 (not (eq cs 'ascii)))
-      ;; The default.
-      (setq charset "iso-8859-1"
-            cs 'iso-8859-1))
-    (mm-insert-inline
-     handle
-     (mm-with-unibyte-buffer
-       (insert source)
-       (mm-enable-multibyte)
-       (let ((coding-system-for-write 'binary)
-             (coding-system-for-read cs))
-         (call-process-region
-          (point-min) (point-max)
-          "w3m" t t nil "-dump" "-T" "text/html"
-          "-I" charset "-O" charset))
-       (buffer-string)))))
+  (if (mm-w3m-standalone-supports-m17n-p)
+      (let ((source (mm-get-part handle))
+            (charset (mail-content-type-get (mm-handle-type handle) 'charset))
+            cs)
+        (unless (and charset
+                     (setq cs (mm-charset-to-coding-system charset))
+                     (not (eq cs 'ascii)))
+          ;; The default.
+          (setq charset "iso-8859-1"
+                cs 'iso-8859-1))
+        (mm-insert-inline
+         handle
+         (mm-with-unibyte-buffer
+           (insert source)
+           (mm-enable-multibyte)
+           (let ((coding-system-for-write 'binary)
+                 (coding-system-for-read cs))
+             (call-process-region
+              (point-min) (point-max)
+              "w3m" t t nil "-dump" "-T" "text/html"
+              "-I" charset "-O" charset))
+           (buffer-string))))
+    (mm-inline-render-with-stdin handle nil "w3m" "-dump" "-T" "text/html")))
 
 (defun mm-links-remove-leading-blank ()
   ;; Delete the annoying three spaces preceding each line of links
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index f88276f4e69..7d7ea9e20a1 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -38,6 +38,7 @@
   (autoload 'gnus-add-minor-mode "gnus-ems")
   (autoload 'gnus-make-local-hook "gnus-util")
   (autoload 'message-fetch-field "message")
+  (autoload 'message-info "message")
   (autoload 'fill-flowed-encode "flow-fill")
   (autoload 'message-posting-charset "message"))
 
@@ -916,7 +917,14 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
     ;;["Narrow" mml-narrow-to-part t]
     ["Quote MML" mml-quote-region t]
     ["Validate MML" mml-validate t]
-    ["Preview" mml-preview t]))
+    ["Preview" mml-preview t]
+    "----"
+    ["Emacs MIME manual" (lambda () (interactive) (message-info 4))
+     ,@(if (featurep 'xemacs) '(t)
+         '(:help "Display the Emacs MIME manual"))]
+    ["PGG manual" (lambda () (interactive) (message-info 16))
+     ,@(if (featurep 'xemacs) '(t)
+         '(:help "Display the PGG manual"))]))
 
 (defvar mml-mode nil
   "Minor mode for editing MML.")
@@ -1035,9 +1043,12 @@ See Info node `(emacs-mime)Composing'.
 The file is not inserted or encoded until you send the message with
 `\\[message-send-and-exit]' or `\\[message-send]'.
 
-FILE is the name of the file to attach.  TYPE is its content-type, a
-string of the form \"type/subtype\".  DESCRIPTION is a one-line
-description of the attachment."
+FILE is the name of the file to attach.  TYPE is its
+content-type, a string of the form \"type/subtype\".  DESCRIPTION
+is a one-line description of the attachment.  The DISPOSITION
+specifies how the attachment is intended to be displayed.  It can
+be either \"inline\" (displayed automatically within the message
+body) or \"attachment\" (separate from the body)."
   (interactive
    (let* ((file (mml-minibuffer-read-file "Attach file: "))
           (type (mml-minibuffer-read-type file))
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index 8b722c95586..32de2f60e22 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -467,14 +467,28 @@ spamoracle database."
   "Logical exclusive `or'."
   (and (or a b) (not (and a b))))
 
+(defun spam-group-ham-mark-p (group mark &optional spam)
+  (when (stringp group)
+    (let* ((marks (spam-group-ham-marks group spam))
+           (marks (if (symbolp mark)
+                      marks
+                    (mapcar 'symbol-value marks))))
+      (memq mark marks))))
+
+(defun spam-group-spam-mark-p (group mark)
+  (spam-group-ham-mark-p group mark t))
+
 (defun spam-group-ham-marks (group &optional spam)
   (when (stringp group)
-    (let ((marks (car (if spam
-                          (gnus-parameter-spam-marks group)
-                        (gnus-parameter-ham-marks group)))))
-      (if (listp (car marks))
-          (car marks)
-        marks))))
+    (let* ((marks (if spam
+                      (gnus-parameter-spam-marks group)
+                    (gnus-parameter-ham-marks group)))
+           (marks (car marks))
+           (marks (if (listp (car marks)) (car marks) marks)))
+      marks)))
+
+(defun spam-group-spam-marks (group)
+  (spam-group-ham-marks group t))
 
 (defun spam-group-spam-contents-p (group)
   (if (stringp group)
@@ -1036,12 +1050,23 @@ functions")
       (nth 2 flist))))
 
 (defun spam-list-articles (articles classification)
-  (let ((marks (mapcar 'eval (spam-group-ham-marks gnus-newsgroup-name
-                                                   (eq classification 'spam))))
-        list)
+  (let ((mark-check (if (eq classification 'spam)
+                        'spam-group-spam-mark-p
+                      'spam-group-ham-mark-p))
+        list mark-cache-yes mark-cache-no)
     (dolist (article articles)
-      (if (memq (gnus-summary-article-mark article) marks)
-          (push article list)))
+      (let ((mark (gnus-summary-article-mark article)))
+        (unless (memq mark mark-cache-no)
+          (if (memq mark mark-cache-yes)
+              (push article list)
+            ;; else, we have to actually check the mark
+            (if (funcall mark-check
+                         gnus-newsgroup-name
+                         mark)
+                (progn
+                  (push article list)
+                  (push mark mark-cache-yes))
+              (push mark mark-cache-no))))))
     list))
 
 (defun spam-register-routine (classification
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index 3dd56f2f239..c2d2d293010 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -1,7 +1,7 @@
 ;;; hl-line.el --- highlight the current line
 
 ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:  Dave Love <fx@gnu.org>
 ;; Maintainer: FSF
@@ -58,7 +58,7 @@
 ;; it to nil to avoid highlighting specific buffers, when the global
 ;; mode is used.
 
-;; In default whole the line is highlighted. The range of highlighting
+;; By default the whole line is highlighted.  The range of highlighting
 ;; can be changed by defining an appropriate function as the
 ;; buffer-local value of `hl-line-range-function'.
 
@@ -130,7 +130,7 @@ addition to `hl-line-highlight' on `post-command-hook'."
     (remove-hook 'pre-command-hook #'hl-line-unhighlight t)))
 
 (defun hl-line-highlight ()
-  "Active the Hl-Line overlay on the current line."
+  "Activate the Hl-Line overlay on the current line."
   (if hl-line-mode      ; Might be changed outside the mode function.
       (progn
         (unless hl-line-overlay
@@ -179,9 +179,9 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and
       (delete-overlay global-hl-line-overlay)))
 
 (defun hl-line-move (overlay)
-  "Move the hl-line-mode overlay.
+  "Move the Hl-Line overlay.
 If `hl-line-range-function' is non-nil, move the OVERLAY to the position
-where the function returns. If `hl-line-range-function' is nil, fill
+where the function returns.  If `hl-line-range-function' is nil, fill
 the line including the point by OVERLAY."
   (let (tmp b e)
     (if hl-line-range-function
diff --git a/lisp/info.el b/lisp/info.el
index 61d59741078..912e31f62ad 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -129,21 +129,14 @@ The Lisp code is executed when the node is selected.")
 (put 'info-menu-5 'face-alias 'info-menu-star)
 
 (defface info-xref
-  '((((min-colors 88)
-      (class color) (background light)) :foreground "blue1" :underline t)
-    (((class color) (background light)) :foreground "blue" :underline t)
-    (((min-colors 88)
-      (class color) (background dark)) :foreground "cyan1" :underline t)
-    (((class color) (background dark)) :foreground "cyan" :underline t)
-    (t :underline t))
-  "Face for Info cross-references."
+  '((t :inherit link))
+  "Face for unvisited Info cross-references."
   :group 'info)
 
 (defface info-xref-visited
-  '((default :inherit info-xref)
-    (((class color) (background light)) :foreground "magenta4")
-    (((class color) (background dark)) :foreground "violet"))
+  '((t :inherit link-visited))
   "Face for visited Info cross-references."
+  :version "22.1"
   :group 'info)
 
 (defcustom Info-fontify-visited-nodes t
diff --git a/lisp/international/latexenc.el b/lisp/international/latexenc.el
index 51d70faf76c..17a9df20843 100644
--- a/lisp/international/latexenc.el
+++ b/lisp/international/latexenc.el
@@ -1,6 +1,6 @@
 ;;; latexenc.el --- guess correct coding system in LaTeX files
 
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Arne J,Ax(Brgensen <arne@arnested.dk>
 ;; Keywords: mule, coding system, latex
@@ -167,6 +167,7 @@ coding system names is determined from `latex-inputenc-coding-alist'."
                   (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-regular-p 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)
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 332b57381c3..ce104f74b11 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -517,8 +517,8 @@ Type \\[isearch-exit] to exit, leaving point at location found.
 Type LFD (C-j) to match end of line.
 Type \\[isearch-repeat-forward] to search again forward,\
  \\[isearch-repeat-backward] to search again backward.
-Type \\[isearch-yank-word-or-char] to yank word from buffer onto end of search\
- string and search for it.
+Type \\[isearch-yank-word-or-char] to yank next word or character in buffer
+  onto the end of the search string, and search for it.
 Type \\[isearch-del-char] to delete character from end of search string.
 Type \\[isearch-yank-char] to yank char from buffer onto end of search\
  string and search for it.
diff --git a/lisp/log-view.el b/lisp/log-view.el
index 91320f08dd9..e7a58dad8b7 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -1,7 +1,7 @@
 ;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;;           Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: rcs sccs cvs log version-control
@@ -225,8 +225,8 @@
 
 (defun log-view-minor-wrap (buf f)
   (let ((data (with-current-buffer buf
-                (let* ((beg (if mark-active (region-beginning) (point)))
-                       (end (if mark-active (region-end) (point)))
+                (let* ((beg (point))
+                       (end (if mark-active (mark) (point)))
                        (fr (log-view-current-tag beg))
                        (to (log-view-current-tag end)))
                   (when (string-equal fr to)
@@ -235,8 +235,11 @@
                       (log-view-msg-next)
                       (setq to (log-view-current-tag))))
                   (cons
-                   (cons (log-view-current-file) to)
-                   (cons (log-view-current-file) fr))))))
+                   ;; The first revision has to be the one at point, for
+                   ;; operations that only take one revision
+                   ;; (e.g. cvs-mode-edit).
+                   (cons (log-view-current-file) fr)
+                   (cons (log-view-current-file) to))))))
     (let ((cvs-branch-prefix (cdar data))
           (cvs-secondary-branch-prefix (and (cdar data) (cddr data)))
           (cvs-minor-current-files
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index da801492210..7319589d9f0 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -543,7 +543,11 @@ This is set to nil by default.")
   "*If non-nil, RMAIL uses MIME feature.
 If the value is t, RMAIL automatically shows MIME decoded message.
 If the value is neither t nor nil, RMAIL does not show MIME decoded message
-until a user explicitly requires it."
+until a user explicitly requires it.
+
+Even if the value is non-nil, you can't use MIME feature
+if the feature specified by `rmail-mime-feature' is not available
+in your session."
   :type '(choice (const :tag "on" t)
                  (const :tag "off" nil)
                  (other :tag "when asked" ask))
@@ -595,7 +599,10 @@ LIMIT is the position specifying the end of header.")
 (defvar rmail-mime-feature 'rmail-mime
   "Feature to require to load MIME support in Rmail.
 When starting Rmail, if `rmail-enable-mime' is non-nil,
-this feature is required with `require'.")
+this feature is required with `require'.
+
+The default value is `rmail-mime'.  This feature is provided by
+the rmail-mime package available at <http://www.m17n.org/rmail-mime/>.")
 
 ;;;###autoload
 (defvar rmail-decode-mime-charset t
@@ -735,8 +742,14 @@ isn't provided."
     (condition-case err
         (require rmail-mime-feature)
       (error
-       (message "Feature `%s' not provided" rmail-mime-feature)
-       (sit-for 1)
+       (display-warning
+        :warning
+        (format "Although MIME support is requested
+by setting `rmail-enable-mime' to non-nil, the required feature
+`%s' (the value of `rmail-mime-feature')
+is not available in the current session.
+So, the MIME support is turned off for the moment." 
+                rmail-mime-feature))
        (setq rmail-enable-mime nil)))))
 
 
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index 97654ae92c5..bd37a41aef8 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -349,9 +349,11 @@ The optional fourth argument FROM-GNUS is set when called from GNUS."
                                                  (mail-fetch-field "sender")
                                                  "unknown"))
                     " " (current-time-string) "\n"))
-          (if mime-version
-              (insert "MIME-Version: " mime-version
-                      "\nContent-type: " content-type "\n"))
+          (when mime-version
+            (insert "MIME-Version: " mime-version)
+            ;; Some malformed MIME messages set content-type to nil.
+            (when content-type
+              (insert "\nContent-type: " content-type "\n")))
           ;; ``Quote'' "\nFrom " as "\n>From "
           ;;  (note that this isn't really quoting, as there is no requirement
           ;;   that "\n[>]+From " be quoted in the same transparent way.)
diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el
index 53cc392ad7a..dc3742c231a 100644
--- a/lisp/net/tramp-ftp.el
+++ b/lisp/net/tramp-ftp.el
@@ -1,6 +1,6 @@
 ;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP -*- coding: iso-8859-1; -*-
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
@@ -63,8 +63,40 @@ present for backward compatibility."
         (a2 (rassq 'ange-ftp-completion-hook-function file-name-handler-alist)))
     (setq file-name-handler-alist
           (delete a1 (delete a2 file-name-handler-alist)))))
-(tramp-disable-ange-ftp)
-(eval-after-load "ange-ftp" '(tramp-disable-ange-ftp))
+
+(eval-after-load "ange-ftp"
+  '(when (functionp 'tramp-disable-ange-ftp)
+     (tramp-disable-ange-ftp)))
+
+;;;###autoload
+(defun tramp-ftp-enable-ange-ftp ()
+  ;; The following code is commented out in Ange-FTP.
+
+  ;;; This regexp takes care of real ange-ftp file names (with a slash
+  ;;; and colon).
+  ;;; Don't allow the host name to end in a period--some systems use /.:
+  (or (assoc "^/[^/:]*[^/:.]:" file-name-handler-alist)
+      (setq file-name-handler-alist
+            (cons '("^/[^/:]*[^/:.]:" . ange-ftp-hook-function)
+                  file-name-handler-alist)))
+
+  ;;; This regexp recognizes absolute filenames with only one component,
+  ;;; for the sake of hostname completion.
+  (or (assoc "^/[^/:]*\\'" file-name-handler-alist)
+      (setq file-name-handler-alist
+            (cons '("^/[^/:]*\\'" . ange-ftp-completion-hook-function)
+                  file-name-handler-alist)))
+
+  ;;; This regexp recognizes absolute filenames with only one component
+  ;;; on Windows, for the sake of hostname completion.
+  (and (memq system-type '(ms-dos windows-nt))
+       (or (assoc "^[a-zA-Z]:/[^/:]*\\'" file-name-handler-alist)
+           (setq file-name-handler-alist
+                 (cons '("^[a-zA-Z]:/[^/:]*\\'" .
+                         ange-ftp-completion-hook-function)
+                       file-name-handler-alist)))))
+
+(add-hook 'tramp-ftp-unload-hook 'tramp-ftp-enable-ange-ftp)
 
 ;; Define FTP method ...
 (defcustom tramp-ftp-method "ftp"
diff --git a/lisp/net/tramp-util.el b/lisp/net/tramp-util.el
index acb10727d46..666471d6429 100644
--- a/lisp/net/tramp-util.el
+++ b/lisp/net/tramp-util.el
@@ -1,7 +1,8 @@
 ;;; -*- coding: iso-2022-7bit; -*-
 ;;; tramp-util.el --- Misc utility functions to use with Tramp
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: kai.grossjohann@gmx.net
 ;; Keywords: comm, extensions, processes
@@ -31,6 +32,10 @@
 (eval-when-compile (require 'cl))
 (require 'compile)
 (require 'tramp)
+(add-hook 'tramp-util-unload-hook
+          '(lambda ()
+             (when (featurep 'tramp)
+               (unload-feature 'tramp 'force))))
 
 ;; Define a Tramp minor mode. It's intention is to redefine some keys for Tramp
 ;; specific functions, like compilation.
@@ -42,7 +47,7 @@
       (defalias 'define-minor-mode 'identity)
       (defvar tramp-minor-mode))
   (unless (featurep 'xemacs)
-      (defalias 'add-menu-button 'identity)))
+    (defalias 'add-menu-button 'ignore)))
 
 (defvar tramp-minor-mode-map (make-sparse-keymap)
   "Keymap for Tramp minor mode.")
@@ -57,7 +62,14 @@
         (and tramp-minor-mode (tramp-tramp-file-p default-directory))))
 
 (add-hook 'find-file-hooks 'tramp-minor-mode t)
+(add-hook 'tramp-util-unload-hook
+          '(lambda ()
+             (remove-hook 'find-file-hooks 'tramp-minor-mode)))
+
 (add-hook 'dired-mode-hook 'tramp-minor-mode t)
+(add-hook 'tramp-util-unload-hook
+          '(lambda ()
+             (remove-hook 'dired-mode-hook 'tramp-minor-mode)))
 
 (defun tramp-remap-command (old-command new-command)
   "Replaces bindings of OLD-COMMAND by NEW-COMMAND.
diff --git a/lisp/net/tramp-vc.el b/lisp/net/tramp-vc.el
index c1806a4be24..368d85c8e57 100644
--- a/lisp/net/tramp-vc.el
+++ b/lisp/net/tramp-vc.el
@@ -1,7 +1,7 @@
 ;;; tramp-vc.el --- Version control integration for TRAMP.el
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pittman <daniel@danann.net>
 ;; Keywords: comm, processes
@@ -220,34 +220,37 @@ Since TRAMP doesn't do async commands yet, this function doesn't, either."
 ;; Daniel Pittman <daniel@danann.net>
 ;;-(if (fboundp 'vc-call-backend)
 ;;-    () ;; This is the new VC for which we don't have an appropriate advice yet
+;;-)
 (unless (fboundp 'process-file)
-(if (fboundp 'vc-call-backend)
+  (if (fboundp 'vc-call-backend)
+      (defadvice vc-do-command
+        (around tramp-advice-vc-do-command
+                (buffer okstatus command file &rest flags)
+                activate)
+        "Invoke tramp-vc-do-command for tramp files."
+        (let ((file (symbol-value 'file)))    ;pacify byte-compiler
+          (if (or (and (stringp file)     (tramp-tramp-file-p file))
+                  (and (buffer-file-name) (tramp-tramp-file-p (buffer-file-name))))
+              (setq ad-return-value
+                    (apply 'tramp-vc-do-command-new buffer okstatus command
+                           file ;(or file (buffer-file-name))
+                           flags))
+            ad-do-it)))
     (defadvice vc-do-command
       (around tramp-advice-vc-do-command
-              (buffer okstatus command file &rest flags)
-              activate)
+              (buffer okstatus command file last &rest flags)
+              activate)
       "Invoke tramp-vc-do-command for tramp files."
-      (let ((file (symbol-value 'file)))    ;pacify byte-compiler
-        (if (or (and (stringp file)     (tramp-tramp-file-p file))
-                (and (buffer-file-name) (tramp-tramp-file-p (buffer-file-name))))
-            (setq ad-return-value
-                  (apply 'tramp-vc-do-command-new buffer okstatus command
-                         file ;(or file (buffer-file-name))
-                         flags))
-          ad-do-it)))
-  (defadvice vc-do-command
-    (around tramp-advice-vc-do-command
-            (buffer okstatus command file last &rest flags)
-            activate)
-    "Invoke tramp-vc-do-command for tramp files."
-    (let ((file (symbol-value 'file)))  ;pacify byte-compiler
-      (if (or (and (stringp file)     (tramp-tramp-file-p file))
-              (and (buffer-file-name) (tramp-tramp-file-p (buffer-file-name))))
-          (setq ad-return-value
-                (apply 'tramp-vc-do-command buffer okstatus command
-                       (or file (buffer-file-name)) last flags))
-        ad-do-it)))))
-;;-)
+      (let ((file (symbol-value 'file)))  ;pacify byte-compiler
+        (if (or (and (stringp file)     (tramp-tramp-file-p file))
+                (and (buffer-file-name) (tramp-tramp-file-p (buffer-file-name))))
+            (setq ad-return-value
+                  (apply 'tramp-vc-do-command buffer okstatus command
+                         (or file (buffer-file-name)) last flags))
+          ad-do-it))))
+
+  (add-hook 'tramp-unload-hook
+            '(lambda () (ad-unadvise 'vc-do-command))))
 
 
 ;; XEmacs uses this to do some of its work. Like vc-do-command, we
@@ -324,6 +327,9 @@ Since TRAMP doesn't do async commands yet, this function doesn't, either."
                      (or file (buffer-file-name)) args))
       ad-do-it)))
 
+(add-hook 'tramp-unload-hook
+          '(lambda () (ad-unadvise 'vc-simple-command)))
+
 
 ;; `vc-workfile-unchanged-p'
 ;; This function does not deal well with remote files, so we do the
@@ -364,6 +370,9 @@ Since TRAMP doesn't do async commands yet, this function doesn't, either."
             (tramp-vc-workfile-unchanged-p filename want-differences-if-changed))
     ad-do-it))
 
+(add-hook 'tramp-unload-hook
+          '(lambda () (ad-unadvise 'vc-workfile-unchanged-p)))
+
 
 ;; Redefine a function from vc.el -- allow tramp files.
 ;; `save-match-data' seems not to be required -- it isn't in
@@ -445,6 +454,9 @@ filename we are thinking about..."
                      (tramp-handle-vc-user-login-name uid)))) ; get the owner name
         ad-do-it)))                     ; else call the original
 
+(add-hook 'tramp-unload-hook
+          '(lambda () (ad-unadvise 'vc-user-login-name)))
+
 
 ;; Determine the name of the user owning a file.
 (defun tramp-file-owner (filename)
@@ -486,6 +498,9 @@ filename we are thinking about..."
                      (tramp-file-owner filename)))) ; get the owner name
         ad-do-it)))                     ; else call the original
 
+(add-hook 'tramp-unload-hook
+          '(lambda () (ad-unadvise 'vc-file-owner)))
+
 
 ;; We need to make the version control software backend version
 ;; information local to the current buffer. This is because each TRAMP
@@ -506,7 +521,11 @@ This makes remote VC work correctly at the cost of some processing time."
              (tramp-tramp-file-p (buffer-file-name)))
     (make-local-variable 'vc-rcs-release)
     (setq vc-rcs-release nil)))
+
 (add-hook 'find-file-hooks 'tramp-vc-setup-for-remote t)
+(add-hook 'tramp-unload-hook
+          '(lambda ()
+             (remove-hook 'find-file-hooks 'tramp-vc-setup-for-remote)))
 
 ;; No need to load this again if anyone asks.
 (provide 'tramp-vc)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 8555c9a83c5..10a5dd9eedf 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2,7 +2,7 @@
 ;;; tramp.el --- Transparent Remote Access, Multiple Protocol
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Kai Gro,A_(Bjohann <kai.grossjohann@gmx.net>
 ;;         Michael Albinus <michael.albinus@gmx.de>
@@ -67,8 +67,15 @@
 
 ;; The Tramp version number and bug report address, as prepared by configure.
 (require 'trampver)
+(add-hook 'tramp-unload-hook
+          '(lambda ()
+             (when (featurep 'trampver)
+               (unload-feature 'trampver 'force))))
+
+(if (featurep 'xemacs)
+    (require 'timer-funcs)
+  (require 'timer))
 
-(require 'timer)
 (require 'format-spec)                  ;from Gnus 5.8, also in tar ball
 ;; As long as password.el is not part of (X)Emacs, it shouldn't
 ;; be mandatory
@@ -87,6 +94,10 @@
 
 (autoload 'tramp-uuencode-region "tramp-uu"
   "Implementation of `uuencode' in Lisp.")
+(add-hook 'tramp-unload-hook
+          '(lambda ()
+             (when (featurep 'tramp-uu)
+               (unload-feature 'tramp-uu 'force))))
 
 (unless (fboundp 'uudecode-decode-region)
   (autoload 'uudecode-decode-region "uudecode"))
@@ -110,10 +121,20 @@ Nil means to use a separate filename syntax for Tramp.")
 ;; tramp-ftp supports Ange-FTP only.  Not suited for XEmacs therefore.
 (unless (featurep 'xemacs)
   (eval-after-load "tramp"
-    '(require 'tramp-ftp)))
+    '(progn
+       (require 'tramp-ftp)
+       (add-hook 'tramp-unload-hook
+                 '(lambda ()
+                    (when (featurep 'tramp-ftp)
+                      (unload-feature 'tramp-ftp 'force)))))))
 (when (and tramp-unified-filenames (featurep 'xemacs))
   (eval-after-load "tramp"
-    '(require 'tramp-efs)))
+    '(progn
+       (require 'tramp-efs)
+       (add-hook 'tramp-unload-hook
+                 '(lambda ()
+                    (when (featurep 'tramp-efs)
+                      (unload-feature 'tramp-efs 'force)))))))
 
 ;; tramp-smb uses "smbclient" from Samba.
 ;; Not available under Cygwin and Windows, because they don't offer
@@ -121,7 +142,12 @@ Nil means to use a separate filename syntax for Tramp.")
 ;; UNC file names like "//host/share/localname".
 (unless (memq system-type '(cygwin windows-nt))
   (eval-after-load "tramp"
-    '(require 'tramp-smb)))
+    '(progn
+       (require 'tramp-smb)
+       (add-hook 'tramp-unload-hook
+                 '(lambda ()
+                    (when (featurep 'tramp-smb)
+                      (unload-feature 'tramp-smb 'force)))))))
 
 (eval-when-compile
   (require 'cl)
@@ -1445,7 +1471,7 @@ the visited file modtime.")
         ((fboundp 'md5-encode)
          (lambda (x) (base64-encode-string
                       (funcall (symbol-function 'md5-encode) x))))
-        (t (error "Coulnd't find an `md5' function")))
+        (t (error "Couldn't find an `md5' function")))
   "Function to call for running the MD5 algorithm.")
 
 (defvar tramp-end-of-output
@@ -2012,6 +2038,7 @@ The intent is to protect against `obsolete variable' warnings."
      (let ((,variable ,value))
        ,@body)))
 (put 'tramp-let-maybe 'lisp-indent-function 2)
+(put 'tramp-let-maybe 'edebug-form-spec t)
 
 ;;; Config Manipulation Functions:
 
@@ -2370,8 +2397,8 @@ target of the symlink differ."
      ;; 8. File modes, as a string of ten letters or dashes as in ls -l.
      res-filemodes
      ;; 9. t iff file's gid would change if file were deleted and
-     ;; recreated.
-     nil                                ;hm?
+     ;; recreated.  Will be set in `tramp-convert-file-attributes'
+     t
      ;; 10. inode number.
      res-inode
      ;; 11. Device number.  Will be replaced by a virtual device number.
@@ -2627,9 +2654,12 @@ of."
 (defun tramp-handle-file-ownership-preserved-p (filename)
   "Like `file-ownership-preserved-p' for tramp files."
   (with-parsed-tramp-file-name filename nil
-    (or (not (file-exists-p filename))
-        ;; Existing files must be writable.
-        (zerop (tramp-run-test "-O" filename)))))
+    (let ((attributes (file-attributes filename)))
+      ;; Return t if the file doesn't exist, since it's true that no
+      ;; information would be lost by an (attempted) delete and create.
+      (or (null attributes)
+          (= (nth 2 attributes)
+             (tramp-get-remote-uid multi-method method user host))))))
 
 ;; Other file name ops.
 
@@ -3487,6 +3517,17 @@ the result will be a local, non-Tramp, filename."
         (when (string-match "\\`\\(~[^/]*\\)\\(.*\\)\\'" localname)
           (let ((uname (match-string 1 localname))
                 (fname (match-string 2 localname)))
+            ;; We cannot simply apply "~/", because under sudo "~/" is
+            ;; expanded to the local user home directory but to the
+            ;; root home directory.  On the other hand, using always
+            ;; the default user name for tilde expansion is not
+            ;; appropriate either, because ssh and companions might
+            ;; use a user name from the config file.
+            (when (and (string-equal uname "~")
+                       (string-match
+                        "\\`su\\(do\\)?\\'"
+                        (tramp-find-method multi-method method user host)))
+              (setq uname (concat uname (or user "root"))))
             ;; CCC fanatic error checking?
             (set-buffer (tramp-get-buffer multi-method method user host))
             (erase-buffer)
@@ -3499,17 +3540,24 @@ the result will be a local, non-Tramp, filename."
             (setq uname (buffer-substring (point) (tramp-line-end-position)))
             (setq localname (concat uname fname))
             (erase-buffer)))
+        ;; There might be a double slash, for example when "~/"
+        ;; expands to "/". Remove this.
+        (while (string-match "//" localname)
+          (setq localname (replace-match "/" t t localname)))
         ;; No tilde characters in file name, do normal
         ;; expand-file-name (this does "/./" and "/../").  We bind
-        ;; directory-sep-char here for XEmacs on Windows, which
-        ;; would otherwise use backslash.
+        ;; directory-sep-char here for XEmacs on Windows, which would
+        ;; otherwise use backslash.  `default-directory' is bound to
+        ;; "/", because on Windows there would be problems with UNC
+        ;; shares or Cygwin mounts.
         (tramp-let-maybe directory-sep-char ?/
-          (tramp-make-tramp-file-name
-           multi-method (or method (tramp-find-default-method user host))
-           user host
-           (tramp-drop-volume-letter
-            (tramp-run-real-handler 'expand-file-name
-                                    (list localname)))))))))
+          (let ((default-directory "/"))
+            (tramp-make-tramp-file-name
+             multi-method (or method (tramp-find-default-method user host))
+             user host
+             (tramp-drop-volume-letter
+              (tramp-run-real-handler 'expand-file-name
+                                      (list localname))))))))))
 
 ;; old version follows.  it uses ".." to cross file handler
 ;; boundaries.
@@ -4294,6 +4342,17 @@ Falls back to normal file name handler if no tramp file name handler exists."
              (cons tramp-completion-file-name-regexp
                    'tramp-completion-file-name-handler))
 
+;;;###autoload
+(defun tramp-unload-file-name-handler-alist ()
+  (setq file-name-handler-alist
+        (delete (rassoc 'tramp-file-name-handler
+                        file-name-handler-alist)
+                (delete (rassoc 'tramp-completion-file-name-handler
+                                file-name-handler-alist)
+                        file-name-handler-alist))))
+
+(add-hook 'tramp-unload-hook 'tramp-unload-file-name-handler-alist)
+
 (defun tramp-repair-jka-compr ()
   "If jka-compr is already loaded, move it to the front of
 `file-name-handler-alist'.  On Emacs 22 or so this will not be
@@ -4353,22 +4412,16 @@ necessary anymore."
                  (read (current-buffer))))))
         (list (expand-file-name name))))))
 
-;; Check for complete.el and override PC-expand-many-files if appropriate.
-(eval-and-compile
-  (defun tramp-save-PC-expand-many-files (name))); avoid compiler warning
-
-(defun tramp-setup-complete ()
-  (fset 'tramp-save-PC-expand-many-files
-        (symbol-function 'PC-expand-many-files))
-  (defun PC-expand-many-files (name)
-    (if (tramp-tramp-file-p name)
-        (funcall (symbol-function 'expand-many-files) name)
-      (tramp-save-PC-expand-many-files name))))
-
-;; Why isn't eval-after-load sufficient?
-(if (fboundp 'PC-expand-many-files)
-    (tramp-setup-complete)
-  (eval-after-load "complete" '(tramp-setup-complete)))
+(eval-after-load "complete"
+  '(progn
+     (defadvice PC-expand-many-files
+       (around tramp-advice-PC-expand-many-files (name) activate)
+       "Invoke `tramp-handle-expand-many-files' for tramp files."
+       (if (tramp-tramp-file-p name)
+           (setq ad-return-value (tramp-handle-expand-many-files name))
+         ad-do-it))
+     (add-hook 'tramp-unload-hook
+               '(lambda () (ad-unadvise 'PC-expand-many-files)))))
 
 ;;; File name handler functions for completion mode
 
@@ -4940,6 +4993,9 @@ Function may have 0-3 parameters."
              auto-save-default)
     (auto-save-mode 1)))
 (add-hook 'find-file-hooks 'tramp-set-auto-save t)
+(add-hook 'tramp-unload-hook
+          '(lambda ()
+             (remove-hook 'find-file-hooks 'tramp-set-auto-save)))
 
 (defun tramp-run-test (switch filename)
   "Run `test' on the remote system, given a SWITCH and a FILENAME.
@@ -5532,6 +5588,7 @@ Maybe the different regular expressions need to be tuned.
                    (or user (user-login-name)) host method)
     (let ((process-environment (copy-sequence process-environment)))
       (setenv "TERM" tramp-terminal-type)
+      (setenv "PS1" "$ ")
       (let* ((default-directory (tramp-temporary-file-directory))
              ;; If we omit the conditional here, then we would use
              ;; `undecided-dos' in some cases.  With the conditional,
@@ -5608,6 +5665,7 @@ arguments, and xx will be used as the host name to connect to.
         (setq login-args (cons "-p" (cons (match-string 2 host) login-args)))
         (setq real-host (match-string 1 host)))
       (setenv "TERM" tramp-terminal-type)
+      (setenv "PS1" "$ ")
       (let* ((default-directory (tramp-temporary-file-directory))
              ;; If we omit the conditional, we would use
              ;; `undecided-dos' in some cases.  With the conditional,
@@ -5659,6 +5717,7 @@ prompt than you do, so it is not at all unlikely that the variable
                    (or user "<root>") method)
     (let ((process-environment (copy-sequence process-environment)))
       (setenv "TERM" tramp-terminal-type)
+      (setenv "PS1" "$ ")
       (let* ((default-directory (tramp-temporary-file-directory))
              ;; If we omit the conditional, we use `undecided-dos' in
              ;; some cases.  With the conditional, we use nil in these
@@ -5723,6 +5782,7 @@ log in as u2 to h2."
     (tramp-message 7 "Opening `%s' connection..." multi-method)
     (let ((process-environment (copy-sequence process-environment)))
       (setenv "TERM" tramp-terminal-type)
+      (setenv "PS1" "$ ")
       (let* ((default-directory (tramp-temporary-file-directory))
              ;; If we omit the conditional, we use `undecided-dos' in
              ;; some cases.  With the conditional, we use nil in these
@@ -6203,8 +6263,17 @@ locale to C and sets up the remote shell search path."
                                    "ln" tramp-remote-path nil)))
     (when ln
       (tramp-set-connection-property "ln" ln multi-method method user host)))
+  ;; Set uid and gid.
   (erase-buffer)
+  (tramp-send-command multi-method method user host "id -u; id -g")
+  (tramp-wait-for-output)
+  (goto-char (point-min))
+  (tramp-set-connection-property
+   "uid" (read (current-buffer)) multi-method method user host)
+  (tramp-set-connection-property
+   "gid" (read (current-buffer)) multi-method method user host)
   ;; Find the right encoding/decoding commands to use.
+  (erase-buffer)
   (unless (tramp-method-out-of-band-p multi-method method user host)
     (tramp-find-inline-encoding multi-method method user host))
   ;; If encoding/decoding command are given, test to see if they work.
@@ -6700,6 +6769,10 @@ Return ATTR."
   (unless (stringp (nth 8 attr))
     ;; Convert file mode bits to string.
     (setcar (nthcdr 8 attr) (tramp-file-mode-from-int (nth 8 attr))))
+  ;; Set file's gid change bit.
+  (setcar (nthcdr 9 attr)
+          (not (= (nth 3 attr)
+                  (tramp-get-remote-gid multi-method method user host))))
   ;; Set virtual device number.
   (setcar (nthcdr 11 attr)
           (tramp-get-device multi-method method user host))
@@ -6957,6 +7030,12 @@ If both MULTI-METHOD and METHOD are nil, do a lookup in
 (defun tramp-get-remote-ln (multi-method method user host)
   (tramp-get-connection-property "ln" nil multi-method method user host))
 
+(defun tramp-get-remote-uid (multi-method method user host)
+  (tramp-get-connection-property "uid" nil multi-method method user host))
+
+(defun tramp-get-remote-gid (multi-method method user host)
+  (tramp-get-connection-property "gid" nil multi-method method user host))
+
 ;; Get a property of a TRAMP connection.
 (defun tramp-get-connection-property
   (property default multi-method method user host)
@@ -6967,7 +7046,7 @@ If the value is not set for the connection, return `default'"
     (let (error)
       (condition-case nil
           (symbol-value (intern (concat "tramp-connection-property-" property)))
-        (error  default)))))
+        (error default)))))
 
 ;; Set a property of a TRAMP connection.
 (defun tramp-set-connection-property
@@ -7045,7 +7124,9 @@ as default."
     "Invoke `tramp-handle-make-auto-save-file-name' for tramp files."
     (if (and (buffer-file-name) (tramp-tramp-file-p (buffer-file-name)))
         (setq ad-return-value (tramp-handle-make-auto-save-file-name))
-      ad-do-it)))
+      ad-do-it))
+  (add-hook 'tramp-unload-hook
+            '(lambda () (ad-unadvise 'make-auto-save-file-name))))
 
 ;; In Emacs < 22 and XEmacs < 21.5 autosaved remote files have
 ;; permission 0666 minus umask. This is a security threat.
@@ -7069,7 +7150,10 @@ as default."
             (and (featurep 'xemacs)
                  (= emacs-major-version 21)
                  (> emacs-minor-version 4)))
-  (add-hook 'auto-save-hook 'tramp-set-auto-save-file-modes))
+  (add-hook 'auto-save-hook 'tramp-set-auto-save-file-modes)
+  (add-hook 'tramp-unload-hook
+            '(lambda ()
+               (remove-hook 'auto-save-hook 'tramp-set-auto-save-file-modes))))
 
 (defun tramp-subst-strs-in-string (alist string)
   "Replace all occurrences of the string FROM with TO in STRING.
@@ -7296,7 +7380,9 @@ Only works for Bourne-like shells."
               (setq ad-return-value (list name))))
         ;; If it is not a Tramp file, just run the original function.
         (let ((res ad-do-it))
-          (setq ad-return-value (or res (list name))))))))
+          (setq ad-return-value (or res (list name)))))))
+  (add-hook 'tramp-unload-hook
+            '(lambda () (ad-unadvise 'file-expand-wildcards))))
 
 ;; Tramp version is useful in a number of situations.
 
@@ -7521,6 +7607,25 @@ Therefore, the contents of files might be included in the debug buffer(s).")
 
 (defalias 'tramp-submit-bug 'tramp-bug)
 
+;; Checklist for `tramp-unload-hook'
+;; - Unload all `tramp-*' packages
+;; - Reset `file-name-handler-alist'
+;; - Cleanup hooks where Tramp functions are in
+;; - Cleanup advised functions
+;; - Cleanup autoloads
+;;;###autoload
+(defun tramp-unload-tramp ()
+  (interactive)
+  ;; When Tramp is not loaded yet, its autoloads are still active.
+  (tramp-unload-file-name-handler-alist)
+  ;; ange-ftp settings must be enabled.
+  (when (functionp 'tramp-ftp-enable-ange-ftp)
+    (funcall (symbol-function 'tramp-ftp-enable-ange-ftp)))
+  ;; `tramp-util' unloads also `tramp'.
+  (condition-case nil ;; maybe its not loaded yet.
+      (unload-feature (if (featurep 'tramp-util) 'tramp-util 'tramp) 'force)
+    (error nil)))
+
 (provide 'tramp)
 
 ;; Make sure that we get integration with the VC package.
@@ -7528,7 +7633,12 @@ Therefore, the contents of files might be included in the debug buffer(s).")
 ;; This must come after (provide 'tramp) because tramp-vc.el
 ;; requires tramp.
 (eval-after-load "vc"
-  '(require 'tramp-vc))
+  '(progn
+     (require 'tramp-vc)
+     (add-hook 'tramp-unload-hook
+               '(lambda ()
+                  (when (featurep 'tramp-vc)
+                    (unload-feature 'tramp-vc 'force))))))
 
 ;;; TODO:
 
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 650f1a727a7..632d958249d 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -30,7 +30,7 @@
 ;; are auto-frobbed from configure.ac, so you should edit that file and run
 ;; "autoconf && ./configure" to change them.
 
-(defconst tramp-version "2.0.51"
+(defconst tramp-version "2.0.52"
   "This version of Tramp.")
 
 (defconst tramp-bug-report-address "tramp-devel@gnu.org"
diff --git a/lisp/outline.el b/lisp/outline.el
index 8a05aaf0cd9..eed84bd61c7 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -803,11 +803,12 @@ Show the heading too, if it is currently invisible."
   (outline-flag-subtree t))
 
 (defun hide-leaves ()
-  "Hide all body after this heading at deeper levels."
+  "Hide the body after this heading and at deeper levels."
   (interactive)
   (save-excursion
     (outline-back-to-heading)
-    (outline-end-of-heading)
+;; Turned off to fix bug reported by Otto Maddox on 22 Nov 2005.
+;;    (outline-end-of-heading)
     (hide-region-body (point) (progn (outline-end-of-subtree) (point)))))
 
 (defun show-subtree ()
diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index 85e15470dbc..32dfd6254c3 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -89,7 +89,7 @@
     (set what ww)
     first))
 
-(defvar doc-mode-map
+(defvar doctor-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map "\n" 'doctor-read-print)
     (define-key map "\r" 'doctor-ret-or-read)
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el
index cf119bde719..06a141016e5 100644
--- a/lisp/progmodes/cpp.el
+++ b/lisp/progmodes/cpp.el
@@ -526,6 +526,8 @@ You can also use the keyboard accelerators indicated like this: [K]ey."
                      'cpp-edit-toggle-unknown)
     (insert (format "\n\n\n%39s: %14s %14s %7s\n\n" "Expression"
                     "[T]rue Face" "[F]alse Face" "[W]rite"))
+
+    (setq symbols (reverse symbols))
     (while symbols
       (let*  ((symbol (car symbols))
               (entry (assoc symbol cpp-edit-list))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 6ed2e39e4e8..0ed58fd558e 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1743,7 +1743,7 @@ lines count as headers.
   (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
+            '(lambda () (run-python nil t)) nil t) ; need it running
   (if (featurep 'hippie-exp)
       (set (make-local-variable 'hippie-expand-try-functions-list)
            (cons 'python-try-complete hippie-expand-try-functions-list)))
diff --git a/lisp/ses.el b/lisp/ses.el
index 4c959c015a7..debb22d84db 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -1,6 +1,6 @@
 ;;; ses.el -- Simple Emacs Spreadsheet  -*- coding: utf-8 -*-
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
@@ -148,8 +148,7 @@ Each function is called with ARG=1."
         (newmap (make-sparse-keymap)))
     (set-keymap-parent newmap minibuffer-local-map)
     (while keys
-      (define-key newmap (car keys) (cadr keys))
-      (setq keys (cddr keys)))
+      (define-key newmap (pop keys) (pop keys)))
     newmap)
   "Local keymap for SES minibuffer cell-editing.")
 
@@ -1865,20 +1864,20 @@ cell formula was unsafe and user declined confirmation."
 (defun ses-read-cell (row col newval)
   "Self-insert for initial character of cell function."
   (interactive
-   (let ((initial (this-command-keys))
-         (rowcol  (progn (ses-check-curcell) (ses-sym-rowcol ses--curcell))))
+   (let* ((initial (this-command-keys))
+          (rowcol  (progn (ses-check-curcell) (ses-sym-rowcol ses--curcell)))
+          (curval (ses-cell-formula (car rowcol) (cdr rowcol))))
      (barf-if-buffer-read-only)
-     (if (string= initial "\"")
-         (setq initial "\"\"") ;Enter a string
-       (if (string= initial "(")
-           (setq initial "()"))) ;Enter a formula list
      (list (car rowcol)
            (cdr rowcol)
-           (read-from-minibuffer (format "Cell %s: " ses--curcell)
-                                 (cons initial 2)
-                                 ses-mode-edit-map
-                                 t ;Convert to Lisp object
-                                 'ses-read-cell-history))))
+           (read-from-minibuffer
+            (format "Cell %s: " ses--curcell)
+            (cons (if (equal initial "\"") "\"\""
+                    (if (equal initial "(") "()" initial)) 2)
+            ses-mode-edit-map
+            t                         ;Convert to Lisp object
+            'ses-read-cell-history
+            (prin1-to-string curval)))))
   (when (ses-edit-cell row col newval)
     (ses-command-hook) ;Update cell widths before movement
     (dolist (x ses-after-entry-functions)
diff --git a/lisp/simple.el b/lisp/simple.el
index 1f00d52155e..087961fabac 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1,7 +1,7 @@
 ;;; simple.el --- basic editing commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -3185,8 +3185,9 @@ for mark off the local mark ring \(this does not affect the global
 mark ring\).  Use \\[pop-global-mark] to jump to a mark off the global
 mark ring \(see `pop-global-mark'\).
 
-Repeating the \\[set-mark-command] command without the prefix jumps to
-the next position off the local (or global) mark ring.
+If `set-mark-command-repeat-pop' is non-nil, repeating
+the \\[set-mark-command] command with no prefix pops the next position
+off the local (or global) mark ring and jumps there.
 
 With a double \\[universal-argument] prefix argument, e.g. \\[universal-argument] \
 \\[universal-argument] \\[set-mark-command], unconditionally
@@ -3734,7 +3735,13 @@ To ignore intangibility, bind `inhibit-point-motion-hooks' to t."
   (or arg (setq arg 1))
   (if (/= arg 1)
       (line-move (1- arg) t))
-  (beginning-of-line 1)
+  
+  ;; Move to beginning-of-line, ignoring fields and invisibles.
+  (skip-chars-backward "^\n")
+  (while (and (not (bobp)) (line-move-invisible-p (1- (point))))
+    (goto-char (previous-char-property-change (1- (point))))
+    (skip-chars-backward "^\n"))
+
   (let ((orig (point)))
     (vertical-motion 0)
     (if (/= orig (point))
@@ -5028,8 +5035,8 @@ select the completion near point.\n\n")))))
       (goto-char (point-min))
       (search-forward "\n\n")
       (forward-line 1))))
-
-;; Support keyboard commands to turn on various modifiers.
+
+;;; Support keyboard commands to turn on various modifiers.
 
 ;; These functions -- which are not commands -- each add one modifier
 ;; to the following event.
@@ -5094,7 +5101,7 @@ PREFIX is the string that represents this modifier in an event type symbol."
 (define-key function-key-map [?\C-x ?@ ?a] 'event-apply-alt-modifier)
 (define-key function-key-map [?\C-x ?@ ?S] 'event-apply-shift-modifier)
 (define-key function-key-map [?\C-x ?@ ?c] 'event-apply-control-modifier)
-
+
 ;;;; Keypad support.
 
 ;;; Make the keypad keys act like ordinary typing keys.  If people add
@@ -5189,7 +5196,8 @@ after it has been set up properly in other respects."
          (error "Cannot clone a file-visiting buffer"))
      (if (get major-mode 'no-clone)
          (error "Cannot clone a buffer in %s mode" mode-name))
-     (list (if current-prefix-arg (read-string "Name: "))
+     (list (if current-prefix-arg
+               (read-buffer "Name of new cloned buffer: " (current-buffer)))
            t)))
   (if buffer-file-name
       (error "Cannot clone a file-visiting buffer"))
@@ -5236,7 +5244,12 @@ after it has been set up properly in other respects."
       ;; Run any hooks (typically set up by the major mode
       ;; for cloning to work properly).
       (run-hooks 'clone-buffer-hook))
-    (if display-flag (pop-to-buffer new))
+    (if display-flag
+        ;; Presumably the current buffer is shown in the selected frame, so
+        ;; we want to display the clone elsewhere.
+        (let ((same-window-regexps nil)
+              (same-window-buffer-names))
+          (pop-to-buffer new)))
     new))
 
 
@@ -5259,7 +5272,7 @@ front of the list of recently selected ones."
      (if (get major-mode 'no-clone-indirect)
          (error "Cannot indirectly clone a buffer in %s mode" mode-name))
      (list (if current-prefix-arg
-               (read-string "BName of indirect buffer: "))
+               (read-buffer "Name of indirect buffer: " (current-buffer)))
            t)))
   (if (get major-mode 'no-clone-indirect)
       (error "Cannot indirectly clone a buffer in %s mode" mode-name))
@@ -5278,7 +5291,13 @@ front of the list of recently selected ones."
 Select the new buffer in another window.
 Optional second arg NORECORD non-nil means do not put this buffer at
 the front of the list of recently selected ones."
-  (interactive "bClone buffer in other window: ")
+  (interactive
+   (progn
+     (if (get major-mode 'no-clone-indirect)
+         (error "Cannot indirectly clone a buffer in %s mode" mode-name))
+     (list (if current-prefix-arg
+               (read-buffer "Name of indirect buffer: " (current-buffer)))
+           t)))
   (let ((pop-up-windows t))
     (set-buffer buffer)
     (clone-indirect-buffer nil t norecord)))
diff --git a/lisp/startup.el b/lisp/startup.el
index df20bc14685..d2f5de838c8 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -41,7 +41,9 @@
   :group 'internal)
 
 (defcustom inhibit-splash-screen nil
-  "*Non-nil inhibits the startup screen.
+  "Non-nil inhibits the startup screen.
+It also inhibits display of the initial message in the *scratch* buffer.
+
 This is for use in your personal init file, once you are familiar
 with the contents of the startup screen."
   :type 'boolean
@@ -1087,7 +1089,9 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 
 ")
   "Initial message displayed in *scratch* buffer at startup.
-If this is nil, no message will be displayed."
+If this is nil, no message will be displayed.
+If `inhibit-splash-screen' is non-nil, then no message is displayed,
+regardless of the value of this variable."
   :type '(choice (text :tag "Message")
                  (const :tag "none" nil))
   :group 'initialization)
@@ -1631,7 +1635,7 @@ normal otherwise."
           (longopts
            (append '(("--funcall") ("--load") ("--insert") ("--kill")
                      ("--directory") ("--eval") ("--execute") ("--no-splash")
-                     ("--find-file") ("--visit") ("--file"))
+                     ("--find-file") ("--visit") ("--file") ("--no-desktop"))
                    (mapcar (lambda (elt)
                              (list (concat "-" (car elt))))
                            command-switch-alist)))
@@ -1731,6 +1735,13 @@ normal otherwise."
                 ((equal argi "-kill")
                  (kill-emacs t))
 
+                ;; This is for when they use --no-desktop with -q, or
+                ;; don't load Desktop in their .emacs.  If desktop.el
+                ;; _is_ loaded, it will handle this switch, and we
+                ;; won't see it by the time we get here.
+                ((equal argi "-no-desktop")
+                 (message "\"--no-desktop\" ignored because the Desktop package is not loaded"))
+
                 ((string-match "^\\+[0-9]+\\'" argi)
                  (setq line (string-to-number argi)))
 
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index ac067f34fef..a083d308036 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -1,7 +1,7 @@
 ;;; w32-win.el --- parse switches controlling interface with W32 window system
 
 ;; Copyright (C) 1993, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallo
 ;; Keywords: terminals
@@ -1232,7 +1232,7 @@ font dialog to get the matching FONTS. Otherwise use a pop-up menu
         (png "libpng13d.dll" "libpng13.dll" "libpng12d.dll" "libpng12.dll" "libpng.dll")
         (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll")
         (tiff "libtiff3.dll" "libtiff.dll")
-        (gif "libungif.dll")))
+        (gif "giflib4.dll" "libungif4.dll" "libungif.dll")))
 
 ;; arch-tag: 69fb1701-28c2-4890-b351-3d1fe4b4f166
 ;;; w32-win.el ends here
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 6bb3c0d642c..c708355ce7e 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -1049,6 +1049,7 @@ At most `bibtex-entry-kill-ring-max' items are kept here.")
   "Completion table for BibTeX string keys.
 Initialized from `bibtex-predefined-strings' and `bibtex-string-files'.")
 (make-variable-buffer-local 'bibtex-strings)
+(put 'bibtex-strings 'risky-local-variable t)
 
 (defvar bibtex-reference-keys
   (lazy-completion-table bibtex-reference-keys
@@ -1056,6 +1057,7 @@ Initialized from `bibtex-predefined-strings' and `bibtex-string-files'.")
   "Completion table for BibTeX reference keys.
 The CDRs of the elements are t for header keys and nil for crossref keys.")
 (make-variable-buffer-local 'bibtex-reference-keys)
+(put 'bibtex-reference-keys 'risky-local-variable t)
 
 (defvar bibtex-buffer-last-parsed-tick nil
   "Value of `buffer-modified-tick' last time buffer was parsed for keys.")
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index a4930324e95..61192bbbe1c 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -2080,7 +2080,8 @@ The word checked is the word at the mouse position."
                                  corrects)
                        '()))
          (affix      (car (cdr (cdr (cdr poss)))))
-         (base-menu  (let ((save (if (consp affix)
+         show-affix-info
+         (base-menu  (let ((save (if (and (consp affix) show-affix-info)
                                      (list
                                       (list (concat "Save affix: " (car affix))
                                             'save)
@@ -2121,7 +2122,8 @@ The word checked is the word at the mouse position."
                                  corrects)
                        '()))
          (affix      (car (cdr (cdr (cdr poss)))))
-         (menu       (let ((save (if (consp affix)
+         show-affix-info
+         (menu       (let ((save (if (and (consp affix) show-affix-info)
                                      (vector
                                       (concat "Save affix: " (car affix))
                                       (list 'flyspell-do-correct
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 7c686091319..926cc56bfe9 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, wp
 ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
-;; Version: 4.03
+;; Version: 4.04
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -81,6 +81,10 @@
 ;;
 ;; Changes since version 4.00:
 ;; ---------------------------
+;; Version 4.04
+;;    - Cleanup tags display in agenda.
+;;    - Bug fixes.
+;;
 ;; Version 4.03
 ;;    - Table alignment fixed for use with wide characters.
 ;;    - `C-c -' leaves cursor in current table line.
@@ -111,7 +115,7 @@
 
 ;;; Customization variables
 
-(defvar org-version "4.03"
+(defvar org-version "4.04"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -608,7 +612,8 @@ the prefix, you could use:
 
   (setq org-agenda-prefix-format \"  %-11:c% s\")
 
-See also the variable `org-agenda-remove-times-when-in-prefix'."
+See also the variables `org-agenda-remove-times-when-in-prefix' and
+`org-agenda-remove-tags-when-in-prefix'."
   :type 'string
   :group 'org-agenda)
 
@@ -691,6 +696,16 @@ agenda entries."
   :group 'org-agenda
   :type 'boolean)
 
+(defcustom org-agenda-remove-tags-when-in-prefix nil
+  "Non-nil means, the tags from copy of headline in agenda.
+When this is the symbol `prefix', only remove tags when
+`org-agenda-prefix-format' contains a `%T' specifier."
+  :group 'org-agenda
+  :type '(choice
+          (const :tag "Always" t)
+          (const :tag "Never" nil)
+          (const :tag "When prefix format contains %T" prefix)))
+
 (defgroup org-structure nil
   "Options concerning structure editing in Org-mode."
   :tag "Org Structure"
@@ -1875,42 +1890,43 @@ When this is non-nil, the headline after the keyword is set to the
 
 ;; Tell the compiler about dynamically scoped variables,
 ;; and variables from other packages
-(defvar zmacs-regions)
-(defvar original-date)
-(defvar org-transient-mark-mode)
-(defvar org-old-auto-fill-inhibit-regexp)
-(defvar orgtbl-mode-menu)
-(defvar org-html-entities)
-(defvar org-goto-start-pos)
-(defvar org-cursor-color)
-(defvar org-time-was-given)
-(defvar org-ts-what)
-(defvar mark-active)
-(defvar timecnt)
-(defvar levels-open)
-(defvar title)
-(defvar author)
-(defvar email)
-(defvar text)
-(defvar entry)
-(defvar date)
-(defvar language)
-(defvar options)
-(defvar ans1)
-(defvar ans2)
-(defvar starting-day)
-(defvar include-all-loc)
-(defvar vm-message-pointer)
-(defvar vm-folder-directory)
-(defvar wl-summary-buffer-elmo-folder)
-(defvar wl-summary-buffer-folder-name)
-(defvar gnus-group-name)
-(defvar gnus-article-current)
-(defvar w3m-current-url)
-(defvar org-selected-point)
-(defvar calendar-mode-map)
-(defvar remember-save-after-remembering)
-(defvar remember-data-file)
+(eval-when-compile
+  (defvar zmacs-regions)
+  (defvar original-date)
+  (defvar org-transient-mark-mode)
+  (defvar org-old-auto-fill-inhibit-regexp)
+  (defvar orgtbl-mode-menu)
+  (defvar org-html-entities)
+  (defvar org-goto-start-pos)
+  (defvar org-cursor-color)
+  (defvar org-time-was-given)
+  (defvar org-ts-what)
+  (defvar mark-active)
+  (defvar timecnt)
+  (defvar levels-open)
+  (defvar title)
+  (defvar author)
+  (defvar email)
+  (defvar text)
+  (defvar entry)
+  (defvar date)
+  (defvar language)
+  (defvar options)
+  (defvar ans1)
+  (defvar ans2)
+  (defvar starting-day)
+  (defvar include-all-loc)
+  (defvar vm-message-pointer)
+  (defvar vm-folder-directory)
+  (defvar wl-summary-buffer-elmo-folder)
+  (defvar wl-summary-buffer-folder-name)
+  (defvar gnus-group-name)
+  (defvar gnus-article-current)
+  (defvar w3m-current-url)
+  (defvar org-selected-point)
+  (defvar calendar-mode-map)
+  (defvar remember-save-after-remembering)
+  (defvar remember-data-file))
 
 
 ;;; Define the mode
@@ -3100,7 +3116,7 @@ heading be marked DONE, and the current time will be added."
     (if (string-match "\\(.*\\)::\\(.*\\)" org-archive-location)
         (progn
           (setq file (format (match-string 1 org-archive-location)
-                             (file-name-nondirectory buffer-file-name))
+                             (file-name-nondirectory (buffer-file-name)))
                 heading (match-string 2 org-archive-location)))
       (error "Invalid `org-archive-location'"))
     (if (> (length file) 0)
@@ -4031,8 +4047,9 @@ in the timestamp determines what will be changed."
                   (nthcdr 6 time0))))
     (if (eq what 'calendar)
         (let ((cal-date
-               (save-match-data
-                 (with-current-buffer "*Calendar*"
+               (save-excursion
+                 (save-match-data
+                   (set-buffer "*Calendar*")
                    (calendar-cursor-to-date)))))
           (setcar (nthcdr 4 time0) (nth 0 cal-date)) ; month
           (setcar (nthcdr 3 time0) (nth 1 cal-date)) ; day
@@ -4285,7 +4302,7 @@ first press `1' to indicate that the agenda should be temporarily (until the
 next use of \\[org-agenda]) restricted to the current file."
   (interactive "P")
   (catch 'exit
-    (let ((restrict-ok (and buffer-file-name (eq major-mode 'org-mode)))
+    (let ((restrict-ok (and (buffer-file-name) (eq major-mode 'org-mode)))
           (custom org-agenda-custom-commands)
           c entry key type string)
       (put 'org-agenda-files 'org-restrict nil)
@@ -4320,7 +4337,7 @@ C   Configure your own agenda commands")
         (message "")
         (when (equal c ?1)
           (if restrict-ok
-              (put 'org-agenda-files 'org-restrict (list buffer-file-name))
+              (put 'org-agenda-files 'org-restrict (list (buffer-file-name)))
             (error "Cannot restrict agenda to current buffer"))
           (message "Press key for agenda command%s"
                    (if restrict-ok " (restricted to current file)" ""))
@@ -4444,8 +4461,8 @@ dates."
          (dotodo include-all)
          (doclosed org-agenda-show-log)
          (org-agenda-keep-modes keep-modes)
-         (entry buffer-file-name)
-         (org-agenda-files (list buffer-file-name))
+         (entry (buffer-file-name))
+         (org-agenda-files (list (buffer-file-name)))
          (date (calendar-current-date))
          (win (selected-window))
          (pos1 (point))
@@ -4672,9 +4689,10 @@ for a keyword.  A numeric prefix directly selects the Nth keyword in
     (erase-buffer)
     (org-agenda-mode) (setq buffer-read-only nil)
     (set (make-local-variable 'org-agenda-type) 'todo)
+    (set (make-local-variable 'last-arg) arg)
     (set (make-local-variable 'org-todo-keywords) kwds)
     (set (make-local-variable 'org-agenda-redo-command)
-         `(org-todo-list (or current-prefix-arg ',arg) t))
+         '(org-todo-list (or current-prefix-arg last-arg) t))
     (setq files (org-agenda-files)
           rtnall nil)
     (while (setq file (pop files))
@@ -4971,7 +4989,7 @@ date.  Itt also removes lines that contain only whitespace."
        "Make the position visible."
        (if (and org-disable-agenda-to-diary  ;; called from org-agenda
                 (stringp string)
-                buffer-file-name)
+                (buffer-file-name))
            (setq string (org-modify-diary-entry-string string))))))
 
 (defun org-modify-diary-entry-string (string)
@@ -4983,7 +5001,7 @@ date.  Itt also removes lines that contain only whitespace."
          'help-echo
          (format
           "mouse-2 or RET jump to diary file %s"
-          (abbreviate-file-name buffer-file-name))
+          (abbreviate-file-name (buffer-file-name)))
          'org-agenda-diary-link t
          'org-marker (org-agenda-new-marker (point-at-bol)))
    string)
@@ -5005,7 +5023,7 @@ If the current buffer visits an agenda file, find the next one in the list.
 If the current buffer does not, find the first agenda file."
   (interactive)
   (let ((files (append org-agenda-files (list (car org-agenda-files))))
-        (tcf (if buffer-file-name (file-truename buffer-file-name)))
+        (tcf (if (buffer-file-name) (file-truename (buffer-file-name))))
         file)
     (unless files (error "No agenda files"))
     (catch 'exit
@@ -5016,28 +5034,30 @@ If the current buffer does not, find the first agenda file."
               (throw 'exit t))))
       (find-file (car org-agenda-files)))))
 
-(defun org-agenda-file-to-end ()
+(defun org-agenda-file-to-end (&optional file)
   "Move/add the current file to the end of the agenda fiole list.
-If the file is not present in the list, append it to the list.  If it is
-present, move it there."
+I the file is not present in the list, it is appended ot the list.  If it is
+present, it is moved there."
   (interactive)
-  (org-agenda-file-to-front 'to-end))
+  (org-agenda-file-to-front 'to-end file))
 
-(defun org-agenda-file-to-front (&optional to-end)
+(defun org-agenda-file-to-front (&optional to-end file)
   "Move/add the current file to the top of the agenda file list.
-If the file is not present in the list, add it to the front.  If it is
-present, it move it there.  With optional argument TO-END, add/move to the
+If the file is not present in the list, it is added to the front.  If it is
+present, it is moved there.  With optional argument TO-END, add/move to the
 end of the list."
   (interactive "P")
-  (let* ((file-alist (mapcar (lambda (x)
-                               (cons (file-truename x) x))
-                             org-agenda-files))
-         (ctf (file-truename buffer-file-name))
-         (had (assoc ctf file-alist))
-         (x (or had (cons ctf (abbreviate-file-name buffer-file-name)))))
-    (setq file-alist (if to-end
-                         (append (delq x file-alist) (list x))
-                       (cons x (delq x file-alist))))
+  (let ((file-alist (mapcar (lambda (x)
+                              (cons (file-truename x) x))
+                            org-agenda-files))
+        (ctf (file-truename (buffer-file-name)))
+        x had)
+    (setq x (assoc ctf file-alist) had x)
+
+    (if (not x) (setq x (cons ctf (abbreviate-file-name (buffer-file-name)))))
+    (if to-end
+        (setq file-alist (append (delq x file-alist) (list x)))
+      (setq file-alist (cons x (delq x file-alist))))
     (setq org-agenda-files (mapcar 'cdr file-alist))
     (let ((org-mode-hook nil) (default-major-mode 'fundamental-mode))
       (customize-save-variable 'org-agenda-files org-agenda-files))
@@ -5050,7 +5070,7 @@ end of the list."
 These are the files which are being checked for agenda entries.
 Optional argument FILE means, use this file instead of the current."
   (interactive)
-  (let* ((file (or file buffer-file-name))
+  (let* ((file (or file (buffer-file-name)))
          (true-file (file-truename file))
          (afile (abbreviate-file-name file))
          (files (delq nil (mapcar
@@ -5174,9 +5194,9 @@ function from a program - use `org-agenda-get-day-entries' instead."
       (cond
        ((null org-category)
         (setq org-category
-              (if buffer-file-name
+              (if (buffer-file-name)
                   (file-name-sans-extension
-                   (file-name-nondirectory buffer-file-name))
+                   (file-name-nondirectory (buffer-file-name)))
                 "???")))
        ((symbolp org-category) (symbol-name org-category))
        (t org-category))
@@ -5265,6 +5285,27 @@ the documentation of `org-diary'."
              (throw 'exit t)))
       nil)))
 
+(defun org-get-tags-at (&optional pos)
+  "Get a list of all headline targs applicable at POS.
+POS defaults to point.  If tags are inherited, the list contains
+the targets in the same sequence as the headlines appear, i.e.
+the tags of the current headline come last."
+  (interactive)
+  (let (tags)
+    (save-excursion
+      (goto-char (or pos (point)))
+      (save-match-data
+        (org-back-to-heading t)
+        (condition-case nil
+            (while t
+              (if (looking-at "[^\r\n]+?:\\([a-zA-Z_:]+\\):[ \t]*\\([\n\r]\\|\\'\\)")
+                  (setq tags (append (org-split-string (match-string 1) ":") tags)))
+              (or org-use-tag-inheritance (error ""))
+              (org-up-heading-all 1))
+          (error nil))))
+    (message "%s" tags)
+    tags))
+
 (defun org-agenda-get-todos ()
   "Return the TODO information for agenda display."
   (let* ((props (list 'face nil
@@ -5273,7 +5314,7 @@ the documentation of `org-diary'."
                       'keymap org-agenda-keymap
                       'help-echo
                       (format "mouse-2 or RET jump to org file %s"
-                              (abbreviate-file-name buffer-file-name))))
+                              (abbreviate-file-name (buffer-file-name)))))
          (regexp (concat "[\n\r]\\*+ *\\(" 
                          (if org-select-this-todo-keyword
                              (concat "\\<\\(" org-select-this-todo-keyword
@@ -5315,7 +5356,7 @@ the documentation of `org-diary'."
                       'keymap org-agenda-keymap
                       'help-echo
                       (format "mouse-2 or RET jump to org file %s"
-                              (abbreviate-file-name buffer-file-name))))
+                              (abbreviate-file-name (buffer-file-name)))))
          (regexp (regexp-quote
                   (substring
                    (format-time-string
@@ -5392,7 +5433,7 @@ the documentation of `org-diary'."
                       'keymap org-agenda-keymap
                       'help-echo
                       (format "mouse-2 or RET jump to org file %s"
-                              (abbreviate-file-name buffer-file-name))))
+                              (abbreviate-file-name (buffer-file-name)))))
          (regexp (concat
                   "\\<" org-closed-string " *\\["
                   (regexp-quote
@@ -5448,7 +5489,7 @@ the documentation of `org-diary'."
                       'keymap org-agenda-keymap
                       'help-echo
                       (format "mouse-2 or RET jump to org file %s"
-                              (abbreviate-file-name buffer-file-name))))
+                              (abbreviate-file-name (buffer-file-name)))))
          (regexp org-deadline-time-regexp)
          (todayp (equal date (calendar-current-date))) ; DATE bound by calendar
          (d1 (calendar-absolute-from-gregorian date))  ; DATE bound by calendar
@@ -5510,7 +5551,7 @@ the documentation of `org-diary'."
                       'keymap org-agenda-keymap
                       'help-echo
                       (format "mouse-2 or RET jump to org file %s"
-                              (abbreviate-file-name buffer-file-name))))
+                              (abbreviate-file-name (buffer-file-name)))))
          (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
@@ -5559,7 +5600,7 @@ the documentation of `org-diary'."
                       'keymap org-agenda-keymap
                       'help-echo
                       (format "mouse-2 or RET jump to org file %s"
-                              (abbreviate-file-name buffer-file-name))))
+                              (abbreviate-file-name (buffer-file-name)))))
          (regexp org-tr-regexp)
          (d0 (calendar-absolute-from-gregorian date))
          marker hdmarker ee txt d1 d2 s1 s2 timestr category tags)
@@ -5631,9 +5672,10 @@ After a match, the following groups carry important information:
 (defvar org-prefix-has-time nil
   "A flag, set by `org-compile-prefix-format'.
 The flag is set if the currently compiled format contains a `%t'.")
+(defvar org-prefix-has-tag nil
+  "A flag, set by `org-compile-prefix-format'.
+The flag is set if the currently compiled format contains a `%T'.")
 
-(defvar time)                     ;Needed for the eval of the prefix format.
-(defvar tag)                      ;Presumably, same thing as above.
 (defun org-format-agenda-item (extra txt &optional category tags dotime noprefix)
   "Format TXT to be inserted into the agenda buffer.
 In particular, it adds the prefix and corresponding text properties.  EXTRA
@@ -5651,9 +5693,9 @@ only the correctly processes TXT should be returned - this is used by
     (if (string-match "^ +" txt) (setq txt (replace-match "" nil nil txt)))
     (let* ((category (or category
                          org-category
-                         (if buffer-file-name
+                         (if (buffer-file-name)
                              (file-name-sans-extension
-                              (file-name-nondirectory buffer-file-name))
+                              (file-name-nondirectory (buffer-file-name)))
                            "")))
            (tag (or (nth (1- (length tags)) tags) ""))
            time              ;; needed for the eval of the prefix format
@@ -5681,6 +5723,12 @@ only the correctly processes TXT should be returned - this is used by
         (if s1 (setq s1 (org-get-time-of-day s1 'string)))
         (if s2 (setq s2 (org-get-time-of-day s2 'string))))
 
+      (when (and (or (eq org-agenda-remove-tags-when-in-prefix t)
+                     (and org-agenda-remove-tags-when-in-prefix
+                          org-prefix-has-tag))
+                 (string-match ":[a-zA-Z_:]+:[ \t]*$" txt))
+        (setq txt (replace-match "" t t txt)))
+
       ;; Create the final string
       (if noprefix
           (setq rtn txt)
@@ -5738,7 +5786,7 @@ only the correctly processes TXT should be returned - this is used by
   "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'."
-  (setq org-prefix-has-time nil)
+  (setq org-prefix-has-time nil org-prefix-has-tag nil)
   (let ((start 0) varform vars var (s format)e c f opt)
     (while (string-match "%\\(\\?\\)?\\([-+]?[0-9.]*\\)\\([ .;,:!?=|/<>]?\\)\\([cts]\\)"
                          s start)
@@ -5749,6 +5797,7 @@ The resulting form is returned and stored in the variable
             opt (match-beginning 1)
             start (1+ (match-beginning 0)))
       (if (equal var 'time) (setq org-prefix-has-time t))
+      (if (equal var 'tag)  (setq org-prefix-has-tag  t))
       (setq f (concat "%" (match-string 2 s) "s"))
       (if opt
           (setq varform
@@ -5783,7 +5832,7 @@ HH:MM."
                        (string-to-number (match-string 3 s))
                      0)))
             (t1 (concat " "
-                        (if (< t0 100) "0" "") (if (< t0 10) "0" "")
+                        (if (< t0 100) "0" "") (if (< t0 10)  "0" "")
                         (int-to-string t0))))
        (if string (concat (substring t1 -4 -2) ":" (substring t1 -2)) t0)))))
 
@@ -5816,9 +5865,6 @@ HH:MM."
           ((< tb ta) +1)
           (t nil))))
 
-(defvar time-up) (defvar time-down)
-(defvar priority-up) (defvar priority-down)
-(defvar category-up) (defvar category-down) (defvar category-keep)
 (defun org-entries-lessp (a b)
   "Predicate for sorting agenda entries."
   ;; The following variables will be used when the form is evaluated.
@@ -6260,7 +6306,7 @@ d are included in the output."
                       'keymap org-agenda-keymap
                       'help-echo
                       (format "mouse-2 or RET jump to org file %s"
-                              (abbreviate-file-name buffer-file-name))))
+                              (abbreviate-file-name (buffer-file-name)))))
          lspos
          tags tags-list tags-alist (llast 0) rtn level category i txt
          todo marker)
@@ -6551,7 +6597,10 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file."
           (skip-chars-backward
            (concat (if org-allow-space-in-links "^" "^ ")
                    org-non-link-chars))
-          (when (looking-at org-link-regexp)
+          (when (or (looking-at org-link-regexp)
+                    (and (re-search-forward org-link-regexp (point-at-eol) t)
+                         (<= (match-beginning 0) pos)
+                         (>= (match-end 0) pos)))
             (setq type (match-string 1)
                   path (match-string 2))
             (throw 'match t)))
@@ -6589,7 +6638,7 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file."
       (cond
        
        ((string= type "tags")
-        (org-tags-view path in-emacs))
+        (org-tags-view in-emacs path))
        ((string= type "camel")
         (org-link-search
          path
@@ -6862,7 +6911,7 @@ openen in emacs.
 If the file does not exist, an error is thrown."
   (setq in-emacs (or in-emacs line search))
   (let* ((file (if (equal path "") 
-                   buffer-file-name
+                   (buffer-file-name)
                  (convert-standard-filename (org-expand-file-name path))))
          (dfile (downcase file))
          ext cmd apps)
@@ -6893,7 +6942,7 @@ If the file does not exist, an error is thrown."
         (shell-command (concat cmd " &"))))
      ((or (stringp cmd)
           (eq cmd 'emacs))
-      (unless (equal (file-truename file) (file-truename buffer-file-name))
+      (unless (equal (file-truename file) (file-truename (buffer-file-name)))
         (funcall (cdr (assq 'file org-link-frame-setup)) file))
       (if line (goto-line line)
         (if search (org-link-search search))))
@@ -6956,7 +7005,7 @@ For file links, arg negates `org-context-in-file-links'."
       (save-excursion
        (vm-select-folder-buffer)
        (let* ((message (car vm-message-pointer))
-              (folder buffer-file-name)
+              (folder (buffer-file-name))
               (subject (vm-su-subject message))
               (author (vm-su-full-name message))
               (message-id (vm-su-message-id message)))
@@ -6987,7 +7036,7 @@ For file links, arg negates `org-context-in-file-links'."
       (save-excursion
         (save-restriction
           (rmail-narrow-to-non-pruned-header)
-          (let ((folder buffer-file-name)
+          (let ((folder (buffer-file-name))
                 (message-id (mail-fetch-field "message-id"))
                 (author (mail-fetch-field "from"))
                 (subject (mail-fetch-field "subject")))
@@ -7041,7 +7090,7 @@ For file links, arg negates `org-context-in-file-links'."
      ((eq major-mode 'org-mode)
       ;; Just link to current headline
       (setq cpltxt (concat "file:"
-                           (abbreviate-file-name buffer-file-name)))
+                           (abbreviate-file-name (buffer-file-name))))
       ;; Add a context search string
       (when (org-xor org-context-in-file-links arg)
         (if (save-excursion
@@ -7059,10 +7108,10 @@ For file links, arg negates `org-context-in-file-links'."
                          )))))
       (setq link (org-make-link cpltxt)))
 
-     (buffer-file-name
+     ((buffer-file-name)
       ;; Just link to this file here.
       (setq cpltxt (concat "file:"
-                           (abbreviate-file-name buffer-file-name)))
+                           (abbreviate-file-name (buffer-file-name))))
       ;; Add a context string
       (when (org-xor org-context-in-file-links arg)
         (setq cpltxt
@@ -7197,7 +7246,7 @@ is in the current directory or below."
                (case-fold-search nil)
                (search (match-string 2 link)))
             (when (save-match-data
-                    (equal (file-truename buffer-file-name)
+                    (equal (file-truename (buffer-file-name))
                            (file-truename path)))
               (if (save-match-data
                     (string-match (concat "^" org-camel-regexp "$") search))
@@ -7356,7 +7405,7 @@ See also the variable `org-reverse-note-order'."
         (let  ((all org-reverse-note-order)
                entry)
           (while (setq entry (pop all))
-            (if (string-match (car entry) buffer-file-name)
+            (if (string-match (car entry) (buffer-file-name))
                 (throw 'exit (cdr entry))))
           nil)))))
 
@@ -10010,7 +10059,7 @@ underlined headlines.  The default is 3."
          (level 0) line txt
          (umax nil)
          (case-fold-search nil)
-         (filename (concat (file-name-sans-extension buffer-file-name)
+         (filename (concat (file-name-sans-extension (buffer-file-name))
                            ".txt"))
          (buffer (find-file-noselect filename))
          (levels-open (make-vector org-level-max nil))
@@ -10159,7 +10208,7 @@ underlined headlines.  The default is 3."
 Also removes the first line of the buffer if it specifies a mode,
 and all options lines."
   (interactive)
-  (let* ((filename (concat (file-name-sans-extension buffer-file-name)
+  (let* ((filename (concat (file-name-sans-extension (buffer-file-name))
                            ".txt"))
          (buffer (find-file-noselect filename))
          (ore (concat
@@ -10233,7 +10282,7 @@ Does include HTML export options as well as TODO and CATEGORY stuff."
    org-export-with-sub-superscripts
    org-export-with-emphasize
    org-export-with-TeX-macros
-   (file-name-nondirectory buffer-file-name)
+   (file-name-nondirectory (buffer-file-name))
    (if (equal org-todo-interpretation 'sequence)
        (mapconcat 'identity org-todo-keywords " ")
      "TODO FEEDBACK VERIFY DONE")
@@ -10306,7 +10355,7 @@ The prefix ARG specifies how many levels of the outline should become
 headlines.  The default is 3.  Lower levels will become bulleted lists."
   (interactive "P")
   (org-export-as-html arg 'hidden)
-  (org-open-file buffer-file-name))
+  (org-open-file (buffer-file-name)))
 
 (defun org-export-as-html-batch ()
   "Call `org-export-as-html', may be used in batch processing as
@@ -10336,7 +10385,7 @@ headlines.  The default is 3.  Lower levels will become bulleted lists."
          (lines (org-export-find-first-heading-line all_lines))
          (level 0) (line "") (origline "") txt todo
          (umax nil)
-         (filename (concat (file-name-sans-extension buffer-file-name)
+         (filename (concat (file-name-sans-extension (buffer-file-name))
                            ".html"))
          (buffer (find-file-noselect filename))
          (levels-open (make-vector org-level-max nil))
@@ -10999,7 +11048,7 @@ When LEVEL is non-nil, increase section numbers on that level."
 The iCalendar file will be located in the same directory as the Org-mode
 file, but with extension `.ics'."
   (interactive)
-  (org-export-icalendar nil buffer-file-name))
+  (org-export-icalendar nil (buffer-file-name)))
 
 ;;;###autoload
 (defun org-export-icalendar-all-agenda-files ()
@@ -11036,7 +11085,7 @@ file and store it under the name `org-combined-agenda-icalendar-file'."
           (set-buffer (org-get-agenda-file-buffer file))
           (setq category (or org-category
                              (file-name-sans-extension
-                              (file-name-nondirectory buffer-file-name))))
+                              (file-name-nondirectory (buffer-file-name)))))
           (if (symbolp category) (setq category (symbol-name category)))
           (let ((standard-output ical-buffer))
             (if combine
@@ -12137,27 +12186,6 @@ Show the heading too, if it is currently invisible."
                            (org-invisible-p)))
        (org-show-hierarchy-above)))
 
-(defun org-get-tags-at (&optional pos)
-  "Get a list of all headline targs applicable at POS.
-POS defaults to point.  If tags are inherited, the list contains
-the targets in the same sequence as the headlines appear, i.e.
-the tags of the current headline come last."
-  (interactive)
-  (let (tags)
-    (save-excursion
-      (goto-char (or pos (point)))
-      (save-match-data
-        (org-back-to-heading t)
-        (condition-case nil
-            (while t
-              (if (looking-at "[^\r\n]+?:\\([a-zA-Z_:]+\\):[ \t]*\\([\n\r]\\|\\'\\)")
-                  (setq tags (append (org-split-string (match-string 1) ":") tags)))
-              (or org-use-tag-inheritance (error ""))
-              (org-up-heading-all 1))
-          (error nil))))
-    (message "%s" tags)
-    tags))
-
 ;;; Finish up
 
 (provide 'org)
@@ -12166,4 +12194,5 @@ the tags of the current headline come last."
 
 ;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd
 ;;; org.el ends here
+
       
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 80f062ae3fe..db8d2c94c46 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -913,7 +913,7 @@ This is always set to nil at the entry to `table-with-cache-buffer' before execu
   "For mode line indicator")
 ;; This is not a real minor-mode but placed in the minor-mode-alist
 ;; so that we can show the indicator on the mode line handy.
-(make-variable-buffer-local table-mode-indicator)
+(make-variable-buffer-local 'table-mode-indicator)
 (unless (assq table-mode-indicator minor-mode-alist)
   (push '(table-mode-indicator (table-fixed-width-mode " Fixed-Table" " Table"))
         minor-mode-alist))
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index 2a8f6b217d4..f4b283bf7f2 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Jean-Philippe Theberge <jphiltheberge@videotron.ca>
+;; Maintainer: FSF
 ;; Keywords: Multimedia
 
 ;; This file is part of GNU Emacs.
@@ -21,23 +22,24 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
-;;
-;; Thanks: Alex Schroeder <alex@gnu.org> for maintaining the package at some time
-;;         The peoples at #emacs@freenode.net for numerous help
-;;         RMS for emacs and the GNU project.
-;;
 
 ;;; Commentary:
 
-;; This package create two new mode: thumbs-mode and
-;; thumbs-view-image-mode.  It is used for images browsing and viewing
-;; from within Emacs.  Minimal image manipulation functions are also
-;; available via external programs.
+;; This package create two new modes: thumbs-mode and thumbs-view-image-mode.
+;; It is used for basic browsing and viewing of images from within Emacs.
+;; Minimal image manipulation functions are also available via external
+;; programs.  If you want to do more complex tasks like categorise and tag
+;; your images, use tumme.el
 ;;
 ;; The 'convert' program from 'ImageMagick'
 ;; [URL:http://www.imagemagick.org/] is required.
 ;;
+;; Thanks: Alex Schroeder <alex@gnu.org> for maintaining the package at some
+;;         time.  The peoples at #emacs@freenode.net for numerous help.  RMS
+;;         for emacs and the GNU project.
+;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
 ;; CHANGELOG
 ;;
 ;; This is version 2.0
@@ -48,8 +50,8 @@
 ;; That should be a directory containing image files.
 ;; from dired, C-t m enter in thumbs-mode with all marked files
 ;;             C-t a enter in thumbs-mode with all files in current-directory
-;; In thumbs-mode, pressing <return> on a image will bring you in image view mode
-;; for that image.  C-h m will give you a list of available keybinding.
+;; In thumbs-mode, pressing <return> on a image will bring you in image view
+;; mode for that image.  C-h m will give you a list of available keybinding.
 
 ;;; History:
 ;;
@@ -75,13 +77,18 @@
   :type 'string
   :group 'thumbs)
 
-(defcustom thumbs-per-line 5
-  "*Number of thumbnails per line to show in directory."
+(defcustom thumbs-per-line 4
+  "Number of thumbnails per line to show in directory."
+  :type 'integer
+  :group 'thumbs)
+
+(defcustom thumbs-max-image-number 16
+ "Maximum number of images initially displayed in thumbs buffer."
   :type 'integer
   :group 'thumbs)
 
 (defcustom thumbs-thumbsdir-max-size 50000000
-  "Max size for thumbnails directory.
+  "Maximum size for thumbnails directory.
 When it reaches that size (in bytes), a warning is sent."
   :type 'integer
   :group 'thumbs)
@@ -121,7 +128,7 @@ than `thumbs-thumbsdir-max-size'."
   :group 'thumbs)
 
 (defcustom thumbs-image-resizing-step 10
-  "Step by which to resize image."
+  "Step by which to resize image as a percentage."
   :type 'integer
   :group 'thumbs)
 
@@ -146,6 +153,11 @@ this value can let another user see some of your images."
   "Filename of current image.")
 (make-variable-buffer-local 'thumbs-current-image-filename)
 
+(defvar thumbs-extra-images 1
+  "Counter for showing extra images in thumbs buffer.")
+(make-variable-buffer-local 'thumbs-extra-images)
+(put 'thumbs-extra-images 'permanent-local t)
+
 (defvar thumbs-current-image-size nil
   "Size of current image.")
 
@@ -153,10 +165,14 @@ this value can let another user see some of your images."
   "Number of current image.")
 (make-variable-buffer-local 'thumbs-image-num)
 
+(defvar thumbs-buffer nil
+  "Name of buffer containing thumbnails associated with image.")
+(make-variable-buffer-local 'thumbs-buffer)
+
 (defvar thumbs-current-dir nil
   "Current directory.")
 
-(defvar thumbs-markedL nil
+(defvar thumbs-marked-list nil
   "List of marked files.")
 
 (defalias 'thumbs-gensym
@@ -199,21 +215,21 @@ Create the thumbnails directory if it does not exist."
 If the total size of all files in `thumbs-thumbsdir' is bigger than
 `thumbs-thumbsdir-max-size', files are deleted until the max size is
 reached."
-  (let* ((filesL
+  (let* ((files-list
           (sort
            (mapcar
             (lambda (f)
-              (let ((fattribsL (file-attributes f)))
-                `(,(nth 4 fattribsL) ,(nth 7 fattribsL) ,f)))
+              (let ((fattribs-list (file-attributes f)))
+                `(,(nth 4 fattribs-list) ,(nth 7 fattribs-list) ,f)))
             (directory-files (thumbs-thumbsdir) t (image-file-name-regexp)))
            '(lambda (l1 l2) (time-less-p (car l1) (car l2)))))
-         (dirsize (apply '+ (mapcar (lambda (x) (cadr x)) filesL))))
+         (dirsize (apply '+ (mapcar (lambda (x) (cadr x)) files-list))))
     (while (> dirsize thumbs-thumbsdir-max-size)
       (progn
-        (message "Deleting file %s" (cadr (cdar filesL))))
-      (delete-file (cadr (cdar filesL)))
-      (setq dirsize (- dirsize (car (cdar filesL))))
-      (setq filesL (cdr filesL)))))
+        (message "Deleting file %s" (cadr (cdar files-list))))
+      (delete-file (cadr (cdar files-list)))
+      (setq dirsize (- dirsize (car (cdar files-list))))
+      (setq files-list (cdr files-list)))))
 
 ;; Check the thumbsnail directory size and clean it if necessary.
 (when thumbs-thumbsdir-auto-clean
@@ -238,75 +254,47 @@ ACTION-PREFIX is the symbol to place before the ACTION command
                          filein
                          (or output-format "jpeg")
                          fileout)))
-    (shell-command command)))
-
-(defun thumbs-increment-image-size-element (n d)
-  "Increment number N by D percent."
-  (round (+ n (/ (* d n) 100))))
-
-(defun thumbs-decrement-image-size-element (n d)
-  "Decrement number N by D percent."
-  (round (- n (/ (* d n) 100))))
-
-(defun thumbs-increment-image-size (s)
-  "Increment S (a cons of width x height)."
-  (cons
-   (thumbs-increment-image-size-element (car s)
-                                        thumbs-image-resizing-step)
-   (thumbs-increment-image-size-element (cdr s)
-                                        thumbs-image-resizing-step)))
-
-(defun thumbs-decrement-image-size (s)
-  "Decrement S (a cons of width x height)."
-  (cons
-   (thumbs-decrement-image-size-element (car s)
-                                        thumbs-image-resizing-step)
-   (thumbs-decrement-image-size-element (cdr s)
-                                        thumbs-image-resizing-step)))
-
-(defun thumbs-resize-image (&optional increment size)
+    (call-process shell-file-name nil nil nil "-c" command)))
+
+(defun thumbs-new-image-size (s increment)
+  "New image (a cons of width x height)."
+  (let ((d (* increment thumbs-image-resizing-step)))
+    (cons
+     (round (+ (car s) (/ (* d (car s)) 100)))
+     (round (+ (cdr s) (/ (* d (cdr s)) 100))))))
+
+(defun thumbs-resize-image-1 (&optional increment size)
   "Resize image in current buffer.
-If INCREMENT is set, make the image bigger, else smaller.
-Or, alternatively, a SIZE may be specified."
-  (interactive)
-  ;; cleaning of old temp file
-  (condition-case nil
-    (apply 'delete-file
-           (directory-files
-            (thumbs-temp-dir) t
-            thumbs-temp-prefix))
-    (error nil))
-  (let ((buffer-read-only nil)
-        (x (if size
-               size
-             (if increment
-                 (thumbs-increment-image-size
-                  thumbs-current-image-size)
-               (thumbs-decrement-image-size
-                thumbs-current-image-size))))
-        (tmp (thumbs-temp-file)))
+If SIZE is specified use it.  Otherwise make the image larger or
+smaller according to whether INCREMENT is 1 or -1."
+  (let* ((buffer-read-only nil)
+         (old thumbs-current-tmp-filename)
+         (x (or size
+                (thumbs-new-image-size thumbs-current-image-size increment)))
+         (tmp (thumbs-temp-file)))
     (erase-buffer)
-    (thumbs-call-convert thumbs-current-image-filename
+    (thumbs-call-convert (or old thumbs-current-image-filename)
                          tmp "sample"
                          (concat (number-to-string (car x)) "x"
                                  (number-to-string (cdr x))))
-    (thumbs-insert-image tmp 'jpeg 0)
+    (save-excursion
+      (thumbs-insert-image tmp 'jpeg 0))
     (setq thumbs-current-tmp-filename tmp)))
 
-(defun thumbs-resize-interactive (width height)
+(defun thumbs-resize-image (width height)
   "Resize image interactively to specified WIDTH and HEIGHT."
   (interactive "nWidth: \nnHeight: ")
-  (thumbs-resize-image nil (cons width height)))
+  (thumbs-resize-image-1 nil (cons width height)))
 
-(defun thumbs-resize-image-size-down ()
+(defun thumbs-shrink-image ()
   "Resize image (smaller)."
   (interactive)
-  (thumbs-resize-image nil))
+  (thumbs-resize-image-1 -1))
 
-(defun thumbs-resize-image-size-up ()
+(defun thumbs-enlarge-image ()
   "Resize image (bigger)."
   (interactive)
-  (thumbs-resize-image t))
+  (thumbs-resize-image-1 1))
 
 (defun thumbs-thumbname (img)
   "Return a thumbnail name for the image IMG."
@@ -376,70 +364,81 @@ If MARKED is non-nil, the image is marked."
 If MARKED is non-nil, the image is marked."
   (thumbs-insert-image
    (thumbs-make-thumb img) 'jpeg thumbs-relief marked)
-  (put-text-property (1- (point)) (point)
-                     'thumb-image-file img))
-
-(defun thumbs-do-thumbs-insertion (L)
-  "Insert all thumbs in list L."
-  (let ((i 0))
-    (dolist (img L)
+  (add-text-properties (1- (point)) (point)
+                     `(thumb-image-file ,img
+                       help-echo ,(file-name-nondirectory img))))
+
+(defun thumbs-do-thumbs-insertion (list)
+  "Insert all thumbnails into thumbs buffer."
+  (let* ((i 0)
+        (length (length list))
+        (diff (- length (* thumbs-max-image-number thumbs-extra-images))))
+    (nbutlast list diff)
+    (dolist (img list)
       (thumbs-insert-thumb img
-                           (member img thumbs-markedL))
+                           (member img thumbs-marked-list))
       (when (= 0 (mod (setq i (1+ i)) thumbs-per-line))
         (newline)))
-    (unless (bobp) (newline))))
+    (unless (bobp) (newline))
+    (if diff (message "Type + to display more images."))))
 
-(defun thumbs-show-thumbs-list (L &optional buffer-name same-window)
+(defun thumbs-show-thumbs-list (list &optional dir same-window)
   (unless (and (display-images-p)
                (image-type-available-p 'jpeg))
     (error "Required image type is not supported in this Emacs session"))
   (funcall (if same-window 'switch-to-buffer 'pop-to-buffer)
-           (or buffer-name "*THUMB-View*"))
+           (if dir (concat "*Thumbs: " dir) "*THUMB-View*"))
   (let ((inhibit-read-only t))
     (erase-buffer)
     (thumbs-mode)
-    (thumbs-do-thumbs-insertion L)
+    (setq thumbs-buffer (current-buffer))
+    (if dir (setq default-directory dir))
+    (thumbs-do-thumbs-insertion list)
     (goto-char (point-min))
     (set (make-local-variable 'thumbs-current-dir) default-directory)))
 
 ;;;###autoload
-(defun thumbs-show-all-from-dir (dir &optional reg same-window)
+(defun thumbs-show-from-dir (dir &optional reg same-window)
   "Make a preview buffer for all images in DIR.
 Optional argument REG to select file matching a regexp,
 and SAME-WINDOW to show thumbs in the same window."
   (interactive "DDir: ")
   (thumbs-show-thumbs-list
-   (directory-files dir t
-                    (or reg (image-file-name-regexp)))
-   (concat "*Thumbs: " dir) same-window))
+   (directory-files dir t (or reg (image-file-name-regexp)))
+   dir same-window))
 
 ;;;###autoload
 (defun thumbs-dired-show-marked ()
-  "In dired, make a thumbs buffer with all marked files."
+  "In dired, make a thumbs buffer with marked files."
   (interactive)
   (thumbs-show-thumbs-list (dired-get-marked-files) nil t))
 
 ;;;###autoload
-(defun thumbs-dired-show-all ()
+(defun thumbs-dired-show ()
   "In dired, make a thumbs buffer with all files in current directory."
   (interactive)
-  (thumbs-show-all-from-dir default-directory nil t))
+  (thumbs-show-from-dir default-directory nil t))
 
 ;;;###autoload
-(defalias 'thumbs 'thumbs-show-all-from-dir)
+(defalias 'thumbs 'thumbs-show-from-dir)
 
 (defun thumbs-find-image (img &optional num otherwin)
-  (funcall
-   (if otherwin 'switch-to-buffer-other-window 'switch-to-buffer)
-   (concat "*Image: " (file-name-nondirectory img) " - "
-           (number-to-string (or num 0)) "*"))
-  (thumbs-view-image-mode)
-  (let ((inhibit-read-only t))
-    (setq thumbs-current-image-filename img
-          thumbs-current-tmp-filename nil
-          thumbs-image-num (or num 0))
-    (delete-region (point-min)(point-max))
-    (thumbs-insert-image img (thumbs-image-type img) 0)))
+  (let ((buffer (current-buffer)))
+    (funcall
+     (if otherwin 'switch-to-buffer-other-window 'switch-to-buffer)
+     "*Image*")
+    (thumbs-view-image-mode)
+    (setq mode-name
+          (concat "image-view-mode: " (file-name-nondirectory img)
+                  " - " (number-to-string num)))
+    (setq thumbs-buffer buffer)
+    (let ((inhibit-read-only t))
+      (setq thumbs-current-image-filename img
+            thumbs-current-tmp-filename nil
+            thumbs-image-num (or num 0))
+      (delete-region (point-min)(point-max))
+      (save-excursion
+        (thumbs-insert-image img (thumbs-image-type img) 0)))))
 
 (defun thumbs-find-image-at-point (&optional img otherwin)
   "Display image IMG for thumbnail at point.
@@ -484,16 +483,18 @@ Open another window."
 
 (defun thumbs-file-alist ()
   "Make an alist of elements (POS . FILENAME) for all images in thumb buffer."
-  (save-excursion
-    (let (list)
-      (goto-char (point-min))
-      (while (not (eobp))
-        (if (thumbs-current-image)
-            (push (cons (point-marker)
-                        (thumbs-current-image))
-                  list))
-        (forward-char 1))
-      list)))
+  (with-current-buffer thumbs-buffer
+    (save-excursion
+      (let (list)
+        (goto-char (point-min))
+        (while (not (eobp))
+          (unless (= 0 (mod (point) (1+ thumbs-per-line)))
+            (if (thumbs-current-image)
+                (push (cons (point-marker)
+                            (thumbs-current-image))
+                    list)))
+          (forward-char 1))
+        (nreverse list)))))
 
 (defun thumbs-file-list ()
   "Make a list of file names for all images in thumb buffer."
@@ -509,9 +510,9 @@ Open another window."
 (defun thumbs-delete-images ()
   "Delete the image at point (and its thumbnail) (or marked files if any)."
   (interactive)
-  (let ((files (or thumbs-markedL (list (thumbs-current-image)))))
+  (let ((files (or thumbs-marked-list (list (thumbs-current-image)))))
     (if (yes-or-no-p (format "Really delete %d files? " (length files)))
-        (let ((thumbs-fileL (thumbs-file-alist))
+        (let ((thumbs-file-list (thumbs-file-alist))
               (inhibit-read-only t))
           (dolist (x files)
             (let (failure)
@@ -521,24 +522,24 @@ Open another window."
                     (delete-file (thumbs-thumbname x)))
                 (file-error (setq failure t)))
               (unless failure
-                (when (rassoc x thumbs-fileL)
-                  (goto-char (car (rassoc x thumbs-fileL)))
+                (when (rassoc x thumbs-file-list)
+                  (goto-char (car (rassoc x thumbs-file-list)))
                   (delete-region (point) (1+ (point))))
-                (setq thumbs-markedL
-                      (delq x thumbs-markedL)))))))))
+                (setq thumbs-marked-list
+                      (delq x thumbs-marked-list)))))))))
 
 (defun thumbs-rename-images (newfile)
   "Rename the image at point (and its thumbnail) (or marked files if any)."
   (interactive "FRename to file or directory: ")
-  (let ((files (or thumbs-markedL (list (thumbs-current-image))))
+  (let ((files (or thumbs-marked-list (list (thumbs-current-image))))
         failures)
     (if (and (not (file-directory-p newfile))
-             thumbs-markedL)
+             thumbs-marked-list)
         (if (file-exists-p newfile)
             (error "Renaming marked files to file name `%s'" newfile)
           (make-directory newfile t)))
     (if (yes-or-no-p (format "Really rename %d files? " (length files)))
-        (let ((thumbs-fileL (thumbs-file-alist))
+        (let ((thumbs-file-list (thumbs-file-alist))
               (inhibit-read-only t))
           (dolist (file files)
             (let (failure)
@@ -552,11 +553,11 @@ Open another window."
                 (file-error (setq failure t)
                             (push file failures)))
               (unless failure
-                (when (rassoc file thumbs-fileL)
-                  (goto-char (car (rassoc file thumbs-fileL)))
+                (when (rassoc file thumbs-file-list)
+                  (goto-char (car (rassoc file thumbs-file-list)))
                   (delete-region (point) (1+ (point))))
-                (setq thumbs-markedL
-                      (delq file thumbs-markedL)))))))
+                (setq thumbs-marked-list
+                      (delq file thumbs-marked-list)))))))
     (if failures
         (display-warning 'file-error
                          (format "Rename failures for %s into %s"
@@ -571,31 +572,38 @@ Open another window."
 (defun thumbs-show-image-num (num)
   "Show the image with number NUM."
   (let ((image-buffer (get-buffer-create "*Image*")))
-    (let ((i (thumbs-current-image)))
+    (let ((img (cdr (nth (1- num) (thumbs-file-alist)))))
       (with-current-buffer image-buffer
-        (thumbs-insert-image i (thumbs-image-type i) 0))
+        (setq mode-name
+              (concat "image-view-mode: " (file-name-nondirectory img)
+                      " - " (number-to-string num)))
+        (let ((inhibit-read-only t))
+          (erase-buffer)
+          (thumbs-insert-image img (thumbs-image-type img) 0)
+          (goto-char (point-min))))
       (setq thumbs-image-num num
-            thumbs-current-image-filename i))))
+            thumbs-current-image-filename img))))
+
+(defun thumbs-previous-image ()
+  "Show the previous image."
+  (interactive)
+  (let* ((i (- thumbs-image-num 1))
+         (number (length (thumbs-file-alist))))
+    (if (= i 0) (setq i (1- number)))
+    (thumbs-show-image-num i)))
 
 (defun thumbs-next-image ()
   "Show the next image."
   (interactive)
   (let* ((i (1+ thumbs-image-num))
-         (list (thumbs-file-alist))
-         (l (caar list)))
-    (while (and (/= i thumbs-image-num) (not (assoc i list)))
-      (setq i (if (>= i l) 1 (1+ i))))
+         (number (length (thumbs-file-alist))))
+    (if (= i number) (setq i 1))
     (thumbs-show-image-num i)))
 
-(defun thumbs-previous-image ()
-  "Show the previous image."
+(defun thumbs-display-thumbs-buffer ()
+  "Display the associated thumbs buffer."
   (interactive)
-  (let* ((i (- thumbs-image-num 1))
-         (list (thumbs-file-alist))
-         (l (caar list)))
-    (while (and (/= i thumbs-image-num) (not (assoc i list)))
-      (setq i (if (<= i 1) l (1- i))))
-    (thumbs-show-image-num i)))
+  (display-buffer thumbs-buffer))
 
 (defun thumbs-redraw-buffer ()
   "Redraw the current thumbs buffer."
@@ -612,10 +620,11 @@ Open another window."
   (let ((elt (thumbs-current-image)))
     (unless elt
       (error "No image here"))
-    (push elt thumbs-markedL)
+    (push elt thumbs-marked-list)
     (let ((inhibit-read-only t))
       (delete-char 1)
-      (thumbs-insert-thumb elt t)))
+      (save-excursion
+        (thumbs-insert-thumb elt t))))
   (when (eolp) (forward-char)))
 
 (defun thumbs-unmark ()
@@ -624,32 +633,34 @@ Open another window."
   (let ((elt (thumbs-current-image)))
     (unless elt
       (error "No image here"))
-    (setq thumbs-markedL (delete elt thumbs-markedL))
+    (setq thumbs-marked-list (delete elt thumbs-marked-list))
     (let ((inhibit-read-only t))
       (delete-char 1)
-      (thumbs-insert-thumb elt nil)))
+      (save-excursion
+        (thumbs-insert-thumb elt nil))))
   (when (eolp) (forward-char)))
 
+
+;; cleaning of old temp files
+(mapc 'delete-file
+      (directory-files (thumbs-temp-dir) t thumbs-temp-prefix))
+
 ;; Image modification routines
 
 (defun thumbs-modify-image (action &optional arg)
   "Call convert to do ACTION on image with argument ARG.
 ACTION and ARG should be a valid convert command."
   (interactive "sAction: \nsValue: ")
-  ;; cleaning of old temp file
-  (mapc 'delete-file
-        (directory-files
-         (thumbs-temp-dir)
-         t
-         thumbs-temp-prefix))
-  (let ((buffer-read-only nil)
-        (tmp (thumbs-temp-file)))
+  (let* ((buffer-read-only nil)
+         (old thumbs-current-tmp-filename)
+         (tmp (thumbs-temp-file)))
     (erase-buffer)
-    (thumbs-call-convert thumbs-current-image-filename
+    (thumbs-call-convert (or old thumbs-current-image-filename)
                          tmp
                          action
                          (or arg ""))
-    (thumbs-insert-image tmp 'jpeg 0)
+    (save-excursion
+      (thumbs-insert-image tmp 'jpeg 0))
     (setq thumbs-current-tmp-filename tmp)))
 
 (defun thumbs-emboss-image (emboss)
@@ -699,17 +710,24 @@ ACTION and ARG should be a valid convert command."
     (forward-char -1))
   (thumbs-show-name))
 
+(defun thumbs-backward-line ()
+  "Move up one line."
+  (interactive)
+  (forward-line -1)
+  (thumbs-show-name))
+
 (defun thumbs-forward-line ()
   "Move down one line."
   (interactive)
   (forward-line 1)
   (thumbs-show-name))
 
-(defun thumbs-backward-line ()
-  "Move up one line."
-  (interactive)
-  (forward-line -1)
-  (thumbs-show-name))
+(defun thumbs-show-more-images (&optional arg)
+  "Show more than `thumbs-max-image-number' images, if present."
+  (interactive "P")
+  (or arg (setq arg 1))
+  (setq thumbs-extra-images (+ thumbs-extra-images arg))
+  (thumbs-dired-show))
 
 (defun thumbs-show-name ()
   "Show the name of the current file."
@@ -744,6 +762,7 @@ ACTION and ARG should be a valid convert command."
     (define-key map [left] 'thumbs-backward-char)
     (define-key map [up] 'thumbs-backward-line)
     (define-key map [down] 'thumbs-forward-line)
+    (define-key map "+" 'thumbs-show-more-images)
     (define-key map "d" 'thumbs-dired)
     (define-key map "m" 'thumbs-mark)
     (define-key map "u" 'thumbs-unmark)
@@ -759,18 +778,19 @@ ACTION and ARG should be a valid convert command."
   fundamental-mode "thumbs"
   "Preview images in a thumbnails buffer"
   (setq buffer-read-only t)
-  (set (make-local-variable 'thumbs-markedL) nil))
+  (set (make-local-variable 'thumbs-marked-list) nil))
 
 (defvar thumbs-view-image-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map [prior] 'thumbs-previous-image)
     (define-key map [next] 'thumbs-next-image)
-    (define-key map "-" 'thumbs-resize-image-size-down)
-    (define-key map "+" 'thumbs-resize-image-size-up)
+    (define-key map "^" 'thumbs-display-thumbs-buffer)
+    (define-key map "-" 'thumbs-shrink-image)
+    (define-key map "+" 'thumbs-enlarge-image)
     (define-key map "<" 'thumbs-rotate-left)
     (define-key map ">" 'thumbs-rotate-right)
     (define-key map "e" 'thumbs-emboss-image)
-    (define-key map "r" 'thumbs-resize-interactive)
+    (define-key map "r" 'thumbs-resize-image)
     (define-key map "s" 'thumbs-save-current-image)
     (define-key map "q" 'thumbs-kill-buffer)
     (define-key map "w" 'thumbs-set-root)
@@ -790,7 +810,7 @@ ACTION and ARG should be a valid convert command."
   (thumbs-call-setroot-command (dired-get-filename)))
 
 ;; Modif to dired mode map
-(define-key dired-mode-map "\C-ta" 'thumbs-dired-show-all)
+(define-key dired-mode-map "\C-ta" 'thumbs-dired-show)
 (define-key dired-mode-map "\C-tm" 'thumbs-dired-show-marked)
 (define-key dired-mode-map "\C-tw" 'thumbs-dired-setroot)
 
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el
index e301804cf17..0729064c72b 100644
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -152,8 +152,8 @@ For a description of possible values, see `vc-check-master-templates'."
                 (vc-file-setprop file 'vc-checkout-model 'locking))))
           state)
       (if (not (vc-mistrust-permissions file))
-          (let* ((attributes  (file-attributes file))
-                 (owner-uid   (nth 2 attributes))
+          (let* ((attributes  (file-attributes file 'string))
+                 (owner-name  (nth 2 attributes))
                  (permissions (nth 8 attributes)))
             (cond ((string-match ".r-..-..-." permissions)
                    (vc-file-setprop file 'vc-checkout-model 'locking)
@@ -162,7 +162,7 @@ For a description of possible values, see `vc-check-master-templates'."
                    (if (eq (vc-checkout-model file) 'locking)
                        (if (file-ownership-preserved-p file)
                            'edited
-                         (vc-user-login-name owner-uid))
+                         owner-name)
                      (if (vc-rcs-workfile-is-newer file)
                          'edited
                        'up-to-date)))
diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el
index 8f00e1df627..c4047d1b3ec 100644
--- a/lisp/vc-sccs.el
+++ b/lisp/vc-sccs.el
@@ -122,15 +122,15 @@ For a description of possible values, see `vc-check-master-templates'."
       ;; We have to be careful not to exclude files with execute bits on;
       ;; scripts can be under version control too.  Also, we must ignore the
       ;; group-read and other-read bits, since paranoid users turn them off.
-      (let* ((attributes (file-attributes file))
-             (owner-uid  (nth 2 attributes))
+      (let* ((attributes  (file-attributes file 'string))
+             (owner-name  (nth 2 attributes))
              (permissions (nth 8 attributes)))
         (if (string-match ".r-..-..-." permissions)
             'up-to-date
           (if (string-match ".rw..-..-." permissions)
               (if (file-ownership-preserved-p file)
                   'edited
-                (vc-user-login-name owner-uid))
+                owner-name)
             ;; Strange permissions.
             ;; Fall through to real state computation.
             (vc-sccs-state file))))