diff options
| author | Mark Oteiza | 2016-11-04 12:45:51 -0400 |
|---|---|---|
| committer | Mark Oteiza | 2016-11-04 12:51:04 -0400 |
| commit | 2c6920a3650b07f597ceb22c883710f464a41d94 (patch) | |
| tree | dc8c20d8e4d6a717ac318b8e04fff01fcc39a47a /lisp/textmodes | |
| parent | abe594c0990a4e6bc72b20b7ff06b4b0c01a682c (diff) | |
| download | emacs-2c6920a3650b07f597ceb22c883710f464a41d94.tar.gz emacs-2c6920a3650b07f597ceb22c883710f464a41d94.zip | |
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.
Diffstat (limited to 'lisp/textmodes')
| -rw-r--r-- | lisp/textmodes/reftex-toc.el | 14 | ||||
| -rw-r--r-- | lisp/textmodes/sgml-mode.el | 2 |
2 files changed, 8 insertions, 8 deletions
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." | |||
| 942 | (with-selected-window toc-window | 942 | (with-selected-window toc-window |
| 943 | (reftex-unhighlight 0))) | 943 | (reftex-unhighlight 0))) |
| 944 | ((eq final 'hide) | 944 | ((eq final 'hide) |
| 945 | (let ((show-window (selected-window)) | 945 | (let ((window (selected-window)) |
| 946 | (show-buffer (window-buffer))) | 946 | (buffer (window-buffer))) |
| 947 | (unless (eq show-window toc-window) ;FIXME: Can this happen? | 947 | (unless (eq window toc-window) ;FIXME: Can this happen? |
| 948 | (with-selected-window toc-window | 948 | (with-selected-window toc-window |
| 949 | (reftex-unhighlight 0) | 949 | (reftex-unhighlight 0) |
| 950 | (or (one-window-p) (delete-window)))) | 950 | (or (one-window-p) (delete-window)))) |
| 951 | ;; If `show-window' is still live, show-buffer is already visible | 951 | ;; If window is still live, buffer is already visible |
| 952 | ;; so let's not make it visible in yet-another-window. | 952 | ;; so let's not make it visible in yet-another-window. |
| 953 | (unless (window-live-p show-window) | 953 | (unless (window-live-p window) |
| 954 | ;; FIXME: How could show-window not be live? | 954 | ;; FIXME: How could window not be live? |
| 955 | (switch-to-buffer show-buffer)) | 955 | (pop-to-buffer-same-window buffer)) |
| 956 | (reftex-re-enlarge))) | 956 | (reftex-re-enlarge))) |
| 957 | (t | 957 | (t |
| 958 | (unless (eq (selected-frame) (window-frame toc-window)) | 958 | (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.") | |||
| 1926 | ("hgroup" \n) | 1926 | ("hgroup" \n) |
| 1927 | ("html" (\n | 1927 | ("html" (\n |
| 1928 | "<head>\n" | 1928 | "<head>\n" |
| 1929 | "<title>" (setq str (read-input "Title: ")) "</title>\n" | 1929 | "<title>" (setq str (read-string "Title: ")) "</title>\n" |
| 1930 | "</head>\n" | 1930 | "</head>\n" |
| 1931 | "<body>\n<h1>" str "</h1>\n" _ | 1931 | "<body>\n<h1>" str "</h1>\n" _ |
| 1932 | "\n<address>\n<a href=\"mailto:" | 1932 | "\n<address>\n<a href=\"mailto:" |