diff options
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 2 | ||||
| -rw-r--r-- | lispref/variables.texi | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 29167c70812..b23217151e3 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | 45 | ||
| 46 | ;; Major modes for other languages may use Eldoc by defining an | 46 | ;; Major modes for other languages may use Eldoc by defining an |
| 47 | ;; appropriate function as the buffer-local value of | 47 | ;; appropriate function as the buffer-local value of |
| 48 | ;; `eldoc-print-current-symbol-info-function'. | 48 | ;; `eldoc-documentation-function'. |
| 49 | 49 | ||
| 50 | ;;; Code: | 50 | ;;; Code: |
| 51 | 51 | ||
diff --git a/lispref/variables.texi b/lispref/variables.texi index b39c4abb719..43f590503ec 100644 --- a/lispref/variables.texi +++ b/lispref/variables.texi | |||
| @@ -1722,10 +1722,9 @@ stage in the future. | |||
| 1722 | @defmac make-obsolete-variable variable new &optional when | 1722 | @defmac make-obsolete-variable variable new &optional when |
| 1723 | This macro makes the byte-compiler warn that the variable | 1723 | This macro makes the byte-compiler warn that the variable |
| 1724 | @var{variable} is obsolete. If @var{new} is a symbol, it is the | 1724 | @var{variable} is obsolete. If @var{new} is a symbol, it is the |
| 1725 | variable's new name; the warning messages say to use @var{new} | 1725 | variable's new name; then the warning messages says to use @var{new} |
| 1726 | instead of @var{variable}. | 1726 | instead of @var{variable}. If @var{new} is a string, this is the |
| 1727 | If @var{new} is a string, this is the message and there is no | 1727 | message and there is no replacement variable. |
| 1728 | replacement variable. | ||
| 1729 | 1728 | ||
| 1730 | If provided, @var{when} should be a string indicating when the | 1729 | If provided, @var{when} should be a string indicating when the |
| 1731 | variable was first made obsolete---for example, a date or a release | 1730 | variable was first made obsolete---for example, a date or a release |