|
@@ -56,7 +56,7 @@
|
|
:group 'ido)
|
|
:group 'ido)
|
|
|
|
|
|
;;;###autoload
|
|
;;;###autoload
|
|
-(define-minor-mode ido-ubiquitous
|
|
|
|
|
|
+(define-minor-mode ido-ubiquitous-mode
|
|
"Use `ido-completing-read' instead of `completing-read' almost everywhere.
|
|
"Use `ido-completing-read' instead of `completing-read' almost everywhere.
|
|
|
|
|
|
This mode has no effect unles `ido-mode' is also enabled.
|
|
This mode has no effect unles `ido-mode' is also enabled.
|
|
@@ -73,6 +73,13 @@
|
|
:global t
|
|
:global t
|
|
:group 'ido-ubiquitous)
|
|
:group 'ido-ubiquitous)
|
|
|
|
|
|
|
|
+;;;###autoload
|
|
|
|
+(define-obsolete-variable-alias 'ido-ubiquitous
|
|
|
|
+ 'ido-ubiquitous-mode "0.8")
|
|
|
|
+;;;###autoload
|
|
|
|
+(define-obsolete-function-alias 'ido-ubiquitous
|
|
|
|
+ 'ido-ubiquitous-mode "0.8")
|
|
|
|
+
|
|
;;;###autoload
|
|
;;;###autoload
|
|
(defcustom ido-ubiquitous-command-exceptions '()
|
|
(defcustom ido-ubiquitous-command-exceptions '()
|
|
"List of commands that should not be affected by `ido-ubiquitous'.
|
|
"List of commands that should not be affected by `ido-ubiquitous'.
|
|
@@ -87,12 +94,13 @@ ido-ubiquitous in non-interactive functions, customize
|
|
:type '(repeat (symbol :tag "Command"))
|
|
:type '(repeat (symbol :tag "Command"))
|
|
:group 'ido-ubiquitous)
|
|
:group 'ido-ubiquitous)
|
|
|
|
|
|
|
|
+;;;###autoload
|
|
(define-obsolete-variable-alias 'ido-ubiquitous-exceptions
|
|
(define-obsolete-variable-alias 'ido-ubiquitous-exceptions
|
|
'ido-ubiquitous-command-exceptions "0.4")
|
|
'ido-ubiquitous-command-exceptions "0.4")
|
|
|
|
|
|
(defadvice completing-read (around ido-ubiquitous activate)
|
|
(defadvice completing-read (around ido-ubiquitous activate)
|
|
(if (or (not ido-mode)
|
|
(if (or (not ido-mode)
|
|
- (not ido-ubiquitous)
|
|
|
|
|
|
+ (not ido-ubiquitous-mode)
|
|
(memq this-command ido-ubiquitous-command-exceptions)
|
|
(memq this-command ido-ubiquitous-command-exceptions)
|
|
;; Avoid infinite recursion from ido calling completing-read
|
|
;; Avoid infinite recursion from ido calling completing-read
|
|
(boundp 'ido-cur-item))
|
|
(boundp 'ido-cur-item))
|
|
@@ -112,7 +120,7 @@ ido-ubiquitous in non-interactive functions, customize
|
|
(format "Disable ido-ubiquitous in %s" func)))
|
|
(format "Disable ido-ubiquitous in %s" func)))
|
|
`(defadvice ,func (around disable-ido-ubiquitous activate)
|
|
`(defadvice ,func (around disable-ido-ubiquitous activate)
|
|
,docstring
|
|
,docstring
|
|
- (let (ido-ubiquitous) ad-do-it))))
|
|
|
|
|
|
+ (let (ido-ubiquitous-mode) ad-do-it))))
|
|
|
|
|
|
(define-obsolete-function-alias
|
|
(define-obsolete-function-alias
|
|
'disable-ido-ubiquitous-in
|
|
'disable-ido-ubiquitous-in
|