diff options
| author | Lars Magne Ingebrigtsen | 2011-07-20 11:53:51 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-07-20 11:53:51 +0200 |
| commit | 8ca422621c3a1c366f589f430f496d586e11e509 (patch) | |
| tree | b1843dbc30aec9553d96d1c45eb704e8725f3891 | |
| parent | 2ecab2b506cc69d8a1859982e1e2dc44e2b46f65 (diff) | |
| download | emacs-8ca422621c3a1c366f589f430f496d586e11e509.tar.gz emacs-8ca422621c3a1c366f589f430f496d586e11e509.zip | |
(proced-update): Revert yesterday's bug#1779 patch, which apparently didn't work.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/proced.el | 11 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 16520024c42..b138d78a070 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-07-20 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * proced.el (proced-update): Revert yesterday's bug#1779 patch, | ||
| 4 | which apparently didn't work. | ||
| 5 | |||
| 1 | 2011-07-19 Roland Winkler <winkler@gnu.org> | 6 | 2011-07-19 Roland Winkler <winkler@gnu.org> |
| 2 | 7 | ||
| 3 | * proced.el (proced-send-signal): For *Marked Processes* buffer | 8 | * 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)." | |||
| 1509 | (if (string-match "[ \t]+$" proced-header-line) | 1509 | (if (string-match "[ \t]+$" proced-header-line) |
| 1510 | (setq proced-header-line (substring proced-header-line 0 | 1510 | (setq proced-header-line (substring proced-header-line 0 |
| 1511 | (match-beginning 0)))) | 1511 | (match-beginning 0)))) |
| 1512 | (setq proced-header-line (concat " " proced-header-line)) | ||
| 1513 | ;; From buff-menu.el: Turn whitespace chars in the header into | ||
| 1514 | ;; stretch specs so they work regardless of the header-line face. | ||
| 1515 | (let ((pos 0) | ||
| 1516 | (header proced-header-line)) | ||
| 1517 | (while (string-match "[ \t\n]+" header pos) | ||
| 1518 | (setq pos (match-end 0)) | ||
| 1519 | (put-text-property (match-beginning 0) pos 'display | ||
| 1520 | (list 'space :align-to pos) | ||
| 1521 | header))) | ||
| 1522 | ;; (delete-trailing-whitespace) | 1512 | ;; (delete-trailing-whitespace) |
| 1523 | (goto-char (point-min)) | 1513 | (goto-char (point-min)) |
| 1524 | (while (re-search-forward "[ \t\r]+$" nil t) | 1514 | (while (re-search-forward "[ \t\r]+$" nil t) |
| @@ -1612,6 +1602,7 @@ After updating a displayed Proced buffer run the normal hook | |||
| 1612 | (while (not (eobp)) | 1602 | (while (not (eobp)) |
| 1613 | (insert " ") | 1603 | (insert " ") |
| 1614 | (forward-line)) | 1604 | (forward-line)) |
| 1605 | (setq proced-header-line (concat " " proced-header-line)) | ||
| 1615 | (if revert (set-buffer-modified-p nil)) | 1606 | (if revert (set-buffer-modified-p nil)) |
| 1616 | 1607 | ||
| 1617 | ;; set `goal-column' | 1608 | ;; set `goal-column' |