[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 01/01: Fix up headers and compilation
From: |
Stefan Monnier |
Subject: |
[elpa] 01/01: Fix up headers and compilation |
Date: |
Mon, 12 May 2014 06:23:06 +0000 |
monnier pushed a commit to branch externals/rudel
in repository elpa.
commit 5e4f147f6b23c392505cb0cbb5f13384d6d96304
Author: Stefan Monnier <address@hidden>
Date: Mon May 12 02:23:00 2014 -0400
Fix up headers and compilation
---
.bzrignore | 4 +-
adopted/adopted-compound.el | 2 +-
adopted/adopted-delete.el | 2 +-
adopted/adopted-insert.el | 2 +-
adopted/adopted-nop.el | 2 +-
adopted/adopted-operation.el | 2 +-
adopted/adopted.el | 2 +-
infinote/rudel-infinote-client.el | 2 +-
infinote/rudel-infinote-display.el | 2 +-
infinote/rudel-infinote-document.el | 2 +-
infinote/rudel-infinote-errors.el | 2 +-
infinote/rudel-infinote-group-directory.el | 2 +-
infinote/rudel-infinote-group-document.el | 2 +-
infinote/rudel-infinote-group-text-document.el | 2 +-
infinote/rudel-infinote-group.el | 2 +-
infinote/rudel-infinote-node-directory.el | 2 +-
infinote/rudel-infinote-node.el | 2 +-
infinote/rudel-infinote-state.el | 2 +-
infinote/rudel-infinote-text-document.el | 2 +-
infinote/rudel-infinote-user.el | 2 +-
infinote/rudel-infinote-util.el | 2 +-
infinote/rudel-infinote.el | 8 +-
jupiter/jupiter-compound.el | 2 +-
jupiter/jupiter-delete.el | 2 +-
jupiter/jupiter-insert.el | 2 +-
jupiter/jupiter-nop.el | 2 +-
jupiter/jupiter-operation.el | 2 +-
jupiter/jupiter.el | 2 +-
obby/rudel-obby-client.el | 2 +-
obby/rudel-obby-debug.el | 2 +-
obby/rudel-obby-display.el | 2 +-
obby/rudel-obby-errors.el | 2 +-
obby/rudel-obby-server.el | 2 +-
obby/rudel-obby-state.el | 2 +-
obby/rudel-obby-util.el | 2 +-
obby/rudel-obby.el | 8 +-
rudel-backend.el | 15 ++--
rudel-chat.el | 2 +-
rudel-color.el | 3 +-
rudel-compat.el | 3 +-
rudel-compile.el | 100 ------------------------
rudel-debug.el | 2 +-
rudel-display.el | 2 +-
rudel-errors.el | 2 +-
rudel-hooks.el | 2 +-
rudel-icons.el | 5 +-
rudel-interactive.el | 19 +++--
rudel-mode.el | 13 ++-
rudel-operations.el | 2 +-
rudel-operators.el | 2 +-
rudel-overlay.el | 5 +-
rudel-protocol.el | 2 +-
rudel-session-initiation.el | 13 ++--
rudel-speedbar.el | 4 +-
rudel-state-machine.el | 5 +-
rudel-transport-util.el | 6 +-
rudel-transport.el | 2 +-
rudel-util.el | 5 +-
rudel-xml.el | 3 +-
rudel.el | 15 +++-
socket/rudel-socket.el | 6 +-
telepathy/rudel-telepathy.el | 6 +-
tls/rudel-tls.el | 6 +-
wave/rudel-wave.el | 6 +-
xmpp/rudel-xmpp-debug.el | 2 +-
xmpp/rudel-xmpp-sasl.el | 2 +-
xmpp/rudel-xmpp-state.el | 2 +-
xmpp/rudel-xmpp-tls.el | 2 +-
xmpp/rudel-xmpp-tunnel.el | 4 +-
xmpp/rudel-xmpp-util.el | 2 +-
xmpp/rudel-xmpp.el | 6 +-
zeroconf/rudel-zeroconf.el | 8 +-
72 files changed, 145 insertions(+), 225 deletions(-)
diff --git a/.bzrignore b/.bzrignore
index 58a1d5c..a36190d 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,5 +1,7 @@
+*~
*.elc
Makefile
-rudel-loaddefs.el
+rudel-pkg.el
+rudel-autoloads.el
*.log
doc/auto
diff --git a/adopted/adopted-compound.el b/adopted/adopted-compound.el
index 02f8d98..e710076 100644
--- a/adopted/adopted-compound.el
+++ b/adopted/adopted-compound.el
@@ -1,6 +1,6 @@
;;; adopted-compound.el --- Adopted compound operation
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, adopted, algorithm, operation, compound
diff --git a/adopted/adopted-delete.el b/adopted/adopted-delete.el
index ecdb067..74732b3 100644
--- a/adopted/adopted-delete.el
+++ b/adopted/adopted-delete.el
@@ -1,6 +1,6 @@
;;; adopted-delete.el --- Adopted delete operation
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, adopted, algorithm, operation, delete
diff --git a/adopted/adopted-insert.el b/adopted/adopted-insert.el
index bc49346..ba1f781 100644
--- a/adopted/adopted-insert.el
+++ b/adopted/adopted-insert.el
@@ -1,6 +1,6 @@
;;; adopted-insert.el --- Adopted insert operation
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, adopted, algorithm, operation, insert
diff --git a/adopted/adopted-nop.el b/adopted/adopted-nop.el
index a812692..9725127 100644
--- a/adopted/adopted-nop.el
+++ b/adopted/adopted-nop.el
@@ -1,6 +1,6 @@
;;; adopted-nop.el --- Adopted no operation
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, adopted, algorithm, operation, nop
diff --git a/adopted/adopted-operation.el b/adopted/adopted-operation.el
index 489c448..1901b23 100644
--- a/adopted/adopted-operation.el
+++ b/adopted/adopted-operation.el
@@ -1,6 +1,6 @@
;;; adopted-operation.el --- Base class for Adopted operations
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, adopted, algorithm, operation
diff --git a/adopted/adopted.el b/adopted/adopted.el
index d411d16..23a78a2 100644
--- a/adopted/adopted.el
+++ b/adopted/adopted.el
@@ -1,6 +1,6 @@
;;; adopted.el --- Adopted algorithm
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, adopted, algorithm
diff --git a/infinote/rudel-infinote-client.el
b/infinote/rudel-infinote-client.el
index 4d24cb3..6057940 100644
--- a/infinote/rudel-infinote-client.el
+++ b/infinote/rudel-infinote-client.el
@@ -1,6 +1,6 @@
;;; rudel-infinote-client.el --- Client part of the infinote backend for Rudel
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinote, client
diff --git a/infinote/rudel-infinote-display.el
b/infinote/rudel-infinote-display.el
index 6b07463..2e59adf 100644
--- a/infinote/rudel-infinote-display.el
+++ b/infinote/rudel-infinote-display.el
@@ -1,6 +1,6 @@
;;; rudel-infinote-display.el --- Display functions for infinote users
;;
-;; Copyright (C) 2010 Jan Moringen
+;; Copyright (C) 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinote, user interface
diff --git a/infinote/rudel-infinote-document.el
b/infinote/rudel-infinote-document.el
index 12ed7a4..f016a68 100644
--- a/infinote/rudel-infinote-document.el
+++ b/infinote/rudel-infinote-document.el
@@ -1,6 +1,6 @@
;;; rudel-infinote-document.el --- Infinote document class
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinote, document
diff --git a/infinote/rudel-infinote-errors.el
b/infinote/rudel-infinote-errors.el
index 65bf9c9..92cfb40 100644
--- a/infinote/rudel-infinote-errors.el
+++ b/infinote/rudel-infinote-errors.el
@@ -1,6 +1,6 @@
;;; rudel-infinote-errors.el --- Error data used in the infinote Rudel backend
;;
-;; Copyright (C) 2010 Jan Moringen
+;; Copyright (C) 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, infinote, errors
diff --git a/infinote/rudel-infinote-group-directory.el
b/infinote/rudel-infinote-group-directory.el
index 6122d82..7ca4d5f 100644
--- a/infinote/rudel-infinote-group-directory.el
+++ b/infinote/rudel-infinote-group-directory.el
@@ -1,6 +1,6 @@
;;; rudel-infinote-group-directory.el --- Infinote directory group
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinote, group, communication
diff --git a/infinote/rudel-infinote-group-document.el
b/infinote/rudel-infinote-group-document.el
index dde796c..1f20d6e 100644
--- a/infinote/rudel-infinote-group-document.el
+++ b/infinote/rudel-infinote-group-document.el
@@ -1,6 +1,6 @@
;;; rudel-infinote-group-document.el --- Infinote document group
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinote, group, communication
diff --git a/infinote/rudel-infinote-group-text-document.el
b/infinote/rudel-infinote-group-text-document.el
index 68e4b67..0331599 100644
--- a/infinote/rudel-infinote-group-text-document.el
+++ b/infinote/rudel-infinote-group-text-document.el
@@ -1,6 +1,6 @@
;;; rudel-infinote-group-text-document.el --- Communication group used by text
documents
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinote, communication, group, text, document
diff --git a/infinote/rudel-infinote-group.el b/infinote/rudel-infinote-group.el
index 7b4bb75..51cfc4c 100644
--- a/infinote/rudel-infinote-group.el
+++ b/infinote/rudel-infinote-group.el
@@ -1,6 +1,6 @@
;;; rudel-infinote-group.el --- Common aspects of infinote communication groups
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinote, group, communication
diff --git a/infinote/rudel-infinote-node-directory.el
b/infinote/rudel-infinote-node-directory.el
index 444d128..bdf8422 100644
--- a/infinote/rudel-infinote-node-directory.el
+++ b/infinote/rudel-infinote-node-directory.el
@@ -1,6 +1,6 @@
;;; rudel-infinote-node-directory.el --- Infinote directory node class
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinote, document, directory
diff --git a/infinote/rudel-infinote-node.el b/infinote/rudel-infinote-node.el
index e159946..e20574d 100644
--- a/infinote/rudel-infinote-node.el
+++ b/infinote/rudel-infinote-node.el
@@ -1,6 +1,6 @@
;;; rudel-infinote-node.el --- Base class of infinote node classes
;;
-;; Copyright (C) 2010 Jan Moringen
+;; Copyright (C) 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinote, node
diff --git a/infinote/rudel-infinote-state.el b/infinote/rudel-infinote-state.el
index 039ac39..7f029e8 100644
--- a/infinote/rudel-infinote-state.el
+++ b/infinote/rudel-infinote-state.el
@@ -1,6 +1,6 @@
;;; rudel-infinote-state.el --- Base classes for infinote states
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinotes, states
diff --git a/infinote/rudel-infinote-text-document.el
b/infinote/rudel-infinote-text-document.el
index 60f4825..7a5b685 100644
--- a/infinote/rudel-infinote-text-document.el
+++ b/infinote/rudel-infinote-text-document.el
@@ -1,6 +1,6 @@
;;; rudel-infinote-text-document.el --- Infinote text document class
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinote, document, text
diff --git a/infinote/rudel-infinote-user.el b/infinote/rudel-infinote-user.el
index 885024f..8516a56 100644
--- a/infinote/rudel-infinote-user.el
+++ b/infinote/rudel-infinote-user.el
@@ -1,6 +1,6 @@
;;; rudel-infinote-user.el --- Infinote user class
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinote, user
diff --git a/infinote/rudel-infinote-util.el b/infinote/rudel-infinote-util.el
index 0569a3c..142e322 100644
--- a/infinote/rudel-infinote-util.el
+++ b/infinote/rudel-infinote-util.el
@@ -1,6 +1,6 @@
;;; rudel-infinote-util.el --- Miscellaneous functions for infinote backend
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinote, miscellaneous, utility
diff --git a/infinote/rudel-infinote.el b/infinote/rudel-infinote.el
index 7ffc485..675b8ce 100644
--- a/infinote/rudel-infinote.el
+++ b/infinote/rudel-infinote.el
@@ -1,6 +1,6 @@
;;; rudel-infinote.el --- Infinote backend for Rudel
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, gobby, infinote, protocol
@@ -54,7 +54,7 @@
;;; Class rudel-infinote-backend
;;
-;;;###autoload
+;;;###rudel-autoload
(defclass rudel-infinote-backend (rudel-protocol-backend)
((capabilities :initform '(join
change-color
@@ -167,11 +167,11 @@ document) associated to the new group."
;;; Autoloading
;;
-;;;###autoload
+;;;###rudel-autoload
(rudel-add-backend (rudel-backend-get-factory 'protocol)
'infinote 'rudel-infinote-backend)
-;;;###autoload
+;;;###rudel-autoload
(eval-after-load 'rudel-zeroconf
'(rudel-zeroconf-register-service "_infinote._tcp"
'xmpp 'infinote))
diff --git a/jupiter/jupiter-compound.el b/jupiter/jupiter-compound.el
index 789bbc2..a64ec33 100644
--- a/jupiter/jupiter-compound.el
+++ b/jupiter/jupiter-compound.el
@@ -1,6 +1,6 @@
;;; jupiter-compound.el --- Jupiter compound operation
;;
-;; Copyright (C) 2009 Jan Moringen
+;; Copyright (C) 2009, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: jupiter, operation, compound
diff --git a/jupiter/jupiter-delete.el b/jupiter/jupiter-delete.el
index b9ac934..48a5649 100644
--- a/jupiter/jupiter-delete.el
+++ b/jupiter/jupiter-delete.el
@@ -1,6 +1,6 @@
;;; jupiter-delete.el --- Jupiter delete operation
;;
-;; Copyright (C) 2009 Jan Moringen
+;; Copyright (C) 2009, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: jupiter, operation, delete
diff --git a/jupiter/jupiter-insert.el b/jupiter/jupiter-insert.el
index aa12b48..67b274d 100644
--- a/jupiter/jupiter-insert.el
+++ b/jupiter/jupiter-insert.el
@@ -1,6 +1,6 @@
;;; jupiter-insert.el --- Jupiter insert operation
;;
-;; Copyright (C) 2009 Jan Moringen
+;; Copyright (C) 2009, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: jupiter, operation, insert
diff --git a/jupiter/jupiter-nop.el b/jupiter/jupiter-nop.el
index e0f4a5c..7ed3867 100644
--- a/jupiter/jupiter-nop.el
+++ b/jupiter/jupiter-nop.el
@@ -1,6 +1,6 @@
;;; jupiter-nop.el --- Jupiter no operation
;;
-;; Copyright (C) 2009 Jan Moringen
+;; Copyright (C) 2009, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: jupiter, operation, nop
diff --git a/jupiter/jupiter-operation.el b/jupiter/jupiter-operation.el
index bc91fee..47f7a0f 100644
--- a/jupiter/jupiter-operation.el
+++ b/jupiter/jupiter-operation.el
@@ -1,6 +1,6 @@
;;; jupiter-operation.el --- Operation base class for jupiter algorithm
;;
-;; Copyright (C) 2009 Jan Moringen
+;; Copyright (C) 2009, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Jupiter, operation, base
diff --git a/jupiter/jupiter.el b/jupiter/jupiter.el
index d285041..8a5abfa 100644
--- a/jupiter/jupiter.el
+++ b/jupiter/jupiter.el
@@ -1,6 +1,6 @@
;;; jupiter.el --- An implementation of the Jupiter algorithm
;;
-;; Copyright (C) 2008, 2009 Jan Moringen
+;; Copyright (C) 2008, 2009, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, jupiter, algorithm, distributed, integrity
diff --git a/obby/rudel-obby-client.el b/obby/rudel-obby-client.el
index dd84367..700863e 100644
--- a/obby/rudel-obby-client.el
+++ b/obby/rudel-obby-client.el
@@ -1,6 +1,6 @@
;;; rudel-obby-client.el --- Client functions of the Rudel obby backend
;;
-;; Copyright (C) 2008, 2009, 2010, 2011 Jan Moringen
+;; Copyright (C) 2008-2011, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, obby, backend, client
diff --git a/obby/rudel-obby-debug.el b/obby/rudel-obby-debug.el
index edc0e01..3325008 100644
--- a/obby/rudel-obby-debug.el
+++ b/obby/rudel-obby-debug.el
@@ -1,6 +1,6 @@
;;; rudel-obby-debug.el --- Debugging functions for obby backend
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, obby, debugging
diff --git a/obby/rudel-obby-display.el b/obby/rudel-obby-display.el
index c0d2e06..7f91e38 100644
--- a/obby/rudel-obby-display.el
+++ b/obby/rudel-obby-display.el
@@ -1,6 +1,6 @@
;;; rudel-obby-display.el --- Display functions for obby documents and users
;;
-;; Copyright (C) 2009 Jan Moringen
+;; Copyright (C) 2009, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, user interface
diff --git a/obby/rudel-obby-errors.el b/obby/rudel-obby-errors.el
index 83f75a2..3c2dc47 100644
--- a/obby/rudel-obby-errors.el
+++ b/obby/rudel-obby-errors.el
@@ -1,6 +1,6 @@
;;; rudel-obby-errors.el --- Error data used in the obby Rudel backend
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, obby, errors
diff --git a/obby/rudel-obby-server.el b/obby/rudel-obby-server.el
index 7a46a59..77e5cdd 100644
--- a/obby/rudel-obby-server.el
+++ b/obby/rudel-obby-server.el
@@ -1,6 +1,6 @@
;;; rudel-obby-server.el --- Server component of the Rudel obby backend
;;
-;; Copyright (C) 2008, 2009, 2010 Jan Moringen
+;; Copyright (C) 2008-2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, obby, backend, server
diff --git a/obby/rudel-obby-state.el b/obby/rudel-obby-state.el
index 286be3f..8ad3855 100644
--- a/obby/rudel-obby-state.el
+++ b/obby/rudel-obby-state.el
@@ -1,6 +1,6 @@
;;; rudel-obby-state.el --- Base class for states used in the obby backend
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, obby, state machine
diff --git a/obby/rudel-obby-util.el b/obby/rudel-obby-util.el
index 9b6b148..a09e2b9 100644
--- a/obby/rudel-obby-util.el
+++ b/obby/rudel-obby-util.el
@@ -1,6 +1,6 @@
;;; rudel-obby-util.el --- Miscellaneous functions for the Rudel obby backend
;;
-;; Copyright (C) 2008, 2009 Jan Moringen
+;; Copyright (C) 2008, 2009, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, obby, backend, miscellaneous
diff --git a/obby/rudel-obby.el b/obby/rudel-obby.el
index 6edb639..4412d11 100644
--- a/obby/rudel-obby.el
+++ b/obby/rudel-obby.el
@@ -1,6 +1,6 @@
;;; rudel-obby.el --- An obby backend for Rudel
;;
-;; Copyright (C) 2008, 2009, 2010 Jan Moringen
+;; Copyright (C) 2008-2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, obby, backend, implementation
@@ -79,7 +79,7 @@ multiple chunks.")
;;; Class rudel-obby-backend
;;
-;;;###autoload
+;;;###rudel-autoload
(defclass rudel-obby-backend (rudel-protocol-backend)
((capabilities :initform '(join host
change-color
@@ -454,11 +454,11 @@ The resulting message is a string that looks like this:
;;; Autoloading
;;
-;;;###autoload
+;;;###rudel-autoload
(rudel-add-backend (rudel-backend-get-factory 'protocol)
'obby 'rudel-obby-backend)
-;;;###autoload
+;;;###rudel-autoload
(eval-after-load 'rudel-zeroconf
'(rudel-zeroconf-register-service "_lobby._tcp"
'start-tls 'obby))
diff --git a/rudel-backend.el b/rudel-backend.el
index 04938ea..ef1a5b3 100644
--- a/rudel-backend.el
+++ b/rudel-backend.el
@@ -1,6 +1,6 @@
;;; rudel-backend.el --- A generic backend management mechanism for Rudel
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, backend, factory
@@ -46,8 +46,7 @@
;;; Code:
;;
-(eval-when-compile
- (require 'cl))
+(require 'cl)
(require 'warnings)
@@ -81,7 +80,7 @@ symbol, that each describe one capability of the backend."))
;;; Class rudel-backend-factory
;;
-;;;###autoload
+;;;###rudel-autoload
(defclass rudel-backend-factory ()
((backends :initarg :backends
:type hash-table
@@ -106,7 +105,7 @@ category each.")
(call-next-method))
(oset this :backends (make-hash-table :test #'eq)))
-;;;###autoload
+;;;###rudel-autoload
(defmethod rudel-get-factory :static ((this rudel-backend-factory)
category)
"Return the factory responsible for CATEGORY.
@@ -116,7 +115,7 @@ If there is no responsible factory, create one and return
it."
(puthash category (rudel-backend-factory category) factories)))
)
-;;;###autoload
+;;;###rudel-autoload
(defmethod rudel-add-backend ((this rudel-backend-factory)
name class &optional replace)
"Add factory class CLASS with name NAME to THIS.
@@ -215,13 +214,13 @@ objects."
(symbolp (car cell))
(object-p (cdr cell))))
-;;;###autoload
+;;;###rudel-autoload
(defun rudel-backend-get (category name)
"A shortcut for getting backend NAME of category CATEGORY.
The returned backend is of the form (NAME . OBJECT)."
(rudel-get-backend (rudel-backend-get-factory category) name))
-;;;###autoload
+;;;###rudel-autoload
(defun rudel-backend-get-factory (category)
"A shortcut for getting the factory object for CATEGORY."
(rudel-get-factory rudel-backend-factory category))
diff --git a/rudel-chat.el b/rudel-chat.el
index 1a1bb84..9f7c7ff 100644
--- a/rudel-chat.el
+++ b/rudel-chat.el
@@ -1,6 +1,6 @@
;;; rudel-chat.el --- Handling of chat messages
;;
-;; Copyright (C) 2008, 2009, 2010 Jan Moringen
+;; Copyright (C) 2008-2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, chat, message
diff --git a/rudel-color.el b/rudel-color.el
index 0a78485..862d887 100644
--- a/rudel-color.el
+++ b/rudel-color.el
@@ -1,6 +1,6 @@
;;; rudel-color.el --- Color manipulation functions for Rudel
;;
-;; Copyright (C) 2010 Jan Moringen
+;; Copyright (C) 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, color, color space
@@ -46,6 +46,7 @@
;;; Code:
;;
+(eval-when-compile (require 'cl))
;;; RGV <-> HSV conversion
;;
diff --git a/rudel-compat.el b/rudel-compat.el
index 35178b1..609e003 100644
--- a/rudel-compat.el
+++ b/rudel-compat.el
@@ -1,7 +1,6 @@
;;; rudel-compat.el --- Compatibility code for Rudel
;;
-;; Copyright (C) 2009 Jan Moringen
-;; Copyright (C) 2009 Phil Hagelberg
+;; Copyright (C) 2009, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Phil Hagelberg <address@hidden>
diff --git a/rudel-compile.el b/rudel-compile.el
deleted file mode 100644
index 7bb701b..0000000
--- a/rudel-compile.el
+++ /dev/null
@@ -1,100 +0,0 @@
-;;; rudel-compile.el --- Byte-compile Rudel
-;;
-;; Copyright (C) 2009 Phil Hagelberg
-;; Copyright (C) 2009, 2010 Jan Moringen
-;;
-;; Author: Phil Hagelberg <address@hidden>
-;; Jan Moringen <address@hidden>
-;; Keywords: rudel, compile
-;; X-RCS: $Id:$
-;;
-;; This file is part of Rudel.
-;;
-;; Rudel is free software: you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-;;
-;; Rudel is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with Rudel. If not, see <http://www.gnu.org/licenses>.
-
-
-;;; Commentary:
-;;
-;; This file contains some Emacs Lisp code, which can be used to
-;; generate autoloads for Rudel and byte-compile Rudel. Autoloads or
-;; written into a file named rudel-loaddefs.el. This file should be
-;; loaded during the Emacs startup process.
-;;
-;; Press M-x eval-buffer to generate autoloads and byte-compile Rudel.
-
-
-;;; History:
-;;
-;; 0.2 - Generation of autoloads
-;;
-;; 0.1 - Initial version
-
-
-;;; Code:
-;;
-
-(require 'eieio)
-(require 'bytecomp)
-(require 'cl) ;; required for `flet' below
-
-(let* ((rudel-dir (file-name-directory
- (or load-file-name (buffer-file-name))))
- (subdirs (mapcar
- (lambda (subdir)
- (concat rudel-dir subdir))
- '("." "jupiter" "adopted" "socket" "tls" "xmpp" "telepathy"
"obby" "infinote" "zeroconf")))
- (loaddefs (concat rudel-dir "rudel-loaddefs.el"))
- (filename nil)) ;; TODO this is just a workaround for the
- ;; "void-variable: filename" compilation error
-
- (flet ((byte-compile-cl-warn (&rest) nil))
-
- ;; Adjust load path for compilation. We need to have all Rudel
- ;; subdirectories on the load path.
- (dolist (subdir subdirs)
- (add-to-list 'load-path subdir))
-
- ;; Byte compile everything.
- (byte-recompile-directory rudel-dir 0)
-
- ;; Update autoloads.
- (let ((generated-autoload-file loaddefs))
- (apply #'update-directory-autoloads subdirs))
-
- ;; This is for compatibility with older Emacs versions. Starting
- ;; from version 23.1 of GNU Emacs eieio should always be
- ;; (auto)loaded.
- (with-current-buffer (find-file-noselect loaddefs)
- (goto-char 1)
- (unless (looking-at "(let*")
- (insert "(let* ((rudel-dir (file-name-directory (or #$
- load-file-name
- (buffer-file-name))))
- (subdirs (mapcar
- (lambda (subdir)
- (concat rudel-dir subdir))
- '(\".\" \"jupiter\" \"adopted\" \"socket\" \"tls\" \"xmpp\"
\"telepathy\" \"obby\" \"infinote\" \"zeroconf\"))))
- ;; Adjust load path. We need to have all Rudel subdirectories on
- ;; the load path.
- (dolist (subdir subdirs)
- (add-to-list 'load-path subdir)))
-
-\(require 'eieio\)\n(require 'cl)\n(require 'rudel-backend)\n\n")
- (save-buffer))
- (kill-buffer))))
-
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
-;;; rudel-compile.el ends here
diff --git a/rudel-debug.el b/rudel-debug.el
index fa14a22..7aca207 100644
--- a/rudel-debug.el
+++ b/rudel-debug.el
@@ -1,6 +1,6 @@
;;; rudel-debug.el --- Debugging functions for Rudel
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, debugging
diff --git a/rudel-display.el b/rudel-display.el
index abb3066..54b0b35 100644
--- a/rudel-display.el
+++ b/rudel-display.el
@@ -1,6 +1,6 @@
;;; rudel-display.el --- Display functions for Rudel objects
;;
-;; Copyright (C) 2009 Jan Moringen
+;; Copyright (C) 2009, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, display, icons, text, representation
diff --git a/rudel-errors.el b/rudel-errors.el
index 0b32af3..5bb1a65 100644
--- a/rudel-errors.el
+++ b/rudel-errors.el
@@ -1,6 +1,6 @@
;;; rudel-errors.el --- Error data used in Rudel
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, errors, conditions
diff --git a/rudel-hooks.el b/rudel-hooks.el
index 7db8e8b..5d766cd 100644
--- a/rudel-hooks.el
+++ b/rudel-hooks.el
@@ -1,6 +1,6 @@
;;; rudel-hooks.el --- Hooks for Rudel events
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, hook
diff --git a/rudel-icons.el b/rudel-icons.el
index 6eaa5dc..ac69e6b 100644
--- a/rudel-icons.el
+++ b/rudel-icons.el
@@ -1,6 +1,6 @@
;;; rudel-icons.el --- Icons used by Rudel
;;
-;; Copyright (C) 2008, 2009, 2011 Jan Moringen
+;; Copyright (C) 2008, 2009, 2011, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, icons
@@ -41,8 +41,9 @@
;;; Image constants
;;
+(eval-and-compile
(defconst rudel-icons-image-formats '(svg png)
- "Image formats to try (in that order) when loading Rudel icons.")
+ "Image formats to try (in that order) when loading Rudel icons."))
(defvar rudel-icons-directory
(file-name-as-directory
diff --git a/rudel-interactive.el b/rudel-interactive.el
index 77d57fd..b8f0754 100644
--- a/rudel-interactive.el
+++ b/rudel-interactive.el
@@ -1,6 +1,6 @@
;;; rudel-interactive.el --- User interaction functions for Rudel.
;;
-;; Copyright (C) 2008, 2009, 2010 Jan Moringen
+;; Copyright (C) 2008-2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, user, interface, interaction
@@ -38,6 +38,7 @@
;;; Code:
;;
+(require 'cl)
(require 'rudel-compat) ;; for `read-color' replacement
(require 'rudel-backend) ;; for `rudel-backend-cons-p'
@@ -80,25 +81,29 @@ the name as string."
(setq prompt "Session: "))
;; For presentation and identification of sessions, use the :name
;; property.
- (flet ((to-string (session)
- (if (rudel-backend-cons-p session)
- (symbol-name (car session))
- (plist-get session :name))))
+ (let ((to-string
+ (lambda (session)
+ (if (rudel-backend-cons-p session)
+ (symbol-name (car session))
+ (plist-get session :name)))))
;; Read a session by name, then return that name or the
;; corresponding session info.
(let ((session-name (completing-read prompt
- (mapcar #'to-string sessions)
+ (mapcar to-string sessions)
nil t)))
(cond
((eq return 'object)
(find session-name sessions
- :key #'to-string :test #'string=))
+ :key to-string :test #'string=))
(t session-name))))
)
(defvar rudel-read-user-name-history nil
"History of inputs read by `rudel-read-user-name'.")
+(defvar rudel-default-username)
+(defvar rudel-current-session)
+
(defun rudel-read-user-name ()
"Read a username.
The default is taken from `rudel-default-username'."
diff --git a/rudel-mode.el b/rudel-mode.el
index ba95c1b..89c5fbf 100644
--- a/rudel-mode.el
+++ b/rudel-mode.el
@@ -1,6 +1,6 @@
;;; rudel-mode.el --- Global and buffer-local Rudel minor modes
;;
-;; Copyright (C) 2008, 2009, 2010 Jan Moringen
+;; Copyright (C) 2008-2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, mode
@@ -48,6 +48,7 @@
;;; Code:
;;
+(require 'cl)
(require 'easy-mmode)
(require 'easymenu)
@@ -132,6 +133,8 @@
(rudel-buffer-document))))
(force-mode-line-update))
+(defvar rudel-header-subscriptions-minor-mode)
+
(defun rudel-header-subscriptions--options-changed ()
"Update headers in buffers that have header subscriptions mode enabled."
(dolist (buffer (buffer-list))
@@ -228,8 +231,7 @@ subscriptions mode; otherwise, turn it off."
#'rudel-header-subscriptions--remove-user))
;; Reset header line to default format.
- (setq header-line-format default-header-line-format)
- (force-mode-line-update)) ;; TODO remove all handlers
+ (kill-local-variable 'header-line-format)) ;; TODO remove all handlers
;; No buffer document
(t
@@ -237,8 +239,7 @@ subscriptions mode; otherwise, turn it off."
(setq rudel-header-subscriptions-minor-mode nil)
;; Reset header line to default format.
- (setq header-line-format default-header-line-format)
- (force-mode-line-update)))
+ (kill-local-variable 'header-line-format)))
)
@@ -411,6 +412,8 @@ of the buffer.")
(force-mode-line-update)
)
+(defvar rudel-mode-line-publish-state-minor-mode)
+
(defun rudel-mode-line-publish-state--document-attach (document buffer)
"Handle attaching of DOCUMENT to BUFFER.
When `rudel-mode-line-publish-state-minor-mode' is enabled in
diff --git a/rudel-operations.el b/rudel-operations.el
index 90418d5..ddd1db5 100644
--- a/rudel-operations.el
+++ b/rudel-operations.el
@@ -1,6 +1,6 @@
;;; rudel-operations.el --- Rudel domain operations
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, operations
diff --git a/rudel-operators.el b/rudel-operators.el
index 07b8dc6..cf08036 100644
--- a/rudel-operators.el
+++ b/rudel-operators.el
@@ -1,6 +1,6 @@
;;; rudel-operators.el --- Sets of modification operators for Rudel objects
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, operators
diff --git a/rudel-overlay.el b/rudel-overlay.el
index 20ef2c3..a4f0663 100644
--- a/rudel-overlay.el
+++ b/rudel-overlay.el
@@ -1,6 +1,6 @@
;;; rudel-overlay.el --- Overlay functions for Rudel
;;
-;; Copyright (C) 2008, 2009, 2010 Jan Moringen
+;; Copyright (C) 2008-2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, overlay
@@ -36,8 +36,7 @@
(require 'custom)
-(eval-when-compile
- (require 'cl))
+(require 'cl)
(require 'eieio)
diff --git a/rudel-protocol.el b/rudel-protocol.el
index 96ba31b..3d81624 100644
--- a/rudel-protocol.el
+++ b/rudel-protocol.el
@@ -1,6 +1,6 @@
;;; rudel-protocol.el --- Interface implemented by Rudel protocol backends
;;
-;; Copyright (C) 2009 Jan Moringen
+;; Copyright (C) 2009, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, backend, protocol
diff --git a/rudel-session-initiation.el b/rudel-session-initiation.el
index b363334..bf2b2a7 100644
--- a/rudel-session-initiation.el
+++ b/rudel-session-initiation.el
@@ -1,6 +1,6 @@
;;; rudel-session-initiation.el --- Session discovery and advertising functions
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, session, initiation, service, discovery, advertising
@@ -54,8 +54,7 @@
;;; Code:
;;
-(eval-when-compile
- (require 'cl))
+(require 'cl)
(require 'eieio)
@@ -259,7 +258,7 @@ advertise the session."
(defconst rudel-ask-protocol-version '(0 2)
"Version of the ask-protocol backend for Rudel.")
-;;;###autoload
+;;;###rudel-autoload
(defclass rudel-ask-protocol-backend (rudel-session-initiation-backend)
((capabilities :initform (discover))
(priority :initform fallback))
@@ -295,7 +294,7 @@ required by the chosen backend.")
:transport-backend transport-backend)))))
)
-;;;###autoload
+;;;###rudel-autoload
(rudel-add-backend (rudel-backend-get-factory 'session-initiation)
'ask-protocol 'rudel-ask-protocol-backend)
@@ -306,7 +305,7 @@ required by the chosen backend.")
(defconst rudel-configured-sessions-version '(0 2)
"Version of the configured-sessions backend for Rudel.")
-;;;###autoload
+;;;###rudel-autoload
(defclass rudel-configured-sessions-backend
(rudel-session-initiation-backend)
((capabilities :initform (discover))
@@ -329,7 +328,7 @@ configured using customization.")
(mapcar #'rudel-session-initiation-adjust-info
rudel-configured-sessions))
-;;;###autoload
+;;;###rudel-autoload
(rudel-add-backend (rudel-backend-get-factory 'session-initiation)
'configured-sessions 'rudel-configured-sessions-backend)
diff --git a/rudel-speedbar.el b/rudel-speedbar.el
index 7ab2aba..72a41d0 100644
--- a/rudel-speedbar.el
+++ b/rudel-speedbar.el
@@ -1,6 +1,6 @@
;;; rudel-speedbar.el --- Speedbar rendering of Rudel objects
;;
-;; Copyright (C) 2008, 2009 Jan Moringen
+;; Copyright (C) 2008, 2009, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, collaboration, speedbar
@@ -77,6 +77,8 @@
'([ "Subscribe" #'ignore t])
"Menu part in easymenu format used in speedbar while browsing objects.")
+(defvar rudel-current-session)
+
(defun rudel-speedbar-toplevel-buttons (dir)
"Return a list of objects to display in speedbar.
Argument DIR is the directory from which to derive the list of objects."
diff --git a/rudel-state-machine.el b/rudel-state-machine.el
index 65879fb..7879983 100644
--- a/rudel-state-machine.el
+++ b/rudel-state-machine.el
@@ -1,6 +1,6 @@
;;; rudel-state-machine.el --- A simple state machine for Rudel
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, fsm
@@ -41,8 +41,7 @@
;;; Code:
;;
-(eval-when-compile
- (require 'cl))
+(require 'cl)
(require 'eieio)
diff --git a/rudel-transport-util.el b/rudel-transport-util.el
index 13e7afb..8db91fb 100644
--- a/rudel-transport-util.el
+++ b/rudel-transport-util.el
@@ -1,6 +1,6 @@
;;; rudel-transport-util.el --- Utility functions for Rudel transport
functionality
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, backend, transport, utility, miscellaneous
@@ -48,7 +48,9 @@
;;; Code:
;;
-
+(eval-when-compile (require 'cl))
+(require 'eieio)
+(eval-when-compile (require 'rudel-util))
(require 'rudel-errors) ;; for `rudel-error'
(require 'rudel-transport)
diff --git a/rudel-transport.el b/rudel-transport.el
index 7acdc9f..7025f57 100644
--- a/rudel-transport.el
+++ b/rudel-transport.el
@@ -1,6 +1,6 @@
;;; rudel-transport.el --- Rudel transport interface and backend
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, backend, transport
diff --git a/rudel-util.el b/rudel-util.el
index f52f40c..1ed30aa 100644
--- a/rudel-util.el
+++ b/rudel-util.el
@@ -1,6 +1,6 @@
;;; rudel-util.el --- Miscellaneous functions for Rudel
;;
-;; Copyright (C) 2008, 2009, 2010 Jan Moringen
+;; Copyright (C) 2008-2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, miscellaneous, util
@@ -43,8 +43,7 @@
;;; Code:
;;
-(eval-when-compile
- (require 'cl))
+(require 'cl)
(require 'eieio)
diff --git a/rudel-xml.el b/rudel-xml.el
index f9cfa3d..0689808 100644
--- a/rudel-xml.el
+++ b/rudel-xml.el
@@ -1,6 +1,6 @@
;;; rudel-xml.el --- XML processing functions used by Rudel
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, xml
@@ -45,6 +45,7 @@
;;; Code:
;;
+(eval-when-compile (require 'cl))
(require 'xml)
diff --git a/rudel.el b/rudel.el
index b08be69..09471d0 100644
--- a/rudel.el
+++ b/rudel.el
@@ -1,6 +1,6 @@
;;; rudel.el --- A collaborative editing framework for Emacs
;;
-;; Copyright (C) 2008, 2009, 2010 Jan Moringen
+;; Copyright (C) 2008-2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, collaboration
@@ -41,8 +41,7 @@
;;; Code:
;;
-(eval-when-compile
- (require 'cl))
+(require 'cl)
(require 'eieio)
(require 'eieio-base)
@@ -62,6 +61,16 @@
(require 'rudel-icons)
(require 'rudel-compat) ;; for `read-color' replacement
+;; Setup load-path for our subdirs.
+;; FIXME: We should probably just load those files via relative file names
+;; rather than mess with load-path.
+(let ((rudel-dir (file-name-directory
+ (or load-file-name (buffer-file-name)))))
+ (dolist (subdir '("jupiter" "adopted" "socket" "tls" "xmpp" "telepathy"
+ "obby" "infinote" "zeroconf"))
+ (add-to-list 'load-path (expand-file-name subdir rudel-dir))))
+(load "rudel-loaddefs") ;; Internal autoloads.
+
;;; Global variables
;;
diff --git a/socket/rudel-socket.el b/socket/rudel-socket.el
index 0ff3f3c..1858538 100644
--- a/socket/rudel-socket.el
+++ b/socket/rudel-socket.el
@@ -1,6 +1,6 @@
;;; rudel-tcp.el --- socket transport backend for Rudel
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, socket, transport, backend
@@ -164,7 +164,7 @@ be a transport object representing the incoming
connection."))
;;; Class rudel-tcp-backend
;;
-;;;###autoload
+;;;###rudel-autoload
(defclass rudel-tcp-backend (rudel-transport-backend)
((capabilities :initform (listen connect)))
"TCP transport backend.
@@ -270,7 +270,7 @@ INFO has to be a property list containing the key :port."
;;; Autoloading
;;
-;;;###autoload
+;;;###rudel-autoload
(rudel-add-backend (rudel-backend-get-factory 'transport)
'tcp 'rudel-tcp-backend)
diff --git a/telepathy/rudel-telepathy.el b/telepathy/rudel-telepathy.el
index dfe51a7..ea22d14 100644
--- a/telepathy/rudel-telepathy.el
+++ b/telepathy/rudel-telepathy.el
@@ -1,6 +1,6 @@
;;; rudel-telepathy.el --- A telepathy backend for Rudel
;;
-;; Copyright (C) 2008, 2009, 2010 Jan Moringen
+;; Copyright (C) 2008, 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, telepathy, backend
@@ -53,7 +53,7 @@
;;; Class rudel-telepathy-backend
;;
-;;;###autoload
+;;;###rudel-autoload
(defclass rudel-telepathy-backend (rudel-transport-backend)
((capabilities :initform '()))
"Class rudel-telepathy-backend ")
@@ -69,7 +69,7 @@
;;; Autoloading
;;
-;;;###autoload
+;;;###rudel-autoload
(rudel-add-backend (rudel-backend-get-factory 'transport)
'telepathy 'rudel-telepathy-backend)
diff --git a/tls/rudel-tls.el b/tls/rudel-tls.el
index 67eaec9..c6da7e7 100644
--- a/tls/rudel-tls.el
+++ b/tls/rudel-tls.el
@@ -1,6 +1,6 @@
;;; rudel-tls.el --- Start TLS protocol.
;;
-;; Copyright (C) 2008, 2009, 2010 Jan Moringen
+;; Copyright (C) 2008, 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, TLS, encryption, starttls, gnutls
@@ -244,7 +244,7 @@ capability.")
;;; Class rudel-start-tls-backend
;;
-;;;###autoload
+;;;###rudel-autoload
(defclass rudel-start-tls-backend (rudel-transport-backend)
((capabilities :initform (connect encrypt)))
"STARTTLS transport backend.
@@ -319,7 +319,7 @@ and :port."
;;; Autoloading
;;
-;;;###autoload
+;;;###rudel-autoload
(rudel-add-backend (rudel-backend-get-factory 'transport)
'start-tls 'rudel-start-tls-backend)
diff --git a/wave/rudel-wave.el b/wave/rudel-wave.el
index f87c676..4cd7fe2 100644
--- a/wave/rudel-wave.el
+++ b/wave/rudel-wave.el
@@ -1,6 +1,6 @@
;;; rudel-wave.el --- A Wave backend for Rudel
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, Wave protocol, backend
@@ -50,7 +50,7 @@
;;; Class rudel-wave-backend
;;
-;;;###autoload
+;;;###rudel-autoload
(defclass rudel-wave-backend (rudel-protocol-backend)
((capabilities :initform '(join
chat
@@ -69,7 +69,7 @@ connections.")
;;; Autoloading
;;
-;;;###autoload
+;;;###rudel-autoload
(rudel-add-backend (rudel-backend-get-factory 'protocol)
'wave 'rudel-wave-backend)
diff --git a/xmpp/rudel-xmpp-debug.el b/xmpp/rudel-xmpp-debug.el
index 3362b92..2502351 100644
--- a/xmpp/rudel-xmpp-debug.el
+++ b/xmpp/rudel-xmpp-debug.el
@@ -1,6 +1,6 @@
;;; rudel-xmpp-debug.el --- Debugging functions for the Rudel XMPP backend
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, xmpp, debug
diff --git a/xmpp/rudel-xmpp-sasl.el b/xmpp/rudel-xmpp-sasl.el
index 5ea1cdf..2ac5d2b 100644
--- a/xmpp/rudel-xmpp-sasl.el
+++ b/xmpp/rudel-xmpp-sasl.el
@@ -1,6 +1,6 @@
;;; rudel-xmpp-sasl.el --- SASL mechanism for the Rudel XMPP backend
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, xmpp, sasl, authentication
diff --git a/xmpp/rudel-xmpp-state.el b/xmpp/rudel-xmpp-state.el
index d598051..862c30f 100644
--- a/xmpp/rudel-xmpp-state.el
+++ b/xmpp/rudel-xmpp-state.el
@@ -1,6 +1,6 @@
;;; rudel-xmpp-state.el --- Base class for states used in XMPP connections
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, xmpp, state machine
diff --git a/xmpp/rudel-xmpp-tls.el b/xmpp/rudel-xmpp-tls.el
index 4df2f0b..7fd0c8d 100644
--- a/xmpp/rudel-xmpp-tls.el
+++ b/xmpp/rudel-xmpp-tls.el
@@ -1,6 +1,6 @@
;;; rudel-xmpp-tls.el --- TLS support for XMPP connections
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, xmpp, tls, encryption
diff --git a/xmpp/rudel-xmpp-tunnel.el b/xmpp/rudel-xmpp-tunnel.el
index 8f9361b..5e12e86 100644
--- a/xmpp/rudel-xmpp-tunnel.el
+++ b/xmpp/rudel-xmpp-tunnel.el
@@ -1,6 +1,6 @@
;;; rudel-xmpp-tunnel.el --- XMPP tunnel transport backend for Rudel
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, xmpp, tunnel, transport, backend
@@ -63,7 +63,7 @@ necessarily XML) through an XMPP connection.")
;;; Autoloading
;;
-;;;###autoload
+;;;###rudel-autoload
(rudel-add-backend (rudel-backend-get-factory 'transport)
'xmpp 'rudel-xmpp-tunnel-backend)
diff --git a/xmpp/rudel-xmpp-util.el b/xmpp/rudel-xmpp-util.el
index 530da8d..2bf2be4 100644
--- a/xmpp/rudel-xmpp-util.el
+++ b/xmpp/rudel-xmpp-util.el
@@ -1,6 +1,6 @@
;;; rudel-xmpp-util.el --- Miscellaneous functions for the Rudel XMPP backend
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, xmpp, backend, miscellaneous
diff --git a/xmpp/rudel-xmpp.el b/xmpp/rudel-xmpp.el
index 6e4113c..29d7822 100644
--- a/xmpp/rudel-xmpp.el
+++ b/xmpp/rudel-xmpp.el
@@ -1,6 +1,6 @@
;;; rudel-xmpp.el --- XMPP transport backend for Rudel
;;
-;; Copyright (C) 2009, 2010 Jan Moringen
+;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, xmpp, transport, backend
@@ -63,7 +63,7 @@
;;; Class rudel-xmpp-backend
;;
-;;;###autoload
+;;;###rudel-autoload
(defclass rudel-xmpp-backend (rudel-transport-backend)
((capabilities :initform '(connect)))
"Transport backend works by transporting XMPP messages through
@@ -419,7 +419,7 @@ previously shelved data"
;;; Autoloading
;;
-;;;###autoload
+;;;###rudel-autoload
(rudel-add-backend (rudel-backend-get-factory 'transport)
'xmpp 'rudel-xmpp-backend)
diff --git a/zeroconf/rudel-zeroconf.el b/zeroconf/rudel-zeroconf.el
index 18eefb1..80f47a9 100644
--- a/zeroconf/rudel-zeroconf.el
+++ b/zeroconf/rudel-zeroconf.el
@@ -1,6 +1,6 @@
;;; rudel-zeroconf.el --- Zeroconf support for Rudel
;;
-;; Copyright (C) 2008, 2009 Jan Moringen
+;; Copyright (C) 2008, 2009, 2014 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, service, discovery, advertising, zeroconf,
@@ -87,7 +87,7 @@ Each element is of the form
:key key :test (if (eq key 'rudel-zeroconf-service-type)
#'string= #'eq)))
-;;;###autoload
+;;;###rudel-autoload
(defun rudel-zeroconf-register-service
(type transport-backend protocol-backend)
"Add an entry for TYPE with TRANSPORT-BACKEND and PROTOCOL-BACKEND to the
list of service types.
@@ -109,7 +109,7 @@ service type TYPE."
;;; Class rudel-zeroconf-backend
;;
-;;;###autoload
+;;;###rudel-autoload
(defclass rudel-zeroconf-backend (rudel-session-initiation-backend)
((capabilities :initform (discover advertise))
(priority :initform primary))
@@ -259,7 +259,7 @@ service type TYPE."
;;; Autoloading
;;
-;;;###autoload
+;;;###rudel-autoload
(rudel-add-backend (rudel-backend-get-factory 'session-initiation)
'zeroconf 'rudel-zeroconf-backend)