(proced, proced-format-time): Doc fixes.

(proced-process-attributes): Signal an error if unsupported.  (Bug#1314)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39fc2682527db56232381f97e5c054cb6458b37c..a13050b45dab2e6ea3846b5c1b6704ed8c1183b5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-19  Glenn Morris  <rgm@gnu.org>
+
+       * proced.el (proced, proced-format-time): Doc fixes.
+       (proced-process-attributes): Signal an error if unsupported.  (Bug#1314)
+
 2008-11-19  Karl Fogel  <kfogel@red-bean.com>
 
        * bookmark.el (bookmark-jump-noselect): Move the deprecation

diff --git a/lisp/proced.el b/lisp/proced.el
index 77247eef34cdd04ca10dab2c525098f18c225eaa..dcb60e361f8aba3e8de62ca58c0d9ec24b302752 100644 (file)
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -583,7 +583,7 @@ are defined in `proced-grammar-alist'.
 If invoked with optional ARG the window displaying the process
 information will be displayed but not selected.
 
-See `proced-mode' for a descreption of features available in Proced buffers."
+See `proced-mode' for a description of features available in Proced buffers."
   (interactive "P")
   (let ((buffer (get-buffer-create "*Proced*")) new)
     (set-buffer buffer)
@@ -1074,7 +1074,7 @@ This command updates the variable `proced-sort'."
 ;;; Formating
 
 (defun proced-format-time (time)
-  "Format time intervall TIME."
+  "Format time interval TIME."
   (let* ((ftime (float-time time))
          (days (truncate ftime 86400))
          (ftime (mod ftime 86400))
@@ -1233,25 +1233,28 @@ With prefix REVERT non-nil revert listing."
 (defun proced-process-attributes ()
   "Return alist of attributes for each system process.
 This alist can be customized via `proced-custom-attributes'."
-  (mapcar (lambda (pid)
-            (let* ((attributes (system-process-attributes pid))
-                   (utime (cdr (assq 'utime attributes)))
-                   (stime (cdr (assq 'stime attributes)))
-                   (cutime (cdr (assq 'cutime attributes)))
-                   (cstime (cdr (assq 'cstime attributes)))
-                   attr)
-              (setq attributes
-                    (append (list (cons 'pid pid))
-                            (if (and utime stime)
-                                (list (cons 'time (time-add utime stime))))
-                            (if (and cutime cstime)
-                                (list (cons 'ctime (time-add cutime cstime))))
-                            attributes))
-              (dolist (fun proced-custom-attributes)
-                (if (setq attr (funcall fun attributes))
-                    (push attr attributes)))
-              (cons pid attributes)))
-          (list-system-processes)))
+  (let ((procs (list-system-processes)))
+    (if procs
+        (mapcar (lambda (pid)
+                  (let* ((attributes (system-process-attributes pid))
+                         (utime (cdr (assq 'utime attributes)))
+                         (stime (cdr (assq 'stime attributes)))
+                         (cutime (cdr (assq 'cutime attributes)))
+                         (cstime (cdr (assq 'cstime attributes)))
+                         attr)
+                    (setq attributes
+                          (append (list (cons 'pid pid))
+                                  (if (and utime stime)
+                                      (list (cons 'time (time-add utime stime))))
+                                  (if (and cutime cstime)
+                                      (list (cons 'ctime (time-add cutime cstime))))
+                                  attributes))
+                    (dolist (fun proced-custom-attributes)
+                      (if (setq attr (funcall fun attributes))
+                          (push attr attributes)))
+                    (cons pid attributes)))
+                procs)
+      (error "Proced is not available on this system"))))
 
 (defun proced-update (&optional revert quiet)
   "Update the `proced' process information.  Preserves point and marks.