1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 18:40:39 -08:00

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.
This commit is contained in:
Mark Oteiza 2016-11-04 12:45:51 -04:00
parent abe594c099
commit 2c6920a365
6 changed files with 12 additions and 12 deletions

View file

@ -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)

View file

@ -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))

View file

@ -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:"