Simplify url handling in rcirc-mode

[gnu-emacs] / lisp / proced.el

diff --git a/lisp/proced.el b/lisp/proced.el
index ddc4ed1db14e6af97e7b14eee57f11bec039403e..94ea579ebd84617f2bdd3318452363c8a7923591 100644 (file)
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -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