Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
0a8c8225
Commit
0a8c8225
authored
Mar 11, 2002
by
Richard M. Stallman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(desktop-buffer-handlers): Doc fix.
(desktop-buffer-file): Explicitly return BUF.
parent
6be7b127
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
lisp/desktop.el
lisp/desktop.el
+4
-2
No files found.
lisp/desktop.el
View file @
0a8c8225
...
...
@@ -241,7 +241,8 @@ The functions are called without explicit parameters but can use the
variables `desktop-buffer-major-mode', `desktop-buffer-file-name',
`desktop-buffer-name'.
If one function returns non-nil, no further functions are called.
If the function returns t then the buffer is considered created."
If the function returns a buffer, then the saved mode settings
and variable values for that buffer are copied into it."
:type
'
(
repeat
function
)
:group
'desktop
)
...
...
@@ -669,7 +670,8 @@ to provide correct modes for autoloaded files."
(
let
((
buf
(
find-file-noselect
desktop-buffer-file-name
)))
(
condition-case
nil
(
switch-to-buffer
buf
)
(
error
(
pop-to-buffer
buf
))))
(
error
(
pop-to-buffer
buf
)))
buf
)
'ignored
)))
;; ----------------------------------------------------------------------------
;; Create a buffer, load its file, set is mode, ...; called from Desktop file
...
...
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