summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--helm-aliases.el2
-rw-r--r--helm-info.el14
2 files changed, 6 insertions, 10 deletions
diff --git a/helm-aliases.el b/helm-aliases.el
index 4c6e814c..03d27235 100644
--- a/helm-aliases.el
+++ b/helm-aliases.el
@@ -729,8 +729,6 @@
(make-obsolete-variable 'helm-c-source-elscreen 'helm-source-elscreen "1.5.1")
(defvaralias 'helm-c-etags-mtime-alist 'helm-etags-mtime-alist)
(make-obsolete-variable 'helm-c-etags-mtime-alist 'helm-etags-mtime-alist "1.5.1")
-(defvaralias 'helm-c-info-pages 'helm-info-pages)
-(make-obsolete-variable 'helm-c-info-pages 'helm-info-pages "1.5.1")
(defvaralias 'helm-c-grep-default-recurse-command 'helm-grep-default-recurse-command)
(make-obsolete-variable 'helm-c-grep-default-recurse-command 'helm-grep-default-recurse-command "1.5.1")
(defvaralias 'helm-c-source-google-suggest 'helm-source-google-suggest)
diff --git a/helm-info.el b/helm-info.el
index bd742204..ef6b159d 100644
--- a/helm-info.el
+++ b/helm-info.el
@@ -140,15 +140,13 @@ Where NAME is one of `helm-default-info-index-list'."
;;; Info pages
-(defvar helm-info-pages nil
- "All info pages on system.
-Will be calculated the first time you invoke helm with this
-source.")
+(defvar helm-info--pages-cache nil
+ "Cache for all info pages on system.")
(defun helm-info-pages-init ()
"Collect candidates for initial Info node Top."
- (if helm-info-pages
- helm-info-pages
+ (if helm-info--pages-cache
+ helm-info--pages-cache
(let ((info-topic-regexp "\\* +\\([^:]+: ([^)]+)[^.]*\\)\\.")
topics)
(require 'info)
@@ -158,12 +156,12 @@ source.")
(while (re-search-forward info-topic-regexp nil t)
(push (match-string-no-properties 1) topics))
(kill-buffer))
- (setq helm-info-pages topics))))
+ (setq helm-info--pages-cache topics))))
(defvar helm-source-info-pages
(helm-build-sync-source "Info Pages"
:init #'helm-info-pages-init
- :candidates (lambda () helm-info-pages)
+ :candidates (lambda () helm-info--pages-cache)
:action '(("Show with Info" .(lambda (node-str)
(info (replace-regexp-in-string
"^[^:]+: " "" node-str)))))