[Emacs-diffs] /srv/bzr/emacs/trunk r112227: * lisp/ido.el (ido-completions): Use extra elements of ido-decorations.

[Stefan Monnier]

------------------------------------------------------------
revno: 112227
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14143
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2013-04-05 10:00:08 -0400
message:
  * lisp/ido.el (ido-completions): Use extra elements of ido-decorations.
  (ido-decorations): Update docstring.
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/ido.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-03-30 13:49:00 +0000
+++ b/etc/NEWS  2013-04-05 14:00:08 +0000
@@ -87,6 +87,8 @@
 
 * Changes in Specialized Modes and Packages in Emacs 24.4
 
+** `ido-decorations' has been slightly extended to give a bit more control.
+
 ** More packages look for ~/.emacs.d/<foo> additionally to ~/.<foo>.
 Affected files:
 ~/.emacs.d/timelog     replaces  ~/.timelog

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-04-05 10:18:43 +0000
+++ b/lisp/ChangeLog    2013-04-05 14:00:08 +0000
@@ -1,3 +1,9 @@
+2013-04-05  Stefan Monnier  <address@hidden>
+
+       * ido.el (ido-completions): Use extra elements of ido-decorations
+       (bug#14143).
+       (ido-decorations): Update docstring.
+
 2013-04-05  Michael Albinus  <address@hidden>
 
        * autorevert.el (auto-revert-mode, auto-revert-tail-mode)

=== modified file 'lisp/ido.el'
--- a/lisp/ido.el       2013-03-20 03:05:34 +0000
+++ b/lisp/ido.el       2013-04-05 14:00:08 +0000
@@ -765,7 +765,7 @@
 
 (defcustom ido-decorations '( "{" "}" " | " " | ..." "[" "]" " [No match]" " 
[Matched]" " [Not readable]" " [Too big]" " [Confirm]")
   "List of strings used by ido to display the alternatives in the minibuffer.
-There are 11 elements in this list:
+There are between 11 and 13 elements in this list:
 1st and 2nd elements are used as brackets around the prospect list,
 3rd element is the separator between prospects (ignored if `ido-separator' is 
set),
 4th element is the string inserted at the end of a truncated list of prospects,
@@ -775,7 +775,9 @@
 8th element is displayed if there is a single match (and faces are not used),
 9th element is displayed when the current directory is non-readable,
 10th element is displayed when directory exceeds `ido-max-directory-size',
-11th element is displayed to confirm creating new file or buffer."
+11th element is displayed to confirm creating new file or buffer.
+12th and 13th elements (if present) are used as brackets around the sole
+remaining completion.  If absent, elements 5 and 6 are used instead."
   :type '(repeat string)
   :group 'ido)
 
@@ -4581,10 +4583,12 @@
                          (string-equal (match-string 0 (ido-name (car comps)))
                                        (ido-name (car comps))))
                        ""
-                     ;; when there is one match, show the matching file name 
in full
-                     (concat (nth 4 ido-decorations)  ;; [ ... ]
-                             (ido-name (car comps))
-                             (nth 5 ido-decorations)))
+                     ;; When there is only one match, show the matching file
+                     ;; name in full, wrapped in [ ... ].
+                     (concat
+                      (or (nth 11 ido-decorations) (nth 4 ido-decorations))
+                      (ido-name (car comps))
+                      (or (nth 12 ido-decorations) (nth 5 ido-decorations))))
                   (if (not ido-use-faces) (nth 7 ido-decorations))))  ;; 
[Matched]
          (t                            ;multiple matches
           (let* ((items (if (> ido-max-prospects 0) (1+ ido-max-prospects) 
999))