* net/newst-treeview.el (newsticker-groups-filename):

* net/newst-backend.el (newsticker-cache-filename):
* speedbar.el (speedbar-update-speed, speedbar-navigating-speed)
(speedbar-ignored-path-expressions, speedbar-ignored-path-regexp)
(speedbar-add-ignored-path-regexp, speedbar-line-path)
(speedbar-buffers-line-path, speedbar-path-line)
(speedbar-buffers-line-path):
* epg.el (epg-passphrase-callback-function, epg-start-sign-keys,epg-sign-keys):
* epa.el (epa-display-verify-result):
* progmodes/pascal.el (pascal-outline): Add version of obsolescence.

7 files changed, 31 insertions, 17 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a377cb31bfe..aa36a8441a6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2009-08-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* net/newst-treeview.el (newsticker-groups-filename):
+	* net/newst-backend.el (newsticker-cache-filename):
+	* speedbar.el (speedbar-update-speed, speedbar-navigating-speed)
+	(speedbar-ignored-path-expressions, speedbar-ignored-path-regexp)
+	(speedbar-add-ignored-path-regexp, speedbar-line-path)
+	(speedbar-buffers-line-path, speedbar-path-line)
+	(speedbar-buffers-line-path):
+	* epg.el (epg-passphrase-callback-function, epg-start-sign-keys)
+	(epg-sign-keys):
+	* epa.el (epa-display-verify-result):
+	* progmodes/pascal.el (pascal-outline): Add version of obsolescence.
+
 2009-08-21  Glenn Morris  <rgm@gnu.org>
 
 	* progmodes/js.el (inferior-moz-process): Fix declaration.
@@ -62,7 +76,7 @@
 2009-08-19  Magnus Henoch  <magnus.henoch@gmail.com>
 
 	* log-edit.el (log-edit-strip-single-file-name): New var.
-	(log-edit-insert-changelog): Use it.
+	(log-edit-insert-changelog): Use it.  Bug#3571
 
 2009-08-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/epa.el b/lisp/epa.el
index 36c261a4e26..4f4d62567d4 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -635,7 +635,7 @@ If SECRET is non-nil, list secret keys instead of public keys."
 
 (defun epa-display-verify-result (verify-result)
   (epa-display-info (epg-verify-result-to-string verify-result)))
-(make-obsolete 'epa-display-verify-result 'epa-display-info)
+(make-obsolete 'epa-display-verify-result 'epa-display-info "23.1")
 
 (defun epa-passphrase-callback-function (context key-id handback)
   (if (eq key-id 'SYM)
diff --git a/lisp/epg.el b/lisp/epg.el
index 5c9fd9b882b..8481f65b833 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -1681,7 +1681,7 @@ This function is for internal use only."
 	   (format "Passphrase for %s: " key-id)))))))
 
 (make-obsolete 'epg-passphrase-callback-function
-	       'epa-passphrase-callback-function)
+	       'epa-passphrase-callback-function "23.1")
 
 (defun epg--list-keys-1 (context name mode)
   (let ((args (append (if epg-gpg-home-directory
@@ -2491,7 +2491,7 @@ If you are unsure, use synchronous version of this function
 			      (epg-sub-key-id
 			       (car (epg-key-sub-key-list key))))
 			    keys))))
-(make-obsolete 'epg-start-sign-keys "do not use.")
+(make-obsolete 'epg-start-sign-keys "do not use." "23.1")
 
 ;;;###autoload
 (defun epg-sign-keys (context keys &optional local)
@@ -2504,7 +2504,7 @@ If you are unsure, use synchronous version of this function
 	    (error "Sign keys failed: %S"
 		   (epg-context-result-for context 'error))))
     (epg-reset context)))
-(make-obsolete 'epg-sign-keys "do not use.")
+(make-obsolete 'epg-sign-keys "do not use." "23.1")
 
 ;;;###autoload
 (defun epg-start-generate-key (context parameters)
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index 9ebf0903afc..56254ccd539 100644
--- a/lisp/net/newst-backend.el
+++ b/lisp/net/newst-backend.el
@@ -421,7 +421,7 @@ headline after it has been retrieved for the first time."
   "Name of the newsticker cache file."
   :type 'string
   :group 'newsticker-miscellaneous)
-(make-obsolete 'newsticker-cache-filename 'newsticker-dir)
+(make-obsolete 'newsticker-cache-filename 'newsticker-dir "23.1")
 
 (defcustom newsticker-dir
   (locate-user-emacs-file "newsticker/" ".newsticker/")
diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index 022acef570d..63740ff5085 100644
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -143,7 +143,7 @@ Example: (\"Topmost group\" \"feed1\" (\"subgroup1\" \"feed 2\")
   "Name of the newsticker groups settings file."
   :type 'string
   :group 'newsticker-treeview)
-(make-obsolete 'newsticker-groups-filename 'newsticker-dir)
+(make-obsolete 'newsticker-groups-filename 'newsticker-dir "23.1")
 
 ;; ======================================================================
 ;;; internal variables
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index eefdfc7cccd..faf097e8b24 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -1500,7 +1500,7 @@ The default is a name found in the buffer around point."
     map)
   "Keymap used in Pascal Outline mode.")
 
-(define-obsolete-function-alias 'pascal-outline 'pascal-outline-mode)
+(define-obsolete-function-alias 'pascal-outline 'pascal-outline-mode "22.1")
 (define-minor-mode pascal-outline-mode
   "Outline-line minor mode for Pascal mode.
 When in Pascal Outline mode, portions
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 6265d9981a9..df6cd0bc005 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -326,12 +326,12 @@ A nil value means don't show the file in the list."
 (defvar speedbar-update-speed dframe-update-speed)
 (make-obsolete-variable 'speedbar-update-speed
 			'dframe-update-speed
-			"speedbar 1.0pre3")
+			"speedbar 1.0pre3 (Emacs 23.1)")
 
 (defvar speedbar-navigating-speed dframe-update-speed)
 (make-obsolete-variable 'speedbar-navigating-speed
 			'dframe-update-speed
-			"speedbar 1.0pre3")
+			"speedbar 1.0pre3 (Emacs 23.1)")
 ;;; END REMOVE THESE
 
 (defcustom speedbar-frame-parameters '((minibuffer . nil)
@@ -645,7 +645,7 @@ Use the function `speedbar-add-ignored-directory-regexp', or customize the
 variable `speedbar-ignored-directory-expressions' to modify this variable.")
 
 (define-obsolete-variable-alias 'speedbar-ignored-path-expressions
-  'speedbar-ignored-directory-expressions)
+  'speedbar-ignored-directory-expressions "22.1")
 
 (defcustom speedbar-ignored-directory-expressions
   '("[/\\]logs?[/\\]\\'")
@@ -4134,22 +4134,22 @@ TEXT is the buffer's name, TOKEN and INDENT are unused."
 ;;; Obsolete variables and functions
 
 (define-obsolete-variable-alias
-  'speedbar-ignored-path-regexp 'speedbar-ignored-directory-regexp)
+  'speedbar-ignored-path-regexp 'speedbar-ignored-directory-regexp "22.1")
 
 (define-obsolete-function-alias 'speedbar-add-ignored-path-regexp
-  'speedbar-add-ignored-directory-regexp)
+  'speedbar-add-ignored-directory-regexp "22.1")
 
 (define-obsolete-function-alias 'speedbar-line-path
-  'speedbar-line-directory)
+  'speedbar-line-directory "22.1")
 
 (define-obsolete-function-alias 'speedbar-buffers-line-path
-  'speedbar-buffers-line-directory)
+  'speedbar-buffers-line-directory "22.1")
 
 (define-obsolete-function-alias 'speedbar-path-line
-  'speedbar-directory-line)
+  'speedbar-directory-line "22.1")
 
 (define-obsolete-function-alias 'speedbar-buffers-line-path
-  'speedbar-buffers-line-directory)
+  'speedbar-buffers-line-directory "22.1")
 
 (provide 'speedbar)