HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-12-11T09:51:12Z!dmantipov@yandex.ru
[bpt/emacs.git]
/
lisp
/
dired.el
diff --git
a/lisp/dired.el
b/lisp/dired.el
index
76809f9
..
3006948
100644
(file)
--- a/
lisp/dired.el
+++ b/
lisp/dired.el
@@
-3734,6
+3734,7
@@
Ask means pop up a menu for the user to select one of copy, move or link."
;;;; Desktop support
(eval-when-compile (require 'desktop))
;;;; Desktop support
(eval-when-compile (require 'desktop))
+(declare-function desktop-file-name "desktop" (filename dirname))
(defun dired-desktop-buffer-misc-data (dirname)
"Auxiliary information to be saved in desktop file."
(defun dired-desktop-buffer-misc-data (dirname)
"Auxiliary information to be saved in desktop file."
@@
-4296,7
+4297,7
@@
instead.
;;;***
\f
;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump)
;;;***
\f
;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump)
-;;;;;; "dired-x" "dired-x.el" "c
e753ade80ea9f4e64ab3569e3a5421e
")
+;;;;;; "dired-x" "dired-x.el" "c
daacce7c861256289ba48493dd6d0ec
")
;;; Generated autoloads from dired-x.el
(autoload 'dired-jump "dired-x" "\
;;; Generated autoloads from dired-x.el
(autoload 'dired-jump "dired-x" "\