[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117498: * lisp/erc/erc.el (erc-channel-receive-name
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r117498: * lisp/erc/erc.el (erc-channel-receive-names): Reduce redundancy. |
Date: |
Tue, 08 Jul 2014 19:45:28 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117498
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2014-07-08 15:45:24 -0400
message:
* lisp/erc/erc.el (erc-channel-receive-names): Reduce redundancy.
modified:
lisp/erc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-4305
lisp/erc/erc.el erc.el-20091113204419-o5vbwnq5f7feedwu-4346
=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog 2014-06-19 16:56:18 +0000
+++ b/lisp/erc/ChangeLog 2014-07-08 19:45:24 +0000
@@ -1,3 +1,7 @@
+2014-07-08 Stefan Monnier <address@hidden>
+
+ * erc.el (erc-channel-receive-names): Reduce redundancy.
+
2014-06-19 Kelvin White <address@hidden>
* erc-backend.el: Handle user modes in relevant server responses
=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el 2014-07-03 12:30:26 +0000
+++ b/lisp/erc/erc.el 2014-07-08 19:45:24 +0000
@@ -2797,7 +2797,8 @@
(concat "\n" (pp-to-string val))
(format " %S\n" val)))))
(apropos-internal "^erc-" 'custom-variable-p))))
- (current-buffer)) t)
+ (current-buffer))
+ t)
(t nil)))
(defalias 'erc-cmd-VAR 'erc-cmd-SET)
(defalias 'erc-cmd-VARIABLE 'erc-cmd-SET)
@@ -3874,7 +3875,8 @@
(insert (read-from-minibuffer "Message: "
(string (if (featurep 'xemacs)
last-command-char
- last-command-event)) read-map))
+ last-command-event))
+ read-map))
(erc-send-current-line)))
(defvar erc-action-history-list ()
@@ -4106,10 +4108,12 @@
host (regexp-quote host))
(or (when (string-match (concat "^\\(Read error\\) to "
nick "\\[" host "\\]: "
- "\\(.+\\)$") reason)
+ "\\(.+\\)$")
+ reason)
(concat (match-string 1 reason) ": " (match-string 2 reason)))
(when (string-match (concat "^\\(Ping timeout\\) for "
- nick "\\[" host "\\]$") reason)
+ nick "\\[" host "\\]$")
+ reason)
(match-string 1 reason))
reason))
@@ -4226,7 +4230,8 @@
(let ((nick (erc-server-user-nickname user)))
(concat (erc-propertize
(erc-get-user-mode-prefix nick)
- 'face 'erc-nick-prefix-face) nick)))
+ 'face 'erc-nick-prefix-face)
+ nick)))
(defun erc-get-user-mode-prefix (user)
(when user
@@ -4252,7 +4257,8 @@
(let ((nick (erc-server-user-nickname user)))
(concat (erc-propertize
(erc-get-user-mode-prefix nick)
- 'face 'erc-nick-prefix-face) nick))))
+ 'face 'erc-nick-prefix-face)
+ nick))))
(defun erc-format-my-nick ()
"Return the beginning of this user's message, correctly propertized."
@@ -4772,24 +4778,16 @@
(let ((updatep t))
(setq name item op 'off voice 'off halfop 'off admin 'off owner 'off)
(if (rassq (elt item 0) prefix)
- (cond ((= (length item) 1)
- (setq updatep nil))
- ((eq (elt item 0) voice-ch)
- (setq name (substring item 1)
- voice 'on))
- ((eq (elt item 0) hop-ch)
- (setq name (substring item 1)
- halfop 'on))
- ((eq (elt item 0) op-ch)
- (setq name (substring item 1)
- op 'on))
- ((eq (elt item 0) adm-ch)
- (setq name (substring item 1)
- admin 'on))
- ((eq (elt item 0) own-ch)
- (setq name (substring item 1)
- owner 'on))
- (t (setq name (substring item 1)))))
+ (if (= (length item) 1)
+ (setq updatep nil)
+ (setq name (substring item 1))
+ (setf (pcase (aref item 0)
+ ((pred (eq voice-ch)) voice)
+ ((pred (eq hop-ch)) hop)
+ ((pred (eq op-ch)) op)
+ ((pred (eq adm-ch)) adm)
+ ((pred (eq own-ch)) own))
+ 'on)))
(when updatep
(puthash (erc-downcase name) t
erc-channel-new-member-names)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117498: * lisp/erc/erc.el (erc-channel-receive-names): Reduce redundancy.,
Stefan Monnier <=