diff options
| author | Kim F. Storm | 2005-04-28 15:09:34 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2005-04-28 15:09:34 +0000 |
| commit | d6810a2d5d0e3f6d9d1031e14ce393bb7dadfd26 (patch) | |
| tree | 77a28e523a654b1d54d8339cd940019ba0719501 | |
| parent | b7ce417320cbcabde764569d3c42c22bee0196ca (diff) | |
| download | emacs-d6810a2d5d0e3f6d9d1031e14ce393bb7dadfd26.tar.gz emacs-d6810a2d5d0e3f6d9d1031e14ce393bb7dadfd26.zip | |
(ido-everywhere): Fix last change.
| -rw-r--r-- | lisp/ido.el | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lisp/ido.el b/lisp/ido.el index 1c95676db0a..4c6db529ef7 100644 --- a/lisp/ido.el +++ b/lisp/ido.el | |||
| @@ -1347,19 +1347,17 @@ This function also adds a hook to the minibuffer." | |||
| 1347 | (> (prefix-numeric-value arg) 0) | 1347 | (> (prefix-numeric-value arg) 0) |
| 1348 | (not ido-everywhere))) | 1348 | (not ido-everywhere))) |
| 1349 | (when (get 'ido-everywhere 'file) | 1349 | (when (get 'ido-everywhere 'file) |
| 1350 | (setq read-file-name-function (get 'ido-everywhere 'file)) | 1350 | (setq read-file-name-function (car (get 'ido-everywhere 'file))) |
| 1351 | (put 'ido-everywhere 'file nil)) | 1351 | (put 'ido-everywhere 'file nil)) |
| 1352 | (when (get 'ido-everywhere 'buffer) | 1352 | (when (get 'ido-everywhere 'buffer) |
| 1353 | (setq read-buffer-function (get 'ido-everywhere 'buffer)) | 1353 | (setq read-buffer-function (car (get 'ido-everywhere 'buffer))) |
| 1354 | (put 'ido-everywhere 'buffer nil)) | 1354 | (put 'ido-everywhere 'buffer nil)) |
| 1355 | (when ido-everywhere | 1355 | (when ido-everywhere |
| 1356 | (when (memq ido-mode '(both file)) | 1356 | (when (memq ido-mode '(both file)) |
| 1357 | (unless (get 'ido-everywhere 'file) | 1357 | (put 'ido-everywhere 'file (cons read-file-name-function nil)) |
| 1358 | (put 'ido-everywhere 'file read-file-name-function)) | ||
| 1359 | (setq read-file-name-function 'ido-read-file-name)) | 1358 | (setq read-file-name-function 'ido-read-file-name)) |
| 1360 | (when (memq ido-mode '(both buffer)) | 1359 | (when (memq ido-mode '(both buffer)) |
| 1361 | (unless (get 'ido-everywhere 'buffer) | 1360 | (put 'ido-everywhere 'buffer (cons read-buffer-function nil)) |
| 1362 | (put 'ido-everywhere 'buffer read-buffer-function)) | ||
| 1363 | (setq read-buffer-function 'ido-read-buffer)))) | 1361 | (setq read-buffer-function 'ido-read-buffer)))) |
| 1364 | 1362 | ||
| 1365 | 1363 | ||