upstream

8 files changed, 27 insertions, 6 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ec46ab5eb05..fc44828e8bf 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-25  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (Frequently Asked Questions): Mention
+        `tramp-completion-reread-directory-timeout' for performance
+        improvement.
+
 2012-10-25  Glenn Morris  <rgm@gnu.org>
 
         * cl.texi: Don't mess with the TeX section number counter.
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 46f99acbb87..a983f76ffd3 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2918,7 +2918,8 @@ information about remote hosts is kept in the file specified in
 @code{tramp-persistency-file-name}.  Keep this file.  If you are
 confident that files on remote hosts are not changed out of
 @value{emacsname}' control, set @code{remote-file-name-inhibit-cache}
-to @code{nil}.
+to @code{nil}.  Set also @code{tramp-completion-reread-directory-timeout}
+to @code{nil}, @ref{Filename completion}.
 
 Disable version control.  If you access remote files which are not
 under version control, a lot of check operations can be avoided by
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1150b68fe0f..ea75d3774a1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2012-10-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * dired.el (dired-get-marked-files): Allow ! on . and .. (bug#12725).
+
+        * minibuffer.el (minibuffer-force-complete): Fix thinko.
+
+        * net/ldap.el (ldap-search-internal): The official ldif format starts
+        with a "version: 1" header (bug#12724).
+
+        * emacs-lisp/package.el (package-installed-p): Warn if not ready
+        (bug#12721).
+
 2012-10-25  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp/cl-macs.el (cl-progv): Doc fix.
diff --git a/lisp/dired.el b/lisp/dired.el
index 9094ce08f0a..fb2f7281130 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -620,7 +620,7 @@ Don't use that together with FILTER."
   (let* ((all-of-them
           (save-excursion
             (dired-map-over-marks
-             (dired-get-filename localp)
+             (dired-get-filename localp 'no-error-if-not-filep)
              arg nil distinguish-one-marked)))
          result)
     (if (not filter)
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index 684ea42b157..86f04e4b5f5 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -260,7 +260,7 @@ Remove from SYMBOL's plist the property PROPNAME and its value.
 ;;;;;;  cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when
 ;;;;;;  cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp
 ;;;;;;  cl-gensym cl--compiler-macro-cXXr cl--compiler-macro-list*)
-;;;;;;  "cl-macs" "cl-macs.el" "366e9efa4e3e7a81b2253e503611b23a")
+;;;;;;  "cl-macs" "cl-macs.el" "bdc107ab6064c577d393152665c74ddd")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'cl--compiler-macro-list* "cl-macs" "\
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 28d166271fb..303642b5bec 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -728,6 +728,7 @@ It will move point to somewhere in the headers."
 (defun package-installed-p (package &optional min-version)
   "Return true if PACKAGE, of MIN-VERSION or newer, is installed.
 MIN-VERSION should be a version list."
+  (unless package--initialized (error "package.el is not yet initialized!"))
   (let ((pkg-desc (assq package package-alist)))
     (if pkg-desc
         (version-list-<= min-version
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 4267fe4db4f..4421e325b91 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1124,10 +1124,10 @@ Repeated uses step through the possible completions."
         (completion--message
        (if all "No more completions" "No completions")))
      ((not (consp (cdr all)))
-      (let ((mod (equal (car all) (buffer-substring-no-properties base end))))
-        (if mod (completion--replace base end (car all)))
+      (let ((done (equal (car all) (buffer-substring-no-properties base end))))
+        (unless done (completion--replace base end (car all)))
         (completion--done (buffer-substring-no-properties start (point))
-                          'finished (unless mod "Sole completion"))))
+                          'finished (when done "Sole completion"))))
      (t
       (completion--replace base end (car all))
       (completion--done (buffer-substring-no-properties start (point)) 'sole)
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index eb696798b6f..6ef713de93d 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -604,6 +604,7 @@ an alist of attribute/value pairs."
         ;; Skip error message when retrieving attribute list
         (if (looking-at "Size limit exceeded")
             (forward-line 1))
+        (if (looking-at "version:") (forward-line 1)) ;bug#12724.
         (while (progn
                  (skip-chars-forward " \t\n")
                  (not (eobp)))