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
8705576e
Commit
8705576e
authored
Jun 07, 2008
by
Glenn Morris
Browse files
(auth-source-user-or-password): Remove unnecessary eval-and-compile.
parent
408b8ab4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
11 deletions
+14
-11
lisp/url/ChangeLog
lisp/url/ChangeLog
+5
-0
lisp/url/url-auth.el
lisp/url/url-auth.el
+9
-11
No files found.
lisp/url/ChangeLog
View file @
8705576e
2008-06-07 Glenn Morris <rgm@gnu.org>
* url-auth.el (auth-source-user-or-password): Remove unnecessary
eval-and-compile.
2008-05-30 Stefan Monnier <monnier@iro.umontreal.ca>
* url-handlers.el (url-file-name-completion): Add missing argument.
...
...
lisp/url/url-auth.el
View file @
8705576e
;;; url-auth.el --- Uniform Resource Locator authorization modules
;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
;; 200
5, 2006, 2007, 200
8 Free Software Foundation, Inc.
;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
2005, 2006, 2007,
;; 2008
Free Software Foundation, Inc.
;; Keywords: comm, data, processes, hypermedia
...
...
@@ -25,9 +25,7 @@
(
require
'url-vars
)
(
require
'url-parse
)
(
autoload
'url-warn
"url"
)
(
eval-and-compile
(
autoload
'auth-source-user-or-password
"auth-source"
))
(
autoload
'auth-source-user-or-password
"auth-source"
)
(
defsubst
url-auth-user-prompt
(
url
realm
)
"String to usefully prompt for a username."
...
...
@@ -83,11 +81,11 @@ instead of the filename inheritance method."
(
symbol-value
url-basic-auth-storage
))))
(
cond
((
and
prompt
(
not
byserv
))
(
setq
user
(
or
(
setq
user
(
or
(
auth-source-user-or-password
"login"
server
type
)
(
read-string
(
url-auth-user-prompt
url
realm
)
(
or
user
(
user-real-login-name
))))
pass
(
or
pass
(
or
(
auth-source-user-or-password
"password"
server
type
)
(
read-passwd
"Password: "
nil
(
or
pass
""
))))
(
set
url-basic-auth-storage
...
...
@@ -111,11 +109,11 @@ instead of the filename inheritance method."
(
setq
byserv
(
cdr
byserv
))))
(
if
(
or
(
and
(
not
retval
)
prompt
)
overwrite
)
(
progn
(
setq
user
(
or
(
setq
user
(
or
(
auth-source-user-or-password
"login"
server
type
)
(
read-string
(
url-auth-user-prompt
url
realm
)
(
user-real-login-name
)))
pass
(
or
pass
(
or
(
auth-source-user-or-password
"password"
server
type
)
(
read-passwd
"Password: "
))
retval
(
base64-encode-string
(
format
"%s:%s"
user
pass
))
...
...
@@ -205,11 +203,11 @@ instead of hostname:portnum."
(
setq
byserv
(
cdr
byserv
))))
(
if
overwrite
(
if
(
and
(
not
retval
)
prompt
)
(
setq
user
(
or
(
setq
user
(
or
(
auth-source-user-or-password
"login"
server
type
)
(
read-string
(
url-auth-user-prompt
url
realm
)
(
user-real-login-name
)))
pass
(
or
pass
(
or
(
auth-source-user-or-password
"password"
server
type
)
(
read-passwd
"Password: "
))
retval
(
setq
retval
...
...
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