Merge remote-tracking branch 'refs/remotes/tarsius/master' into bleeding-edge

ido-ubiquitous.el

@@ -589,7 +589,7 @@ completion for them."
       (ido-ubiquitous-fallback
        (ido-ubiquitous--explain-fallback sig)
        (apply ido-cr+-fallback-function orig-args)))))
-(define-obsolete-function-alias #'completing-read-ido #'completing-read-ido-ubiquitous
+(define-obsolete-function-alias 'completing-read-ido #'completing-read-ido-ubiquitous
   "ido-ubiquitous 3.0")
 
 ;;; Old-style default support