From: Po Lu <luangruo@yahoo.com>
Date: Thu, 20 Jul 2023 23:58:30 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/master' into feature/android
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ff70f12a5e29a0e90637bd063e1725f0e4e4ab2;p=emacs.git

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

0ff70f12a5e29a0e90637bd063e1725f0e4e4ab2
diff --cc lisp/doc-view.el
index c381d5d34a0,847601872f5..b7f7a862af8
--- a/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