[Emacs-diffs] /srv/bzr/emacs/trunk r110791: Don't bind same-window-* in isearch.el commands.

[Chong Yidong]

------------------------------------------------------------
revno: 110791
fixes bug: http://debbugs.gnu.org/10040
author: Juri Linkov <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2012-11-04 11:24:00 +0800
message:
  Don't bind same-window-* in isearch.el commands.
  
  * isearch.el (isearch-help-for-help, isearch-describe-bindings)
  (isearch-describe-key, isearch-describe-mode): Use a display
  action instead of binding same-window-* variables.
modified:
  lisp/ChangeLog
  lisp/isearch.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-03 19:14:22 +0000
+++ b/lisp/ChangeLog    2012-11-04 03:24:00 +0000
@@ -1,3 +1,9 @@
+2012-11-04  Juri Linkov  <address@hidden>
+
+       * isearch.el (isearch-help-for-help, isearch-describe-bindings)
+       (isearch-describe-key, isearch-describe-mode): Use a display
+       action instead of binding same-window-* variables (Bug#10040).
+
 2012-11-03  Glenn Morris  <address@hidden>
 
        * emacs-lisp/cl-macs.el (cl-parse-loop-clause):

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2012-10-30 06:23:31 +0000
+++ b/lisp/isearch.el   2012-11-04 03:24:00 +0000
@@ -374,10 +374,12 @@
 they exit Isearch mode before displaying global help."
   isearch-help-map)
 
+(defvar isearch--display-help-action '(nil (inhibit-same-window . t)))
+
 (defun isearch-help-for-help ()
   "Display Isearch help menu."
   (interactive)
-  (let (same-window-buffer-names same-window-regexps)
+  (let ((display-buffer-overriding-action isearch--display-help-action))
     (isearch-help-for-help-internal))
   (isearch-update))
 
@@ -385,7 +387,7 @@
   "Show a list of all keys defined in Isearch mode, and their definitions.
 This is like `describe-bindings', but displays only Isearch keys."
   (interactive)
-  (let (same-window-buffer-names same-window-regexps)
+  (let ((display-buffer-overriding-action isearch--display-help-action))
     (with-help-window "*Help*"
       (with-current-buffer standard-output
        (princ "Isearch Mode Bindings:\n")
@@ -394,14 +396,14 @@
 (defun isearch-describe-key ()
   "Display documentation of the function invoked by isearch key."
   (interactive)
-  (let (same-window-buffer-names same-window-regexps)
+  (let ((display-buffer-overriding-action isearch--display-help-action))
     (call-interactively 'describe-key))
   (isearch-update))
 
 (defun isearch-describe-mode ()
   "Display documentation of Isearch mode."
   (interactive)
-  (let (same-window-buffer-names same-window-regexps)
+  (let ((display-buffer-overriding-action isearch--display-help-action))
     (describe-function 'isearch-forward))
   (isearch-update))