emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r108654: * minibuffer.el (read-file-n


From: Michael Albinus
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r108654: * minibuffer.el (read-file-name-default): Revert the patch from 2012-06-17.
Date: Mon, 18 Jun 2012 22:39:52 +0200
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 108654
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Mon 2012-06-18 22:39:52 +0200
message:
  * minibuffer.el (read-file-name-default): Revert the patch from 2012-06-17.
modified:
  lisp/ChangeLog
  lisp/minibuffer.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-18 19:23:35 +0000
+++ b/lisp/ChangeLog    2012-06-18 20:39:52 +0000
@@ -1,3 +1,8 @@
+2012-06-18  Michael Albinus  <address@hidden>
+
+       * minibuffer.el (read-file-name-default): Revert the patch from
+       2012-06-17.
+
 2012-06-18  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/pcase.el (pcase--expand): Warn for unused pattern.

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2012-06-17 18:54:39 +0000
+++ b/lisp/minibuffer.el        2012-06-18 20:39:52 +0000
@@ -461,7 +461,7 @@
            (last (last completions)))
         (when (consp last) (setcdr last nil))
         completions))
-        
+
      ((eq action 'completion--unquote)
       (let ((ustring (funcall unquote string))
             (uprefix (funcall unquote (substring string 0 pred))))
@@ -2335,8 +2335,7 @@
            (if (consp default-filename)
                (mapcar 'abbreviate-file-name default-filename)
              (abbreviate-file-name default-filename))))
-  (let ((non-essential t)
-       (insdef (cond
+  (let ((insdef (cond
                  ((and insert-default-directory (stringp dir))
                   (if initial
                       (cons (minibuffer--double-dollars (concat dir initial))


reply via email to

[Prev in Thread] Current Thread [Next in Thread]