(input-method-exit-on-first-char):

[gnu-emacs] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index aa86b0828c072bb8f4d1d475412bb9ee693e3aaa..f3d4e6d5031d95a76472aa15c3e747b139b4bdde 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -134,7 +134,7 @@ with the contents of the startup message."
   "*Non-nil inhibits the initial startup echo area message.
 Setting this variable takes effect
 only if you do it with the customization buffer
-or it your `.emacs' file contains a line of this form:
+or if your `.emacs' file contains a line of this form:
  (setq inhibit-startup-echo-area-message \"YOUR-USER-NAME\")
 If your `.emacs' file is byte-compiled, use the following form instead:
  (eval '(setq inhibit-startup-echo-area-message \"YOUR-USER-NAME\"))
@@ -249,7 +249,7 @@ Emacs never sets this variable itself.")
   "The brand of keyboard you are using.
 This variable is used to define
 the proper function and keypad keys for use under X.  It is used in a
-fashion analogous to the environment value TERM.")
+fashion analogous to the environment variable TERM.")
 
 (defvar window-setup-hook nil
   "Normal hook run to initialize window system display.
@@ -339,8 +339,8 @@ from being initialized."
 (defun normal-top-level-add-subdirs-to-load-path ()
   "Add all subdirectories of current directory to `load-path'.
 More precisely, this uses only the subdirectories whose names
-start with letters or digits; it excludes any subdirectory named`RCS',
-and any subdirectory that contains a file named `.nosearch'."
+start with letters or digits; it excludes any subdirectory named `RCS'
+or `CVS', and any subdirectory that contains a file named `.nosearch'."
   (let (dirs 
        (pending (list default-directory)))
     ;; This loop does a breadth-first tree walk on DIR's subtree,
@@ -351,7 +351,7 @@ and any subdirectory that contains a file named `.nosearch'."
       (let ((contents (directory-files (car dirs)))
            (default-directory (car dirs)))
        (while contents
-         (unless (member (car contents) '("." ".." "RCS"))
+         (unless (member (car contents) '("." ".." "RCS" "CVS"))
            (when (and (string-match "\\`[a-zA-Z0-9]" (car contents))
                       (file-directory-p (car contents)))
              (let ((expanded (expand-file-name (car contents))))
@@ -361,7 +361,11 @@ and any subdirectory that contains a file named `.nosearch'."
          (setq contents (cdr contents)))))
     (normal-top-level-add-to-load-path (cdr (nreverse dirs)))))
 
-;; This function is called from the subdirs.el file.
+;; This function is called from a subdirs.el file.
+;; It assumes that default-directory is the directory
+;; in which the subdirs.el file exists,
+;; and it adds to load-path the subdirs of that directory
+;; as specified in DIRS.  Normally the elements of DIRS are relative.
 (defun normal-top-level-add-to-load-path (dirs)
   (let ((tail load-path)
        (thisdir (directory-file-name default-directory)))
@@ -382,6 +386,9 @@ and any subdirectory that contains a file named `.nosearch'."
       (save-excursion
        (set-buffer (get-buffer "*Messages*"))
        (setq default-directory dir)))
+    ;; For root, preserve owner and group when editing files.
+    (if (equal (user-uid) 0)
+       (setq backup-by-copying-when-mismatch t))
     ;; Look in each dir in load-path for a subdirs.el file.
     ;; If we find one, load it, which will add the appropriate subdirs
     ;; of that dir into load-path,
@@ -464,6 +471,16 @@ and any subdirectory that contains a file named `.nosearch'."
 (defun command-line ()
   (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")))))
+
   ;; See if we should import version-control from the environment variable.
   (let ((vc (getenv "VERSION_CONTROL")))
     (cond ((eq vc nil))                        ;don't do anything if not set
@@ -499,8 +516,8 @@ and any subdirectory that contains a file named `.nosearch'."
     (when (and ctype
               (string-match iso-8859-n-locale-regexp ctype))
       (let (charset (which (match-string 1 ctype)))
-       (if (equal "5" which)
-           (setq which "9"))
+       (if (equal "9" which)
+           (setq which "5"))
        (setq charset (concat "latin-" which))
        (when (string-match "latin-[12345]" charset)
          ;; Set up for this character set.
@@ -635,7 +652,7 @@ and any subdirectory that contains a file named `.nosearch'."
   (if site-run-file 
       (load site-run-file t t))
 
-  ;; Register avairable input methods by loading LEIM list file.
+  ;; Register available input methods by loading LEIM list file.
   (load "leim-list.el" 'noerror 'nomessage 'nosuffix)
 
   ;; Sites should not disable this.  Only individuals should disable
@@ -739,6 +756,7 @@ If this is nil, no message will be displayed."
 (defun command-line-1 (command-line-args-left)
   (or noninteractive (input-pending-p) init-file-had-error
       (and inhibit-startup-echo-area-message
+          user-init-file
           (or (and (get 'inhibit-startup-echo-area-message 'saved-value)
                    (equal inhibit-startup-echo-area-message
                           (if (string= init-file-user "")
@@ -811,7 +829,7 @@ If this is nil, no message will be displayed."
                       (if (assq 'display (frame-parameters))
                           (progn
                             (insert "\
-The menu bar above is sufficient for basic editing with the mouse.
+The menu bar and scroll bar are sufficient for basic editing with the mouse.
 
 Useful Files menu items:
 Exit Emacs             (or type Control-x followed by Control-c)