1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-02 20:16:25 +00:00

345 Commits

Author SHA1 Message Date
Paul Eggert
0cce3623b1 Merge branch 'emacs-24'. 2014-11-28 23:07:16 -08:00
Paul Eggert
f24c8f98ec Fix white-space problems in ChangeLogs. 2014-11-24 17:16:27 -08:00
Michael Albinus
b1d07e31d0 * erc-desktop-notifications.el (erc-notifications-bus):
Change version to 25.1.
2014-11-23 10:07:00 +01:00
Michael Albinus
709a5173cd * erc-desktop-notifications.el (erc-notifications-bus):
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.
2014-11-23 10:00:28 +01:00
Paul Eggert
342bc0e04b .gitignore cleanup.
* .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.
2014-11-17 17:58:28 -08:00
Glenn Morris
0121d32af5 Merge from emacs-24; up to 117702 2014-11-10 08:49:41 -08:00
Glenn Morris
7611d85a45 ChangeLog tweak 2014-11-10 08:47:16 -08:00
Kelvin White
fbc782bd18 fix version tags 2014-11-10 05:38:11 -05:00
Glenn Morris
c832df2ec2 Merge from emacs-24; up to 117698 2014-11-09 23:39:35 -08:00
Kelvin White
ea283d21fc Update version to 24.5 2014-11-09 08:46:24 -05:00
Kelvin White
bcc9e35de5 backports: fix changelog 2014-11-09 08:36:43 -05:00
l3thal
d1036d288d backport: erc bugfixes 2014-11-08 20:51:43 -05:00
Glenn Morris
b6e66a5cc7 Merge from emacs-24; up to 117669 2014-11-04 21:08:57 -08:00
Glenn Morris
ddce73d32f Revert previous accidental commit 2014-11-04 21:08:12 -08:00
Glenn Morris
6a278b64f7 Merge from emacs-24; up to 117669 2014-11-04 21:04:30 -08:00
Stefan Monnier
6cd9d8c94d * lisp/erc/erc.el (erc-send-input): Bind `str' dynamically.
Fixes: debbugs:18936
2014-11-04 15:07:59 -05:00
Glenn Morris
52b410c60a Merge from emacs-24; up to 117634 2014-10-29 22:15:28 -07:00
Paul Eggert
78d45b66d4 Port current-time change to XEmacs 21.4.
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.
2014-10-28 20:21:06 -07:00
Paul Eggert
123ddec7f8 Simplify use of current-time and friends.
* 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.
2014-10-28 18:42:51 -07:00
Stefan Monnier
9d982156cb * erc/erc-track.el: Docstring fixes. 2014-10-20 18:14:21 -04:00
Glenn Morris
8a85c254de Merge from emacs-24; up to 2014-07-28T06:28:15Z!dmantipov@yandex.ru 2014-10-20 20:59:41 +01:00
Glenn Morris
83bad90efe Add 24.4 release ChangeLog entries 2014-10-20 20:21:15 +01:00
Ivan Shmakov
643b1e97f7 * lisp/erc/erc-track.el (erc-modified-channels-display): Update mode line
more frequently.

Fixes: debbugs:18510
2014-10-14 21:15:40 -04:00
Glenn Morris
244a462a30 * lisp/erc/erc.el: Fix paren typo in previous. 2014-10-10 12:53:19 -04:00
Ivan Shmakov
43f52995ea Only initialize erc-last-saved-position if not already a marker.
Fixes: debbugs:16145
2014-10-10 09:16:12 -04:00
Stefan Monnier
94ab176a44 * lisp/erc/erc.el (erc-channel-receive-names): Silence compiler warning.
(erc-format-@nick, erc-update-modes): Idem.
2014-10-03 23:04:51 -04:00
Kelvin White
efb615a711 erc.el (erc-rename-buffers): Use defcustom instead of defvar. 2014-10-03 07:08:37 -04:00
Paul Eggert
f3c69fb76f * erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755). 2014-10-02 12:28:26 -07:00
Kelvin White
64a67db3cd Use local variable to determine if buffers should be renamed
Fixes: debbugs:18300
2014-10-02 07:55:22 -04:00
Ivan Shmakov
3af2917c91 Do not reset input ring if one exists
Fixes: debbugs:18599
2014-10-02 07:31:56 -04:00
Stefan Monnier
07bec0fc67 Merge from emacs-24 2014-09-30 19:19:31 -04:00
Stefan Monnier
cbdc06f3be Rename 24.5 to 25.1
Except where we expect to backport the corresponding change.
2014-09-29 14:14:08 -04:00
Kelvin White
c575c0509a Regression fix - #bug18551 2014-09-26 09:22:47 -04:00
Kelvin White
53c0a1e9d7 erc.el: Fix regression - Bug #18551 2014-09-26 09:05:28 -04:00
Kelvin White
685460246c Follow Emacs versioning 2014-09-25 10:07:30 -04:00
Stefan Monnier
38353b99f3 * lisp/erc/erc-track.el (erc-modified-channels-display): Update all mode lines
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
2014-09-24 13:31:59 -04:00
Kelvin White
92180ebd2e * erc.el Disable display commands in current buffer, fix case where buffer name is already set 2014-08-13 09:14:43 -04:00
Stefan Monnier
f957571882 * lisp/erc/erc-stamp.el (erc-timestamp-intangible): Disable by default because
`intangible' is evil.
2014-08-11 22:56:28 -04:00
Kelvin White
ddc3fca44e * lisp/erc/erc.el: rename server buffers and fix variable names 2014-08-07 12:44:19 -04:00
Stefan Monnier
27e81f9f4e * lisp/erc/erc.el (erc-channel-receive-names): Reduce redundancy. 2014-07-08 15:45:24 -04:00
Kelvin White
046d53d46e Fix nick duplication in format-@nick 2014-07-03 08:30:26 -04:00
Kelvin White
27966b8101 Update comments in erc-format-@nick to reflect changes in last merge. 2014-06-19 13:22:31 -04:00
Kelvin White
7a4114e4e0 ERC: Better user mode support
Fixes: debbugs:17755
2014-06-19 12:56:18 -04:00
Stefan Monnier
1f0e1785ee * lisp/erc/erc.el (erc-invite-only-mode, erc-toggle-channel-mode): Simplify.
(erc-load-script): Tighten a regexp.
2014-04-04 13:26:23 -04:00
Glenn Morris
2998fa1b73 Fix up some Version: headers that might confuse package.el 2014-03-31 15:01:59 -04:00
Julien Danjou
ea922c8bb3 erc-network: fix erc-determine-network when no network
* erc-networks.el (erc-determine-network): Check that NETWORK as a
value, some servers set it to nothing.
2014-02-25 18:37:25 +01:00
Glenn Morris
34dc21db6e Replace "Maintainer: FSF" with the emacs-devel mailing address 2014-02-09 17:34:22 -08:00
Glenn Morris
23dc6d0ccd * lisp/erc/erc.el (erc-accidental-paste-threshold-seconds): Doc tweak.
* etc/NEWS: Related markup.
2014-01-30 22:39:51 -08:00
Rüdiger Sonderfeld
ed85dee69d Link to info manual in `defgroup'.
* 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.
2014-01-25 20:15:42 +01:00
Glenn Morris
1bf6ecf2b3 ChangeLog fixes 2014-01-21 20:43:37 -05:00