Update icicles
[emacs.git] / .emacs.d / elisp / icicle / icicles.el
index cdac2f2..f403931 100644 (file)
@@ -3,35 +3,37 @@
 ;; Filename: icicles.el
 ;; Description: Minibuffer completion and cycling.
 ;; Author: Drew Adams
-;; Maintainer: Drew Adams
-;; Copyright (C) 1996-2013, Drew Adams, all rights reserved.
+;; Maintainer: Drew Adams (concat "drew.adams" "@" "oracle" ".com")
+;; Copyright (C) 1996-2015, Drew Adams, all rights reserved.
 ;; Created: Tue Aug  1 14:21:16 1995
-;; Version: 2013.04.04
-;; Last-Updated: Thu Apr  4 09:22:48 2013 (-0700)
+;; Version: 2015.01.04
+;; Package-Requires: ()
+;; Last-Updated: Sun Jan  4 14:27:46 2015 (-0800)
 ;;           By: dradams
-;;     Update #: 23392
+;;     Update #: 23646
 ;; URL: http://www.emacswiki.org/icicles.el
 ;; Doc URL: http://emacswiki.org/Icicles
 ;; Keywords: extensions, help, abbrev, local, minibuffer,
 ;;           keys, apropos, completion, matching, regexp, command
-;; Compatibility: GNU Emacs: 20.x, 21.x, 22.x, 23.x, 24.x
+;; Compatibility: GNU Emacs: 20.x, 21.x, 22.x, 23.x, 24.x, 25.x
 ;;
 ;; Features that might be required by this library:
 ;;
 ;;   `advice', `advice-preload', `apropos', `apropos+',
-;;   `apropos-fn+var', `avoid', `bookmark', `bookmark+',
-;;   `bookmark+-1', `bookmark+-bmu', `bookmark+-key',
-;;   `bookmark+-lit', `cl', `cus-edit', `cus-face', `cus-load',
-;;   `cus-start', `dired', `dired+', `dired-aux', `dired-x',
-;;   `doremi', `easymenu', `el-swank-fuzzy', `ffap', `ffap-',
-;;   `fit-frame', `frame-cmds', `frame-fns', `fuzzy', `fuzzy-match',
-;;   `help+20', `hexrgb', `icicles-cmd1', `icicles-cmd2',
-;;   `icicles-face', `icicles-fn', `icicles-mcmd', `icicles-mode',
-;;   `icicles-opt', `icicles-var', `image-dired', `info', `info+',
-;;   `kmacro', `levenshtein', `menu-bar', `menu-bar+', `misc-cmds',
-;;   `misc-fns', `mouse3', `mwheel', `naked', `pp', `pp+',
-;;   `regexp-opt', `ring', `ring+', `second-sel', `strings',
-;;   `subr-21', `thingatpt', `thingatpt+', `unaccent', `w32-browser',
+;;   `apropos-fn+var', `autofit-frame', `avoid', `bookmark',
+;;   `bookmark+', `bookmark+-1', `bookmark+-bmu', `bookmark+-key',
+;;   `bookmark+-lit', `cl', `cmds-menu', `cus-edit', `cus-face',
+;;   `cus-load', `cus-start', `cus-theme', `dired', `dired+',
+;;   `dired-aux', `dired-x', `doremi', `easymenu', `el-swank-fuzzy',
+;;   `ffap', `ffap-', `fit-frame', `frame-cmds', `frame-fns',
+;;   `fuzzy', `fuzzy-match', `help+20', `hexrgb', `highlight',
+;;   `icicles-cmd1', `icicles-cmd2', `icicles-face', `icicles-fn',
+;;   `icicles-mcmd', `icicles-mode', `icicles-opt', `icicles-var',
+;;   `image-dired', `image-file', `info', `info+20', `kmacro',
+;;   `levenshtein', `menu-bar', `menu-bar+', `misc-cmds', `misc-fns',
+;;   `mouse3', `mwheel', `naked', `package', `pp', `pp+',
+;;   `regexp-opt', `ring', `second-sel', `strings', `subr-21',
+;;   `thingatpt', `thingatpt+', `unaccent', `w32-browser',
 ;;   `w32browser-dlgopen', `wid-edit', `wid-edit+', `widget'.
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;    `icicle-define-command', `icicle-define-file-command',
 ;;    `icicle-define-search-bookmark-command',
 ;;    `icicle-define-sort-command', `icicle-file-bindings',
-;;    `icicle-maybe-cached-action', `icicle-search-modes',
-;;    `icicle-with-comments-hidden', `icicle-with-selected-window'.
+;;    `icicle-find-file-abs-no-search-action-1',
+;;    `icicle-find-file-abs-of-content-action-1',
+;;    `icicle-find-file-no-search-action-1',
+;;    `icicle-find-file-of-content-action-1',
+;;    `icicle-maybe-cached-action', `icicle-menu-bar-make-toggle',
+;;    `icicle-search-modes', `icicle-with-comments-hidden',
+;;    `icicle-with-help-window', `icicle-with-icy-mode-OFF',
+;;    `icicle-with-icy-mode-ON', `icicle-with-selected-window'.
 ;;
 ;;  Commands defined in Icicles -
 ;;
 ;;    `icicle-bookmark-specific-buffers-other-window',
 ;;    `icicle-bookmark-specific-files',
 ;;    `icicle-bookmark-specific-files-other-window',
+;;    `icicle-bookmark-tagged', `icicle-bookmark-tagged-other-window',
 ;;    `icicle-bookmark-temporary',
 ;;    `icicle-bookmark-temporary-other-window',
 ;;    `icicle-bookmark-this-buffer',
 ;;    `icicle-buffer-other-window',
 ;;    `icicle-change-alternative-sort-order', `icicle-choose-faces',
 ;;    `icicle-choose-invisible-faces', `icicle-choose-visible-faces',
+;;    `icicle-choose-window-for-buffer-display',
 ;;    `icicle-clear-history', `icicle-clear-current-history',
 ;;    `icicle-color-theme', `icicle-comint-command',
 ;;    `icicle-comint-dynamic-complete',
 ;;    `icicle-comint-replace-by-expanded-filename',
 ;;    `icicle-comint-search', `icicle-command-abbrev',
 ;;    `icicle-compilation-search', `icicle-complete-keys',
-;;    `icicle-complete-thesaurus-entry', `icicle-completing-yank',
-;;    `icicle-customize-apropos', `icicle-customize-apropos-faces',
+;;    `icicle-complete-menu-bar', `icicle-complete-thesaurus-entry',
+;;    `icicle-completing-yank', `icicle-customize-apropos',
+;;    `icicle-customize-apropos-faces',
 ;;    `icicle-customize-apropos-groups',
 ;;    `icicle-customize-apropos-options',
 ;;    `icicle-customize-apropos-options-of-type',
 ;;    `icicle-customize-apropos-opts-w-val-satisfying',
 ;;    `icicle-customize-face', `icicle-customize-icicles-group',
-;;    `icicle-cycle-expand-to-common-match',
+;;    `icicle-custom-theme', `icicle-cycle-expand-to-common-match',
 ;;    `icicle-cycle-image-file-thumbnail',
 ;;    `icicle-cycle-incremental-completion',
 ;;    `icicle-dabbrev-completion', `icicle-delete-file',
 ;;    `icicle-delete-window', `icicle-delete-windows',
 ;;    `icicle-delete-windows-on', `icicle-describe-file',
-;;    `icicle-describe-option-of-type', `icicle-describe-process',
+;;    `icicle-describe-option-of-type', `icicle-describe-package',
+;;    `icicle-describe-process',
 ;;    `icicle-describe-var-w-val-satisfying', `icicle-directory-list',
 ;;    `icicle-dired', `icicle-dired-chosen-files',
 ;;    `icicle-dired-chosen-files-other-window',
 ;;    `icicle-execute-extended-command',
 ;;    `icicle-execute-named-keyboard-macro', `icicle-face-list',
 ;;    `icicle-file', `icicle-file-list', `icicle-file-other-window',
-;;    `icicle-find-file', `icicle-find-file-absolute',
+;;    `icicle-find-file', `icicle-find-file-abs-no-search',
+;;    `icicle-find-file-abs-no-search-other-window',
+;;    `icicle-find-file-abs-of-content',
+;;    `icicle-find-file-abs-of-content-other-window',
+;;    `icicle-find-file-absolute',
 ;;    `icicle-find-file-absolute-other-window',
+;;    `icicle-find-file-abs-read-only',
+;;    `icicle-find-file-abs-read-only-other-window',
 ;;    `icicle-find-file-all-tags',
 ;;    `icicle-find-file-all-tags-other-window',
 ;;    `icicle-find-file-all-tags-regexp',
 ;;    `icicle-find-file-tagged',
 ;;    `icicle-find-file-tagged-other-window', `icicle-find-first-tag',
 ;;    `icicle-find-first-tag-other-window', `icicle-find-tag',
-;;    `icicle-font', `icicle-frame-bg', `icicle-frame-fg',
-;;    `icicle-fundoc', `icicle-goto-global-marker',
+;;    `icicle-font', `icicle-font-lock-keyword', `icicle-frame-bg',
+;;    `icicle-frame-fg', `icicle-fundoc', `icicle-goto-any-marker',
+;;    `icicle-goto-global-marker',
 ;;    `icicle-goto-global-marker-or-pop-global-mark',
 ;;    `icicle-goto-marker', `icicle-goto-marker-or-set-mark-command',
 ;;    `icicle-grep-saved-file-candidates',
 ;;    `icicle-insert-buffer', `icicle-insert-thesaurus-entry',
 ;;    `icicle-keyword-list', `icicle-kill-buffer', `icicle-kmacro',
 ;;    `icicle-lisp-complete-symbol', `icicle-locate',
-;;    `icicle-locate-file', `icicle-locate-file-no-symlinks',
+;;    `icicle-locate-file', `icicle-locate-file-no-search',
+;;    `icicle-locate-file-no-search-no-symlinks',
+;;    `icicle-locate-file-no-search-no-symlinks-other-window',
+;;    `icicle-locate-file-no-search-other-window',
+;;    `icicle-locate-file-no-symlinks',
 ;;    `icicle-locate-file-no-symlinks-other-window',
-;;    `icicle-locate-file-other-window', `icicle-locate-other-window',
+;;    `icicle-locate-file-of-content',
+;;    `icicle-locate-file-of-content-no-symlinks',
+;;    `icicle-locate-file-of-content-no-symlinks-other-window',
+;;    `icicle-locate-file-of-content-other-window',
+;;    `icicle-locate-file-other-window', `icicle-locate-no-search',
+;;    `icicle-locate-no-search-other-window',
+;;    `icicle-locate-of-content',
+;;    `icicle-locate-of-content-other-window',
+;;    `icicle-locate-other-window',
 ;;    `icicle-minibuffer-default-add-dired-shell-commands',
 ;;    `icicle-minibuffer-help', `icicle-mode', `icy-mode',
+;;    `icicle-next-font-lock-keywords',
+;;    `icicle-next-font-lock-keywords-repeat',
 ;;    `icicle-next-visible-thing', `icicle-object-action',
-;;    `icicle-occur', `icicle-ORIG-bbdb-complete-mail',
+;;    `icicle-occur', `icicle-occur-dired-marked',
+;;    `icicle-occur-dired-marked-recursive',
+;;    `icicle-ORIG-bbdb-complete-mail',
 ;;    `icicle-ORIG-bbdb-complete-name',
 ;;    `icicle-ORIG-comint-dynamic-complete',
 ;;    `icicle-ORIG-comint-dynamic-complete-filename',
 ;;    `icicle-plist', `icicle-pop-tag-mark',
 ;;    `icicle-pp-eval-expression', `icicle-previous-visible-thing',
 ;;    `icicle-read-buffer', `icicle-read-color',
-;;    `icicle-read-color-wysiwyg', `icicle-read-kbd-macro',
-;;    `icicle-recent-file', `icicle-recent-file-other-window',
+;;    `icicle-read-color-WYSIWYG', `icicle-read-kbd-macro',
+;;    `icicle-recent-file', `icicle-recent-file-no-search',
+;;    `icicle-recent-file-no-search-other-window',
+;;    `icicle-recent-file-of-content',
+;;    `icicle-recent-file-of-content-other-window',
+;;    `icicle-recent-file-other-window',
 ;;    `icicle-recompute-shell-command-candidates',
 ;;    `icicle-regexp-list', `icicle-remove-buffer-candidate',
 ;;    `icicle-remove-buffer-config',
 ;;    `icicle-search-bookmarks-together', `icicle-search-buffer',
 ;;    `icicle-search-buff-menu-marked', `icicle-search-char-property',
 ;;    `icicle-search-defs', `icicle-search-defs-full',
-;;    `icicle-search-dired-bookmark',
+;;    `icicle-search-dired-bookmark', `icicle-search-dired-marked',
 ;;    `icicle-search-dired-marked-recursive', `icicle-search-file',
 ;;    `icicle-search-file-bookmark', `icicle-search-generic',
 ;;    `icicle-search-gnus-bookmark',
 ;;    `icicle-shell-dynamic-complete-filename', `icicle-show-faces',
 ;;    `icicle-show-only-faces', `icicle-skip-this-command',
 ;;    `icicle-string-list', `icicle-synonyms', `icicle-tag-a-file',
-;;    `icicle-tags-search', `icicle-toggle-~-for-home-dir',
+;;    `icicle-tags-search', `icicle-switch-to/from-minibuffer',
+;;    `icicle-toggle-.', `icicle-toggle-~-for-home-dir',
 ;;    `icicle-toggle-alternative-sorting',
 ;;    `icicle-toggle-angle-brackets', `icicle-toggle-annotation',
 ;;    `icicle-toggle-case-sensitivity', `icicle-toggle-C-for-actions',
 ;;    `icicle-toggle-completions-format', `icicle-toggle-dot',
-;;    `icicle-toggle-expand-to-common-match'
+;;    `icicle-toggle-expand-directory',
+;;    `icicle-toggle-expand-to-common-match',
 ;;    `icicle-toggle-hiding-common-match',
 ;;    `icicle-toggle-hiding-non-matching-lines',
 ;;    `icicle-toggle-highlight-all-current',
 ;;    `icicle-toggle-highlight-historical-candidates',
 ;;    `icicle-toggle-highlight-saved-candidates',
+;;    `icicle-toggle-icomplete-mode',
 ;;    `icicle-toggle-ignored-extensions',
 ;;    `icicle-toggle-ignored-space-prefix',
 ;;    `icicle-toggle-ignoring-comments',
 ;;    `icicle-toggle-search-whole-word',
 ;;    `icicle-toggle-show-multi-completion', `icicle-toggle-sorting',
 ;;    `icicle-toggle-transforming',
-;;    `icicle-toggle-WYSIWYG-Completions', `icicle-untag-a-file',
-;;    `icicle-vardoc', `icicle-visit-marked-file-of-content',
+;;    `icicle-toggle-WYSIWYG-Completions', `icicle-top-level',
+;;    `icicle-untag-a-file', `icicle-vardoc',
+;;    `icicle-visit-marked-file-of-content',
 ;;    `icicle-visit-marked-file-of-content-other-window',
-;;    `icicle-where-is', `icicle-widget-file-complete',
-;;    `icicle-yank-maybe-completing', `icicle-yank-pop-commands',
-;;    `icicle-zap-to-char', `toggle', `synonyms',
-;;    `toggle-icicle-~-for-home-dir',
+;;    `icicle-visit-marked-file-of-content-recursive',
+;;    `icicle-visit-marked-file-of-content-recursive-other-window',
+;;    `icicle-where-is', `icicle-wide-n',
+;;    `icicle-widget-file-complete', `icicle-yank-maybe-completing',
+;;    `icicle-yank-pop-commands', `icicle-zap-to-char', `toggle',
+;;    `synonyms', `toggle-icicle-~-for-home-dir',
 ;;    `toggle-icicle-alternative-sorting',
 ;;    `toggle-icicle-angle-brackets', `toggle-icicle-annotation',
 ;;    `toggle-icicle-case-sensitivity', `toggle-icicle-C-for-actions',
-;;    `toggle-icicle-fuzzy-completion',
+;;    `toggle-icicle-completions-format', `toggle-icicle-dot',
+;;    `toggle-icicle-expand-directory',
+;;    `toggle-icicle-expand-to-common-match',
 ;;    `toggle-icicle-hiding-common-match',
 ;;    `toggle-icicle-hiding-non-matching-lines',
 ;;    `toggle-icicle-highlight-all-current',
 ;;    `toggle-icicle-highlight-historical-candidates',
 ;;    `toggle-icicle-highlight-saved-candidates',
+;;    `toggle-icicle-icomplete-mode',
 ;;    `toggle-icicle-ignored-extensions',
 ;;    `toggle-icicle-ignored-space-prefix',
 ;;    `toggle-icicle-include-cached-files',
 ;;    `toggle-icicle-include-recent-files',
 ;;    `toggle-icicle-incremental-completion',
 ;;    `toggle-icicle-literal-replacement',
+;;    `toggle-icicle-network-drives-as-remote',
 ;;    `toggle-icicle-proxy-candidates', `toggle-icicle-regexp-quote',
 ;;    `toggle-icicle-remote-file-testing',
 ;;    `toggle-icicle-search-cleanup',
 ;;    `toggle-icicle-search-complementing-domain',
+;;    `toggle-icicle-search-replace-common-match',
 ;;    `toggle-icicle-search-replace-whole',
 ;;    `toggle-icicle-search-whole-word',
 ;;    `toggle-icicle-show-multi-completion', `toggle-icicle-sorting',
 ;;    `icicle-apropos-complete-and-narrow',
 ;;    `icicle-apropos-complete-and-widen',
 ;;    `icicle-apropos-complete-no-display',
+;;    `icicle-bookmark-annotated-narrow',
 ;;    `icicle-bookmark-autofile-narrow',
 ;;    `icicle-bookmark-autonamed-narrow',
 ;;    `icicle-bookmark-autonamed-this-buffer-narrow',
 ;;    `icicle-bookmark-desktop-narrow',
 ;;    `icicle-bookmark-dired-narrow',`icicle-bookmark-file-narrow',
 ;;    `icicle-bookmark-file-this-dir-narrow',
-;;    `icicle-bookmark-gnus-narrow', `icicle-bookmark-info-narrow',
+;;    `icicle-bookmark-gnus-narrow', `icicle-bookmark-image-narrow',
+;;    `icicle-bookmark-info-narrow',
 ;;    `icicle-bookmark-local-file-narrow',
-;;    `icicle-bookmark-man-narrow', `icicle-bookmark-non-file-narrow',
+;;    `icicle-bookmark-man-narrow', `icicle-bookmark-navlist-narrow',
+;;    `icicle-bookmark-non-file-narrow',
 ;;    `icicle-bookmark-region-narrow',
 ;;    `icicle-bookmark-remote-file-narrow',
 ;;    `icicle-bookmark-specific-buffers-narrow',
 ;;    `icicle-candidate-set-save-selected',
 ;;    `icicle-candidate-set-save-to-variable',
 ;;    `icicle-candidate-set-swap', `icicle-candidate-set-truncate',
-;;    `icicle-candidate-set-union', `icicle-cd-for-abs-files',
-;;    `icicle-cd-for-loc-files',
+;;    `icicle-candidate-set-union', `icicle-cand-preds',
+;;    `icicle-cd-for-abs-files', `icicle-cd-for-loc-files',
 ;;    `icicle-change-alternative-sort-order',
 ;;    `icicle-change-history-variable', `icicle-change-sort-order',
 ;;    `icicle-change-sort-order', `icicle-choose-completion',
-;;    `icicle-clear-current-history', `icicle-completing-read+insert',
+;;    `icicle-choose-window-by-name', `icicle-clear-current-history',
+;;    `icicle-complete-current-candidate-as-input',
+;;    `icicle-completing-read+insert',
 ;;    `icicle-Completions-mouse-3-menu',
 ;;    `icicle-cycle-expand-to-common-match',
 ;;    `icicle-cycle-image-file-thumbnail',
 ;;    `icicle-dispatch-C-^', `icicle-dispatch-C-.',
 ;;    `icicle-dispatch-C-x.', `icicle-dispatch-M-_',
 ;;    `icicle-dispatch-M-comma', `icicle-dispatch-M-q',
+;;    `icicle-display-candidates-in-Completions',
 ;;    `icicle-doremi-candidate-width-factor+',
 ;;    `icicle-doremi-increment-max-candidates+',
 ;;    `icicle-doremi-increment-swank-prefix-length+',
 ;;    `icicle-help-on-previous-apropos-candidate',
 ;;    `icicle-help-on-previous-prefix-candidate',
 ;;    `icicle-help-string-non-completion', `icicle-history',
-;;    `icicle-bookmark-image-narrow', `icicle-insert-completion',
-;;    `icicle-insert-dot-command', `icicle-insert-history-element',
+;;    `icicle-insert-completion', `icicle-insert-dot-command',
+;;    `icicle-insert-history-element',
 ;;    `icicle-insert-key-description',
 ;;    `icicle-insert-list-join-string',
 ;;    `icicle-insert-newline-in-minibuffer',
 ;;    `icicle-next-prefix-candidate-action',
 ;;    `icicle-next-prefix-candidate-alt-action',
 ;;    `icicle-next-S-TAB-completion-method',
-;;    `icicle-ORIG-choose-completion', `icicle-ORIG-exit-minibuffer',
+;;    `icicle-ORIG-choose-completion', `icicle-ORIG-complete',
+;;    `icicle-ORIG-exit-minibuffer',
 ;;    `icicle-ORIG-minibuffer-complete-and-exit',
 ;;    `icicle-ORIG-mouse-choose-completion',
 ;;    `icicle-ORIG-next-history-element', `icicle-ORIG-sit-for',
 ;;    `icicle-previous-line', `icicle-previous-prefix-candidate',
 ;;    `icicle-previous-prefix-candidate-action',
 ;;    `icicle-previous-prefix-candidate-alt-action',
-;;    `icicle-read+insert-file-name', `icicle-regexp-quote-input',
+;;    `icicle-read+insert-file-name',
+;;    `icicle-recomplete-from-original-domain',
+;;    `icicle-regexp-quote-input',
 ;;    `icicle-remove-buffer-cands-for-derived-mode',
 ;;    `icicle-remove-buffer-cands-for-mode',
 ;;    `icicle-remove-buffer-cands-for-visible',
 ;;    `icicle-sort-by-directories-last', `icicle-sort-by-file-type.',
 ;;    `icicle-sort-by-last-file-access-time',
 ;;    `icicle-sort-by-last-file-modification-time',
-;;    `icicle-sort-by-last-use-as-input',
+;;    `icicle-sort-by-last-use', `icicle-sort-by-last-use-as-input',
+;;    `icicle-sort-by-last-use\,-dirs-first',
 ;;    `icicle-sort-by-previous-use-alphabetically',
 ;;    `icicle-sort-by-2nd-parts-alphabetically',
 ;;    `icicle-sort-case-insensitive',
 ;;    `toggle-icicle-case-sensitivity', `toggle-icicle-C-for-actions',
 ;;    `toggle-icicle-completions-format', `toggle-icicle-dot',
 ;;    `toggle-icicle-expand-to-common-match',
-;;    `toggle-icicle-fuzzy-completion',
 ;;    `toggle-icicle-hiding-common-match',
 ;;    `toggle-icicle-hiding-non-matching-lines',
 ;;    `toggle-icicle-highlight-all-current',
 ;;    `icicle-historical-candidate',
 ;;    `icicle-historical-candidate-other',
 ;;    `icicle-input-completion-fail',
-;;    `icicle-input-completion-fail-lax',
+;;    `icicle-input-completion-fail-lax', `icicle-key-complete-menu',
+;;    `icicle-key-complete-menu-local',
 ;;    `icicle-match-highlight-Completions',
 ;;    `icicle-match-highlight-minibuffer', `icicle-mode-line-help',
 ;;    `icicle-msg-emphasis', `icicle-multi-command-completion',
 ;;    `icicle-apropos-cycle-previous-alt-action-keys',
 ;;    `icicle-apropos-cycle-previous-help-keys',
 ;;    `icicle-bookmark-name-length-max',
-;;    `icicle-bookmark-refresh-cache-flag', `icicle-buffer-configs',
+;;    `icicle-bookmark-refresh-cache-flag',
+;;    `icicle-buffer-candidate-key-bindings', `icicle-buffer-configs',
 ;;    `icicle-buffer-extras',
 ;;    `icicle-buffer-ignore-space-prefix-flag',
 ;;    `icicle-buffer-include-cached-files-nflag',
 ;;    `icicle-buffer-include-recent-files-nflag',
 ;;    `icicle-buffer-match-regexp', `icicle-buffer-no-match-regexp',
-;;    `icicle-buffer-predicate', `icicle-buffer-require-match-flag'
-;;    `icicle-buffer-skip-hook', `icicle-buffer-sort',
+;;    `icicle-buffer-predicate', `icicle-buffer-prefix-arg-filtering',
+;;    `icicle-buffer-require-match-flag'
+;;    `icicle-buffer-skip-functions', `icicle-buffer-sort',
 ;;    `icicle-buffers-ido-like-flag', `icicle-candidate-action-keys',
 ;;    `icicle-candidate-help-keys', `icicle-candidate-width-factor',
+;;    `icicle-cand-preds-all', `icicle-cand-preds-for-bookmark',
+;;    `icicle-cand-preds-for-buffer', `icicle-cand-preds-for-color',
+;;    `icicle-cand-preds-for-face', `icicle-cand-preds-for-file',
+;;    `icicle-cand-preds-for-frame', `icicle-cand-preds-for-misc',
+;;    `icicle-cand-preds-for-package', `icicle-cand-preds-for-symbol',
+;;    `icicle-cand-preds-for-variable',
+;;    `icicle-cand-preds-for-window',
 ;;    `icicle-change-region-background-flag',
-;;    `icicle-change-sort-order-completion-flag',
-;;    `icicle-C-l-uses-completion-flag', `icicle-color-themes',
+;;    `icicle-change-sort-order-completion',
+;;    `icicle-C-l-uses-completion-flag',
+;;    `icicle-cmpl-include-cdabbrev-flag',
+;;    `icicle-cmpl-max-candidates-to-cycle', `icicle-color-themes',
 ;;    `icicle-comint-dynamic-complete-replacements',
 ;;    `icicle-command-abbrev-alist',
 ;;    `icicle-command-abbrev-match-all-parts-flag',
 ;;    `icicle-command-abbrev-priority-flag',
 ;;    `icicle-complete-key-anyway-flag',
+;;    `icicle-complete-keys-ignored-prefix-keys',
 ;;    `icicle-complete-keys-self-insert-ranges',
 ;;    `icicle-completing-read+insert-keys',
 ;;    `icicle-completion-history-max-length',
 ;;    `icicle-Completions-window-max-height',
 ;;    `icicle-customize-save-flag',
 ;;    `icicle-customize-save-variable-function',
+;;    `icicle-custom-themes', `icicle-custom-themes-accumulate-flag',
+;;    `icicle-custom-themes-update-flag',
 ;;    `icicle-default-cycling-mode',
 ;;    `icicle-default-in-prompt-format-function',
 ;;    `icicle-default-thing-insertion', `icicle-default-value',
 ;;    `icicle-deletion-action-flag', `icicle-dot-show-regexp-flag',
 ;;    `icicle-dot-string', `icicle-expand-input-to-common-match',
 ;;    `icicle-expand-input-to-common-match-alt', `icicle-file-extras',
-;;    `icicle-find-file-of-content-skip-hook',
 ;;    `icicle-file-match-regexp', `icicle-file-no-match-regexp',
 ;;    `icicle-file-predicate', `icicle-file-require-match-flag',
-;;    `icicle-file-sort', `icicle-files-ido-like-flag',
+;;    `icicle-file-skip-functions', `icicle-file-sort',
+;;    `icicle-files-ido-like-flag',
 ;;    `icicle-filesets-as-saved-completion-sets-flag',
+;;    `icicle-find-file-expand-directory-flag',
 ;;    `icicle-functions-to-redefine', `icicle-guess-commands-in-path',
 ;;    `icicle-help-in-mode-line-delay',
 ;;    `icicle-hide-common-match-in-Completions-flag',
 ;;    `icicle-highlight-input-initial-whitespace-flag',
 ;;    `icicle-highlight-lighter-flag',
 ;;    `icicle-highlight-saved-candidates-flag',
+;;    `icicle-icomplete-mode-max-candidates',
 ;;    `icicle-ignore-comments-flag', `icicle-ignored-directories',
 ;;    `icicle-image-files-in-Completions',
+;;    `icicle-image-preview-in-tooltip',
 ;;    `icicle-incremental-completion',
 ;;    `icicle-incremental-completion-delay',
 ;;    `icicle-incremental-completion-threshold',
-;;    `icicle-Info-visited-max-candidates',
+;;    `icicle-Info-highlight-visited-nodes',
 ;;    `icicle-inhibit-advice-functions', `icicle-inhibit-ding-flag',
 ;;    `icicle-input-string', `icicle-inter-candidates-min-spaces',
 ;;    `icicle-isearch-complete-keys',
 ;;    `icicle-isearch-history-insert-keys',
+;;    `icicle-keep-Completions-for-sole-dir',
 ;;    `icicle-key-complete-keys',
 ;;    `icicle-key-complete-keys-for-minibuffer',
 ;;    `icicle-key-descriptions-use-<>-flag',
 ;;    `icicle-show-Completions-help-flag',
 ;;    `icicle-show-Completions-initially-flag',
 ;;    `icicle-show-multi-completion-flag', `icicle-sort-comparer',
-;;    `icicle-sort-orders-alist', `icicle-special-candidate-regexp',
+;;    `icicle-sorting-max-candidates', `icicle-sort-orders-alist',
+;;    `icicle-special-candidate-regexp',
 ;;    `icicle-S-TAB-completion-methods-alist',
 ;;    `icicle-S-TAB-completion-methods-per-command',
 ;;    `icicle-swank-prefix-length', `icicle-swank-timeout',
 ;;
 ;;    `custom-variable-p', `icicle-2nd-part-string-less-p',
 ;;    `icicle-abbreviate-or-expand-file-name', `icicle-activate-mark',
-;;    `icicle-add-default-to-prompt', `icicle-add-key+cmd',
-;;    `icicle-add-menu-item-to-cmd-history',
-;;    `icicle-all-candidates-action-1', `icicle-all-completions',
-;;    `icicle-all-exif-data', `icicle-alpha-p',
-;;    `icicle-alt-act-fn-for-type', `icicle-any-candidates-p',
-;;    `icicle-anychar-regexp', `icicle-anything-candidate-value',
-;;    `icicle-apply-action', `icicle-apply-list-action',
-;;    `icicle-apply-to-saved-candidate',
+;;    `icicle-add-key+cmd', `icicle-add-menu-item-to-cmd-history',
+;;    `icicle-alist-key-match', `icicle-all-candidates-action-1',
+;;    `icicle-all-completions', `icicle-all-exif-data',
+;;    `icicle-alpha-p', `icicle-alt-act-fn-for-type',
+;;    `icicle-any-candidates-p', `icicle-anychar-regexp',
+;;    `icicle-anything-candidate-value', `icicle-apply-action',
+;;    `icicle-apply-list-action', `icicle-apply-to-saved-candidate',
 ;;    `icicle-apropos-any-candidates-p',
 ;;    `icicle-apropos-any-file-name-candidates-p',
 ;;    `icicle-apropos-candidates', `icicle-apropos-complete-1',
 ;;    `icicle-bind-key-completion-keys-for-map-var',
 ;;    `icicle-bind-key-completion-keys-in-keymaps-from',
 ;;    `icicle-bind-other-keymap-keys',
-;;    `icicle-bind-top-level-commands',
+;;    `icicle-bind-top-level-commands', `icicle-bookmark-autofile-p',
+;;    `icicle-bookmark-autonamed-p',
+;;    `icicle-bookmark-autonamed-this-buffer-p',
 ;;    `icicle-bookmark-bind-narrow-commands',
-;;    `icicle-bookmark-cleanup', `icicle-bookmark-cleanup-on-quit',
-;;    `icicle-bookmark-delete-action', `icicle-bookmark-help-string',
-;;    `icicle-bookmark-jump-1', `icicle-bounds-of-thing-at-point',
+;;    `icicle-bookmark-bookmark-file-p',
+;;    `icicle-bookmark-bookmark-list-p', `icicle-bookmark-cleanup',
+;;    `icicle-bookmark-cleanup-on-quit',
+;;    `icicle-bookmark-delete-action', `icicle-bookmark-desktop-p',
+;;    `icicle-bookmark-dired-p', `icicle-bookmark-dired-this-dir-p',
+;;    `icicle-bookmark-dired-wildcards-p', `icicle-bookmark-file-p',
+;;    `icicle-bookmark-file-this-dir-p', `icicle-bookmark-flagged-p',
+;;    `icicle-bookmark-function-p', `icicle-bookmark-gnus-p',
+;;    `icicle-bookmark-help-string',
+;;    `icicle-bookmark-icicle-search-hits-p',
+;;    `icicle-bookmark-image-p', `icicle-bookmark-info-p',
+;;    `icicle-bookmark-jump-1',
+;;    `icicle-bookmark-last-specific-buffer-p',
+;;    `icicle-bookmark-last-specific-file-p',
+;;    `icicle-bookmark-lighted-p',
+;;    `icicle-bookmark-local-directory-p',
+;;    `icicle-bookmark-local-file-p', `icicle-bookmark-man-p',
+;;    `icicle-bookmark-marked-p', `icicle-bookmark-modified-p',
+;;    `icicle-bookmark-navlist-p', `icicle-bookmark-non-file-p',
+;;    `icicle-bookmark-omitted-p', `icicle-bookmark-orphaned-file-p',
+;;    `icicle-bookmark-orphaned-local-file-p',
+;;    `icicle-bookmark-orphaned-remote-file-p',
+;;    `icicle-bookmark-region-p', `icicle-bookmark-remote-file-p',
+;;    `icicle-bookmark-sequence-p', `icicle-bookmark-snippet-p',
+;;    `icicle-bookmark-tagged-p', `icicle-bookmark-temporary-p',
+;;    `icicle-bookmark-this-buffer-p', `icicle-bookmark-url-p',
+;;    `icicle-bookmark-url-browse-p',
+;;    `icicle-bookmark-variable-list-p', `icicle-bookmark-w3m-p',
+;;    `icicle-bounds-of-thing-at-point',
 ;;    `icicle-buffer-file/process-name-less-p',
 ;;    `icicle-buffer-apropos-complete-match',
-;;    `icicle-buffer-cand-help', `icicle-buffer-multi-complete',
-;;    `icicle-buffer-name-prompt', `icicle-buffer-smaller-p',
-;;    `icicle-buffer-sort-*...*-last',
+;;    `icicle-buffer-cand-help', `icicle-buffer-modified-p',
+;;    `icicle-buffer-multi-complete', `icicle-buffer-name-prompt',
+;;    `icicle-buffer-smaller-p', `icicle-buffer-sort-*...*-last',
 ;;    `icicle-cached-files-without-buffers',
 ;;    `icicle-call-then-update-Completions',
 ;;    `icicle-cancel-Help-redirection', `icicle-candidate-action-1',
 ;;    `icicle-choose-candidate-of-type',
 ;;    `icicle-choose-completion-string', `icicle-clear-history-1',
 ;;    `icicle-clear-history-entry', `icicle-clear-lighter',
-;;    `icicle-clear-minibuffer', `icicle-cmd2-after-load-bookmark+',
+;;    `icicle-clear-minibuffer',
+;;    `icicle-color-from-multi-completion-input',
+;;    `icicle-cmd2-after-load-bookmark+',
 ;;    `icicle-cmd2-after-load-hexrgb',
 ;;    `icicle-cmd2-after-load-highlight',
 ;;    `icicle-cmd2-after-load-palette',
 ;;    `icicle-cmd2-after-load-synonyms',
-;;    `icicle-cmd2-after-load-wid-edit+', `icicle-color-blue-lessp',
-;;    `icicle-color-completion-setup',
+;;    `icicle-cmd2-after-load-wid-edit+', `icicle-color-defined-p',
+;;    `icicle-color-blue-lessp', `icicle-color-completion-setup',
 ;;    `icicle-color-distance-hsv-lessp',
-;;    `icicle-color-distance-rgb-lessp', `icicle-color-green-lessp',
-;;    `icicle-color-help', `icicle-color-hsv-lessp',
-;;    `icicle-color-hue-lessp', `icicle-color-name-w-bg',
-;;    `icicle-color-red-lessp', `icicle-color-saturation-lessp',
+;;    `icicle-color-distance-rgb-lessp', `icicle-color-gray-p',
+;;    `icicle-color-green-lessp', `icicle-color-help',
+;;    `icicle-color-hsv-lessp', `icicle-color-hue-lessp',
+;;    `icicle-color-name-w-bg', `icicle-color-red-lessp',
+;;    `icicle-color-saturation-lessp', `icicle-color-supported-p',
 ;;    `icicle-color-value-lessp', `icicle-column-wise-cand-nb',
 ;;    `icicle-completion--embedded-envvar-table',
 ;;    `icicle-Completions-popup-choice',
 ;;    `icicle-command-abbrev-save',
 ;;    `icicle-command-abbrev-used-more-p',
 ;;    `icicle-command-names-alphabetic-p',
-;;    `icicle-compilation-hook-fn',
+;;    `icicle-compilation-buffer-p', `icicle-compilation-hook-fn',
 ;;    `icicle-compilation-search-in-context-fn',
 ;;    `icicle-complete-again-update', `icicle-complete-keys-1',
 ;;    `icicle-complete-keys-action', `icicle-completing-p',
-;;    `icicle-completing-read', , `icicle-completing-read-multiple',
+;;    `icicle-completing-read', `icicle-completing-read-default',
+;;    `icicle-completing-read-multiple',
 ;;    `icicle-completing-read-history',
 ;;    `icicle-completion-all-completions',
 ;;    `icicle-completion-setup-function',
 ;;    `icicle-completion-try-completion',
 ;;    `icicle-compute-shell-command-candidates',
-;;    `icicle-convert-dots',
+;;    `icicle-convert-dots', `icicle-create-thumb',
 ;;    `icicle-current-completion-in-Completions',
 ;;    `icicle-current-sort-functions', `icicle-current-sort-order',
 ;;    `icicle-current-TAB-method',
 ;;    `icicle-customize-apropos-opt-action', `icicle-customize-faces',
-;;    `icicle-custom-type', `icicle-dabbrev--abbrev-at-point',
+;;    `icicle-custom-type', `icicle-custom-variable-p',
+;;    `icicle-dabbrev--abbrev-at-point',
 ;;    `icicle-default-buffer-names', `icicle-defaults-at-point',
 ;;    `icicle-define-crm-completion-map', ,
 ;;    `icicle-define-cycling-keys', `icicle-defined-thing-p',
 ;;    `icicle-describe-opt-action',
 ;;    `icicle-describe-opt-of-type-complete', `icicle-ding',
 ;;    `icicle-dired-read-shell-command',
-;;    `icicle-dir-prefix-wo-wildcards', `icicle-dirs-first-p',
+;;    `icicle-dir-prefix-wo-wildcards',
+;;    `icicle-dirs-and-latest-use-first-p', `icicle-dirs-first-p',
 ;;    `icicle-dirs-last-p', `icicle-displayable-cand-from-saved-set',
 ;;    `icicle-display-cand-from-full-cand',
 ;;    `icicle-display-completion-list', `icicle-display-Completions',
-;;    `icicle-display-candidates-in-Completions', `icicle-doc-action',
-;;    `icicle-edmacro-parse-keys',
+;;    `icicle-doc-action', `icicle-edmacro-parse-keys',
 ;;    `icicle-ensure-overriding-map-is-bound',
 ;;    `icicle-execute-extended-command-1',
 ;;    `icicle-expanded-common-match',
 ;;    `icicle-expanded-common-match-1', `icicle-expand-file-name-20',
 ;;    `icicle-expand-file-or-dir-name',
 ;;    `icicle-explicit-saved-completion-candidates', `icicle-explore',
-;;    `icicle-extra-candidates-first-p',
-;;    `icicle-face-valid-attribute-values', `icicle-file-directory-p',
+;;    `icicle-extra-candidates-first-p', `icicle-face-bold-p',
+;;    `icicle-face-differs-from-default-p',
+;;    `icicle-face-inverse-video-p', `icicle-face-italic-p',
+;;    `icicle-face-nontrivial-p', `icicle-face-underline-p',
+;;    `icicle-face-valid-attribute-values',
+;;    `icicle-ffap-file-remote-p', `icicle-ffap-url-p',
+;;    `icicle-file-accessible-directory-p',
+;;    `icicle-file-compressed-p', `icicle-file-desktop-p',
+;;    `icicle-file-directory-p', `icicle-file-elc-p',
+;;    `icicle-file-executable-p', `icicle-file-exists-p',
+;;    `icicle-file-locked-p', `icicle-file-name-absolute-p',
 ;;    `icicle-file-name-apropos-candidates',
 ;;    `icicle-file-name-directory',
 ;;    `icicle-file-name-directory-w-default',
 ;;    `icicle-file-name-input-p', `icicle-file-name-nondirectory',
-;;    `icicle-file-name-prefix-candidates',
+;;    `icicle-file-name-prefix-candidates', `icicle-nondirectory-p',
 ;;    `icicle-file-of-content-apropos-complete-match',
-;;    `icicle-file-readable-p', `icicle-file-remote-p',
-;;    `icicle-file-type-less-p', `icicle-file-writable-p',
-;;    `icicle-filesets-files-under', `icicle-files-within',
+;;    `icicle-file-readable-p', `icicle-file-regular-p',
+;;    `icicle-file-remote-p', `icicle-file-symlink-p',
+;;    `icicle-filesets-files-under', `icicle-file-type-less-p',
+;;    `icicle-file-writable-p', `icicle-files-within',
 ;;    `icicle-files-within-1', `icicle-filter-alist',
-;;    `icicle-filter-wo-input', `icicle-find-first-tag-action',
+;;    `icicle-filter-wo-input', `icicle-find-file-abs-no-search-1',
+;;    `icicle-find-file-abs-no-search-action',
+;;    `icicle-find-file-abs-no-search-other-window-action',
+;;    `icicle-find-file-abs-no-search-ro-action',
+;;    `icicle-find-file-abs-no-search-ro-ow-action',
+;;    `icicle-find-file-abs-of-content-1',
+;;    `icicle-find-file-abs-of-content-action',
+;;    `icicle-find-file-abs-of-content-other-window-action',
+;;    `icicle-find-file-abs-of-content-ro-action',
+;;    `icicle-find-file-abs-of-content-ro-ow-action',
+;;    `icicle-find-file-no-search-action',
+;;    `icicle-find-file-no-search-other-window-action',
+;;    `icicle-find-file-of-content-ro-action',
+;;    `icicle-find-file-of-content-ro-ow-action',
+;;    `icicle-find-file-or-expand-dir',
+;;    `icicle-find-first-tag-action',
 ;;    `icicle-find-first-tag-other-window-action',
-;;    `icicle-find-tag-action', `icicle-find-tag-define-candidates',
+;;    `icicle-find-tag-action', `icicle-find-tag-default-as-regexp',
+;;    `icicle-find-tag-define-candidates',
 ;;    `icicle-find-tag-define-candidates-1',
 ;;    `icicle-find-tag-final-act', `icicle-find-tag-help',
 ;;    `icicle-find-tag-quit-or-error',
 ;;    `icicle-first-matching-candidate', `icicle-first-N',
 ;;    `icicle-fit-completions-window', `icicle-fix-default-directory',
 ;;    `icicle-flat-list', `icicle-fn-doc-minus-sig',
-;;    `icicle-font-w-orig-size', `icicle-frame-name-history',
-;;    `icicle-frames-on', `icicle-function-name-history',
+;;    `icicle-frame-iconified-p', `icicle-frame-invisible-p',
+;;    `icicle-frame-name-history', `icicle-frames-on',
+;;    `icicle-frame-splittable-p', `icicle-frame-thumbnail-p',
+;;    `icicle-frame-unsplittable-p', `icicle-function-name-history',
 ;;    `icicle-fuzzy-candidates', `icicle-get-alist-candidate',
 ;;    `icicle-get-anything-actions-for-type',
 ;;    `icicle-get-anything-cached-candidates',
 ;;    `icicle-get-candidates-from-saved-set', `icicle-get-safe',
 ;;    `icicle-goto-marker-1', `icicle-goto-marker-1-action',
 ;;    `icicle-group-regexp', `icicle-dired-guess-shell-command',
+;;    `icicle-handle-default-for-prompt',
 ;;    `icicle-help-on-candidate-symbol', `icicle-help-line-buffer',
 ;;    `icicle-help-line-file', `icicle-help-string-completion',
 ;;    `icicle-highlight-candidate-in-Completions',
 ;;    `icicle-highlight-input-noncompletion',
 ;;    `icicle-highlight-input-noncompletion-rest',
 ;;    `icicle-highlight-lighter', `icicle-historical-alphabetic-p',
-;;    `icicle-imenu-command-p', `icicle-imenu-in-buffer-p',
+;;    `icicle-image-file-p', `icicle-imenu-command-p',
+;;    `icicle-imenu-help', `icicle-imenu-in-buffer-p',
+;;    `icicle-imenu-macro-p',
 ;;    `icicle-imenu-non-interactive-function-p',
 ;;    `icicle-increment-cand-nb+signal-end',
 ;;    `icicle-Info-apropos-complete-match',
 ;;    `icicle-insert-for-yank', `icicle-insert-input',
 ;;    `icicle-insert-thesaurus-entry-cand-fn', `icicle-insert-thing',
 ;;    `icicle-invisible-face-p', `icicle-invisible-p',
-;;    `icicle-isearch-complete-past-string', `icicle-join-nth-parts',
+;;    `icicle-isearch-complete-past-string',
+;;    `icicle-interesting-buffer-p', `icicle-join-nth-parts',
 ;;    `icicle-kbd', `icicle-keep/remove-buffer-cands-for-visible',
 ;;    `icicle-key-description', `icicle-keys+cmds-w-prefix',
 ;;    `icicle-kill-a-buffer',
 ;;    `icicle-kill-a-buffer-and-update-completions',
-;;    `icicle-kmacro-action', `icicle-last-accessed-first-p',
-;;    `icicle-last-modified-first-p', `icicle-levenshtein-match',
+;;    `icicle-kmacro-action', `icicle-last-non-minibuffer-buffer',
+;;    `icicle-latest-access-first-p', `icicle-latest-input-first-p',
+;;    `icicle-latest-modification-first-p',
+;;    `icicle-latest-use-first-p', `icicle-levenshtein-match',
 ;;    `icicle-levenshtein-one-match', `icicle-levenshtein-one-regexp',
 ;;    `icicle-levenshtein-strict-match',
-;;    `icicle-lisp-completion-at-point',
-;;    `icicle-lisp-vanilla-completing-read',
-;;    `icicle-local-keys-first-p', `icicle-locate-file-1',
-;;    `icicle-locate-file-action',
-;;    `icicle-locate-file-other-window-action',
-;;    `icicle-locate-file-use-locate-p', `icicle-looking-at-p',
-;;    `icicle-looking-back-at-p', `icicle-major-mode-name-less-p',
-;;    `icicle-make-bookmark-candidate', `icicle-make-color-candidate',
-;;    `icicle-make-face-candidate', `icicle-make-frame-alist',
-;;    `icicle-make-plain-predicate', `icicle-make-window-alist',
-;;    `icicle-markers', `icicle-markers-to-readable',
-;;    `icicle-marker+text',
+;;    `icicle-lisp-completion-at-point', `icicle-list-position',
+;;    `icicle-load-library', `icicle-local-keys-first-p',
+;;    `icicle-locate-file-no-search-1',
+;;    `icicle-locate-file-of-content-1', `icicle-looking-at-p',
+;;    `icicle-looking-at-literally-p',
+;;    `icicle-looking-back-at-literally-p',
+;;    `icicle-looks-like-dir-name-p', `icicle-major-mode-name-less-p',
+;;    `icicle-make-bookmark-candidate', `icicle-make-char-candidate',
+;;    `icicle-make-color-candidate', `icicle-make-face-candidate',
+;;    `icicle-make-frame-alist', `icicle-make-plain-predicate',
+;;    `icicle-make-window-alist', `icicle-map', `icicle-markers',
+;;    `icicle-markers-to-readable', `icicle-marker+text',
 ;;    `icicle-maybe-multi-completion-completing-p',
 ;;    `icicle-maybe-sort-and-strip-candidates',
 ;;    `icicle-maybe-sort-maybe-truncate', `icicle-mctize-all',
 ;;    `icicle-minibuffer-default-add-completions',
 ;;    `icicle-minibuf-input', `icicle-minibuf-input-sans-dir',
 ;;    `icicle-minibuffer-prompt-end', `icicle-minibuffer-setup',
-;;    `icicle-mode-line-name-less-p', `icicle-most-recent-first-p',
-;;    `icicle-mouse-candidate-action-1',
+;;    `icicle-mode-line-name-less-p',
+;;    `icicle-mouse-candidate-action-1', `icicle-mouseover-help',
 ;;    `icicle-msg-maybe-in-minibuffer', `icicle-ms-windows-NET-USE',
 ;;    `icicle-multi-comp-apropos-complete-match', `icicle-multi-sort',
 ;;    `icicle-nb-Completions-cols',
 ;;    `icicle-nb-of-cand-at-Completions-pos',
 ;;    `icicle-nb-of-cand-in-Completions-horiz',
-;;    `icicle-next-candidate',
+;;    `icicle-next-candidate', `icicle-next-error-buffer-p',
 ;;    `icicle-next-single-char-property-change',
 ;;    `icicle-next-visible-thing-1', `icicle-next-visible-thing-2',
 ;;    `icicle-next-visible-thing-and-bounds',
+;;    `icicle-next-window-for-display-buffer',
 ;;    `icicle-non-whitespace-string-p',
 ;;    `icicle-not-basic-prefix-completion-p',
+;;    `icicle-not-special-candidate-p',
 ;;    `icicle-ORIG-choose-completion-string',
 ;;    `icicle-ORIG-completing-read',
 ;;    `icicle-ORIG-completing-read-multiple',
 ;;    `icicle-ORIG-minibuffer-default-add-completions',
 ;;    `icicle-ORIG-read-char-by-name', `icicle-ORIG-read-color',
 ;;    `icicle-ORIG-read-face-name',
-;;    `icicle-ORIG-read-file-name-default',
 ;;    `icicle-ORIG-read-from-minibuffer', `icicle-ORIG-read-number',
 ;;    `icicle-ORIG-read-string', `icicle-ORIG-shell-command',
 ;;    `icicle-ORIG-shell-command-on-region',
-;;    `icicle-ORIG-widget-color-complete', `icicle-part-1-cdr-lessp',
+;;    `icicle-ORIG-widget-color-complete',
+;;    `icicle-package-built-in-p', `icicle-package-disabled-p',
+;;    `icicle-package-installed-p', `icicle-part-1-cdr-lessp',
 ;;    `icicle-part-1-lessp', `icicle-part-2-lessp',
 ;;    `icicle-part-3-lessp', `icicle-part-4-lessp',
-;;    `icicle-part-N-lessp', `icicle-pick-color-by-name-action',
-;;    `icicle-place-cursor', `icicle-place-overlay',
-;;    `icicle-position', `icicle-prefix-any-candidates-p',
+;;    `icicle-part-N-lessp', `icicle-pick-color-by-name-1',
+;;    `icicle-pick-color-by-name-action', `icicle-place-cursor',
+;;    `icicle-place-overlay', `icicle-position',
+;;    `icicle-prefix-any-candidates-p',
 ;;    `icicle-prefix-any-file-name-candidates-p',
 ;;    `icicle-prefix-candidates', `icicle-prefix-complete-1',
 ;;    `icicle-prefix-complete-2', `icicle-prefix-keys-first-p',
 ;;    `icicle-read-args-w-val-satisfying', `icicle-read-char-by-name',
 ;;    `icicle-read-args-for-set-completion-methods',
 ;;    `icicle-read-char-exclusive',
-;;    `icicle-read-char-maybe-completing', `icicle-read-face-name',
+;;    `icicle-read-char-maybe-completing',
+;;    `icicle-read-choose-window-args', `icicle-read-face-name',
 ;;    `icicle-read-file-name', `icicle-read-file-name-default',
 ;;    `icicle-read-from-minibuffer',
 ;;    `icicle-read-from-minibuf-nil-default', `icicle-read-number',
-;;    `icicle-read-shell-command',
+;;    `icicle-read-regexp', `icicle-read-shell-command',
 ;;    `icicle-read-shell-command-completing', `icicle-read-string',
 ;;    `icicle-read-string-completing',
 ;;    `icicle-read-var-value-satisfying', `icicle-rebind-global',
+;;    `icicle-recent-file-of-content-1',
 ;;    `icicle-recent-files-without-buffers.',
+;;    `icicle-recentf-include-p', `icicle-recentf-keep-p',
 ;;    `icicle-recentf-make-menu-items', `icicle-recompute-candidates',
 ;;    `icicle-redefine-standard-functions',
 ;;    `icicle-redefine-standard-options',
 ;;    `icicle-remove-from-recentf-candidate-action',
 ;;    `icicle-remove-if', `icicle-remove-if-not',
 ;;    `icicle-remove-property', `icicle-replace-mct-cand-in-mct',
-;;    `icicle-remove-saved-set-action',
+;;    `icicle-remove-saved-set-action', `icicle-repeat-command',
+;;    `icicle-repeat-complex-command--called-interactively-skip',
 ;;    `icicle-replace-input-w-parent-dir', `icicle-require-match-p',
 ;;    `icicle-restore-completion-keys',
 ;;    `icicle-restore-custom-minibuffer-keys',
 ;;    `icicle-retrieve-candidates-from-set', `icicle-reversible-sort',
 ;;    `icicle-row-wise-cand-nb',
 ;;    `icicle-run-icicle-post-command-hook',
-;;    `icicle-run-icicle-pre-command-hook', `icicle-saved-fileset-p',
+;;    `icicle-run-icicle-pre-command-hook',
+;;    `icicle-same-vector-keyseq-p', `icicle-saved-fileset-p',
 ;;    `icicle-save-or-restore-input', `icicle-save-raw-input',
 ;;    `icicle-scatter', `icicle-scatter-match',
 ;;    `icicle-scroll-or-update-Completions', `icicle-search-action',
 ;;    `icicle-search-choose-buffers', `icicle-search-cleanup',
 ;;    `icicle-search-define-candidates',
 ;;    `icicle-search-define-candidates-1',
+;;    `icicle-search-dired-marked-recursive-1',
 ;;    `icicle-search-file-found-p', `icicle-search-final-act',
 ;;    `icicle-search-help',
 ;;    `icicle-search-highlight-all-input-matches',
 ;;    `icicle-show-current-help-in-mode-line',
 ;;    `icicle-show-help-in-mode-line', `icicle-show-in-mode-line',
 ;;    `icicle-signum', `icicle-S-iso-lefttab-to-S-TAB',
-;;    `icicle-sit-for', `icicle-some',
-;;    `icicle-special-candidates-first-p', `icicle-split-input',
+;;    `icicle-sit-for', `icicle-some', `icicle-special-candidate-p',
+;;    `icicle-special-candidates-first-p', `icicle-special-display-p',
+;;    `icicle-special-variable-p', `icicle-split-input',
 ;;    `icicle-start-of-candidates-in-Completions',
 ;;    `icicle-string-match-p', `icicle-strip-ignored-files-and-sort',
 ;;    `icicle-subst-envvar-in-file-name',
 ;;    `icicle-unbind-key-completion-keys-for-map-var',
 ;;    `icicle-unbind-key-completion-keys-in-keymaps-from',
 ;;    `icicle-undo-std-completion-faces',
-;;    `icicle-unhighlight-lighter', `icicle-unmap',
+;;    `icicle-unhighlight-lighter', `icicle-unlist', `icicle-unmap',
 ;;    `icicle-unpropertize-completion',
 ;;    `icicle-unsorted-apropos-candidates',
 ;;    `icicle-unsorted-file-name-apropos-candidates',
 ;;    `icicle-unsorted-file-name-prefix-candidates',
-;;    `icicle-unsorted-prefix-candidates', `icicle-upcase',
-;;    `icicle-upcase-if-ignore-case', `icicle-update-and-next',
+;;    `icicle-unsorted-prefix-candidates',
+;;    `icicle-universal-argument--mode' (Emacs 24.4+),
+;;    `icicle-upcase', `icicle-upcase-if-ignore-case',
+;;    `icicle-update-and-next', `icicle-update-f-l-keywords',
 ;;    `icicle-update-ignored-extensions-regexp',
 ;;    `icicle-value-satisfies-type-p', `icicle-var-inherits-type-p',
 ;;    `icicle-var-is-of-type-p', `icicle-var-matches-type-p',
 ;;    `icicle-var-val-satisfies-type-p',
-;;    `icicle-widget-color-complete', `icicle-widgetp'.
+;;    `icicle-visit-marked-file-of-content-1', `icicle-wide-n-action',
+;;    `icicle-widget-color-complete', `icicle-widgetp',
+;;    `icicle-window-at-bottom-p', `icicle-window-at-left-p',
+;;    `icicle-window-at-right-p', `icicle-window-at-top-p',
+;;    `icicle-window-dedicated-p', `icicle-window-deletable-p',
+;;    `icicle-window-invisible-p', `icicle-WYSIWYG-font'.
 ;;
 ;;  Internal variables and constants defined in Icicles:
 ;;
 ;;    `icicle-allowed-sort-predicate', `icicle-anychar-regexp',
 ;;    `icicle-apply-nomsg', `icicle-apropos-complete-match-fn',
 ;;    `icicle-apropos-value-last-initial-cand-set',
-;;    `icicle-bookmark-history', `icicle-bookmark-list-names-only-p',
-;;    `icicle-bookmark-menu-map', `icicle-bookmark-types',
-;;    `icicle-buffer-config-history', `icicle-buffer-name-input-p',
-;;    `icicle-buffer-sort-first-time-p', `icicle-bufflist',
-;;    `icicle-candidate-action-fn', `icicle-candidate-alt-action-fn',
-;;    `icicle-candidate-entry-fn', `icicle-candidate-help-fn',
-;;    `icicle-candidate-nb', `icicle-candidate-properties-alist',
-;;    `icicle-candidates-alist', `icicle-cands-to-narrow',
-;;    `icicle-char-property-value-history',
+;;    `icicle-auto-no-sort-p', `icicle-bookmark-history',
+;;    `icicle-bookmark-list-names-only-p', `icicle-bookmark-menu-map',
+;;    `icicle-bookmark-types', `icicle-buffer-config-history',
+;;    `icicle-buffer-name-input-p', `icicle-buffer-sort-first-time-p',
+;;    `icicle-bufflist', `icicle-candidate-action-fn',
+;;    `icicle-candidate-alt-action-fn', `icicle-candidate-entry-fn',
+;;    `icicle-candidate-help-fn', `icicle-candidate-nb',
+;;    `icicle-candidate-properties-alist', `icicle-candidates-alist',
+;;    `icicle-cands-to-narrow', `icicle-char-property-value-history',
 ;;    `icicle-cmd-calling-for-completion', `icicle-cmd-reading-input',
 ;;    `icicle-color-history', `icicle-color-theme-history',
 ;;    `icicle-command-abbrev-history', `icicle-commands-for-abbrev',
 ;;    `icicle-complete-input-overlay', `icicle-complete-keys-alist',
 ;;    `icicle-completing-p',
 ;;    `icicle-completing-read+insert-candidates',
-;;    `icicle-completion-candidates',
+;;    `icicle-completion-candidates', `icicle-completion-map-vars',
 ;;    `icicle-completion-prompt-overlay',
 ;;    `icicle-completion-set-history',
 ;;    `icicle-Completions-misc-submenu',
 ;;    `icicle-crm-local-completion-map',
 ;;    `icicle-crm-local-must-match-map',
 ;;    `icicle-current-completion-candidate-overlay',
-;;    `icicle-current-completion-mode', `icicle-current-input',
+;;    `icicle-current-completion-mode',
+;;    `icicle-current-font-lock-part', `icicle-current-input',
 ;;    `icicle-current-raw-input', `icicle-current-TAB-method',
 ;;    `icicle-custom-menu-map', `icicle-cycling-p',
 ;;    `icicle-default-thing-insertion-flipped-p',
 ;;    `icicle-dirs-done', `icicle-doc-last-initial-cand-set',
 ;;    `icicle-dot-string-internal', `icicle-edit-menu-map',
 ;;    `icicle-edit-update-p', `icicle-ess-use-ido',
-;;    `icicle-exclude-default-proxies', `icicle-explore-final-choice',
+;;    `icicle-exclude-default-proxies', `icicle-existing-bufs',
+;;    `icicle-explore-final-choice',
 ;;    `icicle-explore-final-choice-full', `icicle-extra-candidates',
 ;;    `icicle-extra-candidates-dir-insert-p',
 ;;    `icicle-face-name-history', `icicle-fancy-candidates-p',
 ;;    `icicle-fancy-cands-internal-p', `icicle-file-menu-map',
 ;;    `icicle-file-name-completion-table', `icicle-files',
 ;;    `icicle-file-sort-first-time-p',
-;;    `icicle-filtered-default-value', `icicle-font-name-history',
-;;    `icicle-frame-alist', `icicle-frame-name-history',
-;;    `icicle-frames-menu-map', `icicle-full-cand-fn',
-;;    `icicle-function-name-history',
+;;    `icicle-filtered-default-value',
+;;    `icicle-find-file-abs-action-fn', `icicle-find-file-action-fn',
+;;    `icicle-font-name-history', `icicle-frame-alist',
+;;    `icicle-frame-name-history', `icicle-frames-menu-map',
+;;    `icicle-full-cand-fn', `icicle-function-name-history',
 ;;    `icicle-fundoc-last-initial-cand-set',
 ;;    `icicle-general-help-string',
 ;;    `icicle-get-alist-candidate-function',
+;;    `icicle-goto-imenu-menu-map', `icicle-goto-menu-map',
 ;;    `icicle-hist-cands-no-highlight', `icicle-hist-var',
 ;;    `icicle-ignored-extensions', `icicle-ignored-extensions-regexp',
 ;;    `icicle-incremental-completion-p', `icicle-info-buff',
 ;;    `icicle-kmacro-history',
 ;;    `icicle-last-apropos-complete-match-fn',
 ;;    `icicle-last-completion-candidate',
-;;    `icicle-last-completion-command', `icicle-last-input',
+;;    `icicle-last-completion-command',
+;;    `icicle-last-icomplete-mode-value', `icicle-last-input',
 ;;    `icicle-last-sort-comparer', `icicle-last-top-level-command',
 ;;    `icicle-last-transform-function', `icicle-last-thing-type',
-;;    `icicle-locate-file-action-fn',
-;;    `icicle-locate-file-no-symlinks-p', `icicle-lighter-truncation',
+;;    `icicle-locate-file-no-symlinks-p',
+;;    `icicle-locate-file-use-locate-p', `icicle-lighter-truncation',
 ;;    `icicle-list-use-nth-parts', `icicle-menu-map',
-;;    `icicle-minibuffer-message-ok-p', `icicle-minor-mode-map-entry',
-;;    `icicle-mode-line-help', `icicle-mode-map',
-;;    `icicle-ms-windows-drive-hash', `icicle-multi-completing-p',
-;;    `icicle-multi-inputs-action-fn', `icicle-must-match-regexp',
-;;    `icicle-must-not-match-regexp',
+;;    `icicle-minibuf-act-on-all-menu-map',
+;;    `icicle-minibuf-candidate-set-menu-map',
+;;    `icicle-minibuf-edit-menu-map' `icicle-minibuffer-message-ok-p',
+;;    `icicle-minibuf-history-menu-map',
+;;    `icicle-minibuf-save-retrieve-menu-map',
+;;    `icicle-minor-mode-map-entry', `icicle-mode-line-help',
+;;    `icicle-mode-map', `icicle-ms-windows-drive-hash',
+;;    `icicle-multi-completing-p', `icicle-multi-inputs-action-fn',
+;;    `icicle-must-match-regexp', `icicle-must-not-match-regexp',
 ;;    `icicle-must-pass-after-match-predicate',
 ;;    `icicle-must-pass-predicate', `icicle-named-colors',
 ;;    `icicle-narrow-regexp',
 ;;    `icicle-nb-candidates-before-truncation',
-;;    `icicle-nb-of-other-cycle-candidates', `icicle-new-last-cmd',
-;;    `icicle-next-apropos-complete-cycles-p',
+;;    `icicle-nb-of-other-cycle-candidates',
+;;    `icicle-new-bufs-to-keep', `icicle-new-bufs-to-kill',
+;;    `icicle-new-last-cmd', `icicle-next-apropos-complete-cycles-p',
 ;;    `icicle-next-prefix-complete-cycles-p',
-;;    `icicle-options-menu-map', `icicle-orig-buff',
+;;    `icicle-options-menu-map', `icicle-options-choose-menu-map',
+;;    `icicle-options-toggle-menu-map', `icicle-orig-buff',
 ;;    `icicle-ORIG-crm-local-completion-map',
 ;;    `icicle-ORIG-crm-local-must-match-map',
 ;;    `icicle-orig-extra-cands', `icicle-orig-font',
-;;    `icicle-orig-frame', `icicle-orig-menu-bar',
+;;    `icicle-orig-font-lock-keywords', `icicle-orig-frame',
+;;    `icicle-orig-menu-bar',
+;;    `icicle-orig-minibuffer-completion-pred',
+;;    `icicle-orig-minibuffer-completion-table',
+;;    `icicle-orig-must-match-regexp',
+;;    `icicle-orig-must-not-match-regexp',
 ;;    `icicle-orig-must-pass-after-match-pred',
-;;    `icicle-orig-pixelsize', `icicle-orig-pointsize',
-;;    `icicle-orig-pt-explore', `icicle-orig-read-file-name-fn',
+;;    `icicle-orig-must-pass-predicate', `icicle-orig-pixelsize',
+;;    `icicle-orig-pointsize', `icicle-orig-pt-explore',
+;;    `icicle-orig-read-file-name-fn',
 ;;    `icicle-orig-show-initially-flag',
 ;;    `icicle-orig-sort-orders-alist', `icicle-orig-window',
 ;;    `icicle-other-window', `icicle-path-variables',
 ;;    `icicle-progressive-completing-p', `icicle-prompt',
 ;;    `icicle-proxy-candidate-regexp', `icicle-proxy-candidates',
 ;;    `icicle-read-expression-map', `icicle-read-char-history',
-;;    `icicle-read-file-name-internal-fn' (Emacs 24+),
 ;;    `icicle-remove-icicles-props-p', `icicle-re-no-dot',
 ;;    `icicle-require-match-p', `icicle-reverse-multi-sort-p',
 ;;    `icicle-reverse-sort-p', `icicle-saved-candidate-overlays',
 ;;    `icicle-search-context-level', `icicle-search-context-regexp',
 ;;    `icicle-search-current-overlay', `icicle-search-final-choice',
 ;;    `icicle-search-history', `icicle-search-in-context-fn',
-;;    `icicle-searching-p', `icicle-search-level-overlays',
-;;    `icicle-search-map', `icicle-search-modes',
-;;    `icicle-search-menu-map', `icicle-search-tags-menu-map',
-;;    `icicle-search-overlays', `icicle-search-refined-overlays',
-;;    `icicle-search-replacement',
+;;    `icicle-searching-p', `icicle-search-regexp',
+;;    `icicle-search-level-overlays', `icicle-search-map',
+;;    `icicle-search-modes', `icicle-search-menu-map',
+;;    `icicle-search-tags-menu-map', `icicle-search-overlays',
+;;    `icicle-search-refined-overlays', `icicle-search-replacement',
 ;;    `icicle-search-replacement-history',
 ;;    `icicle-successive-grab-count',
 ;;    `icicle-text-property-value-history',
 ;;    `icicle-toggle-transforming-message',
 ;;    `icicle-universal-argument-map',
 ;;    `icicle-vardoc-last-initial-cand-set',
-;;    `icicle-variable-name-history',
+;;    `icicle-variable-name-history', `icicle-vmfoc-other-win-p',
+;;    `icicle-vmfoc-recursive-p',
 ;;    `icicle-whole-candidate-as-text-prop-p',
 ;;    `lacarte-menu-items-alist'.
 ;;
 (require 'icicles-opt)  ;; Requires face
 (require 'icicles-var)  ;; Requires opt
 (require 'icicles-fn)   ;; Requires mac, opt, var
-(require 'icicles-mcmd) ;; Requires opt, var, fn, mac
+(require 'icicles-mcmd) ;; Requires mac, opt, var, fn
 (require 'icicles-cmd1) ;; Requires mac, opt, var, fn, mcmd
 (require 'icicles-cmd2) ;; Requires mac, opt, var, fn, mcmd, cmd1
-(require 'icicles-mode) ;; Requires face, opt, cmd
+(require 'icicles-mode) ;; Requires mac, face, opt, cmd1, cmd2
 
  
 ;;(@* "Miscellaneous")
                   '("icicle-define-add-to-alist-command" "icicle-define-bookmark-command"
                     "icicle-define-bookmark-other-window-command" "icicle-define-command"
                     "icicle-define-file-command" "icicle-define-search-bookmark-command"
-                    "icicle-define-sort-command")
+                    "icicle-define-sort-command" "icicle-with-help-window"
+                    "icicle-with-selected-window")
                   t)
              (if (> emacs-major-version 21)
                  "\\_>[ \t'\(]*\\(\\(\\sw\\|\\s_\\)+\\)?"
 (put 'icicle-define-file-command                  'common-lisp-indent-function '(4 &body))
 (put 'icicle-define-search-bookmark-command       'common-lisp-indent-function '(4 &body))
 (put 'icicle-define-sort-command                  'common-lisp-indent-function '(4 4 &body))
+(put 'icicle-with-help-window                     'common-lisp-indent-function '(4 &body))
 (put 'icicle-with-selected-window                 'common-lisp-indent-function '(4 &body))
 (put 'icicle-condition-case-no-debug              'common-lisp-indent-function '(4 4 &body))
 
+(unless (fboundp 'cl-flet)
+  (put 'cl-flet 'common-lisp-indent-function '((&whole 4 &rest
+                                                (&whole 1 &lambda &body))
+                                               &body)))
 
 
 ;; You might also want to use the following or something similar.