Commit graph

92 commits

Author SHA1 Message Date
Paul Eggert
ae0a1a890e Merge from origin/emacs-25
acae275 ; Spelling fixes
d8fac73 Update README for precompiled windows Emacs.
23570fd Clarify documentation of 'vc-responsible-backend' wrt symlinks
f708cb2 Clarify doc string of 'transpose-sexps'
cd05b1d Fix docstring of 'browse-url-firefox-new-window-is-tab'
bdc89eb Improve documentation of 'font-lock-remove-keywords'
4a0c590 Fix documentation of the command summary key
0221b7a Mark relocation workarounds with REL_ALLOC
2016-11-04 15:02:03 -07:00
Paul Eggert
acae275b27 ; Spelling fixes 2016-11-04 14:50:59 -07:00
Vibhav Pant
eb81a83abb Use correct TYPE value for displaying error messages in (erc-display-message) 2016-09-24 11:41:44 +05:30
Stefan Monnier
52c7b770d5 * lisp/erc/erc-backend.el: Use lexical-binding. Silence byte-compiler
Use #' to quote functions.
(erc-server-delayed-reconnect): Remove unused arg `event'.
(erc-process-sentinel-2): Adjust accordingly.
Don't pass `err' to condition-case if we don't use it.
(define-erc-response-handler): Use add-hook rather than add-to-list.
(NICK): Use cl-pushnew rather than add-to-list.
(331): Remove unused var `topic'.
(352): Remove unused var `hopcount'.
2016-04-02 15:38:54 -04:00
John Wiegley
efb1883244 Restore the fix to bug#18527 from commit d6868025 2016-03-26 17:22:03 -07:00
John Wiegley
0608bf1c3d Merge from origin/emacs-25
ee73997 Make erc work better when encountering unknown prefix chars
b99141d Make erc completion case-insensitive again
66c4620 Make complection in erc use consistent casing
8c562b2 Make /QUIT in erc more robust
d93d2c5 Make tracking faces in Emacs work more reliably
af6ab7e Make shr not bug out on images on non-graphical displays
3311f40 Fix bookmark display widths
d90ab1e Fix typo in eww-make-unique-file-name
7f81825 Make it possible to TAB to input fields
a43a1dc Insert complete alt texts when images are disabled
56ed4e1 Allow eww text fields to grow
66b315c Make erc work when subword-mode is switched on
255b68f Fix IMAP doc example
91557f5 Quoting fixes in doc strings and diagnostics
2c0dc9f Fix warning message in hack-local-variables
504696d Etags: yet another improvement in Ruby tags
8784ebf Fix x-popup-menu on TTYs without a mouse
8b87ecb * lisp/emacs-lisp/map.el: Improvements to the docstring of the
        pcase macro
6191003 Use pop-to-buffer-same-window in eww
fe321fd * autogen.sh: Revert all recent changes.
74ebd4a * make-dist: Updates related to nt/.
737193a * make-dist: Add modules/.
3696bf2 * make-dist: Update for super-special file that can't live in etc/.
a4278e2 Fix failure to compile ns-win.el in parallel builds
860da4d Fix names of tags generated for Ruby accessors
f6213ce Fix file-name recognition in 'etags'
e42e662 Change Ruby file names and extensions recognized by 'etags'
58bfb6a More improvements for Ruby support in 'etags'
c04e911 Add --git-config option to autogen.sh
5713466 Fix editing undo changes in eww fields
51362d6 Allow the user more control of popping up the eww window
ee0fbd8 Make eww-browse-url with new-window parameter work again
9c3142d Clean up eww code slightly
cb035f3 Don't insert nil faces in shr
4c3fae3 ; * lisp/progmodes/prolog.el: Remove some obsolete commentary.
93f2153 Improve the custom type of some user options.
9f60d7e Mark some risky calendar variables.
1d07dcd Highlight two additional SCSS keywords
ee8b466 Recommend enabling integrity-checking in git
e639e10 Some corrections in Elisp manual
d766ca8 Chatter when autogen.sh changes Git configuration
3b734e1 * org/org-compat.el (org-font-lock-ensure): Fix bogus test (bug#22399)
43cb9f8 Omit unnecessary history from Lisp intro
2fbd1da * etc/HISTORY: Add some more history, plus git tags.
c90e1b4 Improve elisp “Security Considerations” doc
cedd7ca autogen.sh now arranges for git to check hashes
86ce76b ; Fix ChangeLog.2 commit ID.
7b1d2b1 Fix (c & 040) typo in emergency escapes
a8273da Fix display of overlay strings with 'display' and 'box' property
fc48106 Fix imap-starttls-open
cdecbed Fix return value of imap-starttls-open
20c7e34 ; * etc/NEWS: Fix renamed command name
98bdbdb Correct reference to DARWIN_OS preprocessor symbol
b250d29 Spelling fix
b920a0e Spelling fixes
93b144b Pacify GCC on C library without glibc API
2016-02-03 23:56:08 -08:00
Dima Kogan
66b315c9c9 Make erc work when subword-mode is switched on
* lisp/erc/erc-backend.el (erc-forward-word, erc-word-at-arg-p)
(erc-bounds-of-word-at-point): New functions to do word-based
things when subword-mode is switched on.

* lisp/erc/erc-button.el (erc-button-add-nickname-buttons): Use them
(bug#17558).
2016-02-04 14:24:18 +11:00
John Wiegley
1dd4f26ab6 Merge from origin/emacs-25
ef33bc7 Spelling and grammar fixes
9c3dbab Fix copyright years by hand
0e96320 Update copyright year to 2016
2016-01-11 22:48:07 -08:00
Paul Eggert
0e963201d0 Update copyright year to 2016
Run admin/update-copyright.
2016-01-01 01:34:24 -08:00
John Wiegley
9f2f14a072 Merge emacs-25 into master (using imerge) 2015-12-29 21:40:28 -08:00
Lars Ingebrigtsen
d686802510 Reconnect erc even on server errors
* lisp/erc/erc-backend.el (erc-server-reconnect-p): Try to
reconnect even if a server error has occurred (bug#18527).
2015-12-28 20:52:41 +01:00
Vivek Dasmohapatra
1fe7344786 Disconnection fixes for erc
* lisp/erc/erc-backend.el (erc-server-reconnect-p): Don't
reconnect if the user has disconnected explicitly (bug#4589).
2015-12-27 23:28:52 +01:00
Thomas Riccardi
d50b89dda9 Further erc asynch fixes
* lisp/erc/erc-backend.el (erc-process-sentinel-2): Make
erc-server-connect to return even if the connection is not
ready.  Then erc-open and erc-server-reconnect do the
same. (bug#5650).

Copyright-paperwork-exempt: yes
2015-12-27 23:14:13 +01:00
Vivek Dasmohapatra
92e1878a04 Make erc connect asynchronously
* lisp/erc/erc-backend.el (erc-server-reconnect): Use it to
reconnect asynchronously.

* lisp/erc/erc-backend.el (erc-open-network-stream): New function (bug#5650).
2015-12-27 23:12:30 +01:00
Deniz Dogan
a36c88806d Clear erc user list upon disconnection
* lisp/erc/erc-backend.el (erc-process-sentinel): Clear channel user
lists upon disconnection.  This prevents invalid channel
user lists when reconnecting (bug#10947).
2015-12-27 22:36:55 +01:00
Lars Ingebrigtsen
ff5f37e56a Don't bug out in erc after waking from sleep
* erc-backend.el (erc-server-send-ping): If the server has
closed connection, this may already have been detected and
`erc-server-last-received-time' has been set to nil (bug#13608).
2015-12-27 22:18:32 +01:00
Dima Kogan
2cd894dc34 Ensure that we don't have several timers in erc
* lisp/erc/erc-backend.el (erc-server-setup-periodical-ping): Checks
for existing timers in the alist before adding new ones.  If a
timer already exists, it is cancelled and
overwritten. (bug#19292).
2015-12-27 21:19:13 +01:00
Paul Eggert
ac16149ba4 Fix docstring quoting problems with ‘ '’
Problem reported by Artur Malabarba in:
http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01513.html
Most of these fixes are to documentation; many involve fixing
longstanding quoting glitches that are independent of the
recent substitute-command-keys changes.  The changes to code are:
* lisp/cedet/mode-local.el (mode-local-augment-function-help)
(describe-mode-local-overload):
Substitute docstrings before displaying them.
* lisp/emacs-lisp/cl-macs.el (cl--transform-lambda):
Quote the generated docstring for later substitution.
2015-11-17 15:29:35 -08:00
l3thal
68cdc4bd7a Reconnect asynchronously. 2015-11-13 16:34:32 -05:00
Paul Eggert
284c470ef7 Backslash cleanup in Elisp source files
This patch should not change behavior.  It typically omits backslashes
where they are redundant (e.g., in the string literal "^\$").
In a few places, insert backslashes where they make regular
expressions clearer: e.g., replace "^\*" (equivalent to "^*") with
"^\\*", which has the same effect as a regular expression.
Also, use ‘\ %’ instead of ‘\%’ when avoiding confusion with SCCS IDs,
and similarly use ‘\ $’ instead of ‘\$’ when avoiding confusion with
RCS IDs, as that makes it clearer that the backslash is intended.
2015-09-17 16:09:39 -07:00
Paul Eggert
26bd978d87 Fix some more docstring etc. quoting problems
Mostly these fixes prevent the transliteration of apostrophes
that should stay apostrophes.  Also, prefer curved quotes in
Bahá’í proper names, as that’s the preferred Bahá’í style and
these names are chock-full of non-ASCII characters anyway.
* lisp/emacs-lisp/eieio-core.el (eieio-defclass-autoload)
(eieio-defclass-internal):
* lisp/emacs-lisp/eieio.el (defclass):
* lisp/hi-lock.el (hi-lock-mode):
Don’t transliterate Lisp apostrophes when generating a
doc string or diagnostic.
* lisp/international/mule-diag.el (list-coding-systems-1):
* lisp/international/ogonek.el (ogonek-jak, ogonek-how):
* lisp/mail/sendmail.el (sendmail-query-user-about-smtp):
* lisp/vc/ediff-mult.el (ediff-redraw-registry-buffer):
* lisp/vc/ediff-ptch.el (ediff-fixup-patch-map):
Substitute quotes before putting them in the help buffer.
2015-09-03 15:32:54 -07:00
Paul Eggert
19532d147b Escape ` and ' in doc
Escape apostrophes and grave accents in docstrings if they are
are supposed to stand for themselves and are not quotes.  Remove
apostrophes from docstring examples like ‘'(calendar-nth-named-day
-1 0 10 year)’ that confuse source code with data.  Do some other
minor docstring fixups as well, e.g., insert a missing close
quote.
2015-09-01 18:23:21 -07:00
Paul Eggert
244c417a56 Quoting fixes in ERC and Eshell
* lisp/erc/erc-autoaway.el (erc-autoaway-set-away):
* lisp/erc/erc-backend.el (define-erc-response-handler):
* lisp/erc/erc-fill.el (erc-fill-static-center):
* lisp/eshell/em-dirs.el (eshell-save-some-last-dir):
* lisp/eshell/em-glob.el (eshell-glob-entries):
* lisp/eshell/em-hist.el (eshell-save-some-history):
* lisp/eshell/em-unix.el (eshell-remove-entries, eshell/rm)
(eshell-shuffle-files):
* lisp/eshell/esh-cmd.el (eshell-do-eval):
* lisp/eshell/esh-proc.el (eshell-process-interact)
(eshell-query-kill-processes):
Respect ‘text-quoting-style’ in diagnostics and doc strings.
2015-08-31 15:10:37 -07:00
Paul Eggert
9d35bb8d65 Fix minor quoting problems in doc strings
These were glitches regardless of how or whether we tackle the
problem of grave accent in doc strings.
* lisp/calc/calc-aent.el (math-restore-placeholders):
* lisp/ido.el (ido-ignore-buffers, ido-ignore-files):
* lisp/leim/quail/cyrillic.el ("bulgarian-alt-phonetic"):
* lisp/leim/quail/hebrew.el ("hebrew-new")
("hebrew-biblical-sil"):
* lisp/leim/quail/thai.el ("thai-kesmanee"):
* lisp/progmodes/idlw-shell.el (idlwave-shell-file-name-chars):
Used curved quotes to avoid ambiguities like ‘`''’ in doc strings.
* lisp/calendar/calendar.el (calendar-month-abbrev-array):
* lisp/cedet/semantic/mru-bookmark.el (semantic-mrub-cache-flush-fcn):
* lisp/cedet/semantic/symref.el (semantic-symref-tool-baseclass):
* lisp/cedet/semantic/tag.el (semantic-tag-copy)
(semantic-tag-components):
* lisp/cedet/srecode/cpp.el (srecode-semantic-handle-:cpp):
* lisp/cedet/srecode/texi.el (srecode-texi-texify-docstring):
* lisp/emacs-lisp/byte-opt.el (byte-optimize-all-constp):
* lisp/emacs-lisp/checkdoc.el (checkdoc-message-text-engine):
* lisp/emacs-lisp/generator.el (iter-next):
* lisp/gnus/gnus-art.el (gnus-treat-strip-list-identifiers)
(gnus-article-mode-syntax-table):
* lisp/net/rlogin.el (rlogin-directory-tracking-mode):
* lisp/net/soap-client.el (soap-wsdl-get):
* lisp/net/telnet.el (telnet-mode):
* lisp/org/org-compat.el (org-number-sequence):
* lisp/org/org.el (org-remove-highlights-with-change)
(org-structure-template-alist):
* lisp/org/ox-html.el (org-html-link-org-files-as-html):
* lisp/play/handwrite.el (handwrite-10pt, handwrite-11pt)
(handwrite-12pt, handwrite-13pt):
* lisp/progmodes/f90.el (f90-mode, f90-abbrev-start):
* lisp/progmodes/idlwave.el (idlwave-mode, idlwave-check-abbrev):
* lisp/progmodes/verilog-mode.el (verilog-tool)
(verilog-string-replace-matches, verilog-preprocess)
(verilog-auto-insert-lisp, verilog-auto-insert-last):
* lisp/textmodes/makeinfo.el (makeinfo-options):
* src/font.c (Ffont_spec):
Fix minor quoting problems in doc strings, e.g., missing quote,
``x'' where `x' was meant, etc.
* lisp/erc/erc-backend.el (erc-process-sentinel-2):
Fix minor quoting problem in other string.
* lisp/leim/quail/ethiopic.el ("ethiopic"):
* lisp/term/tvi970.el (tvi970-set-keypad-mode):
Omit unnecessary quotes.
* lisp/faces.el (set-face-attribute, set-face-underline)
(set-face-inverse-video, x-create-frame-with-faces):
* lisp/gnus/gnus-group.el (gnus-group-nnimap-edit-acl):
* lisp/mail/supercite.el (sc-attribs-%@-addresses)
(sc-attribs-!-addresses, sc-attribs-<>-addresses):
* lisp/net/tramp.el (tramp-methods):
* lisp/recentf.el (recentf-show-file-shortcuts-flag):
* lisp/textmodes/artist.el (artist-ellipse-right-char)
(artist-ellipse-left-char, artist-vaporize-fuzziness)
(artist-spray-chars, artist-mode, artist-replace-string)
(artist-put-pixel, artist-text-see-thru):
* lisp/vc/ediff-util.el (ediff-submit-report):
* lisp/vc/log-edit.el (log-edit-changelog-full-paragraphs):
Use double-quotes rather than TeX markup in doc strings.
* lisp/skeleton.el (skeleton-pair-insert-maybe):
Reword to avoid the need for grave accent and apostrophe.
* lisp/xt-mouse.el (xterm-mouse-tracking-enable-sequence):
Don't use grave and acute accents to quote.
2015-05-19 15:01:16 -07:00
Dima Kogan
d132c7b658 erc-backend.el: Give hook-name a default value of nil and add-to-list unconditionally. Fixes debbugs:19363 2015-01-14 16:55:44 -05:00
Paul Eggert
732fd4c7e1 Update copyright year to 2015
Run admin/update-copyright.
2015-01-01 09:18:06 -08:00
Kelvin White
fbc782bd18 fix version tags 2014-11-10 05:38:11 -05:00
Kelvin White
ea283d21fc Update version to 24.5 2014-11-09 08:46:24 -05:00
l3thal
d1036d288d backport: erc bugfixes 2014-11-08 20:51:43 -05:00
Glenn Morris
34dc21db6e Replace "Maintainer: FSF" with the emacs-devel mailing address 2014-02-09 17:34:22 -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
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
f146f2e4bd * erc/erc-backend.el: Require erc at run-time too (silences compilation) 2013-05-29 20:19:04 -07:00
Glenn Morris
342532db2b * lisp/erc/erc-backend.el (312): Fix typo.
Fixes: debbugs:13235
2013-01-03 17:31:52 -08:00
Paul Eggert
0877d0dc24 Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca 2013-01-02 08:13:04 -08:00
Paul Eggert
ab422c4d68 Update copyright notices for 2013. 2013-01-01 09:11:05 +00:00
Stefan Monnier
277c8f21a1 * lisp/erc/erc-backend.el: Fix last change that missed calls to `second'.
Fixes: debbugs:12970
2012-11-23 11:00:57 -05:00
Stefan Monnier
19dc72069c Use cl-lib instead of cl, and interactive-p => called-interactively-p.
* 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.
2012-11-19 12:24:12 -05:00
Stefan Monnier
3bb08684ce * lisp/erc/erc-backend.el: Only require `erc' during compilation.
Fixes: debbugs:12486
2012-10-28 11:32:15 -04:00
Stefan Monnier
393e94faab * lisp/erc/erc-backend.el: Require `erc' instead of autoloading its macros.
Fixes: debbugs:12669
2012-10-18 11:51:28 -04:00
Stefan Monnier
b2f0135a62 * lisp/erc/erc-backend.el (erc-with-server-buffer): Autoload as well.
Fixes: debbugs:12669
2012-10-18 08:49:18 -04:00
Stefan Monnier
8599b23a90 * lisp/erc/erc.el (erc-log): Make it into a defsubst.
(erc-with-server-buffer, define-erc-module, erc-with-buffer)
(erc-with-all-buffers-of-server): Use `declare'.
* lisp/erc/erc-backend.el (erc-log): Adjust autoload accordingly.
2012-10-15 12:49:57 -04:00
Glenn Morris
87a95afe81 * lisp/erc/erc-backend.el (NICK): Handle pre-existing buffers.
Fixes: debbugs:12002
2012-10-06 18:28:04 -07:00
Glenn Morris
df5d5f59f2 Set maintainer of most lisp/erc/*.el files to FSF
Ref: http://lists.gnu.org/archive/html/bug-gnu-emacs/2012-10/msg00200.html
2012-10-05 21:04:53 -04:00
Glenn Morris
2a1e24765b Replace version 24.2 with 24.3 where appropriate (hopefully) 2012-08-15 09:29:11 -07:00
Glenn Morris
16245de59c New defcustoms need :version tags. They don't need "*" in the doc. 2012-05-13 17:27:21 -07:00
Teemu Likonen
56551c4327 Allow specifying the erc timestamp format
* erc-backend.el (erc-server-timestamp-format): New variable to
allow specifying the timestamp format.

Fixes: debbugs:10779
2012-05-13 20:51:14 +02:00
Chong Yidong
fb7ada5f94 Remove * characters from the front of variable docstrings. 2012-04-09 21:05:48 +08:00
Glenn Morris
c4077254f9 Add missing :version tags for new erc defcustoms.
* 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.
2012-02-08 00:07:24 -08:00
Glenn Morris
acaf905b11 Add 2012 to FSF copyright years for Emacs files 2012-01-05 01:46:05 -08:00