Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-13

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-83
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-89
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-90
   Update from CVS: man/calc.texi: Add macro for LaTeX for info output.

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-91
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-94
   Update from CVS

6 files changed, 12 insertions, 9 deletions

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 9ba613b267d..217f28f2a81 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1765,7 +1765,7 @@ With argument, insert value in current buffer after the form."
 	(byte-compile-maxdepth 0)
 	(byte-compile-output nil)
 	;; This allows us to get the positions of symbols read; it's
-	;; new in Emacs 21.4.
+	;; new in Emacs 22.1.
 	(read-with-symbol-positions inbuffer)
 	(read-symbol-positions-list nil)
 	;;	  #### This is bound in b-c-close-variables.
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 811511a1f00..a10b8546d03 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -249,7 +249,7 @@ is not very useful."
   (while (get mode 'derived-mode-parent)
     (setq mode (get mode 'derived-mode-parent)))
   mode)
-(make-obsolete 'derived-mode-class 'derived-mode-p "21.4")
+(make-obsolete 'derived-mode-class 'derived-mode-p "22.1")
 
 
 ;;; PRIVATE
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 7e2ac5aa883..18e5706dc3d 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -96,7 +96,7 @@ should insert the face name.
 Please send improvements and fixes to the maintainer."
   :type 'regexp
   :group 'find-function
-  :version "21.4")
+  :version "22.1")
 
 (defvar find-function-regexp-alist
   '((nil . find-function-regexp)
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index d19eace5824..d0a2fdc01da 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -233,6 +233,9 @@ recipe (see `end-of-defun').  Major modes can define this if the
 normal method is not appropriate.")
 
 (defun buffer-end (arg)
+  "Return the \"far end\" position of the buffer, moving in direction ARG.
+If ARG is positive, that's the end of the buffer.
+Otherwise, that's the beginning of the buffer."
   (if (> arg 0) (point-max) (point-min)))
 
 (defun end-of-defun (&optional arg)
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 336a1ff82d0..79aad8bd121 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -151,7 +151,7 @@ fire repeatedly that many seconds apart."
   timer)
 (make-obsolete 'timer-set-time-with-usecs
                "use `timer-set-time' and `timer-inc-time' instead."
-               "21.4")
+               "22.1")
 
 (defun timer-set-function (timer function &optional args)
   "Make TIMER call FUNCTION with optional ARGS when triggering."
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index e2bf813f9ce..343eda970ce 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -31,7 +31,7 @@
 
 (defgroup warnings nil
   "Log and display warnings."
-  :version "21.4"
+  :version "22.1"
   :group 'lisp)
 
 (defvar warning-levels
@@ -77,7 +77,7 @@ the warning is logged in the warnings buffer, but the buffer
 is not immediately displayed.  See also `warning-minimum-log-level'."
   :group 'warnings
   :type '(choice (const :emergency) (const :error) (const :warning))
-  :version "21.4")
+  :version "22.1")
 (defvaralias 'display-warning-minimum-level 'warning-minimum-level)
 
 (defcustom warning-minimum-log-level :warning
@@ -86,7 +86,7 @@ If a warning severity level is lower than this,
 the warning is completely ignored."
   :group 'warnings
   :type '(choice (const :emergency) (const :error) (const :warning))
-  :version "21.4")
+  :version "22.1")
 (defvaralias 'log-warning-minimum-level 'warning-minimum-log-level)
 
 (defcustom warning-suppress-log-types nil
@@ -100,7 +100,7 @@ If TYPE is a symbol FOO, that is equivalent to the list (FOO),
 so only the element (FOO) will match it."
   :group 'warnings
   :type '(repeat (repeat symbol))
-  :version "21.4")
+  :version "22.1")
 
 (defcustom warning-suppress-types nil
   "List of warning types not to display immediately.
@@ -115,7 +115,7 @@ so only the element (FOO) will match it.
 See also `warning-suppress-log-types'."
   :group 'warnings
   :type '(repeat (repeat symbol))
-  :version "21.4")
+  :version "22.1")
 
 ;;; The autoload cookie is so that programs can bind this variable
 ;;; safely, testing the existing value, before they call one of the