This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via 2ef76cff4a5a932cf17dc6107a0c5adee806081e (commit)
from 98dc8e429ba6f79065f1c9fc3878d92314d4b510 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2ef76cff4a5a932cf17dc6107a0c5adee806081e
Author: Magnus Henoch <mag...@gm...>
Date: Sat Jan 7 00:03:58 2017 +0000
Assume that password-cache.el is available
It was introduced in Emacs 23.1, which is our minimum requirement.
Remove conditional require of password.el, which used to be part of
Gnus.
Remove some fboundp calls.
diff --git a/jabber-util.el b/jabber-util.el
index 40d2b20..c089dcf 100644
--- a/jabber-util.el
+++ b/jabber-util.el
@@ -22,9 +22,7 @@
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(require 'cl)
-(condition-case nil
- (require 'password)
- (error nil))
+(require 'password-cache)
(condition-case nil
(require 'auth-source)
(error nil))
@@ -329,24 +327,20 @@ If FULLJIDS is non-nil, complete jids with resources."
(funcall secret)
secret)))
(let ((prompt (format "Jabber password for %s: " bare-jid)))
- (if (require 'password-cache nil t)
- ;; Need to copy the password, as sasl.el wants to erase it.
- (copy-sequence
- (password-read prompt (jabber-password-key bare-jid)))
- (read-passwd prompt))))))
+ ;; Need to copy the password, as sasl.el wants to erase it.
+ (copy-sequence
+ (password-read prompt (jabber-password-key bare-jid)))))))
(defun jabber-cache-password (bare-jid password)
"Cache PASSWORD for BARE-JID."
- (when (fboundp 'password-cache-add)
- (password-cache-add (jabber-password-key bare-jid) password)))
+ (password-cache-add (jabber-password-key bare-jid) password))
(defun jabber-uncache-password (bare-jid)
"Uncache cached password for BARE-JID.
Useful if the password proved to be wrong."
(interactive (list (jabber-jid-user
(completing-read "Forget password of account: " jabber-account-list nil nil nil 'jabber-account-history))))
- (when (fboundp 'password-cache-remove)
- (password-cache-remove (jabber-password-key bare-jid))))
+ (password-cache-remove (jabber-password-key bare-jid)))
(defun jabber-read-account (&optional always-ask contact-hint)
"Ask for which connected account to use.
-----------------------------------------------------------------------
Summary of changes:
jabber-util.el | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
hooks/post-receive
--
emacs-jabber
|
