procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

; Fix last change in proced.el

Browse source 
* lisp/proced.el (proced-low-memory-usage-threshold)
(proced-medium-memory-usage-threshold, proced-run-status-code)
(proced-interruptible-sleep-status-code)
(proced-uninterruptible-sleep-status-code, proced-executable): Fix
doc strings.
(proced-format-time): Simplify the format, to avoid bogus warnings
from the byte-compiler.

* etc/NEWS: Move Proced entries to one place and fix their
wording.
This commit is contained in:
Eli Zaretskii 2022-12-01 20:15:52 +02:00
parent 0c1495574a
commit 9c58ea37af
2 changed files with 70 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
etc/NEWS
View file

@ -504,14 +504,6 @@ option) and can be set to nil to disable Just-in-time Lock mode.
* Changes in Emacs 29.1 * Changes in Emacs 29.1
---
** New user option `proced-enable-color-flag` to enable coloring of proced buffers
This option prompts some format functions to furnish their respective
process attributes with colors in a manner similar to htop.
This option is disabled by default and needs setting to a non-nil
value to take effect.
+++ +++
** New user option 'major-mode-remap-alist' to specify favorite major modes. ** New user option 'major-mode-remap-alist' to specify favorite major modes.
This user option lets you remap the default modes (e.g. 'perl-mode' or This user option lets you remap the default modes (e.g. 'perl-mode' or
@ -2818,6 +2810,22 @@ Set it to nil to exclude line numbering from kills and copies.
argument which allows tree-widget display to be activated and computed argument which allows tree-widget display to be activated and computed
only when the user expands the node. only when the user expands the node.
** Proced
---
*** proced.el shows system processes of remote hosts.
When 'default-directory' is remote, and 'proced' is invoked with a
negative argument like 'C-u - proced', the system processes of that
remote host are shown. Alternatively, the user option
'proced-show-remote-processes' can be set to non-nil.
'proced-signal-function' has been marked obsolete.
---
*** Proced can now optionally show process details in color.
New user option 'proced-enable-color-flag' enables coloring of Proced
buffers. This option is disabled by default; customize it to a
non-nil value to enable colors.
** Miscellaneous ** Miscellaneous
--- ---
@ -2903,14 +2911,6 @@ also been renamed:
'mark-bib' to 'bib-mark' 'mark-bib' to 'bib-mark'
'unread-bib' to 'bib-unread' 'unread-bib' to 'bib-unread'
---
*** proced.el shows system processes of remote hosts.
When 'default-directory' is remote, and 'proced' is invoked with a
negative argument like 'C-u - proced', the system processes of that
remote host are shown. Alternatively, the user option
'proced-show-remote-processes' can be set to non-nil.
'proced-signal-function' has been marked obsolete.
--- ---
*** 'outlineify-sticky' command is renamed to 'allout-outlinify-sticky'. *** 'outlineify-sticky' command is renamed to 'allout-outlinify-sticky'.
The old name is still available as an obsolete function alias. The old name is still available as an obsolete function alias.

89
lisp/proced.el
View file

@ -114,38 +114,55 @@ the external command (usually \"kill\")."
(defcustom proced-grammar-alist (defcustom proced-grammar-alist
'( ;; attributes defined in `process-attributes' '( ;; attributes defined in `process-attributes'
(euid "EUID" "%d" right proced-< nil (euid pid) (nil t nil)) (euid "EUID" "%d" right proced-< nil (euid pid) (nil t nil))
(user "User" proced-format-user left proced-string-lessp nil (user pid) (nil t nil)) (user "User" proced-format-user left proced-string-lessp nil
(user pid) (nil t nil))
(egid "EGID" "%d" right proced-< nil (egid euid pid) (nil t nil)) (egid "EGID" "%d" right proced-< nil (egid euid pid) (nil t nil))
(group "Group" nil left proced-string-lessp nil (group user pid) (nil t nil)) (group "Group" nil left proced-string-lessp nil (group user pid)
(nil t nil))
(comm "Command" nil left proced-string-lessp nil (comm pid) (nil t nil)) (comm "Command" nil left proced-string-lessp nil (comm pid) (nil t nil))
(state "Stat" proced-format-state left proced-string-lessp nil (state pid) (nil t nil)) (state "Stat" proced-format-state left proced-string-lessp nil
(state pid) (nil t nil))
(ppid "PPID" proced-format-ppid right proced-< nil (ppid pid) (ppid "PPID" proced-format-ppid right proced-< nil (ppid pid)
((lambda (ppid) (proced-filter-parents proced-process-alist ppid)) ((lambda (ppid)
"refine to process parents")) (proced-filter-parents proced-process-alist ppid))
(pgrp "PGrp" proced-format-pgrp right proced-< nil (pgrp euid pid) (nil t nil)) "refine to process parents"))
(sess "Sess" proced-format-sess right proced-< nil (sess pid) (nil t nil)) (pgrp "PGrp" proced-format-pgrp right proced-< nil (pgrp euid pid)
(ttname "TTY" proced-format-ttname left proced-string-lessp nil (ttname pid) (nil t nil)) (nil t nil))
(sess "Sess" proced-format-sess right proced-< nil (sess pid)
(nil t nil))
(ttname "TTY" proced-format-ttname left proced-string-lessp nil
(ttname pid) (nil t nil))
(tpgid "TPGID" "%d" right proced-< nil (tpgid pid) (nil t nil)) (tpgid "TPGID" "%d" right proced-< nil (tpgid pid) (nil t nil))
(minflt "MinFlt" "%d" right proced-< nil (minflt pid) (nil t t)) (minflt "MinFlt" "%d" right proced-< nil (minflt pid) (nil t t))
(majflt "MajFlt" "%d" right proced-< nil (majflt pid) (nil t t)) (majflt "MajFlt" "%d" right proced-< nil (majflt pid) (nil t t))
(cminflt "CMinFlt" "%d" right proced-< nil (cminflt pid) (nil t t)) (cminflt "CMinFlt" "%d" right proced-< nil (cminflt pid) (nil t t))
(cmajflt "CMajFlt" "%d" right proced-< nil (cmajflt pid) (nil t t)) (cmajflt "CMajFlt" "%d" right proced-< nil (cmajflt pid) (nil t t))
(utime "UTime" proced-format-time right proced-time-lessp t (utime pid) (nil t t)) (utime "UTime" proced-format-time right proced-time-lessp t (utime pid)
(stime "STime" proced-format-time right proced-time-lessp t (stime pid) (nil t t)) (nil t t))
(time "Time" proced-format-time right proced-time-lessp t (time pid) (nil t t)) (stime "STime" proced-format-time right proced-time-lessp t (stime pid)
(cutime "CUTime" proced-format-time right proced-time-lessp t (cutime pid) (nil t t)) (nil t t))
(cstime "CSTime" proced-format-time right proced-time-lessp t (cstime pid) (nil t t)) (time "Time" proced-format-time right proced-time-lessp t (time pid)
(ctime "CTime" proced-format-time right proced-time-lessp t (ctime pid) (nil t t)) (nil t t))
(cutime "CUTime" proced-format-time right proced-time-lessp t (cutime pid)
(nil t t))
(cstime "CSTime" proced-format-time right proced-time-lessp t (cstime pid)
(nil t t))
(ctime "CTime" proced-format-time right proced-time-lessp t (ctime pid)
(nil t t))
(pri "Pr" "%d" right proced-< t (pri pid) (nil t t)) (pri "Pr" "%d" right proced-< t (pri pid) (nil t t))
(nice "Ni" "%3d" 3 proced-< t (nice pid) (t t nil)) (nice "Ni" "%3d" 3 proced-< t (nice pid) (t t nil))
(thcount "THCount" "%d" right proced-< t (thcount pid) (nil t t)) (thcount "THCount" "%d" right proced-< t (thcount pid) (nil t t))
(start "Start" proced-format-start 6 proced-time-lessp nil (start pid) (t t nil)) (start "Start" proced-format-start 6 proced-time-lessp nil (start pid)
(vsize "VSize" proced-format-memory right proced-< t (vsize pid) (nil t t)) (t t nil))
(vsize "VSize" proced-format-memory right proced-< t (vsize pid)
(nil t t))
(rss "RSS" proced-format-rss right proced-< t (rss pid) (nil t t)) (rss "RSS" proced-format-rss right proced-< t (rss pid) (nil t t))
(etime "ETime" proced-format-time right proced-time-lessp t (etime pid) (nil t t)) (etime "ETime" proced-format-time right proced-time-lessp t (etime pid)
(nil t t))
(pcpu "%CPU" proced-format-cpu right proced-< t (pcpu pid) (nil t t)) (pcpu "%CPU" proced-format-cpu right proced-< t (pcpu pid) (nil t t))
(pmem "%Mem" proced-format-mem right proced-< t (pmem pid) (nil t t)) (pmem "%Mem" proced-format-mem right proced-< t (pmem pid) (nil t t))
(args "Args" proced-format-args left proced-string-lessp nil (args pid) (nil t nil)) (args "Args" proced-format-args left proced-string-lessp nil
(args pid) (nil t nil))
;; ;;
;; attributes defined by proced (see `proced-process-attributes') ;; attributes defined by proced (see `proced-process-attributes')
(pid "PID" proced-format-pid right proced-< nil (pid) (pid "PID" proced-format-pid right proced-< nil (pid)
@ -373,23 +390,23 @@ May be used to revert the process listing."
:version "29.1") :version "29.1")
(defcustom proced-low-memory-usage-threshold 0.1 (defcustom proced-low-memory-usage-threshold 0.1
"The upper bound for low memory usage, relative to total memory. "The upper bound for low relative memory usage display in Proced.
When `proced-enable-color-flag' is non-nil, RSS values denoting a proportion When `proced-enable-color-flag' is non-nil, RSS values denoting a
of memory lower than this value will be displayed using the proportion of memory, relative to total memory, that is lower
`proced-memory-low-usage' face." than this value will be displayed using the `proced-memory-low-usage' face."
:type 'float :type 'float
:version "29.1") :version "29.1")
(defcustom proced-medium-memory-usage-threshold 0.5 (defcustom proced-medium-memory-usage-threshold 0.5
"The upper bound for medium memory usage, relative to total memory. "The upper bound for medium relative memory usage display in Proced.
When `proced-enable-color-flag' is non-nil, RSS values denoting a proportion When `proced-enable-color-flag' is non-nil, RSS values denoting a
of memory less than this value, but greater than proportion of memory, relative to total memory, that is less than
`proced-low-memory-usage-threshold', will be displayed using the this value, but greater than `proced-low-memory-usage-threshold',
`proced-memory-medium-usage' face. RSS values denoting a greater proportion will be displayed using the `proced-memory-medium-usage' face.
than this value will be displayed using the `proced-memory-high-usage' RSS values denoting a greater proportion than this value will be
face." displayed using the `proced-memory-high-usage' face."
:type 'float :type 'float
:version "29.1") :version "29.1")
@ -431,19 +448,19 @@ It is a list of lists (KEY PREDICATE REVERSE).")
(defface proced-run-status-code (defface proced-run-status-code
'((t (:foreground "green"))) '((t (:foreground "green")))
"Face used in Proced buffers for the running or runnable status code character \"R\"." "Face used in Proced buffers for running or runnable status code character \"R\"."
:version "29.1") :version "29.1")
(defface proced-interruptible-sleep-status-code (defface proced-interruptible-sleep-status-code
'((((class color) (min-colors 88)) (:foreground "DimGrey")) '((((class color) (min-colors 88)) (:foreground "DimGrey"))
(t (:italic t))) (t (:italic t)))
"Face used in Proced buffers for the interruptible sleep status code character \"S\"." "Face used in Proced buffers for interruptible sleep status code character \"S\"."
:version "29.1") :version "29.1")
(defface proced-uninterruptible-sleep-status-code (defface proced-uninterruptible-sleep-status-code
'((((class color)) (:foreground "red")) '((((class color)) (:foreground "red"))
(t (:bold t))) (t (:bold t)))
"Face used in Proced buffers for the uninterruptible sleep status code character \"D\"." "Face used in Proced buffers for uninterruptible sleep status code character \"D\"."
:version "29.1") :version "29.1")
(defface proced-executable (defface proced-executable
@ -451,7 +468,9 @@ It is a list of lists (KEY PREDICATE REVERSE).")
(((class color) (background dark)) (:foreground "cyan")) (((class color) (background dark)) (:foreground "cyan"))
(((class color) (background light)) (:foreground "blue")) (((class color) (background light)) (:foreground "blue"))
(t (:bold t))) (t (:bold t)))
"Face used in Proced buffers for executables (first word in the args process attribute)." "Face used in Proced buffers for executable names.
The first word in the process arguments attribute is assumed to
be the executable that runs in the process."
:version "29.1") :version "29.1")
(defface proced-memory-high-usage (defface proced-memory-high-usage
@ -1529,9 +1548,9 @@ Prefix ARG controls sort order, see `proced-sort-interactive'."
(propertize ":" 'font-lock-face 'proced-time-colon) (propertize ":" 'font-lock-face 'proced-time-colon)
":"))) ":")))
(cond ((< 0 days) (cond ((< 0 days)
(format "%d-%02d%3$s%02d%3$s%02d" days hours colon minutes seconds)) (format "%d-%02d%s%02d%s%02d" days hours colon minutes colon seconds))
((< 0 hours) ((< 0 hours)
(format "%02d%2$s%02d%2$s%02d" hours colon minutes seconds)) (format "%02d%s%02d%s%02d" hours colon minutes colon seconds))
(t (t
(format "%02d%s%02d" minutes colon seconds))))) (format "%02d%s%02d" minutes colon seconds)))))