GitLab

* sysdep.c (sys_subshell) [!defined DOS_NT]: Diagnose chdir
failure and exit.
(sys_subshell) [defined DOS_NT]: Mark with a FIXME the two
remaining unchecked chdir calls in this function; some DOS/NT
expert needs to fix them.
* emacs.c (main): Mark with a FIXME the unchecked chdir calls
in this function; some NextStep expert needs to fix them.

Makefile.in (nowebhack): Fixed to use -D flag instead of overrides.

* admin/bzrmerge.el (bzrmerge-warning-buffer): New constant.
(bzrmerge-apply): Use it.
(bzrmerge): Kill any old warning buffer first.

(Bug#6386).

font-lock-syntax-table remappings.
(sh-here-doc-markers, sh-here-doc-re): Remove.
(sh-font-lock-close-heredoc): Remove.
(sh-syntax-propertize-here-doc): New function.
(sh-font-lock-open-heredoc): Set the sh-here-doc-marker property
instead of the sh-here-doc-re.
(sh-font-lock-paren): Don't do anything in comments or strings.
Handle line continuations.  Accept a few more chars.
Don't rely on the font-lock-syntax-table remappings.
`esac' is not a valid pattern.
(sh-syntax-propertize-function): Handle here-docs differently, so we
don't bother syntax-propertizing the insides.

Fixes: debbugs:7947

Handle new bashisms ";&" and ";;&".

Fixes: debbugs:7947

sieve.texi, sasl.texi, pgg.texi, message.texi, gnus.texi:
emacs-mime.texi, auth.texi, Makefile.in: Revert last changes.

Replace "delimet" with "delimit" globally.
Replace "explicite" with "explicit" globally.
Replace "instead of" with "instead" where there was nothing after "of".
Audit use of comma before interrogative pronoun, "that", or "which".
Minor word order, spelling, wording changes.
(Frequently Asked Questions): Mention problems with WinSSHD.

* trampver.texi: Update release number.

"NT_STATUS_IO_TIMEOUT" and "NT_STATUS_NO_SUCH_USER".

(tramp-postfix-method-regexp, tramp-prefix-domain-format)
(tramp-prefix-domain-regexp, tramp-postfix-user-format)
(tramp-postfix-user-regexp, tramp-prefix-port-format)
(tramp-prefix-port-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-handle-substitute-in-file-name):
Doc fix.

(define_charset_internal): Switch between char * and unsigned char *.

Replace "instead of" with "instead" where there was nothing after "of"
Audit use of comma before interrogative pronoun, "that", or "which"

(xmenu_show, xdialog_show): Declare local var as char *, not
const char *, to stay compatible with C89 const rules.

(store_mode_line_noprop, display_string, reseat_to_string):
(c_string_pos, number_of_chars, message_dolog):
(message_log_check_duplicate, set_message_1, store_mode_line_noprop):
(display_mode_element, display_string):
Switch between char * and unsigned char * to stay compatible wth
C89 pointer rules.

* doc/emacs/maintaining.texi (VC Change Log): Document vc-log-incoming and
vc-log-outgoing.
(Merging): Document vc-find-conflicted-file.

* doc/emacs/rmail.texi (Rmail Display): Document Rmail MIME support more
accurately.

* doc/lispref/commands.texi (Accessing Mouse): Note that a header line is not
included in the row of posn-col-row.

* etc/NEWS: Remove +++ and --- lines.

shr.el (shr-render-td): Store the actual background colour used.
gnus-sum.el (gnus-user-date): Renamed back from gnus-summary-user-date since user code refers to it.
auth-source.el: Rewrite.
gnus.texi: Add DEVEL header (suggested by Andreas Schwab).
WEBHACKDEVEL work:
 Makefile.in (webhack, nowebhack): Hacks to produce for-the-web manuals.
 auth.texi: Use WEBHACKDEVEL.
 emacs-mime.texi: Use WEBHACKDEVEL.
 gnus.texi: Use WEBHACKDEVEL.
 message.texi: Use WEBHACKDEVEL.
 pgg.texi: Use WEBHACKDEVEL.
 sasl.texi: Use WEBHACKDEVEL.
 sieve.texi: Use WEBHACKDEVEL.
 overrides.texi: New file to set or clear WEBHACKDEVEL.
message.el (message-setup-1): Remove the read-only stuff, since it doesn't work under XEmacs, for some reason.

 makefile.w32-in (LISP_H, PROCESS_H): New variables.
 Replace all uses of lisp.h with $(LISP_H), and all uses of
 process.h with $(PROCESS_H).
 ($(BLD)/editfns.$(O)): Depend on ../lib/strftime.h.
 ($(BLD)/print.$(O)): Depend on ../lib/ftoastr.h and ../lib/intprops.h.
 ($(BLD)/sysdep.$(O)): Depend on ../lib/ignore-value.h.

 (message-setup-1): Revert previous change, since it needs to bind the props to insert them.
 (message-resend): Allow removing the read-only separator line.

 src/makefile.w32-in (IGNORE_VALUE_H): New variable.
 ($(BLD)/sysdep.$(O)): Depend on $(IGNORE_VALUE_H).
 nt/config.nt (inline) [__GNUC__]: Define (for gnulib).

 arc-mode.el (archive-mode-map): Fix a typo in last change.

* lisp/calendar/diary-lib.el (diary-font-lock-keywords):
Tweak diary-time-regexp match.

* lisp/progmodes/f90.el (f90-find-tag-default): New function.
(f90-mode): Use it for mode's `find-tag-default-function' property.

gnus-util.el: change default value of gnus-user-date-format-alist.
gnus-art.el (gnus-article-jump-to-part): Remove useless sit-for.
gnus-art.el: remove old FIXME.
gnus.el (gnus-summary-line-format): Add missing semi-colon for user-date in docstring.
message.el (message-setup-1): Always generate References first.
 (message-mail): Return the return value of message-setup, not always t.
gnus-start.el (gnus-read-active-for-groups): This function is never called with a nil `infos', so clean that up.
 (gnus-get-unread-articles): Request active files from primary/secondary methods that have no groups (yet).
 (message-setup-1): Insert mail-header-separator with read-only and intangible properties set.
gnus-draft.el: Remove progn around gnus-draft-setup.
gnus-start.el (gnus-get-unread-articles): Fix the call to methods that have no groups.
nnimap.el (nnimap-request-accept-article): Give an error message if the APPEND wasn't successful.

Do not error out when `func' is nil.