HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace "Maintainer: FSF" with the emacs-devel mailing address
[bpt/emacs.git]
/
lisp
/
erc
/
erc-dcc.el
diff --git
a/lisp/erc/erc-dcc.el
b/lisp/erc/erc-dcc.el
index
e31416f
..
f9f0060
100644
(file)
--- a/
lisp/erc/erc-dcc.el
+++ b/
lisp/erc/erc-dcc.el
@@
-1,12
+1,12
@@
;;; erc-dcc.el --- CTCP DCC module for ERC
;;; erc-dcc.el --- CTCP DCC module for ERC
-;; Copyright (C) 1993-1995, 1998, 2002-2004, 2006-201
2
-;;
Free Software
Foundation, Inc.
+;; Copyright (C) 1993-1995, 1998, 2002-2004, 2006-201
4 Free Software
+;; Foundation, Inc.
;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu>
;; Noah Friedman <friedman@prep.ai.mit.edu>
;; Per Persson <pp@sno.pp.se>
;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu>
;; Noah Friedman <friedman@prep.ai.mit.edu>
;; Per Persson <pp@sno.pp.se>
-;; Maintainer:
FSF
+;; Maintainer:
emacs-devel@gnu.org
;; Keywords: comm, processes
;; Created: 1994-01-23
;; Keywords: comm, processes
;; Created: 1994-01-23
@@
-897,7
+897,7
@@
other client."
(let* ((buffer (erc-dcc-find-file file))
(size (buffer-size buffer))
(start (with-current-buffer buffer
(let* ((buffer (erc-dcc-find-file file))
(size (buffer-size buffer))
(start (with-current-buffer buffer
- (
set-marker (make-marker) (point-min)
)))
+ (
point-min-marker
)))
(sproc (erc-dcc-server "dcc-send"
'erc-dcc-send-filter
'erc-dcc-send-sentinel))
(sproc (erc-dcc-server "dcc-send"
'erc-dcc-send-filter
'erc-dcc-send-sentinel))
@@
-942,7
+942,6
@@
filter and a process sentinel, and making the connection."
(set-buffer-multibyte nil))
(setq mode-line-process '(":%s")
(set-buffer-multibyte nil))
(setq mode-line-process '(":%s")
- buffer-file-type t
buffer-read-only t)
(setq erc-dcc-file-name file)
buffer-read-only t)
(setq erc-dcc-file-name file)
@@
-1166,7
+1165,7
@@
other client."
(setq erc-dcc-from nick)
(setq erc-dcc-entry-data entry)
(setq erc-dcc-unprocessed-output "")
(setq erc-dcc-from nick)
(setq erc-dcc-entry-data entry)
(setq erc-dcc-unprocessed-output "")
- (setq erc-insert-marker (
set-marker (make-marker) (point-max)
))
+ (setq erc-insert-marker (
point-max-marker
))
(setq erc-input-marker (make-marker))
(erc-display-prompt buffer (point-max))
(set-process-buffer proc buffer)
(setq erc-input-marker (make-marker))
(erc-display-prompt buffer (point-max))
(set-process-buffer proc buffer)