* lisp/subr.el (with-wrapper-hook): Tweak obsolescence message.

* lisp/simple.el: Remove mistaken FIXME comment.

* etc/NEWS: Markup.

diff --git a/etc/NEWS b/etc/NEWS
index 157a505bfd6c361e2b7b926bcf8701700579aa5b..b317d2be60650429fd2885c5ef8b3ea41b19334d 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1295,6 +1295,7 @@ This is like the old `eval-after-load', but better behaved.
 *** `generic-make-keywords-list'
 *** `get-upcase-table' (use `case-table-get-table' instead).
 
++++
 ** `with-wrapper-hook' is obsoleted by `add-function'.
 The few hooks that used with-wrapper-hook are replaced as follows:
 *** `abbrev-expand-function' obsoletes `abbrev-expand-functions'.

diff --git a/lisp/simple.el b/lisp/simple.el
index 85a7476dbe09a4ff5a0ab21564dd343467276bdf..bf8b6a75ac73f042e9336ed2033d6e27e1e5e398 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3468,7 +3468,6 @@ extract characters that are special to a buffer, and should not
 be copied into other buffers."
   (funcall filter-buffer-substring-function beg end delete))
 
-;; FIXME: `with-wrapper-hook' is obsolete
 (defun buffer-substring--filter (beg end &optional delete)
   (with-wrapper-hook filter-buffer-substring-functions (beg end delete)
     (cond

diff --git a/lisp/subr.el b/lisp/subr.el
index 1bfa3c83a35693873f4ea8f658367c8a93e750c7..e4350bffff858dafe3464ca5b3c06e67d0961095 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1461,7 +1461,7 @@ Each hook function definition is used to construct the FUN passed
 to the next hook function, if any.  The last (or \"outermost\")
 FUN is then called once."
   (declare (indent 2) (debug (form sexp body))
-           (obsolete "use a <foo>-function variable modified by add-function."
+           (obsolete "use a <foo>-function variable modified by `add-function'."
                      "24.4"))
   ;; We need those two gensyms because CL's lexical scoping is not available
   ;; for function arguments :-(