1. 27 Mar, 2016 3 commits
    • Paul Eggert's avatar
      Rename C names to match Lisp symbols better · f41f573e
      Paul Eggert authored
      This was inspired by commit e65c3079,
      which fixed a bug where the C name for a symbol disagreed with the
      symbol name itself.  Fix other instances of disagreements that I found.
      Although this doesn’t fix a bug, it should make code easier to follow.
      The remaining disagreements are idiosyncratic: Qminus, Qplus,
      Qsans__serif, Qbackquote, Qcomma, Qcomma_at, Qcomma_dot.
      All uses changed.
      * src/alloc.c (QAutomatic_GC): Rename from Qautomatic_gc.
      * src/dbusbind.c (QCsystem): Rename from QCdbus_system_bus.
      (QCsession): Rename from QCdbus_session_bus.
      (QCtimeout): Rename from QCdbus_timeout.
      (QCbyte): Rename from QCdbus_type_byte.
      (QCboolean): Rename from QCdbus_type_boolean.
      (QCint16): Rename from QCdbus_type_int16.
      (QCuint16): Rename from QCdbus_type_uint16.
      (QCint32): Rename from QCdbus_type_int32.
      (QCuint32): Rename from QCdbus_type_uint32.
      (QCint64): Rename from QCdbus_type_int64.
      (QCuint64): Rename from QCdbus_type_uint64.
      (QCdouble): Rename from QCdbus_type_double.
      (QCstring): Rename from QCdbus_type_string.
      (QCobject_path): Rename from QCdbus_type_object_path.
      (QCsignature): Rename from QCdbus_type_signature.
      (QCunix_fd): Rename from QCdbus_type_unix_fd.
      (QCarray): Rename from QCdbus_type_array.
      (QCvariant): Rename from QCdbus_type_variant.
      (QCstruct): Rename from QCdbus_type_struct.
      (QCdict_entry): Rename from QCdbus_type_dict_entry.
      (QCserial): Rename from QCdbus_registered_serial.
      (QCmethod): Rename from QCdbus_registered_method.
      (QCsignal): Rename from QCdbus_registered_signal.
      * src/emacs-module.c (Qinternal__module_call):
      Rename from Qinternal_module_call.
      * src/frame.c (Qwindow__pixel_to_total):
      Rename from Qwindow_pixel_to_total.
      * src/gnutls.c (QChostname): Rename from QCgnutls_bootprop_hostname.
      (QCpriority): Rename from QCgnutls_bootprop_priority.
      (QCtrustfiles): Rename from QCgnutls_bootprop_trustfiles.
      (QCkeylist): Rename from QCgnutls_bootprop_keylist.
      (QCcrlfiles): Rename from QCgnutls_bootprop_crlfiles.
      (QCmin_prime_bits): Rename from QCgnutls_bootprop_min_prime_bits.
      (QCloglevel): Rename from QCgnutls_bootprop_loglevel.
      (QCcomplete_negotiation): Rename from QCgnutls_complete_negotiation.
      (QCverify_flags): Rename from QCgnutls_bootprop_verify_flags.
      (QCverify_error): Rename from QCgnutls_bootprop_verify_error.
      * src/w32fns.c (Qfont_parameter): Rename from Qfont_param.
      (Qgnutls): Rename from Qgnutls_dll.
      (Qlibxml2): Rename from Qlibxml2_dll.
      (Qzlib): Rename from Qzlib_dll.
      * src/w32select.c (Qutf_16le_dos): Rename from QUNICODE.
      * src/window.c (Qwindow__resize_root_window):
      Rename from Qwindow_resize_root_window.
      (Qwindow__resize_root_window_vertically):
      Rename from Qwindow_resize_root_window_vertically.
      (Qwindow__sanitize_window_sizes):
      Rename from Qwindow_sanitize_window_sizes.
      (Qwindow__pixel_to_total): Rename from Qwindow_pixel_to_total.
      * src/xdisp.c (Qredisplay_internal_xC_functionx):
      Rename from Qredisplay_internal.
      * src/xfns.c (Qfont_parameter): Rename from Qfont_param.
      * src/xselect.c (Q_EMACS_TMP_): Rename from QEMACS_TMP.
      f41f573e
    • Paul Eggert's avatar
      func-arity minor improvements · bc9cc21d
      Paul Eggert authored
      * src/bytecode.c (get_byte_code_arity): Omit unnecessary
      runtime test for integer argument, unless debugging.
      Use EMACS_INT for Emacs integers.
      * src/eval.c (Ffunc_arity): Omit unused locals.
      Avoid side effects in ‘if’ expr.
      (lambda_arity): Use bool for boolean, and EMACS_INT for Emacs ints.
      bc9cc21d
    • John Wiegley's avatar
      efb18832
  2. 26 Mar, 2016 2 commits
    • Martin Rudalics's avatar
      Safely run window size change functions · cad9d76e
      Martin Rudalics authored
      * src/window.c (run_window_size_change_functions): Use
      safe_call1 when running a size change function.
      (grow_mini_window, shrink_mini_window): Report error when
      minibuffer window cannot be resized.
      cad9d76e
    • Paul Pogonyshev's avatar
      Implement 'func-arity' · 6f3243db
      Paul Pogonyshev authored
      * src/eval.c (Ffunc_arity, lambda_arity): New functions.
      * src/bytecode.c (get_byte_code_arity): New function.
      * src/lisp.h (get_byte_code_arity): Add prototype.
      
      * doc/lispref/functions.texi (What Is a Function): Document
      'func-arity'.
      
      * etc/NEWS: Mention 'func-arity'.
      
      * test/src/fns-tests.el (fns-tests-func-arity): New test set.
      6f3243db
  3. 25 Mar, 2016 5 commits
    • Alan Mackenzie's avatar
      Fix absence of c-noise-macro-name-re, etc., in languages which don't use it · 368b9bb4
      Alan Mackenzie authored
      * lisp/progmodes/cc-engine.el (c-forward-keyword-prefixed-id, c-forward-type)
      (c-forward-declarator, c-forward-decl-or-cast-1, c-backward-over-enum-header)
      (c-guess-basic-syntax): Check c-opt-cpp-prefix before `looking-at'
      c-noise-macro-with-parens-name-re.
      
      * lisp/progmodes/cc-fonts.el (c-complex-decl-matchers): The same as for
      cc-engine.el.
      
      * lisp/progmodes/cc-mode.el (c-basic-common-init): Add call to
      `c-make-noise-macro-regexps'.
      (c-mode, c++-mode, objc-mode): Remove calls to `c-make-noise-macro-regexps'.
      
      * lisp/progmodes/cc-vars.el (c-noise-macro-with-parens-name-re)
      (c-noise-macro-with-re): Initialize to "\\<\\>" rather than nil.
      368b9bb4
    • Lars Magne Ingebrigtsen's avatar
      (shr-insert): Respect non-breaking space in non-<pre> text · 7570b357
      Lars Magne Ingebrigtsen authored
      * lisp/net/shr.el (shr-insert): Respect non-breaking space in
      non-<pre> text.
      7570b357
    • Lars Magne Ingebrigtsen's avatar
      parse-times-string doc string clarification · b2e629c0
      Lars Magne Ingebrigtsen authored
      * lisp/calendar/parse-time.el (parse-time-string): Note that
      we accept RFC2822 strings.
      b2e629c0
    • Marcin Borkowski's avatar
      Doc string fix · 2812099b
      Marcin Borkowski authored
      * lisp/calendar/parse-time.el (parse-time-tokenize): Clarify
      doc string and clean up code.
      2812099b
    • Michael Albinus's avatar
      Cleanup file notification code in Tramp · c62371c2
      Michael Albinus authored
      * lisp/net/tramp-sh.el (tramp-sh-handle-file-notify-add-watch):
      Make `events' a list of symbols for "inotifywait".
      (tramp-sh-gvfs-monitor-dir-process-filter): Make event a list.
      Call `file-notify-handle-event' for better traces.
      (tramp-sh-inotifywait-process-filter): Check for expected events.
      Call `file-notify-handle-event' for better traces.
      c62371c2
  4. 24 Mar, 2016 1 commit
    • Michael Albinus's avatar
      Adapt filenotify-tests.el according latest tests · c8874e21
      Michael Albinus authored
      * test/lisp/filenotify-tests.el (file-notify-test02-events)
      (file-notify-test04-file-validity, file-notify-test05-dir-validity):
      Remove superfluous `read-event' calls.
      (file-notify-test02-events): Expect different events under MS
      Windows 7 and 10.
      (file-notify-test04-file-validity): Move `file-notify-valid-p'
      check up.
      c8874e21
  5. 23 Mar, 2016 8 commits
    • Paul Eggert's avatar
      Merge from origin/emacs-25 · 39577d07
      Paul Eggert authored
      ad250f2b Sync with gnulib
      c0165ea4 Resurrect GNUS-NEWS autogeneration
      
      # Conflicts:
      #	etc/GNUS-NEWS
      #	lisp/Makefile.in
      39577d07
    • Paul Eggert's avatar
      ; Merge from origin/emacs-25 · 77557ce8
      Paul Eggert authored
      The following commit was skipped:
      
      1e5327c7 ; Backport ChangeLog.2 fixes from master
      77557ce8
    • Paul Eggert's avatar
      Merge from origin/emacs-25 · 16e4bd52
      Paul Eggert authored
      e643977b Make `toggle-frame-maximized' respect the dock on OS X (bug#2...
      38a43f1a Fix bug in displaying header line with a box face
      16e4bd52
    • Paul Eggert's avatar
      * etc/NEWS: Use straight quotes. · 70c7a51d
      Paul Eggert authored
      70c7a51d
    • Paul Eggert's avatar
      Sync with gnulib · ad250f2b
      Paul Eggert authored
      This incorporates:
      2016-03-22 gitlog-to-changelog: suppress ignored chatter
      2016-03-21 sys_select: port to new Cygwin
      * build-aux/gitlog-to-changelog, doc/misc/texinfo.tex:
      * lib/sys_select.in.h: Copy from gnulib.
      ad250f2b
    • Simen Heggestøyl's avatar
      Support completion of attribute values in CSS mode · 269d5631
      Simen Heggestøyl authored
      * lisp/textmodes/css-mode.el (css-property-alist): New defconst
      holding CSS identifiers and the values they can have.
      (css-property-ids): Compute dynamically from `css-property-alist'.
      (css-value-class-alist): New defconst holding property value classes
      and their values.
      (css--property-value-cache): New variable providing a cache for
      `css--property-values'.
      (css--value-class-lookup): New function for computing a list of values
      in a value class.
      (css--property-values): New function for computing a list of possible
      values for a CSS property.
      (css--complete-property-value): New function for completing a property
      value.
      (css-completion-at-point): Add support for completing property values.
      * test/lisp/textmodes/css-mode-tests.el: New file.
      269d5631
    • Paul Eggert's avatar
      Resurrect GNUS-NEWS autogeneration · c0165ea4
      Paul Eggert authored
      * doc/misc/gnus-coding.texi (Gnus Maintenance Guide): Update
      GNUS-NEWS section to match current file locations and procedure.
      * etc/GNUS-NEWS: Regenerate by using new procedure.
      * lisp/Makefile.in (update-gnus-news): New rule, containing a
      procedure for building GNUS-NEWS.  The old procedure got lost
      somehow when Gnus was merged into Emacs.
      c0165ea4
    • Wilson Snyder's avatar
      Sync with verilog-mode development tree. · 500a781b
      Wilson Snyder authored
      * lisp/progmodes/verilog-mode.el (verilog-imenu-generic-expression,
      verilog-speedbar-initialize): Automatically add verilog-mode
      extensions when in speedbar mode, bug1045, bug1046.  Reported by
      David Shleifman.
      (verilog-mode-map): Move `verilog-star-comment' from M-* to C-c/ to
      avoid conflict with `pop-tag-mark'. Reported by Ian Perryman.
      (verilog-read-always-signals-recurse): Fix :: notation for
      auto-reset signals.  Reported by Andrew Jones.
      (verilog-font-lock-grouping-keywords-face): Fix highlighting of
      grouping keywords, bug1002. Reported by Paul Sargent.
      (verilog-save-font-no-change-functions): Commentary and fix
      pre-Emacs 21 behavior.
      500a781b
  6. 22 Mar, 2016 21 commits
    • Paul Eggert's avatar
      Compute a better commit message for merges · ddd9111a
      Paul Eggert authored
      Problem reported by David Engster in:
      http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01270.html
      * admin/gitmerge.el (gitmerge-commit-message):
      Truncate the computed commit message to at most 72 characters per line.
      (gitmerge-maybe-resume): Don’t use "-" as the commit message for
      merges; use the computed commit message instead.
      ddd9111a
    • Paul Eggert's avatar
    • Paul Eggert's avatar
      ; Backport ChangeLog.2 fixes from master · 1e5327c7
      Paul Eggert authored
      1e5327c7
    • Paul Eggert's avatar
      Change do-not-merge pattern to "do not merge" · b0823718
      Paul Eggert authored
      This should avoid the problem we recently had with
      automatically-generated merge messages, while still letting people
      specify commits not to merge.
      * admin/gitmerge.el (gitmerge-skip-regexp): Add "do not merge".
      (gitmerge-highlight-skip-regexp): Fold case when searching
      for gitmerge-skip-regexp.
      b0823718
    • Michael Albinus's avatar
      ; Remove unwanted merge from emacs-25 · 582962a3
      Michael Albinus authored
      582962a3
    • Anders Lindgren's avatar
      Make `toggle-frame-maximized' respect the dock on OS X (bug#22988). · e643977b
      Anders Lindgren authored
      * src/nsterm.m (ns_screen_margins): New function.
      (ns_screen_margins_ignoring_hidden_dock): New function.
      (ns_menu_bar_height): Reimplement in terms of `ns_screen_margins'.
      ([EmacsWindow zoom:]): Take all screen margins (except those
      originating from a hidden dock) into account.
      e643977b
    • Eli Zaretskii's avatar
      Fix bug in displaying header line with a box face · 38a43f1a
      Eli Zaretskii authored
      * src/xdisp.c (get_next_display_element): Handle the case when a
      display string acquires the box face from an underlying string,
      not from the buffer.  (Bug#23091)
      38a43f1a
    • Paul Eggert's avatar
      ; Fix etc/NEWS typo in recent merge. · c4f4e643
      Paul Eggert authored
      c4f4e643
    • Paul Eggert's avatar
      Merge from origin/emacs-25 · d2ea891f
      Paul Eggert authored
      91e66769 Fix an Isearch var to be a string (Bug#23038)
      76ef5226 Fix (args-out-of-range 1) error in cursor-sensor--detect
      d2ea891f
    • Paul Eggert's avatar
      ; Merge from origin/emacs-25 · 656058b7
      Paul Eggert authored
      The following commits were skipped:
      
      8a35f83c Render empty <ul><li><ul> correctly
      d8b2ce5f Ignore invalid base64 encoded embedded images
      52ba24bd Fix <p> and <div> newlines with or without <li> in shr
      656058b7
    • Paul Eggert's avatar
      - · f95bbe5a
      Paul Eggert authored
      f95bbe5a
    • Paul Eggert's avatar
      ; Merge from origin/emacs-25 · 4869e0d8
      Paul Eggert authored
      The following commit was skipped:
      
      9ab03f27 ; Auto-commit of loaddefs files.
      4869e0d8
    • Paul Eggert's avatar
      - · 37b90990
      Paul Eggert authored
      37b90990
    • Paul Eggert's avatar
      Keep "merge" commits by default in gitmerge · 6bd1e220
      Paul Eggert authored
      * admin/gitmerge.el (gitmerge-skip-regexp): Omit "merge", as it
      causes false positives.  See:
      http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01234.html
      6bd1e220
    • Paul Eggert's avatar
      Assume NON_BLOCKING_CONNECT (Bug#22946) · 780a605e
      Paul Eggert authored
      * lisp/proced.el (proced-signal-list): Omit comment about
      obsolete systems that do not support POSIX 1003.1-2001 signals.
      * src/process.c (NON_BLOCKING_CONNECT): Remove, since we can now
      assume POSIX 1003.1-2001 or better here.  Assume it’s defined.
      (connect_network_socket): Assume EINPROGRESS is defined,
      as that’s portable too now.
      (Fmake_network_process): Use bool for boolean.
      780a605e
    • Eli Zaretskii's avatar
      Fix problems caused by new implementation of sub-word mode · 7dba1767
      Eli Zaretskii authored
      * lisp/subr.el (forward-word-strictly, backward-word-strictly):
      New functions.
      (word-move-empty-char-table): New variable.
      
      * etc/NEWS: Mention 'forward-word-strictly' and
      'backward-word-strictly'.
      
      * doc/lispref/positions.texi (Word Motion): Document
      'find-word-boundary-function-table', 'forward-word-strictly', and
      'backward-word-strictly'.  (Bug#22560)
      
      * src/syntax.c (syms_of_syntax)
      <find-word-boundary-function-table>: Doc fix.
      
      * lisp/wdired.el (wdired-xcase-word):
      * lisp/textmodes/texnfo-upd.el (texinfo-copy-node-name)
      (texinfo-copy-section-title, texinfo-start-menu-description)
      (texinfo-copy-menu-title, texinfo-specific-section-type)
      (texinfo-insert-node-lines, texinfo-copy-next-section-title):
      * lisp/textmodes/texinfo.el (texinfo-clone-environment)
      (texinfo-insert-@end):
      * lisp/textmodes/texinfmt.el (texinfo-format-scan)
      (texinfo-anchor, texinfo-multitable-widths)
      (texinfo-multitable-item):
      * lisp/textmodes/tex-mode.el (latex-env-before-change):
      * lisp/textmodes/flyspell.el (texinfo-mode-flyspell-verify):
      * lisp/skeleton.el (skeleton-insert):
      * lisp/simple.el (count-words):
      * lisp/progmodes/vhdl-mode.el (vhdl-beginning-of-libunit)
      (vhdl-beginning-of-defun, vhdl-beginning-of-statement-1)
      (vhdl-update-sensitivity-list, vhdl-template-block)
      (vhdl-template-break, vhdl-template-case, vhdl-template-default)
      (vhdl-template-default-indent, vhdl-template-for-loop)
      (vhdl-template-if-then-use, vhdl-template-bare-loop)
      (vhdl-template-nature, vhdl-template-procedural)
      (vhdl-template-process, vhdl-template-selected-signal-asst)
      (vhdl-template-type, vhdl-template-variable)
      (vhdl-template-while-loop, vhdl-beginning-of-block)
      (vhdl-hooked-abbrev, vhdl-port-copy, vhdl-hs-forward-sexp-func):
      * lisp/progmodes/verilog-mode.el (verilog-backward-sexp)
      (verilog-forward-sexp, verilog-beg-of-statement)
      (verilog-set-auto-endcomments, verilog-backward-token)
      (verilog-do-indent):
      * lisp/progmodes/vera-mode.el (vera-guess-basic-syntax)
      (vera-indent-block-closing):
      * lisp/progmodes/simula.el (simula-context)
      (simula-backward-up-level, simula-forward-down-level)
      (simula-previous-statement, simula-next-statement)
      (simula-skip-comment-backward, simula-calculate-indent)
      (simula-find-if, simula-electric-keyword):
      * lisp/progmodes/sh-script.el (sh-smie--rc-newline-semi-p):
      * lisp/progmodes/ruby-mode.el (ruby-smie--redundant-do-p)
      (ruby-smie--forward-token, ruby-smie--backward-token)
      (ruby-singleton-class-p, ruby-calculate-indent)
      (ruby-forward-sexp, ruby-backward-sexp):
      * lisp/progmodes/ps-mode.el (ps-run-goto-error):
      * lisp/progmodes/perl-mode.el (perl-syntax-propertize-function)
      (perl-syntax-propertize-special-constructs)
      (perl-backward-to-start-of-continued-exp):
      * lisp/progmodes/pascal.el (pascal-indent-declaration):
      * lisp/progmodes/octave.el (octave-function-file-p):
      * lisp/progmodes/mantemp.el (mantemp-insert-cxx-syntax):
      * lisp/progmodes/js.el (js--forward-function-decl):
      * lisp/progmodes/idlwave.el (idlwave-show-begin-check)
      (idlwave-beginning-of-block, idlwave-end-of-block)
      (idlwave-block-jump-out, idlwave-determine-class):
      * lisp/progmodes/icon.el (icon-is-continuation-line)
      (icon-backward-to-start-of-continued-exp, end-of-icon-defun):
      * lisp/progmodes/hideif.el (hide-ifdef-define):
      * lisp/progmodes/f90.el (f90-change-keywords):
      * lisp/progmodes/cperl-mode.el (cperl-electric-pod)
      (cperl-linefeed, cperl-electric-terminator)
      (cperl-find-pods-heres, cperl-fix-line-spacing)
      (cperl-invert-if-unless):
      * lisp/progmodes/cc-engine.el (c-forward-<>-arglist-recur):
      * lisp/progmodes/cc-align.el (c-lineup-java-inher):
      * lisp/progmodes/ada-mode.el (ada-compile-goto-error)
      (ada-adjust-case-skeleton, ada-create-case-exception)
      (ada-create-case-exception-substring)
      (ada-case-read-exceptions-from-file, ada-after-keyword-p)
      (ada-scan-paramlist, ada-get-current-indent, ada-get-indent-end)
      (ada-get-indent-if, ada-get-indent-block-start)
      (ada-get-indent-loop, ada-get-indent-type)
      (ada-search-prev-end-stmt, ada-check-defun-name)
      (ada-goto-decl-start, ada-goto-matching-start)
      (ada-goto-matching-end, ada-looking-at-semi-or)
      (ada-looking-at-semi-private, ada-in-paramlist-p)
      (ada-search-ignore-complex-boolean, ada-move-to-start)
      (ada-move-to-end, ada-which-function, ada-gen-treat-proc):
      * lisp/net/quickurl.el (quickurl-grab-url):
      * lisp/mail/sendmail.el (mail-do-fcc):
      * lisp/mail/rmail.el (rmail-resend):
      * lisp/mail/mailabbrev.el (mail-abbrev-complete-alias):
      * lisp/mail/mail-extr.el (mail-extract-address-components):
      * lisp/json.el (json-read-keyword):
      * lisp/files.el (insert-directory):
      * lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
      * lisp/completion.el (symbol-under-point, symbol-before-point)
      (symbol-before-point-for-complete, next-cdabbrev)
      (add-completions-from-c-buffer):
      * lisp/cedet/semantic/texi.el (semantic-up-context)
      (semantic-beginning-of-context):
      * lisp/cedet/semantic/bovine/el.el (semantic-get-local-variables):
      use 'forward-word-strictly' and 'backward-word-strictly' instead
      of 'forward-word' and 'backward-word'.
      
      [This reapplies commit c1d32a65,
      which was inadvertently lost by merge commit
      c71e7cc1.]
      7dba1767
    • Paul Eggert's avatar
      * etc/TODO: Minor quoting and grammar fixes. · 22cd92a0
      Paul Eggert authored
      [This reapplies commit 433407d8,
      which was inadvertently lost by merge commit
      5ab243f4.]
      22cd92a0
    • Alan Mackenzie's avatar
      Don't confuse "::" with ":" when trying to parse member initializers. · 515ce25f
      Alan Mackenzie authored
      * lisp/progmodes/cc-engine.el (c-back-over-member-initializers): Check
      more robustly for ":" token when searching backwards for it.
      
      * lisp/progmodes/cc-langs (c-:$-multichar-token-regexp): New language
      variable.
      
      [This reapplies commit 9e5452f7,
      which was inadvertently lost by merge commit
      7823745a.]
      515ce25f
    • Eli Zaretskii's avatar
      Ensure positive number of glyphs for margins of positive width · a17bddea
      Eli Zaretskii authored
      * src/dispnew.c (margin_glyphs_to_reserve): Always return a
      positive value when a non-zero width of the marginal area was
      requested.  (Bug#22356)
      
      [This reapplies commit 740849fe,
      which was inadvertently lost by merge commit
      7823745a.]
      a17bddea
    • Alan Mackenzie's avatar
      In comment-dwim with style `extra-line', respect indent-tabs-mode. · 5a788767
      Alan Mackenzie authored
      This fixes bug #22369.
      
      * lisp/newcomment.el (comment-make-bol-ws): New function.
      (comment-make-extra-lines): Use new function instead of a crude `make-string'.
      
      [This reapplies commit 016b3d58,
      which was inadvertently lost by merge commit
      7823745a.]
      5a788767
    • Eli Zaretskii's avatar
      Merge doc fixes for 'random' lost in previous merge · 05b62680
      Eli Zaretskii authored
      [This reapplies part of commit
      3ffe81e2,
      which was inadvertently lost by merge commit
      7823745a.]
      (Bug#22202)
      05b62680