diff options
| author | Kim F. Storm <storm@cua.dk> | 2005-07-15 09:19:53 +0000 |
|---|---|---|
| committer | Kim F. Storm <storm@cua.dk> | 2005-07-15 09:19:53 +0000 |
| commit | bf67f27b0c97de166098fdab3659776d11bd96d9 (patch) | |
| tree | 883aa72aba0d55dd126bfda93e859bd757f4cf0a /lisp | |
| parent | 075e33b300d848ef5744acf9f0b6dccec56773bf (diff) | |
| download | emacs-bf67f27b0c97de166098fdab3659776d11bd96d9.tar.gz | |
(ido-define-mode-map): Move ido-next-work-file to C-M-o.
Use with-no-warnings around ffap-guesser.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ido.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ido.el b/lisp/ido.el index 97adb97bdd5..f3beb554568 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -1405,7 +1405,7 @@ This function also adds a hook to the minibuffer." (define-key map "\C-s" 'ido-next-match) (define-key map "\C-t" 'ido-toggle-regexp) (define-key map "\C-z" 'ido-undo-merge-work-directory) - (define-key map [(control ? )] 'ido-restrict-to-matches) + (define-key map [(control ?\s)] 'ido-restrict-to-matches) (define-key map [(control ?@)] 'ido-restrict-to-matches) (define-key map [right] 'ido-next-match) (define-key map [left] 'ido-prev-match) @@ -1436,7 +1436,7 @@ This function also adds a hook to the minibuffer." (define-key map [(meta ?m)] 'ido-make-directory) (define-key map [(meta ?n)] 'ido-next-work-directory) (define-key map [(meta ?o)] 'ido-prev-work-file) - (define-key map [(meta ?O)] 'ido-next-work-file) + (define-key map [(meta control ?o)] 'ido-next-work-file) (define-key map [(meta ?p)] 'ido-prev-work-directory) (define-key map [(meta ?s)] 'ido-merge-work-directories) ) @@ -2056,7 +2056,7 @@ If INITIAL is non-nil, it specifies the initial input string." ((and ido-use-filename-at-point (setq fn (if (eq ido-use-filename-at-point 'guess) - (ffap-guesser) + (with-no-warnings (ffap-guesser)) (ffap-string-at-point))) (not (string-match "^http:/" fn)) (setq d (file-name-directory fn)) |