[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/rudel 44d63cb: Use lexical-binding:t everywhere
|
From: |
Stefan Monnier |
|
Subject: |
[elpa] externals/rudel 44d63cb: Use lexical-binding:t everywhere |
|
Date: |
Tue, 12 Jul 2016 01:42:06 +0000 (UTC) |
branch: externals/rudel
commit 44d63cb7326b8afb327e480b89f61733141377df
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
Use lexical-binding:t everywhere
---
adopted-compound.el | 4 +--
adopted-delete.el | 2 +-
adopted-insert.el | 2 +-
adopted-nop.el | 8 ++---
adopted-operation.el | 2 +-
adopted.el | 4 +--
jupiter-compound.el | 4 +--
jupiter-delete.el | 4 +--
jupiter-insert.el | 4 +--
jupiter-nop.el | 8 ++---
jupiter-operation.el | 4 +--
jupiter.el | 8 ++---
rudel-backend.el | 2 +-
rudel-chat.el | 4 +--
rudel-color.el | 2 +-
rudel-debug.el | 2 +-
rudel-display.el | 8 ++---
rudel-errors.el | 10 ++-----
rudel-hooks.el | 4 +--
rudel-icons.el | 6 ++--
rudel-infinote-display.el | 4 +--
rudel-infinote-document.el | 4 +--
rudel-infinote-errors.el | 6 ++--
rudel-infinote-group-directory.el | 21 +++++++------
rudel-infinote-group-document.el | 50 +++++++++++++++----------------
rudel-infinote-group-text-document.el | 28 +++++++++---------
rudel-infinote-group.el | 6 ++--
rudel-infinote-node-directory.el | 6 ++--
rudel-infinote-node.el | 4 +--
rudel-infinote-state.el | 10 +++----
rudel-infinote-text-document.el | 4 +--
rudel-infinote-user.el | 4 +--
rudel-infinote-util.el | 4 +--
rudel-infinote.el | 20 ++++++-------
rudel-interactive.el | 4 +--
rudel-loaddefs.el | 52 ++++++++++++---------------------
rudel-obby-debug.el | 4 +--
rudel-obby-display.el | 4 +--
rudel-obby-errors.el | 12 ++------
rudel-obby-state.el | 8 ++---
rudel-obby-util.el | 10 +++----
rudel-obby.el | 14 ++++-----
rudel-operations.el | 6 ++--
rudel-operators.el | 4 +--
rudel-overlay.el | 4 +--
rudel-protocol.el | 4 +--
rudel-session-initiation.el | 10 +++----
rudel-speedbar.el | 6 ++--
rudel-state-machine.el | 6 ++--
rudel-telepathy.el | 6 ++--
rudel-tls.el | 10 +++----
rudel-transport.el | 4 +--
rudel-wave.el | 6 ++--
rudel-xml.el | 4 +--
rudel-xmpp-debug.el | 2 +-
rudel-xmpp-state.el | 10 +++----
rudel-xmpp-tls.el | 8 +++--
rudel-xmpp-tunnel.el | 4 +--
rudel-xmpp-util.el | 2 +-
rudel-zeroconf.el | 14 ++++-----
rudel.el | 17 ++++++-----
61 files changed, 235 insertions(+), 263 deletions(-)
diff --git a/adopted-compound.el b/adopted-compound.el
index 9668d12..fe788c5 100644
--- a/adopted-compound.el
+++ b/adopted-compound.el
@@ -1,6 +1,6 @@
-;;; adopted-compound.el --- Adopted compound operation
+;;; adopted-compound.el --- Adopted compound operation -*- lexical-binding:t
-*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, adopted, algorithm, operation, compound
diff --git a/adopted-delete.el b/adopted-delete.el
index 1c092f6..d904ad2 100644
--- a/adopted-delete.el
+++ b/adopted-delete.el
@@ -1,4 +1,4 @@
-;;; adopted-delete.el --- Adopted delete operation
+;;; adopted-delete.el --- Adopted delete operation -*- lexical-binding:t -*-
;;
;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
diff --git a/adopted-insert.el b/adopted-insert.el
index dbccd65..9523224 100644
--- a/adopted-insert.el
+++ b/adopted-insert.el
@@ -1,4 +1,4 @@
-;;; adopted-insert.el --- Adopted insert operation
+;;; adopted-insert.el --- Adopted insert operation -*- lexical-binding:t -*-
;;
;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
diff --git a/adopted-nop.el b/adopted-nop.el
index 9725127..622acf7 100644
--- a/adopted-nop.el
+++ b/adopted-nop.el
@@ -1,6 +1,6 @@
-;;; adopted-nop.el --- Adopted no operation
+;;; adopted-nop.el --- Adopted no operation -*- lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, adopted, algorithm, operation, nop
@@ -48,10 +48,10 @@
()
"Operation, which does not change anything.")
-(defmethod rudel-apply ((this adopted-nop) object)
+(defmethod rudel-apply ((_this adopted-nop) _object)
"Applying THIS does not change OBJECT.")
-(defmethod adopted-transform ((this adopted-nop) other)
+(defmethod adopted-transform ((_this adopted-nop) other)
"Transforming OTHER with THIS simply returns OTHER."
other)
diff --git a/adopted-operation.el b/adopted-operation.el
index 3efef1d..2178589 100644
--- a/adopted-operation.el
+++ b/adopted-operation.el
@@ -1,4 +1,4 @@
-;;; adopted-operation.el --- Base class for Adopted operations
+;;; adopted-operation.el --- Base class for Adopted operations -*-
lexical-binding:t -*-
;;
;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
diff --git a/adopted.el b/adopted.el
index 23a78a2..6214a34 100644
--- a/adopted.el
+++ b/adopted.el
@@ -1,6 +1,6 @@
-;;; adopted.el --- Adopted algorithm
+;;; adopted.el --- Adopted algorithm -*- lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, adopted, algorithm
diff --git a/jupiter-compound.el b/jupiter-compound.el
index 13b823c..a624409 100644
--- a/jupiter-compound.el
+++ b/jupiter-compound.el
@@ -1,4 +1,4 @@
-;;; jupiter-compound.el --- Jupiter compound operation
+;;; jupiter-compound.el --- Jupiter compound operation -*- lexical-binding:t
-*-
;;
;; Copyright (C) 2009, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -77,7 +77,7 @@ number of child operation.")
(setq other (jupiter-transform child other)))
other))
-(defmethod object-print ((this jupiter-compound) &rest strings)
+(defmethod object-print ((this jupiter-compound) &rest _strings)
"Add number of children to string representation of THIS."
(with-slots (children) this
(call-next-method
diff --git a/jupiter-delete.el b/jupiter-delete.el
index 1587e1b..1906fe3 100644
--- a/jupiter-delete.el
+++ b/jupiter-delete.el
@@ -1,4 +1,4 @@
-;;; jupiter-delete.el --- Jupiter delete operation
+;;; jupiter-delete.el --- Jupiter delete operation -*- lexical-binding:t -*-
;;
;; Copyright (C) 2009, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -165,7 +165,7 @@ OTHER is destructively modified or replaced."
(object-class other))))
other)
-(defmethod object-print ((this jupiter-delete) &rest strings)
+(defmethod object-print ((this jupiter-delete) &rest _strings)
"Add from, to and length to string representation of THIS."
(with-slots (from to length) this
(call-next-method
diff --git a/jupiter-insert.el b/jupiter-insert.el
index 55679af..2161621 100644
--- a/jupiter-insert.el
+++ b/jupiter-insert.el
@@ -1,4 +1,4 @@
-;;; jupiter-insert.el --- Jupiter insert operation
+;;; jupiter-insert.el --- Jupiter insert operation -*- lexical-binding:t -*-
;;
;; Copyright (C) 2009, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -152,7 +152,7 @@
(object-class other))))
other)
-(defmethod object-print ((this jupiter-insert) &rest strings)
+(defmethod object-print ((this jupiter-insert) &rest _strings)
"Add from, to, length and data to string representation of THIS."
(with-slots (from to length data) this
(call-next-method
diff --git a/jupiter-nop.el b/jupiter-nop.el
index 7ed3867..7a39225 100644
--- a/jupiter-nop.el
+++ b/jupiter-nop.el
@@ -1,6 +1,6 @@
-;;; jupiter-nop.el --- Jupiter no operation
+;;; jupiter-nop.el --- Jupiter no operation -*- lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: jupiter, operation, nop
@@ -48,10 +48,10 @@
()
"Operation, which does not change anything.")
-(defmethod rudel-apply ((this jupiter-nop) object)
+(defmethod rudel-apply ((_this jupiter-nop) _object)
"Applying THIS does not change OBJECT.")
-(defmethod jupiter-transform ((this jupiter-nop) other)
+(defmethod jupiter-transform ((_this jupiter-nop) other)
"Transforming OTHER with THIS simply returns OTHER."
other)
diff --git a/jupiter-operation.el b/jupiter-operation.el
index 47f7a0f..7c07614 100644
--- a/jupiter-operation.el
+++ b/jupiter-operation.el
@@ -1,6 +1,6 @@
-;;; jupiter-operation.el --- Operation base class for jupiter algorithm
+;;; jupiter-operation.el --- Operation base class for jupiter algorithm -*-
lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Jupiter, operation, base
diff --git a/jupiter.el b/jupiter.el
index e543b39..8918d12 100644
--- a/jupiter.el
+++ b/jupiter.el
@@ -1,6 +1,6 @@
-;;; jupiter.el --- An implementation of the Jupiter algorithm
+;;; jupiter.el --- An implementation of the Jupiter algorithm -*-
lexical-binding:t -*-
;;
-;; Copyright (C) 2008, 2009, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2009, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, jupiter, algorithm, distributed, integrity
@@ -83,7 +83,7 @@ jupiter algorithm.")
(cl-incf local-revision)))
(defmethod jupiter-remote-operation ((this jupiter-context)
- local-revision remote-revision
+ local-revision _remote-revision
operation)
"Transform OPERATION with revisions LOCAL-REVISION and REMOTE-REVISION using
the local operations stored in THIS.
LOCAL-REVISION is the local revision of THIS context, the remote
@@ -121,7 +121,7 @@ site is referring to."
transformed-operation)
)
-(defmethod object-print ((this jupiter-context) &rest strings)
+(defmethod object-print ((this jupiter-context) &rest _strings)
"Add revisions and log length to string representation of THIS."
(with-slots (local-revision remote-revision local-log) this
(call-next-method
diff --git a/rudel-backend.el b/rudel-backend.el
index 2072939..17fe1d5 100644
--- a/rudel-backend.el
+++ b/rudel-backend.el
@@ -1,4 +1,4 @@
-;;; rudel-backend.el --- A generic backend management mechanism for Rudel
+;;; rudel-backend.el --- A generic backend management mechanism for Rudel -*-
lexical-binding:t -*-
;;
;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
diff --git a/rudel-chat.el b/rudel-chat.el
index 9f7c7ff..1fb0100 100644
--- a/rudel-chat.el
+++ b/rudel-chat.el
@@ -1,6 +1,6 @@
-;;; rudel-chat.el --- Handling of chat messages
+;;; rudel-chat.el --- Handling of chat messages -*- lexical-binding:t -*-
;;
-;; Copyright (C) 2008-2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, chat, message
diff --git a/rudel-color.el b/rudel-color.el
index 182f66a..c064a38 100644
--- a/rudel-color.el
+++ b/rudel-color.el
@@ -1,4 +1,4 @@
-;;; rudel-color.el --- Color manipulation functions for Rudel
+;;; rudel-color.el --- Color manipulation functions for Rudel -*-
lexical-binding:t -*-
;;
;; Copyright (C) 2010, 2014, 2016 Free Software Foundation, Inc.
;;
diff --git a/rudel-debug.el b/rudel-debug.el
index e87a6b9..586abe1 100644
--- a/rudel-debug.el
+++ b/rudel-debug.el
@@ -388,6 +388,6 @@ TAG and LABEL determine the logging style."
(provide 'rudel-debug)
;; Local Variables:
-;; no-byte-compile: t
+;; no-byte-compile: nil
;; End:
;;; rudel-debug.el ends here
diff --git a/rudel-display.el b/rudel-display.el
index 54b0b35..78ead29 100644
--- a/rudel-display.el
+++ b/rudel-display.el
@@ -1,6 +1,6 @@
-;;; rudel-display.el --- Display functions for Rudel objects
+;;; rudel-display.el --- Display functions for Rudel objects -*-
lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, display, icons, text, representation
@@ -46,7 +46,7 @@
;;
(defmethod rudel-display-string ((this rudel-user)
- &optional use-images align)
+ &optional use-images _align)
"Return a textual representation of THIS for user interface purposes.
When USE-IMAGES is non-nil, add an icon that indicates a user to
the text representation.
@@ -63,7 +63,7 @@ a width equal to that number."
)
(defmethod rudel-display-string ((this rudel-document)
- &optional use-images align)
+ &optional use-images _align)
"Return a textual representation of THIS for user interface purposes.
When USE-IMAGES is non-nil, add an icon that indicates a document
to the text representation.
diff --git a/rudel-errors.el b/rudel-errors.el
index 5bb1a65..d9f375d 100644
--- a/rudel-errors.el
+++ b/rudel-errors.el
@@ -1,6 +1,6 @@
-;;; rudel-errors.el --- Error data used in Rudel
+;;; rudel-errors.el --- Error data used in Rudel -*- lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, errors, conditions
@@ -43,8 +43,6 @@
;; rudel-incomplete-info
-(intern "rudel-incomplete-info")
-
(put 'rudel-incomplete-info 'error-conditions
'(error
rudel-error rudel-incomplete-info))
@@ -54,8 +52,6 @@
;; rudel-join-error
-(intern "rudel-join-error")
-
(put 'rudel-join-error 'error-conditions
'(error
rudel-error rudel-join-error))
@@ -65,8 +61,6 @@
;; rudel-host-error
-(intern "rudel-host-error")
-
(put 'rudel-host-error 'error-conditions
'(error
rudel-error rudel-host-error))
diff --git a/rudel-hooks.el b/rudel-hooks.el
index 5d766cd..13dd4f2 100644
--- a/rudel-hooks.el
+++ b/rudel-hooks.el
@@ -1,6 +1,6 @@
-;;; rudel-hooks.el --- Hooks for Rudel events
+;;; rudel-hooks.el --- Hooks for Rudel events -*- lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, hook
diff --git a/rudel-icons.el b/rudel-icons.el
index ac69e6b..522990a 100644
--- a/rudel-icons.el
+++ b/rudel-icons.el
@@ -1,6 +1,6 @@
-;;; rudel-icons.el --- Icons used by Rudel
+;;; rudel-icons.el --- Icons used by Rudel -*- lexical-binding:t -*-
;;
-;; Copyright (C) 2008, 2009, 2011, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2009, 2011, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, icons
@@ -54,6 +54,8 @@
;;; Helper macro
;;
+(defvar image-load-path)
+
(defmacro rudel-defimage (name &optional docstring)
"Load image from Rudel icon directory and define image named NAME.
Optional argument DOCSTRING is the documentation string to
diff --git a/rudel-infinote-display.el b/rudel-infinote-display.el
index 5ded0ab..839fc44 100644
--- a/rudel-infinote-display.el
+++ b/rudel-infinote-display.el
@@ -1,4 +1,4 @@
-;;; rudel-infinote-display.el --- Display functions for infinote users
+;;; rudel-infinote-display.el --- Display functions for infinote users -*-
lexical-binding:t -*-
;;
;; Copyright (C) 2010, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -41,7 +41,7 @@
(require 'rudel-infinote-user)
(defmethod rudel-display-string ((this rudel-infinote-document-user)
- &optional use-images)
+ &optional _use-images)
"Return a textual representation of THIS for user interface purposes."
(with-slots ((name :object-name) status) this
(concat
diff --git a/rudel-infinote-document.el b/rudel-infinote-document.el
index f016a68..ffe1277 100644
--- a/rudel-infinote-document.el
+++ b/rudel-infinote-document.el
@@ -1,6 +1,6 @@
-;;; rudel-infinote-document.el --- Infinote document class
+;;; rudel-infinote-document.el --- Infinote document class -*-
lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinote, document
diff --git a/rudel-infinote-errors.el b/rudel-infinote-errors.el
index 92cfb40..2198fc5 100644
--- a/rudel-infinote-errors.el
+++ b/rudel-infinote-errors.el
@@ -1,6 +1,6 @@
-;;; rudel-infinote-errors.el --- Error data used in the infinote Rudel backend
+;;; rudel-infinote-errors.el --- Error data used in the infinote Rudel backend
-*- lexical-binding:t -*-
;;
-;; Copyright (C) 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, infinote, errors
@@ -44,8 +44,6 @@
;; rudel-infinote-no-such-node
-(intern "rudel-infinote-no-such-node")
-
(put 'rudel-infinote-no-such-node 'error-conditions
'(error
rudel-error rudel-infinote-no-such-node))
diff --git a/rudel-infinote-group-directory.el
b/rudel-infinote-group-directory.el
index a2f0115..f54ef74 100644
--- a/rudel-infinote-group-directory.el
+++ b/rudel-infinote-group-directory.el
@@ -1,4 +1,4 @@
-;;; rudel-infinote-group-directory.el --- Infinote directory group
+;;; rudel-infinote-group-directory.el --- Infinote directory group -*-
lexical-binding:t -*-
;;
;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -79,7 +79,7 @@ group.")
;; of the connection object and the sequence-number should be used
;; by all groups to identify server replies.
(with-slots (sequence-number plugins) this
- (with-tag-attrs ((version protocol-version number)
+ (with-tag-attrs (;; (version protocol-version number)
(sequence sequence-id number)) xml
(setq sequence-number sequence
plugins (mapcar
@@ -119,18 +119,17 @@ group.")
nil)
(defmethod rudel-infinote/remove-node
- ((this rudel-infinote-directory-state-idle) xml)
+ ((_this rudel-infinote-directory-state-idle) _xml)
""
- (with-tag-attrs (id) xml ;; seq
- nil))
+ ;; (with-tag-attrs (id) xml ;; seq
+ nil)
(defmethod rudel-infinote/sync-in
- ((this rudel-infinote-directory-state-idle) xml)
+ ((_this rudel-infinote-directory-state-idle) _xml)
""
;; TODO can contain child <subscribe group="group_name" method="method_name"
/>
- (with-tag-attrs (id parent name type group method) xml ;; optional? seq
+ ;; (with-tag-attrs (id parent name type group method) xml ;; optional? seq
nil)
- )
;;; Class rudel-infinote-directory-state-exploring
@@ -176,7 +175,7 @@ explored.")
nil)
(defmethod rudel-infinote/explore-end
- ((this rudel-infinote-directory-state-exploring) xml)
+ ((this rudel-infinote-directory-state-exploring) _xml)
""
(with-slots (remaining-messages) this
(unless (zerop remaining-messages)
@@ -270,7 +269,7 @@ explored.")
communication groups.")
(defmethod initialize-instance ((this rudel-infinote-group-directory)
- slots)
+ _slots)
""
;; Initialize slots of THIS.
(when (next-method-p)
@@ -287,7 +286,7 @@ communication groups.")
(with-slots (connection) this
(rudel-make-and-add-node connection id parent name type)))
-(defmethod rudel-remove-node ((this rudel-infinote-group-directory))
+(defmethod rudel-remove-node ((_this rudel-infinote-group-directory))
""
(error "Removing nodes is not implemented"))
diff --git a/rudel-infinote-group-document.el b/rudel-infinote-group-document.el
index 192e58b..4a7ef50 100644
--- a/rudel-infinote-group-document.el
+++ b/rudel-infinote-group-document.el
@@ -1,4 +1,4 @@
-;;; rudel-infinote-group-document.el --- Infinote document group
+;;; rudel-infinote-group-document.el --- Infinote document group -*-
lexical-binding:t -*-
;;
;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -56,7 +56,7 @@
"")
(defmethod rudel-infinote/sync-begin
- ((this rudel-infinote-group-document-state-idle) xml)
+ ((_this rudel-infinote-group-document-state-idle) xml)
"Handle 'sync-begin' message."
(with-tag-attrs ((num-messages num-messages number)) xml
;; Switch to synchronizing state.
@@ -68,8 +68,8 @@
(with-tag-attrs ((id id number)
name
status
- (caret caret number)
- (selection selection number)
+ ;; (caret caret number)
+ ;; (selection selection number)
(hue hue number)) xml
(if (rudel-find-user this id #'= #'rudel-id)
;; If the user is already subscribed to the document,
@@ -78,7 +78,7 @@
'(rudel infinote)
(format
"User with id %d is already subscribed to document `%s'"
- id (object-name-string (oref this :document)))
+ id (object-name-string (oref this document)))
:warning)
;; Otherwise, construct the document user object and add it to
@@ -99,10 +99,10 @@
((this rudel-infinote-group-document-state-idle) xml)
""
(with-tag-attrs ((id id number)
- name
+ ;; name
status
- (caret caret number)
- (selection selection number)
+ ;; (caret caret number)
+ ;; (selection selection number)
(hue hue number)) xml
(let ((user (rudel-find-user this id #'= #'rudel-id)))
(if (not user)
@@ -190,7 +190,7 @@
nil)
(defmethod rudel-infinote/session-close
- ((this rudel-infinote-group-document-state-idle) xml)
+ ((_this rudel-infinote-group-document-state-idle) _xml)
"Handle 'session-close' message."
;; Switch to closed state.
'closed)
@@ -238,12 +238,12 @@
((this rudel-infinote-group-document-state-synchronizing) xml)
"Create a user object and add it to the document."
;; TODO send sync-error if remaining-items is already zero
- (with-slots (remaining-items) this
+ (with-slots (remaining-items document) this
(with-tag-attrs ((id id number)
name
status
- (caret caret number)
- (selection selection number)
+ ;; (caret caret number)
+ ;; (selection selection number)
(hue hue number)) xml
(let ((user (rudel-infinote-document-user
name
@@ -261,11 +261,11 @@
nil)
(defmethod rudel-infinote/sync-request
- ((this rudel-infinote-group-document-state-synchronizing) xml)
+ ((this rudel-infinote-group-document-state-synchronizing) _xml)
"Handle 'sync-request' message."
(with-slots (remaining-items) this
- (with-tag-attrs (user time) xml
- ) ;; TODO
+ ;; (with-tag-attrs (user time) xml
+ ;; ) ;; TODO
;; Expect one less synchronization item.
(cl-decf remaining-items))
@@ -273,11 +273,11 @@
nil)
(defmethod rudel-infinote/sync-segment ;; TODO text documents only?
- ((this rudel-infinote-group-document-state-synchronizing) xml)
+ ((this rudel-infinote-group-document-state-synchronizing) _xml)
"Handle 'sync-segment' message."
(with-slots (remaining-items) this
- (with-tag-attrs (author) xml
- ) ;; TODO
+ ;; (with-tag-attrs (author) xml
+ ;; ) ;; TODO
;; Expect one less synchronization item.
(cl-decf remaining-items))
@@ -285,7 +285,7 @@
nil)
(defmethod rudel-infinote/sync-end
- ((this rudel-infinote-group-document-state-synchronizing) xml)
+ ((this rudel-infinote-group-document-state-synchronizing) _xml)
"Handle 'sync-end' message."
(with-slots (all-items remaining-items) this
(if (= remaining-items 0)
@@ -314,7 +314,7 @@
'idle)
(defmethod rudel-infinote/sync-cancel
- ((this rudel-infinote-group-document-state-synchronizing) xml)
+ ((_this rudel-infinote-group-document-state-synchronizing) _xml)
"Handle 'sync-cancel' message."
;; Stay in this state.
'idle)
@@ -361,8 +361,8 @@ expect a 'user-join' or 'user-rejoin' message in response.")
(with-tag-attrs ((id id number)
name
status
- (caret caret number)
- (selection selection number)
+ ;; (caret caret number)
+ ;; (selection selection number)
(hue hue number)) xml
;; In the joining state, the join message has to refer to our own
;; user. Therefore, we obtain the self user object from the
@@ -398,8 +398,8 @@ expect a 'user-join' or 'user-rejoin' message in response.")
(with-tag-attrs ((id id number)
name
status
- (caret caret number)
- (selection selection number)
+ ;; (caret caret number)
+ ;; (selection selection number)
(hue hue number)) xml
(let ((user (rudel-find-user this id #'= #'rudel-id)))
;; When we did not find the self user or the document user or
@@ -452,7 +452,7 @@ expect a 'user-join' or 'user-rejoin' message in response.")
"")
(defmethod initialize-instance ((this rudel-infinote-group-document)
- slots)
+ _slots)
""
;; Initialize slots of THIS.
(when (next-method-p)
diff --git a/rudel-infinote-group-text-document.el
b/rudel-infinote-group-text-document.el
index f47394a..f3212ba 100644
--- a/rudel-infinote-group-text-document.el
+++ b/rudel-infinote-group-text-document.el
@@ -1,4 +1,4 @@
-;;; rudel-infinote-group-text-document.el --- Communication group used by text
documents
+;;; rudel-infinote-group-text-document.el --- Communication group used by text
documents -*- lexical-binding:t -*-
;;
;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -125,8 +125,8 @@
nil)
(defmethod rudel-infinote/request/no-op
- ((this rudel-infinote-group-text-document-state-idle)
- user xml)
+ ((_this rudel-infinote-group-text-document-state-idle)
+ _user _xml)
""
nil)
@@ -153,22 +153,22 @@
nil)
(defmethod rudel-infinote/request/undo
- ((this rudel-infinote-group-text-document-state-idle) xml)
+ ((_this rudel-infinote-group-text-document-state-idle) _xml)
""
nil)
(defmethod rudel-infinote/request/undo-caret
- ((this rudel-infinote-group-text-document-state-idle) xml)
+ ((_this rudel-infinote-group-text-document-state-idle) _xml)
""
nil)
(defmethod rudel-infinote/request/redo
- ((this rudel-infinote-group-text-document-state-idle) xml)
+ ((_this rudel-infinote-group-text-document-state-idle) _xml)
""
nil)
(defmethod rudel-infinote/request/redo-caret
- ((this rudel-infinote-group-text-document-state-idle) xml)
+ ((_this rudel-infinote-group-text-document-state-idle) _xml)
""
nil)
@@ -184,7 +184,7 @@
(defmethod rudel-infinote/sync-segment ;; TODO text documents only?
((this rudel-infinote-group-text-document-state-synchronizing) xml)
""
- (with-slots (remaining-items) this
+ (with-slots (remaining-items document) this
(with-tag-attrs ((author-id author number)
(text text)) xml
(let ((author (rudel-find-user
@@ -209,7 +209,7 @@
nil)
(defmethod rudel-infinote/request/delete
- ((this rudel-infinote-group-text-document-state-synchronizing) xml)
+ ((_this rudel-infinote-group-text-document-state-synchronizing) _xml)
""
;; <delete pos="pos"><segment author="user_id">text</segment>[...]</delete>
;;
@@ -227,10 +227,10 @@
;; look at the document and which transformations were required to
;; transform the request to the current state before the operation is
;; actually executed.
- (with-tag-attrs (position pos number) xml
- (do-tag-children (child xml)
- (with-tag-attrs (author author number) xml)
- ))
+ ;; (with-tag-attrs (position pos number) xml
+ ;; (do-tag-children (child xml)
+ ;; (with-tag-attrs (author author number) xml)
+ ;; ))
nil)
@@ -253,7 +253,7 @@
"")
(defmethod initialize-instance
- ((this rudel-infinote-group-text-document) slots)
+ ((this rudel-infinote-group-text-document) _slots)
""
;; Initialize slots of THIS.
(when (next-method-p)
diff --git a/rudel-infinote-group.el b/rudel-infinote-group.el
index c7ae505..df6f52d 100644
--- a/rudel-infinote-group.el
+++ b/rudel-infinote-group.el
@@ -1,4 +1,4 @@
-;;; rudel-infinote-group.el --- Common aspects of infinote communication groups
+;;; rudel-infinote-group.el --- Common aspects of infinote communication
groups -*- lexical-binding:t -*-
;;
;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -127,7 +127,7 @@ domain: `%s', code: `%s'"
message.")
;; TODO can all groups receive <session-close/> or just document groups?
-(defmethod rudel-accept ((this rudel-infinote-group-state-closed) xml)
+(defmethod rudel-accept ((_this rudel-infinote-group-state-closed) _xml)
"Simply ignore all further messages."
nil)
@@ -160,7 +160,7 @@ sessions. Groups are basically modeled as named state
machines. Subclasses have to provide their own states."
:abstract t)
-(defmethod rudel-register-state ((this rudel-infinote-group) symbol state)
+(defmethod rudel-register-state ((this rudel-infinote-group) _symbol state)
"Set the :group slot of STATE to THIS."
;; Associate THIS connection to STATE.
(oset state :group this)
diff --git a/rudel-infinote-node-directory.el b/rudel-infinote-node-directory.el
index bdf8422..16f4c21 100644
--- a/rudel-infinote-node-directory.el
+++ b/rudel-infinote-node-directory.el
@@ -1,6 +1,6 @@
-;;; rudel-infinote-node-directory.el --- Infinote directory node class
+;;; rudel-infinote-node-directory.el --- Infinote directory node class -*-
lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinote, document, directory
@@ -59,7 +59,7 @@ Infinote tree.")
(push document child-cache))) ;; TODO object-add-to-list or add-to-list?
(defmethod slot-missing ((this rudel-infinote-node-directory)
- slot-name operation &optional new-value) ;; TODO why
not use slot-unbound?
+ slot-name operation &optional _new-value) ;; TODO why
not use slot-unbound?
"Simulate slot :children. The value of the slot is fetched as
necessary."
(cond
diff --git a/rudel-infinote-node.el b/rudel-infinote-node.el
index e20574d..aa6131c 100644
--- a/rudel-infinote-node.el
+++ b/rudel-infinote-node.el
@@ -1,6 +1,6 @@
-;;; rudel-infinote-node.el --- Base class of infinote node classes
+;;; rudel-infinote-node.el --- Base class of infinote node classes -*-
lexical-binding:t -*-
;;
-;; Copyright (C) 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinote, node
diff --git a/rudel-infinote-state.el b/rudel-infinote-state.el
index 7f029e8..e741cb9 100644
--- a/rudel-infinote-state.el
+++ b/rudel-infinote-state.el
@@ -1,6 +1,6 @@
-;;; rudel-infinote-state.el --- Base classes for infinote states
+;;; rudel-infinote-state.el --- Base classes for infinote states -*-
lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinotes, states
@@ -54,14 +54,14 @@
""))
"Base class for infinote state classes.")
-(defmethod rudel-enter ((this rudel-infinote-state))
+(defmethod rudel-enter ((_this rudel-infinote-state))
""
nil)
-(defmethod rudel-leave ((this rudel-infinote-state))
+(defmethod rudel-leave ((_this rudel-infinote-state))
"")
-(defmethod rudel-accept ((this rudel-infinote-state) xml)
+(defmethod rudel-accept ((_this rudel-infinote-state) _xml)
""
nil)
diff --git a/rudel-infinote-text-document.el b/rudel-infinote-text-document.el
index 7a5b685..2a1dca0 100644
--- a/rudel-infinote-text-document.el
+++ b/rudel-infinote-text-document.el
@@ -1,6 +1,6 @@
-;;; rudel-infinote-text-document.el --- Infinote text document class
+;;; rudel-infinote-text-document.el --- Infinote text document class -*-
lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinote, document, text
diff --git a/rudel-infinote-user.el b/rudel-infinote-user.el
index 8516a56..7a5e027 100644
--- a/rudel-infinote-user.el
+++ b/rudel-infinote-user.el
@@ -1,6 +1,6 @@
-;;; rudel-infinote-user.el --- Infinote user class
+;;; rudel-infinote-user.el --- Infinote user class -*- lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, infinote, user
diff --git a/rudel-infinote-util.el b/rudel-infinote-util.el
index 37b40bd..b5ea0a1 100644
--- a/rudel-infinote-util.el
+++ b/rudel-infinote-util.el
@@ -1,4 +1,4 @@
-;;; rudel-infinote-util.el --- Miscellaneous functions for infinote backend
+;;; rudel-infinote-util.el --- Miscellaneous functions for infinote backend
-*- lexical-binding:t -*-
;;
;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -71,7 +71,7 @@
'(split)
(mapcar #'rudel-operation->xml children))))
-(defmethod rudel-operation->xml ((this adopted-nop))
+(defmethod rudel-operation->xml ((_this adopted-nop))
"Serialize THIS nop operation."
`(nop))
diff --git a/rudel-infinote.el b/rudel-infinote.el
index 675b8ce..d970ca3 100644
--- a/rudel-infinote.el
+++ b/rudel-infinote.el
@@ -1,6 +1,6 @@
-;;; rudel-infinote.el --- Infinote backend for Rudel
+;;; rudel-infinote.el --- Infinote backend for Rudel -*- lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, gobby, infinote, protocol
@@ -64,14 +64,14 @@
group-undo)))
"")
-(defmethod initialize-instance ((this rudel-infinote-backend) slots)
+(defmethod initialize-instance ((this rudel-infinote-backend) _slots)
""
(when (next-method-p)
(call-next-method))
(oset this :version rudel-infinote-version))
-(defmethod rudel-ask-connect-info ((this rudel-infinote-backend)
+(defmethod rudel-ask-connect-info ((_this rudel-infinote-backend)
&optional info)
""
;; Read desired username and color
@@ -85,8 +85,8 @@
info))
)
-(defmethod rudel-connect ((this rudel-infinote-backend) transport
- info info-callback
+(defmethod rudel-connect ((_this rudel-infinote-backend) transport
+ info _info-callback
&optional progress-callback)
"Connect to an infinote server using the information INFO.
Return the connection object."
@@ -112,13 +112,13 @@ Return the connection object."
connection)
)
-(defmethod rudel-make-document ((this rudel-infinote-backend)
- name encoding session)
+(defmethod rudel-make-document ((_this rudel-infinote-backend)
+ name _encoding session)
""
(rudel-infinote-text-document name
:session session))
-(defmethod rudel-make-node ((this rudel-infinote-backend)
+(defmethod rudel-make-node ((_this rudel-infinote-backend)
type name id parent)
"Create a node object according to TYPE, NAME, ID and PARENT.
The new node will be named NAME and have id ID. It will be a
@@ -144,7 +144,7 @@ node will be the root node."
(error "No such node type: `%s'" type)))
)
-(defmethod rudel-make-group ((this rudel-infinote-backend)
+(defmethod rudel-make-group ((_this rudel-infinote-backend)
type name method &optional node)
"Create a new group according to TYPE, NAME and METHOD.
The optional argument NODE can specify the node (usually a
diff --git a/rudel-interactive.el b/rudel-interactive.el
index 3af7cf5..15cb809 100644
--- a/rudel-interactive.el
+++ b/rudel-interactive.el
@@ -128,7 +128,7 @@ the name as string."
;; is used.
(unless users
(if rudel-current-session
- (setq users (oref rudel-current-session :users))
+ (setq users (oref rudel-current-session users))
(error "No user list and no active Rudel session")))
(unless prompt
(setq prompt "User: "))
@@ -150,7 +150,7 @@ If RETURN. is 'object, return the backend object; Otherwise
return the name as string."
(unless documents
(if rudel-current-session
- (setq documents (oref rudel-current-session :documents))
+ (setq documents (oref rudel-current-session documents))
(error "No document list and no active Rudel session")))
(unless documents
(error "No documents")) ; TODO error is a bit harsh
diff --git a/rudel-loaddefs.el b/rudel-loaddefs.el
index 685ecc5..9e55a12 100644
--- a/rudel-loaddefs.el
+++ b/rudel-loaddefs.el
@@ -140,43 +140,27 @@ service type TYPE.
;;;***
-;;;### (autoloads nil nil ("adopted-compound.el" "adopted-compound.el"
-;;;;;; "adopted-delete.el" "adopted-delete.el" "adopted-insert.el"
-;;;;;; "adopted-insert.el" "adopted-nop.el" "adopted-nop.el"
"adopted-operation.el"
-;;;;;; "adopted-operation.el" "adopted.el" "adopted.el" "jupiter-compound.el"
-;;;;;; "jupiter-compound.el" "jupiter-delete.el" "jupiter-delete.el"
-;;;;;; "jupiter-insert.el" "jupiter-insert.el" "jupiter-nop.el"
-;;;;;; "jupiter-nop.el" "jupiter-operation.el" "jupiter-operation.el"
-;;;;;; "jupiter.el" "jupiter.el" "rudel-autoloads.el" "rudel-chat.el"
-;;;;;; "rudel-chat.el" "rudel-color.el" "rudel-color.el" "rudel-debug.el"
-;;;;;; "rudel-display.el" "rudel-display.el" "rudel-errors.el"
"rudel-errors.el"
-;;;;;; "rudel-hooks.el" "rudel-hooks.el" "rudel-icons.el" "rudel-icons.el"
-;;;;;; "rudel-infinote-client.el" "rudel-infinote-display.el"
"rudel-infinote-display.el"
-;;;;;; "rudel-infinote-document.el" "rudel-infinote-document.el"
-;;;;;; "rudel-infinote-errors.el" "rudel-infinote-errors.el"
"rudel-infinote-group-directory.el"
-;;;;;; "rudel-infinote-group-directory.el" "rudel-infinote-group-document.el"
+;;;### (autoloads nil nil ("adopted-compound.el" "adopted-delete.el"
+;;;;;; "adopted-insert.el" "adopted-nop.el" "adopted-operation.el"
+;;;;;; "adopted.el" "jupiter-compound.el" "jupiter-delete.el"
"jupiter-insert.el"
+;;;;;; "jupiter-nop.el" "jupiter-operation.el" "jupiter.el"
"rudel-autoloads.el"
+;;;;;; "rudel-chat.el" "rudel-color.el" "rudel-debug.el" "rudel-display.el"
+;;;;;; "rudel-errors.el" "rudel-hooks.el" "rudel-icons.el"
"rudel-infinote-client.el"
+;;;;;; "rudel-infinote-display.el" "rudel-infinote-document.el"
+;;;;;; "rudel-infinote-errors.el" "rudel-infinote-group-directory.el"
;;;;;; "rudel-infinote-group-document.el"
"rudel-infinote-group-text-document.el"
-;;;;;; "rudel-infinote-group-text-document.el" "rudel-infinote-group.el"
;;;;;; "rudel-infinote-group.el" "rudel-infinote-node-directory.el"
-;;;;;; "rudel-infinote-node-directory.el" "rudel-infinote-node.el"
-;;;;;; "rudel-infinote-node.el" "rudel-infinote-state.el"
"rudel-infinote-state.el"
-;;;;;; "rudel-infinote-text-document.el" "rudel-infinote-text-document.el"
-;;;;;; "rudel-infinote-user.el" "rudel-infinote-user.el"
"rudel-infinote-util.el"
-;;;;;; "rudel-infinote-util.el" "rudel-interactive.el" "rudel-mode.el"
-;;;;;; "rudel-obby-client.el" "rudel-obby-debug.el" "rudel-obby-debug.el"
-;;;;;; "rudel-obby-display.el" "rudel-obby-display.el" "rudel-obby-errors.el"
-;;;;;; "rudel-obby-errors.el" "rudel-obby-server.el" "rudel-obby-state.el"
+;;;;;; "rudel-infinote-node.el" "rudel-infinote-state.el"
"rudel-infinote-text-document.el"
+;;;;;; "rudel-infinote-user.el" "rudel-infinote-util.el"
"rudel-interactive.el"
+;;;;;; "rudel-mode.el" "rudel-obby-client.el" "rudel-obby-debug.el"
+;;;;;; "rudel-obby-display.el" "rudel-obby-errors.el" "rudel-obby-server.el"
;;;;;; "rudel-obby-state.el" "rudel-obby-util.el" "rudel-operations.el"
-;;;;;; "rudel-operations.el" "rudel-operators.el" "rudel-operators.el"
-;;;;;; "rudel-overlay.el" "rudel-overlay.el" "rudel-pkg.el"
"rudel-protocol.el"
-;;;;;; "rudel-protocol.el" "rudel-speedbar.el" "rudel-speedbar.el"
-;;;;;; "rudel-state-machine.el" "rudel-state-machine.el"
"rudel-transport-util.el"
-;;;;;; "rudel-transport-util.el" "rudel-transport.el" "rudel-transport.el"
-;;;;;; "rudel-util.el" "rudel-xml.el" "rudel-xml.el" "rudel-xmpp-debug.el"
-;;;;;; "rudel-xmpp-debug.el" "rudel-xmpp-sasl.el" "rudel-xmpp-state.el"
-;;;;;; "rudel-xmpp-state.el" "rudel-xmpp-tls.el" "rudel-xmpp-tls.el"
-;;;;;; "rudel-xmpp-util.el" "rudel-xmpp-util.el" "rudel.el" "rudel.el")
-;;;;;; (0 0 0 0))
+;;;;;; "rudel-operators.el" "rudel-overlay.el" "rudel-pkg.el"
"rudel-protocol.el"
+;;;;;; "rudel-speedbar.el" "rudel-state-machine.el" "rudel-transport-util.el"
+;;;;;; "rudel-transport-util.el" "rudel-transport.el" "rudel-util.el"
+;;;;;; "rudel-xml.el" "rudel-xmpp-debug.el" "rudel-xmpp-sasl.el"
+;;;;;; "rudel-xmpp-state.el" "rudel-xmpp-tls.el" "rudel-xmpp-util.el"
+;;;;;; "rudel.el") (0 0 0 0))
;;;***
diff --git a/rudel-obby-debug.el b/rudel-obby-debug.el
index 3325008..8d2427e 100644
--- a/rudel-obby-debug.el
+++ b/rudel-obby-debug.el
@@ -1,6 +1,6 @@
-;;; rudel-obby-debug.el --- Debugging functions for obby backend
+;;; rudel-obby-debug.el --- Debugging functions for obby backend -*-
lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, obby, debugging
diff --git a/rudel-obby-display.el b/rudel-obby-display.el
index 7f91e38..308ba4d 100644
--- a/rudel-obby-display.el
+++ b/rudel-obby-display.el
@@ -1,6 +1,6 @@
-;;; rudel-obby-display.el --- Display functions for obby documents and users
+;;; rudel-obby-display.el --- Display functions for obby documents and users
-*- lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, user interface
diff --git a/rudel-obby-errors.el b/rudel-obby-errors.el
index 3c2dc47..ef85f6e 100644
--- a/rudel-obby-errors.el
+++ b/rudel-obby-errors.el
@@ -1,6 +1,6 @@
-;;; rudel-obby-errors.el --- Error data used in the obby Rudel backend
+;;; rudel-obby-errors.el --- Error data used in the obby Rudel backend -*-
lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, obby, errors
@@ -44,8 +44,6 @@
;; rudel-obby-invalid-username
-(intern "rudel-obby-invalid-username")
-
(put 'rudel-obby-invalid-username 'error-conditions
'(error
rudel-error rudel-join-error
@@ -56,8 +54,6 @@
;; rudel-obby-username-in-use
-(intern "rudel-obby-username-in-use")
-
(put 'rudel-obby-username-in-use 'error-conditions
'(error
rudel-error rudel-join-error
@@ -68,8 +64,6 @@
;; rudel-obby-invalid-color
-(intern "rudel-obby-invalid-color")
-
(put 'rudel-obby-invalid-color 'error-conditions
'(error
rudel-error rudel-join-error
@@ -80,8 +74,6 @@
;; rudel-obby-color-in-use
-(intern "rudel-obby-color-in-use")
-
(put 'rudel-obby-color-in-use 'error-conditions
'(error
rudel-error rudel-join-error
diff --git a/rudel-obby-state.el b/rudel-obby-state.el
index 8ad3855..a8a1fe9 100644
--- a/rudel-obby-state.el
+++ b/rudel-obby-state.el
@@ -1,6 +1,6 @@
-;;; rudel-obby-state.el --- Base class for states used in the obby backend
+;;; rudel-obby-state.el --- Base class for states used in the obby backend
-*- lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, obby, state machine
@@ -62,11 +62,11 @@ state."))
"Base class for state classes used in the obby backend."
:abstract t)
-(defmethod rudel-enter ((this rudel-obby-state))
+(defmethod rudel-enter ((_this rudel-obby-state))
"Default behavior is doing nothing when entering a state."
nil)
-(defmethod rudel-leave ((this rudel-obby-state))
+(defmethod rudel-leave ((_this rudel-obby-state))
"Default behavior is doing nothing when leaving a state.")
(defmethod rudel-accept ((this rudel-obby-state) message)
diff --git a/rudel-obby-util.el b/rudel-obby-util.el
index 7e04250..0b1b5df 100644
--- a/rudel-obby-util.el
+++ b/rudel-obby-util.el
@@ -1,4 +1,4 @@
-;;; rudel-obby-util.el --- Miscellaneous functions for the Rudel obby backend
+;;; rudel-obby-util.el --- Miscellaneous functions for the Rudel obby backend
-*- lexical-binding:t -*-
;;
;; Copyright (C) 2008, 2009, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -73,7 +73,7 @@
(list "split" )
(mapcar #'rudel-operation->message children))))
-(defmethod rudel-operation->message ((this jupiter-nop))
+(defmethod rudel-operation->message ((_this jupiter-nop))
"Serialize THIS nop operation."
(list "nop"))
@@ -152,7 +152,7 @@ construction of the name of the new operation. "
(let ((old-from (+ from 1))
(old-to (+ to 1)))
(with-current-buffer buffer
- (pcase-let ((`(,change-from ,change-to string)
+ (pcase-let ((`(,change-from ,_change-to ,string)
rudel-buffer-change-workaround-data))
(setq from (- (position-bytes old-from) 1)
length (string-bytes
@@ -170,7 +170,7 @@ construction of the name of the new operation. "
children))
)
-(defmethod rudel-obby-char->byte ((this jupiter-nop) buffer)
+(defmethod rudel-obby-char->byte ((_this jupiter-nop) _buffer)
"Nothing to convert if THIS is a nop.")
(defgeneric rudel-obby-byte->char ((this jupiter-operation) buffer)
@@ -201,7 +201,7 @@ construction of the name of the new operation. "
children))
)
-(defmethod rudel-obby-byte->char ((this jupiter-nop) buffer)
+(defmethod rudel-obby-byte->char ((_this jupiter-nop) _buffer)
"Nothing to convert if THIS is a nop.")
diff --git a/rudel-obby.el b/rudel-obby.el
index e86d008..e5adc77 100644
--- a/rudel-obby.el
+++ b/rudel-obby.el
@@ -1,4 +1,4 @@
-;;; rudel-obby.el --- An obby backend for Rudel
+;;; rudel-obby.el --- An obby backend for Rudel -*- lexical-binding:t -*-
;;
;; Copyright (C) 2008-2010, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -85,14 +85,14 @@ multiple chunks.")
"Main class of the Rudel obby backend. Creates obby client
connections and creates obby servers.")
-(defmethod initialize-instance ((this rudel-obby-backend) slots)
+(defmethod initialize-instance ((this rudel-obby-backend) _slots)
"Initialize slots of THIS with SLOTS."
(when (next-method-p)
(call-next-method))
(oset this :version rudel-obby-version))
-(defmethod rudel-ask-connect-info ((this rudel-obby-backend)
+(defmethod rudel-ask-connect-info ((_this rudel-obby-backend)
&optional info)
"Ask user for the information required to connect to an obby server."
;; Read server host and port.
@@ -134,7 +134,7 @@ Return the connection object."
;; Create the network process
(let* ((session (plist-get info :session))
(host (plist-get info :host)) ;; Just as name
- (encryption (plist-get info :encryption))
+ ;; (encryption (plist-get info :encryption))
(connection (rudel-obby-connection
host
:session session
@@ -227,7 +227,7 @@ Return the connection object."
;; The connection is now usable; return it.
connection))
-(defmethod rudel-ask-host-info ((this rudel-obby-backend)
+(defmethod rudel-ask-host-info ((_this rudel-obby-backend)
&optional info)
"Ask user for information required to host an obby session."
;; Read address and port unless they are already specified in INFO.
@@ -241,7 +241,7 @@ Return the connection object."
info))
)
-(defmethod rudel-host ((this rudel-obby-backend) listener info)
+(defmethod rudel-host ((_this rudel-obby-backend) listener _info)
"Host an obby session using the information INFO.
Return the created server."
;; Before we start, we load the server functionality.
@@ -266,7 +266,7 @@ Return the new document."
:suffix 1)))
)
-(defmethod rudel-available-document-id ((this rudel-obby-backend)
+(defmethod rudel-available-document-id ((_this rudel-obby-backend)
session)
"Return a document id, which is not in use in SESSION."
;; Look through some candidates until an unused id is hit.
diff --git a/rudel-operations.el b/rudel-operations.el
index ddd1db5..598e6b2 100644
--- a/rudel-operations.el
+++ b/rudel-operations.el
@@ -1,6 +1,6 @@
-;;; rudel-operations.el --- Rudel domain operations
+;;; rudel-operations.el --- Rudel domain operations -*- lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, operations
@@ -123,7 +123,7 @@ end of buffer"))
(rudel-insert object from data)))
(defmethod slot-missing ((this rudel-insert-op)
- slot-name operation &optional new-value)
+ slot-name operation &optional _new-value)
"Simulate read-only slots :length and :to."
(cond
;; Slot :length
diff --git a/rudel-operators.el b/rudel-operators.el
index cf08036..8bc3c17 100644
--- a/rudel-operators.el
+++ b/rudel-operators.el
@@ -1,6 +1,6 @@
-;;; rudel-operators.el --- Sets of modification operators for Rudel objects
+;;; rudel-operators.el --- Sets of modification operators for Rudel objects
-*- lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, operators
diff --git a/rudel-overlay.el b/rudel-overlay.el
index 00fb237..55299af 100644
--- a/rudel-overlay.el
+++ b/rudel-overlay.el
@@ -1,4 +1,4 @@
-;;; rudel-overlay.el --- Overlay functions for Rudel
+;;; rudel-overlay.el --- Overlay functions for Rudel -*- lexical-binding:t -*-
;;
;; Copyright (C) 2008-2010, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -225,7 +225,7 @@ AUTHOR has to be an object of type rudel-author-child."
(rudel-make-author-overlay buffer position end author))))))
)
-(defun rudel-update-author-overlay-after-delete (buffer position length author)
+(defun rudel-update-author-overlay-after-delete (buffer position _length
_author)
"Update author overlays in BUFFER to incorporate a deletion of length LENGTH
at POSITION by AUTHOR.
POSITION refers to an Emacs buffer position.
AUTHOR has to be an object of type rudel-author-child."
diff --git a/rudel-protocol.el b/rudel-protocol.el
index 3d81624..78ae225 100644
--- a/rudel-protocol.el
+++ b/rudel-protocol.el
@@ -1,6 +1,6 @@
-;;; rudel-protocol.el --- Interface implemented by Rudel protocol backends
+;;; rudel-protocol.el --- Interface implemented by Rudel protocol backends
-*- lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2014, 2016 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 ad3a1fc..6301dd5 100644
--- a/rudel-session-initiation.el
+++ b/rudel-session-initiation.el
@@ -1,4 +1,4 @@
-;;; rudel-session-initiation.el --- Session discovery and advertising functions
+;;; rudel-session-initiation.el --- Session discovery and advertising
functions -*- lexical-binding:t -*-
;;
;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -265,14 +265,14 @@ user select a suitable backend and asking for connect
information
required by the chosen backend.")
(defmethod initialize-instance ((this rudel-ask-protocol-backend)
- slots)
+ _slots)
"Set backend version."
(when (next-method-p)
(call-next-method))
(oset this :version rudel-ask-protocol-version))
-(defmethod rudel-discover ((this rudel-ask-protocol-backend))
+(defmethod rudel-discover ((_this rudel-ask-protocol-backend))
"\"Discover\" sessions by asking the user about the backend to use and the
connect info."
(let ((protocol-backend (rudel-backend-choose
'protocol
@@ -312,14 +312,14 @@ required by the chosen backend.")
configured using customization.")
(defmethod initialize-instance ((this rudel-configured-sessions-backend)
- slots)
+ _slots)
"Set backend version."
(when (next-method-p)
(call-next-method))
(oset this :version rudel-configured-sessions-version))
-(defmethod rudel-discover ((this rudel-configured-sessions-backend))
+(defmethod rudel-discover ((_this rudel-configured-sessions-backend))
"\"Discover\" sessions the has configured."
;; Iterate over all configured sessions in order to make
;; adjustments.
diff --git a/rudel-speedbar.el b/rudel-speedbar.el
index 72a41d0..3a03ffe 100644
--- a/rudel-speedbar.el
+++ b/rudel-speedbar.el
@@ -1,6 +1,6 @@
-;;; rudel-speedbar.el --- Speedbar rendering of Rudel objects
+;;; rudel-speedbar.el --- Speedbar rendering of Rudel objects -*-
lexical-binding:t -*-
;;
-;; Copyright (C) 2008, 2009, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2009, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, collaboration, speedbar
@@ -79,7 +79,7 @@
(defvar rudel-current-session)
-(defun rudel-speedbar-toplevel-buttons (dir)
+(defun rudel-speedbar-toplevel-buttons (_dir) ;; FIXME: Use `dir'!
"Return a list of objects to display in speedbar.
Argument DIR is the directory from which to derive the list of objects."
(when rudel-current-session
diff --git a/rudel-state-machine.el b/rudel-state-machine.el
index b15a17e..0b36b0d 100644
--- a/rudel-state-machine.el
+++ b/rudel-state-machine.el
@@ -1,4 +1,4 @@
-;;; rudel-state-machine.el --- A simple state machine for Rudel
+;;; rudel-state-machine.el --- A simple state machine for Rudel -*-
lexical-binding:t -*-
;;
;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -335,13 +335,13 @@ arguments and when they switch states.")
"This method runs 'accept-hook' before ARGUMENTS are processed."
(apply #'object-run-hook-with-args this 'accept-hook arguments))
-(defmethod rudel-switch :before ((this rudel-hook-state-machine) next
+(defmethod rudel-switch :before ((this rudel-hook-state-machine) _next
&rest arguments)
"This method stores ARGUMENTS for later processing."
(oset this :last-args arguments))
(defmethod rudel-set-state :before ((this rudel-hook-state-machine) next
- &rest arguments)
+ &rest _arguments)
"This method runs 'switch-hook' when switching states."
(with-slots (last-args) this
(apply #'object-run-hook-with-args
diff --git a/rudel-telepathy.el b/rudel-telepathy.el
index ea22d14..72e1e31 100644
--- a/rudel-telepathy.el
+++ b/rudel-telepathy.el
@@ -1,6 +1,6 @@
-;;; rudel-telepathy.el --- A telepathy backend for Rudel
+;;; rudel-telepathy.el --- A telepathy backend for Rudel -*-
lexical-binding:t -*-
;;
-;; Copyright (C) 2008, 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, telepathy, backend
@@ -58,7 +58,7 @@
((capabilities :initform '()))
"Class rudel-telepathy-backend ")
-(defmethod initialize-instance ((this rudel-telepathy-backend) slots)
+(defmethod initialize-instance ((this rudel-telepathy-backend) _slots)
"Initialize slots of THIS according to SLOTS."
(when (next-method-p)
(call-next-method))
diff --git a/rudel-tls.el b/rudel-tls.el
index c339a00..cf1269a 100644
--- a/rudel-tls.el
+++ b/rudel-tls.el
@@ -1,4 +1,4 @@
-;;; rudel-tls.el --- Start TLS protocol.
+;;; rudel-tls.el --- Start TLS protocol. -*- lexical-binding:t -*-
;;
;; Copyright (C) 2008, 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -226,7 +226,7 @@ This only works if PROCESS has been created by
capability.")
(defmethod initialize-instance :after
- ((this rudel-start-tls-transport) slots)
+ ((this rudel-start-tls-transport) _slots)
"Repair filter of the process owned by THIS."
;; The superclass `rudel-socket-transport' installs its filter
;; directly onto the socket in its `initialize-instance' :after
@@ -252,7 +252,7 @@ capability.")
The transport backend is a factory for transport objects that
support STARTTLS behavior.")
-(defmethod initialize-instance ((this rudel-start-tls-backend) slots)
+(defmethod initialize-instance ((this rudel-start-tls-backend) _slots)
"Initialize slots and set version of THIS."
(when (next-method-p)
(call-next-method))
@@ -268,7 +268,7 @@ support STARTTLS behavior.")
(defvar rudel-tls-ask-connect-info-port-last nil
"Last port read by TLS backend's `rudel-ask-connect-info'.")
-(defmethod rudel-ask-connect-info ((this rudel-start-tls-backend)
+(defmethod rudel-ask-connect-info ((_this rudel-start-tls-backend)
&optional info)
"Augment INFO by read a hostname and a port number."
;; Read server host and port.
@@ -293,7 +293,7 @@ support STARTTLS behavior.")
(defmethod rudel-make-connection ((this rudel-start-tls-backend)
info info-callback
- &optional progress-callback)
+ &optional _progress-callback)
"Connect to a START-TLS server using the information in INFO.
INFO has to be a property list containing the keys :host
and :port."
diff --git a/rudel-transport.el b/rudel-transport.el
index 7025f57..fc0028d 100644
--- a/rudel-transport.el
+++ b/rudel-transport.el
@@ -1,6 +1,6 @@
-;;; rudel-transport.el --- Rudel transport interface and backend
+;;; rudel-transport.el --- Rudel transport interface and backend -*-
lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, backend, transport
diff --git a/rudel-wave.el b/rudel-wave.el
index 4cd7fe2..344c20a 100644
--- a/rudel-wave.el
+++ b/rudel-wave.el
@@ -1,6 +1,6 @@
-;;; rudel-wave.el --- A Wave backend for Rudel
+;;; rudel-wave.el --- A Wave backend for Rudel -*- lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: Rudel, Wave protocol, backend
@@ -58,7 +58,7 @@
"Main class of the Rudel Wave backend. Creates wave client
connections.")
-(defmethod initialize-instance ((this rudel-wave-backend) slots)
+(defmethod initialize-instance ((this rudel-wave-backend) _slots)
"Initialize slots of THIS with SLOTS."
(when (next-method-p)
(call-next-method))
diff --git a/rudel-xml.el b/rudel-xml.el
index c0ce737..c8da0ef 100644
--- a/rudel-xml.el
+++ b/rudel-xml.el
@@ -1,4 +1,4 @@
-;;; rudel-xml.el --- XML processing functions used by Rudel
+;;; rudel-xml.el --- XML processing functions used by Rudel -*-
lexical-binding:t -*-
;;
;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -132,7 +132,7 @@ ATTRS is structured as follows:
ATTRS ::= (BINDING*)
BINDING ::= VAR | (VAR ATTR) | (VAR ATTR TYPE)
VAR is a symbol. ATTR is a symbol whose symbol-name is used as
-tag name. TYPE can be 'number."
+tag name. TYPE can be `number'."
(declare (indent 2)
(debug (listp form &rest form)))
(let* ((node-var (make-symbol "node-var"))
diff --git a/rudel-xmpp-debug.el b/rudel-xmpp-debug.el
index e2798b7..615bf29 100644
--- a/rudel-xmpp-debug.el
+++ b/rudel-xmpp-debug.el
@@ -1,4 +1,4 @@
-;;; rudel-xmpp-debug.el --- Debugging functions for the Rudel XMPP backend
+;;; rudel-xmpp-debug.el --- Debugging functions for the Rudel XMPP backend
-*- lexical-binding:t -*-
;;
;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
diff --git a/rudel-xmpp-state.el b/rudel-xmpp-state.el
index 68f761a..8eeeec7 100644
--- a/rudel-xmpp-state.el
+++ b/rudel-xmpp-state.el
@@ -1,4 +1,4 @@
-;;; rudel-xmpp-state.el --- Base class for states used in XMPP connections
+;;; rudel-xmpp-state.el --- Base class for states used in XMPP connections
-*- lexical-binding:t -*-
;;
;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -61,19 +61,19 @@
machine of which uses the state object."))
"Base class for XMPP state classes.")
-(defmethod rudel-enter ((this rudel-xmpp-state) &rest args)
+(defmethod rudel-enter ((_this rudel-xmpp-state) &rest _args)
"Default behavior is to stay in the newly entered state."
nil)
-(defmethod rudel-leave ((this rudel-xmpp-state))
+(defmethod rudel-leave ((_this rudel-xmpp-state))
"Default behavior is to do nothing when leaving a state.")
;; TODO choose one
-(defmethod rudel-accept ((this rudel-xmpp-state) xml)
+(defmethod rudel-accept ((_this rudel-xmpp-state) _xml)
"Default behavior is to accept XML without taking action."
nil)
-(defmethod rudel-accept ((this rudel-xmpp-state) xml)
+(defmethod rudel-accept ((_this rudel-xmpp-state) xml)
""
(let ((name (xml-node-name xml)))
(pcase name
diff --git a/rudel-xmpp-tls.el b/rudel-xmpp-tls.el
index 7fd0c8d..8717a5e 100644
--- a/rudel-xmpp-tls.el
+++ b/rudel-xmpp-tls.el
@@ -1,6 +1,6 @@
-;;; rudel-xmpp-tls.el --- TLS support for XMPP connections
+;;; rudel-xmpp-tls.el --- TLS support for XMPP connections -*-
lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, xmpp, tls, encryption
@@ -46,7 +46,7 @@
()
"State used to enable TLS encryption for a connection.")
-(defmethod rudel-enter ((this rudel-xmpp-state-tls-start))
+(defmethod rudel-enter ((_this rudel-xmpp-state-tls-start))
"Enable TLS encryption for the connection associated with THIS."
(require 'rudel-tls)
;; something like this: (rudel-tls-start-tls transport)
@@ -60,6 +60,8 @@
'((start-tls . rudel-xmpp-state-tls-start))
"")
+(defvar rudel-xmpp-states)
+
(dolist (state rudel-xmpp-tls-states)
(add-to-list 'rudel-xmpp-states state))
diff --git a/rudel-xmpp-tunnel.el b/rudel-xmpp-tunnel.el
index 5e12e86..bfad4f4 100644
--- a/rudel-xmpp-tunnel.el
+++ b/rudel-xmpp-tunnel.el
@@ -1,6 +1,6 @@
-;;; rudel-xmpp-tunnel.el --- XMPP tunnel transport backend for Rudel
+;;; rudel-xmpp-tunnel.el --- XMPP tunnel transport backend for Rudel -*-
lexical-binding:t -*-
;;
-;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
;; Author: Jan Moringen <address@hidden>
;; Keywords: rudel, xmpp, tunnel, transport, backend
diff --git a/rudel-xmpp-util.el b/rudel-xmpp-util.el
index f23703a..4bc4ced 100644
--- a/rudel-xmpp-util.el
+++ b/rudel-xmpp-util.el
@@ -1,4 +1,4 @@
-;;; rudel-xmpp-util.el --- Miscellaneous functions for the Rudel XMPP backend
+;;; rudel-xmpp-util.el --- Miscellaneous functions for the Rudel XMPP backend
-*- lexical-binding:t -*-
;;
;; Copyright (C) 2009, 2010, 2014, 2016 Free Software Foundation, Inc.
;;
diff --git a/rudel-zeroconf.el b/rudel-zeroconf.el
index 09eedf8..c7284ad 100644
--- a/rudel-zeroconf.el
+++ b/rudel-zeroconf.el
@@ -1,4 +1,4 @@
-;;; rudel-zeroconf.el --- Zeroconf support for Rudel
+;;; rudel-zeroconf.el --- Zeroconf support for Rudel -*- lexical-binding:t -*-
;;
;; Copyright (C) 2008, 2009, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -114,14 +114,14 @@ service type TYPE."
(priority :initform primary))
"")
-(defmethod initialize-instance ((this rudel-zeroconf-backend) slots)
+(defmethod initialize-instance ((this rudel-zeroconf-backend) _slots)
"Initialize slots of THIS with SLOTS."
(when (next-method-p)
(call-next-method))
(oset this :version rudel-zeroconf-version))
-(defmethod rudel-discover ((this rudel-zeroconf-backend))
+(defmethod rudel-discover ((_this rudel-zeroconf-backend))
"Return a list of session information property lists for Zeroconf-advertised
sessions."
(mapcar
#'rudel-zeroconf-service->plist
@@ -136,7 +136,7 @@ service type TYPE."
rudel-zeroconf-service-types)))))
)
-(defmethod rudel-advertise ((this rudel-session-initiation-backend) info)
+(defmethod rudel-advertise ((_this rudel-session-initiation-backend) info)
"Use Zeroconf to advertise the session described by INFO to other users."
(let ((name (plist-get info :name))
(transport-backend (plist-get info :transport-backend))
@@ -149,7 +149,7 @@ service type TYPE."
transport-backend protocol-backend name host port data)))
t)
-(defmethod rudel-withdraw ((this rudel-session-initiation-backend))
+(defmethod rudel-withdraw ((_this rudel-session-initiation-backend))
"Withdraw Zeroconf record."
(error "Not implemented, yet"))
@@ -166,7 +166,7 @@ service type TYPE."
"Check whether there are Zeroconf services for BACKEND."
(rudel-zeroconf-services service))
-(defun rudel-zeroconf-publish (transport-backend protocol-backend
+(defun rudel-zeroconf-publish (_transport-backend protocol-backend
name host port &rest data)
"Publish PROTOCOL-BACKEND over TRANSPORT-BACKEND service NAME for HOST and
PORT."
;; Try to find the service entry for the protocol backend and
@@ -187,7 +187,7 @@ service type TYPE."
data))))
)
-(defun rudel-zeroconf-withdraw (backend name)
+(defun rudel-zeroconf-withdraw (_backend _name)
"Withdraw service NAME for BACKEND."
(error "Not implemented, yet"))
diff --git a/rudel.el b/rudel.el
index 0219530..fe1a13f 100644
--- a/rudel.el
+++ b/rudel.el
@@ -1,4 +1,4 @@
-;;; rudel.el --- A collaborative editing framework for Emacs
+;;; rudel.el --- A collaborative editing framework for Emacs -*-
lexical-binding:t -*-
;;
;; Copyright (C) 2008-2010, 2014, 2016 Free Software Foundation, Inc.
;;
@@ -6,7 +6,7 @@
;; Keywords: rudel, collaboration
;; Version: 0.3
;; URL: http://rudel.sourceforge.net/
-;; Package-Requires: ((cl-lib "0.5"))
+;; Package-Requires: ((emacs "24") (cl-lib "0.5"))
;; X-RCS: $Id:$
;;
;; This file is part of Rudel.
@@ -308,6 +308,7 @@ client perspective.")
(cl-remove-if
(lambda (document)
+ ;; FIXME: Move this use of the slot to after the class that defines it.
(with-slots (subscribed) document
(memq self subscribed)))
documents))
@@ -456,7 +457,7 @@ collaborative editing session can subscribe to."
(defmethod rudel-attach-to-buffer ((this rudel-document) buffer)
"Attach THIS document to BUFFER"
- (with-slots ((doc-buffer :buffer)) this
+ (with-slots ((doc-buffer buffer)) this
;; Set buffer slot of THIS to BUFFER and associated THIS with
;; BUFFER.
(setq doc-buffer buffer)
@@ -603,7 +604,7 @@ Modification hooks are disabled during the insertion."
(defmethod rudel-local-operation ((this rudel-document) operation)
"Apply the local operation OPERATION to THIS."
(with-slots (session buffer) this
- (with-slots (connection (user :self)) session
+ (with-slots (connection (user self)) session
(dolist (operators (list
;; Update overlays
@@ -726,7 +727,7 @@ If BUFFER is nil, use the current buffer."
(defun rudel-handle-buffer-change (from to length)
"Handle buffer change at range FROM to TO with length LENGTH by relaying
them to the document object of the buffer.
-See after-change-functions for more information."
+See `after-change-functions' for more information."
(when (rudel-buffer-has-document-p)
(let ((document (rudel-buffer-document))
(text)) ; TODO with-rudel-buffer-document?
@@ -891,7 +892,7 @@ will be prompted for."
;; Reset the global session variable when the session ends.
(object-add-hook session 'end-hook
- (lambda (session)
+ (lambda (_session)
(setq rudel-current-session nil)))
;; Run the hook.
@@ -977,7 +978,7 @@ Not all backends support this operation."
(error "Backend `%s' cannot change colors"
(object-name-string backend)))
- (with-slots ((name :object-name) color) self
+ (with-slots ((name object-name) color) self
;; Ask the user for a new color.
(setq color (read-color "New Color: " t))
@@ -1022,7 +1023,7 @@ When called interactively, DOCUMENT is prompted for
interactively."
(buffer (funcall rudel-allocate-buffer-function name)))
(rudel-attach-to-buffer document buffer)
- (let ((connection (oref (oref document :session) :connection)))
+ (let ((connection (oref (oref document session) connection)))
(rudel-subscribe-to connection document))
;; Show the new buffer.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals/rudel 44d63cb: Use lexical-binding:t everywhere,
Stefan Monnier <=