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

[Kim F . Storm]

Index: emacs/lisp/ido.el
diff -c emacs/lisp/ido.el:1.52 emacs/lisp/ido.el:1.53
*** emacs/lisp/ido.el:1.52      Sun Apr 24 19:09:13 2005
--- emacs/lisp/ido.el   Thu Apr 28 15:09:34 2005
***************
*** 1347,1365 ****
                           (> (prefix-numeric-value arg) 0)
                         (not ido-everywhere)))
    (when (get 'ido-everywhere 'file)
!     (setq read-file-name-function (get 'ido-everywhere 'file))
      (put 'ido-everywhere 'file nil))
    (when (get 'ido-everywhere 'buffer)
!     (setq read-buffer-function (get 'ido-everywhere 'buffer))
      (put 'ido-everywhere 'buffer nil))
    (when ido-everywhere
      (when (memq ido-mode '(both file))
!       (unless (get 'ido-everywhere 'file)
!       (put 'ido-everywhere 'file read-file-name-function))
        (setq read-file-name-function 'ido-read-file-name))
      (when (memq ido-mode '(both buffer))
!       (unless (get 'ido-everywhere 'buffer)
!       (put 'ido-everywhere 'buffer read-buffer-function))
        (setq read-buffer-function 'ido-read-buffer))))
  
  
--- 1347,1363 ----
                           (> (prefix-numeric-value arg) 0)
                         (not ido-everywhere)))
    (when (get 'ido-everywhere 'file)
!     (setq read-file-name-function (car (get 'ido-everywhere 'file)))
      (put 'ido-everywhere 'file nil))
    (when (get 'ido-everywhere 'buffer)
!     (setq read-buffer-function (car (get 'ido-everywhere 'buffer)))
      (put 'ido-everywhere 'buffer nil))
    (when ido-everywhere
      (when (memq ido-mode '(both file))
!       (put 'ido-everywhere 'file (cons read-file-name-function nil))
        (setq read-file-name-function 'ido-read-file-name))
      (when (memq ido-mode '(both buffer))
!       (put 'ido-everywhere 'buffer (cons read-buffer-function nil))
        (setq read-buffer-function 'ido-read-buffer))))