Merge from emacs-24 branch; up to 2012-05-01T10:20:43Z!rgm@gnu.org

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

diff --git a/nt/paths.h b/nt/paths.h
index 21c039c..d3a41e3 100644 (file)
--- a/nt/paths.h
+++ b/nt/paths.h
@@ -1,6 +1,6 @@
 /* paths.h file for MS Windows
 
-Copyright (C) 1993, 1995, 1997, 1999, 2001-2011
+Copyright (C) 1993, 1995, 1997, 1999, 2001-2012
   Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -20,10 +20,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 /* The default search path for Lisp function "load".
-   This sets load-path.  */
+   Together with PATH_SITELOADSEARCH, this sets load-path.  */
 /* #define PATH_LOADSEARCH "/usr/local/lib/emacs/lisp" */
 #define PATH_LOADSEARCH "C:/emacs/lisp"
 
+/* Like PATH_LOADSEARCH, but contains the non-standard pieces.  */
+#define PATH_SITELOADSEARCH "C:/emacs/site-lisp"
+
 /* Like PATH_LOADSEARCH, but used only when Emacs is dumping.  This
    path is usually identical to PATH_LOADSEARCH except that the entry
    for the directory containing the installed lisp files has been