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
b89c5a72
Commit
b89c5a72
authored
Jul 29, 2005
by
Juanma Barranquero
Browse files
(desktop-save-buffer): Fix typos in docstring.
(desktop-load-default): Simplify.
parent
dfc434d0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
10 deletions
+17
-10
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/desktop.el
lisp/desktop.el
+12
-10
No files found.
lisp/ChangeLog
View file @
b89c5a72
2005-07-29 Juanma Barranquero <lekktu@gmail.com>
* desktop.el (desktop-save-buffer): Fix typos in docstring.
(desktop-load-default): Simplify.
2005-07-29 Kenichi Handa <handa@m17n.org>
* international/mule-cmds.el (select-message-coding-system): Be
...
...
lisp/desktop.el
View file @
b89c5a72
...
...
@@ -106,7 +106,8 @@ desktop is saved."
:group
'desktop
)
;; Maintained for backward compatibility
(
define-obsolete-variable-alias
'desktop-enable
'desktop-save-mode
"22.1"
)
(
define-obsolete-variable-alias
'desktop-enable
'desktop-save-mode
"22.1"
)
(
defcustom
desktop-save
'ask-if-new
"*Specifies whether the desktop should be saved when it is killed.
...
...
@@ -136,7 +137,8 @@ determine where the desktop is saved."
"Name of file for Emacs desktop, excluding the directory part."
:type
'file
:group
'desktop
)
(
define-obsolete-variable-alias
'desktop-basefilename
'desktop-base-file-name
"22.1"
)
(
define-obsolete-variable-alias
'desktop-basefilename
'desktop-base-file-name
"22.1"
)
(
defcustom
desktop-path
'
(
"."
"~"
)
"List of directories to search for the desktop file.
...
...
@@ -292,8 +294,8 @@ See `desktop-restore-eager'."
"When non-nil, save buffer status in desktop file.
This variable becomes buffer local when set.
If the value is a function, it called by `desktop-save' with argument
DESKTOP-DIRNAME to obtain auxiliary information to save
d
in the desktop
If the value is a function, it
is
called by `desktop-save' with argument
DESKTOP-DIRNAME to obtain auxiliary information to save in the desktop
file along with the state of the buffer for which it was called.
When file names are returned, they should be formatted using the call
...
...
@@ -776,11 +778,11 @@ It returns t if a desktop file was loaded, nil otherwise."
(
defun
desktop-load-default
()
"Load the `default' start-up library manually.
Also inhibit further loading of it."
(
if
(
not
inhibit-default-init
)
; safety check
(
progn
(
load
"
default
"
t
t
)
(
setq
inhibit-default-init
t
))))
(
make-obsolete
'desktop-load-default
'desktop-save-mode
"22.1"
)
(
unless
inhibit-default-init
; safety check
(
load
"default"
t
t
)
(
setq
inhibit-
default
-ini
t
t
)
))
(
make-obsolete
'desktop-load-default
'desktop-save-mode
"22.1"
)
;; ----------------------------------------------------------------------------
;;;###autoload
...
...
@@ -801,7 +803,7 @@ directory DIRNAME."
"Save the desktop in directory `desktop-dirname'."
(
interactive
)
(
if
desktop-dirname
(
desktop-save
desktop-dirname
)
(
desktop-save
desktop-dirname
)
(
call-interactively
'desktop-save
))
(
message
"Desktop saved in %s"
desktop-dirname
))
...
...
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