Fix bug #11182 with the effect of typing '?' in Shell mode.

[bpt/emacs.git] / lisp / proced.el

diff --git a/lisp/proced.el b/lisp/proced.el
index ddc4ed1..da82186 100644 (file)
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -1,6 +1,6 @@
 ;;; proced.el --- operate on system processes like dired
 
 ;;; proced.el --- operate on system processes like dired
 

-;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2012 Free Software Foundation, Inc.

 
 ;; Author: Roland Winkler <winkler@gnu.org>
 ;; Keywords: Processes, Unix
 
 ;; Author: Roland Winkler <winkler@gnu.org>
 ;; Keywords: Processes, Unix


@@ -395,7 +395,7 @@ It is a list of lists (KEY PREDICATE REVERSE).")
   :group 'proced-faces)
 
 (defface proced-marked
   :group 'proced-faces)
 
 (defface proced-marked

-  '((t (:inherit font-lock-warning-face)))
+  '((t (:inherit error)))

   "Face used for marked processes."
   :group 'proced-faces)
 
   "Face used for marked processes."
   :group 'proced-faces)
 


@@ -1332,7 +1332,7 @@ Prefix ARG controls sort order, see `proced-sort-interactive'."
             (proced-sort-interactive key arg)
           (message "No sorter defined here."))))))
 
             (proced-sort-interactive key arg)
           (message "No sorter defined here."))))))
 

-;;; Formating
+;;; Formatting

 
 (defun proced-format-time (time)
   "Format time interval TIME."
 
 (defun proced-format-time (time)
   "Format time interval TIME."


@@ -1724,7 +1724,9 @@ After sending the signal, this command runs the normal hook
             (buffer-disable-undo)
             (setq buffer-read-only t)
             (dolist (process process-alist)
             (buffer-disable-undo)
             (setq buffer-read-only t)
             (dolist (process process-alist)

-              (insert "  " (cdr process) "\n")))
+              (insert "  " (cdr process) "\n"))
+            (delete-char -1)
+            (goto-char (point-min)))

           (save-window-excursion
             ;; Analogous to `dired-pop-to-buffer'
             ;; Don't split window horizontally.  (Bug#1806)
           (save-window-excursion
             ;; Analogous to `dired-pop-to-buffer'
             ;; Don't split window horizontally.  (Bug#1806)


@@ -1735,8 +1737,9 @@ After sending the signal, this command runs the normal hook
                    (pnum (if (= 1 (length process-alist))
                              "1 process"
                            (format "%d processes" (length process-alist))))
                    (pnum (if (= 1 (length process-alist))
                              "1 process"
                            (format "%d processes" (length process-alist))))

-                   (completion-annotate-function
-                    (lambda (s) (cdr (assoc s proced-signal-list)))))
+                   (completion-extra-properties
+                    '(:annotation-function
+                      (lambda (s) (cdr (assoc s proced-signal-list))))))

               (setq signal
                     (completing-read (concat "Send signal [" pnum
                                              "] (default TERM): ")
               (setq signal
                     (completing-read (concat "Send signal [" pnum
                                              "] (default TERM): ")


@@ -1868,16 +1871,6 @@ buffer.  You can use it to recover marks."
   (message "Change in Proced buffer undone.
 Killed processes cannot be recovered by Emacs."))
 
   (message "Change in Proced buffer undone.
 Killed processes cannot be recovered by Emacs."))
 

-(defun proced-unload-function ()
-  "Unload the Proced library."
-  (save-current-buffer
-    (dolist (buf (buffer-list))
-      (set-buffer buf)
-      (when (eq major-mode 'proced-mode)
-        (funcall (or (default-value 'major-mode) 'fundamental-mode)))))
-  ;; continue standard unloading
-  nil)
-

 (provide 'proced)
 
 ;;; proced.el ends here
 (provide 'proced)
 
 ;;; proced.el ends here