/[emacs]/emacs/lisp/ido.el
ViewVC logotype

Diff of /emacs/lisp/ido.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.16 by kfstorm, Fri Nov 1 09:18:40 2002 UTC revision 1.17 by kfstorm, Wed Nov 27 23:13:12 2002 UTC
# Line 823  the file name using normal read-file-nam Line 823  the file name using normal read-file-nam
823  (defvar  ido-buffer-history nil  (defvar  ido-buffer-history nil
824    "History of buffers selected using `ido-switch-buffer'.")    "History of buffers selected using `ido-switch-buffer'.")
825    
 (defvar ido-xemacs  (string-match "XEmacs" (emacs-version))  
   "Non-nil if we are running XEmacs.  Otherwise, assume we are running Emacs.")  
   
826  (defvar ido-last-directory-list nil  (defvar ido-last-directory-list nil
827    "List of last selected directory paths.    "List of last selected directory paths.
828  See `ido-enable-last-directory-history' for details.")  See `ido-enable-last-directory-history' for details.")
# Line 2925  for first matching file." Line 2922  for first matching file."
2922                                      (ido-all-completions))                                      (ido-all-completions))
2923                                     (t                                     (t
2924                                      (copy-sequence (or ido-matches ido-cur-list)))))))                                      (copy-sequence (or ido-matches ido-cur-list)))))))
2925              (if ido-xemacs              (if (featurep 'xemacs)
2926                  ;; XEmacs extents are put on by default, doesn't seem to be                  ;; XEmacs extents are put on by default, doesn't seem to be
2927                  ;; any way of switching them off.                  ;; any way of switching them off.
2928                  ;; This obscure code avoids a byte compiler warning in Emacs.                  ;; This obscure code avoids a byte compiler warning in Emacs.
# Line 3003  Record command in command-history if opt Line 3000  Record command in command-history if opt
3000              (select-frame-set-input-focus newframe)              (select-frame-set-input-focus newframe)
3001            (raise-frame newframe)            (raise-frame newframe)
3002            (select-frame newframe)            (select-frame newframe)
3003            (if (not ido-xemacs)            (unless (featurep 'xemacs)
3004              (set-mouse-position (selected-frame) (1- (frame-width)) 0)))              (set-mouse-position (selected-frame) (1- (frame-width)) 0)))
3005          (select-window win))          (select-window win))
3006         (t         (t
# Line 3022  Record command in command-history if opt Line 3019  Record command in command-history if opt
3019        (display-buffer buffer))        (display-buffer buffer))
3020    
3021       ((eq method 'otherframe)       ((eq method 'otherframe)
3022        (progn        (switch-to-buffer-other-frame buffer)
3023          (switch-to-buffer-other-frame buffer)        (unless (featurep 'xemacs)
3024          (if (not ido-xemacs)          (select-frame-set-input-focus (selected-frame)))
3025              (if (fboundp 'select-frame-set-input-focus)        ))))
                 (select-frame-set-input-focus (selected-frame))  
               (set-mouse-position (selected-frame) (1- (frame-width)) 0)))  
         )))))  
3026    
3027    
3028  (defun ido-window-buffer-p  (buffer)  (defun ido-window-buffer-p  (buffer)
# Line 3570  For details of keybindings, do `\\[descr Line 3564  For details of keybindings, do `\\[descr
3564    "Minibuffer setup hook for `ido'."    "Minibuffer setup hook for `ido'."
3565    ;; Copied from `icomplete-minibuffer-setup-hook'.    ;; Copied from `icomplete-minibuffer-setup-hook'.
3566    (when (and (boundp 'ido-completing-read)    (when (and (boundp 'ido-completing-read)
3567               (or ido-xemacs (= ido-use-mycompletion-depth (minibuffer-depth))))               (or (featurep 'xemacs)
3568                     (= ido-use-mycompletion-depth (minibuffer-depth))))
3569      (add-hook 'pre-command-hook 'ido-tidy nil t)      (add-hook 'pre-command-hook 'ido-tidy nil t)
3570      (add-hook 'post-command-hook 'ido-exhibit nil t)      (add-hook 'post-command-hook 'ido-exhibit nil t)
3571      (setq cua-inhibit-cua-keys t)      (setq cua-inhibit-cua-keys t)
3572      (when ido-xemacs      (when (featurep 'xemacs)
3573        (ido-exhibit)        (ido-exhibit)
3574        (goto-char (point-min)))        (goto-char (point-min)))
3575      (run-hooks 'ido-minibuffer-setup-hook)))      (run-hooks 'ido-minibuffer-setup-hook)))

Legend:
Removed from v.1.16  
changed lines
  Added in v.1.17

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26