diff options
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/erc-button.el | 3 | ||||
| -rw-r--r-- | lisp/erc/erc-dcc.el | 16 | ||||
| -rw-r--r-- | lisp/erc/erc-match.el | 34 | ||||
| -rw-r--r-- | lisp/erc/erc-services.el | 11 | ||||
| -rw-r--r-- | lisp/erc/erc-speedbar.el | 7 | ||||
| -rw-r--r-- | lisp/erc/erc-track.el | 8 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 38 |
7 files changed, 58 insertions, 59 deletions
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index 3530a31ea0..6139e93992 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el @@ -511,7 +511,8 @@ Examples: (defun erc-nick-popup (nick) (let* ((completion-ignore-case t) - (action (completing-read (concat "What action to take on '" nick "'? ") + (action (completing-read (format-message + "What action to take on ‘%s’? " nick) erc-nick-popup-alist)) (code (cdr (assoc action erc-nick-popup-alist)))) (when code diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el index d4d005d834..bb6e3115b4 100644 --- a/lisp/erc/erc-dcc.el +++ b/lisp/erc/erc-dcc.el @@ -166,7 +166,7 @@ All values of the list must be uppercase strings.") "Return the first matching entry in `erc-dcc-list' which satisfies the constraints given as a plist in ARGS. Returns nil on no match. -The property :nick is treated specially, if it contains a '!' character, +The property :nick is treated specially, if it contains a ‘!’ character, it is treated as a nick!user@host string, and compared with the :nick property value of the individual elements using string-equal. Otherwise it is compared with `erc-nick-equal-p' which is IRC case-insensitive." @@ -315,10 +315,10 @@ Should be set to a string or nil. If nil, use the value of (defcustom erc-dcc-send-request 'ask "How to treat incoming DCC Send requests. -'ask - Report the Send request, and wait for the user to manually accept it - You might want to set `erc-dcc-auto-masks' for this. -'auto - Automatically accept the request and begin downloading the file -'ignore - Ignore incoming DCC Send requests completely." +`ask' - Report the Send request, and wait for the user to manually accept it + You might want to set `erc-dcc-auto-masks' for this. +`auto' - Automatically accept the request and begin downloading the file +`ignore' - Ignore incoming DCC Send requests completely." :group 'erc-dcc :type '(choice (const ask) (const auto) (const ignore))) @@ -713,9 +713,9 @@ match, returns that regexp and nil otherwise." (defcustom erc-dcc-chat-request 'ask "How to treat incoming DCC Chat requests. -'ask - Report the Chat request, and wait for the user to manually accept it -'auto - Automatically accept the request and open a new chat window -'ignore - Ignore incoming DCC chat requests completely." +`ask' - Report the Chat request, and wait for the user to manually accept it +`auto' - Automatically accept the request and open a new chat window +`ignore' - Ignore incoming DCC chat requests completely." :group 'erc-dcc :type '(choice (const ask) (const auto) (const ignore))) diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el index 776231f80a..55f298bbf6 100644 --- a/lisp/erc/erc-match.el +++ b/lisp/erc/erc-match.el @@ -88,13 +88,13 @@ Useful to mark nicks from dangerous hosts." The following values are allowed: - nil - do not highlight the message at all - 'keyword - highlight all instances of current nickname in message - 'nick - highlight the nick of the user who typed your nickname - 'nick-or-keyword - highlight the nick of the user who typed your nickname, - or all instances of the current nickname if there was - no sending user - 'all - highlight the entire message where current nickname occurs + nil - do not highlight the message at all + `keyword' - highlight all instances of current nickname in message + `nick' - highlight the nick of the user who typed your nickname + `nick-or-keyword' - highlight the nick of the user who typed your nickname, + or all instances of the current nickname if there was + no sending user + `all' - highlight the entire message where current nickname occurs Any other value disables highlighting of current nickname altogether." :group 'erc-match @@ -110,9 +110,9 @@ See `erc-pals'. The following values are allowed: - nil - do not highlight the message at all - 'nick - highlight pal's nickname only - 'all - highlight the entire message from pal + nil - do not highlight the message at all + `nick' - highlight pal's nickname only + `all' - highlight the entire message from pal Any other value disables pal highlighting altogether." :group 'erc-match @@ -126,9 +126,9 @@ See `erc-fools'. The following values are allowed: - nil - do not highlight the message at all - 'nick - highlight fool's nickname only - 'all - highlight the entire message from fool + nil - do not highlight the message at all + `nick' - highlight fool's nickname only + `all' - highlight the entire message from fool Any other value disables fool highlighting altogether." :group 'erc-match @@ -142,8 +142,8 @@ See variable `erc-keywords'. The following values are allowed: - 'keyword - highlight keyword only - 'all - highlight the entire message containing keyword + `keyword' - highlight keyword only + `all' - highlight the entire message containing keyword Any other value disables keyword highlighting altogether." :group 'erc-match @@ -157,8 +157,8 @@ See `erc-dangerous-hosts'. The following values are allowed: - 'nick - highlight nick from dangerous-host only - 'all - highlight the entire message from dangerous-host + `nick' - highlight nick from dangerous-host only + `all' - highlight the entire message from dangerous-host Any other value disables dangerous-host highlighting altogether." :group 'erc-match diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el index b37427f839..07a4274dcb 100644 --- a/lisp/erc/erc-services.el +++ b/lisp/erc/erc-services.el @@ -83,11 +83,11 @@ communication with those Services." Possible settings are:. -'autodetect - Identify when the real Nickserv sends an identify request. -'nick-change - Identify when you log in or change your nickname. -'both - Do the former if the network supports it, otherwise do the - latter. -nil - Disables automatic Nickserv identification. +`autodetect' - Identify when the real Nickserv sends an identify request. +`nick-change' - Identify when you log in or change your nickname. +`both' - Do the former if the network supports it, otherwise do the + latter. +nil - Disables automatic Nickserv identification. You can also use M-x erc-nickserv-identify-mode to change modes." :group 'erc-services @@ -447,4 +447,3 @@ When called interactively, read the password using `read-passwd'." ;; indent-tabs-mode: t ;; tab-width: 8 ;; End: - diff --git a/lisp/erc/erc-speedbar.el b/lisp/erc/erc-speedbar.el index a1bf32baa4..6015a6ac9f 100644 --- a/lisp/erc/erc-speedbar.el +++ b/lisp/erc/erc-speedbar.el @@ -48,9 +48,9 @@ (defcustom erc-speedbar-sort-users-type 'activity "How channel nicknames are sorted. -'activity - Sort users by channel activity -'alphabetical - Sort users alphabetically -nil - Do not sort users" +`activity' - Sort users by channel activity +`alphabetical' - Sort users alphabetically +nil - Do not sort users" :group 'erc-speedbar :type '(choice (const :tag "Sort users by channel activity" activity) (const :tag "Sort users alphabetically" alphabetical) @@ -364,4 +364,3 @@ The INDENT level is ignored." ;; indent-tabs-mode: t ;; tab-width: 8 ;; End: - diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el index 1a9aee199a..2ebc1f22c0 100644 --- a/lisp/erc/erc-track.el +++ b/lisp/erc/erc-track.el @@ -248,10 +248,10 @@ The effect may be disabled by setting this variable to nil." Setting this variable only has effects in GNU Emacs versions above 21.3. Choices are: -'before-modes - add to the beginning of `mode-line-modes', -'after-modes - add to the end of `mode-line-modes', -t - add to the end of `global-mode-string', -nil - don't add to mode line." +`before-modes' - add to the beginning of `mode-line-modes', +`after-modes' - add to the end of `mode-line-modes', +t - add to the end of `global-mode-string', +nil - don't add to mode line." :group 'erc-track :type '(choice (const :tag "Just before mode information" before-modes) (const :tag "Just after mode information" after-modes) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 460accd3be..f282179810 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -230,7 +230,7 @@ prompt you for it.") (defcustom erc-hide-prompt nil "If non-nil, do not display the prompt for commands. -\(A command is any input starting with a '/'). +\(A command is any input starting with a ‘/’). See also the variables `erc-prompt' and `erc-command-indicator'." :group 'erc-display @@ -667,7 +667,7 @@ See also the variable `erc-prompt'." "Indicator used by ERC for showing commands. If non-nil, this will be used in the ERC buffer to indicate -commands (i.e., input starting with a '/'). +commands (i.e., input starting with a ‘/’). If nil, the prompt will be constructed from the variable `erc-prompt'." :group 'erc-display @@ -696,8 +696,8 @@ See `erc-notice-prefix'. The following values are allowed: - 'prefix - highlight notice prefix only - 'all - highlight the entire notice + `prefix' - highlight notice prefix only + `all' - highlight the entire notice Any other value disables notice's highlighting altogether." :group 'erc-display @@ -1258,13 +1258,13 @@ erc-NAME-enable, and erc-NAME-disable. Example: - ;;;###autoload (autoload 'erc-replace-mode \"erc-replace\") + ;;;###autoload (autoload \\='erc-replace-mode \"erc-replace\") (define-erc-module replace nil \"This mode replaces incoming text according to `erc-replace-alist'.\" - ((add-hook 'erc-insert-modify-hook - 'erc-replace-insert)) - ((remove-hook 'erc-insert-modify-hook - 'erc-replace-insert)))" + ((add-hook \\='erc-insert-modify-hook + \\='erc-replace-insert)) + ((remove-hook \\='erc-insert-modify-hook + \\='erc-replace-insert)))" (declare (doc-string 3)) (let* ((sn (symbol-name name)) (mode (intern (format "erc-%s-mode" (downcase sn)))) @@ -1476,11 +1476,11 @@ Defaults to the server buffer." The available choices are: - 'window - in another window, - 'window-noselect - in another window, but don't select that one, - 'frame - in another frame, - 'bury - bury it in a new buffer, - 'buffer - in place of the current buffer, + `window' - in another window, + `window-noselect' - in another window, but don't select that one, + `frame' - in another frame, + `bury' - bury it in a new buffer, + `buffer' - in place of the current buffer, any other value - in place of the current buffer." :group 'erc-buffers :type '(choice (const :tag "Split window and select" window) @@ -2789,7 +2789,7 @@ this function from interpreting the line as a command." (defun erc-cmd-SAY (line) "Send LINE to the current query or channel as a message, not a command. -Use this when you want to send a message with a leading '/'. Note +Use this when you want to send a message with a leading ‘/’. Note that since multi-line messages are never a command, you don't need this when pasting multiple lines of text." (if (string-match "^\\s-*$" line) @@ -3119,9 +3119,9 @@ a script after exceeding the flood threshold." (erc-display-message nil 'error (current-buffer) 'cannot-read-file ?f file)) (t - (message "Loading \'%s\'..." file) + (message "Loading ‘%s’..." file) (erc-load-script file) - (message "Loading \'%s\'...done" file)))) + (message "Loading ‘%s’...done" file)))) t) (t nil))) @@ -4466,7 +4466,7 @@ See also: `erc-echo-notice-in-user-buffers', "Handle the logging in process of connection." (unless erc-logged-in (setq erc-logged-in t) - (message "Logging in as \'%s\'... done" (erc-current-nick)) + (message "Logging in as ‘%s’... done" (erc-current-nick)) ;; execute a startup script (let ((f (erc-select-startup-file))) (when f @@ -6512,7 +6512,7 @@ All windows are opened in the current frame." . "\n\nConnection failed! Not re-establishing connection.\n") (finished . "\n\n*** ERC finished ***\n") (terminated . "\n\n*** ERC terminated: %e\n") - (login . "Logging in as \'%n\'...") + (login . "Logging in as ‘%n’...") (nick-in-use . "%n is in use. Choose new nickname: ") (nick-too-long . "WARNING: Nick length (%i) exceeds max NICKLEN(%l) defined by server") |