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

[Kim F . Storm]

Index: emacs/lisp/ido.el
diff -c emacs/lisp/ido.el:1.66 emacs/lisp/ido.el:1.67
*** emacs/lisp/ido.el:1.66      Fri Jul  8 10:07:39 2005
--- emacs/lisp/ido.el   Fri Jul 15 09:19:53 2005
***************
*** 1405,1411 ****
      (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 ?@)] 'ido-restrict-to-matches)
      (define-key map [right] 'ido-next-match)
      (define-key map [left] 'ido-prev-match)
--- 1405,1411 ----
      (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 ?\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,1442 ****
        (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 ?p)] 'ido-prev-work-directory)
        (define-key map [(meta ?s)] 'ido-merge-work-directories)
        )
--- 1436,1442 ----
        (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 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,2062 ****
  
         ((and ido-use-filename-at-point
               (setq fn (if (eq ido-use-filename-at-point 'guess)
!                           (ffap-guesser)
                          (ffap-string-at-point)))
               (not (string-match "^http:/" fn))
               (setq d (file-name-directory fn))
--- 2056,2062 ----
  
         ((and ido-use-filename-at-point
               (setq fn (if (eq ido-use-filename-at-point 'guess)
!                           (with-no-warnings (ffap-guesser))
                          (ffap-string-at-point)))
               (not (string-match "^http:/" fn))
               (setq d (file-name-directory fn))