[Erc-commit] [commit][emacs22] Fix a couple of small bugs.

[mwolson]

commit f14d999a20de4f4ec6235659cea7562f441fa169
Author: Michael Olson <address@hidden>
Date:   Mon Sep 11 01:09:29 2006 +0000

    Fix a couple of small bugs.
    
    2006-09-10  Michael Olson  <address@hidden>
    
        * erc.el (erc-generate-new-buffer-name): If this is a server
        buffer and a process exists already, create a new buffer.
        (erc-open): If the IRC session was continued, restore the old
        point.  Thanks to Stephan Stahl for the report.
    
        * erc-autoaway.el (erc-autoaway-possibly-set-away): Check to see
        whether we are already away.
    
        * erc-menu.el: Fix potential compiler warning.
    git-archimport-id: address@hidden/erc--main--0--patch-50

diff --git a/ChangeLog b/ChangeLog
index c9f7924..2f878e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-09-10  Michael Olson  <address@hidden>
+
+       * erc.el (erc-generate-new-buffer-name): If this is a server
+       buffer and a process exists already, create a new buffer.
+       (erc-open): If the IRC session was continued, restore the old
+       point.  Thanks to Stephan Stahl for the report.
+
+       * erc-autoaway.el (erc-autoaway-possibly-set-away): Check to see
+       whether we are already away.
+
+       * erc-menu.el: Fix potential compiler warning.
+
 2006-09-07  Diane Murray  <address@hidden>
 
        * erc.el: Updated Commentary and URL.
diff --git a/erc-autoaway.el b/erc-autoaway.el
index 983f4e4..71d219d 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -246,6 +246,7 @@ exceeds `erc-autoaway-idle-seconds'."
   ;; this function is called from `erc-timer-hook', which is called
   ;; whenever the server sends something to the client.
   (when (and erc-auto-set-away
+            (not erc-autoaway-caused-away)
             (erc-autoaway-some-open-server-buffer))
     (let ((idle-time (erc-time-diff erc-autoaway-last-sent-time
                                    current-time)))
diff --git a/erc-menu.el b/erc-menu.el
index 2556edf..a2dc7a1 100644
--- a/erc-menu.el
+++ b/erc-menu.el
@@ -28,6 +28,7 @@
 
 ;;; Code:
 
+;(require 'erc)
 (require 'easymenu)
 
 (defvar erc-menu-definition
diff --git a/erc.el b/erc.el
index 0cc6561..ff0a128 100644
--- a/erc.el
+++ b/erc.el
@@ -1550,7 +1550,7 @@ symbol, it may have these values:
             (or target
                 (with-current-buffer (get-buffer buf-name)
                   (and (erc-server-buffer-p)
-                       (not erc-server-connected))))
+                       (not (erc-server-process-alive)))))
             (with-current-buffer (get-buffer buf-name)
               (and (string= erc-session-server server)
                    (erc-port-equal erc-session-port port))))
@@ -1906,6 +1906,7 @@ Returns the buffer for the given server or channel."
        (connected-p (unless connect erc-server-connected))
        (buffer (erc-get-buffer-create server port channel))
        (old-buffer (current-buffer))
+       (old-point (point))
        continued-session)
     (erc-update-modules)
     (set-buffer buffer)
@@ -1971,7 +1972,7 @@ Returns the buffer for the given server or channel."
       (goto-char (point-max))
       (insert "\n"))
     (if continued-session
-       (goto-char (point-max))
+       (goto-char old-point)
       (set-marker erc-insert-marker (point))
       (erc-display-prompt)
       (goto-char (point-max)))