update packages

lisp/ess/ess-help.el

@@ -53,6 +53,9 @@
 (defvar ess--help-frame nil
   "Stores the frame used for displaying R help buffers.")
 
+(defvar ess-help--aliases-timeout 10
+  "The large timeout is necessary for some users (#1025, #1081).")
+
  ; ess-help-mode
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; In this section:
@@ -132,8 +135,8 @@ supplied, it is used instead of `inferior-ess-help-command'."
   (interactive
    (progn
      (ess-force-buffer-current)
-     (when current-prefix-arg ;update cache if prefix
-       (ess-process-put 'sp-for-help-changed? t))
+     (when current-prefix-arg
+       (ess-help--reset-cache))
      (list (ess-find-help-file "Help on"))))
   (let* ((hb-name (concat "*help[" ess-current-process-name "]("
                           (replace-regexp-in-string "^\\?\\|`" "" object) ")*"))
@@ -151,6 +154,13 @@ supplied, it is used instead of `inferior-ess-help-command'."
     (unless (ess--help-kill-bogus-buffer-maybe tbuffer)
       (ess-display-help tbuffer))))
 
+(defun ess-help--reset-cache ()
+  "Reset all cached help files."
+  (ess-process-put 'sp-for-help-changed? t)
+  (ess-help--reset-cache-override))
+
+(cl-defgeneric ess-help--reset-cache-override ())
+
 (defun ess-help-revert-buffer (_ignore-auto _noconfirm)
   "Revert the current help buffer.
 This reloads the documentation. IGNORE-AUTO and NOCONFIRM are
@@ -171,7 +181,9 @@ ignored."
     (let ((command (if (and command (string-match-p "%s" command))
                        (format command object)
                      command)))
-      (ess-command (or command (ess-build-help-command object)) (current-buffer)))
+      (ess-command (or command (ess-build-help-command object))
+                   (current-buffer)
+                   nil nil nil nil nil ess-help--aliases-timeout))
     (ess-help-underline)
     (unless (string= ess-language "STA")
       (ess-nuke-help-bs))
@@ -294,7 +306,7 @@ REG-START gives the start location from where to search linkifying, and HELP-OBJ
       (ess-setq-vars-local (eval alist))
       (setq ess-help-object help-object
             ess-help-sec-regex "\\(^\\s-.*\n\\)\\|\\(^\n\\)")
-      (ess-command command buff)
+      (ess--foreground-command command buff)
       (ess-help-underline)
       (set-buffer-modified-p 'nil)
       (goto-char (point-min))
@@ -681,7 +693,9 @@ nil otherwise."
   ;; ess-command locks display, make sure the above message is visible
   (redisplay t)
   (ess-write-to-dribble-buffer "Processing RDS files ...\n")
-  (prog1 (ess-get-words-from-vector ".ess.getHelpAliases()\n")
+  ;; FIXME: This should be run asynchronously
+  (prog1 (ess-get-words-from-vector ".ess.getHelpAliases()\n"
+                                    nil nil nil ess-help--aliases-timeout)
     (message "Retrieving RDS aliases...done")))
 
 (defun ess-nuke-help-bs ()