Face cleanups. Remove some uses of old-style face spec and :bold/:italic.

[gnu-emacs] / lisp / erc / erc.el

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index a4040b239c1cc8534e0af6ac50a5ff719b0b827e..2f714bd6d14d36a2e4e8b81bc962779c6aa0bc57 100644 (file)
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1,6 +1,6 @@
 ;; erc.el --- An Emacs Internet Relay Chat client
 
 ;; erc.el --- An Emacs Internet Relay Chat client
 

-;; Copyright (C) 1997-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2012 Free Software Foundation, Inc.

 
 ;; Author: Alexander L. Belikoff (alexander@belikoff.net)
 ;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu),
 
 ;; Author: Alexander L. Belikoff (alexander@belikoff.net)
 ;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu),


@@ -255,7 +255,7 @@ If nil, only \"> \" will be shown."
          (repeat :inline t :tag "Others" (string :tag "IRC Message Type"))))
 
 (defcustom erc-hide-list nil
          (repeat :inline t :tag "Others" (string :tag "IRC Message Type"))))
 
 (defcustom erc-hide-list nil

-  "*List of IRC type messages to hide.
+  "List of IRC type messages to hide.

 A typical value would be '(\"JOIN\" \"PART\" \"QUIT\")."
   :group 'erc-ignore
   :type 'erc-message-type)
 A typical value would be '(\"JOIN\" \"PART\" \"QUIT\")."
   :group 'erc-ignore
   :type 'erc-message-type)


@@ -653,12 +653,12 @@ This only has any meaning if the variable `erc-command-indicator' is non-nil."
             prompt))))
 
 (defcustom erc-notice-prefix "*** "
             prompt))))
 
 (defcustom erc-notice-prefix "*** "

-  "*Prefix for all notices."
+  "Prefix for all notices."

   :group 'erc-display
   :type 'string)
 
 (defcustom erc-notice-highlight-type 'all
   :group 'erc-display
   :type 'string)
 
 (defcustom erc-notice-highlight-type 'all

-  "*Determines how to highlight notices.
+  "Determines how to highlight notices.

 See `erc-notice-prefix'.
 
 The following values are allowed:
 See `erc-notice-prefix'.
 
 The following values are allowed:


@@ -673,7 +673,7 @@ Any other value disables notice's highlighting altogether."
                 (const :tag "don't highlight notices at all" nil)))
 
 (defcustom erc-echo-notice-hook nil
                 (const :tag "don't highlight notices at all" nil)))
 
 (defcustom erc-echo-notice-hook nil

-  "*Specifies a list of functions to call to echo a private
+  "Specifies a list of functions to call to echo a private

 notice.  Each function is called with four arguments, the string
 to display, the parsed server message, the target buffer (or
 nil), and the sender.  The functions are called in order, until a
 notice.  Each function is called with four arguments, the string
 to display, the parsed server message, the target buffer (or
 nil), and the sender.  The functions are called in order, until a


@@ -704,7 +704,7 @@ See also: `erc-echo-notice-always-hook',
 
 (defcustom erc-echo-notice-always-hook
   '(erc-echo-notice-in-default-buffer)
 
 (defcustom erc-echo-notice-always-hook
   '(erc-echo-notice-in-default-buffer)

-  "*Specifies a list of functions to call to echo a private
+  "Specifies a list of functions to call to echo a private

 notice.  Each function is called with four arguments, the string
 to display, the parsed server message, the target buffer (or
 nil), and the sender.  The functions are called in order, and all
 notice.  Each function is called with four arguments, the string
 to display, the parsed server message, the target buffer (or
 nil), and the sender.  The functions are called in order, and all


@@ -736,17 +736,17 @@ See also: `erc-echo-notice-hook',
 ;; other tunable parameters
 
 (defcustom erc-whowas-on-nosuchnick nil
 ;; other tunable parameters
 
 (defcustom erc-whowas-on-nosuchnick nil

-  "*If non-nil, do a whowas on a nick if no such nick."
+  "If non-nil, do a whowas on a nick if no such nick."

   :group 'erc
   :type 'boolean)
 
 (defcustom erc-verbose-server-ping nil
   :group 'erc
   :type 'boolean)
 
 (defcustom erc-verbose-server-ping nil

-  "*If non-nil, show every time you get a PING or PONG from the server."
+  "If non-nil, show every time you get a PING or PONG from the server."

   :group 'erc-paranoia
   :type 'boolean)
 
 (defcustom erc-public-away-p nil
   :group 'erc-paranoia
   :type 'boolean)
 
 (defcustom erc-public-away-p nil

-  "*Let others know you are back when you are no longer marked away.
+  "Let others know you are back when you are no longer marked away.

 This happens in this form:
 * <nick> is back (gone for <time>)
 
 This happens in this form:
 * <nick> is back (gone for <time>)
 


@@ -755,7 +755,7 @@ Many consider it impolite to do so automatically."
   :type 'boolean)
 
 (defcustom erc-away-nickname nil
   :type 'boolean)
 
 (defcustom erc-away-nickname nil

-  "*The nickname to take when you are marked as being away."
+  "The nickname to take when you are marked as being away."

   :group 'erc
   :type '(choice (const nil)
                 string))
   :group 'erc
   :type '(choice (const nil)
                 string))


@@ -796,7 +796,7 @@ If nil, ERC will call `system-name' to get this information."
                 string))
 
 (defcustom erc-ignore-list nil
                 string))
 
 (defcustom erc-ignore-list nil

-  "*List of regexps matching user identifiers to ignore.
+  "List of regexps matching user identifiers to ignore.

 
 A user identifier has the form \"nick!login@host\".  If an
 identifier matches, the message from the person will not be
 
 A user identifier has the form \"nick!login@host\".  If an
 identifier matches, the message from the person will not be


@@ -806,7 +806,7 @@ processed."
 (make-variable-buffer-local 'erc-ignore-list)
 
 (defcustom erc-ignore-reply-list nil
 (make-variable-buffer-local 'erc-ignore-list)
 
 (defcustom erc-ignore-reply-list nil

-  "*List of regexps matching user identifiers to ignore completely.
+  "List of regexps matching user identifiers to ignore completely.

 
 This differs from `erc-ignore-list' in that it also ignores any
 messages directed at the user.
 
 This differs from `erc-ignore-list' in that it also ignores any
 messages directed at the user.


@@ -824,7 +824,7 @@ people.  You can update the ERC internal info using /WHO *."
   :type '(repeat regexp))
 
 (defvar erc-flood-protect t
   :type '(repeat regexp))
 
 (defvar erc-flood-protect t

-  "*If non-nil, flood protection is enabled.
+  "If non-nil, flood protection is enabled.

 Flooding is sending too much information to the server in too
 short of an interval, which may cause the server to terminate the
 connection.
 Flooding is sending too much information to the server in too
 short of an interval, which may cause the server to terminate the
 connection.


@@ -854,7 +854,7 @@ directory in the list."
   :type '(repeat directory))
 
 (defcustom erc-script-echo t
   :type '(repeat directory))
 
 (defcustom erc-script-echo t

-  "*If non-nil, echo the IRC script commands locally."
+  "If non-nil, echo the IRC script commands locally."

   :group 'erc-scripts
   :type 'boolean)
 
   :group 'erc-scripts
   :type 'boolean)
 


@@ -929,7 +929,7 @@ will be used as the part message."
   :type '(repeat (list regexp (choice (string) (function)))))
 
 (defcustom erc-quit-reason 'erc-quit-reason-normal
   :type '(repeat (list regexp (choice (string) (function)))))
 
 (defcustom erc-quit-reason 'erc-quit-reason-normal

-  "*A function which returns the reason for quitting.
+  "A function which returns the reason for quitting.

 
 The function is passed a single argument, the string typed by the
 user after \"/quit\"."
 
 The function is passed a single argument, the string typed by the
 user after \"/quit\"."


@@ -1140,61 +1140,58 @@ which the local user typed."
   "ERC default face."
   :group 'erc-faces)
 
   "ERC default face."
   :group 'erc-faces)
 

-(defface erc-direct-msg-face '((t (:foreground "IndianRed")))
+(defface erc-direct-msg-face '((t :foreground "IndianRed"))

   "ERC face used for messages you receive in the main erc buffer."
   :group 'erc-faces)
 
 (defface erc-header-line
   "ERC face used for messages you receive in the main erc buffer."
   :group 'erc-faces)
 
 (defface erc-header-line

-  '((t (:foreground "grey20" :background "grey90")))
+  '((t :foreground "grey20" :background "grey90"))

   "ERC face used for the header line.
 
 This will only be used if `erc-header-line-face-method' is non-nil."
   :group 'erc-faces)
 
   "ERC face used for the header line.
 
 This will only be used if `erc-header-line-face-method' is non-nil."
   :group 'erc-faces)
 

-(defface erc-input-face '((t (:foreground "brown")))
+(defface erc-input-face '((t :foreground "brown"))

   "ERC face used for your input."
   :group 'erc-faces)
 
 (defface erc-prompt-face
   "ERC face used for your input."
   :group 'erc-faces)
 
 (defface erc-prompt-face

-  '((t (:bold t :foreground "Black" :background "lightBlue2")))
+  '((t :weight bold :foreground "Black" :background "lightBlue2"))

   "ERC face for the prompt."
   :group 'erc-faces)
 
 (defface erc-command-indicator-face
   "ERC face for the prompt."
   :group 'erc-faces)
 
 (defface erc-command-indicator-face

-    '((t (:bold t)))
+  '((t :weight bold))

   "ERC face for the command indicator.
 See the variable `erc-command-indicator'."
   :group 'erc-faces)
 
 (defface erc-notice-face
   "ERC face for the command indicator.
 See the variable `erc-command-indicator'."
   :group 'erc-faces)
 
 (defface erc-notice-face

-  (if (or (featurep 'xemacs)
-         (< emacs-major-version 22))
-      '((t (:bold t :foreground "blue")))
-    '((((class color) (min-colors 88))
-       (:bold t :foreground "SlateBlue"))
-      (t (:bold t :foreground "blue"))))
+  '((default :weight bold)
+    (((class color) (min-colors 88)) :foreground "SlateBlue")
+    (t :foreground "blue"))

   "ERC face for notices."
   :group 'erc-faces)
 
   "ERC face for notices."
   :group 'erc-faces)
 

-(defface erc-action-face '((t (:bold t)))
+(defface erc-action-face '((t :weight bold))

   "ERC face for actions generated by /ME."
   :group 'erc-faces)
 
   "ERC face for actions generated by /ME."
   :group 'erc-faces)
 

-(defface erc-error-face '((t (:foreground "red")))
+(defface erc-error-face '((t :foreground "red"))

   "ERC face for errors."
   :group 'erc-faces)
 
 ;; same default color as `erc-input-face'
   "ERC face for errors."
   :group 'erc-faces)
 
 ;; same default color as `erc-input-face'

-(defface erc-my-nick-face '((t (:bold t :foreground "brown")))
+(defface erc-my-nick-face '((t :weight bold :foreground "brown"))

   "ERC face for your current nickname in messages sent by you.
 See also `erc-show-my-nick'."
   :group 'erc-faces)
 
   "ERC face for your current nickname in messages sent by you.
 See also `erc-show-my-nick'."
   :group 'erc-faces)
 

-(defface erc-nick-default-face '((t (:bold t)))
+(defface erc-nick-default-face '((t :weight bold))

   "ERC nickname default face."
   :group 'erc-faces)
 
   "ERC nickname default face."
   :group 'erc-faces)
 

-(defface erc-nick-msg-face '((t (:bold t :foreground "IndianRed")))
+(defface erc-nick-msg-face '((t :weight bold :foreground "IndianRed"))

   "ERC nickname face for private messages."
   :group 'erc-faces)
 
   "ERC nickname face for private messages."
   :group 'erc-faces)
 


@@ -1242,7 +1239,9 @@ Example:
        (erc-define-minor-mode
        ,mode
        ,(format "Toggle ERC %S mode.
        (erc-define-minor-mode
        ,mode
        ,(format "Toggle ERC %S mode.

-With arg, turn ERC %S mode on if and only if arg is positive.
+With a prefix argument ARG, enable %s if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil.

 %s" name name doc)
        nil nil nil
        :global ,(not local-p) :group (quote ,group)
 %s" name name doc)
        nil nil nil
        :global ,(not local-p) :group (quote ,group)


@@ -1478,7 +1477,7 @@ The available choices are:
                 (const :tag "Use current buffer" t)))
 
 (defcustom erc-frame-alist nil
                 (const :tag "Use current buffer" t)))
 
 (defcustom erc-frame-alist nil

-  "*Alist of frame parameters for creating erc frames.
+  "Alist of frame parameters for creating erc frames.

 A value of nil means to use `default-frame-alist'."
   :group 'erc-buffers
   :type '(repeat (cons :format "%v"
 A value of nil means to use `default-frame-alist'."
   :group 'erc-buffers
   :type '(repeat (cons :format "%v"


@@ -1486,13 +1485,13 @@ A value of nil means to use `default-frame-alist'."
                       (sexp :tag "Value"))))
 
 (defcustom erc-frame-dedicated-flag nil
                       (sexp :tag "Value"))))
 
 (defcustom erc-frame-dedicated-flag nil

-  "*Non-nil means the erc frames are dedicated to that buffer.
+  "Non-nil means the erc frames are dedicated to that buffer.

 This only has effect when `erc-join-buffer' is set to `frame'."
   :group 'erc-buffers
   :type 'boolean)
 
 (defcustom erc-reuse-frames t
 This only has effect when `erc-join-buffer' is set to `frame'."
   :group 'erc-buffers
   :type 'boolean)
 
 (defcustom erc-reuse-frames t

-  "*Determines whether new frames are always created.
+  "Determines whether new frames are always created.

 Non-nil means that a new frame is not created to display an ERC
 buffer if there is already a window displaying it.  This only has
 effect when `erc-join-buffer' is set to `frame'."
 Non-nil means that a new frame is not created to display an ERC
 buffer if there is already a window displaying it.  This only has
 effect when `erc-join-buffer' is set to `frame'."


@@ -1509,7 +1508,7 @@ effect when `erc-join-buffer' is set to `frame'."
        (t nil)))
 
 (defcustom erc-reuse-buffers t
        (t nil)))
 
 (defcustom erc-reuse-buffers t

-  "*If nil, create new buffers on joining a channel/query.
+  "If nil, create new buffers on joining a channel/query.

 If non-nil, a new buffer will only be created when you join
 channels with same names on different servers, or have query buffers
 open with nicks of the same name on different servers.  Otherwise,
 If non-nil, a new buffer will only be created when you join
 channels with same names on different servers, or have query buffers
 open with nicks of the same name on different servers.  Otherwise,


@@ -1567,7 +1566,7 @@ symbol, it may have these values:
     ;; current ERC buffer.
     ;; if buf-name is taken by a different connection (or by something !erc)
     ;; then see if "buf-name/server" meets the same criteria
     ;; current ERC buffer.
     ;; if buf-name is taken by a different connection (or by something !erc)
     ;; then see if "buf-name/server" meets the same criteria

-    (dolist (candidate (list buf-name (concat buf-name "/" server))) 
+    (dolist (candidate (list buf-name (concat buf-name "/" server)))

       (if (and (not buffer-name)
                erc-reuse-buffers
                (get-buffer candidate)
       (if (and (not buffer-name)
                erc-reuse-buffers
                (get-buffer candidate)


@@ -2173,6 +2172,7 @@ be invoked for the values of the other parameters."
 (defalias 'erc-select 'erc)
 (defalias 'erc-ssl 'erc-tls)
 
 (defalias 'erc-select 'erc)
 (defalias 'erc-ssl 'erc-tls)
 

+;;;###autoload

 (defun erc-tls (&rest r)
   "Interactively select TLS connection parameters and run ERC.
 Arguments are the same as for `erc'."
 (defun erc-tls (&rest r)
   "Interactively select TLS connection parameters and run ERC.
 Arguments are the same as for `erc'."


@@ -2613,7 +2613,7 @@ VALUE is computed by evaluating the rest of LINE in Lisp."
                           (if (consp val)
                               (concat "\n" (pp-to-string val))
                             (format " %S\n" val)))))
                           (if (consp val)
                               (concat "\n" (pp-to-string val))
                             (format " %S\n" val)))))

-              (apropos-internal "^erc-" 'user-variable-p))))
+              (apropos-internal "^erc-" 'custom-variable-p))))

      (current-buffer)) t)
    (t nil)))
 (defalias 'erc-cmd-VAR 'erc-cmd-SET)
      (current-buffer)) t)
    (t nil)))
 (defalias 'erc-cmd-VAR 'erc-cmd-SET)


@@ -2624,7 +2624,7 @@ VALUE is computed by evaluating the rest of LINE in Lisp."
 (defun erc-cmd-default (line)
   "Fallback command.
 
 (defun erc-cmd-default (line)
   "Fallback command.
 

-Commands for which no erc-cmd-xxx exists, are tunnelled through
+Commands for which no erc-cmd-xxx exists, are tunneled through

 this function.  LINE is sent to the server verbatim, and
 therefore has to contain the command itself as well."
   (erc-log (format "cmd: DEFAULT: %s" line))
 this function.  LINE is sent to the server verbatim, and
 therefore has to contain the command itself as well."
   (erc-log (format "cmd: DEFAULT: %s" line))


@@ -3643,6 +3643,7 @@ If FACE is non-nil, it will be used to propertize the prompt.  If it is nil,
                                     'start-open t ; XEmacs
                                     'rear-nonsticky t ; Emacs
                                     'erc-prompt t
                                     'start-open t ; XEmacs
                                     'rear-nonsticky t ; Emacs
                                     'erc-prompt t

+                                    'field t

                                     'front-sticky t
                                     'read-only t))
        (erc-put-text-property 0 (1- (length prompt))
                                     'front-sticky t
                                     'read-only t))
        (erc-put-text-property 0 (1- (length prompt))


@@ -3796,7 +3797,7 @@ This places `point' just after the prompt, or at the beginning of the line."
 
 (defcustom erc-default-server-hook '(erc-debug-missing-hooks
                                     erc-default-server-handler)
 
 (defcustom erc-default-server-hook '(erc-debug-missing-hooks
                                     erc-default-server-handler)

-  "*Default for server messages which aren't covered by `erc-server-hooks'."
+  "Default for server messages which aren't covered by `erc-server-hooks'."

   :group 'erc-server-hooks
   :type 'hook)
 
   :group 'erc-server-hooks
   :type 'hook)
 


@@ -3999,7 +4000,7 @@ and as second argument the event parsed as a vector."
        (not (string-match "^\C-a\\ACTION.*\C-a$" message))))
 
 (defun erc-format-privmessage (nick msg privp msgp)
        (not (string-match "^\C-a\\ACTION.*\C-a$" message))))
 
 (defun erc-format-privmessage (nick msg privp msgp)

-  "Format a PRIVMSG in an insertible fashion."
+  "Format a PRIVMSG in an insertable fashion."

   (let* ((mark-s (if msgp (if privp "*" "<") "-"))
         (mark-e (if msgp (if privp "*" ">") "-"))
         (str    (format "%s%s%s %s" mark-s nick mark-e msg))
   (let* ((mark-s (if msgp (if privp "*" "<") "-"))
         (mark-e (if msgp (if privp "*" ">") "-"))
         (str    (format "%s%s%s %s" mark-s nick mark-e msg))


@@ -4014,7 +4015,7 @@ and as second argument the event parsed as a vector."
     str))
 
 (defcustom erc-format-nick-function 'erc-format-nick
     str))
 
 (defcustom erc-format-nick-function 'erc-format-nick

-  "*Function to format a nickname for message display."
+  "Function to format a nickname for message display."

   :group 'erc-display
   :type 'function)
 
   :group 'erc-display
   :type 'function)
 


@@ -4572,7 +4573,7 @@ channel."
     (run-hooks 'erc-channel-members-changed-hook)))
 
 (defcustom erc-channel-members-changed-hook nil
     (run-hooks 'erc-channel-members-changed-hook)))
 
 (defcustom erc-channel-members-changed-hook nil

-  "*This hook is called every time the variable `channel-members' changes.
+  "This hook is called every time the variable `channel-members' changes.

 The buffer where the change happened is current while this hook is called."
   :group 'erc-hooks
   :type 'hook)
 The buffer where the change happened is current while this hook is called."
   :group 'erc-hooks
   :type 'hook)


@@ -5795,7 +5796,7 @@ If it doesn't exist, create it."
   "Give information about the nickname at `point'.
 
 If called interactively, give a human readable message in the
   "Give information about the nickname at `point'.
 
 If called interactively, give a human readable message in the

-minibuffer.  If called programatically, return the corresponding
+minibuffer.  If called programmatically, return the corresponding

 entry of `channel-members'."
   (interactive)
   (require 'thingatpt)
 entry of `channel-members'."
   (interactive)
   (require 'thingatpt)


@@ -6383,17 +6384,17 @@ See also `format-spec'."
 (add-hook 'kill-buffer-hook 'erc-kill-buffer-function)
 
 (defcustom erc-kill-server-hook '(erc-kill-server)
 (add-hook 'kill-buffer-hook 'erc-kill-buffer-function)
 
 (defcustom erc-kill-server-hook '(erc-kill-server)

-  "*Invoked whenever a server-buffer is killed via `kill-buffer'."
+  "Invoked whenever a server-buffer is killed via `kill-buffer'."

   :group 'erc-hooks
   :type 'hook)
 
 (defcustom erc-kill-channel-hook '(erc-kill-channel)
   :group 'erc-hooks
   :type 'hook)
 
 (defcustom erc-kill-channel-hook '(erc-kill-channel)

-  "*Invoked whenever a channel-buffer is killed via `kill-buffer'."
+  "Invoked whenever a channel-buffer is killed via `kill-buffer'."

   :group 'erc-hooks
   :type 'hook)
 
 (defcustom erc-kill-buffer-hook nil
   :group 'erc-hooks
   :type 'hook)
 
 (defcustom erc-kill-buffer-hook nil

-  "*Hook run whenever a non-server or channel buffer is killed.
+  "Hook run whenever a non-server or channel buffer is killed.

 
 See also `kill-buffer'."
   :group 'erc-hooks
 
 See also `kill-buffer'."
   :group 'erc-hooks