GitLab

* configure.in (HAVE_GCONF): Allow both HAVE_GCONF and HAVE_GSETTINGS.

* lisp/dynamic-setting.el (dynamic-setting-handle-config-changed-event): 
Update doc string.

* src/xsettings.c: Use both GConf and GSettings if both are available.
(store_config_changed_event): Add comment.
(dpyinfo_valid, store_font_name_changed, map_tool_bar_style)
(store_tool_bar_style_changed): New functions.
(store_monospaced_changed): Add comment. Call dpyinfo_valid.
(struct xsettings): Move font inside HAVE_XFT.
(GSETTINGS_TOOL_BAR_STYLE, GSETTINGS_FONT_NAME): New defines.
(GSETTINGS_MONO_FONT): Renamed from SYSTEM_MONO_FONT.
Move inside HAVE_XFT.
(something_changed_gsettingsCB): Renamed from something_changedCB.
Check for changes in GSETTINGS_TOOL_BAR_STYLE and GSETTINGS_FONT_NAME
also.
(GCONF_TOOL_BAR_STYLE, GCONF_FONT_NAME): New defines.
(GCONF_MONO_FONT): Renamed from SYSTEM_MONO_FONT. Move inside HAVE_XFT.
(something_changed_gconfCB): Renamed from something_changedCB.
Check for changes in GCONF_TOOL_BAR_STYLE and GCONF_FONT_NAME also.
(parse_settings): Move check for font inside HAVE_XFT.
(read_settings, apply_xft_settings): Add comment.
(read_and_apply_settings): Add comment.  Call map_tool_bar_style and
store_tool_bar_style_changed.  Move check for font inside HAVE_XFT and
call store_font_name_changed.
(xft_settings_event): Add comment.
(init_gsettings): Add comment.  Get values for GSETTINGS_TOOL_BAR_STYLE
and GSETTINGS_FONT_NAME.  Move check for fonts within HAVE_XFT.
(init_gconf): Add comment.  Get values for GCONF_TOOL_BAR_STYLE
and GCONF_FONT_NAME.  Move check for fonts within HAVE_XFT.
(xsettings_initialize): Call init_gsettings last.
(xsettings_get_system_font, xsettings_get_system_normal_font): Add
comment.

* fns.c (Frandom): Use GET_EMACS_TIME for random seed, and add the
subseconds part to the entropy, as that's a bit more random.
Prefer signed to unsigned, since the signedness doesn't matter and
in general we prefer signed.  When given a limit, use a
denominator equal to INTMASK + 1, not to VALMASK + 1, because the
latter isn't right if USE_2_TAGS_FOR_INTS.
* sysdep.c (get_random): Return a value in the range 0..INTMASK,
not 0..VALMASK.  Don't discard "excess" bits that random () returns.

exception for current topic.  Also note that auto-saves are handled
differently.

(allout-auto-save-temporarily-disabled), (allout-just-did-undo): State
variables for tracking auto-save inhibition situation.

(allout-write-contents-hook-handler): Rename from
'allout-write-file-hook-handler', and describe how it depends on
write-contents-functions sensitivity to non-nil value to prevent file
write.

(allout-auto-save-hook-handler): Remove.  auto-save does not check this in
individual buffers, only in the starting buffer, so this is not the right
way for us to inhibit auto-save in a buffer according to its condition.

(allout-mode): Use new allout-write-contents-hook-handler, and only with
write-contents-functions.  Remove auto-save provisions - they're
implemented elsewhere.

(allout-before-change-handler): If undo is in progress, note that for
attention of allout-post-command-business.

(allout-post-command-business): If the command we're following was an undo,
check for change in the status of encrypted items and adjust auto-save
inhibitions accordingly.

(allout-toggle-subtree-encryption): Adjust auto-save inhibition according
to whether there are or aren't any plain-text topics pending encryption.

(allout-inhibit-auto-save-info-for-decryption): Adjust buffer-saved-size
and some allout state to inhibit auto-saves if there are plain-text topics
pending encryption.

(allout-maybe-resume-auto-save-info-after-encryption): Adjust
buffer-saved-size and some allout state to not inhibit auto-saves if there
are no longer any plain-text topics pending encryption.

(allout-next-topic-pending-encryption), (allout-encrypt-decrypted): No
longer provide for exemption of the current topic.

* lisp/arc-mode.el (archive-7z-expunge, archive-7z-update):
New defcustoms.
(archive-7z-write-file-member): New function.
(archive-7z-summarize): Fix the number of dashes in the
listing output.

Fixes: debbugs:8968

Fixes: debbugs:8958

to dark slate blue.

Fixes: debbugs:6693

(syms_of_textprop): Add `display' to Vtext_property_default_nonsticky.
* w32fns.c (syms_of_w32fns):
* xfns.c (syms_of_xfns): Don't Add `display' since it's there by default.

This is more efficient than Ffile_directory_p and avoids a minor race.

* lisp/emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions):
Add switch-to-buffer.

Fixes: debbugs:8911

unconfigured projects if `global-ede-mode' is on.

Fixes: debbugs:8092

(bug#7835).

error be more correct.

is a directory before asking whether to use the file name
(bug#7564).

when reconnecting.

Fixes: debbugs:5563

`tramp-cleanup-this-connection'.

that's installation-specific, but keep the mention of
`get-load-suffixes'.

meaning of the function returned.

* net/tramp-sh.el (tramp-color-escape-sequence-regexp): New defconst.
(tramp-sh-handle-insert-directory, tramp-convert-file-attributes):
Use it.
(tramp-remote-path): Add "/bin" and "/usr/bin".  On busyboxes,
`tramp-default-remote-path' does not exist.
(tramp-send-command-and-read): New optional argument NOERROR.
(tramp-open-connection-setup-interactive-shell)
(tramp-get-remote-path, tramp-get-remote-stat): Use it.
(tramp-get-remote-readlink): Do not mask with `ignore-errors'.
(tramp-process-sentinel): Flush also process' connection property.
(tramp-sh-handle-start-file-process): Do not set process
sentinel.  It is done now ...
(tramp-maybe-open-connection): ... here.  (Bug#8929)

the buffer name.

Fixes: debbugs:5417

Report string overflow if the output is too long.

 (nndraft-request-list): Declare.

This is simpler and helps future-proof the code.
* emacs-lisp/timer.el (timer-until): Use time-subtract and float-time.
(timer--time-less-p): Use time-less-p.

eval-and-compile block causes compilation errors in XEmacs.

* gnutls.c (Fgnutls_boot): Don't mention :verify-error.
  (syms_of_gnutls): Remove duplicate DEFSYM for
  Qgnutls_bootprop_verify_hostname_error, an error for
  Qgnutls_bootprop_verify_error (which is no longer used).

nndraft.el (nndraft-update-unread-articles): Don't show group having no unread article unless it matches gnus-permanently-visible-groups.

* mh-mime.el, mh-search.el, mh-seq.el: Shush XEmacs compiler in
mh-do-in-xemacs block.

* eval.c (find_handler_clause): Remove parameters `sig' and `data',
  unused since 2011-01-26T20:02:07Z!monnier@iro.umontreal.ca.  All callers changed.
  Also (re)move comments that are misplaced or no longer relevant.

 (nndraft-request-associate-buffer): Use it to update the number of unread articles for the nndraft groups in the group buffer when saving or killing a draft message.

for XEmacs.
* mh-show.el (mh-show-msg): Use it, and avoid compiler warning on
XEmacs.