summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
2012-08-05 Chong Yidong <cyd@gnu.org>
+ * proced.el (proced): Add substitution string to docstring to
+ trigger autoloading of the proced library on C-h f (Bug#1768).
+
* emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Don't
show defvars which have no second argument (Bug#8638).
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
;;;###autoload
(defun proced (&optional arg)
"Generate a listing of UNIX system processes.
-If invoked with optional ARG the window displaying the process
-information will be displayed but not selected.
-Runs the normal hook `proced-post-display-hook'.
+\\<proced-mode-map>
+If invoked with optional ARG, do not select the window displaying
+the process information.
-See `proced-mode' for a description of features available in Proced buffers."
+This function runs the normal hook `proced-post-display-hook'.
+
+See `proced-mode' for a description of features available in
+Proced buffers."
(interactive "P")
(unless proced-available
(error "Proced is not available on this system"))