* subr.el (unintern): Declare the obarray arg mandatory.
* emacs-lisp/byte-run.el (set-advertised-calling-convention):
Add `when' argument.  Update callers.

Doc fixes related to diary-sort-entries.

* lisp/calendar/diary-lib.el (diary-list-entries-hook, diary-sort-entries):
Doc fixes.

* doc/emacs/cal-xtra.texi (Fancy Diary Display): Emphasize that sort
should be the last hook item.

Tiny calendar.texi update.
* doc/emacs/calendar.texi (Appointments): Also updated when a diary
include file is saved.

* lisp/calendar/appt.el (appt-check): Doc fix.

Fix bug#6999.

* lisp/calendar/diary-lib.el (diary-included-files): New variable.
(diary-list-entries): Maybe initialize diary-included-files.
(diary-include-other-diary-files): Append to diary-included-files.
* lisp/calendar/appt.el (appt-update-list): Also check the members of
diary-included-files.

simple.el (line-move-visual): Do not truncate goal column to integer size.
(Bug#7020)

Fix bug 7013, only do send event if wanted state != current state.

* xterm.c (get_current_vm_state): New function.
(do_ewmh_fullscreen): Call get_current_vm_state and compare with
want_fullscreen so set_wm_state calls are few (Bug#7013).
(x_handle_net_wm_state): Move code to get_current_vm_state and
call that function.

Update name of <emacs-bugs-7626@cbane.org>

Various updates for the Bugs section of the manual.

* doc/emacs/trouble.texi (Bugs): Update the section intro.
(Known Problems): New section.
(Checklist): Misc updates.  Prefer M-x report-emacs-bug.
(Sending Patches): Bug fixes are best as responses to existing bugs.

* doc/emacs/emacs.texi (Known Problems): Add menu entry for new section.

* repeat.el (repeat): Allow repeating when the last event is a click.
Suggested by Drew Adams (bug#6256).

* vc/vc-hg.el (vc-hg-state,vc-hg-working-revision):
Replace setting HGRCPATH to "" by some less invasive --config options.

* lisp/font-lock.el (font-lock-beginning-of-syntax-function):
Mark as obsolete.

* src/term.c (tty_set_terminal_modes): Don't initialize twice (bug#7002).

* lisp/url/url-cache (url-store-in-cache): Make `buff' argument really optional.

Close bug#6211.
* lisp/menu-bar.el (menu-bar-options-save): Fix handling of menu-bar
and tool-bar modes.  (Bug#6211)
(menu-bar-mode): Move setting of standard-value after the
minor-mode definition, otherwise it seems to have no effect.

* lisp/url/url-cookie.el (url-cookie-expired-p): Tweak previous change.

* lisp/url/url-cookie.el (url-cookie-expired-p): Simplify and fix.  (Bug#6957)

Close bug#6976.
* lisp/progmodes/antlr-mode.el (antlr-font-lock-additional-keywords): Fix typo.

coding.c (encode_coding_iso_2022): Do not optimize for ASCII if we may use designation or locking-shift.

merge emacs-23

coding.c (detect_coding_emacs_mule): Fix checking of multibyte sequence when the source is multibyte.

Merge whitespace.el from trunk

* doc/lispref/files.texi (Directory Names): Use \` rather than ^.
* lisp/files.el (directory-abbrev-alist): Use \` as default regexp.

Regenerate configure

* emacs-lisp/rx.el (rx-any): Don't explode ranges that end in - or ].
(rx-any-condense-range): Explode 2-char ranges.

Fixes: debbugs:6984

* dired.texi (Dired Enter): Minor doc fix (Bug#6982).

Revert last change.

* frames.texi (Layout Parameters): Add cindex entries (Bug#6929).

Update email of Roland Winkler <winkler@gnu.org>

* doc/emacs/misc.texi (Saving Emacs Sessions): Mention desktop-path.  (Bug#6948)

* desktop.el (desktop-path): Bump :version after 2009-09-15 change.

Fix handling of 8-bit characters in a display table.

merge emacs-23

term.c (encode_terminal_code): Encode byte chars to the correspnding bytes.

* etc/ChangeLog: Whitespace.

* etc/ChangeLog: Mark tiny change.

quail/japanese.el (quail-japanese-update-translation): Fix handling of invalid key.

Sync with Tramp 2.1.19.

* tramp.texi (Inline methods, Default Method): Mention
`tramp-inline-compress-start-size'.  Remove "kludgy" phrase.  Remove
remark about doubled "-t" argument.
(Auto-save and Backup): Remove reference to Emacs 21.
(Filename Syntax): Describe port numbers.
(Frequently Asked Questions): Adapt supported (X)Emacs versions.  Adapt
supported MS Windows versions.  Remove obsolete URL.  Recommend "sshx"
and "scpx" for echoing shells.  Use the $() syntax, texi2dvi reports
errors with the backquotes.
(External packages): File attributes cache flushing for asynchronous
processes.
(Traces and Profiles): Describe verbose level 9.

* trampver.texi: Update release number.

Sync with Tramp 2.1.19.

* net/tramp-cmds.el (tramp-cleanup-all-connections)
(tramp-reporter-dump-variable, tramp-load-report-modules)
(tramp-append-tramp-buffers): Use `tramp-compat-funcall'.
(tramp-bug): Recommend setting of `tramp-verbose' to 9.

* net/tramp-compat.el (top): Do not autoload
`tramp-handle-file-remote-p'.  Load tramp-util.el and tramp-vc.el
only when `start-file-process' is not bound.
(byte-compile-not-obsolete-vars): Define if not bound.
(tramp-compat-funcall): New defmacro.
(tramp-compat-line-beginning-position)
(tramp-compat-line-end-position)
(tramp-compat-temporary-file-directory)
(tramp-compat-make-temp-file, tramp-compat-file-attributes)
(tramp-compat-copy-file, tramp-compat-copy-directory)
(tramp-compat-delete-file, tramp-compat-delete-directory)
(tramp-compat-number-sequence, tramp-compat-process-running-p):
Use it.
(tramp-advice-file-expand-wildcards): Do not use
`tramp-handle-file-remote-p'.
(tramp-compat-make-temp-file): Simplify fallback implementation.
(tramp-compat-copy-file): Add PRESERVE-SELINUX-CONTEXT.
(tramp-compat-copy-tree): Remove function.
(tramp-compat-delete-file): New defun.
(tramp-compat-delete-directory): Provide implementation for older
Emacsen.
(tramp-compat-file-attributes): Handle only
`wrong-number-of-arguments' error.

* net/tramp-fish.el (tramp-fish-handle-copy-file): Add
PRESERVE_SELINUX_CONTEXT.
(tramp-fish-handle-delete-file): Add TRASH arg.
(tramp-fish-handle-directory-files-and-attributes):
Do not use `tramp-fish-handle-file-attributes.
(tramp-fish-handle-file-local-copy)
(tramp-fish-handle-insert-file-contents)
(tramp-fish-maybe-open-connection): Use `with-progress-reporter'.

* net/tramp-gvfs.el (top): Require url-util.
(tramp-gvfs-mount-point): Remove.
(tramp-gvfs-file-name-handler-alist): Add `file-selinux-context'
and `set-file-selinux-context'.
(tramp-gvfs-stringify-dbus-message, tramp-gvfs-send-command)
(tramp-gvfs-handle-file-selinux-context)
(tramp-gvfs-handle-set-file-selinux-context): New defuns.
(with-tramp-dbus-call-method): Format trace message.
(tramp-gvfs-handle-copy-file): Handle PRESERVE-SELINUX-CONTEXT.
(tramp-gvfs-handle-copy-file, tramp-gvfs-handle-rename-file):
Implement backup call, when operation on local files fails.  Use
progress reporter.  Flush properties of changed files.
(tramp-gvfs-handle-delete-file): Add TRASH arg.  Use
`tramp-compat-delete-file'.
(tramp-gvfs-handle-expand-file-name): Expand "~/".
(tramp-gvfs-handle-make-directory): Make more traces.
(tramp-gvfs-handle-write-region): Protect deleting tmpfile.
(tramp-gvfs-url-file-name): Hexify file name in url.
(tramp-gvfs-fuse-file-name): Take also prefix (like dav shares)
into account for the resulting file name.
(tramp-gvfs-handler-askquestion): Preserve current message, in
order to let progress reporter continue afterwards.  (Bug#6257)
Return dummy mountpoint, when the answer is "no".  See
`tramp-gvfs-maybe-open-connection'.
(tramp-gvfs-handler-mounted-unmounted)
(tramp-gvfs-connection-mounted-p): Test also for new mountspec
attribute "default_location".  Set "prefix" property.  Handle
default-location.
(tramp-gvfs-mount-spec): Return both prefix and mountspec.
(tramp-gvfs-maybe-open-connection): Test, whether mountpoint
exists.  Raise an error, if not (due to a corresponding answer
"no" in interactive questions, for example). Use
`tramp-compat-funcall'.

* net/tramp-imap.el (top): Autoload `epg-make-context'.
(tramp-imap-handle-copy-file): Add PRESERVE-SELINUX-CONTEXT.
(tramp-imap-do-copy-or-rename-file)
(tramp-imap-handle-insert-file-contents)
(tramp-imap-handle-file-local-copy): Use `with-progress-reporter'.
(tramp-imap-handle-delete-file): Add TRASH arg.

* net/tramp-smb.el (tramp-smb-handle-copy-file): Add
PRESERVE-SELINUX-CONTEXT.
(tramp-smb-handle-copy-file)
(tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file)
(tramp-smb-handle-write-region, tramp-smb-maybe-open-connection):
Use `with-progress-reporter'.
(tramp-smb-handle-delete-file): Add TRASH arg.

* net/tramp.el (tramp-methods): Move hostname to the end in all
ssh `tramp-login-args'.  Add `tramp-async-args' attribute where
appropriate.
(tramp-verbose): Describe verbose level 9.
(tramp-completion-function-alist)
(tramp-file-name-regexp, tramp-chunksize)
(tramp-local-coding-commands, tramp-remote-coding-commands)
(with-connection-property, tramp-completion-mode-p)
(tramp-action-process-alive, tramp-action-out-of-band)
(tramp-check-for-regexp, tramp-file-name-p, tramp-equal-remote)
(tramp-exists-file-name-handler): Fix docstring.
(tramp-remote-process-environment): Use `format' instead of
`concat'.  Protect version string by apostroph.
(tramp-shell-prompt-pattern): Do not use a shy group in case of
XEmacs.
(tramp-file-name-regexp-unified)
(tramp-completion-file-name-regexp-unified): On W32 systems, do
not regard the volume letter as remote filename.  (Bug#5447)
(tramp-perl-file-attributes)
(tramp-perl-directory-files-and-attributes): Don't pass "$3".
(tramp-vc-registered-read-file-names): Read input as
here-document, otherwise the command could exceed maximum length
of command line.
(tramp-file-name-handler-alist): Add `file-selinux-context' and
`set-file-selinux-context'.
(tramp-debug-message): Add `tramp-compat-funcall' to ignored
backtrace functions.
(tramp-error-with-buffer): Don't show the connection buffer when
we are in completion mode.
(tramp-progress-reporter-update, tramp-remote-selinux-p)
(tramp-handle-file-selinux-context)
(tramp-handle-set-file-selinux-context, tramp-process-sentinel)
(tramp-connectable-p, tramp-open-shell, tramp-get-remote-trash):
New defuns.
(with-progress-reporter): New defmacro.
(tramp-debug-outline-regexp): New defconst.
(top, tramp-rfn-eshadow-setup-minibuffer)
(tramp-rfn-eshadow-update-overlay, tramp-handle-set-file-times)
(tramp-handle-dired-compress-file, tramp-handle-shell-command)
(tramp-completion-mode-p, tramp-check-for-regexp)
(tramp-open-connection-setup-interactive-shell)
(tramp-compute-multi-hops, tramp-read-passwd, tramp-clear-passwd)
(tramp-time-diff, tramp-coding-system-change-eol-conversion)
(tramp-set-process-query-on-exit-flag, tramp-unload-tramp):
Use `tramp-compat-funcall'.
(tramp-handle-make-symbolic-link): Flush file properties.
(tramp-handle-load, tramp-handle-file-local-copy)
(tramp-handle-insert-file-contents, tramp-handle-write-region)
(tramp-handle-vc-registered, tramp-maybe-send-script)
(tramp-find-shell): Use `with-progress-reporter'.
(tramp-do-file-attributes-with-stat): Add space in format string,
in order to work around a bug in pdksh.  Reported by Gilles Pion
<gpion@lfdj.com>.
(tramp-handle-verify-visited-file-modtime): Do not send a command
when the connection is not established.
(tramp-handle-set-file-times): Simplify the check for utc.
(tramp-handle-directory-files-and-attributes)
(tramp-get-remote-path): Use `copy-tree'.
(tramp-completion-handle-file-name-all-completions): Ensure, that
non remote files are still checked.  Oops.
(tramp-handle-copy-file, tramp-do-copy-or-rename-file): Handle
PRESERVE-SELINUX-CONTEXT.
(tramp-do-copy-or-rename-file): Add progress reporter.
(tramp-do-copy-or-rename-file-directly): Do not use
`tramp-handle-file-remote-p'.
(tramp-do-copy-or-rename-file-out-of-band):
Use `tramp-compat-delete-directory'.
(tramp-do-copy-or-rename-file-out-of-band)
(tramp-compute-multi-hops, tramp-maybe-open-connection):
Use `format-spec-make'.
(tramp-handle-delete-file): Add TRASH arg.
(tramp-handle-dired-uncache): Flush directory cache, not only file
cache.
(tramp-handle-expand-file-name)
(tramp-completion-handle-file-name-all-completions)
(tramp-completion-handle-file-name-completion): Use
`tramp-connectable-p'.
(tramp-handle-start-file-process): Set connection property "vec".
Use it, in order to invalidate file caches.  Check only for
`remote-tty' process property.
Implement tty setting.  (Bug#4604, Bug#6360)
(tramp-file-name-for-operation): Add `call-process-region' and
`set-file-selinux-context'.
(tramp-find-foreign-file-name-handler)
(tramp-advice-make-auto-save-file-name)
(tramp-set-auto-save-file-modes): Remove superfluous check for
`stringp'.  This is done inside `tramp-tramp-file-p'.
(tramp-file-name-handler): Trace 'quit.  Catch the error for some
operations when we are in completion mode.  This gives the user
the chance to correct the file name in the minibuffer.
(tramp-completion-mode-p): Use `non-essential'.
(tramp-handle-file-name-all-completions): Backward/ XEmacs
compatibility: Use `completion-ignore-case' if
`read-file-name-completion-ignore-case' does not exist.
(tramp-get-debug-buffer): Use `tramp-debug-outline-regexp'.
(tramp-find-shell, tramp-open-connection-setup-interactive-shell):
`tramp-open-shell'.
(tramp-action-password): Hide password prompt before next run.
(tramp-process-actions): Widen connection buffer for the trace.
(tramp-open-connection-setup-interactive-shell): Set `remote-tty'
process property.  Trace stty settings if `tramp-verbose' >= 9.
Apply workaround for IRIX64 bug.  Move argument of last
`tramp-send-command' where it belongs to.
(tramp-maybe-open-connection): Use `async-args' and `gw-args' in
front of `login-args'.
(tramp-get-ls-command, tramp-get-ls-command-with-dired): Run tests
on "/dev/null" instead of "/".
(tramp-get-ls-command-with-dired): Make test for "--dired"
stronger.
(tramp-set-auto-save-file-modes): Adapt version check.
(tramp-set-process-query-on-exit-flag): Fix wrong parentheses.
(tramp-handle-process-file): Call the program in a subshell, in
order to preserve working directory.
(tramp-handle-shell-command): Don't use hard-wired "/bin/sh" but
`tramp-remote-sh' from `tramp-methods'.
(tramp-get-ls-command): Make test for "--color=never" stronger.
(tramp-check-for-regexp): Use (forward-line 1).

* net/trampver.el: Update release number.

* net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Do not pass
empty argument to gvfs-copy.

* net/tramp-compat.el (tramp-compat-delete-file): Rewrite to
handle new TRASH arg of `delete-file'.

* net/tramp.el (tramp-handle-insert-directory): Don't use
`forward-word', its default syntax could be changed.

Implement compression for inline methods.

* net/tramp.el (tramp-inline-compress-start-size): New defcustom.
(tramp-copy-size-limit): Allow also nil.
(tramp-inline-compress-commands): New defconst.
(tramp-find-inline-compress, tramp-get-inline-compress)
(tramp-get-inline-coding): New defuns.
(tramp-get-remote-coding, tramp-get-local-coding): Remove,
replaced by `tramp-get-inline-coding'.
(tramp-handle-file-local-copy, tramp-handle-write-region)
(tramp-method-out-of-band-p): Use `tramp-get-inline-coding'.

Detect ssh 'ControlMaster' argument automatically in some cases.

* net/tramp.el (tramp-detect-ssh-controlmaster): New defun.
(tramp-default-method): Use it.

* net/tramp.el (tramp-file-name-for-operation):
Add file-selinux-context.

play/cookie1.el (read-cookie): Fix off-by-one error (bug#6921).

* emacs.1: Mention "maximized" value for the "fullscreen" X resource.

* simple.el (beginning-of-buffer, end-of-buffer): Doc fix (Bug#6907).

* progmodes/python.el (python-block-pairs): Allow use of "finally" with "else" (Bug#3991).

* emacs3.py: Import imp module and use it (Bug#5756).

Handle multiple entries in some RCIRC commands (Bug#6894).

* lisp/net/rcirc.el (rcirc-add-or-remove): Accept a list of elements.
(ignore, bright, dim, keyword): Split list of nicknames before
passing to rcirc-add-or-remove.

Doc fix for define-minor-mode (Bug#6880).

* doc/lispref/modes.texi (Defining Minor Modes): Doc fix (Bug#6880).

* emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix (Bug#6880).

merge whitespace.el change from trunk

Fix buffer-list rename&refresh after after killing a buffer in ido.
* lisp/ido.el: Revert Óscar's.
(ido-kill-buffer-at-head): Exit the minibuffer with ido-exit=refresh.
Remember the buffers at head, rather than their name.
* lisp/iswitchb.el (iswitchb-kill-buffer): Re-make the list.

* progmodes/make-mode.el (makefile-fill-paragraph): Account for the
extra backslash added to each line.

Fixes: debbugs:6890

* subr.el (read-key): Don't echo keystrokes.

Fixes: debbugs:6883

* doc/emacs/misc.texi (Amusements): Mention bubbles and animate.

* lisp/menu-bar.el (menu-bar-games-menu): Add landmark.

Minor align-regexp fix.

* lisp/align.el (align-regexp): Make group and spacing arguments use
the interactive defaults when non-interactive.  (Bug#6698)

Fix rmail-forward with non-sendmail sending function.

* lisp/mail/rmail.el (rmail-forward): Replace mail-text-start with its
expansion, so as not to need sendmail.
(mail-text-start): Remove declaration.
(rmail-retry-failure): Require sendmail.

* objects.texi (Bool-Vector Type): Minor definition tweak (Bug#6878).

* lisp/subr.el (read-key): Don't hide the menu-bar entries.

Fixes: debbugs:6881

lisp/ChangeLog: Remove merge markers.

* progmodes/flymake.el (flymake-start-syntax-check-process): Use
`start-file-process' in order to let it run also on remote hosts.

files.el: Add word-wrap as safe local variable.

* lisp/woman.el (woman-translate): Case matters.  (Bug#6849)

* eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA_LISP
instead of SAFE_ALLOCA.

Avoid stack overflow in let, eval, and apply (Bug#6214).

* eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA (Bug#6214).

* quail/vntelex.el ("vietnamese-telex"): Doc fix.

* quail/georgian.el: Remove extra backslashes.

* simple.el (kill-region): Doc fix (Bug#6787).

Avoid mismatching parens

* quail/arabic.el: Quote [ and ].
* quail/latin-ltx.el: Likewise.

* quail/greek.el ("greek", "greek-postfix"): Change string to
character.

* doc.c (Fsnarf_documentation): Set skip_file only if p[1] is S.

* lisp/calendar/diary-lib.el: Bump custom :version for previous change.

Minor diary-lib.el fix.
* lisp/calendar/diary-lib.el (diary-header-line-format):
Fit it to the window, not the frame.

* doc.c (Fsnarf_documentation): Initialize skip_file before build-files test.

merge emacs-23

quail/greek.el ("greek-postfix"): Add rules for Greek style quotes.

* subr.el (ignore-errors): Add debug declaration.

* src/s/hpux10-20.h (HAVE_TERMIOS, NO_TERMIO, ORDINARY_LINK): New
definitions.
(HAVE_TERMIO): Remove.

merge emacs-23

quail/greek.el ("greek"): Add rules for Greek style quotes.

* whitespace.el (whitespace-color-off): Remove post-command-hook locally.

Fix query-replace-regexp incomplete highlighting (Bug#6808).

* replace.el (replace-highlight): Bind isearch-forward and
isearch-error, ensuring that highlighting is updated if the user
switches the search direction (Bug#6808).

* isearch.el (isearch-lazy-highlight-forward): New var.
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
(isearch-lazy-highlight-update): Use it.

merge trunk

Improve the encoding by compound-text-with-extensions.

merge trunk

* emulation/pc-select.el: Fix typos in docstrings.

* lisp/simple.el (exchange-dot-and-mark): Mark obsolete, finally.

Modify the coding system compound-text-with-extensions to conform to the spec of Compound Text.

which-func.el (which-func-format): Split help-echo text into lines.

* server.el (server-start): Force IPv4 and use literal 127.0.0.1.

nt/cmdproxy.c (main): Use _snprintf instead of wsprintf (bug#6647).

* bindings.el (complete-symbol): Run completion-at-point as a fallback.

* lispref/control.texi (Handling Errors) <error-message-string>: Fix arg name.

Fixes: debbugs:6770

* term.el: Fix typos in docstrings.

* bindings.el (function-key-map): Add a S-tab => backtab fallback.

* w32fns.c (syms_of_w32fns) <x-max-tooltip-size>: Fix typo in docstring.
* xfns.c (syms_of_xfns) <x-max-tooltip-size>: Reflow docstring.

* org.texi (Footnotes, Tables in HTML export): Fix typos.

* dabbrev.el (dabbrev-completion): Fix typo in docstring.

* lisp/emacs-lisp/syntax.el (syntax-ppss-toplevel-pos): Fix typo in docstring.

Fixes: debbugs:6747

* lisp/eshell/esh-io.el (eshell-get-target): Better detection of read-only file (Bug#6762).

fns.c: Doc fixes.

align.el: Doc fixes.

* doc/lispref/modes.texi (Defining Minor Modes): Use C-backspace, not C-delete.