Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
253406b9
Commit
253406b9
authored
Jan 14, 1996
by
Richard M. Stallman
Browse files
(desktop-read): Do nothing in batch mode.
Clear desktop-delay-hook after use. Simplify.
parent
71bccd7f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
13 deletions
+20
-13
lisp/desktop.el
lisp/desktop.el
+20
-13
No files found.
lisp/desktop.el
View file @
253406b9
...
...
@@ -85,6 +85,7 @@
;; f89-kam@nada.kth.se (Klas Mellbourn) for a mh-e tip.
;; kifer@sbkifer.cs.sunysb.edu (M. Kifer) for a bug hunt.
;; treese@lcs.mit.edu (Win Treese) for ange-ftp tips.
;; pot@cnuce.cnr.it (Francesco Potorti`) for misc. tips.
;; ---------------------------------------------------------------------------
;; TODO:
;;
...
...
@@ -438,20 +439,26 @@ MODE is the major mode."
(
delete-file
filename
)))))
;; ----------------------------------------------------------------------------
(
defun
desktop-read
()
"Read the Desktop file and the files it specifies."
"Read the Desktop file and the files it specifies.
This is a no-op when Emacs is running in batch mode."
(
interactive
)
(
let
((
filename
))
(
if
(
file-exists-p
(
concat
"./"
desktop-basefilename
))
(
setq
desktop-dirname
(
expand-file-name
"./"
))
(
if
(
file-exists-p
(
concat
"~/"
desktop-basefilename
))
(
setq
desktop-dirname
(
expand-file-name
"~/"
))
(
setq
desktop-dirname
nil
)))
(
if
desktop-dirname
(
progn
(
load
(
concat
desktop-dirname
desktop-basefilename
)
t
t
t
)
(
run-hooks
'desktop-delay-hook
)
(
message
"Desktop loaded."
))
(
desktop-clear
))))
(
if
noninteractive
nil
(
let
((
dirs
'
(
"./"
"~/"
)))
(
while
(
and
dirs
(
not
(
file-exists-p
(
expand-file-name
desktop-basefilename
(
car
dirs
)))))
(
setq
dirs
(
cdr
dirs
)))
(
setq
desktop-dirname
(
and
dirs
(
expand-file-name
(
car
dirs
))))
(
if
desktop-dirname
(
progn
(
load
(
expand-file-name
desktop-basefilename
desktop-dirname
)
t
t
t
)
(
run-hooks
'desktop-delay-hook
)
(
setq
desktop-delay-hook
nil
)
(
message
"Desktop loaded."
))
(
desktop-clear
)))))
;; ----------------------------------------------------------------------------
(
defun
desktop-load-default
()
"Load the `default' start-up library manually.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment