mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

Use help-print-return-message rather than the now obsolete alias.

Browse source
This commit is contained in:
Glenn Morris 2009-08-21 07:24:26 +00:00
parent a8ab722f60
commit d5d105e863
15 changed files with 53 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lisp/ChangeLog
View file

@ -1,5 +1,22 @@
2009-08-21 Glenn Morris <rgm@gnu.org>
* apropos.el (apropos-command):
* ehelp.el (electric-helpify):
* printing.el (pr-show-setup):
* strokes.el (strokes-help):
* tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--detailed-help):
* woman.el (woman-mini-help, woman-display-extended-fonts):
* calc/calc-help.el (calc-describe-key):
* emulation/edt.el (edt-electric-helpify):
* international/mule-diag.el (mule-diag):
* play/yow.el (apropos-zippy):
* progmodes/python.el (python-describe-symbol):
* progmodes/vhdl-mode.el (vhdl-doc-variable, vhdl-doc-mode):
* textmodes/table.el (*table--cell-describe-mode)
(*table--cell-describe-bindings):
Use help-print-return-message rather than the now obsolete alias.
* calendar/cal-move.el (calendar-cursor-to-nearest-date)
(calendar-cursor-to-visible-date): Use forward-line, not goto-line.

2
lisp/apropos.el
View file

@ -466,7 +466,7 @@ while a list of strings is used as a word list."
(apropos-parse-pattern pattern)
(let ((message
(let ((standard-output (get-buffer-create "*Apropos*")))
(print-help-return-message 'identity))))
(help-print-return-message 'identity))))
(or do-all (setq do-all apropos-do-all))
(setq apropos-accumulator
(apropos-internal apropos-regexp

8
lisp/calc/calc-help.el
View file

@ -1,7 +1,7 @@
;;; calc-help.el --- help display functions for Calc,
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
;; 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
@ -283,7 +283,7 @@ C-w Describe how there is no warranty for Calc."
(beginning-of-line)
(princ (buffer-substring pt (point))))
(setq notes (cdr notes)))
(print-help-return-message)))
(help-print-return-message)))
(calc-unread-command (cdr key)))))
(if (or (null defn) (integerp defn))
(message "%s is undefined" desc)
@ -466,7 +466,7 @@ C-w Describe how there is no warranty for Calc."
calc-shift-Y-prefix-help
calc-shift-Z-prefix-help
calc-z-prefix-help)))
(print-help-return-message)))
(help-print-return-message)))
(defun calc-h-prefix-help ()
(interactive)

6
lisp/ehelp.el
View file

@ -292,7 +292,7 @@ will select it.)"
(let ((name (or name "*Help*")))
(if (save-window-excursion
;; kludge-o-rama
(let* ((p (symbol-function 'print-help-return-message))
(let* ((p (symbol-function 'help-print-return-message))
(b (get-buffer name))
(m (buffer-modified-p b)))
(and b (not (get-buffer-window b))
@ -325,14 +325,14 @@ will select it.)"
(save-excursion
(set-buffer b)
(set-buffer-modified-p t)))
(fset 'print-help-return-message 'ignore)
(fset 'help-print-return-message 'ignore)
(call-interactively fun)
(and (get-buffer name)
(get-buffer-window (get-buffer name))
(or (not b)
(not (eq b (get-buffer name)))
(not (buffer-modified-p b)))))
(fset 'print-help-return-message p)
(fset 'help-print-return-message p)
(and b (buffer-name b)
(save-excursion
(set-buffer b)

2
lisp/emerge.el
View file

@ -3023,7 +3023,7 @@ If some prefix of KEY has a non-prefix definition, it is redefined."
;; (save-excursion
;; (set-buffer standard-output)
;; (help-mode))
;; (print-help-return-message)))
;; (help-print-return-message)))
;; This goes with the redefinition of describe-mode.
;;;; Adjust things so that keyboard macro definitions are documented correctly.

6
lisp/emulation/edt.el
View file

@ -2648,7 +2648,7 @@ G-C-\\: Split Window | FNDNXT | Yank | CUT |
(defun edt-electric-helpify (fun)
(let ((name "*Help*"))
(if (save-window-excursion
(let* ((p (symbol-function 'print-help-return-message))
(let* ((p (symbol-function 'help-print-return-message))
(b (get-buffer name))
(m (buffer-modified-p b)))
(and b (not (get-buffer-window b))
@ -2660,14 +2660,14 @@ G-C-\\: Split Window | FNDNXT | Yank | CUT |
(save-excursion
(set-buffer b)
(set-buffer-modified-p t)))
(fset 'print-help-return-message 'ignore)
(fset 'help-print-return-message 'ignore)
(call-interactively fun)
(and (get-buffer name)
(get-buffer-window (get-buffer name))
(or (not b)
(not (eq b (get-buffer name)))
(not (buffer-modified-p b)))))
(fset 'print-help-return-message p)
(fset 'help-print-return-message p)
(and b (buffer-name b)
(save-excursion
(set-buffer b)

2
lisp/international/mule-diag.el
View file

@ -1130,7 +1130,7 @@ system which uses fontsets)."
(insert "------------\t\t\t\t\t\t ----- -----\n")
(dolist (fontset (fontset-list))
(print-fontset fontset t)))
(print-help-return-message))))
(help-print-return-message))))
;;;###autoload
(defun font-show-log (&optional limit)

6
lisp/play/yow.el
View file

@ -1,7 +1,7 @@
;;; yow.el --- quote random zippyisms
;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004, 2005,
;; 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Author: Richard Mlynarik
@ -101,7 +101,7 @@ If called interactively, display a list of matches."
(princ (car l))
(setq l (cdr l))
(and l (princ "\n\n")))
(print-help-return-message))))))
(help-print-return-message))))))
matches))

6
lisp/printing.el
View file

@ -1,7 +1,7 @@
;;; printing.el --- printing utilities
;; Copyright (C) 2000, 2001, 2003, 2004, 2005,
;; 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009
;; Free Software Foundation, Inc.
;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
@ -5506,7 +5506,7 @@ If menu binding was not done, calls `pr-menu-bind'."
(defun pr-show-setup (settings buffer-name)
(with-output-to-temp-buffer buffer-name
(princ settings)
(print-help-return-message)))
(help-print-return-message)))
(defun pr-complete-alist (prompt alist default)

2
lisp/progmodes/python.el
View file

@ -1787,7 +1787,7 @@ will."
;; Fixme: Is this actually useful?
(help-setup-xref (list 'python-describe-symbol symbol) (interactive-p))
(set (make-local-variable 'comint-redirect-subvert-readonly) t)
(print-help-return-message))))
(help-print-return-message))))
(comint-redirect-send-command-to-process (format "emacs.ehelp(%S, %s)"
symbol python-imports)
"*Help*" (python-proc) nil nil))

4
lisp/progmodes/vhdl-mode.el
View file

@ -16979,7 +16979,7 @@ to visually support naming conventions.")
(princ (documentation-property variable 'variable-documentation))
(with-current-buffer standard-output
(help-mode))
(print-help-return-message)))
(help-print-return-message)))
(defun vhdl-doc-mode ()
"Display VHDL Mode documentation in *Help* buffer."
@ -16993,7 +16993,7 @@ to visually support naming conventions.")
(princ (documentation 'vhdl-mode))
(with-current-buffer standard-output
(help-mode))
(print-help-return-message)))
(help-print-return-message)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

6
lisp/strokes.el
View file

@ -1,7 +1,7 @@
;;; strokes.el --- control Emacs through mouse strokes
;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
;; 2008, 2009 Free Software Foundation, Inc.
;; Author: David Bakhash <cadet@alum.mit.edu>
;; Maintainer: FSF
@ -1028,7 +1028,7 @@ o Strokes are a bit computer-dependent in that they depend somewhat on
by customizing the group `strokes' via \\[customize-group]."))
(set-buffer standard-output)
(help-mode)
(print-help-return-message)))
(help-print-return-message)))
(defalias 'strokes-report-bug 'report-emacs-bug)

10
lisp/textmodes/table.el
View file

@ -1,12 +1,12 @@
;;; table.el --- create and edit WYSIWYG text based embedded tables
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
;; 2009 Free Software Foundation, Inc.
;; Keywords: wp, convenience
;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com>
;; Created: Sat Jul 08 2000 13:28:45 (PST)
;; Revised: Thu Jan 08 2009 20:17:04 (PST)
;; Revised: Fri Aug 21 2009 00:16:58 (PDT)
;; This file is part of GNU Emacs.
@ -4078,7 +4078,7 @@ fit in the cell width the word is folded into the next line. The
folded location is marked by a continuation character which is
specified in the variable `table-word-continuation-char'.
")
(print-help-return-message))))
(help-print-return-message))))
(defun *table--cell-describe-bindings ()
"Table cell version of `describe-bindings'."
@ -4096,7 +4096,7 @@ key binding
(key-description (car binding))
(cdr binding))))
table-cell-bindings)
(print-help-return-message))))
(help-print-return-message))))
(defun *table--cell-dabbrev-expand (arg)
"Table cell version of `dabbrev-expand'."

4
lisp/tutorial.el
View file

@ -163,7 +163,7 @@ options:
(format "%s" db)
"'.")))
(fill-region (point-min) (point)))))
(print-help-return-message))))
(help-print-return-message))))
(defun tutorial--sort-keys (left right)
"Sort predicate for use with `tutorial--default-keys'.
@ -388,7 +388,7 @@ from the Emacs default:\n\n" )
(insert "
It is OK to change key bindings, but changed bindings do not
correspond to what the tutorial says.\n\n")
(print-help-return-message)))))
(help-print-return-message)))))
(defun tutorial--find-changed-keys (default-keys)
"Find the key bindings used in the tutorial that have changed.

8
lisp/woman.el
View file

@ -1,7 +1,7 @@
;;; woman.el --- browse UN*X manual pages `wo (without) man'
;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
;; 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
;; 2009 Free Software Foundation, Inc.
;; Author: Francis J. Wright <F.J.Wright@qmul.ac.uk>
;; Maintainer: FSF
@ -1970,7 +1970,7 @@ Optional argument REDRAW, if non-nil, forces mode line to be updated."
(require 'apropos)
(let ((message
(let ((standard-output (get-buffer-create "*Apropos*")))
(print-help-return-message 'identity))))
(help-print-return-message 'identity))))
(setq apropos-accumulator
(apropos-internal "woman"
(lambda (symbol)
@ -2973,7 +2973,7 @@ Useful for constructing the alist variable `woman-special-characters'."
(setq i (1+ i))
(when (= i 128) (setq i 160) (insert "\n"))
(if (zerop (% i 8)) (insert "\n")))))
(print-help-return-message)))
(help-print-return-message)))
;;; Formatting macros that do not cause a break: