Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
84b538ec
Commit
84b538ec
authored
Apr 10, 2003
by
Juanma Barranquero
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(desktop-buffer-file): Restore major-mode if it is different from the normal
mode.
parent
a288d979
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
lisp/desktop.el
lisp/desktop.el
+6
-2
No files found.
lisp/desktop.el
View file @
84b538ec
...
...
@@ -832,7 +832,8 @@ This function always sets `desktop-enable' to t."
'ignored
)))
;; ----------------------------------------------------------------------------
(
defun
desktop-buffer-file
()
"Load a file."
(
defun
desktop-buffer-file
()
"Load a file."
(
if
desktop-buffer-file-name
(
if
(
or
(
file-exists-p
desktop-buffer-file-name
)
(
and
desktop-missing-file-warning
...
...
@@ -843,6 +844,9 @@ This function always sets `desktop-enable' to t."
(
condition-case
nil
(
switch-to-buffer
buf
)
(
error
(
pop-to-buffer
buf
)))
(
and
(
not
(
eq
major-mode
desktop-buffer-major-mode
))
(
functionp
desktop-buffer-major-mode
)
(
funcall
desktop-buffer-major-mode
))
buf
)
'ignored
)))
...
...
@@ -940,7 +944,7 @@ This function always sets `desktop-enable' to t."
(
cons
'case-fold-search
cfs
)
(
cons
'case-replace
cr
)
(
cons
'overwrite-mode
(
car
mim
)))))
;; ----------------------------------------------------------------------------
;; When `desktop-enable' is non-nil and "--no-desktop" is not specified on the
;; command line, we do the rest of what it takes to use desktop, but do it
...
...
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