# HG changeset patch # User Miles Bader # Date 1140054090 0 # Node ID 133ba2ee7e439e067e3b9f737ab7cd1cdfe2b936 # Parent 1ccf0b1b5b016492d8060fbf6a481a36cfd4942d Revision: emacs@sv.gnu.org/emacs--devo--0--patch-88 Creator: Michael Olson Merge from erc--emacs--0 diff -r 1ccf0b1b5b01 -r 133ba2ee7e43 etc/ERC-NEWS --- a/etc/ERC-NEWS Wed Feb 15 13:30:19 2006 +0000 +++ b/etc/ERC-NEWS Thu Feb 16 01:41:30 2006 +0000 @@ -1,5 +1,41 @@ ERC NEWS -*- outline -*- +* Changes in ERC 5.1.2 (unreleased) + +** Fix compiler errors in erc-autojoin.el and erc-dcc.el. + +** Move to end of prompt when ERC reconnects to a server. + +** Changes and additions to modules + +*** Spell-checking (erc-spelling.el) + +**** Don't spell-check nicks or words that are prefixed with '/'. + +**** Remove flyspell properties from words we shouldn't spell-check. + +**** Fix an issue that caused the ispell process to reload every time +we switch to an ERC buffer. + +*** Timestamps (erc-stamp.el) + +**** Fix an inconsistency in calculating width of right timestamps. + +**** Rename option `erc-timestamp-right-align-by-pixel' to +`erc-timestamp-use-align-to'. This controls whether to use the more +fail-proof method of aligning right timestamps, as mentioned below. + +**** Fix a right timestamp spacing problem that used to occur when +erc-stamp.el was byte-compiled. Now that this is fixed, it is safe to +use the method that aligns right timestamps perfectly in Emacs22 with +X. If the current version of Emacs doesn't support this method, use +the simpler method, which is prone to alignment issues for math +symbols and other variable-width text. + +A side effect of using this new method is that there will only be one +space before a right timestamp in any saved logs. If this is +unacceptable, set `erc-timestamp-use-align-to' to nil. + * Changes in ERC 5.1.1 ** Fix a requirement on cl.el. diff -r 1ccf0b1b5b01 -r 133ba2ee7e43 lisp/erc/ChangeLog --- a/lisp/erc/ChangeLog Wed Feb 15 13:30:19 2006 +0000 +++ b/lisp/erc/ChangeLog Thu Feb 16 01:41:30 2006 +0000 @@ -1,3 +1,25 @@ +2006-02-15 Michael Olson + + * 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 + + * 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 * erc-dcc.el: Use (eval-when-compile (require 'cl)). diff -r 1ccf0b1b5b01 -r 133ba2ee7e43 lisp/erc/erc-stamp.el --- a/lisp/erc/erc-stamp.el Wed Feb 15 13:30:19 2006 +0000 +++ b/lisp/erc/erc-stamp.el Thu Feb 16 01:41:30 2006 +0000 @@ -240,19 +240,18 @@ (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 -r 1ccf0b1b5b01 -r 133ba2ee7e43 lisp/erc/erc.el --- a/lisp/erc/erc.el Wed Feb 15 13:30:19 2006 +0000 +++ b/lisp/erc/erc.el Thu Feb 16 01:41:30 2006 +0000 @@ -1927,7 +1927,8 @@ (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)))