(Commentary): Point to calendar.el.
(solar-equinoxes-solstices): Reduce nesting of some lets.

(Commentary): Point to calendar.el.
(lunar-phase-list, lunar-new-moon-on-or-after): Reduce nesting of some lets.

(cal-tex-cursor-month-landscape)
(cal-tex-cursor-month, cal-tex-LaTeXify-string): Reduce nesting of some lets.

(Commentary): Point to calendar.el.
(calendar-persian-date-string): Reduce nesting of some lets.

(Commentary): Point to calendar.el.
(calendar-forward-month, calendar-end-of-month): Reduce nesting of some lets.

(Commentary): Point to calendar.el.
(cal-menu-holidays-menu):  Use calendar-mark-holidays rather than
obsolete alias.

(Commentary): Point to calendar.el.
(calendar-string-to-mayan-long-count, calendar-goto-mayan-long-count-date):
Simplify.

(Commentary): Point to calendar.el.

(Commentary): Point to calendar.el.
(calendar-goto-french-date): Reduce nesting of some lets.

(Commentary): Point to calendar.el.

(calc-init-extensions): Remove keybinding assignments for `calc-yank'.

Autoload `calc-yank'.
(calc-mode-map): Add keybindings for `calc-yank'.

(Funibyte_charset, Fset_unibyte_charset): Remove.

(mark-islamic-diary-entries): Fix argument order in call to
diary-mark-entries-1.

(diary-bahai-mark-entries): Fix argument order in call to diary-mark-entries-1.

(Commentary): Replace with pointer to calendar.el.
(mark-hebrew-diary-entries): Fix argument order in call to diary-mark-entries-1.

(holiday-bahai): Use an algorithm actually relevant to this calendar
system.

*** empty log message ***

(increment-calendar-month): Optionally handle systems without 12
months per year.

(Commentary): Replace with reference to calendar.el.
(holiday-islamic): Comments.  Remove un-needed let.  Use and.

* vc.el (vc-status-add-entry): Assume ENTRY is a list not a cons.
(vc-status-mark-buffer-changed): Handle the extra field.

* vc-bzr.el (vc-bzr-after-dir-status):
* vc-cvs.el (vc-cvs-after-dir-status):
* vc-hg.el (vc-hg-after-dir-status):
* vc-svn.el (vc-svn-after-dir-status): Return a list not a cons.

Compute displayed pages first (in PDF).
(doc-view-current-converter-processes): Rename from
doc-view-current-converter-process.  Update users.
(doc-view-sentinel): Test buffer's liveness.
(doc-view-pdf/ps->png-sentinel): Remove.
(doc-view-start-process): New function.
(doc-view-dvi->pdf, doc-view-pdf/ps->png, doc-view-pdf->txt)
(doc-view-ps->pdf): Use it.
(doc-view-pdf->png-1, doc-view-pdf->png, doc-view-active-pages): New functions.
(doc-view-convert-current-doc, doc-view-goto-page): Use them.
(doc-view-mode): Kill the processes when leaving the mode.

Add todo entries.

*** empty log message ***

(byte-compile-warnings-safe-p): Use `byte-compile-warning-types'.
Add docstring.

(calendar-bahai-date-string): Make previous change more explicit.

Fix typo in previous change.

(holiday-chinese-new-year): Doc fix and comment.

(mml2015-use): Declare for compiler.
(message-info): Require mml2015 when appropriate.

(increment-calendar-month): Doc fix.
(calendar-date-is-visible-p): Doc fix.  Simplify.

Comment.

* gnus.texi (Example Methods): Fix description about ssh-agent.
(Indirect Functions): Fix the default value of nntp-telnet-command;
 remove link to connect.html.

(smerge-apply-resolution-patch): New fun.
(smerge-resolve): Add various resolution heuristics.

(holiday-julian): Fix a a problem with holidays in the last fortnight
in Julian October.

(smerge-refine): Allow highlighting other subparts in 3-way conflicts.

(calendar-bahai-date-string): Avoid an error for pre-Bahai dates.

(holiday-fixed): Comment.
(holiday-filter-visible-calendar): Return result from dolist.

(Fdisplay_buffer): Reinitialize tem to nil.

(hi-lock-mode): Fix typos in docstring.
(hi-lock-unload-function): New function.

* trampver.texi: Update release number.

* net/tramp.el (tramp-do-copy-or-rename-file): Fix check for
overwriting when NEWNAME is a local file.

* net/trampver.el: Update release number.

(xg_set_geometry): Fix indentation.
(xg_resize_outer_widget): Removed
(x_wm_size_hint_off): Fix indentation.
(xg_frame_set_char_size): Call flush_and_sync after
gtk_window_resize.
(x_wm_set_size_hint): Pass NULL as geometry window to
gtk_window_set_geometry_hints due to Gtk+ bug nr 68668.
Add menu bar and tool bar height to base height.
(xg_update_frame_menubar, free_frame_menubar)
(xg_tool_bar_detach_callback, xg_tool_bar_attach_callback)
(update_frame_tool_bar, free_frame_tool_bar): Change
xg_resize_outer_widget to xg_frame_set_char_size.

* vc-git.el: Make vc-status display information about copies,
renames and permission changes.
(vc-git-extra-fileinfo): New defstruct.
(vc-git-escape-file-name, vc-git-file-type-as-string)
(vc-git-rename-as-string, vc-git-permissions-as-string)
(vc-git-status-printer): New functions.
(vc-git-after-dir-status-stage2): Also return vc-git-extra-fileinfo.
(vc-git-after-dir-status-stage1): Look for copies, renames and
permission changes.
(vc-git-after-dir-status-stage1-empty-db): Set permissions.
(vc-git-dir-status): Ask for staged files and renames.

Allow backends to display backend specific information in
the vc-status listing.
(vc-status-fileinfo): Add a field for backend specific information.
(vc-status-printer): Rename to ...
(vc-default-status-printer): ... this.
(vc-status-printer): New function.
(vc-update-vc-status-buffer): Set the backend specific file info
if provided.

(remember-diary-convert-entry): Revert last change (ill-conceived).

* dbus.texi (Synchronous Methods): New parameter TIMEOUT for
dbus-call-method.
(Receiving Method Calls): The timeout can be set by the calling client.

* dbusbind.c (QCdbus_timeout): New D-Bus internal symbol.
(Fdbus_call_method): New parameter TIMEOUT.
(dbus-send-signal): Optimize UNGCPRO call.

(nntp-netcat-command): Rename from nntp-via-netcat-command.
(nntp-netcat-switches): Rename from nntp-via-netcat-switches.
(nntp-open-telnet, nntp-open-rlogin): Use with-current-buffer.
(nntp-service-to-port): New function.
(nntp-open-via-rlogin-and-netcat, nntp-open-via-telnet-and-telnet)
(nntp-open-telnet-stream, nntp-open-via-rlogin-and-telnet): Use it.
(nntp-open-netcat-stream): New function.
(nntp-open-via-rlogin-and-netcat): Don't use a pty.

*** empty log message ***

(byte-compile-warnings): Don't warn about obsolete functions in this
obsolete file.

Update for `calendar-date-style' replacing `european-calendar'.

(list-holidays): Use or.

(holiday-julian): Simplify.

(holiday-hebrew): Simplify.

(Fdisplay_buffer): Move call to
Vsplit_window_preferred_function out of conditions that check
if window is eligible for vertical splitting.
When Vsplit_window_preferred_function is non-nil, call it and use
its non-nil return value as window.  Otherwise, continue doing
vertical splitting using Fsplit_window with arg horflag=nil.
(syms_of_window) <Vsplit_window_preferred_function>: Change the
default value from `split-window' to nil.

(split-window-preferred-function):
Set choice for "vertically" to nil instead of split-window.
Set choice for "horizontally" to split-window-preferred-horizontally
instead of lambda.

(split-window-preferred-horizontally): New function.

Replace section that says about buffer names available via M-n with a section
that says the completion table is added after the list of defaults.

Move minibuffer changes to the section "Minibuffer changes".

(Fcall_interactively): Revert 2008-03-16 change
for interactive code letters 'b' and 'B'.

(debug-ignored-errors): Change "^End of history;
no next item$" to "^End of defaults; no next item$".

(minibuffer-default-add-function): New variable with
the default to minibuffer-default-add-completions.
(minibuffer-default-add-done): New variable.  Make it buffer-local.
(minibuffer-default-add-completions): New function.
(goto-history-element): Set minibuffer-default-add-done to t and
call a function in minibuffer-default-add-function when the
specified absolute history position is greater than the length of
the minibuffer-default list and minibuffer-default-add-done is nil.
Change "^End of history; no next item$" to "^End of defaults;
no next item$".

(with-temp-buffer): Assume kill-buffer can change current-buffer.

Fix merge mistake.

(message-make-in-reply-to): Use mm-with-multibyte-buffer.

(remember-diary-convert-entry): Prefer boundp to with-no-warnings.

(Top): Fix version.  Add SASL.

* trampver.texi: Update release number.

* net/tramp-ftp.el: Require 'cl when byte-compiling.

* net/trampver.el: Update release number.

Merge from gnus--devo--0

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

(Fexpand_file_name): Fix last change.

(Fexpand_file_name): Convert the value of $HOME to a multibyte string.

* vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
(vc-status-refresh): Create a temporary buffer and call the
`dir-status' backend function from that buffer.

* vc-bzr.el (vc-bzr-dir-status): Don't create a buffer.
(vc-bzr-after-dir-status): Don't kill the buffer.

* vc-cvs.el (vc-cvs-dir-status): Don't create a buffer.
(vc-cvs-after-dir-status): Don't kill the buffer.

* vc-git.el (vc-git-dir-status): Don't create a buffer.
(vc-git-after-dir-status-stage2): Don't kill the buffer.

* vc-hg.el (vc-hg-dir-status): Don't create a buffer.
(vc-hg-after-dir-status): Don't kill the buffer.

* vc-svn.el (vc-svn-dir-status): Don't create a buffer.
(vc-svn-after-dir-status): Don't kill the buffer.

(vc-menu-map-filter): Be more careful when finding
the current backend.

Add calendar-date-style.

Autoload diary-insert-entry-1.
(insert-hebrew-diary-entry, insert-monthly-hebrew-diary-entry)
(insert-yearly-hebrew-diary-entry): Use diary-insert-entry-1.
(diary-make-date): Autoload it.
(diary-yahrzeit): Doc fix.  Use diary-make-date.

(remember-diary-convert-entry): Respect calendar-date-style if bound.

(icalendar--datetime-to-american-date): New name for
icalendar--datetime-to-noneuropean-date.  Make old name obsolete alias.
(icalendar--datetime-to-iso-date): New function.
(icalendar--datetime-to-diary-date): Doc fix.  Respect
calendar-date-style if bound.

(number): Move declaration where needed.
(diary-mail-entries, list-sexp-diary-entries): Doc fixes.
(diary-make-date): New function.
(diary-date, diary-block, diary-anniversary, diary-cyclic): Doc fix.
Use diary-make-date.
(diary-date-display-form, diary-insert-entry-1): New functions.
(insert-monthly-diary-entry, insert-yearly-diary-entry):
Use diary-insert-entry-1.
(insert-anniversary-diary-entry, insert-block-diary-entry)
(insert-cyclic-diary-entry): Use diary-date-display-form.

(diary-file, american-date-diary-pattern)
(european-date-diary-pattern,european-calendar-display-form)
(american-calendar-display-form, diary-display-hook): Doc fixes.
(european-calendar-style): Doc fix.  Use calendar-set-date-style for
custom :set.  Mark as obsolete.
(calendar-date-style, iso-date-diary-pattern)
(iso-calendar-display-form): New user variables.
(diary-date-forms, calendar-date-display-form): Set using
calendar-date-style.  Doc fix.
(calendar-set-date-style): New command.
(european-calendar, american-calendar): Use calendar-set-date-style.
Mark as obsolete.

Autoload diary-insert-entry-1.
(insert-islamic-diary-entry, insert-monthly-islamic-diary-entry)
(insert-yearly-islamic-diary-entry): Use diary-insert-entry-1.

Autoload diary-insert-entry-1.
(diary-bahai-insert-entry, diary-bahai-insert-monthly-entry)
(diary-bahai-insert-yearly-entry): Use diary-insert-entry-1.

(xterm-mouse-mode): Use delete-terminal-functions.
(xterm-mouse-handle-delete-frame): Delete.

(terminal-init-xterm): Use delete-terminal-functions.
(xterm-turn-on-modify-other-keys, xterm-turn-off-modify-other-keys)
(xterm-remove-modify-other-keys): Lookup terminal rather than frame
in xterm-modify-other-keys-terminal-list.

* keyboard.c (pending_funcalls): New var.
(timer_check): Run it.
(syms_of_keyboard): Initialize it.
* terminal.c (Qrun_hook_with_args, Qdelete_terminal_functions)
(Vdelete_terminal_functions): New vars.
(syms_of_terminal): Initialize them.
(Fdelete_terminal): Run delete-terminal-functions.
* xdisp.c (safe_eval): Rewrite.
(safe_call2): New fun.
* frame.c (Qdelete_frame_functions): New var.
(syms_of_frame): Initialize it.
(Fdelete_frame): Use it and use safe_call2 and pending_funcalls.
* lisp.h (safe_call2, pending_funcalls): Declare.

(vc-bzr-state-heuristic): Fix last change for when there are conflicts.

(vc-status-mode-map, vc-status-menu-map): Bind vc-update and vc-print-log.

(vc-update): Check if the buffer is unsaved only if it
actually exists.
(vc-status-mode-map, vc-status-menu-map): Bind vc-update.

(dns-write): Use set-buffer-multibyte.

(vc-bzr-sha1): New fun.
(vc-bzr-state-heuristic): New fun, extracted from vc-bzr-registered.
(vc-bzr-registered): Use it.

Reshuffle TODOs.

Fix typo.

(Quitting): Clarify effects of C-g.

(Words, Pages, Fill Commands, HTML Mode): Describe
Transient Mark mode as the default.
(Paragraphs): Describe how M-h behaves when region is active.

(Basic Isearch): Reference the Mark Ring node.
(Replace, Unconditional Replace, Other Repeating Search):
Describe Transient Mark mode as the default.

(Moving by Defuns, Expressions, Comment Commands): Describe Transient
Mark mode as the default.

(Kill Ring, Accumulating Text): Assume Transient Mark mode is the
default, and note that the mark is not activated when set.

(Glossary): Treat Transient Mark mode as the default.