Mercurial > emacs
changeset 69034:65a6ac37752b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-102
Creator: Michael Olson <mwolson@gnu.org>
Merge from erc--emacs--0
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 20 Feb 2006 09:40:28 +0000 |
| parents | 95e4c1cc8c30 |
| children | 069e0539c37d |
| files | etc/ERC-NEWS lisp/erc/ChangeLog lisp/erc/erc-button.el lisp/erc/erc.el man/erc.texi |
| diffstat | 5 files changed, 39 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/ERC-NEWS Mon Feb 20 03:53:56 2006 +0000 +++ b/etc/ERC-NEWS Mon Feb 20 09:40:28 2006 +0000 @@ -1,6 +1,8 @@ ERC NEWS -*- outline -*- -* Changes in ERC 5.1.2 (unreleased) +* Changes in ERC 5.2 (unreleased) + +* Changes in ERC 5.1.2 ** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
--- a/lisp/erc/ChangeLog Mon Feb 20 03:53:56 2006 +0000 +++ b/lisp/erc/ChangeLog Mon Feb 20 09:40:28 2006 +0000 @@ -1,5 +1,21 @@ +2006-02-19 Michael Olson <mwolson@gnu.org> + + * erc-capab.el (erc-capab-send-identify-messages): Make sure some + parameters are strings before using them. Thanks to Alejandro + Benitez for the report. + + * erc.el (erc-version-string): Release ERC 5.1.2. + +2006-02-19 Diane Murray <disumu@x3y2z1.net> + + * erc-button.el (erc-button-keymap): Bind `erc-button-previous' to + <C-tab>. + (erc-button-previous): New function. + 2006-02-15 Michael Olson <mwolson@gnu.org> + * NEWS: Add category for ERC 5.2. + * erc.el (erc): Move to the end of the buffer when a continued session is detected. Thanks to e1f and indio for the report and testing a potential fix. @@ -150,7 +166,7 @@ * erc-stamp.el: Use new arch tagline, since the other one wasn't being treated properly. - * erc.el (erc-version-string): Release ERC 5.1.1 + * erc.el (erc-version-string): Release ERC 5.1.1. 2006-02-03 Zhang Wei <id.brep@gmail.com> (tiny change)
--- a/lisp/erc/erc-button.el Mon Feb 20 03:53:56 2006 +0000 +++ b/lisp/erc/erc-button.el Mon Feb 20 09:40:28 2006 +0000 @@ -216,6 +216,7 @@ (define-key map (kbd "<button2>") 'erc-button-click-button) (define-key map (kbd "<mouse-2>") 'erc-button-click-button)) (define-key map (kbd "TAB") 'erc-button-next) + (define-key map (kbd "<C-tab>") 'erc-button-previous) (set-keymap-parent map erc-mode-map) map) "Local keymap for ERC buttons.") @@ -427,6 +428,22 @@ (error "No next button")) t))) +(defun erc-button-previous () + "Go to the previous button in this buffer." + (interactive) + (let ((here (point))) + (when (< here (erc-beg-of-input-line)) + (while (and (get-text-property here 'erc-callback) + (not (= here (point-min)))) + (setq here (1- here))) + (while (and (not (get-text-property here 'erc-callback)) + (not (= here (point-min)))) + (setq here (1- here))) + (if (> here (point-min)) + (goto-char here) + (error "No previous button")) + t))) + (defun erc-browse-emacswiki (thing) "Browse to thing in the emacs-wiki." (browse-url (concat erc-emacswiki-url thing)))
--- a/lisp/erc/erc.el Mon Feb 20 03:53:56 2006 +0000 +++ b/lisp/erc/erc.el Mon Feb 20 09:40:28 2006 +0000 @@ -66,7 +66,7 @@ ;;; Code: -(defconst erc-version-string "Version 5.1.1" +(defconst erc-version-string "Version 5.1.2" "ERC version. This is used by function `erc-version'.") (eval-when-compile (require 'cl))