[Emacs-diffs] Changes to emacs/lisp/startup.el

[Richard M . Stallman]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.335 emacs/lisp/startup.el:1.336
*** emacs/lisp/startup.el:1.335 Tue Nov 30 07:20:19 2004
--- emacs/lisp/startup.el       Tue Dec 28 15:30:39 2004
***************
*** 229,237 ****
  override them.  Users can prevent loading `default.el' with the `-q'
  option or by setting `inhibit-default-init' in their own init files,
  but inhibiting `site-start.el' requires `--no-site-file', which
! is less convenient."
    :type '(choice (const :tag "none" nil) string)
!   :group 'initialization)
  
  (defcustom mail-host-address nil
    "*Name of this machine, for purposes of naming users."
--- 229,245 ----
  override them.  Users can prevent loading `default.el' with the `-q'
  option or by setting `inhibit-default-init' in their own init files,
  but inhibiting `site-start.el' requires `--no-site-file', which
! is less convenient.
! 
! This variable is defined for customization so as to make
! it visible in the relevant context.  However, actually customizing it
! is not allowed, since it would not work anyway.  The only way to set
! this variable usefully is to set it during while building and dumping Emacs."
    :type '(choice (const :tag "none" nil) string)
!   :group 'initialization
!   :initialize 'custom-initialize-default
!   :set '(lambda (variable value)
!         (error "Customizing `site-run-file' does not work")))
  
  (defcustom mail-host-address nil
    "*Name of this machine, for purposes of naming users."