procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* emacs-lisp/re-builder.el (reb-auto-update): Remove redundant code.

Browse source 
(re-builder): Reuse window displaying the *RE-Builder* buffer, if any.
  (reb-initialize-buffer): Update matches, in case we're reentering
  RE Builder mode.
This commit is contained in:
Juanma Barranquero 2008-11-28 23:54:23 +00:00
parent 3c00847f06
commit 2644eb3f38
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2008-11-28 Juanma Barranquero <lekktu@gmail.com>
* 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 <cyd@stupidchicken.com>
* complete.el (PC-do-complete-and-exit): Synch to 2008-11-24

12
lisp/emacs-lisp/re-builder.el
View file

@ -349,7 +349,8 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
(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 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
(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 @@ optional fourth argument FORCE is non-nil."
(condition-case nil
(progn
(when (or (reb-update-regexp) force)
(reb-assert-buffer-in-window)
(reb-do-update))
"")
(error " *invalid*"))))