[Emacs-diffs] emacs/lisp ChangeLog files.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/02/12 02:19:56

Modified files:
        lisp           : ChangeLog files.el 

Log message:
        (read-buffer-to-switch): Add table to icomplete-with-completion-tables.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15302&r2=1.15303
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1033&r2=1.1034

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15302
retrieving revision 1.15303
diff -u -b -r1.15302 -r1.15303
--- ChangeLog   11 Feb 2009 14:46:05 -0000      1.15302
+++ ChangeLog   12 Feb 2009 02:19:53 -0000      1.15303
@@ -1,3 +1,8 @@
+2009-02-12  Stefan Monnier  <address@hidden>
+
+       * files.el (read-buffer-to-switch):
+       Add table to icomplete-with-completion-tables.
+
 2009-02-11  Chong Yidong  <address@hidden>
 
        * dired-aux.el (dired-add-entry): Avoid munging long-form Dired
@@ -28,8 +33,8 @@
 
 2009-02-11  Chong Yidong  <address@hidden>
 
-       * emacs-lisp/find-func.el (find-library-name, find-library): Doc
-       fixes.  (Part of bug#2270)
+       * emacs-lisp/find-func.el (find-library-name, find-library):
+       Doc fixes.  (Part of bug#2270)
 
 2009-02-10  Eric Hanchrow  <address@hidden>  (tiny change)
 

Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.1033
retrieving revision 1.1034
diff -u -b -r1.1033 -r1.1034
--- files.el    7 Feb 2009 10:23:45 -0000       1.1033
+++ files.el    12 Feb 2009 02:19:55 -0000      1.1034
@@ -1156,7 +1156,17 @@
 and default values."
   (let ((rbts-completion-table (internal-complete-buffer-except)))
     (minibuffer-with-setup-hook
-        (lambda () (setq minibuffer-completion-table rbts-completion-table))
+        (lambda ()
+          (setq minibuffer-completion-table rbts-completion-table)
+          ;; Since rbts-completion-table is built dynamically, we
+          ;; can't just add it to the default value of
+          ;; icomplete-with-completion-tables, so we add it
+          ;; here manually.
+          (if (and (boundp 'icomplete-with-completion-tables)
+                   (listp icomplete-with-completion-tables))
+              (set (make-local-variable 'icomplete-with-completion-tables)
+                   (cons rbts-completion-table
+                         icomplete-with-completion-tables))))
       (read-buffer prompt (other-buffer (current-buffer))
                    (confirm-nonexistent-file-or-buffer)))))