# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1273278030 14400
# Node ID 8e422499f0ffbe7c65e4cb96a9d4a45f45acb174
# Parent  ee0a08d8887e767da4bdc7737728a93a036ce30b
Misc code tweaks.
* electric.el (Electric-command-loop): Minor tweak.
* ebuff-menu.el (electric-buffer-list): Try and make it behave a bit
better with dedicated windows.

diff -r ee0a08d8887e -r 8e422499f0ff lisp/ChangeLog
--- a/lisp/ChangeLog	Fri May 07 16:33:00 2010 -0400
+++ b/lisp/ChangeLog	Fri May 07 20:20:30 2010 -0400
@@ -1,3 +1,10 @@
+2010-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* electric.el (Electric-command-loop): Minor tweak.
+
+	* ebuff-menu.el (electric-buffer-list): Try and make it behave a bit
+	better with dedicated windows.
+
 2010-05-07  Deniz Dogan <deniz.a.m.dogan@gmail.com>  (tiny change)
             Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff -r ee0a08d8887e -r 8e422499f0ff lisp/ebuff-menu.el
--- a/lisp/ebuff-menu.el	Fri May 07 16:33:00 2010 -0400
+++ b/lisp/ebuff-menu.el	Fri May 07 20:20:30 2010 -0400
@@ -95,7 +95,7 @@
 					     (cons first last))))))
 	(set-buffer buffer)
 	(Buffer-menu-mode)
-	(bury-buffer buffer)
+	(bury-buffer)                ;Get rid of window, if dedicated.
 	(message "")))
     (if select
 	(progn (set-buffer buffer)
diff -r ee0a08d8887e -r 8e422499f0ff lisp/electric.el
--- a/lisp/electric.el	Fri May 07 16:33:00 2010 -0400
+++ b/lisp/electric.el	Fri May 07 20:20:30 2010 -0400
@@ -58,12 +58,10 @@
         (err nil)
         (prompt-string prompt))
     (while t
-      (if (not (or (stringp prompt) (eq prompt nil) (eq prompt 'noprompt)))
+      (if (functionp prompt)
           (setq prompt-string (funcall prompt)))
       (if (not (stringp prompt-string))
-          (if (eq prompt-string 'noprompt)
-              (setq prompt-string nil)
-            (setq prompt-string "->")))
+          (setq prompt-string (unless (eq prompt-string 'noprompt) "->")))
       (setq cmd (read-key-sequence prompt-string))
       (setq last-command-event (aref cmd (1- (length cmd)))
 	    this-command (key-binding cmd t)