(process-kill-without-query): Remove spurious "\n" on obsolescence string.

(focus-frame, unfocus-frame): Add obsolescence declaration and empty
docstring.

diff --git a/lisp/subr.el b/lisp/subr.el
index 9b378c5f06b6fb28c5f559b80c2da61395233e87..b90efd46ff0120b9b65aaf2c6b544e15fb42d43a 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -851,9 +851,11 @@ and `event-end' functions."
 (make-obsolete 'dot-min 'point-min     "before 19.15")
 (make-obsolete 'dot-marker 'point-marker "before 19.15")
 (make-obsolete 'buffer-flush-undo 'buffer-disable-undo "before 19.15")
-(make-obsolete 'baud-rate "use the baud-rate variable instead." "before 19.15")
+(make-obsolete 'baud-rate "use the `baud-rate' variable instead." "before 19.15")
 (make-obsolete 'compiled-function-p 'byte-code-function-p "before 19.15")
 (make-obsolete 'define-function 'defalias "20.1")
+(make-obsolete 'focus-frame "it does nothing." "19.32")
+(make-obsolete 'unfocus-frame "it does nothing." "19.32")
 
 (defun insert-string (&rest args)
   "Mocklisp-compatibility insert function.
@@ -870,8 +872,8 @@ is converted into a string by expressing it in decimal."
   "Return the value of the `baud-rate' variable."
   baud-rate)
 
-(defalias 'focus-frame 'ignore)
-(defalias 'unfocus-frame 'ignore)
+(defalias 'focus-frame 'ignore "")
+(defalias 'unfocus-frame 'ignore "")
 
 \f
 ;;;; Obsolescence declarations for variables.
@@ -1186,7 +1188,7 @@ Optional args SENTINEL and FILTER specify the sentinel and filter
 ;; compatibility
 
 (make-obsolete 'process-kill-without-query
-               "use `process-query-on-exit-flag'\nor `set-process-query-on-exit-flag'."
+               "use `process-query-on-exit-flag' or `set-process-query-on-exit-flag'."
                "21.5")
 (defun process-kill-without-query (process &optional flag)
   "Say no query needed if PROCESS is running when Emacs is exited.