[Emacs-diffs] Changes to emacs/lisp/cus-edit.el [lexbind]

[Miles Bader]

Index: emacs/lisp/cus-edit.el
diff -c emacs/lisp/cus-edit.el:1.157.2.9 emacs/lisp/cus-edit.el:1.157.2.10
*** emacs/lisp/cus-edit.el:1.157.2.9    Tue Jul  6 10:17:15 2004
--- emacs/lisp/cus-edit.el      Thu Nov  4 13:12:40 2004
***************
*** 896,910 ****
    (let ((name (format "*Customize Group: %s*"
                      (custom-unlispify-tag-name group))))
      (if (get-buffer name)
!       (let ((window (selected-window))
              ;; Copied from `custom-buffer-create-other-window'.
              (pop-up-windows t)
              (special-display-buffer-names nil)
              (special-display-regexps nil)
              (same-window-buffer-names nil)
              (same-window-regexps nil))
!         (pop-to-buffer name)
!         (select-window window))
        (custom-buffer-create-other-window
         (list (list group 'custom-group))
         name
--- 896,909 ----
    (let ((name (format "*Customize Group: %s*"
                      (custom-unlispify-tag-name group))))
      (if (get-buffer name)
!       (let (
              ;; Copied from `custom-buffer-create-other-window'.
              (pop-up-windows t)
              (special-display-buffer-names nil)
              (special-display-regexps nil)
              (same-window-buffer-names nil)
              (same-window-regexps nil))
!         (pop-to-buffer name))
        (custom-buffer-create-other-window
         (list (list group 'custom-group))
         name
***************
*** 1240,1260 ****
  
  ;;;###autoload
  (defun custom-buffer-create-other-window (options &optional name description)
!   "Create a buffer containing OPTIONS.
  Optional NAME is the name of the buffer.
  OPTIONS should be an alist of the form ((SYMBOL WIDGET)...), where
  SYMBOL is a customization option, and WIDGET is a widget for editing
  that option."
    (unless name (setq name "*Customization*"))
!   (let ((window (selected-window))
!       (pop-up-windows t)
        (special-display-buffer-names nil)
        (special-display-regexps nil)
        (same-window-buffer-names nil)
        (same-window-regexps nil))
      (pop-to-buffer (custom-get-fresh-buffer name))
!     (custom-buffer-create-internal options description)
!     (select-window window)))
  
  (defcustom custom-reset-button-menu nil
    "If non-nil, only show a single reset button in customize buffers.
--- 1239,1258 ----
  
  ;;;###autoload
  (defun custom-buffer-create-other-window (options &optional name description)
!   "Create a buffer containing OPTIONS, and display it in another window.
! The result includes selecting that window.
  Optional NAME is the name of the buffer.
  OPTIONS should be an alist of the form ((SYMBOL WIDGET)...), where
  SYMBOL is a customization option, and WIDGET is a widget for editing
  that option."
    (unless name (setq name "*Customization*"))
!   (let ((pop-up-windows t)
        (special-display-buffer-names nil)
        (special-display-regexps nil)
        (same-window-buffer-names nil)
        (same-window-regexps nil))
      (pop-to-buffer (custom-get-fresh-buffer name))
!     (custom-buffer-create-internal options description)))
  
  (defcustom custom-reset-button-menu nil
    "If non-nil, only show a single reset button in customize buffers.