[Emacs-diffs] Changes to emacs/lisp/dired-x.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/11/28 03:57:08

Index: dired-x.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dired-x.el,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- dired-x.el  27 Nov 2007 03:56:38 -0000      1.85
+++ dired-x.el  28 Nov 2007 03:57:08 -0000      1.86
@@ -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 <address@hidden>
 ;;     Lawrence R. Dodd <address@hidden>
 ;; Maintainer: Romain Francoise <address@hidden>
-;; 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 @@
         (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 @@
     ;; 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 @@
 
 ;;; 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