summaryrefslogtreecommitdiff
path: root/lisp/erc/erc-join.el
Commit message (Collapse)AuthorAgeFilesLines
* Fix erc-reuse-buffers behaviorMingde (Matthew) Zeng2020-08-121-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/erc/erc.el (erc-generate-new-buffer-name): Fixes behavior 1, also determines if the '#channel/server' buffer already exists and will reuse that buffer when joining on the same server. Additionally when creating a new buffer with '#channel/serverB', the existing buffer '#channel' on 'severA' will be renamed to '#channel/serverA' for the sake of consistency (bug#40121). * lisp/erc/erc-join.el (erc-autojoin-channels): The logic is simplified ensuring that when autojoining channels specified in erc-autojoin-channels-alist, if there exists an erc buffer with the same channel name but a different server, it will create a new buffer to join the channel. The current logic is very weak that will skip joining same channel on different servers altogether. By the definition of erc-reuse-buffers, if non-nil it should create a new buffer when joining channels with same names on different servers. The current behavior of erc-reuse-buffers is: 1. when non-nil, it will always reuse the same channel buffer, resulting in server A's channel gets reconnected to the channel with the same name of server B. 2. when nil, the buffer-name of the joined channel is '#channel/server'. However if one tries to '/join #channel' from the server buffer, it creates a new empty buffer with buffer-name '#channel', instead of opening the already-joined channel buffer.
* Make some erc function aliases obsoleteLars Ingebrigtsen2020-08-021-2/+2
| | | | | | | | | | | | | * lisp/erc/erc-networks.el (erc-current-network): * lisp/erc/erc-join.el (erc-autojoin-channels-delayed): * lisp/erc/erc-backend.el (erc-server-setup-periodical-ping) (erc-server-send-ping, erc-server-send-queue): * lisp/erc/erc-autoaway.el (erc-autoaway-reestablish-idletimer) (autoaway): Adjust callers. * lisp/erc/erc-compat.el (erc-with-selected-window) (erc-cancel-timer, erc-make-obsolete) (erc-make-obsolete-variable): Make these aliases obsolete.
* ERC: Update maintainer addressAmin Bandali2020-03-181-1/+1
|
* Update ERC module URLsAmin Bandali2020-01-241-1/+1
| | | | | | | | | | | | | | * lisp/erc/erc-autoaway.el, lisp/erc/erc-button.el, lisp/erc/erc-compat.el, lisp/erc/erc-fill.el, lisp/erc/erc-imenu.el, lisp/erc/erc-join.el, lisp/erc/erc-lang.el, lisp/erc/erc-match.el, lisp/erc/erc-pcomplete.el, lisp/erc/erc-ring.el, lisp/erc/erc-spelling.el, lisp/erc/erc-stamp.el, lisp/erc/erc-track.el: Update URL to friendlier form, over https. * lisp/erc/erc-ibuffer.el: Remove URL to nonexistent page. * lisp/erc/erc-list.el, lisp/erc/erc-log.el, lisp/erc/erc-notify.el, lisp/erc/erc-replace.el, lisp/erc/erc-services.el, lisp/erc/erc-sound.el, lisp/erc/erc-speedbar.el, lisp/erc/erc-truncate.el: Add URL to corresponding EmacsWiki page.
* ERC: New maintainer.Amin Bandali2020-01-171-1/+1
| | | | | | * admin/MAINTAINERS: Add entries for Amin Bandali, new maintainer for ERC, and interested in maintaining Eshell. * lisp/erc/*: New maintainer.
* Update copyright year to 2020Paul Eggert2020-01-011-1/+1
| | | | Run "TZ=UTC0 admin/update-copyright $(git ls-files)".
* Remove lisp/erc/ file-local indent-tabs-mode settingsNoam Postavsky2019-09-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/erc/erc-autoaway.el: * lisp/erc/erc-backend.el: * lisp/erc/erc-button.el: * lisp/erc/erc-compat.el: * lisp/erc/erc-dcc.el: * lisp/erc/erc-fill.el: * lisp/erc/erc-ibuffer.el: * lisp/erc/erc-identd.el: * lisp/erc/erc-imenu.el: * lisp/erc/erc-join.el: * lisp/erc/erc-list.el: * lisp/erc/erc-log.el: * lisp/erc/erc-match.el: * lisp/erc/erc-menu.el: * lisp/erc/erc-netsplit.el: * lisp/erc/erc-networks.el: * lisp/erc/erc-notify.el: * lisp/erc/erc-page.el: * lisp/erc/erc-pcomplete.el: * lisp/erc/erc-replace.el: * lisp/erc/erc-ring.el: * lisp/erc/erc-services.el: * lisp/erc/erc-sound.el: * lisp/erc/erc-speedbar.el: * lisp/erc/erc-stamp.el: * lisp/erc/erc-track.el: * lisp/erc/erc-truncate.el: * lisp/erc/erc-xdcc.el: * lisp/erc/erc.el: Remove indent-tabs-mode setting, so that we follow Emacs' global indent-tabs-mode=nil setting (and much of the indentation in these fails is already spaces anyway). Also remove tab-width=8 settings, since those are redundant with the setting in the top-level .dir-locals.el.
* Autojoin channels with same name on different servers in ercMartin Kletzander2019-06-231-0/+4
| | | | | | | * lisp/erc/erc-join.el (erc-autojoin-channels): Join channels with the same name on different servers (bug#32723). Copyright-paperwork-exempt: yes
* Go back to "Maintainer: emacs-devel@gnu.org"Paul Eggert2019-05-251-0/+1
| | | | | | Restore lines saying "Maintainer: emacs-devel@gnu.org" when there is no special maintainer for a file. Although this wasn't documented it was common practice and removing the lines didn't have consensus.
* Fixes for "Maintainer:" and related linesPaul Eggert2019-05-191-1/+0
| | | | | | Mostly, this just removes "Maintainer: emacs-devel@gnu.org" lines, which are not that useful. It also cleans up and regularizes a few similar lines.
* Merge from origin/emacs-26Paul Eggert2018-12-311-1/+1
|\ | | | | | | | | | | 2fcf2df Fix copyright years by hand 26bed8b Update copyright year to 2019 2814292 Fix value of default frame height. (Bug#33921)
| * Update copyright year to 2019Paul Eggert2019-01-011-1/+1
| | | | | | | | Run 'TZ=UTC0 admin/update-copyright $(git ls-files)'.
* | Merge from origin/emacs-26Paul Eggert2018-01-011-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63b04c11d5 Fix copyright years by hand 5c7dd8a783 Update copyright year to 2018 220a9ecba1 Merge from Gnulib 312c565566 Don't add empty keyboard macro to macro ring (Bug#24992) 39ca289a7a Allow customization of decoding of "man" command f8240815ea * etc/NEWS: Add security consideration note on passphrase ... 0c78822c70 Fix subtle problem with scroll-down when scroll-margin is ... acd289c5a4 Fix problems with indexing in User manual b240c7846b * lisp/help.el (describe-key): Only (copy-sequence elt) wh... e879a5444a * src/buffer.c (Frestore_buffer_modified_p): Fix bug#29846 81b1028b63 Improve documentation of 'inhibit-modification-hooks' and ... 7175496d7a Fix doc string of 'enable-recursive-minibuffers' 5b38406491 Fix documentation of delsel and of killing text # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex
| * Update copyright year to 2018Paul Eggert2018-01-011-1/+1
| | | | | | | | Run admin/update-copyright.
* | Put most erc autoloads in a dedicated file erc-loaddefs.elGlenn Morris2017-11-281-1/+2
|/ | | | | | | | | | | | | | | | | | | | These are features that are only useful after erc.el is loaded. * lisp/erc/erc.el (top-level): Load erc-loaddefs. * lisp/erc/erc-autoaway.el, lisp/erc/erc-button.el: * lisp/erc/erc-capab.el, lisp/erc/erc-compat.el: * lisp/erc/erc-dcc.el, lisp/erc/erc-desktop-notifications.el: * lisp/erc/erc-ezbounce.el, lisp/erc/erc-fill.el: * lisp/erc/erc-identd.el, lisp/erc/erc-imenu.el: * lisp/erc/erc-join.el, lisp/erc/erc-list.el, lisp/erc/erc-log.el: * lisp/erc/erc-match.el, lisp/erc/erc-menu.el: * lisp/erc/erc-netsplit.el, lisp/erc/erc-notify.el: * lisp/erc/erc-page.el, lisp/erc/erc-pcomplete.el: * lisp/erc/erc-replace.el, lisp/erc/erc-ring.el: * lisp/erc/erc-services.el, lisp/erc/erc-sound.el: * lisp/erc/erc-speedbar.el, lisp/erc/erc-spelling.el: * lisp/erc/erc-stamp.el, lisp/erc/erc-track.el: * lisp/erc/erc-truncate.el, lisp/erc/erc-xdcc.el: Set generated-autoload-file to "erc-loaddefs.el".
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-131-2/+1
| | | | | | | | | | | | | Most of this change is to boilerplate commentary such as license URLs. This change was prompted by ftp://ftp.gnu.org's going-away party, planned for November. Change these FTP URLs to https://ftp.gnu.org instead. Make similar changes for URLs to other organizations moving away from FTP. Also, change HTTP to HTTPS for URLs to gnu.org and fsf.org when this works, as this will further help defend against man-in-the-middle attacks (for this part I omitted the MS-DOS and MS-Windows sources and the test tarballs to keep the workload down). HTTPS is not fully working to lists.gnu.org so I left those URLs alone for now.
* Fix erc-join with channel passwordTom Tromey2017-05-051-26/+12
| | | | | | | | | | | Bug#25349 * lisp/erc/erc-join.el (erc-autojoin-after-ident): Switch order of server names. (erc-autojoin-channels, erc-autojoin-add, erc-autojoin-remove): Likewise. (erc-server-join-channel): Move to erc.el. * lisp/erc/erc.el (erc-server-join-channel): Move from erc-join.el. (erc-cmd-JOIN): Use erc-server-join-channel.
* Update copyright year to 2017Paul Eggert2016-12-311-1/+1
| | | | Run admin/update-copyright.
* Update copyright year to 2016Paul Eggert2016-01-011-1/+1
| | | | Run admin/update-copyright.
* Don't join erc channels doublyLars Ingebrigtsen2015-12-271-2/+8
| | | | | * erc-join.el (erc-autojoin-channels): Don't join channels more than once (if you have several nicks) (bug#20695).
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
| | | | Run admin/update-copyright.
* fix version tagsKelvin White2014-11-101-2/+2
|
* Update version to 24.5Kelvin White2014-11-091-2/+2
|
* Replace "Maintainer: FSF" with the emacs-devel mailing addressGlenn Morris2014-02-091-1/+1
|
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
|
* Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.caPaul Eggert2013-01-021-1/+1
|\
| * Update copyright notices for 2013.Paul Eggert2013-01-011-1/+1
| |
* | Use cl-lib instead of cl, and interactive-p => called-interactively-p.Stefan Monnier2012-11-191-1/+0
|/ | | | | | | | | | | | | | | | | * lisp/erc/erc-track.el, lisp/erc/erc-networks.el, lisp/erc/erc-netsplit.el: * lisp/erc/erc-dcc.el, lisp/erc/erc-backend.el: Use cl-lib, nth, pcase, and called-interactively-p instead of cl. * lisp/erc/erc-speedbar.el, lisp/erc/erc-services.el: * lisp/erc/erc-pcomplete.el, lisp/erc/erc-notify.el, lisp/erc/erc-match.el: * lisp/erc/erc-log.el, lisp/erc/erc-join.el, lisp/erc/erc-ezbounce.el: * lisp/erc/erc-capab.el: Don't require cl since we don't use it. * lisp/erc/erc.el: Use cl-lib, nth, pcase, and called-interactively-p i.s.o cl. (erc-lurker-ignore-chars, erc-common-server-suffixes): Move before first use. * lisp/json.el: Don't require cl since we don't use it. * lisp/color.el: Don't require cl. (color-complement): `caddr' -> `nth 2'. * test/automated/ert-x-tests.el: Use cl-lib. * test/automated/ert-tests.el: Use lexical-binding and cl-lib.
* Set maintainer of most lisp/erc/*.el files to FSFGlenn Morris2012-10-051-0/+1
| | | | Ref: http://lists.gnu.org/archive/html/bug-gnu-emacs/2012-10/msg00200.html
* 2012-08-21 Josh Feinstein <jlf@foxtail.org>Josh Feinstein2012-08-211-2/+2
| | | | * erc-join.el (erc-autojoin-timing): Fix defcustom type.
* Make erc use auth-source to look up channel keysLars Magne Ingebrigtsen2012-04-101-2/+25
| | | | | | | | * lisp/erc/erc-join.el (erc-server-join-channel): New function to look up the channel password via auth-source. (erc-autojoin-channels): Use it. (erc-autojoin-after-ident): Ditto. (erc-autojoin-channels-alist): Mention auth-source.
* Add missing :version tags for new erc defcustoms.Glenn Morris2012-02-081-0/+2
| | | | | | | | * lisp/erc/erc-backend.el (erc-coding-system-precedence): * lisp/erc/erc-join.el (erc-autojoin-delay, erc-autojoin-timing): Add missing :version settings. * etc/NEWS: We don't need to duplicate the doc-strings of variables.
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
|
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-1/+1
|
* Nuke arch-tags.Glenn Morris2011-01-151-1/+0
|
* Merge from emacs-23Stefan Monnier2011-01-141-1/+1
|\
| * Add 2011 to FSF/AIST copyright years.Glenn Morris2011-01-021-1/+1
| |
* | Allow delayed autojoin in ERC (Bug#5521).Vivek Dasmohapatra2010-08-141-4/+72
|/ | | | | | | * erc/erc-join.el (erc-autojoin-timing, erc-autojoin-delay): New vars. (erc-autojoin-channels-delayed, erc-autojoin-after-ident): New functions. (erc-autojoin-channels): Allow autojoining after ident (Bug#5521).
* Add 2010 to copyright years.Glenn Morris2010-01-131-1/+1
|
* Add 2009 to copyright years.Glenn Morris2009-01-051-1/+1
|
* Switch to recommended form of GPLv3 permissions notice.Glenn Morris2008-05-061-6/+4
|
* Add 2008 to copyright years.Glenn Morris2008-01-071-1/+1
|
* Switch license to GPLv3 or later.Glenn Morris2007-07-251-1/+1
|
* Add 2007 to copyright years.Glenn Morris2007-01-211-1/+1
|
* Revision: emacs@sv.gnu.org/emacs--devo--0--patch-208Miles Bader2006-04-111-2/+2
| | | | | | Creator: Michael Olson <mwolson@gnu.org> Sync from erc--emacs--0
* Revision: emacs@sv.gnu.org/emacs--devo--0--patch-75Miles Bader2006-02-121-1/+1
| | | | | | Creator: Michael Olson <mwolson@gnu.org> Make ERC comply with the new copyright year guidelines.
* Revision: emacs@sv.gnu.org/emacs--devo--0--patch-55Miles Bader2006-02-081-0/+139
Creator: Michael Olson <mwolson@gnu.org> Merge from erc--emacs--0
View Lorry Controller Status