Merge remote-tracking branch 'origin/master' into feature/android

diff --cc etc/NEWS
Simple merge

diff --cc lisp/cus-edit.el
Simple merge

diff --cc lisp/doc-view.el
index c381d5d34a05a0ecfd3da4dd4ce90500dc3383d5,847601872f55645b331e091a50639f0da5050d56..b7f7a862af8b13e6fcbb3eda818873fed3bd1d1e
--- 1/lisp/doc-view.el
--- 2/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@@ -2284,10 -2239,11 +2287,13 @@@ toggle between displaying the document 
      (setq mode-name "DocView"
          buffer-read-only t
          major-mode 'doc-view-mode)
-     (doc-view-imenu-setup)
+     (condition-case imenu-error
+         (doc-view-imenu-setup)
+       (imenu-unavailable (message "imenu support unavailable: %s"
+                                   (cadr imenu-error))))
      (doc-view-initiate-display)
 +    ;; Replace the tool bar map with `doc-view-tool-bar-map'.
 +    (setq-local tool-bar-map doc-view-tool-bar-map)
      ;; Switch off view-mode explicitly, because doc-view-mode is the
      ;; canonical view mode for PDF/PS/DVI files.  This could be
      ;; switched on automatically depending on the value of

diff --cc lisp/wid-edit.el
Simple merge