comparison lisp/erc/erc.el @ 84387:4ee03308c9b6

Sync ERC 5.3 (devel) from upstream

84386:869c721b5469

;;; History:
;;

;;; Code:

(defconst erc-version-string "Version 5.2"
  "ERC version.  This is used by function `erc-version'.")

(eval-when-compile (require 'cl))
(require 'font-lock)
(require 'pp)

See `erc-server-flood-margin' for other flood-related parameters.")

;; Script parameters

(defcustom erc-startup-file-list
  '("~/.emacs.d/.ercrc.el" "~/.emacs.d/.ercrc"
    "~/.ercrc.el" "~/.ercrc" ".ercrc.el" ".ercrc")
  "List of files to try for a startup script.
The first existent and readable one will get executed.

If the filename ends with `.el' it is presumed to be an Emacs Lisp
script and it gets (load)ed.  Otherwise it is treated as a bunch of

;; activation

(defconst erc-default-server "irc.freenode.net"
  "IRC server to use if it cannot be detected otherwise.")

(defconst erc-default-port "6667"
  "IRC port to use if it cannot be detected otherwise.")

(defcustom erc-join-buffer 'buffer
  "Determines how to display the newly created IRC buffer.
'window - in another window,

		       (sexp :tag "Value"))))

(defcustom erc-frame-dedicated-flag nil
  "*Non-nil means the erc frames are dedicated to that buffer.
This only has effect when `erc-join-buffer' is set to `frame'."
  :group 'erc-buffers
  :type 'boolean)

(defun erc-channel-p (channel)
  "Return non-nil if CHANNEL seems to be an IRC channel name."

	((eq erc-join-buffer 'window-noselect)
	 (display-buffer buffer))
	((eq erc-join-buffer 'bury)
	 nil)
	((eq erc-join-buffer 'frame)
	 (funcall '(lambda (frame)
		     (raise-frame frame)
		     (select-frame frame))
		  (make-frame (or erc-frame-alist
				  default-frame-alist)))
	 (switch-to-buffer buffer)
	 (when erc-frame-dedicated-flag
	   (set-window-dedicated-p (selected-window) t)))
	(t
	 (if (active-minibuffer-window)
	     (display-buffer buffer)
	   (switch-to-buffer buffer)))))

(defun erc-open-ssl-stream (name buffer host port)
  "Open an SSL stream to an IRC server.
The process will be given the name NAME, its target buffer will be
BUFFER.  HOST and PORT specify the connection target."
  (when (require 'tls)
    (let ((proc (open-tls-stream name buffer host port)))
      ;; Ugly hack, but it works for now. Problem is it is
      ;; very hard to detect when ssl is established, because s_client
      ;; doesn't give any CONNECTIONESTABLISHED kind of message, and
      ;; most IRC servers send nothing and wait for you to identify.
      ;; Disabled when switching to tls.el -- jas
      ;(sit-for 5)
      proc)))

;;; Debugging the protocol

(defvar erc-debug-irc-protocol nil
  "If non-nil, log all IRC protocol traffic to the buffer \"*erc-protocol*\".

  (let ((arglist (format "%S" (erc-function-arglist fun))))
    (if (string-match "^(\\(.*\\))$" arglist)
	(match-string 1 arglist)
      arglist)))

(defun erc-command-name (cmd)
  "For CMD being the function name of a ERC command, something like
erc-cmd-FOO, this returns a string /FOO."
  (let ((command-name (symbol-name cmd)))
    (if (string-match "^erc-cmd-\\(.*\\)$" command-name)

     (current-buffer)) t)
   (t nil)))
(defalias 'erc-cmd-VAR 'erc-cmd-SET)
(defalias 'erc-cmd-VARIABLE 'erc-cmd-SET)
(put 'erc-cmd-SET 'do-not-parse-args t)

(defun erc-cmd-default (line)
  "Fallback command.

Commands for which no erc-cmd-xxx exists, are tunnelled through

(defun erc-cmd-CLEAR ()
  "Clear the window content."
  (recenter 0)
  t)

(defun erc-cmd-OPS ()
  "Show the ops in the current channel."
  (interactive)
  (let ((ops nil))

	(erc-display-message
	 nil 'notice 'active 'country ?c co ?d tld)
      (erc-display-message
       nil 'notice 'active 'country-unknown ?d tld))
  t))

(defun erc-cmd-AWAY (line)
  "Mark the user as being away, the reason being indicated by LINE.
If no reason is given, unset away status."
  (when (string-match "^\\s-*\\(.*\\)$" line)

    (apropos "erc-cmd-")
    (message "Type C-h m to get additional information about keybindings.")
    t))

(defalias 'erc-cmd-H 'erc-cmd-HELP)

(defun erc-cmd-JOIN (channel &optional key)
  "Join the channel given in CHANNEL, optionally with KEY.
If CHANNEL is specified as \"-invite\", join the channel to which you
were most recently invited.  See also `invitation'."

If LINE contains upper case characters (excluding those preceded by `\'),
the matching is case-sensitive."
  (occur line)
  t)
(put 'erc-cmd-LASTLOG 'do-not-parse-args t)

(defun erc-send-message (line &optional force)
  "Send LINE to the current channel or user and display it.

See also `erc-message' and `erc-display-line'."

(defalias 'erc-cmd-BYE 'erc-cmd-QUIT)
(defalias 'erc-cmd-EXIT 'erc-cmd-QUIT)
(defalias 'erc-cmd-SIGNOFF 'erc-cmd-QUIT)
(put 'erc-cmd-QUIT 'do-not-parse-args t)

(defun erc-cmd-GQUIT (reason)
  "Disconnect from all servers at once with the same quit REASON."
  (erc-with-all-buffers-of-server nil #'erc-open-server-buffer-p
				  (erc-cmd-QUIT reason)))

(defalias 'erc-cmd-GQ 'erc-cmd-GQUIT)
(put 'erc-cmd-GQUIT 'do-not-parse-args t)

(defun erc-cmd-RECONNECT ()
  "Try to reconnect to the current IRC server."
  (let ((buffer (or (erc-server-buffer) (current-buffer)))
	(process nil))
    (with-current-buffer (if (bufferp buffer) buffer (current-buffer))
      (setq erc-server-quitting nil)
      (setq erc-server-reconnecting t)
      (setq erc-server-reconnect-count 0)
      (setq process (get-buffer-process (erc-server-buffer)))
      (if process
	  (delete-process process)
	(erc-server-reconnect))
      (setq erc-server-reconnecting nil)))
  t)

(defun erc-cmd-SERVER (server)
  "Connect to SERVER, leaving existing connection intact."
  (erc-log (format "cmd: SERVER: %s" server))
  (condition-case nil
      (erc :server server :nick (erc-current-nick))
    (error
     (message "Cannot find host %s." server)
     (beep)))
  t)

(eval-when-compile
  (defvar motif-version-string)
  (defvar gtk-version-string))

	     (if (null (gethash nick erc-channel-new-member-names))
		 (erc-remove-channel-user nick)))
	   erc-channel-users)
  (setq erc-channel-new-member-names nil))

(defun erc-channel-receive-names (names-string)
  "This function is for internal use only.

Update `erc-channel-users' according to NAMES-STRING.
NAMES-STRING is a string listing some of the names on the
channel."
  (let (names name op voice)
      ;; We need to delete "" because in XEmacs, (split-string "a ")
      ;; returns ("a" "").
      (setq names (delete "" (split-string names-string)))
      (let ((erc-channel-members-changed-hook nil))
	(dolist (item names)
	  (cond ((string-match "^@\\(.*\\)$" item)
		 (setq name (match-string 1 item)
		       op 'on
		       voice 'off))
		((string-match "^+\\(.*\\)$" item)
		 (setq name (match-string 1 item)
		       op 'off
		       voice 'on))
		(t (setq name item
			 op 'off
			 voice 'off)))
	(puthash (erc-downcase name) t
		 erc-channel-new-member-names)
	(erc-update-current-channel-member
	 name name t op voice)))
    (run-hooks 'erc-channel-members-changed-hook)))

(defcustom erc-channel-members-changed-hook nil
  "*This hook is called every time the variable `channel-members' changes.
The buffer where the change happened is current while this hook is called."

	  (when (and op
		     (not (eq (erc-channel-user-op cuser) op)))
	      (setq changed t)
	    (setf (erc-channel-user-op cuser)
		  (cond ((eq op 'on) t)
				   ((eq op 'off) nil)
				   (t op))))
	  (when (and voice
		     (not (eq (erc-channel-user-voice cuser) voice)))
	      (setq changed t)
	    (setf (erc-channel-user-voice cuser)
		  (cond ((eq voice 'on) t)
				      ((eq voice 'off) nil)
				      (t voice))))
	  (when update-message-time
	    (setf (erc-channel-user-last-message-time cuser) (current-time)))
	  (setq user-changed
		(erc-update-user user new-nick
				 host login full-name info)))

	  (setf (erc-server-user-buffers user)
		(cons (current-buffer)
		      (erc-server-user-buffers user))))
	(setq cuser (make-erc-channel-user
		     :op (cond ((eq op 'on) t)
				       ((eq op 'off) nil)
				       (t op))
		     :voice (cond ((eq voice 'on) t)
				       ((eq voice 'off) nil)
				       (t voice))
		     :last-message-time
		     (if update-message-time (current-time))))
	(puthash (erc-downcase nick) (cons user cuser)
		 erc-channel-users)
	(setq changed t)))

(defun erc-send-current-line ()
  "Parse current line and send it to IRC."
  (interactive)
  (save-restriction
    (widen)
    (cond
     ((< (point) (erc-beg-of-input-line))
      (message "Point is not in the input area")
      (beep))
     ((not (erc-server-buffer-live-p))
      (message "ERC: No process running")
      (beep))
     (t
      (erc-set-active-buffer (current-buffer))
      (let ((inhibit-read-only t)
	    (str (erc-user-input))
	    (old-buf (current-buffer)))

	;; Kill the input and the prompt
	(delete-region (erc-beg-of-input-line)
		       (erc-end-of-input-line))

	(unwind-protect
	    (erc-send-input str)
	  ;; Fix the buffer if the command didn't kill it
	  (when (buffer-live-p old-buf)
	    (with-current-buffer old-buf
	      (save-restriction
		(widen)
		(goto-char (point-max))
		(set-marker (process-mark erc-server-process) (point))
		(set-marker erc-insert-marker (point))
		(let ((buffer-modified (buffer-modified-p)))
		  (erc-display-prompt)
		  (set-buffer-modified-p buffer-modified))))))

	;; Only when last hook has been run...
	(run-hook-with-args 'erc-send-completed-hook str))))))

(defun erc-user-input ()
  "Return the input of the user in the current buffer."
  (buffer-substring
   erc-input-marker

      (let ((beg (point)))
	(insert line)
	(erc-put-text-property beg (point)
			       'face 'erc-command-indicator-face)
	(insert "\n"))
      (set-marker (process-mark erc-server-process) (point))
      (set-marker erc-insert-marker (point))
      (save-excursion
	(save-restriction
	  (narrow-to-region insert-position (point))
	  (run-hooks 'erc-send-modify-hook)

      (let ((beg (point)))
	(insert line)
	(erc-put-text-property beg (point)
			       'face 'erc-input-face))
      (insert "\n")
      (set-marker (process-mark erc-server-process) (point))
      (set-marker erc-insert-marker (point))
      (save-excursion
	(save-restriction
	  (narrow-to-region insert-position (point))
	  (run-hooks 'erc-send-modify-hook)

84387:4ee03308c9b6

;;; History:
;;

;;; Code:

(defconst erc-version-string "Version 5.3 (devel)"
  "ERC version.  This is used by function `erc-version'.")

(eval-when-compile (require 'cl))
(require 'font-lock)
(require 'pp)

See `erc-server-flood-margin' for other flood-related parameters.")

;; Script parameters

(defcustom erc-startup-file-list
  (list (concat erc-user-emacs-directory ".ercrc.el")
	(concat erc-user-emacs-directory ".ercrc")
	"~/.ercrc.el" "~/.ercrc" ".ercrc.el" ".ercrc")
  "List of files to try for a startup script.
The first existent and readable one will get executed.

If the filename ends with `.el' it is presumed to be an Emacs Lisp
script and it gets (load)ed.  Otherwise it is treated as a bunch of

;; activation

(defconst erc-default-server "irc.freenode.net"
  "IRC server to use if it cannot be detected otherwise.")

(defconst erc-default-port 6667
  "IRC port to use if it cannot be detected otherwise.")

(defcustom erc-join-buffer 'buffer
  "Determines how to display the newly created IRC buffer.
'window - in another window,

		       (sexp :tag "Value"))))

(defcustom erc-frame-dedicated-flag nil
  "*Non-nil means the erc frames are dedicated to that buffer.
This only has effect when `erc-join-buffer' is set to `frame'."
  :group 'erc-buffers
  :type 'boolean)

(defcustom erc-reuse-frames t
  "*Determines whether new frames are always created.
Non-nil means that a new frame is not created to display an ERC
buffer if there is already a window displaying it.  This only has
effect when `erc-join-buffer' is set to `frame'."
  :group 'erc-buffers
  :type 'boolean)

(defun erc-channel-p (channel)
  "Return non-nil if CHANNEL seems to be an IRC channel name."

	((eq erc-join-buffer 'window-noselect)
	 (display-buffer buffer))
	((eq erc-join-buffer 'bury)
	 nil)
	((eq erc-join-buffer 'frame)
	 (when (or (not erc-reuse-frames)
		   (not (get-buffer-window buffer t)))
	   ((lambda (frame)
		     (raise-frame frame)
		     (select-frame frame))
		  (make-frame (or erc-frame-alist
				  default-frame-alist)))
	 (switch-to-buffer buffer)
	 (when erc-frame-dedicated-flag
	   (set-window-dedicated-p (selected-window) t))))
	(t
	 (if (active-minibuffer-window)
	     (display-buffer buffer)
	   (switch-to-buffer buffer)))))

(defun erc-open-ssl-stream (name buffer host port)
  "Open an SSL stream to an IRC server.
The process will be given the name NAME, its target buffer will be
BUFFER.  HOST and PORT specify the connection target."
  (when (condition-case nil
	    (require 'ssl)
	  (error (message "You don't have ssl.el.  %s"
			  "Try using `erc-tls' instead.")
		 nil))
    (let ((proc (open-ssl-stream name buffer host port)))
      ;; Ugly hack, but it works for now. Problem is it is
      ;; very hard to detect when ssl is established, because s_client
      ;; doesn't give any CONNECTIONESTABLISHED kind of message, and
      ;; most IRC servers send nothing and wait for you to identify.
      (sit-for 5)
      proc)))

(defun erc-tls (&rest r)
  "Interactively select TLS connection parameters and run ERC.
Arguments are the same as for `erc'."
  (interactive (erc-select-read-args))
  (let ((erc-server-connect-function 'erc-open-tls-stream))
    (apply 'erc r)))

(defun erc-open-tls-stream (name buffer host port)
  "Open an TLS stream to an IRC server.
The process will be given the name NAME, its target buffer will be
BUFFER.  HOST and PORT specify the connection target."
  (when (condition-case nil
	    (require 'tls)
	  (error (message "You don't have tls.el.  %s"
			  "Try using `erc-ssl' instead.")
		 nil))
    (open-tls-stream name buffer host port)))

;;; Displaying error messages

(defun erc-error (&rest args)
  "Pass ARGS to `format', and display the result as an error message.
If `debug-on-error' is set to non-nil, then throw a real error with this
message instead, to make debugging easier."
  (if debug-on-error
      (apply #'error args)
    (apply #'message args)
    (beep)))

;;; Debugging the protocol

(defvar erc-debug-irc-protocol nil
  "If non-nil, log all IRC protocol traffic to the buffer \"*erc-protocol*\".

  (let ((arglist (format "%S" (erc-function-arglist fun))))
    (if (string-match "^(\\(.*\\))$" arglist)
	(match-string 1 arglist)
      arglist)))

(defun erc-command-no-process-p (str)
  "Return non-nil if STR is an ERC command that can be run when the process
is not alive, nil otherwise."
  (let ((fun (erc-extract-command-from-line str)))
    (and fun
	 (symbolp (car fun))
	 (get (car fun) 'process-not-needed))))

(defun erc-command-name (cmd)
  "For CMD being the function name of a ERC command, something like
erc-cmd-FOO, this returns a string /FOO."
  (let ((command-name (symbol-name cmd)))
    (if (string-match "^erc-cmd-\\(.*\\)$" command-name)

     (current-buffer)) t)
   (t nil)))
(defalias 'erc-cmd-VAR 'erc-cmd-SET)
(defalias 'erc-cmd-VARIABLE 'erc-cmd-SET)
(put 'erc-cmd-SET 'do-not-parse-args t)
(put 'erc-cmd-SET 'process-not-needed t)

(defun erc-cmd-default (line)
  "Fallback command.

Commands for which no erc-cmd-xxx exists, are tunnelled through

(defun erc-cmd-CLEAR ()
  "Clear the window content."
  (recenter 0)
  t)
(put 'erc-cmd-CLEAR 'process-not-needed t)

(defun erc-cmd-OPS ()
  "Show the ops in the current channel."
  (interactive)
  (let ((ops nil))

	(erc-display-message
	 nil 'notice 'active 'country ?c co ?d tld)
      (erc-display-message
       nil 'notice 'active 'country-unknown ?d tld))
  t))
(put 'erc-cmd-COUNTRY 'process-not-needed t)

(defun erc-cmd-AWAY (line)
  "Mark the user as being away, the reason being indicated by LINE.
If no reason is given, unset away status."
  (when (string-match "^\\s-*\\(.*\\)$" line)

    (apropos "erc-cmd-")
    (message "Type C-h m to get additional information about keybindings.")
    t))

(defalias 'erc-cmd-H 'erc-cmd-HELP)
(put 'erc-cmd-HELP 'process-not-needed t)

(defun erc-cmd-JOIN (channel &optional key)
  "Join the channel given in CHANNEL, optionally with KEY.
If CHANNEL is specified as \"-invite\", join the channel to which you
were most recently invited.  See also `invitation'."

If LINE contains upper case characters (excluding those preceded by `\'),
the matching is case-sensitive."
  (occur line)
  t)
(put 'erc-cmd-LASTLOG 'do-not-parse-args t)
(put 'erc-cmd-LASTLOG 'process-not-needed t)

(defun erc-send-message (line &optional force)
  "Send LINE to the current channel or user and display it.

See also `erc-message' and `erc-display-line'."

(defalias 'erc-cmd-BYE 'erc-cmd-QUIT)
(defalias 'erc-cmd-EXIT 'erc-cmd-QUIT)
(defalias 'erc-cmd-SIGNOFF 'erc-cmd-QUIT)
(put 'erc-cmd-QUIT 'do-not-parse-args t)
(put 'erc-cmd-QUIT 'process-not-needed t)

(defun erc-cmd-GQUIT (reason)
  "Disconnect from all servers at once with the same quit REASON."
  (erc-with-all-buffers-of-server nil #'erc-open-server-buffer-p
				  (erc-cmd-QUIT reason))
  (when erc-kill-queries-on-quit
    ;; if the query buffers have not been killed within 4 seconds,
    ;; kill them
    (run-at-time
     4 nil
     (lambda ()
       (dolist (buffer (erc-buffer-list (lambda (buf)
					  (not (erc-server-buffer-p buf)))))
	 (kill-buffer buffer)))))
  t)

(defalias 'erc-cmd-GQ 'erc-cmd-GQUIT)
(put 'erc-cmd-GQUIT 'do-not-parse-args t)
(put 'erc-cmd-GQUIT 'process-not-needed t)

(defun erc-cmd-RECONNECT ()
  "Try to reconnect to the current IRC server."
  (let ((buffer (erc-server-buffer))
	(process nil))
    (unless (buffer-live-p buffer)
      (setq buffer (current-buffer)))
    (with-current-buffer buffer
      (setq erc-server-quitting nil)
      (setq erc-server-reconnecting t)
      (setq erc-server-reconnect-count 0)
      (setq process (get-buffer-process (erc-server-buffer)))
      (if process
	  (delete-process process)
	(erc-server-reconnect))
      (setq erc-server-reconnecting nil)))
  t)
(put 'erc-cmd-RECONNECT 'process-not-needed t)

(defun erc-cmd-SERVER (server)
  "Connect to SERVER, leaving existing connection intact."
  (erc-log (format "cmd: SERVER: %s" server))
  (condition-case nil
      (erc :server server :nick (erc-current-nick))
    (error
     (erc-error "Cannot find host %s." server)))
  t)
(put 'erc-cmd-SERVER 'process-not-needed t)

(eval-when-compile
  (defvar motif-version-string)
  (defvar gtk-version-string))

	     (if (null (gethash nick erc-channel-new-member-names))
		 (erc-remove-channel-user nick)))
	   erc-channel-users)
  (setq erc-channel-new-member-names nil))

(defun erc-parse-prefix ()
  "Return an alist of valid prefix character types and their representations.
Example: (operator) o => @, (voiced) v => +."
  (let ((str (or (cdr (assoc "PREFIX" (erc-with-server-buffer
					erc-server-parameters)))
		 ;; provide a sane default
		 "(ov)@+"))
	types chars)
    (when (string-match "^(\\([^)]+\\))\\(.+\\)$" str)
      (setq types (match-string 1 str)
	    chars (match-string 2 str))
      (let ((len (min (length types) (length chars)))
	    (i 0)
	    (alist nil))
	(while (< i len)
	  (setq alist (cons (cons (elt types i) (elt chars i))
			    alist))
	  (setq i (1+ i)))
	alist))))

(defun erc-channel-receive-names (names-string)
  "This function is for internal use only.

Update `erc-channel-users' according to NAMES-STRING.
NAMES-STRING is a string listing some of the names on the
channel."
  (let (prefix op-ch voice-ch names name op voice)
    (setq prefix (erc-parse-prefix))
    (setq op-ch (cdr (assq ?o prefix))
	  voice-ch (cdr (assq ?v prefix)))
    ;; We need to delete "" because in XEmacs, (split-string "a ")
    ;; returns ("a" "").
    (setq names (delete "" (split-string names-string)))
    (let ((erc-channel-members-changed-hook nil))
      (dolist (item names)
	(let ((updatep t)
	      ch)
	  (if (rassq (elt item 0) prefix)
	      (cond ((= (length item) 1)
		     (setq updatep nil))
		    ((eq (elt item 0) op-ch)
		     (setq name (substring item 1)
			   op 'on
			   voice 'off))
		    ((eq (elt item 0) voice-ch)
		     (setq name (substring item 1)
			   op 'off
			   voice 'on))
		    (t (setq name (substring item 1)
			     op 'off
			     voice 'off)))
	    (setq name item
		  op 'off
		  voice 'off))
	  (when updatep
	    (puthash (erc-downcase name) t
		     erc-channel-new-member-names)
	    (erc-update-current-channel-member
	     name name t op voice)))))
    (run-hooks 'erc-channel-members-changed-hook)))

(defcustom erc-channel-members-changed-hook nil
  "*This hook is called every time the variable `channel-members' changes.
The buffer where the change happened is current while this hook is called."

	  (when (and op
		     (not (eq (erc-channel-user-op cuser) op)))
	      (setq changed t)
	    (setf (erc-channel-user-op cuser)
		  (cond ((eq op 'on) t)
			((eq op 'off) nil)
			(t op))))
	  (when (and voice
		     (not (eq (erc-channel-user-voice cuser) voice)))
	      (setq changed t)
	    (setf (erc-channel-user-voice cuser)
		  (cond ((eq voice 'on) t)
			((eq voice 'off) nil)
			(t voice))))
	  (when update-message-time
	    (setf (erc-channel-user-last-message-time cuser) (current-time)))
	  (setq user-changed
		(erc-update-user user new-nick
				 host login full-name info)))

	  (setf (erc-server-user-buffers user)
		(cons (current-buffer)
		      (erc-server-user-buffers user))))
	(setq cuser (make-erc-channel-user
		     :op (cond ((eq op 'on) t)
			       ((eq op 'off) nil)
			       (t op))
		     :voice (cond ((eq voice 'on) t)
				  ((eq voice 'off) nil)
				  (t voice))
		     :last-message-time
		     (if update-message-time (current-time))))
	(puthash (erc-downcase nick) (cons user cuser)
		 erc-channel-users)
	(setq changed t)))

(defun erc-send-current-line ()
  "Parse current line and send it to IRC."
  (interactive)
  (save-restriction
    (widen)
    (if (< (point) (erc-beg-of-input-line))
	(erc-error "Point is not in the input area")
      (let ((inhibit-read-only t)
	    (str (erc-user-input))
	    (old-buf (current-buffer)))
	(if (and (not (erc-server-buffer-live-p))
		 (not (erc-command-no-process-p str)))
	    (erc-error "ERC: No process running")
	  (erc-set-active-buffer (current-buffer))

	  ;; Kill the input and the prompt
	  (delete-region (erc-beg-of-input-line)
			 (erc-end-of-input-line))

	  (unwind-protect
	      (erc-send-input str)
	    ;; Fix the buffer if the command didn't kill it
	    (when (buffer-live-p old-buf)
	      (with-current-buffer old-buf
		(save-restriction
		  (widen)
		  (goto-char (point-max))
		  (when (processp erc-server-process)
		    (set-marker (process-mark erc-server-process) (point)))
		  (set-marker erc-insert-marker (point))
		  (let ((buffer-modified (buffer-modified-p)))
		    (erc-display-prompt)
		    (set-buffer-modified-p buffer-modified))))))

	  ;; Only when last hook has been run...
	  (run-hook-with-args 'erc-send-completed-hook str))))))

(defun erc-user-input ()
  "Return the input of the user in the current buffer."
  (buffer-substring
   erc-input-marker

      (let ((beg (point)))
	(insert line)
	(erc-put-text-property beg (point)
			       'face 'erc-command-indicator-face)
	(insert "\n"))
      (when (processp erc-server-process)
	(set-marker (process-mark erc-server-process) (point)))
      (set-marker erc-insert-marker (point))
      (save-excursion
	(save-restriction
	  (narrow-to-region insert-position (point))
	  (run-hooks 'erc-send-modify-hook)

      (let ((beg (point)))
	(insert line)
	(erc-put-text-property beg (point)
			       'face 'erc-input-face))
      (insert "\n")
      (when (processp erc-server-process)
	(set-marker (process-mark erc-server-process) (point)))
      (set-marker erc-insert-marker (point))
      (save-excursion
	(save-restriction
	  (narrow-to-region insert-position (point))
	  (run-hooks 'erc-send-modify-hook)