diff options
| author | Miles Bader <[email protected]> | 2006-02-16 01:41:30 +0000 |
|---|---|---|
| committer | Miles Bader <[email protected]> | 2006-02-16 01:41:30 +0000 |
| commit | e7559e307df1582c802885c5c6f80fba230bc524 (patch) | |
| tree | e1e54761e494b5f272eec3b0171d32a14ae45661 /lisp/erc | |
| parent | 1899ba3642557437c156156bad44d99d4aae5323 (diff) | |
Revision: [email protected]/emacs--devo--0--patch-88
Creator: Michael Olson <[email protected]>
Merge from erc--emacs--0
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 22 | ||||
| -rw-r--r-- | lisp/erc/erc-stamp.el | 9 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 3 |
3 files changed, 28 insertions, 6 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 3d44f87777..ec2098c7bd 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,25 @@ +2006-02-15 Michael Olson <[email protected]> + + * erc.el (erc): Move to the end of the buffer when a continued + session is detected. Thanks to e1f and indio for the report and + testing a potential fix. + +2006-02-14 Michael Olson <[email protected]> + + * debian/changelog: Prepare a new Debian package. + + * Makefile (debprepare): New rule that creates an ERC snapshot + directory for use in both new Debian releases and revisions for + Debian packages. + (debrelease, debrevision-mwolson): Use debprepare. + + * NEWS: Bring up-to-date. + + * erc-stamp.el (erc-insert-timestamp-right): For now, put + timestamps before rather than after erc-fill-column when + erc-timestamp-right-column is nil. This way we won't surprise + anyone unpleasantly, or so it is hoped. + 2006-02-13 Michael Olson <[email protected]> * erc-dcc.el: Use (eval-when-compile (require 'cl)). diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el index e5d4250d14..5d43baab6c 100644 --- a/lisp/erc/erc-stamp.el +++ b/lisp/erc/erc-stamp.el @@ -240,19 +240,18 @@ be printed just before the window-width." (goto-char (point-max)) (forward-char -1);; before the last newline (let* ((current-window (get-buffer-window (current-buffer))) + (str-width (string-width string)) (pos (cond (erc-timestamp-right-column erc-timestamp-right-column) ((and (boundp 'erc-fill-mode) erc-fill-mode (boundp 'erc-fill-column) erc-fill-column) - (1+ erc-fill-column)) + (1+ (- erc-fill-column str-width))) (fill-column - (1+ fill-column)) + (1+ (- fill-column str-width))) (t - (- (window-width) - (string-width string) - 1)))) + (- (window-width) str-width 1)))) (from (point)) (col (current-column)) indent) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index d444ab2af0..e1dc240901 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1927,7 +1927,8 @@ Returns the buffer for the given server or channel." (goto-char (point-max)) (insert "\n")) (set-marker (process-mark erc-server-process) (point)) - (unless continued-session + (if continued-session + (goto-char (point-max)) (set-marker erc-insert-marker (point)) (erc-display-prompt) (goto-char (point-max))) |