1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-05 05:21:26 -08:00
Commit graph

2171 commits

Author SHA1 Message Date
Paul Eggert
52a4e87c63 Fix copyright years by hand
These are dates that admin/update-copyright did not update, or
updated incorrectly.  Also, back out the copyright-date change to
doc/misc/texinfo.tex, as upstream hasn't updated that date yet.
2015-01-01 14:27:34 -08:00
Paul Eggert
7e09ef09a4 Update copyright year to 2015
Run admin/update-copyright.
2015-01-01 14:26:41 -08:00
Paul Eggert
6ddd819467 Merge from origin/emacs-24
a5f90a3 * .gitattributes: New file.
5a9710f Make sure tool-bar changes are reflected on display.
93796ba * autogen.sh: Port better to non-GNU 'cp'.
9758516 Fix a typo in a comment in the previous commit.
aa472a3 Fix the pixel coordinates returned by pos-visible-in-window-p.  (Bug#19473)
d261229 * automated/tramp-tests.el (tramp--test-smb-or-windows-nt-p): New defun. (tramp-test30-special-characters): Use it. (tramp--test-check-files): Filter nil file names out.
9278f05 Omit trailing white space
1c93fd3 Sync with Tramp 2.2.11.
96ebe18 Sync with Tramp 2.2.11.
e792450 Sync with Tramp 2.2.11.
2d17e12 Fix ChangeLog entry.
6444482 Fix auto-revert-tail-mode for remote files
b5c9c13 Spelling fixes
c5504d1 src/w32proc.c (Fw32_get_codepage_charset): Doc fix.  (Bug#19458)

Conflicts:
	ChangeLog
	doc/misc/ChangeLog
	lisp/ChangeLog
	src/ChangeLog
	test/ChangeLog
2015-01-01 10:47:17 -08:00
Juri Linkov
5480b8ef25 Multi-page isearch support in eww
* lisp/net/eww.el (eww-isearch-next-buffer): New function.
(eww-mode): Set multi-isearch-next-buffer-function to it.
http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg02300.html
2014-12-31 01:50:06 +02:00
Michael Albinus
e792450d4b Sync with Tramp 2.2.11.
* net/tramp-compat.el (top): Require cl-macs for Emacs 22.
Make an alias for `default-toplevel-value' if it doesn't exist.

* net/tramp-smb.el (tramp-smb-handle-copy-directory):
Use `tramp-compat-delete-directory'.

* net/trampver.el: Update release number.
2014-12-29 17:31:15 +01:00
Lars Ingebrigtsen
c5a81fdb6f Make eww rendering default to `window-width' again
* lisp/gnus/mm-decode.el (mm-shr): Bind `shr-width' to `fill-column'
so that lines don't get overlong when responding.

* lisp/net/eww.el (eww-mode): Truncate overlong lines for prettier
display when resizing.

* lisp/net/shr.el (shr-width): Default to using the window width when
rendering.
2014-12-29 13:48:43 +01:00
Ivan Shmakov
53822badf4 shr table header/footer fixes
Fixes: debbugs:19444

* lisp/net/shr.el (shr-tag-table): Fix handling of tbody/header/footer
elements in tables.
2014-12-28 15:06:05 +01:00
Ivan Shmakov
28a584d0e9 Fix eww typo in "up" handling
Fixes: debbugs:19445

* lisp/net/eww.el (eww-handle-link): Fix typo in "up" rel handling.
2014-12-28 14:54:46 +01:00
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
Fabián Ezequiel Gallina
411c1c6531 Merge from origin/emacs-24
216c6aa * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use `tramp-rsh-end-of-line', it ought to be more robust.
20cfd24 Improve indexing on the chapter/section/subsection levels.
14c3739 * lisp/progmodes/js.el (js-syntax-propertize): "return" can't be divided.
ea78112 * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use "\n" as end-of-line delimeter for passwords, when running on MS Windows.
012479a * lisp/progmodes/sh-script.el: Don't set global indent-line-function
75e114f Fix line numbers on Python shell.
d0fd23c doc/emacs/buffers.texi (Kill Buffer): Improve indexing.
8e818d1 Keep maximized when going fullscreen.
749813e python.el: Fix electric colon behavior
936d5e5 Fix last patch.
74d3b20 Fixes: debbugs:18623

Conflicts:
	doc/emacs/ChangeLog
	doc/lispref/ChangeLog
	doc/lispref/functions.texi
	lisp/ChangeLog
	src/ChangeLog
	src/xterm.c
	test/ChangeLog
2014-12-27 13:21:17 -03:00
Fabián Ezequiel Gallina
3a12f2ed99 Merge from origin/emacs-24
2616307 * net/tramp-sh.el (tramp-send-command-and-read): New optional arg MARKER. (tramp-get-remote-path): Use it.
c773edc * net/tramp-gw.el (tramp-gw-open-connection): Suppress traces in wrong debug buffer. (tramp-gw-open-connection): Set process coding system 'binary. (tramp-gw-open-network-stream): Handle HTTP error 403.
8032fc1 * .gitignore: Ignore /conftest*.
fb420e7 * lisp/subr.el (sit-for): Tweak docstring.
061db13 Fix vc-git-dir-status-files WRT up-to-date vs edited
bb57c94 Consider electric-pair-mode in tex-mode.
7b94572 * test/automated/flymake/warnpred/test.pl: Tweak earlier change.
59c218f ChangeLog fix
db2a768 * test/automated/flymake/warnpred/test.pl: Tweak format
d9005dd src/gnutls.c (gnutls_init): Fix deprecation warning from GCC.

Conflicts:
	ChangeLog
	lisp/ChangeLog
	src/ChangeLog
	test/ChangeLog
2014-12-27 13:15:55 -03:00
Paul Eggert
7aa506eed8 Spelling fixes 2014-12-25 18:08:47 -08:00
Michael Albinus
216c6aadf2 * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):
Use `tramp-rsh-end-of-line', it ought to be more robust.
2014-12-24 09:58:49 +01:00
Michael Albinus
ea78112b12 * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use "\n"
as end-of-line delimeter for passwords, when running on MS Windows.

* net/tramp.el (tramp-read-passwd): Ignore errors from `auth-source-*'.
2014-12-23 14:17:00 +01:00
Lars Ingebrigtsen
be4304d8d8 Fixes: debbugs:19269
* lisp/net/nsm.el (nsm-save-host): Don't save the host name twice.
2014-12-21 17:20:54 +01:00
Michael Albinus
936d5e5bb6 Fix last patch. 2014-12-21 16:19:26 +01:00
Michael Albinus
74d3b20cf5 Fixes: debbugs:18623
* net/tramp.el (tramp-handle-insert-file-contents):
Set `find-file-not-found-functions' in case of errors.
2014-12-21 12:10:31 +01:00
Michael Albinus
b459f1f0b9 * net/tramp-sh.el (tramp-histfile-override): Add :version. 2014-12-20 13:09:49 +01:00
Ted Zlatanov
6623f3daae * net/tramp-sh.el (tramp-histfile-override): Clarify docstring. 2014-12-20 06:14:04 -05:00
Michael Albinus
230c010050 * net/tramp-sh.el (tramp-send-command-and-read): New optional arg MARKER.
(tramp-get-remote-path): Use it.
2014-12-19 12:51:42 +01:00
Michael Albinus
2616307f5c * net/tramp-sh.el (tramp-send-command-and-read): New optional arg MARKER.
(tramp-get-remote-path): Use it.
2014-12-19 12:45:01 +01:00
Michael Albinus
c773edcf56 * net/tramp-gw.el (tramp-gw-open-connection): Suppress traces in
wrong debug buffer.
(tramp-gw-open-connection): Set process coding system 'binary.
(tramp-gw-open-network-stream): Handle HTTP error 403.

* net/tramp-sh.el (tramp-compute-multi-hops): Suppress traces in
wrong debug buffer.
(tramp-maybe-open-connection): Set connection property "gateway".

* net/tramp.el (tramp-error-with-buffer): Call `message' properly.
(tramp-accept-process-output): Use nil as argument for
`accept-process-output', when there is a gateway prepended.
2014-12-17 22:08:30 +01:00
Ted Zlatanov
9be1538571 Introduce tramp-histfile-override.
* net/tramp-sh.el (tramp-histfile-override): New variable.
(tramp-open-shell, tramp-maybe-open-connection): Use it.
2014-12-17 14:52:10 -05:00
Lars Magne Ingebrigtsen
872617ad73 * net/shr.el (shr-fold-text): Don't bug out on zero-length text. 2014-12-15 06:05:05 +01:00
Andreas Schwab
4ea175894a * net/shr.el (shr-next-link): Don't error out at eob. 2014-12-13 19:04:00 +01:00
Lars Magne Ingebrigtsen
05beff88de (shr-fold-text): Inhibit state from being altered. 2014-12-13 16:32:17 +01:00
Lars Magne Ingebrigtsen
76f9994d67 Make shr fold long title texts
* net/shr.el (shr-fold-text): New function.
(shr-show-alt-text, shr-urlify, shr-tag-img): Use it to fold long
alt/title texts.
2014-12-13 16:23:40 +01:00
Ted Zlatanov
28e0d0c95d Merge from origin/emacs-24
bd6c441 * simple.el (password-word-equivalents): Add "passcode", used for numeric secrets like PINs or RSA tokens.
16d4c1c A better fix for bug#19346
82ec808 * .gitignore: Add !lib/std*.in.h, so as to not ignore the .in.h files.
3cf7629 Git ignore lib/std*.h
301a401 Always define `gnutls-available-p' even if GnuTLS is not available.
d76b9b2 Don't break example string between 2 lines (bug#19257)
75b4857 Port commit-msg to mawk
9ac0332 Improve commit-msg messages and autosquash
0c2f254 Support overflow-newline-into-fringe together with word-wrap (bug#19300)
935ee05 * net/tramp-sh.el (tramp-get-remote-path): Use a login shell in order to determine `tramp-own-remote-path'.
c2db939 python.el: Support interpreter paths with spaces
d83f329 ChangeLog fix
0f9fbb9 Port commit-message checking to FreeBSD 9.
3db1ada admin/MAINTAINERS: Update my interests and responsibilities.
6382f24 * .gitignore: Ignore autosave files.

Conflicts:
	ChangeLog
	lisp/progmodes/python.el
	src/gnutls.c
2014-12-12 19:23:19 -05:00
Lars Magne Ingebrigtsen
88f3dbc465 Remove more (fboundp 'gnutls-available-p)
* lisp/net/network-stream.el (network-stream-open-starttls): No need to
check for the availability of `gnutls-available-p'.
2014-12-12 12:32:42 +01:00
Rasmus Pank Roulund
bdc373bf45 (ange-ftp-switches-ok): Disallow flags causing trouble with ls over ftp.
Fixes: debbugs:19192

* net/ange-ftp.el (ange-ftp-switches-ok): Disallow flags causing
trouble with ls over ftp.  These flags result in ls returning no
output, causing Tramp-breakage.
2014-12-10 17:47:53 +01:00
Michael Albinus
935ee05f07 * net/tramp-sh.el (tramp-get-remote-path): Use a login shell in
order to determine `tramp-own-remote-path'.
2014-12-10 14:15:51 +01:00
Lars Magne Ingebrigtsen
ef8892db3c (shr-tag-object): Don't bug out on text elements in <object> 2014-12-10 05:00:32 +01:00
Lars Magne Ingebrigtsen
c3ea511964 Make inline SVGs work in shr again
* net/shr.el (shr-dom-print): Don't print comments.
(shr-tag-svg): Give inline SVG images the right type.
2014-12-09 05:18:12 +01:00
Lars Magne Ingebrigtsen
a005f61018 Make eww mark valid/invalid https pages
* lisp/net/eww.el (eww-update-header-line-format): Mark valid/invalid
certificates in the header line.
(eww-invalid-certificate, eww-valid-certificate): New faces.
2014-12-09 04:21:57 +01:00
Lars Magne Ingebrigtsen
e9aaf96966 Make NSM warn on `high' for older protocols, and document
* doc/emacs/misc.texi (Network Security): Mention the new protocol-level
`high' NSM checks.

(nsm-check-protocol): Also warn if using SSL3 or older.
2014-12-08 22:51:54 +01:00
Lars Magne Ingebrigtsen
be6767d59b Make the NSM prompting have more data
(nsm-format-certificate): Include more data about the connection.
(nsm-query): Fill the text to that it looks nicer.
2014-12-08 22:40:57 +01:00
Lars Magne Ingebrigtsen
7befee11a8 * lisp/net/nsm.el (nsm-check-protocol): Test for RC4 on `high'. 2014-12-08 22:23:51 +01:00
Stefan Monnier
b76bea4c26 Various minor details accumulated over time
* lisp/info.el (Info-mode-map): Remove left-over binding.
* lisp/net/tramp.el (tramp-handle-make-symbolic-link): Mark unused arg.
* lisp/obsolete/gulp.el (gulp-create-m-p-alist): Remove unused var `mnt-tm'.
* lisp/progmodes/gud.el (gud-gdb-completions): Remove unused var `start'.
* lisp/url/url-http.el (url-http-activate-callback): Make debug more verbose.
* src/process.c: Whitespace and line-break nitpicks.
2014-12-08 15:02:26 -05:00
Lars Magne Ingebrigtsen
b7768d785f (nsm-check-protocol): Check for weak Diffie-Hellman prime bits.
Fixes: debbugs:19153
2014-12-08 20:41:05 +01:00
Lars Magne Ingebrigtsen
6b1ab80ef9 `network-security-level' documentation simplification
* lisp/net/nsm.el (network-security-level): Remove the detailed
description, which was already outdated, and refer the users to
the manual.
2014-12-08 20:06:50 +01:00
Andrey Kotlarski
e40e63033b Commands and mode for managing multiple eww buffers
Fixes: debbugs:19131

* doc/misc/eww.texi (Basics): Document managing multiple eww buffers.

* lisp/net/eww.el (eww-buffers-mode): New major mode.
(eww-list-buffers, eww-buffer-select, eww-buffer-show-next)
(eww-buffer-show-previous, eww-buffer-kill, eww-buffer-show): New
commands/functions.
2014-12-08 19:29:06 +01:00
Lars Magne Ingebrigtsen
e63c720b72 Make gnutls-negotiate ignore specially handled files
Fixes: debbugs:15866

* lisp/net/gnutls.el (gnutls-negotiate): Ignore files found via
'file-name-handler-alist' since the gnutls library can't use those.
2014-12-08 19:13:39 +01:00
Lars Magne Ingebrigtsen
eb5b08bef5 (eww-copy-page-url): Add doc string. 2014-12-07 22:18:09 +01:00
Lars Magne Ingebrigtsen
a3ca30c8b5 Revert prefix behavior in RET to previous behavior
* net/eww.el (eww-follow-link): Revert prefix behaviour to
previous behavior.
2014-12-07 21:44:19 +01:00
Ivan Shmakov
06b5cfe498 Make `G' in eww record history
Fixes: debbugs:19253

* net/eww.el (eww-browse-url): Use generate-new-buffer (was:
iterating over possible buffer names.)

* net/eww.el (eww): Moved history recording here...
(eww-browse-url): ... from here.
2014-12-07 21:14:07 +01:00
Lars Magne Ingebrigtsen
c08883ccb4 (eww-current-buffer): Compilation fix for bug#18550 patch. 2014-12-07 20:50:23 +01:00
Lars Magne Ingebrigtsen
007d4c29c2 Make a prefix to `eww-reload' work locally
Fixes: debbugs:19086

* net/eww.el (eww-reload): Take a prefix to work locally (bug#19086).
2014-12-07 20:49:16 +01:00
Ivan Shmakov
b9ad615e65 eww history restoration fix
Fixes: debbugs:18550

* net/eww.el (eww-list-histories): Restore the history in the
correct buffer.
2014-12-07 20:38:38 +01:00
Lars Magne Ingebrigtsen
2c3d111392 eww bookmark display fixup
Fixes: debbugs:16398

* net/eww.el (eww-bookmark-prepare): Display URLs in first by
displaying shortened titles first.
2014-12-07 20:32:07 +01:00
UJ
a1cf6ec16b newsticker: Context menu in treeview's tree.
* net/newst-treeview.el (newsticker--treeview-list-add-item)
(newsticker--treeview-propertize-tag): Bind tree menu to mouse-3.
(newsticker--treeview-create-groups-menu)
(newsticker--treeview-create-tree-menu): Removed.
(newsticker--treeview-tree-open-menu): New.
(newsticker-treeview-tree-click): Pass event to
`newsticker-treeview-tree-do-click'.
(newsticker-treeview-tree-do-click): Open treemenu on mouse-3.
2014-12-06 20:56:56 +01:00