diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-04 15:02:03 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-04 15:02:03 -0700 |
| commit | ae0a1a890ec7b885e85cd945a21ca42fed80df3d (patch) | |
| tree | 495f1d851cb3a43a0e677bff9c09d4211a35fbde /lisp/erc/erc-backend.el | |
| parent | 66b5222c3cd72839bf72e0b2a03912719c930451 (diff) | |
| parent | acae275b2752357497a2411876b83240ce7c8aec (diff) | |
| download | emacs-ae0a1a890ec7b885e85cd945a21ca42fed80df3d.tar.gz | |
Merge from origin/emacs-25
acae275 ; Spelling fixes
d8fac73 Update README for precompiled windows Emacs.
23570fd Clarify documentation of 'vc-responsible-backend' wrt symlinks
f708cb2 Clarify doc string of 'transpose-sexps'
cd05b1d Fix docstring of 'browse-url-firefox-new-window-is-tab'
bdc89eb Improve documentation of 'font-lock-remove-keywords'
4a0c590 Fix documentation of the command summary key
0221b7a Mark relocation workarounds with REL_ALLOC
Diffstat (limited to 'lisp/erc/erc-backend.el')
| -rw-r--r-- | lisp/erc/erc-backend.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index 54c17bf73d9..288e8efe73e 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -108,7 +108,7 @@ ;;;; Variables and options (defvar erc-server-responses (make-hash-table :test #'equal) - "Hashtable mapping server responses to their handler hooks.") + "Hash table mapping server responses to their handler hooks.") (cl-defstruct (erc-response (:conc-name erc-response.)) (unparsed "" :type string) @@ -1061,7 +1061,7 @@ See also `erc-server-responses'." (defun erc-call-hooks (process message) "Call hooks associated with MESSAGE in PROCESS. -Finds hooks by looking in the `erc-server-responses' hashtable." +Finds hooks by looking in the `erc-server-responses' hash table." (let ((hook (or (erc-get-hook (erc-response.command message)) 'erc-default-server-functions))) (run-hook-with-args-until-success hook process message) @@ -1218,7 +1218,7 @@ add things to `%s' instead." (put ',fn-name 'definition-name ',name) (put ',hook-name 'definition-name ',name) - ;; Hashtable map of responses to hook variables + ;; Hash table map of responses to hook variables ,@(cl-loop for response in (cons name aliases) for var in (cons hook-name var-alternates) collect `(puthash ,(format "%s" response) ',var |