Mercurial > emacs
comparison lisp/ido.el @ 48559:f694cedb78e4
(ido-xemacs): Remove defvar. All uses changed to
check (featurep 'xemacs) instead.
(ido-visit-buffer): Use select-frame-set-input-focus
unconditionally.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Wed, 27 Nov 2002 23:13:12 +0000 |
| parents | c7684f618b74 |
| children | 1bd259d860a2 |
comparison
equal
deleted
inserted
replaced
| 48558:d06ce341b650 | 48559:f694cedb78e4 |
|---|---|
| 820 (defvar ido-file-history nil | 820 (defvar ido-file-history nil |
| 821 "History of files selected using `ido-find-file'.") | 821 "History of files selected using `ido-find-file'.") |
| 822 | 822 |
| 823 (defvar ido-buffer-history nil | 823 (defvar ido-buffer-history nil |
| 824 "History of buffers selected using `ido-switch-buffer'.") | 824 "History of buffers selected using `ido-switch-buffer'.") |
| 825 | |
| 826 (defvar ido-xemacs (string-match "XEmacs" (emacs-version)) | |
| 827 "Non-nil if we are running XEmacs. Otherwise, assume we are running Emacs.") | |
| 828 | 825 |
| 829 (defvar ido-last-directory-list nil | 826 (defvar ido-last-directory-list nil |
| 830 "List of last selected directory paths. | 827 "List of last selected directory paths. |
| 831 See `ido-enable-last-directory-history' for details.") | 828 See `ido-enable-last-directory-history' for details.") |
| 832 | 829 |
| 2923 (ido-flatten-merged-list (or ido-matches ido-cur-list))) | 2920 (ido-flatten-merged-list (or ido-matches ido-cur-list))) |
| 2924 ((or full-list ido-completion-buffer-all-completions) | 2921 ((or full-list ido-completion-buffer-all-completions) |
| 2925 (ido-all-completions)) | 2922 (ido-all-completions)) |
| 2926 (t | 2923 (t |
| 2927 (copy-sequence (or ido-matches ido-cur-list))))))) | 2924 (copy-sequence (or ido-matches ido-cur-list))))))) |
| 2928 (if ido-xemacs | 2925 (if (featurep 'xemacs) |
| 2929 ;; XEmacs extents are put on by default, doesn't seem to be | 2926 ;; XEmacs extents are put on by default, doesn't seem to be |
| 2930 ;; any way of switching them off. | 2927 ;; any way of switching them off. |
| 2931 ;; This obscure code avoids a byte compiler warning in Emacs. | 2928 ;; This obscure code avoids a byte compiler warning in Emacs. |
| 2932 (let ((f 'display-completion-list)) | 2929 (let ((f 'display-completion-list)) |
| 2933 (funcall f completion-list | 2930 (funcall f completion-list |
| 3001 (setq newframe (window-frame win)) | 2998 (setq newframe (window-frame win)) |
| 3002 (if (fboundp 'select-frame-set-input-focus) | 2999 (if (fboundp 'select-frame-set-input-focus) |
| 3003 (select-frame-set-input-focus newframe) | 3000 (select-frame-set-input-focus newframe) |
| 3004 (raise-frame newframe) | 3001 (raise-frame newframe) |
| 3005 (select-frame newframe) | 3002 (select-frame newframe) |
| 3006 (if (not ido-xemacs) | 3003 (unless (featurep 'xemacs) |
| 3007 (set-mouse-position (selected-frame) (1- (frame-width)) 0))) | 3004 (set-mouse-position (selected-frame) (1- (frame-width)) 0))) |
| 3008 (select-window win)) | 3005 (select-window win)) |
| 3009 (t | 3006 (t |
| 3010 ;; No buffer in other frames... | 3007 ;; No buffer in other frames... |
| 3011 (if record | 3008 (if record |
| 3020 | 3017 |
| 3021 ((eq method 'display) | 3018 ((eq method 'display) |
| 3022 (display-buffer buffer)) | 3019 (display-buffer buffer)) |
| 3023 | 3020 |
| 3024 ((eq method 'otherframe) | 3021 ((eq method 'otherframe) |
| 3025 (progn | 3022 (switch-to-buffer-other-frame buffer) |
| 3026 (switch-to-buffer-other-frame buffer) | 3023 (unless (featurep 'xemacs) |
| 3027 (if (not ido-xemacs) | 3024 (select-frame-set-input-focus (selected-frame))) |
| 3028 (if (fboundp 'select-frame-set-input-focus) | 3025 )))) |
| 3029 (select-frame-set-input-focus (selected-frame)) | |
| 3030 (set-mouse-position (selected-frame) (1- (frame-width)) 0))) | |
| 3031 ))))) | |
| 3032 | 3026 |
| 3033 | 3027 |
| 3034 (defun ido-window-buffer-p (buffer) | 3028 (defun ido-window-buffer-p (buffer) |
| 3035 ;; Return window pointer if BUFFER is visible in another frame. | 3029 ;; Return window pointer if BUFFER is visible in another frame. |
| 3036 ;; If BUFFER is visible in the current frame, return nil. | 3030 ;; If BUFFER is visible in the current frame, return nil. |
| 3568 | 3562 |
| 3569 (defun ido-minibuffer-setup () | 3563 (defun ido-minibuffer-setup () |
| 3570 "Minibuffer setup hook for `ido'." | 3564 "Minibuffer setup hook for `ido'." |
| 3571 ;; Copied from `icomplete-minibuffer-setup-hook'. | 3565 ;; Copied from `icomplete-minibuffer-setup-hook'. |
| 3572 (when (and (boundp 'ido-completing-read) | 3566 (when (and (boundp 'ido-completing-read) |
| 3573 (or ido-xemacs (= ido-use-mycompletion-depth (minibuffer-depth)))) | 3567 (or (featurep 'xemacs) |
| 3568 (= ido-use-mycompletion-depth (minibuffer-depth)))) | |
| 3574 (add-hook 'pre-command-hook 'ido-tidy nil t) | 3569 (add-hook 'pre-command-hook 'ido-tidy nil t) |
| 3575 (add-hook 'post-command-hook 'ido-exhibit nil t) | 3570 (add-hook 'post-command-hook 'ido-exhibit nil t) |
| 3576 (setq cua-inhibit-cua-keys t) | 3571 (setq cua-inhibit-cua-keys t) |
| 3577 (when ido-xemacs | 3572 (when (featurep 'xemacs) |
| 3578 (ido-exhibit) | 3573 (ido-exhibit) |
| 3579 (goto-char (point-min))) | 3574 (goto-char (point-min))) |
| 3580 (run-hooks 'ido-minibuffer-setup-hook))) | 3575 (run-hooks 'ido-minibuffer-setup-hook))) |
| 3581 | 3576 |
| 3582 (defun ido-tidy () | 3577 (defun ido-tidy () |