[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog minibuffer.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog minibuffer.el |
Date: |
Wed, 14 Oct 2009 03:05:12 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 09/10/14 03:05:12
Modified files:
lisp : ChangeLog minibuffer.el
Log message:
(completion--file-name-table): Return nil if there's
no file completion, even if substitute-in-file-name changed
the string (bug#4708).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16418&r2=1.16419
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/minibuffer.el?cvsroot=emacs&r1=1.84&r2=1.85
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16418
retrieving revision 1.16419
diff -u -b -r1.16418 -r1.16419
--- ChangeLog 13 Oct 2009 22:35:44 -0000 1.16418
+++ ChangeLog 14 Oct 2009 03:05:06 -0000 1.16419
@@ -1,3 +1,9 @@
+2009-10-14 Stefan Monnier <address@hidden>
+
+ * minibuffer.el (completion--file-name-table): Return nil if there's
+ no file completion, even if substitute-in-file-name changed
+ the string (bug#4708).
+
2009-10-13 Juri Linkov <address@hidden>
* files-x.el (read-file-local-variable-value): Don't filter out
@@ -277,7 +283,7 @@
2009-10-05 Stefan Monnier <address@hidden>
- * help-fns.el (describe-function-1): Don't burp is the function is not
+ * help-fns.el (describe-function-1): Don't burp if the function is not
a symbol.
2009-10-05 Juanma Barranquero <address@hidden>
Index: minibuffer.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/minibuffer.el,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- minibuffer.el 24 Sep 2009 02:37:40 -0000 1.84
+++ minibuffer.el 14 Oct 2009 03:05:11 -0000 1.85
@@ -1078,16 +1078,18 @@
((null action)
(let ((comp (file-name-completion name realdir
read-file-name-predicate)))
- (if (stringp comp)
+ (cond
+ ((stringp comp)
;; Requote the $s before returning the completion.
- (minibuffer--double-dollars (concat specdir comp))
+ (minibuffer--double-dollars (concat specdir comp)))
+ (comp
;; Requote the $s before checking for changes.
(setq str (minibuffer--double-dollars str))
(if (string-equal string str)
comp
;; If there's no real completion, but substitute-in-file-name
;; changed the string, then return the new string.
- str))))
+ str)))))
((eq action t)
(let ((all (file-name-all-completions name realdir)))
- [Emacs-diffs] emacs/lisp ChangeLog minibuffer.el,
Stefan Monnier <=