[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/startup.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/startup.el |
Date: |
Sat, 05 Mar 2005 19:48:48 -0500 |
Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.339 emacs/lisp/startup.el:1.340
*** emacs/lisp/startup.el:1.339 Sat Mar 5 04:31:59 2005
--- emacs/lisp/startup.el Sun Mar 6 00:48:45 2005
***************
*** 1,7 ****
;;; startup.el --- process Emacs shell arguments
! ;; Copyright (C) 1985, 86, 92, 94, 95, 96, 97, 98, 99, 2000, 01, 02, 2004
! ;; Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
--- 1,7 ----
;;; startup.el --- process Emacs shell arguments
! ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
! ;; 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
***************
*** 565,586 ****
(setq command-line-default-directory default-directory)
;; Choose a reasonable location for temporary files.
! (setq temporary-file-directory
! (file-name-as-directory
! (cond ((memq system-type '(ms-dos windows-nt))
! (or (getenv "TEMP") (getenv "TMPDIR") (getenv "TMP") "c:/temp"))
! ((memq system-type '(vax-vms axp-vms))
! (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP")
"SYS$SCRATCH:"))
! (t
! (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "/tmp")))))
! (setq small-temporary-file-directory
! (if (eq system-type 'ms-dos)
! (getenv "TMPDIR")))
! (setq auto-save-file-name-transforms
! (list (list (car (car auto-save-file-name-transforms))
! ;; Don't put "\\2" inside expand-file-name, since
! ;; it will be transformed to "/2" on DOS/Windows.
! (concat temporary-file-directory "\\2") t)))
;; See if we should import version-control from the environment variable.
(let ((vc (getenv "VERSION_CONTROL")))
--- 565,573 ----
(setq command-line-default-directory default-directory)
;; Choose a reasonable location for temporary files.
! (custom-reevaluate-setting 'temporary-file-directory)
! (custom-reevaluate-setting 'small-emporary-file-directory)
! (custom-reevaluate-setting 'auto-save-file-name-transforms)
;; See if we should import version-control from the environment variable.
(let ((vc (getenv "VERSION_CONTROL")))
***************
*** 742,776 ****
(tool-bar-mode 1))
;; Can't do this init in defcustom because the relevant variables
! ;; are not set. If you make any changes to the `or' form below,
! ;; you should also change the corresponding expression in the
! ;; defcustom in frame.el, or Custom will be badly confused.
! (unless (or noninteractive
! no-blinking-cursor
! (eq system-type 'ms-dos)
! (not (memq window-system '(x w32))))
! (blink-cursor-mode 1))
!
! (unless noninteractive
! ;; DOS/Windows systems have a PC-type keyboard which has both
! ;; <delete> and <backspace> keys.
! (when (or (memq system-type '(ms-dos windows-nt))
! (and (memq window-system '(x))
! (fboundp 'x-backspace-delete-keys-p)
! (x-backspace-delete-keys-p))
! ;; If the terminal Emacs is running on has erase char
! ;; set to ^H, use the Backspace key for deleting
! ;; backward and, and the Delete key for deleting forward.
! (and (null window-system)
! (eq tty-erase-char 8)))
! (setq-default normal-erase-is-backspace t)
! (normal-erase-is-backspace-mode 1)))
(unless (or noninteractive
emacs-quick-startup
(not (display-graphic-p))
(not (fboundp 'x-show-tip)))
- (setq-default tooltip-mode t)
(tooltip-mode 1))
;; Register default TTY colors for the case the terminal hasn't a
--- 729,742 ----
(tool-bar-mode 1))
;; Can't do this init in defcustom because the relevant variables
! ;; are not set.
! (custom-reevaluate-setting 'blink-cursor-mode)
! (custom-reevaluate-setting 'normal-erase-is-backspace)
(unless (or noninteractive
emacs-quick-startup
(not (display-graphic-p))
(not (fboundp 'x-show-tip)))
(tooltip-mode 1))
;; Register default TTY colors for the case the terminal hasn't a
***************
*** 1751,1755 ****
(setq file (replace-match "/" t t file)))
file))
! ;;; arch-tag: 7e294698-244d-4758-984b-4047f887a5db
;;; startup.el ends here
--- 1717,1721 ----
(setq file (replace-match "/" t t file)))
file))
! ;; arch-tag: 7e294698-244d-4758-984b-4047f887a5db
;;; startup.el ends here