--- a/lisp/obsolete.el	Mon Aug 13 11:19:22 2007 +0200
+++ b/lisp/obsolete.el	Mon Aug 13 11:20:41 2007 +0200
@@ -171,10 +171,6 @@
 set Info-directory-list.")
 (make-obsolete-variable 'Info-default-directory-list 'Info-directory-list)
 
-(defvar init-file-user nil
-  "This used to be the name of the user whose init file was read at startup.")
-(make-obsolete-variable 'init-file-user 'load-user-init-file-p)
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; hooks
 
 (make-compatible-variable 'lisp-indent-hook 'lisp-indent-function)
@@ -246,11 +242,6 @@
 (define-compatible-function-alias 'byte-code-function-p
   'compiled-function-p) ;FSFmacs
 
-(define-obsolete-function-alias 'isearch-yank-x-selection
-  'isearch-yank-selection)
-(define-obsolete-function-alias 'isearch-yank-x-clipboard
-  'isearch-yank-clipboard)
-
 ;; too bad there's not a way to check for aref, assq, and nconc
 ;; being called on the values of functions known to return keymaps,
 ;; or known to return vectors of events instead of strings...
@@ -353,7 +344,7 @@
       (setq idx (1+ idx) i (1+ i)))
     string))
 
-;; #### This function is not compatible with FSF in some cases.  Hard
+;; ### This function is not compatible with FSF in some cases.  Hard
 ;; to fix, because it is hard to trace the logic of the FSF function.
 ;; In case we need the exact behavior, we can always copy the FSF
 ;; version, which is very long and does lots of unnecessary stuff.