projects
/
elisp
/
riece.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use modern AC_INIT.
[elisp/riece.git]
/
lisp
/
riece-button.el
diff --git
a/lisp/riece-button.el
b/lisp/riece-button.el
index
ba15859
..
27e4a73
100644
(file)
--- a/
lisp/riece-button.el
+++ b/
lisp/riece-button.el
@@
-19,8
+19,8
@@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;; Commentary:
@@
-48,8
+48,6
@@
["Set +v" riece-user-button-set-speakers])
"Menu for user buttons.")
["Set +v" riece-user-button-set-speakers])
"Menu for user buttons.")
-(defvar riece-button-enabled nil)
-
(defconst riece-button-description
"Display useful buttons in IRC buffers.")
(defconst riece-button-description
"Display useful buttons in IRC buffers.")
@@
-63,7
+61,7
@@
;; wid-edit (XEmacs only).
(if (boundp 'help-echo-owns-message)
(setq help-echo-owns-message t))
;; wid-edit (XEmacs only).
(if (boundp 'help-echo-owns-message)
(setq help-echo-owns-message t))
- (format "%S: switch to %s; down-mouse-3: more options"
+ (format (riece-mcat "%S: switch to %s; down-mouse-3: more options")
(aref riece-mouse-2 0)
;; XEmacs will get a single widget arg; Emacs 21 will get
;; window, overlay, position.
(aref riece-mouse-2 0)
;; XEmacs will get a single widget arg; Emacs 21 will get
;; window, overlay, position.
@@
-80,7
+78,8
@@
This function is used as a callback for a channel button."
(if (riece-identity-member channel riece-current-channels)
(riece-command-switch-to-channel channel)
(message "%s" (substitute-command-keys
(if (riece-identity-member channel riece-current-channels)
(riece-command-switch-to-channel channel)
(message "%s" (substitute-command-keys
- "Type \\[riece-command-join] to join the channel")))))
+ (riece-mcat
+ "Type \\[riece-command-join] to join the channel"))))))
(defun riece-identity-button-click (event)
"Call widget-button-click and select the last selected window."
(defun riece-identity-button-click (event)
"Call widget-button-click and select the last selected window."
@@
-206,7
+205,7
@@
This function is used as a callback for a channel button."
(defvar riece-identity-button-map)
(defun riece-button-add-identity-button (start end)
(defvar riece-identity-button-map)
(defun riece-button-add-identity-button (start end)
- (if riece-button-enabled
+ (if (get 'riece-button 'riece-addon-enabled)
(riece-scan-property-region
'riece-identity
start end
(riece-scan-property-region
'riece-identity
start end
@@
-250,16
+249,16
@@
This function is used as a callback for a channel button."
(save-excursion
(when riece-channel-list-buffer
(set-buffer riece-channel-list-buffer)
(save-excursion
(when riece-channel-list-buffer
(set-buffer riece-channel-list-buffer)
- (riece-channel-list-mode-hook))
+ (riece-button-channel-list-mode-hook))
(when riece-user-list-buffer
(set-buffer riece-user-list-buffer)
(when riece-user-list-buffer
(set-buffer riece-user-list-buffer)
- (riece-user-list-mode-hook))
+ (riece-button-user-list-mode-hook))
(let ((buffers riece-buffer-list))
(while buffers
(set-buffer (car buffers))
(if (eq (derived-mode-class major-mode)
'riece-dialogue-mode)
(let ((buffers riece-buffer-list))
(while buffers
(set-buffer (car buffers))
(if (eq (derived-mode-class major-mode)
'riece-dialogue-mode)
- (riece-dialogue-mode-hook))
+ (riece-button-dialogue-mode-hook))
(setq buffers (cdr buffers)))))
(add-hook 'riece-channel-list-mode-hook
'riece-button-channel-list-mode-hook)
(setq buffers (cdr buffers)))))
(add-hook 'riece-channel-list-mode-hook
'riece-button-channel-list-mode-hook)
@@
-290,7
+289,6
@@
This function is used as a callback for a channel button."
'riece-button-add-identity-button))
(defun riece-button-enable ()
'riece-button-add-identity-button))
(defun riece-button-enable ()
- (setq riece-button-enabled t)
(let ((pointer riece-buffer-list))
(while pointer
(with-current-buffer (car pointer)
(let ((pointer riece-buffer-list))
(while pointer
(with-current-buffer (car pointer)
@@
-303,7
+301,6
@@
This function is used as a callback for a channel button."
(riece-emit-signal 'channel-list-changed)))
(defun riece-button-disable ()
(riece-emit-signal 'channel-list-changed)))
(defun riece-button-disable ()
- (setq riece-button-enabled nil)
(save-excursion
(let ((pointer riece-buffer-list))
(while pointer
(save-excursion
(let ((pointer riece-buffer-list))
(while pointer