From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Wed, 20 Jul 2011 09:53:51 +0000 (+0200)
Subject: (proced-update): Revert yesterday's bug#1779 patch, which apparently didn't work.
X-Git-Tag: emacs-pretest-24.0.90~104^2~189
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8ca422621c3a1c366f589f430f496d586e11e509;p=emacs.git

(proced-update): Revert yesterday's bug#1779 patch, which apparently didn't work.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16520024c42..b138d78a070 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* proced.el (proced-update): Revert yesterday's bug#1779 patch,
+	which apparently didn't work.
+
 2011-07-19  Roland Winkler  <winkler@gnu.org>
 
 	* proced.el (proced-send-signal): For *Marked Processes* buffer
diff --git a/lisp/proced.el b/lisp/proced.el
index b1a7aed722c..94ea579ebd8 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -1509,16 +1509,6 @@ Replace newline characters by \"^J\" (two characters)."
     (if (string-match "[ \t]+$" proced-header-line)
         (setq proced-header-line (substring proced-header-line 0
                                             (match-beginning 0))))
-     (setq proced-header-line (concat "  " proced-header-line))
-     ;; From buff-menu.el: Turn whitespace chars in the header into
-     ;; stretch specs so they work regardless of the header-line face.
-     (let ((pos 0)
-     	  (header proced-header-line))
-     	(while (string-match "[ \t\n]+" header pos)
-     	  (setq pos (match-end 0))
-     	  (put-text-property (match-beginning 0) pos 'display
-     			     (list 'space :align-to pos)
-     			     header)))
     ;; (delete-trailing-whitespace)
     (goto-char (point-min))
     (while (re-search-forward "[ \t\r]+$" nil t)
@@ -1612,6 +1602,7 @@ After updating a displayed Proced buffer run the normal hook
     (while (not (eobp))
       (insert "  ")
       (forward-line))
+    (setq proced-header-line (concat "  " proced-header-line))
     (if revert (set-buffer-modified-p nil))
 
     ;; set `goal-column'