Mercurial > hg > xemacs-beta

comparison lisp/prim/startup.el @ 163:0132846995bd r20-3b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b8
author cvs
date Mon, 13 Aug 2007 09:43:35 +0200
parents 43dd3413c7c7
children 929b76928fce
comparison
equal deleted inserted replaced
162:4de2936b4e77 163:0132846995bd
545 ;; Strip off last hyphen and what follows, then try again 545 ;; Strip off last hyphen and what follows, then try again
546 (if (setq hyphend (string-match "[-_][^-_]+\\'" term)) 546 (if (setq hyphend (string-match "[-_][^-_]+\\'" term))
547 (setq term (substring term 0 hyphend)) 547 (setq term (substring term 0 hyphend))
548 (setq term nil)))))) 548 (setq term nil))))))
549 549
550
551
550 (defun load-user-init-file (init-file-user) 552 (defun load-user-init-file (init-file-user)
551 ;; This function actually reads the init files. 553 "This function actually reads the init files.
554 First try .xemacs, then try .emacs, but only load one of the two."
552 (when init-file-user 555 (when init-file-user
553 (setq user-init-file 556 (setq user-init-file
554 (cond 557 (cond
555 ((eq system-type 'ms-dos) 558 ((eq system-type 'ms-dos)
556 (concat "~" init-file-user "/_emacs")) 559 (concat "~" init-file-user "/_xemacs"))
557 ((eq system-type 'vax-vms) 560 ((eq system-type 'vax-vms)
558 "sys$login:.emacs") 561 "sys$login:.xemacs")
559 (t 562 (t
560 (concat "~" init-file-user "/.emacs")))) 563 (concat "~" init-file-user "/.xemacs"))))
564 (unless (file-exists-p (expand-file-name user-init-file))
565 (setq user-init-file
566 (cond
567 ((eq system-type 'ms-dos)
568 (concat "~" init-file-user "/_emacs"))
569 ((eq system-type 'vax-vms)
570 "sys$login:.emacs")
571 (t
572 (concat "~" init-file-user "/.emacs")))))
561 (load user-init-file t t t) 573 (load user-init-file t t t)
574 (when (string= custom-file (concat "~" init-file-user "/.xemacs-custom"))
575 (load (concat "~" init-file-user "/.xemacs-custom") t t))
562 (unless inhibit-default-init 576 (unless inhibit-default-init
563 (let ((inhibit-startup-message nil)) 577 (let ((inhibit-startup-message nil))
564 ;; Users are supposed to be told their rights. 578 ;; Users are supposed to be told their rights.
565 ;; (Plus how to get help and how to undo.) 579 ;; (Plus how to get help and how to undo.)
566 ;; Don't you dare turn this off for anyone except yourself. 580 ;; Don't you dare turn this off for anyone except yourself.