Sanitize processing of display specifiers; new option frame-auto-delete.

[bpt/emacs.git] / nt / paths.h

diff --git a/nt/paths.h b/nt/paths.h
index 64258d1..21c039c 100644 (file)
--- a/nt/paths.h
+++ b/nt/paths.h
@@ -1,12 +1,14 @@
-/* Copyright (C) 1993, 1995, 1997, 1999, 2001
-   Free Software Foundation, Inc.
+/* paths.h file for MS Windows
+
+Copyright (C) 1993, 1995, 1997, 1999, 2001-2011
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 /* The default search path for Lisp function "load".
@@ -44,22 +44,17 @@ Boston, MA 02111-1307, USA.  */
 /* #define PATH_DATA "/usr/local/lib/emacs/data" */
 #define PATH_DATA "C:/emacs/data"
 
+/* Where Emacs should look for X bitmap files.
+   The lisp variable x-bitmap-file-path is set based on this value.  */
+#define PATH_BITMAPS ""
+
 /* Where Emacs should look for its docstring file.  The lisp variable
    doc-directory is set to this value.  */
 #define PATH_DOC "C:/emacs/etc"
 
-/* The name of the directory that contains lock files with which we
-   record what files are being modified in Emacs.  This directory
-   should be writable by everyone.  THE STRING MUST END WITH A
-   SLASH!!!  */
-/* #define PATH_LOCK "/usr/local/lib/emacs/lock/" */
-#define PATH_LOCK "C:/emacs/lock/"
-
 /* Where the configuration process believes the info tree lives.  The
    lisp variable configure-info-directory gets its value from this
    macro, and is then used to set the Info-default-directory-list.  */
 /* #define PATH_INFO "/usr/local/info" */
 #define PATH_INFO "C:/emacs/info"
 
-/* arch-tag: f6d46f3c-e1e9-436b-8629-edcaf6597973
-   (do not change this comment) */