Mercurial > emacs
comparison lisp/erc/erc-stamp.el @ 74484:e9bc018298b2
Update from erc--emacs--22
Highlights:
- Remove contributions from someone who has not assigned changes yet.
- Merge in a couple of bug-fixes from the main branch.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-546
Creator: Michael Olson <mwolson@gnu.org>
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 08 Dec 2006 07:13:33 +0000 |
| parents | 133ba2ee7e43 |
| children | 7a3f13e2dd57 |
comparison
equal
deleted
inserted
replaced
| 74483:00d6850d1b3e | 74484:e9bc018298b2 |
|---|---|
| 264 (erc-insert-aligned string pos) | 264 (erc-insert-aligned string pos) |
| 265 (newline) | 265 (newline) |
| 266 (indent-to pos) | 266 (indent-to pos) |
| 267 (setq from (point)) | 267 (setq from (point)) |
| 268 (insert string)) | 268 (insert string)) |
| 269 (erc-put-text-property from (1+ (point)) 'field 'erc-timestamp) | 269 (erc-put-text-property from (point) 'field 'erc-timestamp) |
| 270 (erc-put-text-property from (1+ (point)) 'rear-nonsticky t) | 270 (erc-put-text-property from (point) 'rear-nonsticky t) |
| 271 (when erc-timestamp-intangible | 271 (when erc-timestamp-intangible |
| 272 (erc-put-text-property from (1+ (point)) 'intangible t))))) | 272 (erc-put-text-property from (1+ (point)) 'intangible t))))) |
| 273 | 273 |
| 274 ;; for testing: (setq erc-timestamp-only-if-changed-flag nil) | 274 ;; for testing: (setq erc-timestamp-only-if-changed-flag nil) |
| 275 | 275 |