aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-12-19 21:53:25 +0000
committerJuanma Barranquero2008-12-19 21:53:25 +0000
commitd0482e4e9a5e4f37964ded899250aca0552cf585 (patch)
treedfd6db98819ff1e0ee3f5e04dbb7abf3bc9a2918
parenta300e74ab113c23bcfa432862ca31acf52a258e7 (diff)
downloademacs-d0482e4e9a5e4f37964ded899250aca0552cf585.tar.gz
emacs-d0482e4e9a5e4f37964ded899250aca0552cf585.zip
* proced.el (proced-grammar-alist): Doc fix.
(proced-marker-char, proced-mark, proced-help-string, proced-mode-map) (proced-filter-parents, proced-sort-header, proced-update, proced-help) (proced-undo): Fix typos in docstrings.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/proced.el26
2 files changed, 20 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bc62265a5e5..dad06617fe5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12008-12-19 Juanma Barranquero <lekktu@gmail.com>
2
3 * proced.el (proced-grammar-alist): Doc fix.
4 (proced-marker-char, proced-mark, proced-help-string, proced-mode-map)
5 (proced-filter-parents, proced-sort-header, proced-update, proced-help)
6 (proced-undo): Fix typos in docstrings.
7
12008-12-19 Glenn Morris <rgm@gnu.org> 82008-12-19 Glenn Morris <rgm@gnu.org>
2 9
3 * emacs-lisp/authors.el (authors-aliases): Add some more aliases. 10 * emacs-lisp/authors.el (authors-aliases): Add some more aliases.
diff --git a/lisp/proced.el b/lisp/proced.el
index 9f7b4206a47..9590e921bf0 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -148,9 +148,9 @@ Symbol KEY is the car of a process attribute.
148 148
149String NAME appears in the header line. 149String NAME appears in the header line.
150 150
151FORMAT specifies the format for displaying the attribute values. 151FORMAT specifies the format for displaying the attribute values. It can
152It can be a string passed to `format'. It can be a function called 152be a string passed to `format'. It can be a function called with one
153with one argument, the value of the attribute. Nil means take as is. 153argument, the value of the attribute. The value nil means take as is.
154 154
155If JUSTIFY is an integer, its modulus gives the width of the attribute 155If JUSTIFY is an integer, its modulus gives the width of the attribute
156values formatted with FORMAT. If JUSTIFY is positive, NAME appears 156values formatted with FORMAT. If JUSTIFY is positive, NAME appears
@@ -359,7 +359,7 @@ cons pairs, see `proced-process-attributes'.")
359It is a list of lists (KEY PREDICATE REVERSE).") 359It is a list of lists (KEY PREDICATE REVERSE).")
360 360
361(defvar proced-marker-char ?* ; the answer is 42 361(defvar proced-marker-char ?* ; the answer is 42
362 "In proced, the current mark character.") 362 "In Proced, the current mark character.")
363 363
364;; Faces and font-lock code taken from dired, 364;; Faces and font-lock code taken from dired,
365;; but face variables are deprecated for new code. 365;; but face variables are deprecated for new code.
@@ -370,7 +370,7 @@ It is a list of lists (KEY PREDICATE REVERSE).")
370 370
371(defface proced-mark 371(defface proced-mark
372 '((t (:inherit font-lock-constant-face))) 372 '((t (:inherit font-lock-constant-face)))
373 "Face used for proced marks." 373 "Face used for Proced marks."
374 :group 'proced-faces) 374 :group 'proced-faces)
375 375
376(defface proced-marked 376(defface proced-marked
@@ -402,7 +402,7 @@ Important: the match ends just after the marker.")
402 402
403(defconst proced-help-string 403(defconst proced-help-string
404 "(n)ext, (p)revious, (m)ark, (u)nmark, (k)ill, (q)uit (type ? for more help)" 404 "(n)ext, (p)revious, (m)ark, (u)nmark, (k)ill, (q)uit (type ? for more help)"
405 "Help string for proced.") 405 "Help string for Proced.")
406 406
407(defconst proced-header-help-echo 407(defconst proced-header-help-echo
408 "mouse-1, mouse-2: sort by attribute %s%s (%s)" 408 "mouse-1, mouse-2: sort by attribute %s%s (%s)"
@@ -470,7 +470,7 @@ Important: the match ends just after the marker.")
470 (define-key km [remap undo] 'proced-undo) 470 (define-key km [remap undo] 'proced-undo)
471 (define-key km [remap advertised-undo] 'proced-undo) 471 (define-key km [remap advertised-undo] 'proced-undo)
472 km) 472 km)
473 "Keymap for proced commands.") 473 "Keymap for Proced commands.")
474 474
475(easy-menu-define 475(easy-menu-define
476 proced-menu proced-mode-map "Proced Menu" 476 proced-menu proced-mode-map "Proced Menu"
@@ -913,7 +913,7 @@ This list includes PPID unless OMIT-PPID is non-nil."
913 913
914(defun proced-filter-parents (process-alist pid &optional omit-pid) 914(defun proced-filter-parents (process-alist pid &optional omit-pid)
915 "For PROCESS-ALIST return list of parent processes of PID. 915 "For PROCESS-ALIST return list of parent processes of PID.
916This list includes CPID unless OMIT-CPID is non-nil." 916This list includes PID unless OMIT-PID is non-nil."
917 (let ((parent-list (unless omit-pid (list (assq pid process-alist))))) 917 (let ((parent-list (unless omit-pid (list (assq pid process-alist)))))
918 (while (setq pid (cdr (assq 'ppid (cdr (assq pid process-alist))))) 918 (while (setq pid (cdr (assq 'ppid (cdr (assq pid process-alist)))))
919 (push (assq pid process-alist) parent-list)) 919 (push (assq pid process-alist) parent-list))
@@ -1145,7 +1145,7 @@ Prefix ARG controls sort order, see `proced-sort-interactive'."
1145(defun proced-sort-header (event &optional arg) 1145(defun proced-sort-header (event &optional arg)
1146 "Sort Proced listing based on an attribute. 1146 "Sort Proced listing based on an attribute.
1147EVENT is a mouse event with starting position in the header line. 1147EVENT is a mouse event with starting position in the header line.
1148It is converted in the corresponding attribute key. 1148It is converted to the corresponding attribute key.
1149This command updates the variable `proced-sort'. 1149This command updates the variable `proced-sort'.
1150Prefix ARG controls sort order, see `proced-sort-interactive'." 1150Prefix ARG controls sort order, see `proced-sort-interactive'."
1151 (interactive (list last-input-event (or last-prefix-arg 'no-arg))) 1151 (interactive (list last-input-event (or last-prefix-arg 'no-arg)))
@@ -1380,7 +1380,7 @@ the process is ignored."
1380 (push (cons pid attributes) process-alist)))))) 1380 (push (cons pid attributes) process-alist))))))
1381 1381
1382(defun proced-update (&optional revert quiet) 1382(defun proced-update (&optional revert quiet)
1383 "Update the `proced' process information. Preserves point and marks. 1383 "Update the Proced process information. Preserves point and marks.
1384With prefix REVERT non-nil, revert listing. 1384With prefix REVERT non-nil, revert listing.
1385Suppress status information if QUIET is nil." 1385Suppress status information if QUIET is nil."
1386 ;; This is the main function that generates and updates the process listing. 1386 ;; This is the main function that generates and updates the process listing.
@@ -1670,7 +1670,7 @@ STRING is an overall summary of the failures."
1670 (proced-log t signal)) 1670 (proced-log t signal))
1671 1671
1672(defun proced-help () 1672(defun proced-help ()
1673 "Provide help for the `proced' user." 1673 "Provide help for the Proced user."
1674 (interactive) 1674 (interactive)
1675 (proced-why) 1675 (proced-why)
1676 (if (eq last-command 'proced-help) 1676 (if (eq last-command 'proced-help)
@@ -1678,8 +1678,8 @@ STRING is an overall summary of the failures."
1678 (message proced-help-string))) 1678 (message proced-help-string)))
1679 1679
1680(defun proced-undo () 1680(defun proced-undo ()
1681 "Undo in a proced buffer. 1681 "Undo in a Proced buffer.
1682This doesn't recover killed processes, it just undoes changes in the proced 1682This doesn't recover killed processes, it just undoes changes in the Proced
1683buffer. You can use it to recover marks." 1683buffer. You can use it to recover marks."
1684 (interactive) 1684 (interactive)
1685 (let (buffer-read-only) 1685 (let (buffer-read-only)