Custom Theme bugfixes.

[gnu-emacs] / lisp / pcomplete.el

diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 5dff6d954f8f7b734a97fdc4f09f0db46a37604b..785c62290c4e5eb12ab3b51c82bea1cc8d47526f 100644 (file)
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -1,6 +1,7 @@
 ;;; pcomplete.el --- programmable completion
 
-;; Copyright (C) 1999, 2000,01,02,03,04 Free Sofware Foundation
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+;;   2005 Free Sofware Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: processes abbrev
@@ -19,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -150,7 +151,7 @@ This mirrors the optional behavior of tcsh."
   :type 'boolean
   :group 'pcomplete)
 
-(defcustom pcomplete-suffix-list (list directory-sep-char ?:)
+(defcustom pcomplete-suffix-list (list ?/ ?:)
   "*A list of characters which constitute a proper suffix."
   :type '(repeat character)
   :group 'pcomplete)
@@ -740,7 +741,7 @@ component, `default-directory' is used as the basis for completion."
                 (function
                  (lambda (file)
                    (if (eq (aref file (1- (length file)))
-                           directory-sep-char)
+                           ?/)
                        (and pcomplete-dir-ignore
                             (string-match pcomplete-dir-ignore file))
                      (and pcomplete-file-ignore
@@ -757,11 +758,11 @@ component, `default-directory' is used as the basis for completion."
               ;; since . is earlier in the ASCII alphabet than
               ;; /
               (let ((left (if (eq (aref l (1- (length l)))
-                                  directory-sep-char)
+                                  ?/)
                               (substring l 0 (1- (length l)))
                             l))
                     (right (if (eq (aref r (1- (length r)))
-                                   directory-sep-char)
+                                   ?/)
                                (substring r 0 (1- (length r)))
                              r)))
                 (if above-cutoff
@@ -946,8 +947,10 @@ generate the completions list.  This means that the hook
 (unless (fboundp 'event-matches-key-specifier-p)
   (defalias 'event-matches-key-specifier-p 'eq))
 
-(unless (fboundp 'read-event)
-  (defsubst read-event (&optional prompt)
+(if (fboundp 'read-event)
+    (defsubst pcomplete-read-event (&optional prompt)
+      (read-event prompt))
+  (defsubst pcomplete-read-event (&optional prompt)
     (aref (read-key-sequence prompt) 0)))
 
 (unless (fboundp 'event-basic-type)
@@ -969,7 +972,7 @@ Typing SPC flushes the help buffer."
       (prog1
          (catch 'done
            (while (with-current-buffer (get-buffer "*Completions*")
-                    (setq event (read-event)))
+                    (setq event (pcomplete-read-event)))
              (cond
               ((event-matches-key-specifier-p event ? )
                (set-window-configuration pcomplete-last-window-config)