*** empty log message ***

[bpt/emacs.git] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index 1919c28..b7d1a1d 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -755,16 +755,6 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
               (not (fboundp 'x-show-tip)))
     (tooltip-mode 1))
 
-  ;; If you change the code below, you need to also change the
-  ;; corresponding code in the xterm-mouse-mode defcustom.  The two need
-  ;; to be equivalent under all conditions, or Custom will get confused.
-  (unless (or noninteractive
-             window-system)
-    (let ((term (getenv "TERM")))
-      (and term
-          (string-match "^\\(xterm\\|rxvt\\|dtterm\\|eterm\\)" term)
-          (xterm-mouse-mode 1))))
-
   ;; Register default TTY colors for the case the terminal hasn't a
   ;; terminal init file.
   (unless (memq window-system '(x w32))
@@ -1005,7 +995,8 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
   ;; the session manager and we have a session manager connection.
   (if (and (boundp 'x-session-previous-id)
            (stringp x-session-previous-id))
-      (emacs-session-restore x-session-previous-id)))
+      (with-no-warnings
+       (emacs-session-restore x-session-previous-id))))
 
 (defcustom initial-scratch-message (purecopy "\
 ;; This buffer is for notes you don't want to save, and for Lisp evaluation.
@@ -1117,7 +1108,7 @@ Values less than twice `fancy-splash-delay' are ignored."
 Arguments from ARGS should be either strings, functions called
 with no args that return a string, or pairs `:face FACE',
 where FACE is a valid face specification, as it can be used with
-`put-text-properties'."
+`put-text-property'."
   (let ((current-face nil))
     (while args
       (if (eq (car args) :face)
@@ -1640,11 +1631,11 @@ normal otherwise."
                  (kill-emacs t))
 
                 ((string-match "^\\+[0-9]+\\'" argi)
-                 (setq line (string-to-int argi)))
+                 (setq line (string-to-number argi)))
 
                 ((string-match "^\\+\\([0-9]+\\):\\([0-9]+\\)\\'" argi)
-                 (setq line (string-to-int (match-string 1 argi))
-                       column (string-to-int (match-string 2 argi))))
+                 (setq line (string-to-number (match-string 1 argi))
+                       column (string-to-number (match-string 2 argi))))
 
                 ((setq tem (assoc argi command-line-x-option-alist))
                  ;; Ignore X-windows options and their args if not using X.