summaryrefslogtreecommitdiff
path: root/lisp/erc
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year to 2015Paul Eggert2015-01-0144-44/+44
| | | | Run admin/update-copyright.
* Merge branch 'emacs-24'.Paul Eggert2014-11-284-11/+8
|\
| * Fix white-space problems in ChangeLogs.Paul Eggert2014-11-243-9/+8
| |
| * .gitignore cleanup.Paul Eggert2014-11-171-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * .gitignore: Merge contents of subsidiary files and organize the result so as to avoid duplication. Remove no-longer needed entries. * admin/charsets/.gitignore, admin/unidata/.gitignore: * doc/lispintro/.gitignore, etc/.gitignore, leim/.gitignore: * leim/ja-dic/.gitignore, lib-src/.gitignore, lisp/.gitignore: * lisp/calc/.gitignore, lisp/calendar/.gitignore: * lisp/cedet/.gitignore, lisp/emulation/.gitignore: * lisp/erc/.gitignore, lisp/eshell/.gitignore, lisp/gnus/.gitignore: * lisp/international/.gitignore, lisp/language/.gitignore: * lisp/leim/.gitignore, lisp/leim/quail/.gitignore: * lisp/mail/.gitignore, lisp/mh-e/.gitignore, lisp/net/.gitignore: * lisp/nxml/.gitignore, lisp/obsolete/.gitignore: * lisp/play/.gitignore, lisp/progmodes/.gitignore: * lisp/term/.gitignore, lisp/textmodes/.gitignore: * lisp/url/.gitignore, nt/.gitignore, src/.gitignore: Remove; no longer needed.
* | * erc-desktop-notifications.el (erc-notifications-bus):Michael Albinus2014-11-231-1/+1
| | | | | | | | Change version to 25.1.
* | * erc-desktop-notifications.el (erc-notifications-bus):Michael Albinus2014-11-232-1/+15
| | | | | | | | | | | | New customer option. Supports cases when Emacs hasn't been invoked in the same environment where the notifications shall go to. (erc-notifications-notify): Use it.
* | Merge from emacs-24; up to 117702Glenn Morris2014-11-106-10/+9
|\ \ | |/
| * ChangeLog tweakGlenn Morris2014-11-101-1/+1
| |
| * fix version tagsKelvin White2014-11-106-11/+10
| |
* | Merge from emacs-24; up to 117698Glenn Morris2014-11-097-9/+14
|\ \ | |/
| * Update version to 24.5Kelvin White2014-11-097-9/+14
| |
| * backports: fix changelogKelvin White2014-11-091-34/+30
| |
| * backport: erc bugfixesl3thal2014-11-086-1982/+2166
| |
* | Merge from emacs-24; up to 117669Glenn Morris2014-11-042-1/+6
|\ \ | |/
| * * lisp/erc/erc.el (erc-send-input): Bind `str' dynamically.Stefan Monnier2014-11-042-1/+6
| | | | | | | | Fixes: debbugs:18936
* | Revert previous accidental commitGlenn Morris2014-11-041-13/+11
| |
* | Merge from emacs-24; up to 117669Glenn Morris2014-11-041-11/+13
| |
* | Merge from emacs-24; up to 117634Glenn Morris2014-10-291-4/+2
|\ \ | |/
| * * erc/erc-track.el: Docstring fixes.Stefan Monnier2014-10-201-4/+2
| |
* | Port current-time change to XEmacs 21.4.Paul Eggert2014-10-281-7/+2
| | | | | | | | | | | | | | | | | | | | See the buildbot log at: http://www.randomsample.de:4456/builders/xemacs21.4-linux/builds/1285 * lisp/erc/erc.el (erc-emacs-time-to-erc-time) (erc-emacs-time-to-erc-time): * lisp/gnus/gnus-util.el (gnus-float-time): * lisp/org/org-compat.el (org-float-time): Use 2-arg defalias, since XEmacs 21.4 doesn't support 3-arg.
* | Simplify use of current-time and friends.Paul Eggert2014-10-283-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * doc/misc/org.texi (Dynamic blocks): * lisp/allout-widgets.el (allout-widgets-hook-error-handler): * lisp/calendar/appt.el (appt-display-message): * lisp/calendar/icalendar.el (icalendar--convert-float-to-ical): * lisp/calendar/timeclock.el (timeclock-in, timeclock-when-to-leave) (timeclock-last-period, timeclock-day-base): * lisp/eshell/em-ls.el (eshell-ls-file): * lisp/eshell/esh-util.el (eshell-parse-ange-ls): * lisp/generic-x.el (named-database-print-serial): * lisp/net/newst-backend.el (newsticker--get-news-by-url-callback) (newsticker-get-news, newsticker--sentinel-work) (newsticker--image-get, newsticker--image-sentinel): * lisp/net/tramp-sh.el (tramp-get-remote-touch): * lisp/progmodes/opascal.el (opascal-debug-log): * lisp/textmodes/remember.el (remember-mail-date) (remember-store-in-files): * lisp/vc/vc-annotate.el (vc-annotate-display-autoscale) (vc-default-annotate-current-time): * lisp/vc/vc-bzr.el (vc-bzr-shelve-snapshot): * lisp/vc/vc-cvs.el (vc-cvs-annotate-current-time): * lisp/vc/vc-rcs.el (vc-rcs-annotate-current-time): * lisp/url/url-util.el (url-get-normalized-date): * lisp/erc/erc-backend.el (TOPIC): * lisp/gnus/gnus-delay.el (gnus-delay-article): * lisp/gnus/gnus-sum.el (gnus-summary-read-document): * lisp/gnus/gnus-util.el (gnus-seconds-today, gnus-seconds-month): * lisp/gnus/message.el (message-make-expires-date): * lisp/org/org-archive.el (org-archive-subtree) (org-archive-to-archive-sibling): * lisp/org/org-clock.el (org-resolve-clocks, org-clock-get-sum-start) (org-clock-special-range): * lisp/org/org-timer.el (org-timer-seconds): * lisp/org/org.el (org-read-date-analyze, org-get-cursor-date): * lisp/org/ox-html.el (org-html-format-spec): * lisp/org/ox-icalendar.el (org-icalendar--vtodo): Omit unnecessary call to current-time. * lisp/calendar/time-date.el (time-to-seconds) [!float-time]: * lisp/calendar/timeclock.el (timeclock-time-to-date): * lisp/vc/vc-annotate.el (vc-annotate-convert-time): Use current time if arg is nil, to be compatible with float-time. (time-date--day-in-year): New function, with most of the guts of the old time-to-day-in-year. (time-to-day-in-year): Use it. (time-to-days): Use it, to avoid decoding the same time stamp twice. * lisp/calendar/timeclock.el (timeclock-update-mode-line): * lisp/cedet/srecode/args.el (srecode-semantic-handle-:time): * lisp/gnus/gnus-util.el (gnus-seconds-year): * lisp/org/org.el (org-get-cursor-date): Don't call current-time twice to get the current time stamp, as this can lead to inconsistent results. * lisp/completion.el (cmpl-hours-since-origin): * lisp/erc/erc.el (erc-emacs-time-to-erc-time): * lisp/ido.el (ido-time-stamp): * lisp/vc/vc-annotate.el (vc-annotate-convert-time): Simplify by using float-time. * lisp/completion.el (save-completions-to-file): * lisp/url/url-cache.el (url-cache-prune-cache): Rename local var to avoid confusion. * lisp/gnus/gnus-util.el (gnus-float-time): * lisp/net/rcirc.el (rcirc-float-time): * lisp/org/org-compat.el (org-float-time): Simplify to an alias because time-to-seconds now behaves like float-time with respect to nil arg. * lisp/subr.el (progress-reporter-do-update): Don't call float-time unless needed. * lisp/erc/erc.el (erc-current-time): Simplify by using erc-emacs-time-to-erc-time. * lisp/org/org-clock.el (org-clock-get-table-data): Omit unnecessary, lossy conversion from floating point to Emacs time and back. (org-resolve-clocks): Prefer two-argument floor.
* | Merge from emacs-24; up to 2014-07-28T06:28:15Z!dmantipov@yandex.ruGlenn Morris2014-10-201-0/+4
|\ \ | |/
| * Add 24.4 release ChangeLog entriesemacs-24.4Glenn Morris2014-10-201-0/+4
| |
* | * lisp/erc/erc-track.el (erc-modified-channels-display): Update mode lineIvan Shmakov2014-10-142-3/+8
| | | | | | | | | | | | more frequently. Fixes: debbugs:18510
* | * lisp/erc/erc.el: Fix paren typo in previous.Glenn Morris2014-10-101-1/+1
| |
* | Only initialize erc-last-saved-position if not already a marker.Ivan Shmakov2014-10-102-3/+9
| | | | | | | | Fixes: debbugs:16145
* | * lisp/erc/erc.el (erc-channel-receive-names): Silence compiler warning.Stefan Monnier2014-10-032-8/+15
| | | | | | | | (erc-format-@nick, erc-update-modes): Idem.
* | erc.el (erc-rename-buffers): Use defcustom instead of defvar.Kelvin White2014-10-032-5/+11
| |
* | * erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755).Paul Eggert2014-10-022-3/+7
| |
* | Use local variable to determine if buffers should be renamedKelvin White2014-10-022-1/+11
| | | | | | | | Fixes: debbugs:18300
* | Do not reset input ring if one existsIvan Shmakov2014-10-022-1/+6
| | | | | | | | Fixes: debbugs:18599
* | Merge from emacs-24Stefan Monnier2014-09-302-40/+49
|\ \ | |/
| * * lisp/erc/erc-track.el (erc-modified-channels-display): Update all mode linesStefan Monnier2014-09-242-39/+47
| | | | | | | | | | | | | | | | if needed. Remove call to erc-modified-channels-object where we ignored the return value. (erc-modified-channels-update): Don't force-mode-line-update here any more. Fixes: debbugs:18510
* | Rename 24.5 to 25.1Stefan Monnier2014-09-291-1/+1
| | | | | | | | Except where we expect to backport the corresponding change.
* | Regression fix - #bug18551Kelvin White2014-09-261-6/+1
| |
* | erc.el: Fix regression - Bug #18551Kelvin White2014-09-262-2/+7
| |
* | Follow Emacs versioningKelvin White2014-09-252-22/+30
| |
* | * erc.el Disable display commands in current buffer, fix case where buffer ↵Kelvin White2014-08-132-4/+7
| | | | | | | | name is already set
* | * lisp/erc/erc-stamp.el (erc-timestamp-intangible): Disable by default becauseStefan Monnier2014-08-112-1/+7
| | | | | | | | `intangible' is evil.
* | * lisp/erc/erc.el: rename server buffers and fix variable namesKelvin White2014-08-072-5/+14
| |
* | * lisp/erc/erc.el (erc-channel-receive-names): Reduce redundancy.Stefan Monnier2014-07-082-24/+26
| |
* | Fix nick duplication in format-@nickKelvin White2014-07-031-2/+2
| |
* | Update comments in erc-format-@nick to reflect changes in last merge.Kelvin White2014-06-191-4/+5
| |
* | ERC: Better user mode supportKelvin White2014-06-193-1931/+2040
| | | | | | | | Fixes: debbugs:17755
* | * lisp/erc/erc.el (erc-invite-only-mode, erc-toggle-channel-mode): Simplify.Stefan Monnier2014-04-042-16/+19
|/ | | | (erc-load-script): Tighten a regexp.
* Fix up some Version: headers that might confuse package.elGlenn Morris2014-03-312-2/+2
|
* erc-network: fix erc-determine-network when no networkJulien Danjou2014-02-252-10/+16
| | | | | * erc-networks.el (erc-determine-network): Check that NETWORK as a value, some servers set it to nothing.
* Replace "Maintainer: FSF" with the emacs-devel mailing addressGlenn Morris2014-02-0934-34/+34
|
* * lisp/erc/erc.el (erc-accidental-paste-threshold-seconds): Doc tweak.Glenn Morris2014-01-302-5/+8
| | | | * etc/NEWS: Related markup.
* Link to info manual in `defgroup'.Rüdiger Sonderfeld2014-01-252-0/+5
| | | | | | | | | | | | | | | | * lisp/progmodes/ada-mode.el (ada): * lisp/woman.el (woman): Link to info manual and Commentary section. * lisp/url/url-vars.el (url): * lisp/erc/erc.el (erc): * lisp/progmodes/flymake.el (flymake): * lisp/nxml/nxml-mode.el (nxml): * lisp/net/eww.el (eww): * lisp/speedbar.el (speedbar, speedbar-faces, speedbar-vc): * lisp/htmlfontify.el (htmlfontify): * lisp/ses.el (ses): * lisp/epa.el (epa): * lisp/ido.el (ido): Link to info manual.