aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/erc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/ChangeLog4
-rw-r--r--lisp/erc/erc-dcc.el1
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index bbe551c735d..cc7624dee03 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
12013-02-09 Eli Zaretskii <eliz@gnu.org>
2
3 * erc-dcc.el (erc-dcc-get-file): Don't reference buffer-file-type.
4
12013-01-11 Dmitry Antipov <dmantipov@yandex.ru> 52013-01-11 Dmitry Antipov <dmantipov@yandex.ru>
2 6
3 * erc-dcc.el (erc-dcc-send-file): Use point-min-marker. 7 * erc-dcc.el (erc-dcc-send-file): Use point-min-marker.
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index c27bb629f9d..acb8febea80 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -942,7 +942,6 @@ filter and a process sentinel, and making the connection."
942 (set-buffer-multibyte nil)) 942 (set-buffer-multibyte nil))
943 943
944 (setq mode-line-process '(":%s") 944 (setq mode-line-process '(":%s")
945 buffer-file-type t
946 buffer-read-only t) 945 buffer-read-only t)
947 (setq erc-dcc-file-name file) 946 (setq erc-dcc-file-name file)
948 947