aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-08-05 22:22:05 +0800
committerChong Yidong2012-08-05 22:22:05 +0800
commit777fe95e05ab77e77e4ecee45382ec64d381c776 (patch)
treeee874934f0d5512d7529f290adb46e5f39ba07f8
parentb7ccbdc2e39ff834a03a7f30516b71cd98e84a44 (diff)
downloademacs-777fe95e05ab77e77e4ecee45382ec64d381c776.tar.gz
emacs-777fe95e05ab77e77e4ecee45382ec64d381c776.zip
Tweak proced docstring to trigger autoloading.
* lisp/proced.el (proced): Add substitution string to docstring to trigger autoloading of the proced library on C-h f. Fixes: debbugs:1768
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/proced.el11
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e211bacbb02..289fbf4a225 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12012-08-05 Chong Yidong <cyd@gnu.org> 12012-08-05 Chong Yidong <cyd@gnu.org>
2 2
3 * proced.el (proced): Add substitution string to docstring to
4 trigger autoloading of the proced library on C-h f (Bug#1768).
5
3 * emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Don't 6 * emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Don't
4 show defvars which have no second argument (Bug#8638). 7 show defvars which have no second argument (Bug#8638).
5 8
diff --git a/lisp/proced.el b/lisp/proced.el
index 78afcac9f50..d98bf7d2c5b 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -659,11 +659,14 @@ After displaying or updating a Proced buffer, Proced runs the normal hook
659;;;###autoload 659;;;###autoload
660(defun proced (&optional arg) 660(defun proced (&optional arg)
661 "Generate a listing of UNIX system processes. 661 "Generate a listing of UNIX system processes.
662If invoked with optional ARG the window displaying the process 662\\<proced-mode-map>
663information will be displayed but not selected. 663If invoked with optional ARG, do not select the window displaying
664Runs the normal hook `proced-post-display-hook'. 664the process information.
665 665
666See `proced-mode' for a description of features available in Proced buffers." 666This function runs the normal hook `proced-post-display-hook'.
667
668See `proced-mode' for a description of features available in
669Proced buffers."
667 (interactive "P") 670 (interactive "P")
668 (unless proced-available 671 (unless proced-available
669 (error "Proced is not available on this system")) 672 (error "Proced is not available on this system"))