[Emacs-diffs] emacs/lisp ChangeLog emacs-lisp/re-builder.el

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/11/28 23:54:26

Modified files:
        lisp           : ChangeLog 
        lisp/emacs-lisp: re-builder.el 

Log message:
        * emacs-lisp/re-builder.el (reb-auto-update): Remove redundant code.
          (re-builder): Reuse window displaying the *RE-Builder* buffer, if any.
          (reb-initialize-buffer): Update matches, in case we're reentering
          RE Builder mode.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.14876&r2=1.14877
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/re-builder.el?cvsroot=emacs&r1=1.41&r2=1.42

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.14876
retrieving revision 1.14877
diff -u -b -r1.14876 -r1.14877
--- ChangeLog   28 Nov 2008 19:10:40 -0000      1.14876
+++ ChangeLog   28 Nov 2008 23:54:23 -0000      1.14877
@@ -1,3 +1,10 @@
+2008-11-28  Juanma Barranquero  <address@hidden>
+
+       * emacs-lisp/re-builder.el (reb-auto-update): Remove redundant code.
+       (re-builder): Reuse window displaying the *RE-Builder* buffer, if any.
+       (reb-initialize-buffer): Update matches, in case we're reentering
+       RE Builder mode.
+
 2008-11-28  Chong Yidong  <address@hidden>
 
        * complete.el (PC-do-complete-and-exit): Synch to 2008-11-24

Index: emacs-lisp/re-builder.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/re-builder.el,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- emacs-lisp/re-builder.el    6 May 2008 03:21:18 -0000       1.41
+++ emacs-lisp/re-builder.el    28 Nov 2008 23:54:26 -0000      1.42
@@ -349,7 +349,8 @@
   (goto-char (+ 2 (point-min)))
   (cond ((reb-lisp-syntax-p)
          (reb-lisp-mode))
-        (t (reb-mode))))
+        (t (reb-mode)))
+  (reb-do-update))
 
 (defun reb-mode-buffer-p ()
   "Return non-nil if the current buffer is a RE Builder buffer."
@@ -370,9 +371,11 @@
     (when reb-target-buffer
       (reb-delete-overlays))
     (setq reb-target-buffer (current-buffer)
-          reb-target-window (selected-window)
-          reb-window-config (current-window-configuration))
-    (select-window (split-window (selected-window) (- (window-height) 4)))
+          reb-target-window (selected-window))
+    (select-window (or (get-buffer-window reb-buffer)
+                      (progn
+                        (setq reb-window-config (current-window-configuration))
+                        (split-window (selected-window) (- (window-height) 
4)))))
     (switch-to-buffer (get-buffer-create reb-buffer))
     (reb-initialize-buffer)))
 
@@ -524,7 +527,6 @@
         (condition-case nil
             (progn
               (when (or (reb-update-regexp) force)
-                (reb-assert-buffer-in-window)
                 (reb-do-update))
               "")
           (error " *invalid*"))))