Skip to content

Move to 26.2 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Move to 26.2 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3a4fc8
cosmetic changes to make tweets look like tweets
Mar 10, 2015
7e99ae1
Merge https://github.com/emacs-mirror/emacs
emacswatcher Sep 13, 2015
64415b6
Merge pull request #1 from emacs-mirror/master
emacswatcher May 4, 2018
bce716a
Merge pull request #2 from emacs-mirror/master
emacswatcher Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lisp/erc/erc-backend.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1501,7 +1501,8 @@ add things to `%s' instead."
(erc-query-buffer-p buffer)
erc-format-query-as-channel-p))
privp)
msgp))))
msgp
(string-match-p "twitter" (buffer-name buffer))))))
(when s
(if (and noticep privp)
(progn
Expand Down
6 changes: 3 additions & 3 deletions lisp/erc/erc.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4284,10 +4284,10 @@ and as second argument the event parsed as a vector."
(and (erc-is-message-ctcp-p message)
(not (string-match "^\C-aACTION.*\C-a$" message))))

(defun erc-format-privmessage (nick msg privp msgp)
(defun erc-format-privmessage (nick msg privp msgp &optional twitterp)
"Format a PRIVMSG in an insertable fashion."
(let* ((mark-s (if msgp (if privp "*" "<") "-"))
(mark-e (if msgp (if privp "*" ">") "-"))
(let* ((mark-s (if msgp (if privp "*" (if twitterp "" "<")) "-"))
(mark-e (if msgp (if privp "*" (if twitterp ":" ">")) "-"))
(str (format "%s%s%s %s" mark-s nick mark-e msg))
(nick-face (if privp 'erc-nick-msg-face 'erc-nick-default-face))
(msg-face (if privp 'erc-direct-msg-face 'erc-default-face)))
Expand Down