[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/man/custom.texi
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/man/custom.texi |
Date: |
Sat, 29 Oct 2005 23:56:17 -0400 |
Index: emacs/man/custom.texi
diff -c emacs/man/custom.texi:1.92 emacs/man/custom.texi:1.93
*** emacs/man/custom.texi:1.92 Sun Oct 23 18:01:25 2005
--- emacs/man/custom.texi Sun Oct 30 03:56:16 2005
***************
*** 1983,1995 ****
@cindex startup (init file)
When Emacs is started, it normally loads a Lisp program from the
! file @file{.emacs} or @file{.emacs.el} in your home directory. (You
! can also put it in a subdirectory @file{~/.emacs.d} and Emacs will
! still find it.) We call this file your @dfn{init file} because it
! specifies how to initialize Emacs for you. You can use the command
! line switch @samp{-q} to prevent loading your init file, and @samp{-u}
! (or @samp{--user}) to specify a different user's init file
! (@pxref{Initial Options}).
@cindex @file{default.el}, the default init file
There can also be a @dfn{default init file}, which is the library
--- 1983,1997 ----
@cindex startup (init file)
When Emacs is started, it normally loads a Lisp program from the
! file @file{.emacs} or @file{.emacs.el} in your home directory. We
! call this file your @dfn{init file} because it specifies how to
! initialize Emacs for you. You can use the command line switch
! @samp{-q} to prevent loading your init file, and @samp{-u} (or
! @samp{--user}) to specify a different user's init file (@pxref{Initial
! Options}).
!
! You can also use @file{~/.emacs.d/init.el} as the init file. Emacs
! tries this if it cannot find @file{~/.emacs} or @file{~/.emacs.el}.
@cindex @file{default.el}, the default init file
There can also be a @dfn{default init file}, which is the library