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
6ff901c7
Commit
6ff901c7
authored
Jan 21, 2006
by
Eli Zaretskii
Browse files
(command-line-1): Handle --no-desktop if desktop.el is not loaded.
parent
6a056c5d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/startup.el
lisp/startup.el
+8
-1
No files found.
lisp/ChangeLog
View file @
6ff901c7
2006-01-21 Eli Zaretskii <eliz@gnu.org>
* startup.el (command-line-1): Handle --no-desktop if desktop.el
is not loaded.
2006-01-20 Jay Belanger <belanger@truman.edu>
* calc/calcalg2.el (calc-sum-rec): Fix the sum when the lower
...
...
lisp/startup.el
View file @
6ff901c7
...
...
@@ -1628,7 +1628,7 @@ normal otherwise."
(
longopts
(
append
'
((
"--funcall"
)
(
"--load"
)
(
"--insert"
)
(
"--kill"
)
(
"--directory"
)
(
"--eval"
)
(
"--execute"
)
(
"--no-splash"
)
(
"--find-file"
)
(
"--visit"
)
(
"--file"
))
(
"--find-file"
)
(
"--visit"
)
(
"--file"
)
(
"--no-desktop"
)
)
(
mapcar
(
lambda
(
elt
)
(
list
(
concat
"-"
(
car
elt
))))
command-switch-alist
)))
...
...
@@ -1728,6 +1728,13 @@ normal otherwise."
((
equal
argi
"-kill"
)
(
kill-emacs
t
))
;; This is for when they use --no-desktop with -q, or
;; don't load Desktop in their .emacs. If desktop.el
;; _is_ loaded, it will handle this switch, and we
;; won't see it by the time we get here.
((
equal
argi
"-no-desktop"
)
(
message
"\"--no-desktop\" ignored because the Desktop package is not loaded"
))
((
string-match
"^\\+[0-9]+\\'"
argi
)
(
setq
line
(
string-to-number
argi
)))
...
...
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