[Emacs-diffs] master 2c6920a: Fix references to long obsoleted functions/aliases

[Mark Oteiza]

branch: master
commit 2c6920a3650b07f597ceb22c883710f464a41d94
Author: Mark Oteiza <address@hidden>
Commit: Mark Oteiza <address@hidden>

    Fix references to long obsoleted functions/aliases
    
    * doc/lispintro/emacs-list-intro.texi (Miscellaneous):
    * doc/misc/cl.texi (Conditionals):
    * doc/misc/speedbar.texi (Major Display Modes): Use string-to-number,
    not string-to-int.
    * lisp/emulation/viper.el (viper-go-away): Use major-mode, not
    default-major-mode.
    * lisp/textmodes/reftex-toc.el (reftex-toc-visit-location): show-window
    here is not a function call, but shorten the binding names anyways.
    Also, use pop-to-buffer-same-window instead of switch-to-buffer cf
    Bug#22244.
    * lisp/textmodes/sgml-mode.el (html-tag-alist): Use read-string, not
    read-input.
---
 doc/lispintro/emacs-lisp-intro.texi |    2 +-
 doc/misc/cl.texi                    |    2 +-
 doc/misc/speedbar.texi              |    2 +-
 lisp/emulation/viper.el             |    2 +-
 lisp/textmodes/reftex-toc.el        |   14 +++++++-------
 lisp/textmodes/sgml-mode.el         |    2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/doc/lispintro/emacs-lisp-intro.texi 
b/doc/lispintro/emacs-lisp-intro.texi
index 86c8da0..958dba1 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -17647,7 +17647,7 @@ Set the shape and color of the mouse cursor:
       (setq mpointer "132")) ; top_left_arrow
 @end group
 @group
-  (setq x-pointer-shape (string-to-int mpointer))
+  (setq x-pointer-shape (string-to-number mpointer))
   (set-mouse-color "white"))
 @end group
 @end smallexample
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index c62fa72..4f15cf5 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -1486,7 +1486,7 @@ for a description of type specifiers.  For example,
 (cl-typecase x
   (integer (munch-integer x))
   (float (munch-float x))
-  (string (munch-integer (string-to-int x)))
+  (string (munch-integer (string-to-number x)))
   (t (munch-anything x)))
 @end example
 
diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi
index d43c521..27b57c0 100644
--- a/doc/misc/speedbar.texi
+++ b/doc/misc/speedbar.texi
@@ -1030,7 +1030,7 @@ it is not provided, you can derive it like this:
       (progn
         (beginning-of-line)
         (looking-at "^\\([0-9]+\\):")
-        (setq depth (string-to-int (match-string 1)))))
+        (setq depth (string-to-number (match-string 1)))))
 @end example
 
 @noindent
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 1ee1464..04a7c22 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -683,7 +683,7 @@ It also can't undo some Viper settings."
    (delq 'viper-mode-string global-mode-string))
 
   (setq-default major-mode
-                (viper-standard-value 'default-major-mode
+                (viper-standard-value 'major-mode
                                       viper-saved-non-viper-variables))
 
   (if (featurep 'emacs)
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el
index 915acc8..5df4178 100644
--- a/lisp/textmodes/reftex-toc.el
+++ b/lisp/textmodes/reftex-toc.el
@@ -942,17 +942,17 @@ label prefix determines the wording of a reference."
       (with-selected-window toc-window
         (reftex-unhighlight 0)))
      ((eq final 'hide)
-      (let ((show-window (selected-window))
-            (show-buffer (window-buffer)))
-        (unless (eq show-window toc-window) ;FIXME: Can this happen?
+      (let ((window (selected-window))
+            (buffer (window-buffer)))
+        (unless (eq window toc-window) ;FIXME: Can this happen?
           (with-selected-window toc-window
             (reftex-unhighlight 0)
             (or (one-window-p) (delete-window))))
-        ;; If `show-window' is still live, show-buffer is already visible
+        ;; If window is still live, buffer is already visible
         ;; so let's not make it visible in yet-another-window.
-        (unless (window-live-p show-window)
-          ;; FIXME: How could show-window not be live?
-          (switch-to-buffer show-buffer))
+        (unless (window-live-p window)
+          ;; FIXME: How could window not be live?
+          (pop-to-buffer-same-window buffer))
         (reftex-re-enlarge)))
      (t
       (unless (eq (selected-frame) (window-frame toc-window))
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 43effef..13c3cfb 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1926,7 +1926,7 @@ This takes effect when first loading the library.")
       ("hgroup" \n)
       ("html" (\n
               "<head>\n"
-              "<title>" (setq str (read-input "Title: ")) "</title>\n"
+              "<title>" (setq str (read-string "Title: ")) "</title>\n"
               "</head>\n"
               "<body>\n<h1>" str "</h1>\n" _
               "\n<address>\n<a href=\"mailto:";