(facemenu-complete-face-list): Doc fix.

[gnu-emacs] / lisp / hippie-exp.el

diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 408b80ee393b4bb6b596faadd7efa26d70dbfc14..bb59ac683827b3c82d8407277707288491f7c65a 100644 (file)
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -1,12 +1,12 @@
 ;;; hippie-exp.el --- expand text trying various ways to find its expansion.
 
+;; Copyright (C) 1992 Free Software Foundation, Inc.
+
 ;; Author: Anders Holst <aho@sans.kth.se>
 ;; Last change: 6 August 1995
 ;; Version: 1.4
 ;; Keywords: abbrev
 
-;; Copyright (C) 1992 Free Software Foundation, Inc.
-;;
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -20,11 +20,12 @@
 ;; GNU General Public License for more details.
 
 ;; 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; 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.
 
 ;;; Commentary:
-;;  
+
 ;;  `hippie-expand' is a single function for a lot of different kinds
 ;;  of completions and expansions.  Called repeatedly it tries all
 ;;  possible completions in succession. 
@@ -247,9 +248,9 @@ undoes the expansion."
              (ding))
            (if (and hippie-expand-verbose
                     (not (window-minibuffer-p (selected-window))))
-               (message (concat "Using "
-                                (prin1-to-string (nth he-num 
-                                  hippie-expand-try-functions-list)))))))
+               (message "Using %s"
+                        (prin1-to-string (nth he-num 
+                                  hippie-expand-try-functions-list))))))
       (if (and (>= he-num 0)
               (eq (marker-buffer he-string-beg) (current-buffer)))
          (progn
@@ -311,7 +312,7 @@ undoes the expansion."
                                                    (length to-str))))
         to-str)
        ((not (he-ordinary-case-p to-str))
-        to-string)
+        to-str)
        ((string= from-str (downcase from-str))
         (downcase to-str))
        ((string= from-str (upcase from-str))
@@ -444,7 +445,7 @@ otherwise."
 (defvar he-file-name-chars
   (cond ((memq system-type '(vax-vms axp-vms))
         "-a-zA-Z0-9_/.,~^#$+=:\\[\\]")
-       ((memq system-type '(ms-dos ms-windows))
+       ((memq system-type '(ms-dos windows-nt))
         "-a-zA-Z0-9_/.,~^#$+=:\\\\")
        (t                          ;; More strange file formats ?
         "-a-zA-Z0-9_/.,~^#$+="))