1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-17 19:30:38 -08:00
emacs/lisp/net
Fabián Ezequiel Gallina 35e1f9d9fc Merge from origin/emacs-24
a5f38fa Fix ChangeLog typo
c6400e1 Fix composition of characters from Syriac and Arabis scripts.
7e9dfde python.el: Fix message when sending region.
800260c python.el: Cleanup temp files even with eval errors.
ed65b91 Fix for previous commit
2dd5163 python.el: Handle file encoding for shell.
7aa506e Spelling fixes
4cd6d77 * automated/tramp-tests.el (tramp-test17-insert-directory): Do not expect a given order of "." and "..".
a41d07b Fix rendering of composed caharacters on the mode line.  (Bug#19435)
b70977c Small doc markup fixes
73c050c * doc/lispref/modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes.
1783e6c ChangeLog fix
c741b1b TUTORIAL.es: Improve style consistency
f89efea TUTORIAL.es: spelling fixes
0d48826 Avoid compiler warning.

Conflicts:
	doc/lispref/ChangeLog
	doc/lispref/control.texi
	etc/ChangeLog
	lisp/ChangeLog
	src/ChangeLog
	test/ChangeLog
2014-12-27 13:31:20 -03:00
..
ange-ftp.el (ange-ftp-switches-ok): Disallow flags causing trouble with ls over ftp. 2014-12-10 17:47:53 +01:00
browse-url.el
dbus.el
dig.el
dns.el
eudc-bob.el
eudc-export.el
eudc-hotlist.el
eudc-vars.el
eudc.el
eudcb-bbdb.el
eudcb-ldap.el
eudcb-mab.el
eudcb-ph.el
eww.el Make eww mark valid/invalid https pages 2014-12-09 04:21:57 +01:00
gnutls.el Make gnutls-negotiate ignore specially handled files 2014-12-08 19:13:39 +01:00
goto-addr.el
hmac-def.el
hmac-md5.el
imap.el
ldap.el
mairix.el
net-utils.el
netrc.el
network-stream.el Remove more (fboundp 'gnutls-available-p) 2014-12-12 12:32:42 +01:00
newst-backend.el newsticker: Prevent multiple "Could not download..." messages. Fixes bug#19166. 2014-12-01 19:14:54 +01:00
newst-plainview.el
newst-reader.el
newst-ticker.el
newst-treeview.el newsticker: Context menu in treeview's tree. 2014-12-06 20:56:56 +01:00
newsticker.el
nsm.el Fixes: debbugs:19269 2014-12-21 17:20:54 +01:00
ntlm.el
quickurl.el
rcirc.el
rlogin.el
sasl-cram.el
sasl-digest.el
sasl-ntlm.el
sasl.el
secrets.el
shr-color.el
shr.el * net/shr.el (shr-fold-text): Don't bug out on zero-length text. 2014-12-15 06:05:05 +01:00
snmp-mode.el
soap-client.el
soap-inspect.el
socks.el
telnet.el
tls.el
tramp-adb.el
tramp-cache.el
tramp-cmds.el
tramp-compat.el
tramp-ftp.el
tramp-gvfs.el
tramp-gw.el * net/tramp-gw.el (tramp-gw-open-connection): Suppress traces in 2014-12-17 22:08:30 +01:00
tramp-sh.el Merge from origin/emacs-24 2014-12-27 13:21:17 -03:00
tramp-smb.el
tramp-uu.el
tramp.el Merge from origin/emacs-24 2014-12-27 13:31:20 -03:00
trampver.el
webjump.el
zeroconf.el