diff options
author | Glenn Morris <rgm@gnu.org> | 2009-01-16 03:32:10 +0000 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2009-01-16 03:32:10 +0000 |
commit | 64bd06a8189423d05123bc3a88a3aae24c27114f (patch) | |
tree | 75e46321f9e1557c394e59a21bbb2a3216149d46 /lisp/erc | |
parent | 7d8345daad78d4334e2aa4e5c6e868d6d7e50ade (diff) | |
download | emacs-64bd06a8189423d05123bc3a88a3aae24c27114f.tar.gz |
(erc-input-message): Conditionalize previous change for XEmacs.
Diffstat (limited to 'lisp/erc')
-rw-r--r-- | lisp/erc/ChangeLog | 2 | ||||
-rw-r--r-- | lisp/erc/erc.el | 4 |
2 files changed, 5 insertions, 1 deletions
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 <rgm@gnu.org> + * 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 () |