From: Glenn Morris Date: Fri, 16 Jan 2009 03:32:10 +0000 (+0000) Subject: (erc-input-message): Conditionalize previous change for XEmacs. X-Git-Tag: emacs-pretest-23.0.90~418 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=64bd06a8189423d05123bc3a88a3aae24c27114f;p=emacs.git (erc-input-message): Conditionalize previous change for XEmacs. --- diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index d56947d5e71..f7bb78cb245 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,5 +1,7 @@ 2009-01-16 Glenn Morris + * erc.el (erc-input-message): Conditionalize previous change for XEmacs. + * erc-dcc.el (erc-dcc-server): Silence warning about obsolete function behind fboundp test. diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 756ecef14fd..8a1a8671d69 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -3708,7 +3708,9 @@ If FACE is non-nil, it will be used to propertize the prompt. If it is nil, (let ((minibuffer-allow-text-properties t) (read-map minibuffer-local-map)) (insert (read-from-minibuffer "Message: " - (string last-command-event) read-map)) + (string (if (featurep 'xemacs) + last-command-char + last-command-event)) read-map)) (erc-send-current-line))) (defvar erc-action-history-list ()