aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/erc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/ChangeLog5
-rw-r--r--lisp/erc/erc-dcc.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 3a625eb215e..bbe551c735d 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
12013-01-11 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * erc-dcc.el (erc-dcc-send-file): Use point-min-marker.
4 (erc-dcc-chat-setup): Use point-max-marker.
5
12013-01-04 Glenn Morris <rgm@gnu.org> 62013-01-04 Glenn Morris <rgm@gnu.org>
2 7
3 * erc-backend.el (312): Fix typo. (Bug#13235) 8 * erc-backend.el (312): Fix typo. (Bug#13235)
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index dc67d3b01df..c27bb629f9d 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -897,7 +897,7 @@ other client."
897 (let* ((buffer (erc-dcc-find-file file)) 897 (let* ((buffer (erc-dcc-find-file file))
898 (size (buffer-size buffer)) 898 (size (buffer-size buffer))
899 (start (with-current-buffer buffer 899 (start (with-current-buffer buffer
900 (set-marker (make-marker) (point-min)))) 900 (point-min-marker)))
901 (sproc (erc-dcc-server "dcc-send" 901 (sproc (erc-dcc-server "dcc-send"
902 'erc-dcc-send-filter 902 'erc-dcc-send-filter
903 'erc-dcc-send-sentinel)) 903 'erc-dcc-send-sentinel))
@@ -1166,7 +1166,7 @@ other client."
1166 (setq erc-dcc-from nick) 1166 (setq erc-dcc-from nick)
1167 (setq erc-dcc-entry-data entry) 1167 (setq erc-dcc-entry-data entry)
1168 (setq erc-dcc-unprocessed-output "") 1168 (setq erc-dcc-unprocessed-output "")
1169 (setq erc-insert-marker (set-marker (make-marker) (point-max))) 1169 (setq erc-insert-marker (point-max-marker))
1170 (setq erc-input-marker (make-marker)) 1170 (setq erc-input-marker (make-marker))
1171 (erc-display-prompt buffer (point-max)) 1171 (erc-display-prompt buffer (point-max))
1172 (set-process-buffer proc buffer) 1172 (set-process-buffer proc buffer)