Revision: emacs@sv.gnu.org/emacs--devo--0--patch-102

Creator:  Michael Olson <mwolson@gnu.org>

Merge from erc--emacs--0

diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index ada1d02785dcceeb59f0415d7849ce2632bfd32f..67345efe0907af369d0e045bf6f89f3ed00ffd46 100644 (file)
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -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.
 

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index ec2098c7bd370e5057059c59d119956408956ca4..92f8c40133627c1f073648c40c8d5cdbb403b0fe 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -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)
 

diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 6c6998a3afc388d1f037b7b620def27293dbc706..2ec625cc87f8deccdeb781c759e58bcb5b9deaa5 100644 (file)
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -216,6 +216,7 @@ PAR is a number of a regexp grouping whose text will be passed to
         (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 @@ call it with the value of the `erc-data' text property."
         (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)))

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index e1dc240901b1217dc01ee37d7c13a9243d0cc5b0..63ff60d762e380726231cf087383f766b1412923 100644 (file)
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -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))

diff --git a/man/erc.texi b/man/erc.texi
index fb9c60d635dadccc1573214cf3542dfe708a9ae7..4713afa2fbc8216d573d7acfbe8a82b1cca3055b 100644 (file)
--- a/man/erc.texi
+++ b/man/erc.texi
@@ -12,7 +12,7 @@
 @syncodeindex fn cp
 
 @copying
-This manual is for ERC version 5.1.1.
+This manual is for ERC version 5.1.2.
 
 Copyright @copyright{} 2005, 2006 Free Software Foundation, Inc.