[Emacs-diffs] Changes to emacs/lisp/ido.el

[Kim F. Storm]

Index: emacs/lisp/ido.el
diff -c emacs/lisp/ido.el:1.16 emacs/lisp/ido.el:1.17
*** emacs/lisp/ido.el:1.16      Fri Nov  1 04:18:40 2002
--- emacs/lisp/ido.el   Wed Nov 27 18:13:12 2002
***************
*** 823,831 ****
  (defvar  ido-buffer-history nil
    "History of buffers selected using `ido-switch-buffer'.")
  
- (defvar ido-xemacs  (string-match "XEmacs" (emacs-version))
-   "Non-nil if we are running XEmacs.  Otherwise, assume we are running 
Emacs.")
- 
  (defvar ido-last-directory-list nil
    "List of last selected directory paths.
  See `ido-enable-last-directory-history' for details.")
--- 823,828 ----
***************
*** 2925,2931 ****
                                    (ido-all-completions))
                                   (t
                                    (copy-sequence (or ido-matches 
ido-cur-list)))))))
!           (if ido-xemacs 
                ;; XEmacs extents are put on by default, doesn't seem to be
                ;; any way of switching them off.
                ;; This obscure code avoids a byte compiler warning in Emacs.
--- 2922,2928 ----
                                    (ido-all-completions))
                                   (t
                                    (copy-sequence (or ido-matches 
ido-cur-list)))))))
!           (if (featurep 'xemacs)
                ;; XEmacs extents are put on by default, doesn't seem to be
                ;; any way of switching them off.
                ;; This obscure code avoids a byte compiler warning in Emacs.
***************
*** 3003,3009 ****
            (select-frame-set-input-focus newframe)
          (raise-frame newframe)
          (select-frame newframe)
!         (if (not ido-xemacs)
            (set-mouse-position (selected-frame) (1- (frame-width)) 0)))
        (select-window win))
         (t
--- 3000,3006 ----
            (select-frame-set-input-focus newframe)
          (raise-frame newframe)
          (select-frame newframe)
!         (unless (featurep 'xemacs)
            (set-mouse-position (selected-frame) (1- (frame-width)) 0)))
        (select-window win))
         (t
***************
*** 3022,3034 ****
        (display-buffer buffer))
  
       ((eq method 'otherframe)
!       (progn
!       (switch-to-buffer-other-frame buffer)
!       (if (not ido-xemacs)
!           (if (fboundp 'select-frame-set-input-focus)
!               (select-frame-set-input-focus (selected-frame))
!             (set-mouse-position (selected-frame) (1- (frame-width)) 0)))
!       )))))
  
  
  (defun ido-window-buffer-p  (buffer)
--- 3019,3028 ----
        (display-buffer buffer))
  
       ((eq method 'otherframe)
!       (switch-to-buffer-other-frame buffer)
!       (unless (featurep 'xemacs)
!       (select-frame-set-input-focus (selected-frame)))
!       ))))
  
  
  (defun ido-window-buffer-p  (buffer)
***************
*** 3570,3580 ****
    "Minibuffer setup hook for `ido'."
    ;; Copied from `icomplete-minibuffer-setup-hook'.
    (when (and (boundp 'ido-completing-read) 
!            (or ido-xemacs (= ido-use-mycompletion-depth (minibuffer-depth))))
      (add-hook 'pre-command-hook 'ido-tidy nil t)
      (add-hook 'post-command-hook 'ido-exhibit nil t)
      (setq cua-inhibit-cua-keys t)
!     (when ido-xemacs
        (ido-exhibit)
        (goto-char (point-min)))
      (run-hooks 'ido-minibuffer-setup-hook)))
--- 3564,3575 ----
    "Minibuffer setup hook for `ido'."
    ;; Copied from `icomplete-minibuffer-setup-hook'.
    (when (and (boundp 'ido-completing-read) 
!            (or (featurep 'xemacs)
!                (= ido-use-mycompletion-depth (minibuffer-depth))))
      (add-hook 'pre-command-hook 'ido-tidy nil t)
      (add-hook 'post-command-hook 'ido-exhibit nil t)
      (setq cua-inhibit-cua-keys t)
!     (when (featurep 'xemacs)
        (ido-exhibit)
        (goto-char (point-min)))
      (run-hooks 'ido-minibuffer-setup-hook)))