From a20878b6d8caccb2b5bf38f02dccf28d10ea2223 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Mon, 23 Feb 2009 05:06:36 +0000 Subject: [PATCH] Rename `system-process-attributes' to `process-attributes' Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1553 --- doc/lispref/ChangeLog | 5 +++++ doc/lispref/processes.texi | 2 +- etc/ChangeLog | 4 ++++ etc/NEWS | 2 +- lisp/ChangeLog | 6 ++++++ lisp/proced.el | 10 +++++----- lisp/server.el | 2 +- src/ChangeLog | 6 ++++++ src/process.c | 18 ++++++++---------- 9 files changed, 37 insertions(+), 18 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 618336b3aed..e2acc24c2a6 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2009-02-23 Miles Bader + + * processes.texi (System Processes): Rename `system-process-attributes' + to `process-attributes'. + 2009-02-22 Chong Yidong * symbols.texi (Property Lists): Emphasize that property lists are diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index ae3246f0d29..7795ddfc3a0 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -1644,7 +1644,7 @@ from all the other processes running on the same machine at the same time. @end defun -@defun system-process-attributes pid +@defun process-attributes pid This function returns an alist of attributes for the process specified by its process ID @var{pid}. Each association in the alist is of the form @code{(@var{key} . @var{value})}, where @var{key} designates the diff --git a/etc/ChangeLog b/etc/ChangeLog index f5dfc46f3bf..897aaffd958 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2009-02-23 Miles Bader + + * NEWS: Rename `system-process-attributes' to `process-attributes'. + 2009-02-19 Nick Roberts * compilation.txt: Add entry for maven. diff --git a/etc/NEWS b/etc/NEWS index 080f52a920e..0b4b19e4bb3 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1260,7 +1260,7 @@ The default values are ";;;###autoload" and `loaddefs.el', respectively. +++ -** New primitives `list-system-processes' and `system-process-attributes' +** New primitives `list-system-processes' and `process-attributes' let Lisp programs access the processes that are running on the local machine. See the doc strings of these functions for more details. Not all platforms support accessing this information; on those that diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cd1776997ed..ee18b8c55c5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2009-02-23 Miles Bader + + * proced.el (proced-process-attributes): + * server.el (server-running-p): Rename `system-process-attributes' + to `process-attributes'. + 2009-02-22 Juri Linkov * dired-aux.el (minibuffer-default-add-dired-shell-commands): diff --git a/lisp/proced.el b/lisp/proced.el index fc4d6d01cf9..38163b17e8b 100644 --- a/lisp/proced.el +++ b/lisp/proced.el @@ -32,12 +32,12 @@ ;; - allow "sudo kill PID", "renice PID" ;; ;; Thoughts and Ideas -;; - Currently, `system-process-attributes' returns the list of +;; - Currently, `process-attributes' returns the list of ;; command-line arguments of a process as one concatenated string. ;; This format is compatible with `shell-command'. Also, under ;; MS-Windows, the command-line arguments are actually stored as a ;; single string, so that it is impossible to reverse-engineer it back -;; into separate arguments. Alternatively, `system-process-attributes' +;; into separate arguments. Alternatively, `process-attributes' ;; could (try to) return a list of strings that correspond to individual ;; command-line arguments. Then one could feed such a list of ;; command-line arguments into `call-process' or `start-process'. @@ -94,7 +94,7 @@ the external command (usually \"kill\")." ;; It would be neat if one could temporarily override the following ;; predefined rules. (defcustom proced-grammar-alist - '( ;; attributes defined in `system-process-attributes' + '( ;; attributes defined in `process-attributes' (euid "EUID" "%d" right proced-< nil (euid pid) (nil t nil)) (user "USER" nil left proced-string-lessp nil (user pid) (nil t nil)) (egid "EGID" "%d" right proced-< nil (egid euid pid) (nil t nil)) @@ -218,7 +218,7 @@ If REFINER is nil no refinement is done." This variable extends the functionality of `proced-process-attributes'. Each function is called with one argument, the list of attributes of a system process. It returns a cons cell of the form (KEY . VALUE) -like `system-process-attributes'. This cons cell is appended to the list +like `process-attributes'. This cons cell is appended to the list returned by `proced-process-attributes'. If the function returns nil, the value is ignored." :group 'proced @@ -1539,7 +1539,7 @@ the process is ignored." ;; lists are ignored? When would such processes be of interest? (let (process-alist attributes attr) (dolist (pid (or pid-list (list-system-processes)) process-alist) - (when (setq attributes (system-process-attributes pid)) + (when (setq attributes (process-attributes pid)) (setq attributes (cons (cons 'pid pid) attributes)) (dolist (fun proced-custom-attributes) (if (setq attr (funcall fun attributes)) diff --git a/lisp/server.el b/lisp/server.el index 1399b41e8ce..5e4e6e1548e 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -595,7 +595,7 @@ Return values: (insert-file-contents-literally (expand-file-name name server-auth-dir)) (or (and (looking-at "127\\.0\\.0\\.1:[0-9]+ \\([0-9]+\\)") (assq 'comm - (system-process-attributes + (process-attributes (string-to-number (match-string 1)))) t) :other)) diff --git a/src/ChangeLog b/src/ChangeLog index 1f386d97797..2a6eb53eb98 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2009-02-23 Miles Bader + + * process.c (Flist_system_processes, Fprocess_attributes) + (syms_of_process): Rename `system-process-attributes' to + `process-attributes'. + 2009-02-22 Andreas Schwab * coding.h (struct coding_system): Make safe_charsets a pointer to diff --git a/src/process.c b/src/process.c index 10b3b714d54..143c58030c1 100644 --- a/src/process.c +++ b/src/process.c @@ -7075,15 +7075,14 @@ DEFUN ("list-system-processes", Flist_system_processes, Slist_system_processes, doc: /* Return a list of numerical process IDs of all running processes. If this functionality is unsupported, return nil. -See `system-process-attributes' for getting attributes of a process -given its ID. */) +See `process-attributes' for getting attributes of a process given its ID. */) () { return list_system_processes (); } -DEFUN ("system-process-attributes", Fsystem_process_attributes, - Ssystem_process_attributes, 1, 1, 0, +DEFUN ("process-attributes", Fprocess_attributes, + Sprocess_attributes, 1, 1, 0, doc: /* Return attributes of the process given by its PID, a number. Value is an alist where each element is a cons cell of the form @@ -7511,7 +7510,7 @@ The variable takes effect when `start-process' is called. */); defsubr (&Sset_process_filter_multibyte); defsubr (&Sprocess_filter_multibyte_p); defsubr (&Slist_system_processes); - defsubr (&Ssystem_process_attributes); + defsubr (&Sprocess_attributes); } @@ -7810,15 +7809,14 @@ DEFUN ("list-system-processes", Flist_system_processes, Slist_system_processes, doc: /* Return a list of numerical process IDs of all running processes. If this functionality is unsupported, return nil. -See `system-process-attributes' for getting attributes of a process -given its ID. */) +See `process-attributes' for getting attributes of a process given its ID. */) () { return list_system_processes (); } -DEFUN ("system-process-attributes", Fsystem_process_attributes, - Ssystem_process_attributes, 1, 1, 0, +DEFUN ("process-attributes", Fprocess_attributes, + Sprocess_attributes, 1, 1, 0, doc: /* Return attributes of the process given by its PID, a number. Value is an alist where each element is a cons cell of the form @@ -7957,7 +7955,7 @@ syms_of_process () defsubr (&Sget_buffer_process); defsubr (&Sprocess_inherit_coding_system_flag); defsubr (&Slist_system_processes); - defsubr (&Ssystem_process_attributes); + defsubr (&Sprocess_attributes); }