diff lisp/dired-x.el @ 91204:53108e6cea98

Merge from emacs--devo--0 Revision: [e-mail]/emacs--unicode--0--patch-294

--- a/lisp/dired-x.el	Thu Dec 06 07:36:30 2007 +0000
+++ b/lisp/dired-x.el	Thu Dec 06 09:51:45 2007 +0000
@@ -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 <[e-mail]>
 ;;	Lawrence R. Dodd <[e-mail]>
 ;; Maintainer: Romain Francoise <[e-mail]>
-;; 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,6 +650,15 @@
         (and fn (string-match regexp fn))))
      msg)))
 
+;; 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)
   ;; This redefines dired-aux.el's dired-add-entry to avoid calling ls for
@@ -679,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)
 
@@ -746,7 +748,7 @@
   ;; decent subdir headerline:
   (goto-char (point-min))
   (or (looking-at dired-subdir-regexp)
-      (insert "  " 
+      (insert "  "
 	      (directory-file-name (file-name-directory default-directory))
 	      ":\n"))
   (dired-mode dirname (or switches dired-listing-switches))
@@ -1211,6 +1213,8 @@
 
 ;;; RELATIVE SYMBOLIC LINKS.
 
+(declare-function make-symbolic-link "fileio.c")
+
 (defvar dired-keep-marker-relsymlink ?S
   "See variable `dired-keep-marker-move'.")
 
@@ -1437,6 +1441,8 @@
 
 ;;; MISCELLANEOUS INTERNAL FUNCTIONS.
 
+(declare-function dired-old-find-buffer-nocreate "dired-x")
+
 (or (fboundp 'dired-old-find-buffer-nocreate)
     (fset 'dired-old-find-buffer-nocreate
           (symbol-function 'dired-find-buffer-nocreate)))