[Emacs-diffs] /srv/bzr/emacs/trunk r100192: Misc code tweaks.

[Stefan Monnier]

------------------------------------------------------------
revno: 100192
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2010-05-07 20:20:30 -0400
message:
  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.
modified:
  lisp/ChangeLog
  lisp/ebuff-menu.el
  lisp/electric.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-07 17:47:56 +0000
+++ b/lisp/ChangeLog    2010-05-08 00:20:30 +0000
@@ -1,3 +1,10 @@
+2010-05-08  Stefan Monnier  <address@hidden>
+
+       * 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 <address@hidden>  (tiny change)
             Stefan Monnier  <address@hidden>
 

=== modified file 'lisp/ebuff-menu.el'
--- a/lisp/ebuff-menu.el        2010-01-13 08:35:10 +0000
+++ b/lisp/ebuff-menu.el        2010-05-08 00:20:30 +0000
@@ -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)

=== modified file 'lisp/electric.el'
--- a/lisp/electric.el  2010-01-13 08:35:10 +0000
+++ b/lisp/electric.el  2010-05-08 00:20:30 +0000
@@ -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)