Standardize order of header items. Delete meaningless header keys.

(dired-omit-old-add-entry): Declare as function.  Move definition before use.
(dired-old-find-buffer-nocreate): Declare as function.

1 files changed, 12 insertions, 13 deletions

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index c55ea099cb4..f8e0b2a6140 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -1,15 +1,13 @@
 ;;; dired-x.el --- extra Dired functionality -*-byte-compile-dynamic: t;-*-
 
+;; Copyright (C) 1993, 1994, 1997, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
+
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
 ;;      Lawrence R. Dodd <dodd@roebling.poly.edu>
 ;; Maintainer: Romain Francoise <rfrancoise@gnu.org>
-;; Version: 2.37+
-;; Date: 1994/08/18 19:27:42
 ;; Keywords: dired extensions files
 
-;; Copyright (C) 1993, 1994, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -652,8 +650,14 @@ Optional fourth argument LOCALP is as in `dired-get-filename'."
         (and fn (string-match regexp fn))))
      msg)))
 
-;; check-declare does not handle fset.
-;;;(declare-function dired-omit-old-add-entry "dired-x")
+;; Compiler does not get fset.
+(declare-function dired-omit-old-add-entry "dired-x")
+
+;;; REDEFINE.
+;;; Redefine dired-aux.el's version of `dired-add-entry'
+;;; Save old defun if not already done:
+(or (fboundp 'dired-omit-old-add-entry)
+    (fset 'dired-omit-old-add-entry (symbol-function 'dired-add-entry)))
 
 ;;; REDEFINE.
 (defun dired-omit-new-add-entry (filename &optional marker-char relative)
@@ -682,11 +686,6 @@ Optional fourth argument LOCALP is as in `dired-get-filename'."
     ;; omitting is not turned on at all
     (dired-omit-old-add-entry filename marker-char relative)))
 
-;;; REDEFINE.
-;;; Redefine dired-aux.el's version of `dired-add-entry'
-;;; Save old defun if not already done:
-(or (fboundp 'dired-omit-old-add-entry)
-    (fset 'dired-omit-old-add-entry (symbol-function 'dired-add-entry)))
 ;; Redefine it.
 (fset 'dired-add-entry 'dired-omit-new-add-entry)
 
@@ -1442,7 +1441,7 @@ See also variable `dired-vm-read-only-folders'."
 
 ;;; MISCELLANEOUS INTERNAL FUNCTIONS.
 
-;;;(declare-function dired-old-find-buffer-nocreate "dired-x")
+(declare-function dired-old-find-buffer-nocreate "dired-x")
 
 (or (fboundp 'dired-old-find-buffer-nocreate)
     (fset 'dired-old-find-buffer-nocreate