diff options
| -rw-r--r-- | doc/lispintro/emacs-lisp-intro.texi | 2 | ||||
| -rw-r--r-- | doc/misc/cl.texi | 2 | ||||
| -rw-r--r-- | doc/misc/speedbar.texi | 2 | ||||
| -rw-r--r-- | lisp/emulation/viper.el | 2 | ||||
| -rw-r--r-- | lisp/textmodes/reftex-toc.el | 14 | ||||
| -rw-r--r-- | 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 86c8da0e461..958dba13a2b 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 c62fa727c10..4f15cf53d4a 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 d43c521f76a..27b57c0a03a 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 1ee1464ac73..04a7c22e787 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 915acc8382d..5df4178b966 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 43effefdecd..13c3cfbca40 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:" |