* tramp.el (tramp-methods): Fix tramp-copy-args of "pscp" and "psftp".

Fix up encoding.

* vc-hooks.el (vc-default-mode-line-string): Add case for added files.
* vc.el (vc-default-dired-state-info): Use just "modified".
* vc-cvs.el (vc-cvs-state-heuristic): Turn rev 0 into `added'.
(vc-cvs-mode-line-string): Make use of the better default.
(vc-cvs-parse-entry): Use the new `added'.
(vc-cvs-dired-state-info): Remove.
* vc-svn.el (vc-svn-dired-state-info): Remove.
* vc-hg.el (vc-hg-dired-state-info): Remove.
* vc-git.el (vc-git-dired-state-info): Remove.

(vc-git-status-result): New variable.
(vc-git-dir-status): Split out ...
(vc-git-after-dir-status-stage1, vc-git-after-dir-status-stage2):
... these new functions and work asynchronously.

(vc-git-after-dir-status): Remove.
(vc-git-dired-state-info): Reimplement.

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

(emacs-lisp-mode-map): Add menu entry for disassemble.

(vc-status-mark-buffer-changed): Better deal with files in
the 'added state.
(vc-status-remove-up-to-date): New function.
(vc-status-mode-map, vc-status-menu-map): Bind it.
(vc-status-printer): Use a different face up-to-date files.
(vc-resynch-buffer): Update the vc-status buffer if it exists.
(Todo): Remove solved entries.

* vc-hg.el (vc-hg-state):
* vc-git.el (vc-git-state):
* vc-cvs.el (vc-cvs-parse-status):
* vc-bzr.el (vc-bzr-state): Return 'added when the file is in that
state.

(enlarge_buffer_text): Fix int -> EMACS_INT.

*** empty log message ***

(read-shell-command): Other typo.

* progmodes/compile.el (compile):
* progmodes/grep.el (grep, grep-find): Use read-shell-command.

(read-shell-command): Typo.

(minibuffer-local-shell-command-map): New var.
(minibuffer-complete-shell-command, read-shell-command): New funs.
(shell-command, shell-command-on-region): Use them.

* intervals.c (temp_set_point, temp_set_point_both): Use EMACS_INT.
(set_point, set_point_both): Use EMACS_INT.  Remove `buffer' arg,
work on current_buffer only instead (that was already the case
for some of the code anyway).
* buffer.h (set_point, set_point_both): Remove buffer arg, use long int.
(temp_set_point, temp_set_point_both): Use EMACS_INT.
(SET_PT, SET_PT_BOTH): Adjust.
* intervals.h (set_point, temp_set_point, set_point_both)
(temp_set_point_both): Remove redundant declarations.

* fileio.c (Finsert_file_contents):
* lread.c (Feval_buffer): Use BUF_TEMP_SET_PT.
* buffer.h (BUF_SET_PT): Remove.  set_point_both doesn't work right
when buffer != current_buffer anyway.

(Fcall_interactively) [case 'B']: Use other-buffer
as default.

(vc-status-mark-buffer-changed): New function to implement
updating of the *vc-status* buffer when a buffer is saved.
(vc-status-mode): Use it for after-change-hook.
(vc-add-to-vc-status-buffer): Rename to ...
(vc-status-add-entry): ... this.
(Todo): Add new entry.

(mm-copy-to-buffer): Use mm-set-buffer-multibyte.

(mm-set-buffer-multibyte): New function.

(gnus-configure-frame, gnus-all-windows-visible-p):
Prefer fboundp to functionp so it works with macros as well.

(sort-reorder-buffer): Preserve the buffer's multibyteness.

Fix up encoding.

(icomplete-completions): While collecting the list of prospective candidates,
don't overshoot `icomplete-prospects-length'.

(icomplete-prospects-length, icomplete-max-delay-chars,
icomplete-show-key-bindings, icomplete-minibuffer-setup-hook):
Remove spurious * from defcustom docstrings.
(icomplete-compute-delay): Fix docstring and remove spurious *.
(icomplete-delay-completions-threshold): Fix typo in docstring
and remove spurious *.

* textmodes/refbib.el:
* textmodes/reftex.el:
* textmodes/reftex-global.el:
* textmodes/reftex-vars.el:
* textmodes/reftex-toc.el: Don't use eval-and-compile for byte
compiler pacifying defvars.
(reftex-toc-mode): Only make zmacs-regions local on XEmacs.
* textmodes/reftex-index.el (zmacs-regions): Remove pacifier, not
needed.

(verilog-read-decls): Fix AUTOINPUT/AUTOOUTPUT mis-including
genvars.

(verilog-easy-menu-filter): New function.
(verilog-stmt-menu, verilog-menu): Add :help and filter it.
(verilog-customize, verilog-font-customize)
(electric-verilog-backward-sexp, electric-verilog-forward-sexp)
(verilog-mode): Update documentation strings to match tool tips.
(verilog-auto-search-do, verilog-auto-re-search-do)
(verilog-skip-forward-comment-or-string): Fix verilog-auto
expansion when a .* appears inside a string.
(verilog-re-search-forward, verilog-re-search-backward): Add
comment to recall how this works.

(calendar-location-name, calendar-latitude)
(calendar-longitude, solar-arctan, sunrise-sunset)
(solar-mean-equinoxes/solstices): Use the appropriate equality test.

(calendar-other-dates): Declare it, and removes the declarations it replaces.
(calendar-mouse-print-dates): Use calendar-other-dates.
(calendar-mouse-holidays): Re-use the title.
(calendar-mouse-view-diary-entries): Use or.
(calendar-mouse-chinese-date): Remove unused command.
(cal-menu-load-hook): Mark as obsolete.

(calendar-other-dates): New function.
(calendar-print-other-dates): Use calendar-other-dates.

(chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Make defcustoms.

(calendar-bahai-leap-year-p)
(calendar-bahai-leap-base, calendar-bahai-from-absolute): Doc fixes.
(calendar-absolute-from-bahai): Fix the leap-year case.
(calendar-bahai-from-absolute): Store the month.
(calendar-bahai-date-string, calendar-bahai-print-date): Handle
pre-Bahai dates.

Remove outdated comments.
(defcalcmodevar, calc-mode-var-list-restore-default-values)
(calc-mode-var-list-restore-saved-values, calc-autorange-units):
Add docstrings.

(x-alternatives-map): Add S-tab mapping.

(open-tls-stream): Reindent.

* net/tramp.el (tramp-let-maybe): Removed.
(tramp-drop-volume-letter): Don't use `replace-regexp-in-string'.
It does not exist under XEmacs.
(tramp-handle-file-truename, tramp-handle-expand-file-name)
(tramp-completion-file-name-handler): Let-bind
`directory-sep-char'.

* net/trampver.el: Move coding cookie at the end.

* net/tramp-uu.el: Move coding cookie at the end.

* net/tramp-fish.el (tramp-fish-handle-expand-file-name): Let-bind
`directory-sep-char'.

Revert accidental deletion of an entry.

(describe-function-1): Don't signal "missing arglist" for autoloaded keymaps.

* w32fns.c (hourglass_timer, hourglass_hwnd): New variables.
(syms_of_w32fns): Initialize them.
(HOURGLASS_ID): New constant.
(x_window_to_frame): Don't check hourglass_window.
(w32_wnd_proc) <WM_TIMER>: Handle hourglass_timer.
(w32_wnd_proc) <WM_EXITMENULOOP>: Set pending hourglass cursor.
(w32_wnd_proc) <WM_SETCURSOR>: Set the hourglass or current cursor.
(w32_wnd_proc) <WM_EMACS_SETCURSOR>: Set frame's current_cursor.
Only change the cursor if hourglass is not active.
(Fx_create_frame): Initialize frame's current_cursor.
(hourglass_atimer): Remove.
(hourglass_started): New function.
(start_hourglass, cancel_hourglass, hide_hourglass): Adapt to w32.
(show_hourglass): Adapt to w32, changing argument to frame.

* w32term.h (struct w32_output): Remove hourglass_window.
Add current_cursor.

* eval.c (call_debugger, Fsignal):
* keyboard.c (recursive_edit_1, cmd_error, Ftop_level)
(command_loop_1, Fread_key_sequence, Fread_key_sequence_vector)
(Fexecute_extended_command, cancel_hourglass_unwind):
* minibuf.c (read_minibuf):
* fns.c (Fy_or_n_p): Enable hourglass when HAVE_WINDOW_SYSTEM.

*** empty log message ***

(run_funs): New fun.
(run_window_configuration_change_hook): Use it to run the buffer-local
and the global part of the hook.

(format_mode_line_unwind_data): Add window argument.
(unwind_format_mode_line): Restore selected window.
(x_consider_frame_title, Fformat_mode_line): Set selected window.

(verilog-syntax-ppss): New function.
(electric-verilog-terminate-line, verilog-in-struct-region-p)
(verilog-backward-ws&directives, verilog-forward-ws&directives)
(verilog-in-comment-p, verilog-in-star-comment-p)
(verilog-in-slash-comment-p, verilog-skip-backward-comments)
(verilog-parenthesis-depth, verilog-skip-backward-comment-or-string)
(verilog-skip-forward-comment-or-string, verilog-in-paren)
(verilog-skip-forward-comment-p): Use it,

*** empty log message ***

(org-link-store, org-link-follow, org-latex, org-remember-templates,
org-time-stamp-rounding-minutes, org-back-over-empty-lines,
org-find-base-buffer-visiting, org-columns-new): Fix typos in docstrings.

(tramp-drop-volume-letter): Evaluate when compiling.

(diff-header): Make the color louder.
(diff-refine-change): Tone the color down.

*** empty log message ***

(describe-char): When specifying all properties,
list them in the right order.

(load-with-code-conversion): Avoid setting default-enable-multibyte-characters.

*** empty log message ***

(vc-annotate-background): Fix custom type.

(describe-char-unidata-list): Allow specifying just all properties.
(describe-char): Handle that new value.

(cua-paste): Signal an error in read-only buf.

`inhibit-startup-screen' doesn't inhibit display of the initial message
in the *scratch* buffer.

(doc-view-initiate-display): Use doc-view-doc-type
instead of file name extension to make docs with uncommon
extensions work.

(require): Require cl at compile time because
`assert' needs it.

Fix typos in comments.

(mh-invisible-header-fields-internal): Add Accreditor,
Seal-Send-Time (closes SF #1916032).
(mh-invisible-header-fields, mh-invisible-header-fields-default):
Update URL to bug report for users to report ignored fields.

(initial-calendar-window-hook, today-visible-calendar-hook): Doc fixes.

* net/tramp.el (tramp-root-regexp): Simplify.
(tramp-completion-file-name-regexp-separate): Don't insist on
leading "[".  This prevents method or user or host completion.
(tramp-let-maybe): Autoload it.
(tramp-drop-volume-letter): Don't autoload.  When not on W32, it is
an alias for `identity'.
(tramp-handle-write-region): Protect `last-coding-system-used'
over the trailing statements.
(tramp-completion-file-name-handler-post-function): Removed.
(tramp-completion-file-name-handler): Let-bind
`directory-sep-char' instead of calling
`tramp-drop-volume-letter'.
(top): Move coding cookie at the end.

Revert unintended change.

(Fchar_equal): Check they are valid characters.

(Fbuffer_list): Declare (for use in callint.c).

(tramp-completion-mode-p): Don't use char-equal for
elements which may be something else than characters.

* vc-bzr.el (vc-bzr-dir-status, vc-bzr-after-dir-status):
New functions to implement vc-status support.

* vc.el (vc-default-extra-status-menu)
(vc-add-to-vc-status-buffer): New functions.

(emacs-lisp-mode-map): Add menu entries for eldoc and ielm.

(re_match_2_internal): Properly match raw 8-bit bytes
against a charset.

(Fbuffer_list): Declare.

(free_frame_tool_bar): Only call gtk_container_remove if
handlebox_widget is != 0.

(diary-frame-parameters, calendar-frame-parameters)
(calendar-and-diary-frame-parameters): Fix custom type; add options.
(calendar-frame, diary-frame): Doc fixes.
(calendar-dedicate-diary, calendar-frame-1): Extract common code into
new functions.
(calendar-one-frame-setup, calendar-two-frame-setup): Doc fixes.
Use calendar-frame-1 and calendar-dedicate-diary.
(calendar-one-frame-setup): Also handle only-one-frame case.
(calendar-only-one-frame-setup): Doc fix.  Just call calendar-one-frame-setup.

Re-order some definitions before their use.
(nongregorian-diary-listing-hook, nongregorian-diary-marking-hook)
(diary-list-entries): Doc fixes.
(simple-diary-display, fancy-diary-display): Use
calendar-in-read-only-buffer to replace previous code and disable undo.
(make-fancy-diary-display): Remove function.

(calendar-today-marker, initial-calendar-window-hook)
(today-visible-calendar-hook, today-invisible-calendar-hook)
(diary-file, calendar-basic-setup, calendar-star-date)
(calendar-mark-today): Doc fixes.
(today-visible-calendar-hook): Add options.
(calendar-in-read-only-buffer): New macro.
(calendar-basic-setup): Adapt for change in calendar-read-date.
Place holiday let inside if.
(calendar-day-name-array, calendar-month-name-array): Make defcustoms.
(calendar-read-date): Set day to 1 rather than nil in the NODAY case.
(calendar-print-other-dates): Use one let rather than many.
Use calendar-in-read-only-buffer to replace previous code and disable undo.

(list-yahrzeit-dates): Use calendar-in-read-only-buffer to replace
previous code and disable undo.

(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Use calendar-in-read-only-buffer to replace previous code and disable undo.

(calendar-phases-of-moon): Use calendar-in-read-only-buffer to replace
previous code and disable undo.

*** empty log message ***

(Viewing): Update URL for adding header fields to
mh-invisible-header-fields-default.

*** empty log message ***

Commands that read a buffer name now provide a list of all buffers.

(Fcall_interactively): For interactive code letters
'b' and 'B' put the buffer list into the list of default "future"
values of the minibuffer.

(goto-line): Leave mark at previous position.  Doc fix.

(kill-this-buffer): Use menu-bar-non-minibuffer-window-p
to check if the current buffer is the minibuffer, and in this case
call abort-recursive-edit to kill the minibuffer.  Doc fix.
(kill-this-buffer-enabled-p): Allow this function to return non-nil
when the current buffer is the minibuffer.

(isearch-edit-string): Use search-ring-yank-pointer
and regexp-search-ring-yank-pointer for the HISTPOS argument of
read-from-minibuffer to provide the correct initial minibuffer
history position in isearch-edit-string when it is called from
isearch-ring-adjust.

Fix typos.

(read_key_sequence): Fix downcasing of letters with
modifiers.

(re_match_2_internal): Correct matching of a charset
against latin-1 characters.

(doc-view-doc->txt, doc-view-convert-current-doc):
Use non-nil PARENTS attribute of make-directory instead of
explicitly checking existence the current cache directory.

lisp/ChangeLog: Update.

EasyPG: Fix bug with C-x C-s after M-x epa-file-select-keys.

(calendar-mayan-haab-to-string): Simplify.
(calendar-mayan-tzolkin-from-absolute): Expand calendar-mod calls.

*** empty log message ***

(auto-coding-alist): Use
no-conversion-multibyte for archive files.

Small formatting change.

(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
(diary-font-lock-sexps): Use format rather than concat.
(diary): Remove un-needed let.
(view-other-diary-entries): Rename argument.
(diary-list-entries-2): New function.
(diary-list-entries-1, diary-list-entries): Use diary-list-entries-2.
(print-diary-entries): Use unless.
(diary-mark-entries-1): Change argument order, make all but
markfunc optional.  Handle the standard (Gregorian) case.  Use
match-string-no-properties.  Handle marks.
(mark-diary-entries): Use diary-mark-entries-1.
(calendar-mark-complex, calendar-mark-1): New functions.
(diary-font-lock-keywords-1): New macro.
(diary-font-lock-keywords): Use diary-font-lock-keywords-1.