Change 'needs-patch to 'needs-update.

(vc-delete-file): Check if the file has uncommitted changed.

Comment cleanup (no code change).

Add items to TODO list.

Revert incorrect fix for claimed bootstrap breakage.

(make_window): Initialize resize_proportionally.
(enlarge_window): Temporarily set resize_proportionally to make
sure that shrink_windows does scale the window proportionally.
(shrink_windows): When window has resize_proportionally set try
to shrink it proportionally by stealing from other windows.
(struct saved_window, Fset_window_configuration)
(compare_window_configurations): Handle resize_proportionally.
(WINDOW_TOTAL_SIZE): New macro.
(window_min_size, shrink_windows, size_window): Use it.
(check_min_window_sizes): Removed.  Invalid values of
window-min-height|width are handled by window_min_size_2 now.
(size_window, Fsplit_window, enlarge_window)
(adjust_window_trailing_edge, grow_mini_window): Don't call
check_min_window_sizes.
(window_min_size_2, window_min_size_1, window_min_size): New
argument safe_p for retrieving "safe" minimum sizes.
(Fdisplay_buffer, Fsplit_window, enlarge_window):
(adjust_window_trailing_edge, grow_mini_window): Adjust
arguments of window_min_size... functions.
(shrink_windows): Argument min_size removed.  New argument
safe_p allows shrinking windows to their safe minimum sizes.
Calculate minimum size and decide whether a window shall be
deleted for each window individually.
(size_window): When nodelete_p equals 2, tell shrink_windows to
delete windows only if their new minimum size is no more safe.
(shrink_window_lowest_first): Call window_min_size_1 to make
sure to preserve modeline of bottom-most window when resizing
the minibuffer.
(Fset_window_configuration, Fcurrent_window_configuration)
(compare_window_configurations): Do not handle
window-min-height|width any more.
(syms_of_window): Clarify window-min-height|width doc-strings.

(struct window): Replace field too_small_ok by field
resize_proportionally.

(change_frame_size_1): Preserve small windows when shrinking
frames by calling set_window_height|width with third arg 2.

* epa-file-hook.el: New file split from epa-file.el.
* epa-file.el: Require 'epa-file-hook.
(epa-file-handler): Add autoload cookie.
* loadup.el: Load epa-file-hook.
* startup.el (command-line): Eval the body of auto-encryption-mode.

(vc-hg-extra-fileinfo): New defstruct.
(vc-hg-status-printer): New function.
(vc-hg-after-dir-status): Deal with copied and renamed files.
(vc-hg-dir-status): Add flag to show copied files.

(vc-dir-mode-map): Don't bind "r".

*** empty log message ***

(define-ibuffer-sorter): Define the sorter to reverse sorting order if
last sorting mode was the sorter's.

(ibuffer-last-sorting-mode): New variable.
(ibuffer-do-sort-by-recency): Reverse sorting order if last sorting
mode was recency.

(w32-charset-info-alist): Map vietnamese to windows-1258.

(define-ibuffer-filter filename): When the major mode is `vc-dir-mode'
use the buffer's default directory as filename.

(define-ibuffer-column filename): When the major mode is `vc-dir-mode'
show the buffer's default directory.

(vc-dir-mode-map): Bind "r" to vc-dir-delete-file, like in PCL-CVS.

(vc-dir-mode-map): Bind "d" to vc-dir-delete-file.
(vc-dir-delete-file): Add.
(vc-delete-file): Do not barf when the file has been already deleted.

*** empty log message ***

(lisp-mode-map): Add menu.

* progmodes/octave-mod.el (octave-help): New function.
* progmodes/octave-hlp.el: Delete.
* info-look.el (octave-mode): Add operator index.

(vc-checkout): Typo.

(compilation-error-regexp-alist-alist) <gnu>:
Rule out trailing spaces in file and directory names as well.

(file_name_completion): Fix up the encoding/decoding issue
some more.  Copy some of the code from Ftry_completions.
Remove special case code that dates back to initial revision when the
slash was only added when necessary and that can't trigger nowadays.

Reorder, place things related to version control together.

(menu-bar-tools-menu): Reorder, place Games last.
Add "..." in the appropriate places.

(epa-key-list-mode-map): Add more menu entries.
Add ... in the appropriate places.

(dired-mode-map): Add :help.

(vc-deduce-fileset): Add new parameter.
(vc-dir-marked-only-files): New function.
(vc-next-action): Don't ignore directories, look at the files
inside them.
(vc-dir-mode): Document how the mark/unmark commands work.

(completion-pcm-try-completion): Typo.

(completion--do-completion): Move point even if the completion makes no change.
(completion-pcm-try-completion): Fix computation of new point.

Require 'cl.

*** empty log message ***

(gdb-frame-handler-1): Make overlay arrow
hollow if not in innermost frame.

*** empty log message ***

Make `checkout-model' apply to filesets.
* vc-hooks.el (vc-checkout-model): Rewrite.
(vc-before-save, vc-after-save): Adjust callers accordingly.
* vc.el (vc-editable-p, vc-next-action, vc-checkout, vc-update)
(vc-transfer-file): Adjust callers accordingly.
* vc-rcs.el (vc-rcs-checkout-model): Adjust arg.
(vc-rcs-state, vc-rcs-state-heuristic, vc-rcs-receive-file)
(vc-rcs-checkout, vc-rcs-fetch-master-state): Use vc-rcs-checkout-model
instead of vc-checkout-model.
* vc-mcvs.el (vc-mcvs-revert):
Use vc-mcvs-checkout-model i.s.o vc-checkout-model.
* vc-cvs.el (vc-cvs-checkout-model): Adjust arg.
(vc-cvs-revert): Use vc-cvs-checkout-model i.s.o vc-checkout-model.
* vc-svn.el (vc-svn-checkout-model):
* vc-hg.el (vc-hg-checkout-model):
* vc-git.el (vc-git-checkout-model):
* vc-bzr.el (vc-bzr-checkout-model): Adjust arg.

(dired-read-dir-and-switches): Replace last change with
a new approach that mixes read-file-name and read-directory-name.

(read-buffer-to-switch): Avoid making assumptions about `other-buffer'.

(vc-dir-mode-hook): Add normal hook.
(vc-dir-mode): Run it.

(gud-speedbar-buttons): Raise frame in gdb-speedbar-timer-fn.

(gdb-display-buffer): Don't pop up GUD buffer.
Always split windows.
(gdb-speedbar-timer-fn): Only raise frame after user input.
(gdb-same-frame): Reverse initial value.
(gdb-display-gdb-buffer): Check for GUD buffer in other frames.

*** empty log message ***

(flyspell-mode-on):  Remove redundant (flyspell-mode-hook) run.
(flyspell-mode): Fix docstring in definition.

(uniquify-rationalize-a-list): Beware of side-effects.

Daiki Ueno  <ueno at unixuser.org>

(epa-key-list-mode-map): Add menu.
(epa-delete-keys, epa-import-keys): Fix typo.

(top-level): Does not need cl when compiling.
Add arch-tag and footer.

Another new file, another license notice to update.

Fix typo in previous.

New file.

(completion-hilit-commonality): Remove leftover code.
(completion-pcm--pattern->regex): Let `group' be a list of symbols.
(completion-pcm--hilit-commonality): New function.
(completion-pcm-all-completions): Use it.

* minibuffer.el (completion-common-substring): Mark obsolete.
(completions-first-difference, completions-common-part): Move from simple.el.
(completion-hilit-commonality): New fun.
(display-completion-list, completion-emacs21-all-completions)
(completion-emacs22-all-completions): Use it.
* simple.el (completions-first-difference, completions-common-part):
Move to minibuffer.el.
(choose-completion-string): Use field functions and minibufferp.
(completion-setup-function): Don't set completions faces.

Fix comment typo.

(Sexp Diary Entries): Clarify diary-float.

(check-declare-errmsg): Fix counting in the `full' case.

(calendar-iso-from-absolute): Fix declaration.

(calendar-absolute-from-iso, calendar-iso-from-absolute): Fix declarations.

(holiday-float): Doc fix.

(diary-list-sexp-entries, diary-float): Doc fix.

(calendar-nth-named-absday, calendar-nth-named-day): Doc fix.

Add Windows battery support.

Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1132

Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1131

(battery-status-function): Use w32-battery-status on Windows.
(battery-echo-area-format): Make apm format the general case.
(battery-mode-line-format): Merge apm and pmset formats as the
general case.

(Fw32_battery_status): New defun.
(syms_of_w32fns): Defsubr it.

(gud-display-line): Only consider visible
frames when looking for source buffer.

(gdb-info-stack-custom): Use
gud-tool-bar-item-visible-no-fringe.
(gdb-display-buffer): Don't pop new buffer if gud-comint-buffer
is already visible in frame.  Remove optional size parameter
and add optional frame parameter.

*** empty log message ***

(doc-view-new-window-function): Avoid using WINDOW
argument to get-char-property, in case the current buffer hasn't
been assigned to that window yet.
(doc-view-display): Default to selected window if the current
buffer hasn't been assigned to a window yet.

* doc-view.el (doc-view-new-window-function): Avoid using WINDOW
argument to get-char-property, in case the current buffer hasn't
been assigned to that window yet.
(doc-view-display): Default to selected window if the current
buffer hasn't been assigned to a window yet.

Add arch tagline

whitespace-trailing-regexp docstring fix.

(vc-hg-rename-file): Fix argument order.

* tramp.texi (Frequently Asked Questions): Explain, how to disable
Tramp via `tramp-mode'.

* net/tramp.el (tramp-replace-environment-variables): Remove it.
There is a more simple solution.
(tramp-file-name-handler): Apply `substitute-in-file-name' w/o
Tramp file name handlers.

* net/tramp.el (tramp-mode): New defcustom.
(tramp-file-name-handler, tramp-completion-file-name-handler): Use
it.
(tramp-replace-environment-variables): Handle "$$".

(file_name_completion): Fix another mixing of encoded
and decoded names.

Explain how to work awound an error case.

(Fw32_define_rgb_color): Fix typo in docstring.

* whitespace.el (whitespace-trailing): Fix typo.

(url-load-hook): Fix typo in docstring.

(diary-make-entry): Update the autoload.

(completion-pcm--all-completions): Don't pass nil to all-completions.

(desktop-minor-mode-table): Add `savehist-mode'.

*** empty log message ***

(gdb-info-breakpoints-custom): Fix mismatched parentheses.

Daiki Ueno <ueno at unixuser.org>

(epa-file-handler): Restore 2008-03-16T04:04:15Z!mwolson@gnu.org version; previous change was buggy
patch.

(gdb-info-breakpoints-custom): Make breakpoint
icons work for assembler, i.e. FILE.s, FILE.S (not disassembly).
(gdb-goto-breakpoint): Likewise for visiting breakpoints.
(gdb-assembler-custom): Be careful not to match other addresses.

*** empty log message ***

*** empty log message ***

*** empty log message ***

(Fdefine_fringe_bitmap): Doc fix.

(epa-file-handler): Comment out, does not compile.

(vc-dir-mode-map): Change bindings for unmark all and revert.
(vc-dir-parent-marked-p, vc-dir-children-marked-p): Implement.
(vc-dir-mark-file): Add an optional argument.
(vc-dir-mark-all-files, vc-dir-unmark-all-files): Deal with directories.

* epa-file.el (auto-encryption-mode): Rename from epa-file-mode.
(epa-file-handler): Put 'safe-magic and 'operations properties.

* epa.el (epa-global-minor-modes, epa-mode, epa-menu)
(epa-menu-items): Remove.

* epa-dired.el (epa-dired-do-decrypt, epa-dired-do-verify)
(epa-dired-do-sign, epa-dired-do-encrypt): Add autoload cookie.
(epa-dired-mode, epa-global-dired-mode): Remove.

* dired.el (dired-mode-map): Bind encryption/decryption commands.

* menu-bar.el (menu-bar-encryption-decryption-menu): New menu item.

* files.el (insert-file-contents-literally): Inhibit epa-file-handler.

(reftex-isearch-switch-to-next-file): Remove un-needed local `orig-list'.
Replace cl `copy-list'.

2008-04-27  Carsten Dominik  <dominik@science.uva.nl>

* org/org.el (org-html-level-start): Always have id's in HTML
(org-export-as-html): Use `org-link-protocols' to
retrieve the export form of the link.
(org-add-link-type): Final parameter renamed from PUBLISH.  Better
documentation of how it is to be used.  Avoid double entries for
the same link type.
(org-add-link-props): New function.
(org-modules-loaded): New variable.
(org-load-modules-maybe, org-set-modules): New function.
(org-modules): New option.
(org-mode, org-cycle, orgstruct-mode, org-run-like-in-org-mode)
(orgtbl-mode, org-store-link, org-insert-link-global)
(org-open-at-point): Call `org-load-modules-maybe'.
(org-search-view): Add more text properties.
(org-agenda-schedule, org-agenda-deadline): Allow also in
search-type agendas.
(org-search-view): Order of arguments has been changed.
Interpret prefix-arg as TODO-ONLY.
(org-agenda, org-run-agenda-series, org-agenda-manipulate-query):
Take new argument order of `org-search-view' into account.
(org-todo-only): New variable.
(org-search-syntax-table): New variable and function.
(org-search-view): Do the search with the special syntax table.
(define-obsolete-function-alias): Make work with XEmacs.
(org-add-planning-info): Use old date as default when modifying an
existing deadline or scheduled item.
(org-agenda-compute-time-span): Make argument N optional.
(org-agenda-format-date-aligned): Require `cal-iso'.
(org-agenda-list): Include week into into agenda heading, don't
list it at each date (only on Mondays).
(org-read-date-analyze): Define local variable `iso-date'.
(org-agenda-format-date-aligned): Remove dependency on
`calendar-time-from-absolute'.
(org-remember-apply-template, org-go-to-remember-target):
Interpret filenames relative to `org-directory'.
(org-complete): Silently fail when trying to complete
keywords that don't have a default value.
(org-get-current-options): Added a #+DATE: option.
(org-additional-option-like-keywords): Removed "DATE:" from the
list of additional keywords.
(org-export-as-html): Removed (current-time) as unnecessary second
argument of `format-time-string'.
(org-clock-find-position): Handle special case at end of
buffer.
(org-agenda-day-view): New argument DAY-OF-YEAR, pass it on to
`org-agenda-change-time-span'.
(org-agenda-week-view): New argument ISO-WEEK, pass it on to
`org-agenda-change-time-span'.
(org-agenda-month-view): New argument MONTH, pass it on to
`org-agenda-change-time-span'.
(org-agenda-year-view):  New argument YEAR, pass it on to
`org-agenda-change-time-span'.
(org-agenda-change-time-span): New optional argument N, pass it on
to `org-agenda-compute-time-span'.
(org-agenda-compute-time-span): New argument N, interpret it by
changing the starting day.
(org-small-year-to-year): New function.
(org-scheduled-past-days): Respect
`org-scheduled-past-days'.
(org-auto-repeat-maybe): Make sure that repeating
dates are pushed into the future, and that the shift is at least
one interval, never 0.
(org-update-checkbox-count): Fix bug with checkbox
counting.
(org-add-note): New command.
(org-add-log-setup): Renamed from `org-add-log-maybe'.
(org-log-note-headings): New entry for plain notes (i.e. notes not
related to state changes or clocking).
(org-get-org-file): Check for availability of
`remember-data-file'.
(org-cached-entry-get): Allow a regexp value for
`org-use-property-inheritance'.
(org-use-property-inheritance): Allow regexp value.  Fix bug in
customization type.
(org-use-tag-inheritance): Allow a list and a regexp value for
this variable.
(org-scan-tags, org-get-tags-at): Implement selective tag
inheritance.
(org-entry-get): Respect value `selective' for the INHERIT
argument.
(org-tag-inherit-p, org-property-inherit-p): New functions.
(org-agenda-format-date-aligned): Allow 10 characters for
weekday, to acomodate German locale.
(org-add-archive-files): New function.
(org-agenda-files): New argument `ext', to
get archive files as well.
(org-tbl-menu): Protect the use of variables that
are only available when org-table.el gets loaded.
(org-read-agenda-file-list): Error if `org-agenda-files' is a
single directory.
(org-open-file): Allow a batch process to trigger
waiting after executing a system command.
(org-store-link): Link to headline when there is not
target and no region in an org-mode buffer when creating a link.
(org-link-types-re): New variable.
(org-make-link-regexps): Compute `org-link-types-re'.
(org-make-link-description-function): New option.
(org-agenda-date, org-agenda-date-weekend): New faces.
(org-archive-sibling-heading): New option.
(org-archive-to-archive-sibling): New function.
(org-iswitchb): New command.
(org-buffer-list): New function.
(org-agenda-columns): Also try the #+COLUMNS line in
the buffer associated with the entry at point (or with the first
entry in the agenda view).
(org-modules): Add entry for org-bibtex.el.
(org-completion-fallback-command): Moved into `org-completion'
group.
(org-clock-heading-function): Moved to `org-progress' group.
(org-auto-repeat-maybe): Make sure that a note can
be enforces if `org-log-repeat' is `note'.
(org-modules): Allow additional symbols for external
packages.
(org-ctrl-c-ctrl-c): Allow for `org-clock-overlays' to be
undefined.
(org-clock-goto): Hide drawers after showing an
entry with `org-clock-goto.'
(org-shiftup, org-shiftdown, org-shiftright, org-shiftleft): Try
also a clocktable block shift.
(org-clocktable-try-shift): New function.
(org-columns-hscoll-title): New function.
(org-columns-previous-hscroll): New variable.
(org-columns-full-header-line-format): New variable.
(org-columns-display-here-title, org-columns-remove-overlays):
Install `org-columns-hscoll-title' in post-command-hook.

* org/org.el: Split into many small files.

* org/org-agenda.el: New file, split off from org.el.

* org/org-archive.el: New file, split off from org.el.

* org/org-bbdb.el: New file.

* org/org-bibtex.el: New file, split off from org.el.

* org/org-clock.el: New file, split off from org.el.

* org/org-colview.el: New file, split off from org.el.

* org/org-compat.el: New file, split off from org.el.

* org/org-exp.el: New file, split off from org.el.

* org/org-faces.el: New file, split off from org.el.

* org/org-gnus.el: New file, split off from org.el.

* org/org-info.el: New file, split off from org.el.

* org/org-infojs.el: New file.

* org/org-irc.el: New file.

* org/org-macs.el: New file, split off from org.el.

* org/org-mew.el: New file.

* org/org-mhe.el: New file, split off from org.el.

* org/org-publish.el: New file, split off from org.el.

* org/org-remember.el: New file, split off from org.el.

* org/org-rmail.el: New file, split off from org.el.

* org/org-table.el: New file, split off from org.el.

* org/org-vm.el: New file, split off from org.el.

* org/org-wl.el: New file, split off from org.el.

2008-04-27  Jason Riedy  <jason@acm.org>

* lisp/org-table.el (orgtbl-to-generic): Add a :remove-nil-lines
parameter that supresses lines that evaluate to NIL.
(orgtbl-get-fmt): New inline function for
picking apart formats that may be lists.
(orgtbl-apply-fmt): New inline function for applying formats that
may be functions.
(orgtbl-eval-str): New inline function for strings that may be
functions.
(orgtbl-format-line, orgtbl-to-generic): Use and document.
(orgtbl-to-latex, orgtbl-to-texinfo): Document.
(*orgtbl-llfmt*, *orgtbl-llstart*)
(*orgtbl-llend*): Dynamic variables for last-line formatting.
(orgtbl-format-section): Shift formatting to support detecting the
last line and formatting it specially.
(orgtbl-to-generic): Document :ll* formats.  Set to the non-ll
formats unless overridden.
(orgtbl-to-latex): Suggest using :llend to suppress the final \\.
(*orgtbl-table*, *orgtbl-rtn*): Dynamically
bound variables to hold the input collection of lines and output
formatted text.
(*orgtbl-hline*, *orgtbl-sep*, *orgtbl-fmt*, *orgtbl-efmt*,
(*orgtbl-lfmt*, *orgtbl-lstart*, *orgtbl-lend*): Dynamically bound
format parameters.
(orgtbl-format-line): New function encapsulating formatting for a
single line.
(orgtbl-format-section): Similar for each section.  Rebinding the
dynamic vars customizes the formatting for each section.
(orgtbl-to-generic): Use orgtbl-format-line and
orgtbl-format-section.
(org-get-param): Now unused, so delete.
(orgtbl-gather-send-defs): New function to
gather all the SEND definitions before a table.
(orgtbl-send-replace-tbl): New function to find the RECEIVE
corresponding to the current name.
(orgtbl-send-table): Use the previous two functions and implement
multiple destinations for each table.

* doc/org.texi (A LaTeX example): Note that fmt may be a
one-argument function, and efmt may be a two-argument function.
(Radio tables): Document multiple destinations.

2008-04-27  Carsten Dominik  <dominik@science.uva.nl>

* org/org-agenda.el (org-add-to-diary-list): New function.
(org-prefix-has-effort): New variable.
(org-sort-agenda-noeffort-is-high): New option.
(org-agenda-columns-show-summaries)
(org-agenda-columns-compute-summary-properties): New options.
(org-format-agenda-item): Compute the duration of the item.
(org-agenda-weekend-days): New variable.
(org-agenda-list, org-timeline): Use the proper faces for dates in
the agenda and timeline buffers.
(org-agenda-archive-to-archive-sibling): New command.
(org-agenda-start-with-clockreport-mode): New option.
(org-agenda-clockreport-parameter-plist): New option.
(org-agenda-clocktable-mode): New variable.
(org-agenda-deadline-leaders): Allow a function value for the
deadline leader.
(org-agenda-get-deadlines): Deal with new function value.

* lisp/org-clock.el (org-clock): New customization group.
(org-clock-into-drawer, org-clock-out-when-done)
(org-clock-in-switch-to-state, org-clock-heading-function): Moved
into the new group.
(org-clock-out-remove-zero-time-clocks): New option.
(org-clock-out): Use `org-clock-out-remove-zero-time-clocks'.
(org-dblock-write:clocktable): Allow a Lisp form for the scope
parameter.
(org-dblock-write:clocktable): Fixed bug with total time
calculation.
(org-dblock-write:clocktable): Request the unrestricted list of
files.
(org-get-clocktable): New function.
(org-dblock-write:clocktable): Make sure :tstart and :tend can not
only be strings but also integers (an absolute day number) and
lists (m d y).

* org/org-colview.el (org-columns-next-allowed-value)
(org-columns-edit-value): Limit the effort for updatig in the
agenda to recomputing a single file.
(org-columns-compute): Only write property value if it has
changed.  This avoids raising the buffer-change-flag
unnecessarily.
(org-agenda-colview-summarize)
(org-agenda-colview-compute): New functions.
(org-agenda-columns): Call `org-agenda-colview-summarize'.

* org/org-exp.el (org-export-run-in-background): New option.
(org-export-icalendar): Allow a batch process to trigger waiting
after executing a system command.
(org-export-preprocess-string): Renamed-from
`org-cleaned-string-for-export'.
(org-export-html-style): Made target class look like normal text.
(org-export-as-html): Make use of the better proprocessing in
`org-cleaned-string-for-export'.
(org-cleaned-string-for-export): Better treatment of heuristic
targets, many more internal links will now work in HTML export.
(org-get-current-options): Incorporate LINK_UP, LINK_HOME, and
INFOJS.
(org-export-inbuffer-options-extra): New variable.
(org-export-options-filters): New hook.
(org-infile-export-plist): Find also the settings keywords in
`org-export-inbuffer-options-extra'.
(org-infile-export-plist): Allow multiple #+OPTIONS lines and
multiple #+INFOJS_OPT lines.
(org-export-html-handle-js-options): New function.
(org-export-html-infojs-setup): New option.
(org-export-as-html): Call `org-export-html-handle-js-options'.
Add autoload to all entry points.
(org-skip-comments): Function removed.

* org/org-table.el (org-table-make-reference): Extra parenthesis
around single fields, to make sure that algebraic formulas get
correctly interpreted by calc.
(org-table-current-column): No longer interactive.

* org/org-export-latex.el (org-export-latex-preprocess): Renamed
from `org-export-latex-cleaned-string'.

2008-04-27  Bastien Guerry  <bzg@altern.org>

* org/org-publish.el (org-publish-get-base-files-1): New function.
(org-publish-get-base-files): Use it.
(org-publish-temp-files): New variable.
Don't require 'dired-aux anymore.
(org-publish-initial-buffer): New variable.
(org-publish-org-to, org-publish): Use it.
(org-publish-get-base-files-1): Bug fix: get
the proper list of files when recursing thru a directory.
(org-publish-get-base-files): Use the :exclude property to skip
both files and directories.

*** empty log message ***

(erc-put-text-properties): Replace use of cl mapcar*.

Minor changes during update to version 6.02b.