aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm2003-01-13 23:05:51 +0000
committerKim F. Storm2003-01-13 23:05:51 +0000
commita42e9704f249843536e7c54b44770dc73e7dcc3f (patch)
tree7a86d74ddc16664370908045f8ee21f265da7ed6
parente1e7e6dd4ef1d1a49606eaa1331558c0c22ace4d (diff)
downloademacs-a42e9704f249843536e7c54b44770dc73e7dcc3f.tar.gz
emacs-a42e9704f249843536e7c54b44770dc73e7dcc3f.zip
Rename ido-max-prompt-width to ido-max-file-prompt-width for consistency.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/ido.el8
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e455fa117fa..4eb73aa7c59 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,7 @@
12003-01-14 Kim F. Storm <storm@cua.dk> 12003-01-14 Kim F. Storm <storm@cua.dk>
2 2
3 * ido.el (ido-ignore-directories-merge): Doc fix. 3 * ido.el (ido-ignore-directories-merge): Doc fix.
4 (ido-max-prompt-width): Renamed from ido-max-prompt-path. 4 (ido-max-file-prompt-width): Renamed from ido-max-prompt-path.
5 (ido-enable-last-directory-history): Doc fix. 5 (ido-enable-last-directory-history): Doc fix.
6 (ido-work-directory-list-ignore-regexps): Doc fix. 6 (ido-work-directory-list-ignore-regexps): Doc fix.
7 (ido-enable-tramp-completion): Doc fix. 7 (ido-enable-tramp-completion): Doc fix.
diff --git a/lisp/ido.el b/lisp/ido.el
index 82b9485de33..76f7fa01a73 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -511,7 +511,7 @@ non-negletable amount of time; setting this variable reduces that time."
511 :type 'integer 511 :type 'integer
512 :group 'ido) 512 :group 'ido)
513 513
514(defcustom ido-max-prompt-width 0.35 514(defcustom ido-max-file-prompt-width 0.35
515 "*Non-zero means that the prompt string be limited to than number of characters. 515 "*Non-zero means that the prompt string be limited to than number of characters.
516If value is a floating point number, it specifies a fraction of the frame width." 516If value is a floating point number, it specifies a fraction of the frame width."
517 :type '(choice 517 :type '(choice
@@ -1395,9 +1395,9 @@ This function also adds a hook to the minibuffer."
1395 (cond 1395 (cond
1396 ((and (memq item '(file dir)) ido-current-directory) 1396 ((and (memq item '(file dir)) ido-current-directory)
1397 (let ((dirname (abbreviate-file-name ido-current-directory)) 1397 (let ((dirname (abbreviate-file-name ido-current-directory))
1398 (max-width (if (and ido-max-prompt-width (floatp ido-max-prompt-width)) 1398 (max-width (if (and ido-max-file-prompt-width (floatp ido-max-file-prompt-width))
1399 (floor (* (frame-width) ido-max-prompt-width)) 1399 (floor (* (frame-width) ido-max-file-prompt-width))
1400 ido-max-prompt-width)) 1400 ido-max-file-prompt-width))
1401 (literal (and (boundp 'ido-find-literal) ido-find-literal "(literal) ")) 1401 (literal (and (boundp 'ido-find-literal) ido-find-literal "(literal) "))
1402 (vc-off (and ido-saved-vc-mt (not vc-master-templates) "[-VC] ")) 1402 (vc-off (and ido-saved-vc-mt (not vc-master-templates) "[-VC] "))
1403 (prefix nil) 1403 (prefix nil)