[SCM] emacs-jabber branch, master, updated. fff33826f42e040dad7ef64ea312d85215d3b0a1

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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
  discards  c33196772075e6c6ca1dea3ae7bb33094138507a (commit)
  discards  2ef76cff4a5a932cf17dc6107a0c5adee806081e (commit)
       via  fff33826f42e040dad7ef64ea312d85215d3b0a1 (commit)
       via  7fb313c259153dc6af6adebb359e11130f12259f (commit)
       via  3de7fb40ab9c82ada2a4b5f364a2417345953050 (commit)
       via  562e503274a38dfcc1ea3186e0939df9d869cfc3 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (c33196772075e6c6ca1dea3ae7bb33094138507a)
            \
             N -- N -- N (fff33826f42e040dad7ef64ea312d85215d3b0a1)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 fff33826f42e040dad7ef64ea312d85215d3b0a1
Author: Magnus Henoch <mag...@gm...>
Date:   Fri Sep 28 00:20:15 2018 +0100

    Use srv.el from package repository
    
    srv.el is now a separate package in MELPA, so let's depend on that.
    
    Keep a copy in jabber-fallback-lib for the time being.

diff --git a/Makefile.am b/Makefile.am
index 5eed578..7df29d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,9 +23,10 @@ jabber-time.el jabber-truncate.el jabber-util.el			\
 jabber-vcard-avatars.el jabber-vcard.el jabber-version.el		\
 jabber-watch.el jabber-widget.el jabber-wmii.el jabber-xmessage.el	\
 jabber-muc-nick-coloring.el						\
-jabber-xml.el jabber.el srv.el jabber-tmux.el jabber-ourversion.el
+jabber-xml.el jabber.el jabber-tmux.el jabber-ourversion.el
 
-compat_lisp_sources = jabber-fallback-lib/hexrgb.el jabber-fallback-lib/fsm.el
+compat_lisp_sources = jabber-fallback-lib/hexrgb.el jabber-fallback-lib/fsm.el \
+  jabber-fallback-lib/srv.el
 
 dist_lisp_LISP=$(my_lisp_sources) $(compat_lisp_sources) jabber-autoloads.el
 MAINTAINERCLEANFILES=jabber-autoloads.el
diff --git a/jabber-conn.el b/jabber-conn.el
index 6a4c2d5..ab88a89 100644
--- a/jabber-conn.el
+++ b/jabber-conn.el
@@ -36,7 +36,16 @@
 
 (ignore-errors (require 'starttls))
 
-(require 'srv)
+(eval-and-compile
+  (or (ignore-errors (require 'srv))
+      (ignore-errors
+        (let ((load-path (cons (expand-file-name
+                                "jabber-fallback-lib"
+                                (file-name-directory (locate-library "jabber")))
+                               load-path)))
+          (require 'srv)))
+      (error
+       "srv not found in `load-path' or jabber-fallback-lib/ directory.")))
 
 (defgroup jabber-conn nil "Jabber Connection Settings"
   :group 'jabber)
diff --git a/srv.el b/jabber-fallback-lib/srv.el
similarity index 100%
rename from srv.el
rename to jabber-fallback-lib/srv.el
diff --git a/jabber-pkg.el.in b/jabber-pkg.el.in
index bcd7f48..43067fa 100644
--- a/jabber-pkg.el.in
+++ b/jabber-pkg.el.in
@@ -1,5 +1,5 @@
 ;; For ELPA: http://tromey.com/elpa/
 (define-package "jabber" "@PACKAGE_VERSION@" "A Jabber client for Emacs."
-  '((fsm "0.2")))
+  '((fsm "0.2") (srv "0.2")))
 
 ;; arch-tag: fa652136-12f7-11dd-b4c4-000a95c2fcd0

commit 7fb313c259153dc6af6adebb359e11130f12259f
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.

commit 3de7fb40ab9c82ada2a4b5f364a2417345953050
Merge: 98dc8e4 562e503
Author: Magnus Henoch <mag...@er...>
Date:   Sun Apr 23 13:13:53 2017 +0100

    Merge pull request #9 from wasamasa/bugfix-menu-bar
    
    Don't display menu bar indicator when installed


commit 562e503274a38dfcc1ea3186e0939df9d869cfc3
Author: Vasilij Schneidermann <v.s...@gm...>
Date:   Thu May 7 11:03:41 2015 +0200

    Don't display menu bar indicator when installed
    
    See "(elisp) Coding Conventions".  Displaying a menu bar indicator if
    the package was installed violates its first convention, asides from
    that this check yields a truthy value in nearly all cases for people
    using this package and therefore makes the other possible branch (is
    this mode actually in use?) unused.

diff --git a/jabber-menu.el b/jabber-menu.el
index 40082ee..88c2ab1 100644
--- a/jabber-menu.el
+++ b/jabber-menu.el
@@ -143,20 +143,10 @@ With prefix argument, remove it."
   [jabber-menu]
   (list 'menu-item "Jabber" jabber-menu
 	:visible
-	;; If the package was installed by the user personally, it's
-	;; probably ok to "clutter" the menu bar with a Jabber menu.
-	(let ((user-installed-package
-	       (and (bound-and-true-p package-user-dir)
-		    (string=
-		     (file-name-as-directory
-		      (expand-file-name ".." (file-name-directory load-file-name)))
-		     (file-name-as-directory
-		      (expand-file-name package-user-dir))))))
-	  `(or (eq jabber-display-menu t)
-	       (and (eq jabber-display-menu 'maybe)
-		    (or ,user-installed-package
-			(bound-and-true-p jabber-account-list)
-			(bound-and-true-p jabber-connections)))))))
+        '(or (eq jabber-display-menu t)
+             (and (eq jabber-display-menu 'maybe)
+                  (or (bound-and-true-p jabber-account-list)
+                      (bound-and-true-p jabber-connections))))))
 
 (defvar jabber-jid-chat-menu nil
   "Menu items for chat menu")

-----------------------------------------------------------------------

Summary of changes:
 jabber-menu.el | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
emacs-jabber


