summaryrefslogtreecommitdiff
path: root/lisp/erc/erc-stamp.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2006-02-16 01:41:30 +0000
committerMiles Bader <miles@gnu.org>2006-02-16 01:41:30 +0000
commite7559e307df1582c802885c5c6f80fba230bc524 (patch)
treee1e54761e494b5f272eec3b0171d32a14ae45661 /lisp/erc/erc-stamp.el
parent1899ba3642557437c156156bad44d99d4aae5323 (diff)
downloademacs-e7559e307df1582c802885c5c6f80fba230bc524.tar.gz
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-88
Creator: Michael Olson <mwolson@gnu.org> Merge from erc--emacs--0
Diffstat (limited to 'lisp/erc/erc-stamp.el')
-rw-r--r--lisp/erc/erc-stamp.el9
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index e5d4250d142..5d43baab6c9 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)