Commit graph

632 commits

Author SHA1 Message Date
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
Glenn Morris
d967cd184c ChangeLog fixes 2014-01-16 00:34:43 -08:00
Glenn Morris
39c871402f ChangeLog fixes 2014-01-14 22:06:07 -05:00
Paul Eggert
da5ecfa9b9 Spelling fixes.
* lib-src/Makefile.in (regex.o): Remove reference to no-longer-used macros
CONFIG_BROKETS and INHIBIT_STRING_HEADER.  "BROKETS" was a
misspelling anyway....
* src/nsterm.h (updateCollectionBehavior): Rename from
updateCollectionBehaviour.  All uses changed.
2014-01-04 18:56:08 -08:00
Paul Eggert
ba3189039a Update copyright year to 2014 by running admin/update-copyright. 2014-01-01 07:43:34 +00:00
Glenn Morris
946618bae3 Revert earlier erc-button change 2013-12-28 00:27:34 -08:00
Glenn Morris
9c5a5c7700 Every defcustom should specify its type
* apropos.el (apropos-match-face):
* calculator.el (calculator-displayer):
* dabbrev.el (dabbrev-search-these-buffers-only):
* face-remap.el (buffer-face-mode-face):
* simple.el (yank-handled-properties):
* emacs-lisp/testcover.el (testcover-potentially-1value-functions):
* mail/footnote.el (footnote-mode-line-string, footnote-prefix):
* mail/hashcash.el (hashcash-accept-resources, hashcash-program)
(hashcash-double-spend-database):
* progmodes/ruby-mode.el (ruby-deep-indent-paren)
(ruby-deep-indent-paren-style):
* textmodes/flyspell.el (flyspell-auto-correct-binding):
* textmodes/rst.el (rst-toc-indent, rst-toc-insert-style)
(rst-toc-insert-number-separator, rst-toc-insert-max-level):
* vc/pcvs-defs.el (cvs-minor-mode-prefix):
* erc/erc-log.el (erc-log-file-coding-system):
* gnus/gnus-sieve.el (gnus-sieve-select-method):
* gnus/gravatar.el (gravatar-automatic-caching, gravatar-cache-ttl)
(gravatar-rating, gravatar-size):
* gnus/message.el (message-minibuffer-local-map):
* gnus/sieve-manage.el (sieve-manage-authenticators)
(sieve-manage-authenticator-alist):
Specify custom types.

* mail/hashcash.el (hashcash-program): Rename from hashcash-path.
Update callers.
2013-12-28 00:21:33 -08:00
Glenn Morris
9c61f806fb Misc small custom fixes
The value of defcustom's const should not be quoted!

* lisp/desktop.el (desktop-restore-in-current-display):
* lisp/newcomment.el (comment-empty-lines):
* lisp/progmodes/idlwave.el (idlwave-scan-all-buffers-for-routine-info)
(idlwave-pad-keyword):
* lisp/progmodes/tcl.el (tcl-tab-always-indent):
* lisp/textmodes/reftex-vars.el (reftex-index-default-tag):
* lisp/elec-pair.el (electric-pair-skip-whitespace):
* lisp/progmodes/cfengine.el (cfengine-cf-promises):
* lisp/cedet/ede/linux.el (project-linux-build-directory-default)
(project-linux-architecture-default):
* lisp/erc/erc-button.el (erc-button-alist):
* lisp/gnus/auth-source.el (auth-sources):
* lisp/gnus/nnmairix.el (nnmairix-propagate-marks-upon-close):
* lisp/url/url-history.el (url-history-track):
* lisp/url/url-vars.el (url-honor-refresh-requests):
Fix custom types.

* lisp/net/tls.el (tls-certtool-program): Fix default value.
2013-12-27 17:24:15 -08:00
Glenn Morris
1288751c49 * erc/erc-button.el (erc-nick-popup): Make `nick' available in the eval
environment.

Fixes: debbugs:15969
2013-11-24 19:25:13 -08:00
Stefan Monnier
7f851ea43b * lisp/erc/erc-pcomplete.el (erc-pcomplete): Set this-command. 2013-11-04 14:35:37 -05:00
Glenn Morris
26d078a69e * erc.el (erc-invite-only-mode, erc-toggle-channel-mode):
Remove unused local variable `erc-force-send'.
2013-09-20 17:52:07 -07:00
Glenn Morris
0bc8d75810 * erc/erc-list.el (erc-list-handle-322): Mark unused argument. 2013-09-18 19:32:27 -07:00
Glenn Morris
a022856b0f Address some "unused lexical argument" warnings in erc
* erc/erc.el (erc-open-server-buffer-p): Actually use the `buffer' arg.
* erc/erc-backend.el (erc-server-process-alive): Take optional `buffer' arg.

* erc/erc-button.el (erc-button-click-button, erc-button-press-button):
Mark unused arguments.
2013-09-18 19:21:31 -07:00
Glenn Morris
49a053fc5b Address some "unused lexical variable" warnings
* lisp/dframe.el (x-sensitive-text-pointer-shape, x-pointer-shape): Declare.

* lisp/eshell/esh-io.el (x-select-enable-clipboard): Declare.

* lisp/erc/erc-button.el (erc-button-add-buttons):
* lisp/eshell/em-cmpl.el (eshell-complete-parse-arguments):
* lisp/eshell/em-hist.el (eshell/history, eshell-isearch-backward):
* lisp/eshell/em-pred.el (eshell-parse-modifiers, eshell-pred-file-time):
Remove unused local variables.
2013-09-17 21:48:00 -04:00